Updater Popup: Add Changelog; Make about page prettier

README.md

@@ -2,8 +2,6 @@
 
 Vencord Desktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
 
-Vencord Desktop is currently in beta
-
 **Not yet supported**:
 - Global Keybinds
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "VencordDesktop",
-    "version": "0.2.3",
+    "version": "0.2.5",
     "private": true,
     "description": "",
     "keywords": [],

src/globals.d.ts

@@ -7,7 +7,7 @@
 declare global {
     export var VencordDesktopNative: typeof import("preload/VencordDesktopNative").VencordDesktopNative;
     export var VencordDesktop: typeof import("renderer/index");
-    export var vcdLS: typeof localStorage;
+    export var VCDP: any;
 
     export var IS_DEV: boolean;
 }

src/main/about.ts

@@ -4,10 +4,9 @@
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
-import { app, BrowserWindow } from "electron";
-import { readFileSync } from "fs";
+import { BrowserWindow } from "electron";
 import { join } from "path";
-import { ICON_PATH, STATIC_DIR } from "shared/paths";
+import { ICON_PATH, VIEW_DIR } from "shared/paths";
 
 import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
 
@@ -15,14 +14,15 @@ export function createAboutWindow() {
     const about = new BrowserWindow({
         center: true,
         autoHideMenuBar: true,
-        icon: ICON_PATH
+        icon: ICON_PATH,
+        webPreferences: {
+            preload: join(__dirname, "updaterPreload.js")
+        }
     });
 
     makeLinksOpenExternally(about);
 
-    const html = readFileSync(join(STATIC_DIR, "about.html"), "utf-8").replaceAll("%VERSION%", app.getVersion());
-
-    about.loadURL("data:text/html;charset=utf-8," + html);
+    about.loadFile(join(VIEW_DIR, "about.html"));
 
     return about;
 }

src/main/appBadge.ts

@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+import { app, NativeImage, nativeImage } from "electron";
+import { join } from "path";
+import { BADGE_DIR } from "shared/paths";
+
+const imgCache = new Map<number, NativeImage>();
+function loadBadge(index: number) {
+    const cached = imgCache.get(index);
+    if (cached) return cached;
+
+    const img = nativeImage.createFromPath(join(BADGE_DIR, `${index}.ico`));
+    imgCache.set(index, img);
+
+    return img;
+}
+
+let lastIndex: null | number = -1;
+
+export function setBadgeCount(count: number) {
+    switch (process.platform) {
+        case "darwin":
+        case "linux":
+            if (count === -1) count = 0;
+            app.setBadgeCount(count);
+            break;
+        case "win32":
+            const [index, description] = getBadgeIndexAndDescription(count);
+            if (lastIndex === index) break;
+
+            lastIndex = index;
+
+            // circular import shenanigans
+            const { mainWin } = require("./mainWindow") as typeof import("./mainWindow");
+            mainWin.setOverlayIcon(index === null ? null : loadBadge(index), description);
+            break;
+    }
+}
+
+function getBadgeIndexAndDescription(count: number): [number | null, string] {
+    if (count === -1) return [11, "Unread Messages"];
+    if (count === 0) return [null, "No Notifications"];
+
+    const index = Math.max(1, Math.min(count, 10));
+    return [index, `${index} Notification`];
+}

src/main/firstLaunch.ts

@@ -9,12 +9,13 @@ import { BrowserWindow } from "electron/main";
 import { copyFileSync, mkdirSync, readdirSync } from "fs";
 import { join } from "path";
 import { SplashProps } from "shared/browserWinProperties";
-import { STATIC_DIR } from "shared/paths";
+import { VIEW_DIR } from "shared/paths";
 
 import { autoStart } from "./autoStart";
 import { DATA_DIR } from "./constants";
 import { createWindows } from "./mainWindow";
 import { Settings } from "./settings";
+import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
 
 interface Data {
     minimizeToTray: boolean;
@@ -33,7 +34,9 @@ export function createFirstLaunchTour() {
         width: 550
     });
 
