Merge remote-tracking branch 'upstream/main'

src/debug/loadLazyChunks.ts

@@ -27,7 +27,12 @@ export async function loadLazyChunks() {
 
         const LazyChunkRegex = canonicalizeMatch(/(?:(?:Promise\.all\(\[)?(\i\.e\("?[^)]+?"?\)[^\]]*?)(?:\]\))?)\.then\(\i\.bind\(\i,"?([^)]+?)"?\)\)/g);
 
+        const foundCssDebuggingLoad = false;
+
         async function searchAndLoadLazyChunks(factoryCode: string) {
+            // Workaround to avoid loading the CSS debugging chunk which turns the app pink
+            const hasCssDebuggingLoad = foundCssDebuggingLoad ? false : factoryCode.includes(".cssDebuggingEnabled&&");
+
             const lazyChunks = factoryCode.matchAll(LazyChunkRegex);
             const validChunkGroups = new Set<[chunkIds: number[], entryPoint: number]>();
 
@@ -43,6 +48,16 @@ export async function loadLazyChunks() {
                 let invalidChunkGroup = false;
 
                 for (const id of chunkIds) {
+                    if (hasCssDebuggingLoad) {
+                        if (chunkIds.length > 1) {
+                            throw new Error("Found multiple chunks in factory that loads the CSS debugging chunk");
+                        }
+
+                        invalidChunks.add(id);
+                        invalidChunkGroup = true;
+                        break;
+                    }
+
                     if (wreq.u(id) == null || wreq.u(id) === "undefined.js") continue;
 
                     const isWorkerAsset = await fetch(wreq.p + wreq.u(id))

src/plugins/alwaysExpandRoles/index.ts

@@ -28,10 +28,18 @@ export default definePlugin({
     patches: [
         {
             find: 'action:"EXPAND_ROLES"',
-            replacement: {
+            replacement: [
-                match: /(roles:\i(?=.+?(\i)\(!0\)[,;]\i\({action:"EXPAND_ROLES"}\)).+?\[\i,\2\]=\i\.useState\()!1\)/,
+                {
-                replace: (_, rest, setExpandedRoles) => `${rest}!0)`
+                    match: /(roles:\i(?=.+?(\i)\(!0\)[,;]\i\({action:"EXPAND_ROLES"}\)).+?\[\i,\2\]=\i\.useState\()!1\)/,
-            }
+                    replace: (_, rest, setExpandedRoles) => `${rest}!0)`
+                },
+                {
+                    // Fix not calculating non-expanded roles because the above patch makes the default "expanded",
+                    // which makes the collapse button never show up and calculation never occur
+                    match: /(?<=useLayoutEffect\(\(\)=>{if\()\i/,
+                    replace: isExpanded => "false"
+                }
+            ]
         }
     ]
 });

src/plugins/consoleJanitor/index.ts

@@ -151,13 +151,6 @@ export default definePlugin({
                 replace: ""
             }
         },
-        {
-            find: "[DEPRECATED] `context` will be removed in a future version. Instead use `import { createStore, useStore } from 'zustand'`. See: https://github.com/pmndrs/zustand/discussions/1180.",
-            replacement: {
-                match: /console\.warn\("\[DEPRECATED\] `context` will be removed in a future version\. Instead use `import { createStore, useStore } from 'zustand'`\. See: https:\/\/github\.com\/pmndrs\/zustand\/discussions\/1180\."\);/,
-                replace: ""
-            }
-        },
         // Patches discords generic logger function
         {
             find: "Σ:",

src/plugins/fakeNitro/index.tsx

@@ -20,11 +20,11 @@ import { addPreEditListener, addPreSendListener, removePreEditListener, removePr
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import { ApngBlendOp, ApngDisposeOp, importApngJs } from "@utils/dependencies";
-import { getCurrentGuild } from "@utils/discord";
+import { getCurrentGuild, getEmojiURL } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType, Patch } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy, findStoreLazy, proxyLazyWebpack } from "@webpack";
-import { Alerts, ChannelStore, DraftType, EmojiStore, FluxDispatcher, Forms, GuildMemberStore, IconUtils, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
+import { Alerts, ChannelStore, DraftType, EmojiStore, FluxDispatcher, Forms, GuildMemberStore, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
 import type { Emoji } from "@webpack/types";
 import type { Message } from "discord-types/general";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
@@ -920,7 +920,7 @@ export default definePlugin({
 
                     const emojiString = `<${emoji.animated ? "a" : ""}:${emoji.originalName || emoji.name}:${emoji.id}>`;
 
-                    const url = new URL(IconUtils.getEmojiURL({ id: emoji.id, animated: emoji.animated, size: s.emojiSize }));
+                    const url = new URL(getEmojiURL(emoji.id, emoji.animated, s.emojiSize));
                     url.searchParams.set("size", s.emojiSize.toString());
                     url.searchParams.set("name", emoji.name);
 
@@ -953,7 +953,7 @@ export default definePlugin({
 
                 hasBypass = true;
 
-                const url = new URL(IconUtils.getEmojiURL({ id: emoji.id, animated: emoji.animated, size: s.emojiSize }));
+                const url = new URL(getEmojiURL(emoji.id, emoji.animated, s.emojiSize));
                 url.searchParams.set("size", s.emojiSize.toString());
                 url.searchParams.set("name", emoji.name);
 

src/plugins/noMosaic/index.ts

@@ -20,7 +20,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "NoMosaic",
     authors: [Devs.AutumnVN],
-    description: "Removes Discord new image mosaic",
+    description: "Removes Discord image mosaic",
     tags: ["image", "mosaic", "media"],
 
     settings,
@@ -29,8 +29,8 @@ export default definePlugin({
         {
             find: '=>"IMAGE"===',
             replacement: {
-                match: /=>"IMAGE"===\i\|\|"VIDEO"===\i;/,
+                match: /=>"IMAGE"===\i\|\|"VIDEO"===\i(?:\|\|("VISUAL_PLACEHOLDER"===\i))?;/,
-                replace: "=>false;"
+                replace: (_, visualPlaceholderPred) => visualPlaceholderPred != null ? `=>${visualPlaceholderPred};` : "=>false;"
             }
         },
         {

src/plugins/viewIcons/index.tsx

@@ -209,10 +209,11 @@ export default definePlugin({
         },
         // Group DMs top small & large icon
         {
-            find: /\.recipients\.length>=2(?!<isMultiUserDM.{0,50})/,
+            find: '["aria-hidden"],"aria-label":',
             replacement: {
                 match: /null==\i\.icon\?.+?src:(\(0,\i\.\i\).+?\))(?=[,}])/,
-                replace: (m, iconUrl) => `${m},onClick:()=>$self.openAvatar(${iconUrl})`
+                // We have to check that icon is not an unread GDM in the server bar
+                replace: (m, iconUrl) => `${m},onClick:()=>arguments[0]?.size!=="SIZE_48"&&$self.openAvatar(${iconUrl})`
             }
         },
         // User DMs top small icon

src/utils/discord.tsx

@@ -19,7 +19,7 @@
 import "./discord.css";
 
 import { MessageObject } from "@api/MessageEvents";
-import { ChannelStore, ComponentDispatch, Constants, FluxDispatcher, GuildStore, i18n, InviteActions, MessageActions, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileActions, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
+import { ChannelStore, ComponentDispatch, Constants, FluxDispatcher, GuildStore, i18n, IconUtils, InviteActions, MessageActions, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileActions, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
 import { Channel, Guild, Message, User } from "discord-types/general";
 import { Except } from "type-fest";
 
@@ -212,3 +212,14 @@ export async function fetchUserProfile(id: string, options?: FetchUserProfileOpt
 export function getUniqueUsername(user: User) {
     return user.discriminator === "0" ? user.username : user.tag;
 }
+
+/**
+ *  Get the URL for an emoji. This function always returns a gif URL for animated emojis, instead of webp
+ * @param id The emoji id
+ * @param animated Whether the emoji is animated
+ * @param size The size for the emoji
+ */
+export function getEmojiURL(id: string, animated: boolean, size: number) {
+    const url = IconUtils.getEmojiURL({ id, animated, size });
+    return animated ? url.replace(".webp", ".gif") : url;
+}