From a38ac956dfaf53711a4cddea73ae1b8cf617211a Mon Sep 17 00:00:00 2001 From: Vendicated Date: Tue, 24 Jan 2023 13:50:02 +0100 Subject: [PATCH] chore: Remove legacy workarounds --- build.mjs | 3 --- docs/1_INSTALLING.md | 3 +-- src/ipcMain/index.ts | 1 - src/ipcMain/legacy.ts | 31 ------------------------------- src/ipcMain/updater/http.ts | 5 +---- src/patcher.ts | 20 +------------------- src/preload.ts | 28 +++++++++------------------- src/utils/IpcEvents.ts | 1 - 8 files changed, 12 insertions(+), 80 deletions(-) delete mode 100644 build.mjs delete mode 100644 src/ipcMain/legacy.ts diff --git a/build.mjs b/build.mjs deleted file mode 100644 index 44c18e94..00000000 --- a/build.mjs +++ /dev/null @@ -1,3 +0,0 @@ -// FIXME: Delete this soon, for now it is needed so people can update - -import("./scripts/build/build.mjs"); diff --git a/docs/1_INSTALLING.md b/docs/1_INSTALLING.md index f27dfc14..96f1bed5 100644 --- a/docs/1_INSTALLING.md +++ b/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//path/to/vencord/dist/patcher.js"); -require("../app.asar"); ``` And in `package.json`: diff --git a/src/ipcMain/index.ts b/src/ipcMain/index.ts index 0946f5af..bae67933 100644 --- a/src/ipcMain/index.ts +++ b/src/ipcMain/index.ts @@ -16,7 +16,6 @@ * along with this program. If not, see . */ -import "./legacy"; import "./updater"; import { debounce } from "@utils/debounce"; diff --git a/src/ipcMain/legacy.ts b/src/ipcMain/legacy.ts deleted file mode 100644 index 567ad3d0..00000000 --- a/src/ipcMain/legacy.ts +++ /dev/null @@ -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 . -*/ - -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"); -}); - diff --git a/src/ipcMain/updater/http.ts b/src/ipcMain/updater/http.ts index 3b381447..25dc5bad 100644 --- a/src/ipcMain/updater/http.ts +++ b/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, - // todo: perhaps add support for (optional) api token? - // unauthorised rate limit is 60 reqs/h - // https://github.com/settings/tokens/new?description=Vencord%20Updater + "User-Agent": VENCORD_USER_AGENT } }); } diff --git a/src/patcher.ts b/src/patcher.ts index 2da404fa..64bc5026 100644 --- a/src/patcher.ts +++ b/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 -// 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); -} +require(require.main!.filename); diff --git a/src/preload.ts b/src/preload.ts index 3867f336..820b6554 100644 --- a/src/preload.ts +++ b/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"); - insertCss(css); - if (IS_DEV) { - // persistent means keep process running if watcher is the only thing still running - // which we obviously don't want - watch(rendererCss, { persistent: false }, () => { - 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); + const css = readFileSync(rendererCss, "utf-8"); + insertCss(css); + if (IS_DEV) { + // persistent means keep process running if watcher is the only thing still running + // which we obviously don't want + watch(rendererCss, { persistent: false }, () => { + document.getElementById("vencord-css-core")!.textContent = readFileSync(rendererCss, "utf-8"); + }); } require(process.env.DISCORD_PRELOAD!); } else { diff --git a/src/utils/IpcEvents.ts b/src/utils/IpcEvents.ts index e97e41b0..dbf3540c 100644 --- a/src/utils/IpcEvents.ts +++ b/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);