cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-11-23 07:30:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge cd4d8eb96d into 478d375125

Browse source
This commit is contained in:
Declan Chidlow 2024-11-15 13:09:56 +00:00 committed by GitHub
commit fb7aa08b70
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 49 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/settings/appearance/legacy/ThemeOverrides.tsx
View file

@ -106,9 +106,9 @@ export default observer(() => {
"scrollbar-thumb",
"scrollbar-track",
"status-online",
"status-away",
"status-idle",
"status-focus",
"status-busy",
"status-streaming",
"status-invisible",
"success",
"warning",

1
src/components/settings/roles/PermissionSelect.tsx
View file

@ -73,7 +73,6 @@ export function PermissionSelect({
}
return "Neutral";
}, [value]);
function onSwitch(state: State) {

9
src/context/Theme.tsx
View file

@ -30,10 +30,9 @@ export type Variables =
| "tertiary-foreground"
| "tooltip"
| "status-online"
| "status-away"
| "status-idle"
| "status-focus"
| "status-busy"
| "status-streaming"
| "status-invisible";
// While this isn't used, it'd be good to keep this up to date as a reference or for future use
@ -283,10 +282,9 @@ export const PRESETS: Record<string, Theme> = {
"tertiary-background": "#4D4D4D",
"tertiary-foreground": "#3a3a3a",
"status-online": "#3ABF7E",
"status-away": "#F39F00",
"status-idle": "#F39F00",
"status-focus": "#4799F0",
"status-busy": "#F84848",
"status-streaming": "#977EFF",
"status-invisible": "#A5A5A5",
},
dark: {
@ -311,10 +309,9 @@ export const PRESETS: Record<string, Theme> = {
"tertiary-background": "#4D4D4D",
"tertiary-foreground": "#848484",
"status-online": "#3ABF7E",
"status-away": "#F39F00",
"status-idle": "#F39F00",
"status-focus": "#4799F0",
"status-busy": "#F84848",
"status-streaming": "#977EFF",
"status-invisible": "#A5A5A5",
},
};

2
src/controllers/client/jsx/error.tsx
View file

@ -10,7 +10,7 @@ export function takeError(error: any): string {
case 429:
return "TooManyRequests";
case 401:
return "Unauthorized"
return "Unauthorized";
case 403:
return "Forbidden";
default:

6
src/controllers/modals/components/CreateInvite.tsx
View file

@ -7,10 +7,10 @@ import { ModalForm } from "@revoltchat/ui";
import { noopAsync } from "../../../lib/js";
import { IS_REVOLT } from "../../../version";
import { takeError } from "../../client/jsx/error";
import { modalController } from "../ModalController";
import { ModalProps } from "../types";
import { IS_REVOLT } from "../../../version";
/**
* Code block which displays invite
@ -79,7 +79,9 @@ export default function CreateInvite({
children: <Text id="app.context_menu.copy_link" />,
onClick: () =>
modalController.writeText(
IS_REVOLT ? `https://rvlt.gg/${code}` : `${window.location.host}/invite/${code}`
IS_REVOLT
? `https://rvlt.gg/${code}`
: `${window.location.host}/invite/${code}`,
),
},
]}

28
src/lib/ContextMenus.tsx
View file

@ -2,29 +2,32 @@ import { ChevronRight, Trash } from "@styled-icons/boxicons-regular";
import { Cog, UserVoice } from "@styled-icons/boxicons-solid";
import { isFirefox } from "react-device-detect";
import { useHistory } from "react-router-dom";
import { Channel, Message, Server, User, API, Permission, UserPermission, Member } from "revolt.js";
import {
Channel,
Message,
Server,
User,
API,
Permission,
UserPermission,
Member,
} from "revolt.js";
import { ContextMenuWithData, MenuItem, openContextMenu } from "preact-context-menu";
import {
ContextMenuWithData,
MenuItem,
openContextMenu,
} from "preact-context-menu";
import { Text } from "preact-i18n";
import { Column, IconButton, LineDivider } from "@revoltchat/ui";
import { useApplicationState } from "../mobx/State";
import { QueuedMessage } from "../mobx/stores/MessageQueue";
import { NotificationState } from "../mobx/stores/NotificationOptions";
import CMNotifications from "./contextmenu/CMNotifications";
import Tooltip from "../components/common/Tooltip";
import UserStatus from "../components/common/user/UserStatus";
import { useSession } from "../controllers/client/ClientController";
@ -33,7 +36,6 @@ import { modalController } from "../controllers/modals/ModalController";
import { internalEmit } from "./eventEmitter";
import { getRenderer } from "./renderer/Singleton";
interface ContextMenuData {
user?: string;
server?: string;

3
src/mobx/stores/helpers/SAudio.ts
View file

@ -86,7 +86,6 @@ export default class SAudio {
const el = new Audio(path);
this.cache.set(path, el);
return el;
}
loadCache() {
@ -100,7 +99,7 @@ export default class SAudio {
try {
audio.play();
} catch (err) {
console.error("Hit error while playing", `${sound }:`, err);
console.error("Hit error while playing", `${sound}:`, err);
}
}
}

2
src/mobx/stores/helpers/STheme.ts
View file

@ -110,7 +110,7 @@ export default class STheme {
for (const key of Object.keys(variables)) {
const value = variables[key];
if (typeof value === "string") {
variables[`${key }-contrast`] = getContrastingColour(value);
variables[`${key}-contrast`] = getContrastingColour(value);
}
}

2
src/styles/_context-menu.scss
View file

@ -89,7 +89,7 @@
}
&.idle {
background: var(--status-away);
background: var(--status-idle);
}
&.focus {

2
src/sw.ts
View file

@ -29,7 +29,7 @@ precacheAndRoute(
}
for (const key of locale_keys) {
if (fn.startsWith(`${key }.`)) {
if (fn.startsWith(`${key}.`)) {
return false;
}
}