Merge ffee147aed into 00e6ead9bd

external/revolt.js

@@ -1 +1 @@
-Subproject commit 783c8d1a3e3ad6071d268b18077569262ea61602
+Subproject commit cd9e84a337c72709b82bb4eca794ec7474a0ee7e

src/components/markdown/plugins/htmlToText.ts

@@ -1,10 +1,10 @@
-import { Plugin } from "unified";
-import { visit } from "unist-util-visit";
-
-export const remarkHtmlToText: Plugin = () => {
-    return (tree) => {
-        visit(tree, "html", (node: { type: string; value: string }) => {
-            node.type = "text";
-        });
-    };
-};
+import { Plugin } from "unified";
+import { visit } from "unist-util-visit";
+
+export const remarkHtmlToText: Plugin = () => {
+    return (tree) => {
+        visit(tree, "html", (node: { type: string; value: string }) => {
+            node.type = "text";
+        });
+    };
+};

src/components/settings/appearance/legacy/ThemeOverrides.tsx

@@ -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",

src/components/settings/roles/PermissionSelect.tsx

@@ -67,13 +67,12 @@ export function PermissionSelect({
             }
 
             return "Neutral";
-        } 
-            if (Long.fromNumber(value).and(permission).eq(permission)) {
-                return "Allow";
-            }
+        }
+        if (Long.fromNumber(value).and(permission).eq(permission)) {
+            return "Allow";
+        }
 
-            return "Neutral";
-        
+        return "Neutral";
     }, [value]);
 
     function onSwitch(state: State) {

src/context/Theme.tsx

@@ -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",
     },
 };

src/controllers/client/jsx/error.tsx

@@ -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:

src/controllers/modals/components/CreateInvite.tsx

@@ -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}`,
                         ),
                 },
             ]}

src/lib/ContextMenus.tsx

@@ -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;
@@ -1293,4 +1295,4 @@ export default function ContextMenus() {
             <CMNotifications />
         </>
     );
-}
+}

src/mobx/stores/helpers/SAudio.ts

@@ -82,11 +82,10 @@ export default class SAudio {
     getAudio(path: string) {
         if (this.cache.has(path)) {
             return this.cache.get(path)!;
-        } 
-            const el = new Audio(path);
-            this.cache.set(path, el);
-            return el;
-        
+        }
+        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);
             }
         }
     }

src/mobx/stores/helpers/STheme.ts

@@ -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);
             }
         }
 

src/pages/home/Home.tsx

@@ -51,7 +51,7 @@ export default observer(() => {
         state.settings.set("appearance:seasonal", !seasonalTheme);
 
     const isDecember = !isTouchscreenDevice && new Date().getMonth() === 11;
-    const isOctober = !isTouchscreenDevice && new Date().getMonth() === 9
+    const isOctober = !isTouchscreenDevice && new Date().getMonth() === 9;
     const snowflakes = useMemo(() => {
         const flakes: string[] = [];
 

src/styles/_context-menu.scss

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

src/sw.ts

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