Merge branch 'immediate-finds' into immediate-finds-modules-proxy

scripts/generateReport.ts

@@ -513,31 +513,41 @@ async function runtime(token: string) {
             try {
                 let result = null as any;
 
-                if (searchType === "webpackDependantLazy" || searchType === "webpackDependantLazyComponent") {
+                switch (searchType) {
-                    const [factory] = args;
+                    case "webpackDependantLazy":
-                    result = factory();
+                    case "webpackDependantLazyComponent": {
-                } else if (searchType === "extractAndLoadChunks") {
+                        const [factory] = args;
-                    const [code, matcher] = args;
+                        result = factory();
-
+                        break;
-                    const module = Vencord.Webpack.findModuleFactory(...code);
-                    if (module) {
-                        result = module.toString().match(Vencord.Util.canonicalizeMatch(matcher));
                     }
-                } else {
+                    case "extractAndLoadChunks": {
-                    const findResult = args.shift();
+                        const [code, matcher] = args;
 
-                    if (findResult != null) {
+                        const module = Vencord.Webpack.findModuleFactory(...code);
-                        if (findResult.$$vencordCallbackCalled != null && findResult.$$vencordCallbackCalled()) {
+                        if (module) {
-                            result = findResult;
+                            result = module.toString().match(Vencord.Util.canonicalizeMatch(matcher));
                         }
 
-                        if (findResult[Vencord.Util.proxyInnerGet] != null) {
+                        break;
-                            result = findResult[Vencord.Util.proxyInnerValue];
+                    }
+                    default: {
+                        const findResult = args.shift();
+
+                        if (findResult != null) {
+                            if (findResult.$$vencordCallbackCalled != null && findResult.$$vencordCallbackCalled()) {
+                                result = findResult;
+                            }
+
+                            if (findResult[Vencord.Util.proxyInnerGet] != null) {
+                                result = findResult[Vencord.Util.proxyInnerValue];
+                            }
+
+                            if (findResult.$$vencordInner != null) {
+                                result = findResult.$$vencordInner();
+                            }
                         }
 
-                        if (findResult.$$vencordInner != null) {
+                        break;
-                            result = findResult.$$vencordInner();
-                        }
                     }
                 }
 

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/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/messageLogger/index.tsx

@@ -295,12 +295,9 @@ export default definePlugin({
                 // },
                 {
                     // Pass through editHistory & deleted & original attachments to the "edited message" transformer
-                    match: /interactionData:(\i)\.interactionData/,
+                    match: /(?<=null!=\i\.edited_timestamp\)return )\i\(\i,\{reactions:(\i)\.reactions.{0,50}\}\)/,
                     replace:
-                        "interactionData:$1.interactionData," +
+                        "Object.assign($&,{ deleted:$1.deleted, editHistory:$1.editHistory, attachments:$1.attachments })"
-                        "deleted:$1.deleted," +
-                        "editHistory:$1.editHistory," +
-                        "attachments:$1.attachments"
                 },
 
                 // {

src/webpack/patchWebpack.ts

@@ -88,6 +88,16 @@ Object.defineProperty(Function.prototype, "O", {
             };
 
             onChunksLoaded.toString = originalOnChunksLoaded.toString.bind(originalOnChunksLoaded);
+
+            // Returns whether a chunk has been loaded
+            Object.defineProperty(onChunksLoaded, "j", {
+                set(v) {
+                    delete onChunksLoaded.j;
+                    onChunksLoaded.j = v;
+                    originalOnChunksLoaded.j = v;
+                },
+                configurable: true
+            });
         }
 
         Object.defineProperty(this, "O", {