Improve persistence after Discord updates (#4441)

improves update persistence & ports to Linux

Author: Vendicated

src/main/patcher.ts

@@ -28,10 +28,10 @@ console.log("[Vencord] Starting up...");
 // Our injector file at app/index.js
 const injectorPath = require.main!.filename;
 
-// special discord_arch_electron injection method
+// Original Discord app.asar name
 const asarName = require.main!.path.endsWith("app.asar") ? "_app.asar" : "app.asar";
 
-// The original app.asar
+// Original Discord app.asar
 const asarPath = join(dirname(injectorPath), "..", asarName);
 
 const discordPkg = require(join(asarPath, "package.json"));
@@ -42,28 +42,29 @@ app.setAppPath(asarPath);
 
 if (!IS_VANILLA) {
     const settings = RendererSettings.store;
-    // Repatch after host updates on Windows
-    if (process.platform === "win32") {
-        require("./patchWin32Updater");
-
-        if (settings.winCtrlQ) {
-            const originalBuild = Menu.buildFromTemplate;
-            Menu.buildFromTemplate = function (template) {
-                if (template[0]?.label === "&File") {
-                    const { submenu } = template[0];
-                    if (Array.isArray(submenu)) {
-                        submenu.push({
-                            label: "Quit (Hidden)",
-                            visible: false,
-                            acceleratorWorksWhenHidden: true,
-                            accelerator: "Control+Q",
-                            click: () => app.quit()
-                        });
-                    }
+
+    // Repatch after host updates on Windows and Linux
+    if (process.platform === "win32" || process.platform === "linux") {
+        require("./persistAfterDiscordUpdates");
+    }
+
+    if (process.platform === "win32" && settings.winCtrlQ) {
+        const originalBuild = Menu.buildFromTemplate;
+        Menu.buildFromTemplate = function (template) {
+            if (template[0]?.label === "&File") {
+                const { submenu } = template[0];
+                if (Array.isArray(submenu)) {
+                    submenu.push({
+                        label: "Quit (Hidden)",
+                        visible: false,
+                        acceleratorWorksWhenHidden: true,
+                        accelerator: "Control+Q",
+                        click: () => app.quit()
+                    });
                 }
-                return originalBuild.call(this, template);
-            };
-        }
+            }
+            return originalBuild.call(this, template);
+        };
     }
 
     class BrowserWindow extends electron.BrowserWindow {
@@ -137,13 +138,11 @@ if (!IS_VANILLA) {
     process.env.DATA_DIR = join(app.getPath("userData"), "..", "Vencord");
 
     // Monkey patch commandLine to:
-    // - disable WidgetLayering: Fix DevTools context menus https://github.com/electron/electron/issues/38790
     // - disable UseEcoQoSForBackgroundProcess: Work around Discord unloading when in background
     const originalAppend = app.commandLine.appendSwitch;
     app.commandLine.appendSwitch = function (...args) {
         if (args[0] === "disable-features") {
             const disabledFeatures = new Set((args[1] ?? "").split(","));
-            disabledFeatures.add("WidgetLayering");
             disabledFeatures.add("UseEcoQoSForBackgroundProcess");
             args[1] += [...disabledFeatures].join(",");
         }

src/main/patchWin32Updater.ts src/main/persistAfterDiscordUpdates.tssrc/main/patchWin32Updater.ts renamed to src/main/persistAfterDiscordUpdates.ts

@@ -17,7 +17,7 @@
 */
 
 import { app } from "electron";
-import { existsSync, mkdirSync, readdirSync, renameSync, statSync, writeFileSync } from "original-fs";
+import { copyFileSync, existsSync, readdirSync, renameSync } from "original-fs";
 import { basename, dirname, join } from "path";
 
 function isNewer($new: string, old: string) {
@@ -47,21 +47,19 @@ function patchLatest() {
 
         if (latestVersion === currentVersion) return;
 
+        const oldResources = join(discordPath, currentVersion, "resources");
+        const oldVencordAsar = join(oldResources, "app.asar");
+
         const resources = join(discordPath, latestVersion, "resources");
-        const app = join(resources, "app.asar");
-        const _app = join(resources, "_app.asar");
+        const newAppAsar = join(resources, "app.asar");
+        const newAppAsarBackup = join(resources, "_app.asar");
 
-        if (!existsSync(app) || statSync(app).isDirectory()) return;
+        if (!existsSync(oldVencordAsar) || !existsSync(newAppAsar)) return;
 
-        console.info("[Vencord] Detected Host Update. Repatching...");
+        console.info(`[Vencord] Detected Host Update (${currentVersion} -> ${latestVersion}). Repatching...`);
 
-        renameSync(app, _app);
-        mkdirSync(app);
-        writeFileSync(join(app, "package.json"), JSON.stringify({
-            name: "discord",
-            main: "index.js"
-        }));
-        writeFileSync(join(app, "index.js"), `require(${JSON.stringify(join(__dirname, "patcher.js"))});`);
+        renameSync(newAppAsar, newAppAsarBackup);
+        copyFileSync(oldVencordAsar, newAppAsar);
     } catch (err) {
         console.error("[Vencord] Failed to repatch latest host update", err);
     }