Merge remote-tracking branch 'upstream/dev' into dev

src/plugins/clientTheme/index.tsx

@@ -110,7 +110,7 @@ const settings = definePluginSettings({
 
 export default definePlugin({
     name: "ClientTheme",
-    authors: [Devs.F53, Devs.Nuckyz],
+    authors: [Devs.Nuckyz],
     description: "Recreation of the old client theme experiment. Add a color to your Discord client theme",
     settings,
 

src/plugins/consoleJanitor/index.ts

@@ -137,27 +137,6 @@ export default definePlugin({
                 replace: ""
             }
         },
-        // Zustand section
-        {
-            find: "[DEPRECATED] Passing a vanilla store will be unsupported in a future version. Instead use `import { useStore } from 'zustand'`.",
-            replacement: [
-                {
-                    match: /&&console\.warn\("\[DEPRECATED\] Passing a vanilla store will be unsupported in a future version\. Instead use `import { useStore } from 'zustand'`\."\)/,
-                    replace: ""
-                },
-                {
-                    match: /console\.warn\("\[DEPRECATED\] Use `createWithEqualityFn` instead of `create` or use `useStoreWithEqualityFn` instead of `useStore`\. They can be imported from 'zustand\/traditional'\. https:\/\/github\.com\/pmndrs\/zustand\/discussions\/1937"\),/,
-                    replace: ""
-                }
-            ]
-        },
-        {
-            find: "[DEPRECATED] `getStorage`, `serialize` and `deserialize` options are deprecated. Use `storage` option instead.",
-            replacement: {
-                match: /console\.warn\("\[DEPRECATED\] `getStorage`, `serialize` and `deserialize` options are deprecated\. Use `storage` option instead\."\),/,
-                replace: ""
-            }
-        },
         // Patches discords generic logger function
         {
             find: "Σ:",

src/plugins/emoteCloner/index.tsx

@@ -310,7 +310,8 @@ function buildMenuItem(type: "Emoji" | "Sticker", fetchData: () => Promisable<Om
 }
 
 function isGifUrl(url: string) {
-    return new URL(url).pathname.endsWith(".gif");
+    const u = new URL(url);
+    return u.pathname.endsWith(".gif") || u.searchParams.get("animated") === "true";
 }
 
 const messageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => {

src/plugins/roleColorEverywhere/index.tsx

@@ -156,7 +156,7 @@ export default definePlugin({
             find: "#{intl::MESSAGE_EDITED}",
             replacement: {
                 match: /(?<=isUnsupported\]:(\i)\.isUnsupported\}\),)(?=children:\[)/,
-                replace: "style:$self.useMessageColorStyle($1),"
+                replace: "style:$self.useMessageColorsStyle($1),"
             },
             predicate: () => settings.store.colorChatMessages
         }
@@ -188,13 +188,19 @@ export default definePlugin({
         };
     },
 
-    useMessageColor(message: any) {
+    useMessageColorsStyle(message: any) {
         try {
             const { messageSaturation } = settings.use(["messageSaturation"]);
             const author = useMessageAuthor(message);
 
             if (author.colorString != null && messageSaturation !== 0) {
-                return `color-mix(in oklab, ${author.colorString} ${messageSaturation}%, var(--text-normal))`;
+                const value = `color-mix(in oklab, ${author.colorString} ${messageSaturation}%, var({DEFAULT}))`;
+
+                return {
+                    color: value.replace("{DEFAULT}", "--text-normal"),
+                    "--header-primary": value.replace("{DEFAULT}", "--header-primary"),
+                    "--text-muted": value.replace("{DEFAULT}", "--text-muted")
+                };
             }
         } catch (e) {
             new Logger("RoleColorEverywhere").error("Failed to get message color", e);
@@ -203,14 +209,6 @@ export default definePlugin({
         return null;
     },
 
-    useMessageColorStyle(message: any) {
-        const color = this.useMessageColor(message);
-
-        return color && {
-            color
-        };
-    },
-
     RoleGroupColor: ErrorBoundary.wrap(({ id, count, title, guildId, label }: { id: string; count: number; title: string; guildId: string; label: string; }) => {
         const role = GuildStore.getRole(guildId, id);
 

src/plugins/showHiddenChannels/index.tsx

@@ -103,7 +103,7 @@ export default definePlugin({
             replacement: [
                 {
                     // Do not show confirmation to join a voice channel when already connected to another if clicking on a hidden voice channel
-                    match: /(?<=getBlockedUsersForVoiceChannel\((\i)\.id\);return\()/,
+                    match: /(?<=getIgnoredUsersForVoiceChannel\((\i)\.id\);return\()/,
                     replace: (_, channel) => `!$self.isHiddenChannel(${channel})&&`
                 },
                 {