-    win.loadFile(join(STATIC_DIR, "first-launch.html"));
+    makeLinksOpenExternally(win);
+
+    win.loadFile(join(VIEW_DIR, "first-launch.html"));
     win.webContents.addListener("console-message", (_e, _l, msg) => {
         if (msg === "cancel") return app.exit();
 

src/main/index.ts

@@ -24,20 +24,18 @@ if (IS_DEV) {
 process.env.VENCORD_USER_DATA_DIR = DATA_DIR;
 
 function init() {
-    // <-- BEGIN COPY PASTED FROM DISCORD -->
-
     // work around chrome 66 disabling autoplay by default
     app.commandLine.appendSwitch("autoplay-policy", "no-user-gesture-required");
 
     // WinRetrieveSuggestionsOnlyOnDemand: Work around electron 13 bug w/ async spellchecking on Windows.
     // HardwareMediaKeyHandling,MediaSessionService: Prevent Discord from registering as a media service.
+    //
+    // WidgetLayering (Vencord Added): Fix DevTools context menus https://github.com/electron/electron/issues/38790
     app.commandLine.appendSwitch(
         "disable-features",
-        "WinRetrieveSuggestionsOnlyOnDemand,HardwareMediaKeyHandling,MediaSessionService"
+        "WinRetrieveSuggestionsOnlyOnDemand,HardwareMediaKeyHandling,MediaSessionService,WidgetLayering"
     );
 
-    // <-- END COPY PASTED FROM DISCORD -->
-
     app.on("second-instance", (_event, _cmdLine, _cwd, data: any) => {
         if (data.IS_DEV) app.quit();
         else if (mainWin) {

src/main/ipc.ts

@@ -11,6 +11,7 @@ import { join } from "path";
 import { debounce } from "shared/utils/debounce";
 
 import { IpcEvents } from "../shared/IpcEvents";
+import { setBadgeCount } from "./appBadge";
 import { autoStart } from "./autoStart";
 import { VENCORD_FILES_DIR, VENCORD_QUICKCSS_FILE } from "./constants";
 import { mainWin } from "./mainWindow";
@@ -75,6 +76,14 @@ ipcMain.handle(IpcEvents.SPELLCHECK_SET_LANGUAGES, (_, languages: string[]) => {
     if (applicable.length) ses.setSpellCheckerLanguages(applicable);
 });
 
+ipcMain.handle(IpcEvents.SPELLCHECK_REPLACE_MISSPELLING, (e, word: string) => {
+    e.sender.replaceMisspelling(word);
+});
+
+ipcMain.handle(IpcEvents.SPELLCHECK_ADD_TO_DICTIONARY, (e, word: string) => {
+    e.sender.session.addWordToSpellCheckerDictionary(word);
+});
+
 ipcMain.handle(IpcEvents.SELECT_VENCORD_DIR, async () => {
     const res = await dialog.showOpenDialog(mainWin!, {
         properties: ["openDirectory"]
@@ -89,6 +98,8 @@ ipcMain.handle(IpcEvents.SELECT_VENCORD_DIR, async () => {
     return dir;
 });
 
+ipcMain.handle(IpcEvents.SET_BADGE_COUNT, (_, count: number) => setBadgeCount(count));
+
 function readCss() {
     return readFile(VENCORD_QUICKCSS_FILE, "utf-8").catch(() => "");
 }

src/main/mainWindow.ts

@@ -6,7 +6,9 @@
 
 import { app, BrowserWindow, BrowserWindowConstructorOptions, Menu, Tray } from "electron";
 import { join } from "path";
+import { IpcEvents } from "shared/IpcEvents";
 import { once } from "shared/utils/once";
+import type { SettingsStore } from "shared/utils/SettingsStore";
 
 import { ICON_PATH } from "../shared/paths";
 import { createAboutWindow } from "./about";
@@ -26,6 +28,27 @@ app.on("before-quit", () => {
 
 export let mainWin: BrowserWindow;
 
+function makeSettingsListenerHelpers<O extends object>(o: SettingsStore<O>) {
+    const listeners = new Map<(data: any) => void, PropertyKey>();
+
+    const addListener: typeof o.addChangeListener = (path, cb) => {
+        listeners.set(cb, path);
+        o.addChangeListener(path, cb);
+    };
+    const removeAllListeners = () => {
+        for (const [listener, path] of listeners) {
+            o.removeChangeListener(path as any, listener);
+        }
+
+        listeners.clear();
+    };
+
+    return [addListener, removeAllListeners] as const;
+}
+
+const [addSettingsListener, removeSettingsListeners] = makeSettingsListenerHelpers(Settings);
+const [addVencordSettingsListener, removeVencordSettingsListeners] = makeSettingsListenerHelpers(VencordSettings);
+
 function initTray(win: BrowserWindow) {
     const trayMenu = Menu.buildFromTemplate([
         {
@@ -186,11 +209,11 @@ function initWindowBoundsListeners(win: BrowserWindow) {
 }
 
 function initSettingsListeners(win: BrowserWindow) {
-    Settings.addChangeListener("tray", enable => {
+    addSettingsListener("tray", enable => {
         if (enable) initTray(win);
         else tray?.destroy();
     });
-    Settings.addChangeListener("disableMinSize", disable => {
+    addSettingsListener("disableMinSize", disable => {
         if (disable) {
             // 0 no work
             win.setMinimumSize(1, 1);
@@ -205,7 +228,7 @@ function initSettingsListeners(win: BrowserWindow) {
         }
     });
 
-    VencordSettings.addChangeListener("macosTranslucency", enabled => {
+    addVencordSettingsListener("macosTranslucency", enabled => {
         if (enabled) {
             win.setVibrancy("sidebar");
             win.setBackgroundColor("#ffffff00");
@@ -216,7 +239,17 @@ function initSettingsListeners(win: BrowserWindow) {
     });
 }
 
+function initSpellCheck(win: BrowserWindow) {
+    win.webContents.on("context-menu", (_, data) => {
+        win.webContents.send(IpcEvents.SPELLCHECK_RESULT, data.misspelledWord, data.dictionarySuggestions);
+    });
+}
+
 function createMainWindow() {
+    // Clear up previous settings listeners
+    removeSettingsListeners();
+    removeVencordSettingsListeners();
+
     const win = (mainWin = new BrowserWindow({
         show: false,
         autoHideMenuBar: true,
@@ -225,7 +258,8 @@ function createMainWindow() {
             sandbox: false,
             contextIsolation: true,
             devTools: true,
-            preload: join(__dirname, "preload.js")
+            preload: join(__dirname, "preload.js"),
+            spellcheck: true
         },
         icon: ICON_PATH,
         frame: VencordSettings.store.frameless !== true,
@@ -255,6 +289,7 @@ function createMainWindow() {
     initMenuBar(win);
     makeLinksOpenExternally(win);
     initSettingsListeners(win);
+    initSpellCheck(win);
 
     win.webContents.setUserAgent(
         "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"

src/main/splash.ts

@@ -7,12 +7,12 @@
 import { BrowserWindow } from "electron";
 import { join } from "path";
 import { SplashProps } from "shared/browserWinProperties";
-import { STATIC_DIR } from "shared/paths";
+import { VIEW_DIR } from "shared/paths";
 
 export function createSplashWindow() {
     const splash = new BrowserWindow(SplashProps);
 
-    splash.loadFile(join(STATIC_DIR, "splash.html"));
+    splash.loadFile(join(VIEW_DIR, "splash.html"));
 
     return splash;
 }

src/preload/VencordDesktopNative.ts

@@ -4,16 +4,26 @@
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
+import { ipcRenderer } from "electron";
 import type { Settings } from "shared/settings";
 import type { LiteralUnion } from "type-fest";
 
 import { IpcEvents } from "../shared/IpcEvents";
-import { invoke, sendSync } from "./typedIpcs";
+import { invoke, sendSync } from "./typedIpc";
+
+type SpellCheckerResultCallback = (word: string, suggestions: string[]) => void;
+
+const spellCheckCallbacks = new Set<SpellCheckerResultCallback>();
+
+ipcRenderer.on(IpcEvents.SPELLCHECK_RESULT, (_, w: string, s: string[]) => {
+    spellCheckCallbacks.forEach(cb => cb(w, s));
+});
 
 export const VencordDesktopNative = {
     app: {
         relaunch: () => invoke<void>(IpcEvents.RELAUNCH),
-        getVersion: () => sendSync<void>(IpcEvents.GET_VERSION)
+        getVersion: () => sendSync<void>(IpcEvents.GET_VERSION),
+        setBadgeCount: (count: number) => invoke<void>(IpcEvents.SET_BADGE_COUNT, count)
     },
     autostart: {
         isEnabled: () => sendSync<boolean>(IpcEvents.AUTOSTART_ENABLED),
@@ -29,8 +39,15 @@ export const VencordDesktopNative = {
         set: (settings: Settings, path?: string) => invoke<void>(IpcEvents.SET_SETTINGS, settings, path)
     },
     spellcheck: {
-        setLanguages: (languages: readonly string[]) => invoke<void>(IpcEvents.SPELLCHECK_SET_LANGUAGES, languages)
-        // todo: perhaps add ways to learn words
+        setLanguages: (languages: readonly string[]) => invoke<void>(IpcEvents.SPELLCHECK_SET_LANGUAGES, languages),
+        onSpellcheckResult(cb: SpellCheckerResultCallback) {
+            spellCheckCallbacks.add(cb);
+        },
+        offSpellcheckResult(cb: SpellCheckerResultCallback) {
+            spellCheckCallbacks.delete(cb);
+        },
+        replaceMisspelling: (word: string) => invoke<void>(IpcEvents.SPELLCHECK_REPLACE_MISSPELLING, word),
+        addToDictionary: (word: string) => invoke<void>(IpcEvents.SPELLCHECK_ADD_TO_DICTIONARY, word)
     },
     win: {
         focus: () => invoke<void>(IpcEvents.FOCUS)

src/renderer/appBadge.ts

@@ -0,0 +1,43 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+import { filters, waitFor } from "@vencord/types/webpack";
+import { RelationshipStore } from "@vencord/types/webpack/common";
+
+import { Settings } from "./settings";
+
+let GuildReadStateStore: any;
+let NotificationSettingsStore: any;
+
+export function setBadge() {
+    if (Settings.store.appBadge === false) return;
+
+    const mentionCount = GuildReadStateStore.getTotalMentionCount();
+    const pendingRequests = RelationshipStore.getPendingCount();
+    const hasUnread = GuildReadStateStore.hasAnyUnread();
+    const disableUnreadBadge = NotificationSettingsStore.getDisableUnreadBadge();
+
+    let totalCount = mentionCount + pendingRequests;
+    if (!totalCount && hasUnread && !disableUnreadBadge) totalCount = -1;
+
+    VencordDesktopNative.app.setBadgeCount(totalCount);
+}
+
+let toFind = 3;
+
+function waitForAndSubscribeToStore(name: string, cb?: (m: any) => void) {
+    waitFor(filters.byStoreName(name), store => {
+        cb?.(store);
+        store.addChangeListener(setBadge);
+
+        toFind--;
+        if (toFind === 0) setBadge();
+    });
+}
+
+waitForAndSubscribeToStore("GuildReadStateStore", store => (GuildReadStateStore = store));
+waitForAndSubscribeToStore("NotificationSettingsStore", store => (NotificationSettingsStore = store));
+waitForAndSubscribeToStore("RelationshipStore");

src/renderer/components/Settings.tsx

@@ -8,6 +8,7 @@ import "./settings.css";
 
 import { Margins } from "@vencord/types/utils";
 import { Button, Forms, Select, Switch, Text, useState } from "@vencord/types/webpack/common";
+import { setBadge } from "renderer/appBadge";
 import { useSettings } from "renderer/settings";
 
 export default function SettingsUi() {
@@ -72,6 +73,18 @@ export default function SettingsUi() {
                 Start With System
             </Switch>
 
+            <Switch
+                value={Settings.appBadge ?? true}
+                onChange={v => {
+                    Settings.appBadge = v;
+                    if (v) setBadge();
+                    else VencordDesktopNative.app.setBadgeCount(0);
+                }}
+                note="Show mention badge on the app icon"
+            >
+                Notification Badge
+            </Switch>
+
             {switches.map(([key, text, note, def, predicate]) => (
                 <Switch
                     value={(Settings[key as any] ?? def ?? false) && predicate?.() !== false}

src/renderer/fixes.ts

@@ -22,11 +22,11 @@ Object.defineProperty(Notification.prototype, "onclick", {
     configurable: true
 });
 
-// Enable Desktop Notifications by default
 if (isFirstRun) {
     // Hide "Download Discord Desktop now!!!!" banner
     localStorage.setItem("hideNag", "true");
 
+    // Enable Desktop Notifications by default
     waitFor("setDesktopType", m => {
         m.setDesktopType("all");
     });

src/renderer/index.ts

@@ -5,6 +5,8 @@
  */
 
 import "./fixes";
+import "./appBadge";
+import "./patches";
 
 console.log("read if cute :3");
 

src/renderer/patches/index.ts

@@ -0,0 +1,8 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+// TODO: Possibly auto generate glob if we have more patches in the future
+import "./spellCheck";

src/renderer/patches/shared.ts

@@ -0,0 +1,30 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+import { Patch } from "@vencord/types/utils/types";
+
+window.VCDP = {};
+
+interface PatchData {
+    patches: Omit<Patch, "plugin">[];
+    [key: string]: any;
+}
+
+export function addPatch<P extends PatchData>(p: P) {
+    const { patches, ...globals } = p;
+
+    for (const patch of patches as Patch[]) {
+        if (!Array.isArray(patch.replacement)) patch.replacement = [patch.replacement];
+        for (const r of patch.replacement) {
+            if (typeof r.replace === "string") r.replace = r.replace.replaceAll("$self", "VCDP");
+        }
+
+        patch.plugin = "VencordDesktop";
+        Vencord.Plugins.patches.push(patch);
+    }
+
+    Object.assign(VCDP, globals);
+}

src/renderer/patches/spellCheck.tsx

@@ -0,0 +1,83 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+import { addContextMenuPatch } from "@vencord/types/api/ContextMenu";
+import { findStoreLazy } from "@vencord/types/webpack";
+import { ContextMenu, FluxDispatcher, Menu } from "@vencord/types/webpack/common";
+
+import { addPatch } from "./shared";
+
+let word: string;
+let corrections: string[];
+
+const SpellCheckStore = findStoreLazy("SpellcheckStore");
+
+// Make spellcheck suggestions work
+addPatch({
+    patches: [
+        {
+            find: ".enableSpellCheck)",
+            replacement: {
+                // if (isDesktop) { DiscordNative.onSpellcheck(openMenu(props)) } else { e.preventDefault(); openMenu(props) }
+                match: /else\{(.{1,3})\.preventDefault\(\);(.{1,3}\(.{1,3}\))\}(?<=:(.{1,3})\.enableSpellCheck\).+?)/,
+                // ... else { $self.onSlateContext(() => openMenu(props)) }
+                replace: "else {$self.onSlateContext($1, $3?.enableSpellCheck, () => $2)}"
+            }
+        }
+    ],
+
+    onSlateContext(e: MouseEvent, hasSpellcheck: boolean | undefined, openMenu: () => void) {
+        if (!hasSpellcheck) {
+            e.preventDefault();
+            openMenu();
+            return;
+        }
+
+        const cb = (w: string, c: string[]) => {
+            VencordDesktopNative.spellcheck.offSpellcheckResult(cb);
+            word = w;
+            corrections = c;
+            openMenu();
+        };
+        VencordDesktopNative.spellcheck.onSpellcheckResult(cb);
+    }
+});
+
+addContextMenuPatch("textarea-context", children => () => {
+    const hasCorrections = Boolean(word && corrections?.length);
+
+    children.push(
+        <Menu.MenuGroup>
+            {hasCorrections && (
+                <>
+                    {corrections.map(c => (
+                        <Menu.MenuItem
+                            id={"vcd-spellcheck-suggestion-" + c}
+                            label={c}
+                            action={() => VencordDesktopNative.spellcheck.replaceMisspelling(c)}
+                        />
+                    ))}
+                    <Menu.MenuSeparator />
+                    <Menu.MenuItem
+                        id="vcd-spellcheck-learn"
+                        label={`Add ${word} to dictionary`}
+                        action={() => VencordDesktopNative.spellcheck.addToDictionary(word)}
+                    />
+                </>
+            )}
+            <Menu.MenuCheckboxItem
+                id="vcd-spellcheck-enabled"
+                label="Enable Spellcheck"
+                checked={SpellCheckStore.isEnabled()}
+                action={() => {
+                    FluxDispatcher.dispatch({ type: "SPELLCHECK_TOGGLE" });
+                    // Haven't found a good way to update state, so just close for now 🤷‍♀️
+                    ContextMenu.close();
+                }}
+            />
+        </Menu.MenuGroup>
+    );
+});

src/renderer/utils.ts

@@ -4,7 +4,7 @@
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
-export const localStorage = (window.vcdLS = window.localStorage);
+export const { localStorage } = window;
 
 export const isFirstRun = (() => {
     const key = "VCD_FIRST_RUN";

src/shared/IpcEvents.ts

@@ -27,6 +27,11 @@ export const enum IpcEvents {
     UPDATE_IGNORE = "VCD_UPDATE_IGNORE",
 
     SPELLCHECK_SET_LANGUAGES = "VCD_SPELLCHECK_SET_LANGUAGES",
+    SPELLCHECK_RESULT = "VCD_SPELLCHECK_RESULT",
+    SPELLCHECK_REPLACE_MISSPELLING = "VCD_SPELLCHECK_REPLACE_MISSPELLING",
+    SPELLCHECK_ADD_TO_DICTIONARY = "VCD_SPELLCHECK_ADD_TO_DICTIONARY",
+
+    SET_BADGE_COUNT = "VCD_SET_BADGE_COUNT",
 
     CAPTURER_GET_LARGE_THUMBNAIL = "VCD_CAPTURER_GET_LARGE_THUMBNAIL",
 

src/shared/paths.ts

@@ -7,4 +7,6 @@
 import { join } from "path";
 
 export const STATIC_DIR = /* @__PURE__ */ join(__dirname, "..", "..", "static");
+export const VIEW_DIR = /* @__PURE__ */ join(STATIC_DIR, "views");
+export const BADGE_DIR = /* @__PURE__ */ join(STATIC_DIR, "badges");
 export const ICON_PATH = /* @__PURE__ */ join(STATIC_DIR, "icon.png");

src/shared/settings.d.ts

@@ -19,6 +19,7 @@ export interface Settings {
     skippedUpdate?: string;
     staticTitle?: boolean;
     arRPC?: boolean;
+    appBadge?: boolean;
 
     firstLaunch?: boolean;
 }

src/shared/utils/monkeyPatch.ts

@@ -1,23 +0,0 @@
-/*
- * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2023 Vendicated and Vencord contributors
- */
-
-type Func = (...args: any[]) => any;
-
-export function monkeyPatch<O extends object>(
-    object: O,
-    key: keyof O,
-    replacement: (original: Func, ...args: any[]) => any
-): void {
-    const original = object[key] as Func;
-
-    const replacer = (object[key] = function (this: unknown, ...args: any[]) {
-        return replacement.call(this, original, ...args);
-    } as any);
-
-    Object.defineProperties(replacer, Object.getOwnPropertyDescriptors(original));
-    replacer.toString = () => original.toString();
-    replacer.$$original = original;
-}

src/updater/main.ts

@@ -6,11 +6,11 @@
 
 import { app, BrowserWindow, ipcMain, shell } from "electron";
 import { Settings } from "main/settings";
+import { makeLinksOpenExternally } from "main/utils/makeLinksOpenExternally";
 import { githubGet, ReleaseData } from "main/utils/vencordLoader";
 import { join } from "path";
-import { SplashProps } from "shared/browserWinProperties";
 import { IpcEvents } from "shared/IpcEvents";
-import { STATIC_DIR } from "shared/paths";
+import { VIEW_DIR } from "shared/paths";
 
 export interface UpdateData {
     currentVersion: string;
@@ -79,13 +79,13 @@ export async function checkUpdates() {
 
         const oldVersion = app.getVersion();
         const newVersion = data.tag_name.replace(/^v/, "");
-        if (Settings.store.skippedUpdate !== newVersion && isOutdated(oldVersion, newVersion)) {
-            updateData = {
-                currentVersion: oldVersion,
-                latestVersion: newVersion,
-                release: data
-            };
+        updateData = {
+            currentVersion: oldVersion,
+            latestVersion: newVersion,
+            release: data
+        };
 
+        if (Settings.store.skippedUpdate !== newVersion && isOutdated(oldVersion, newVersion)) {
             openNewUpdateWindow();
         }
     } catch (e) {
@@ -95,11 +95,18 @@ export async function checkUpdates() {
 
 function openNewUpdateWindow() {
     const win = new BrowserWindow({
-        ...SplashProps,
+        width: 500,
+        autoHideMenuBar: true,
+        alwaysOnTop: true,
         webPreferences: {
-            preload: join(__dirname, "updaterPreload.js")
+            preload: join(__dirname, "updaterPreload.js"),
+            nodeIntegration: false,
+            contextIsolation: true,
+            sandbox: true
         }
     });
 
-    win.loadFile(join(STATIC_DIR, "updater.html"));
+    makeLinksOpenExternally(win);
+
+    win.loadFile(join(VIEW_DIR, "updater.html"));
 }

src/updater/preload.ts

@@ -5,7 +5,7 @@
  */
 
 import { contextBridge } from "electron";
-import { invoke } from "preload/typedIpcs";
+import { invoke } from "preload/typedIpc";
 import { IpcEvents } from "shared/IpcEvents";
 
 import type { UpdateData } from "./main";

static/views/about.html

@@ -1,9 +1,9 @@
 <head>
+    <link rel="stylesheet" href="./style.css" type="text/css" />
+
     <style>
         body {
             padding: 2em;
-            font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell,
-                "Open Sans", "Helvetica Neue", sans-serif;
         }
 
         h1 {
@@ -13,7 +13,7 @@
 </head>
 
 <body>
-    <h1>Vencord Desktop %VERSION%</h1>
+    <h1 id="title">Vencord Desktop</h1>
     <p>
         Vencord Desktop is a free/libre cross platform desktop app aiming to give you a snappier Discord experience with
         Vencord pre-installed
@@ -60,3 +60,12 @@
         </ul>
     </section>
 </body>
+
+<script type="module">
+    const data = await Updater.getData();
+    if (data.currentVersion) {
+        const title = document.getElementById("title");
+
+        title.textContent += ` v${data.currentVersion}`;
+    }
+</script>

static/views/first-launch.html

@@ -1,29 +1,10 @@
 <head>
+    <link rel="stylesheet" href="./style.css" type="text/css" />
+
     <style>
-        :root {
-            --bg: white;
-            --fg: black;
-            --fg-secondary: #313338;
-            --fg-semi-trans: rgb(0 0 0 / 0.2);
-            --link: #006ce7;
-        }
-
-        @media (prefers-color-scheme: dark) {
-            :root {
-                --bg: hsl(223 6.7% 20.6%);
-                --fg: white;
-                --fg-secondary: #b5bac1;
-                --fg-semi-trans: rgb(255 255 255 / 0.2);
-                --link: #00a8fc;
-            }
-        }
-
         body {
             height: 100vh;
 
-            font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell,
-                "Open Sans", "Helvetica Neue", sans-serif;
-            margin: 0;
             padding: 1.5em;
             padding-bottom: 1em;
 
@@ -34,13 +15,9 @@
             box-sizing: border-box;
         }
 
-        body,
         select {
             background: var(--bg);
             color: var(--fg);
-        }
-
-        select {
             padding: 0.3em;
             margin: -0.3em;
             border-radius: 6px;
@@ -54,10 +31,6 @@
             margin: 1em 0 2em;
         }
 
-        a {
-            color: var(--link);
-        }
-
         form {
             display: grid;
             gap: 1em;
@@ -155,7 +128,10 @@
         <label>
             <div>
                 <h2>Rich Presence</h2>
-                <span>Enable Rich presence (game activity) via arRPC</span>
+                <span
+                    >Enable Rich presence (game activity) via
+                    <a href="https://github.com/OpenAsar/arrpc" target="_blank">arRPC</a></span
+                >
             </div>
             <input type="checkbox" name="richPresence" checked />
         </label>

static/views/splash.html

@@ -1,16 +1,11 @@
 <head>
+    <link rel="stylesheet" href="./style.css" type="text/css" />
+
     <style>
         * {
             user-select: none;
         }
 
-        body {
-            font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell,
-                "Open Sans", "Helvetica Neue", sans-serif;
-            margin: 0;
-            padding: 0;
-        }
-
         .wrapper {
             box-sizing: border-box;
             height: 100%;
@@ -18,13 +13,11 @@
             flex-direction: column;
             justify-content: center;
             align-items: center;
-            background-color: hsl(223 6.7% 20.6%);
             border-radius: 8px;
-            border: 1px solid hsl(220 6.5% 18%);
+            border: 1px solid var(--fg-semi-trans);
         }
 
         p {
-            color: rgb(219, 222, 225);
             text-align: center;
         }
 

static/views/style.css

@@ -0,0 +1,30 @@
+:root {
+    --bg: white;
+    --fg: black;
+    --fg-secondary: #313338;
+    --fg-semi-trans: rgb(0 0 0 / 0.2);
+    --link: #006ce7;
+}
+
+@media (prefers-color-scheme: dark) {
+    :root {
+        --bg: hsl(223 6.7% 20.6%);
+        --fg: white;
+        --fg-secondary: #b5bac1;
+        --fg-semi-trans: rgb(255 255 255 / 0.2);
+        --link: #00a8fc;
+    }
+}
+
+body {
+    font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell,
+        "Open Sans", "Helvetica Neue", sans-serif;
+    margin: 0;
+    padding: 0;
+    background: var(--bg);
+    color: var(--fg);
+}
+
+a {
+    color: var(--link);
+}

static/views/updater.html

@@ -1,22 +1,13 @@
 <head>
-    <style>
-        body {
-            font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell,
-                "Open Sans", "Helvetica Neue", sans-serif;
-            margin: 0;
-            padding: 0;
-            color: rgb(219, 222, 225);
-        }
+    <link rel="stylesheet" href="./style.css" type="text/css" />
 
+    <style>
         .wrapper {
             display: flex;
             flex-direction: column;
             justify-content: space-between;
             box-sizing: border-box;
-            height: 100%;
-            background-color: #313338;
-            border-radius: 8px;
-            border: 1px solid #248046;
+            min-height: 100%;
             padding: 1em;
         }
 
@@ -34,7 +25,7 @@
         button {
             cursor: pointer;
             padding: 0.5em;
-            color: white;
+            color: var(--fg);
             border: none;
             border-radius: 3px;
             font-weight: bold;
@@ -66,6 +57,9 @@
                 <br />
                 Latest: <span id="latest"></span>
             </p>
+
+            <h2>Changelog</h2>
+            <p id="changelog">Loading...</p>
         </section>
 
         <section>
@@ -113,3 +107,17 @@
         });
     }
 </script>
+
+<script type="module">
+    import { micromark } from "https://esm.sh/micromark@3?bundle";
+    import { gfm, gfmHtml } from "https://esm.sh/micromark-extension-gfm@2?bundle";
+
+    const changelog = (await Updater.getData()).release.body;
+    if (changelog)
+        document.getElementById("changelog").innerHTML = micromark(changelog, {
+            extensions: [gfm()],
+            htmlExtensions: [gfmHtml()]
+        })
+            .replace(/h1>/g, "h3>")
+            .replace(/<a /g, '<a target="_blank" ');
+</script>