i hate workflows

.github/workflows/release.yml

@@ -1,6 +1,9 @@
-name: Build/release
+name: Release
 
-on: push
+on:
+  push:
+    tags:
+      - v*
 
 jobs:
   release:
@@ -22,4 +25,4 @@ jobs:
         uses: samuelmeuli/action-electron-builder@e4b12cd06ddf023422f1ac4e39632bd76f6e6928
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RELEASE: ${{ startsWith(github.ref, 'refs/tags/v') }}
+          RELEASE: true

package.json

@@ -1,21 +1,21 @@
 {
     "name": "VencordDesktop",
+    "version": "0.1.3",
     "private": true,
-    "version": "0.1.2",
     "description": "",
+    "keywords": [],
+    "license": "GPL-3.0",
+    "author": "Vendicated <vendicated@riseup.net>",
     "main": "dist/js/main.js",
     "scripts": {
         "build": "tsx scripts/build.mts",
-        "watch": "pnpm build --watch",
         "package": "pnpm build && electron-builder",
         "package:dir": "pnpm build && electron-builder --dir",
         "start": "pnpm build && electron .",
         "start:watch": "tsx scripts/startWatch.mts",
-        "test": "echo \"Error: no test specified\" && exit 1"
+        "test": "echo \"Error: no test specified\" && exit 1",
+        "watch": "pnpm build --watch"
     },
-    "keywords": [],
-    "author": "Vendicated <vendicated@riseup.net>",
-    "license": "GPL-3.0",
     "devDependencies": {
         "@types/node": "^18.15.11",
         "electron": "^23.2.0",
@@ -26,15 +26,13 @@
     },
     "build": {
         "appId": "dev.vencord.desktop",
-        "productName": "Vencord Desktop",
-        "mac": {
-            "category": "Network"
-        },
-        "nsis": {
-            "include": "build/installer.nsh",
-            "oneClick": false,
-            "allowToChangeInstallationDirectory": true
-        },
+        "files": [
+            "!*",
+            "dist/js",
+            "static",
+            "package.json",
+            "LICENSE"
+        ],
         "linux": {
             "category": "Network",
             "maintainer": "vendicated+vencord-desktop@riseup.net",
@@ -45,12 +43,14 @@
                 "AppImage"
             ]
         },
-        "files": [
-            "!*",
-            "dist/js",
-            "static",
-            "package.json",
-            "LICENSE"
-        ]
+        "mac": {
+            "category": "Network"
+        },
+        "nsis": {
+            "allowToChangeInstallationDirectory": true,
+            "include": "build/installer.nsh",
+            "oneClick": false
+        },
+        "productName": "Vencord Desktop"
     }
 }

src/globals.d.ts

@@ -0,0 +1,8 @@
+declare global {
+    export var VencordDesktop: typeof import("./preload/VencordDesktop").VencordDesktop;
+    // TODO
+    export var Vencord: any;
+    export var vcdLS: typeof localStorage;
+}
+
+export { };

src/main/about.ts

@@ -0,0 +1,18 @@
+import { BrowserWindow } from "electron";
+import { join } from "path";
+import { ICON_PATH, STATIC_DIR } from "shared/paths";
+import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
+
+export function createAboutWindow() {
+    const about = new BrowserWindow({
+        center: true,
+        autoHideMenuBar: true,
+        icon: ICON_PATH
+    });
+
+    makeLinksOpenExternally(about);
+
+    about.loadFile(join(STATIC_DIR, "about.html"));
+
+    return about;
+}

src/main/constants.ts

@@ -3,5 +3,8 @@ import { join } from "path";
 
 export const DATA_DIR = process.env.VENCORD_USER_DATA_DIR ?? join(app.getPath("userData"), "VencordDesktop");
 export const VENCORD_FILES_DIR = join(DATA_DIR, "vencordDist");
+export const VENCORD_SETTINGS_DIR = join(DATA_DIR, "settings");
+export const VENCORD_QUICKCSS_FILE = join(VENCORD_SETTINGS_DIR, "quickCss.css");
+export const VENCORD_SETTINGS_FILE = join(VENCORD_SETTINGS_DIR, "settings.json");
 
 export const USER_AGENT = `VencordDesktop/${app.getVersion()} (https://github.com/Vencord/Electron)`;

