chore: Remove legacy workarounds

build.mjs

@@ -1,3 +0,0 @@
-// FIXME: Delete this soon, for now it is needed so people can update
-
-import("./scripts/build/build.mjs");

docs/1_INSTALLING.md

@@ -1,5 +1,5 @@
 > **Warning**
-> These instructions are only for advanced users. If you're not a Developer, you should use our [graphical installer](https://github.com/Vendicated/VencordInstaller#usage) instead. 
+> These instructions are only for advanced users. If you're not a Developer, you should use our [graphical installer](https://github.com/Vendicated/VencordInstaller#usage) instead.
 
 # Installation Guide
 
@@ -183,7 +183,6 @@ In `index.js`:
 
 ```js
 require("C:/Users/<your user>/path/to/vencord/dist/patcher.js");
-require("../app.asar");
 ```
 
 And in `package.json`:

src/ipcMain/index.ts

@@ -16,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import "./legacy";
 import "./updater";
 
 import { debounce } from "@utils/debounce";

src/ipcMain/legacy.ts

@@ -1,31 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import IpcEvents from "@utils/IpcEvents";
-import { ipcMain } from "electron";
-import { writeFile } from "fs/promises";
-import { join } from "path";
-
-import { get } from "./simpleGet";
-
-ipcMain.handleOnce(IpcEvents.DOWNLOAD_VENCORD_CSS, async () => {
-    const buf = await get("https://github.com/Vendicated/Vencord/releases/download/devbuild/renderer.css");
-    await writeFile(join(__dirname, "renderer.css"), buf);
-    return buf.toString("utf-8");
-});
-

src/ipcMain/updater/http.ts

@@ -37,10 +37,7 @@ async function githubGet(endpoint: string) {
             Accept: "application/vnd.github+json",
             // "All API requests MUST include a valid User-Agent header.
             // Requests with no User-Agent header will be rejected."
-            "User-Agent": VENCORD_USER_AGENT,
+            "User-Agent": VENCORD_USER_AGENT
-            // todo: perhaps add support for (optional) api token?
-            // unauthorised rate limit is 60 reqs/h
-            // https://github.com/settings/tokens/new?description=Vencord%20Updater
         }
     });
 }

src/patcher.ts

@@ -18,7 +18,6 @@
 
 import { onceDefined } from "@utils/onceDefined";
 import electron, { app, BrowserWindowConstructorOptions, Menu } from "electron";
-import { readFileSync } from "fs";
 import { dirname, join } from "path";
 
 import { initIpc } from "./ipcMain";
@@ -187,21 +186,4 @@ if (!process.argv.includes("--vanilla")) {
 }
 
 console.log("[Vencord] Loading original Discord app.asar");
-// Legacy Vencord Injector requires "../app.asar". However, because we
+require(require.main!.filename);
-// restore the require.main above this is messed up, so monkey patch Module._load to
-// redirect such requires
-// FIXME: remove this eventually
-if (readFileSync(injectorPath, "utf-8").includes('require("../app.asar")')) {
-    console.warn("[Vencord] [--> WARNING <--] You have a legacy Vencord install. Please reinject");
-    const Module = require("module");
-    const loadModule = Module._load;
-    Module._load = function (path: string) {
-        if (path === "../app.asar") {
-            Module._load = loadModule;
-            arguments[0] = require.main!.filename;
-        }
-        return loadModule.apply(this, arguments);
-    };
-} else {
-    require(require.main!.filename);
-}

src/preload.ts

@@ -18,7 +18,7 @@
 
 import { debounce } from "@utils/debounce";
 import IpcEvents from "@utils/IpcEvents";
-import { contextBridge, ipcRenderer, webFrame } from "electron";
+import { contextBridge, webFrame } from "electron";
 import { readFileSync, watch } from "fs";
 import { join } from "path";
 
@@ -45,24 +45,14 @@ if (location.protocol !== "data:") {
         }
     }
 
-    try {
+    const css = readFileSync(rendererCss, "utf-8");
-        const css = readFileSync(rendererCss, "utf-8");
+    insertCss(css);
-        insertCss(css);
+    if (IS_DEV) {
-        if (IS_DEV) {
+        // persistent means keep process running if watcher is the only thing still running
-            // persistent means keep process running if watcher is the only thing still running
+        // which we obviously don't want
-            // which we obviously don't want
+        watch(rendererCss, { persistent: false }, () => {
-            watch(rendererCss, { persistent: false }, () => {
+            document.getElementById("vencord-css-core")!.textContent = readFileSync(rendererCss, "utf-8");
-                document.getElementById("vencord-css-core")!.textContent = readFileSync(rendererCss, "utf-8");
+        });
-            });
-        }
-    } catch (err) {
-        if ((err as NodeJS.ErrnoException)?.code !== "ENOENT")
-            throw err;
-
-        // hack: the pre update updater does not download this file, so manually download it
-        // TODO: remove this in a future version
-        ipcRenderer.invoke(IpcEvents.DOWNLOAD_VENCORD_CSS)
-            .then(insertCss);
     }
     require(process.env.DISCORD_PRELOAD!);
 } else {

src/utils/IpcEvents.ts

@@ -44,5 +44,4 @@ export default strEnum({
     UPDATE: "VencordUpdate",
     BUILD: "VencordBuild",
     OPEN_MONACO_EDITOR: "VencordOpenMonacoEditor",
-    DOWNLOAD_VENCORD_CSS: "VencordDownloadVencordCss"
 } as const);