Merge branch 'main' into macos-standard-icons

Vencord · Jul 27, 2023 · 6941758 · 6941758
2 parents de792d1 + a95f7f8
commit 6941758
Show file tree

Hide file tree

Showing 56 changed files with 336 additions and 169 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -20,5 +20,6 @@
     },
     "[jsonc]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
-    }
+    },
+    "cSpell.words": ["Vesktop"]
 }
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# Vencord Desktop
+# Vesktop
 
-Vencord Desktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
+Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
 
 **Not yet supported**:
 - Global Keybinds
@@ -13,11 +13,11 @@ Bug reports, feature requests & contributions are highly appreciated!!
 
 ### Windows
 
-Download and run Vencord-Desktop-Setup-VERSION.exe from [releases](https://github.com/Vencord/Desktop/releases/latest)
+Download and run Vesktop-Setup-VERSION.exe from [releases](https://github.com/Vencord/Vesktop/releases/latest)
 
 ### Mac
 
-Download and run Vencord-Desktop-VERSION.dmg from [releases](https://github.com/Vencord/Desktop/releases/latest)
+Download and run Vesktop-VERSION.dmg from [releases](https://github.com/Vencord/Vesktop/releases/latest)
 
 ### Linux
 
@@ -27,15 +27,15 @@ Install [vencord-desktop-git](https://aur.archlinux.org/packages/vencord-desktop
 
 #### Ubuntu/Debian based
 
-Download Vencord-Desktop-VERSION.deb from [releases](https://github.com/Vencord/Desktop/releases/latest)
+Download Vesktop-VERSION.deb from [releases](https://github.com/Vencord/Vesktop/releases/latest)
 
 #### Fedora/RHEL based
 
-Download Vencord-Desktop-VERSION.rpm from [releases](https://github.com/Vencord/Desktop/releases/latest)
+Download Vesktop-VERSION.rpm from [releases](https://github.com/Vencord/Vesktop/releases/latest)
 
 #### Other
 
-Either download Vencord-Desktop-VERSION.AppImage and just run it directly or grab Vencord-Desktop-VERSION.tar.gz, extract it somewhere and run `vencorddesktop`.
+Either download Vesktop-VERSION.AppImage and just run it directly or grab Vesktop-VERSION.tar.gz, extract it somewhere and run `vencorddesktop`.
 
 A flatpak is planned, if you want packages for other repos, feel free to create them and they can be linked as unofficial here
 
@@ -44,8 +44,8 @@ A flatpak is planned, if you want packages for other repos, feel free to create
 Packaging will create builds in the dist/ folder. You can then install them like mentioned above or distribute them
 
 ```sh
-git clone https://github.com/Vencord/Desktop
-cd Desktop
+git clone https://github.com/Vencord/Vesktop
+cd Vesktop
 
 # Install Dependencies
 pnpm i

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "VencordDesktop",
-    "version": "0.2.6",
+    "version": "0.2.7",
     "private": true,
     "description": "",
     "keywords": [],
@@ -57,7 +57,7 @@
     },
     "build": {
         "appId": "dev.vencord.desktop",
-        "productName": "Vencord Desktop",
+        "productName": "Vesktop",
         "files": [
             "!*",
             "dist/js",
@@ -67,15 +67,15 @@
         ],
         "linux": {
             "category": "Network",
-            "maintainer": "vendicated+vencord-desktop@riseup.net",
+            "maintainer": "vendicated+vesktop@riseup.net",
             "target": [
                 "deb",
                 "tar.gz",
                 "rpm",
                 "AppImage"
             ],
             "desktop": {
-                "Name": "Vencord Desktop",
+                "Name": "Vesktop",
                 "GenericName": "Internet Messenger",
                 "Type": "Application",
                 "Categories": "Network;InstantMessaging;Chat;",

diff --git a/scripts/build/build.mts b/scripts/build/build.mts
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
@@ -54,7 +54,7 @@ await Promise.all([
     }),
     createContext({
         ...CommonOpts,
-        globalName: "VencordDesktop",
+        globalName: "Vesktop",
         entryPoints: ["src/renderer/index.ts"],
         outfile: "dist/js/renderer.js",
         format: "iife",
@@ -65,7 +65,11 @@ await Promise.all([
         tsconfig: "./scripts/build/tsconfig.esbuild.json",
         external: ["@vencord/types/*"],
         plugins: [vencordDep],
-        footer: { js: "//# sourceURL=VCDRenderer" }
+        // TODO: remove legacy name once main Vencord codebase has migrated and some time has passed.
+        // this 0 is very important. we run this script via webFrame.executeJavaScript and the last
+        // expression will be the return value. Without the 0, the return value would be Vesktop which
+        // leads to "An object could not be cloned"
+        footer: { js: ";window.VencordDesktop=Vesktop;0 \n//# sourceURL=VCDRenderer" }
     })
 ]);
 

diff --git a/scripts/build/injectReact.mjs b/scripts/build/injectReact.mjs
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

diff --git a/scripts/build/vencordDep.mts b/scripts/build/vencordDep.mts
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

diff --git a/scripts/header.txt b/scripts/header.txt
@@ -1,5 +1,5 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
diff --git a/scripts/start.ts b/scripts/start.ts
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

diff --git a/scripts/startWatch.mts b/scripts/startWatch.mts
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

diff --git a/scripts/utils/dotenv.ts b/scripts/utils/dotenv.ts
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

diff --git a/scripts/utils/spawn.mts b/scripts/utils/spawn.mts
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

diff --git a/src/globals.d.ts b/src/globals.d.ts
@@ -1,12 +1,12 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 declare global {
-    export var VencordDesktopNative: typeof import("preload/VencordDesktopNative").VencordDesktopNative;
-    export var VencordDesktop: typeof import("renderer/index");
+    export var VesktopNative: typeof import("preload/VesktopNative").VesktopNative;
+    export var Vesktop: typeof import("renderer/index");
     export var VCDP: any;
 
     export var IS_DEV: boolean;

diff --git a/src/main/about.ts b/src/main/about.ts
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

diff --git a/src/main/appBadge.ts b/src/main/appBadge.ts
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

diff --git a/src/main/arrpc.ts b/src/main/arrpc.ts
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
@@ -29,7 +29,7 @@ export async function initArRPC() {
             mainWin.webContents
                 // Safety: Result of JSON.stringify should always be safe to equal
                 // Also, just to be super super safe, invite is regex validated above
-                .executeJavaScript(`VencordDesktop.openInviteModal(${JSON.stringify(invite)})`)
+                .executeJavaScript(`Vesktop.openInviteModal(${JSON.stringify(invite)})`)
                 .then(callback);
         });
     } catch (e) {

diff --git a/src/main/autoStart.ts b/src/main/autoStart.ts
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

diff --git a/src/main/constants.ts b/src/main/constants.ts
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
@@ -17,7 +17,7 @@ export const VENCORD_SETTINGS_FILE = join(VENCORD_SETTINGS_DIR, "settings.json")
 export const VENCORD_FILES_DIR =
     (require("./settings") as typeof import("./settings")).Settings.store.vencordDir || join(DATA_DIR, "vencordDist");
 
-export const USER_AGENT = `VencordDesktop/${app.getVersion()} (https://github.com/Vencord/Desktop)`;
+export const USER_AGENT = `Vesktop/${app.getVersion()} (https://github.com/Vencord/Vesktop)`;
 
 // dimensions shamelessly stolen from Discord Desktop :3
 export const MIN_WIDTH = 940;

diff --git a/src/main/firstLaunch.ts b/src/main/firstLaunch.ts
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

diff --git a/src/main/index.ts b/src/main/index.ts
@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
@@ -59,10 +59,10 @@ function init() {
 
 if (!app.requestSingleInstanceLock({ IS_DEV })) {
     if (IS_DEV) {
-        console.log("Vencord Desktop is already running. Quitting previous instance...");
+        console.log("Vesktop is already running. Quitting previous instance...");
         init();
     } else {
-        console.log("Vencord Desktop is already running. Quitting...");
+        console.log("Vesktop is already running. Quitting...");
         app.quit();
     }
 } else {

diff --git a/src/main/ipc.ts b/src/main/ipc.ts
@@ -1,12 +1,13 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 import { app, dialog, ipcMain, session, shell } from "electron";
 import { existsSync, readFileSync, watch } from "fs";
 import { open, readFile } from "fs/promises";
+import { release } from "os";
 import { join } from "path";
 import { debounce } from "shared/utils/debounce";
 
@@ -41,6 +42,10 @@ ipcMain.on(IpcEvents.GET_VERSION, e => {
     e.returnValue = app.getVersion();
 });
 
+ipcMain.on(IpcEvents.SUPPORTS_WINDOWS_TRANSPARENCY, e => {
+    e.returnValue = process.platform === "win32" && Number(release().split(".").pop()) >= 22621;
+});
+
 ipcMain.on(IpcEvents.AUTOSTART_ENABLED, e => {
     e.returnValue = autoStart.isEnabled();
 });