src/main/ipc.ts

@@ -1,8 +1,11 @@
 import { app, ipcMain, shell } from "electron";
-import { readFileSync } from "fs";
+import { readFileSync, watch } from "fs";
+import { open, readFile } from "fs/promises";
 import { join } from "path";
-import { GET_RENDERER_SCRIPT, GET_SETTINGS, GET_VENCORD_PRELOAD_FILE, RELAUNCH, SET_SETTINGS, SHOW_IN_FOLDER } from "../shared/IpcEvents";
-import { VENCORD_FILES_DIR } from "./constants";
+import { debounce } from "shared/utils/debounce";
+import { FOCUS, GET_RENDERER_SCRIPT, GET_RENDERER_STYLES, GET_SETTINGS, GET_VENCORD_PRELOAD_FILE, RELAUNCH, SET_SETTINGS, SHOW_ITEM_IN_FOLDER } from "../shared/IpcEvents";
+import { VENCORD_FILES_DIR, VENCORD_QUICKCSS_FILE } from "./constants";
+import { mainWin } from "./mainWindow";
 import { PlainSettings, setSettings } from "./settings";
 
 ipcMain.on(GET_VENCORD_PRELOAD_FILE, e => {
@@ -13,6 +16,8 @@ ipcMain.on(GET_RENDERER_SCRIPT, e => {
     e.returnValue = readFileSync(join(__dirname, "renderer.js"), "utf-8");
 });
 
+ipcMain.handle(GET_RENDERER_STYLES, () => readFile(join(__dirname, "renderer.css"), "utf-8"));
+
 ipcMain.on(GET_SETTINGS, e => {
     e.returnValue = PlainSettings;
 });
@@ -26,6 +31,21 @@ ipcMain.handle(RELAUNCH, () => {
     app.exit();
 });
 
-ipcMain.handle(SHOW_IN_FOLDER, (_, path) => {
+ipcMain.handle(SHOW_ITEM_IN_FOLDER, (_, path) => {
     shell.showItemInFolder(path);
 });
+
+ipcMain.handle(FOCUS, () => {
+    mainWin?.focus();
+});
+
+function readCss() {
+    return readFile(VENCORD_QUICKCSS_FILE, "utf-8").catch(() => "");
+}
+
+open(VENCORD_QUICKCSS_FILE, "a+").then(fd => {
+    fd.close();
+    watch(VENCORD_QUICKCSS_FILE, { persistent: false }, debounce(async () => {
+        mainWin?.webContents.postMessage("VencordQuickCssUpdate", await readCss());
+    }, 50));
+});

src/main/mainWindow.ts

@@ -1,7 +1,10 @@
-import { BrowserWindow, BrowserWindowConstructorOptions, Menu, Tray, app, shell } from "electron";
+import { BrowserWindow, BrowserWindowConstructorOptions, Menu, Tray, app } from "electron";
 import { join } from "path";
 import { ICON_PATH } from "../shared/paths";
+import { createAboutWindow } from "./about";
 import { Settings } from "./settings";
+import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
+import { downloadVencordFiles } from "./utils/vencordLoader";
 
 let isQuitting = false;
 
@@ -9,32 +12,7 @@ app.on("before-quit", () => {
     isQuitting = true;
 });
 
-function initWindowOpenHandler(win: BrowserWindow) {
-    win.webContents.setWindowOpenHandler(({ url }) => {
-        switch (url) {
-            case "about:blank":
-            case "https://discord.com/popout":
-                return { action: "allow" };
-        }
-
-        try {
-            var protocol = new URL(url).protocol;
-        } catch {
-            return { action: "deny" };
-        }
-
-        switch (protocol) {
-            case "http:":
-            case "https:":
-            case "mailto:":
-            case "steam:":
-            case "spotify:":
-                shell.openExternal(url);
-        }
-
-        return { action: "deny" };
-    });
-}
+export let mainWin: BrowserWindow;
 
 function initTray(win: BrowserWindow) {
     const trayMenu = Menu.buildFromTemplate([
@@ -45,6 +23,28 @@ function initTray(win: BrowserWindow) {
             },
             enabled: false
         },
+        {
+            label: "About",
+            click: createAboutWindow
+        },
+        {
+            label: "Update Vencord",
+            async click() {
+                await downloadVencordFiles();
+                app.relaunch();
+                app.quit();
+            }
+        },
+        {
+            type: "separator"
+        },
+        {
+            label: "Relaunch",
+            click() {
+                app.relaunch();
+                app.quit();
+            }
+        },
         {
             label: "Quit Vencord Desktop",
             click() {
@@ -68,6 +68,103 @@ function initTray(win: BrowserWindow) {
     });
 }
 
+function initMenuBar(win: BrowserWindow) {
+    console.log(process.platform);
+    const menu = Menu.buildFromTemplate([
+        {
+            label: "Vencord Desktop",
+            submenu: [
+                {
+                    label: "About Vencord Desktop",
+                    click: createAboutWindow
+                },
+                {
+                    label: "Force Update Vencord",
+                    async click() {
+                        await downloadVencordFiles();
+                        app.relaunch();
+                        app.quit();
+                    },
+                    toolTip: "Vencord Desktop will automatically restart after this operation"
+                },
+                {
+                    label: "Toggle Developer Tools",
+                    accelerator: "CmdOrCtrl+Shift+I",
+                    click() {
+                        BrowserWindow.getFocusedWindow()!.webContents.toggleDevTools();
+                    }
+                },
+                {
+                    label: "Toggle Developer Tools (Hidden)",
+                    accelerator: "F12",
+                    visible: false,
+                    click() {
+                        BrowserWindow.getFocusedWindow()!.webContents.toggleDevTools();
+                    }
+                },
+                {
+                    label: "Reload Window",
+                    accelerator: "CmdOrCtrl+R",
+                    click() {
+                        BrowserWindow.getFocusedWindow()!.webContents.reload();
+                    }
+                },
+                {
+                    label: "Relaunch",
+                    accelerator: "CmdOrCtrl+Shift+R",
+                    click() {
+                        app.relaunch();
+                        app.quit();
+                    }
+                },
+                {
+                    label: "Quit",
+                    accelerator: process.platform === "win32" ? void 0 : "CmdOrCtrl+Q",
+                    // TODO: Setting
+                    visible: process.platform !== "win32",
+                    click() {
+                        app.quit();
+                    }
+                },
+                {
+                    label: "Quit",
+                    accelerator: "Alt+F4",
+                    visible: process.platform === "win32",
+                    acceleratorWorksWhenHidden: false,
+                    click() {
+                        app.quit();
+                    }
+                }
+            ]
+        },
+        {
+            label: "Zoom",
+            submenu: [
+                {
+                    label: "Zoom in",
+                    accelerator: "CmdOrCtrl+Plus",
+                    role: "zoomIn"
+                },
+                // Fix for zoom in on keyboards with dedicated + like QWERTZ (or numpad)
+                // See https://github.com/electron/electron/issues/14742 and https://github.com/electron/electron/issues/5256
+                {
+                    label: "Zoom in",
+                    accelerator: "CmdOrCtrl+=",
+                    role: "zoomIn",
+                    visible: false
+                },
+                {
+                    label: "Zoom out",
+                    accelerator: "CmdOrCtrl+-",
+                    role: "zoomOut"
+                }
+            ]
+        }
+    ]);
+
+    Menu.setApplicationMenu(menu);
+}
+
 function getWindowBoundsOptions() {
     const options = {} as BrowserWindowConstructorOptions;
 
@@ -115,7 +212,7 @@ function initWindowBoundsListeners(win: BrowserWindow) {
 }
 
 export function createMainWindow() {
-    const win = new BrowserWindow({
+    const win = mainWin = new BrowserWindow({
         show: false,
         autoHideMenuBar: true,
         webPreferences: {
@@ -140,7 +237,8 @@ export function createMainWindow() {
 
     initWindowBoundsListeners(win);
     initTray(win);
-    initWindowOpenHandler(win);
+    initMenuBar(win);
+    makeLinksOpenExternally(win);
 
     const subdomain = Settings.discordBranch === "canary" || Settings.discordBranch === "ptb"
         ? `${Settings.discordBranch}.`

src/main/settings.ts

@@ -13,7 +13,8 @@ interface Settings {
         width: number;
         height: number;
     };
-    discordBranch: "stable" | "canary" | "ptb";
+    discordBranch?: "stable" | "canary" | "ptb";
+    openLinksWithElectron?: boolean;
 }
 
 export let PlainSettings = {} as Settings;

src/main/splash.ts

@@ -1,5 +1,6 @@
 import { BrowserWindow } from "electron";
 import { join } from "path";
+import { STATIC_DIR } from "shared/paths";
 
 export function createSplashWindow() {
     const splash = new BrowserWindow({
@@ -12,7 +13,7 @@ export function createSplashWindow() {
         maximizable: false
     });
 
-    splash.loadFile(join(__dirname, "..", "..", "static", "splash.html"));
+    splash.loadFile(join(STATIC_DIR, "splash.html"));
 
     return splash;
 }

src/main/utils/makeLinksOpenExternally.ts

@@ -0,0 +1,32 @@
+import { BrowserWindow, shell } from "electron";
+import { Settings } from "../settings";
+
+export function makeLinksOpenExternally(win: BrowserWindow) {
+    win.webContents.setWindowOpenHandler(({ url }) => {
+        switch (url) {
+            case "about:blank":
+            case "https://discord.com/popout":
+                return { action: "allow" };
+        }
+
+        try {
+            var protocol = new URL(url).protocol;
+        } catch {
+            return { action: "deny" };
+        }
+
+        switch (protocol) {
+            case "http:":
+            case "https:":
+                if (Settings.openLinksWithElectron) {
+                    return { action: "allow" };
+                }
+            case "mailto:":
+            case "steam:":
+            case "spotify:":
+                shell.openExternal(url);
+        }
+
+        return { action: "deny" };
+    });
+}

src/preload/VencordDesktop.ts

@@ -1,17 +1,20 @@
 import { ipcRenderer } from "electron";
 import type { Settings } from "../main/settings";
-import { GET_SETTINGS, RELAUNCH, SET_SETTINGS, SHOW_IN_FOLDER } from "../shared/IpcEvents";
+import { FOCUS, GET_SETTINGS, RELAUNCH, SET_SETTINGS, SHOW_ITEM_IN_FOLDER } from "../shared/IpcEvents";
 
 export const VencordDesktop = {
     app: {
         relaunch: () => ipcRenderer.invoke(RELAUNCH)
     },
-    files: {
-        showInFolder: (path: string) => ipcRenderer.invoke(SHOW_IN_FOLDER, path)
+    fileManager: {
+        showItemInFolder: (path: string) => ipcRenderer.invoke(SHOW_ITEM_IN_FOLDER, path)
     },
     settings: {
         get: () => ipcRenderer.sendSync(GET_SETTINGS),
         set: (settings: typeof Settings) => ipcRenderer.invoke(SET_SETTINGS, settings)
+    },
+    win: {
+        focus: () => ipcRenderer.invoke(FOCUS)
     }
 }
 

src/preload/index.ts

@@ -1,5 +1,5 @@
 import { contextBridge, ipcRenderer, webFrame } from "electron";
-import { GET_RENDERER_SCRIPT, GET_VENCORD_PRELOAD_FILE } from "../shared/IpcEvents";
+import { GET_RENDERER_SCRIPT, GET_RENDERER_STYLES, GET_VENCORD_PRELOAD_FILE } from "../shared/IpcEvents";
 import { VencordDesktop } from "./VencordDesktop";
 
 contextBridge.exposeInMainWorld("VencordDesktop", VencordDesktop);
@@ -7,3 +7,4 @@ contextBridge.exposeInMainWorld("VencordDesktop", VencordDesktop);
 require(ipcRenderer.sendSync(GET_VENCORD_PRELOAD_FILE));
 
 webFrame.executeJavaScript(ipcRenderer.sendSync(GET_RENDERER_SCRIPT));
+ipcRenderer.invoke(GET_RENDERER_STYLES).then(s => webFrame.insertCSS(s));

src/renderer/fixes.ts

@@ -0,0 +1,24 @@
+import "./hideGarbage.css";
+import { isFirstRun, localStorage } from "./utils";
+
+// Make clicking Notifications focus the window
+const originalSetOnClick = Object.getOwnPropertyDescriptor(Notification.prototype, "onclick")!.set!;
+Object.defineProperty(Notification.prototype, "onclick", {
+    set(onClick) {
+        originalSetOnClick.call(this, function (this: unknown) {
+            onClick.apply(this, arguments);
+            VencordDesktop.win.focus();
+        });
+    },
+    configurable: true
+});
+
+// Enable Desktop Notifications by default
+if (isFirstRun) {
+    // Hide "Download Discord Desktop now!!!!" banner
+    localStorage.setItem("hideNag", "true");
+
+    Vencord.Webpack.waitFor("setDesktopType", m => {
+        m.setDesktopType("all");
+    });
+}

src/renderer/hideGarbage.css

@@ -0,0 +1,5 @@
+/* Download Desktop button in guilds list */
+[class|=listItem]:has([data-list-item-id=guildsnav___app-download-button]),
+[class|=listItem]:has(+ [class|=listItem] [data-list-item-id=guildsnav___app-download-button]) {
+    display: none;
+}

src/renderer/index.ts

@@ -1 +1,3 @@
+import "./fixes";
+
 console.log("read if cute :3");

src/renderer/utils.ts

@@ -0,0 +1,8 @@
+export const localStorage = window.vcdLS = window.localStorage;
+
+export const isFirstRun = (() => {
+    const key = "VCD_FIRST_RUN";
+    if (localStorage.getItem(key) !== null) return false;
+    localStorage.setItem(key, "false");
+    return true;
+})();

src/shared/IpcEvents.ts

@@ -1,6 +1,10 @@
 export const GET_VENCORD_PRELOAD_FILE = "VCD_GET_VC_PRELOAD_FILE";
 export const GET_RENDERER_SCRIPT = "VCD_GET_RENDERER_SCRIPT";
+export const GET_RENDERER_STYLES = "VCD_GET_RENDERER_STYLES";
+
 export const RELAUNCH = "VCD_RELAUNCH";
-export const SHOW_IN_FOLDER = "VCD_SHOW_IN_FOLDER";
+export const FOCUS = "VC_FOCUS";
+
+export const SHOW_ITEM_IN_FOLDER = "VCD_SHOW_ITEM_IN_FOLDER";
 export const GET_SETTINGS = "VCD_GET_SETTINGS";
 export const SET_SETTINGS = "VCD_SET_SETTINGS";

src/shared/utils/debounce.ts

@@ -0,0 +1,7 @@
+export function debounce<T extends Function>(func: T, delay = 300): T {
+    let timeout: NodeJS.Timeout;
+    return function (...args: any[]) {
+        clearTimeout(timeout);
+        timeout = setTimeout(() => { func(...args); }, delay);
+    } as any;
+}

static/about.html

@@ -0,0 +1,34 @@
+<head>
+    <style>
+        body {
+            padding: 2em;
+            font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell,
+                "Open Sans", "Helvetica Neue", sans-serif;
+        }
+
+        h1 {
+            text-align: center;
+        }
+    </style>
+</head>
+
+<body>
+    <h1>About 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
+    </p>
+
+    <h2>Links</h2>
+    <ul>
+        <li>
+            <a href="https://vencord.dev">Vencord Website</a>
+        </li>
+        <li>
+            <a href="https://github.com/Vencord/Desktop" target="_blank">Source Code</a>
+        </li>
+        <li>
+            <a href="https://github.com/Vencord/Desktop/issues" target="_blank">Report bugs / Request features</a>
+        </li>
+    </ul>
+</body>

tsconfig.json

@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "allowSyntheticDefaultImports": true,
+        "esModuleInterop": true,
+        "lib": ["DOM", "DOM.Iterable", "esnext", "esnext.array", "esnext.asynciterable", "esnext.symbol"],
+        "module": "commonjs",
+        "moduleResolution": "node",
+        "strict": true,
+        "noImplicitAny": false,
+        "target": "ESNEXT",
+        "jsx": "preserve",
+
+        "baseUrl": "./src/"
+    },
+    "include": ["src/**/*"]
+}