Merge pull request #7 from Vendicated/main

1.8.6

Author: Scyye

package.json

@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.8.5",
+    "version": "1.8.6",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

scripts/generateReport.ts

@@ -243,19 +243,27 @@ page.on("console", async e => {
         }
     }
 
-    if (isDebug) {
-        console.error(e.text());
-    } else if (level === "error") {
-        const text = await Promise.all(
-            e.args().map(async a => {
-                try {
+    async function getText() {
+        try {
+            return await Promise.all(
+                e.args().map(async a => {
                     return await maybeGetError(a) || await a.jsonValue();
-                } catch (e) {
-                    return a.toString();
-                }
-            })
-        ).then(a => a.join(" ").trim());
+                })
+            ).then(a => a.join(" ").trim());
+        } catch {
+            return e.text();
+        }
+    }
+
+    if (isDebug) {
+        const text = await getText();
 
+        console.error(text);
+        if (text.includes("A fatal error occurred:")) {
+            process.exit(1);
+        }
+    } else if (level === "error") {
+        const text = await getText();
 
         if (text.length && !text.startsWith("Failed to load resource: the server responded with a status of") && !text.includes("Webpack")) {
             console.error("[Unexpected Error]", text);
@@ -322,22 +330,31 @@ async function runtime(token: string) {
 
         const validChunks = new Set<string>();
         const invalidChunks = new Set<string>();
+        const deferredRequires = new Set<string>();
 
         let chunksSearchingResolve: (value: void | PromiseLike<void>) => void;
         const chunksSearchingDone = new Promise<void>(r => chunksSearchingResolve = r);
 
         // True if resolved, false otherwise
         const chunksSearchPromises = [] as Array<() => boolean>;
-        const lazyChunkRegex = canonicalizeMatch(/Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\)/g);
-        const chunkIdsRegex = canonicalizeMatch(/\("(.+?)"\)/g);
+
+        const LazyChunkRegex = canonicalizeMatch(/(?:Promise\.all\(\[(\i\.\i\("[^)]+?"\)[^\]]+?)\]\)|(\i\.\i\("[^)]+?"\)))\.then\(\i\.bind\(\i,"([^)]+?)"\)\)/g);
 
         async function searchAndLoadLazyChunks(factoryCode: string) {
-            const lazyChunks = factoryCode.matchAll(lazyChunkRegex);
+            const lazyChunks = factoryCode.matchAll(LazyChunkRegex);
             const validChunkGroups = new Set<[chunkIds: string[], entryPoint: string]>();
 
-            await Promise.all(Array.from(lazyChunks).map(async ([, rawChunkIds, entryPoint]) => {
-                const chunkIds = Array.from(rawChunkIds.matchAll(chunkIdsRegex)).map(m => m[1]);
-                if (chunkIds.length === 0) return;
+            // Workaround for a chunk that depends on the ChannelMessage component but may be be force loaded before
+            // the chunk containing the component
+            const shouldForceDefer = factoryCode.includes(".Messages.GUILD_FEED_UNFEATURE_BUTTON_TEXT");
+
+            await Promise.all(Array.from(lazyChunks).map(async ([, rawChunkIdsArray, rawChunkIdsSingle, entryPoint]) => {
+                const rawChunkIds = rawChunkIdsArray ?? rawChunkIdsSingle;
+                const chunkIds = rawChunkIds ? Array.from(rawChunkIds.matchAll(Vencord.Webpack.ChunkIdsRegex)).map(m => m[1]) : [];
+
+                if (chunkIds.length === 0) {
+                    return;
+                }
 
                 let invalidChunkGroup = false;
 
@@ -373,6 +390,11 @@ async function runtime(token: string) {
             // Requires the entry points for all valid chunk groups
             for (const [, entryPoint] of validChunkGroups) {
                 try {
+                    if (shouldForceDefer) {
+                        deferredRequires.add(entryPoint);
+                        continue;
+                    }
+
                     if (wreq.m[entryPoint]) wreq(entryPoint as any);
                 } catch (err) {
                     console.error(err);
@@ -435,6 +457,11 @@ async function runtime(token: string) {
 
         await chunksSearchingDone;
 
+        // Require deferred entry points
+        for (const deferredRequire of deferredRequires) {
+            wreq!(deferredRequire as any);
+        }
+
         // All chunks Discord has mapped to asset files, even if they are not used anymore
         const allChunks = [] as string[];
 
@@ -514,7 +541,6 @@ async function runtime(token: string) {
         setTimeout(() => console.log("[PUPPETEER_TEST_DONE_SIGNAL]"), 1000);
     } catch (e) {
         console.log("[PUP_DEBUG]", "A fatal error occurred:", e);
-        process.exit(1);
     }
 }
 

src/main/patcher.ts

@@ -73,6 +73,9 @@ if (!IS_VANILLA) {
                 const original = options.webPreferences.preload;
                 options.webPreferences.preload = join(__dirname, IS_DISCORD_DESKTOP ? "preload.js" : "vencordDesktopPreload.js");
                 options.webPreferences.sandbox = false;
+                // work around discord unloading when in background
+                options.webPreferences.backgroundThrottling = false;
+
                 if (settings.frameless) {
                     options.frame = false;
                 } else if (process.platform === "win32" && settings.winNativeTitleBar) {
@@ -136,6 +139,9 @@ if (!IS_VANILLA) {
         }
         return originalAppend.apply(this, args);
     };
+
+    // Work around discord unloading when in background
+    app.commandLine.appendSwitch("disable-renderer-backgrounding");
 } else {
     console.log("[Vencord] Running in vanilla mode. Not loading Vencord");
 }

src/plugins/_core/settings.tsx

@@ -56,6 +56,26 @@ export default definePlugin({
                 }
             ]
         },
+        // Discord Stable
+        // FIXME: remove once change merged to stable
+        {
+            find: "Messages.ACTIVITY_SETTINGS",
+            replacement: {
+                get match() {
+                    switch (Settings.plugins.Settings.settingsLocation) {
+                        case "top": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.USER_SETTINGS/;
+                        case "aboveNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.BILLING_SETTINGS/;
+                        case "belowNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.APP_SETTINGS/;
+                        case "belowActivity": return /(?<=\{section:(\i\.\i)\.DIVIDER},)\{section:"changelog"/;
+                        case "bottom": return /\{section:(\i\.\i)\.CUSTOM,\s*element:.+?}/;
+                        case "aboveActivity":
+                        default:
+                            return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.ACTIVITY_SETTINGS/;
+                    }
+                },
+                replace: "...$self.makeSettingsCategories($1),$&"
+            }
+        },
         {
             find: "Messages.ACTIVITY_SETTINGS",
             replacement: {

src/plugins/anonymiseFileNames/index.tsx

@@ -73,13 +73,13 @@ export default definePlugin({
         {
             find: "instantBatchUpload:function",
             replacement: {
-                match: /uploadFiles:(.{1,2}),/,
+                match: /uploadFiles:(\i),/,
                 replace:
                     "uploadFiles:(...args)=>(args[0].uploads.forEach(f=>f.filename=$self.anonymise(f)),$1(...args)),",
             },
         },
         {
-            find: "message.attachments",
+            find: 'addFilesTo:"message.attachments"',
             replacement: {
                 match: /(\i.uploadFiles\((\i),)/,
                 replace: "$2.forEach(f=>f.filename=$self.anonymise(f)),$1"

src/plugins/betterRoleContext/README.md

@@ -1,6 +1,6 @@
 # BetterRoleContext
 
-Adds options to copy role color  and edit role when right clicking roles in the user profile
+Adds options to copy role color, edit role and view role icon when right clicking roles in the user profile
 
-![](https://github.com/Vendicated/Vencord/assets/45497981/d1765e9e-7db2-4a3c-b110-139c59235326)
+![](https://github.com/Vendicated/Vencord/assets/45497981/354220a4-09f3-4c5f-a28e-4b19ca775190)
 

src/plugins/betterRoleContext/index.tsx

@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { definePluginSettings } from "@api/Settings";
+import { ImageIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
-import { getCurrentGuild } from "@utils/discord";
-import definePlugin from "@utils/types";
+import { getCurrentGuild, openImageModal } from "@utils/discord";
+import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { Clipboard, GuildStore, Menu, PermissionStore, TextAndImagesSettingsStores } from "@webpack/common";
 
@@ -34,10 +36,34 @@ function AppearanceIcon() {
     );
 }
 
+const settings = definePluginSettings({
+    roleIconFileFormat: {
+        type: OptionType.SELECT,
+        description: "File format to use when viewing role icons",
+        options: [
+            {
+                label: "png",
+                value: "png",
+                default: true
+            },
+            {
+                label: "webp",
+                value: "webp",
+            },
+            {
+                label: "jpg",
+                value: "jpg"
+            }
+        ]
+    }
+});
+
 export default definePlugin({
     name: "BetterRoleContext",
-    description: "Adds options to copy role color / edit role when right clicking roles in the user profile",
-    authors: [Devs.Ven],
+    description: "Adds options to copy role color / edit role / view role icon when right clicking roles in the user profile",
+    authors: [Devs.Ven, Devs.goodbee],
+
+    settings,
 
     start() {
         // DeveloperMode needs to be enabled for the context menu to be shown
@@ -63,6 +89,20 @@ export default definePlugin({
                 );
             }
 
+            if (role.icon) {
+                children.push(
+                    <Menu.MenuItem
+                        id="vc-view-role-icon"
+                        label="View Role Icon"
+                        action={() => {
+                            openImageModal(`${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/role-icons/${role.id}/${role.icon}.${settings.store.roleIconFileFormat}`);
+                        }}
+                        icon={ImageIcon}
+                    />
+
+                );
+            }
+
             if (PermissionStore.getGuildPermissionProps(guild).canManageRoles) {
                 children.push(
                     <Menu.MenuItem

src/plugins/fakeProfileThemes/index.css

@@ -0,0 +1,3 @@
+.vc-fpt-preview * {
+    pointer-events: none;
+}