From 210ddbae061857b9979e32afc0ad049bd3a85bce Mon Sep 17 00:00:00 2001 From: V Date: Thu, 13 Jul 2023 19:03:13 +0200 Subject: [PATCH] Rename to Vesktop (#57) --- .vscode/settings.json | 3 ++- README.md | 18 +++++++------- package.json | 6 ++--- scripts/build/build.mts | 10 +++++--- scripts/build/injectReact.mjs | 2 +- scripts/build/vencordDep.mts | 2 +- scripts/header.txt | 2 +- scripts/start.ts | 2 +- scripts/startWatch.mts | 2 +- scripts/utils/dotenv.ts | 2 +- scripts/utils/spawn.mts | 2 +- src/globals.d.ts | 6 ++--- src/main/about.ts | 2 +- src/main/appBadge.ts | 2 +- src/main/arrpc.ts | 4 ++-- src/main/autoStart.ts | 2 +- src/main/constants.ts | 4 ++-- src/main/firstLaunch.ts | 2 +- src/main/index.ts | 6 ++--- src/main/ipc.ts | 2 +- src/main/mainWindow.ts | 12 +++++----- src/main/screenShare.ts | 4 ++-- src/main/settings.ts | 4 ++-- src/main/splash.ts | 2 +- src/main/utils/http.ts | 2 +- src/main/utils/makeLinksOpenExternally.ts | 2 +- src/main/utils/vencordLoader.ts | 2 +- ...ncordDesktopNative.ts => VesktopNative.ts} | 4 ++-- src/preload/index.ts | 10 ++++---- src/preload/typedIpc.ts | 2 +- src/renderer/appBadge.ts | 4 ++-- src/renderer/components/ScreenSharePicker.tsx | 4 ++-- src/renderer/components/Settings.tsx | 24 +++++++++---------- src/renderer/components/index.ts | 2 +- src/renderer/fixes.ts | 4 ++-- src/renderer/index.ts | 4 ++-- src/renderer/patches/index.ts | 2 +- src/renderer/patches/shared.ts | 4 ++-- src/renderer/patches/spellCheck.tsx | 10 ++++---- src/renderer/settings.ts | 6 ++--- src/renderer/utils.ts | 2 +- src/shared/IpcEvents.ts | 2 +- src/shared/browserWinProperties.ts | 2 +- src/shared/paths.ts | 2 +- src/shared/settings.d.ts | 2 +- src/shared/utils/SettingsStore.ts | 2 +- src/shared/utils/debounce.ts | 2 +- src/shared/utils/guards.ts | 2 +- src/shared/utils/once.ts | 2 +- src/updater/main.ts | 4 ++-- src/updater/preload.ts | 2 +- static/views/about.html | 14 +++++------ static/views/first-launch.html | 4 ++-- static/views/splash.html | 2 +- static/views/updater.html | 2 +- 55 files changed, 121 insertions(+), 114 deletions(-) rename src/preload/{VencordDesktopNative.ts => VesktopNative.ts} (95%) diff --git a/.vscode/settings.json b/.vscode/settings.json index 53b335c..e729f08 100644 --- 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 index d8c10a4..870a435 100644 --- 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 index 0e204d9..6486de4 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ }, "build": { "appId": "dev.vencord.desktop", - "productName": "Vencord Desktop", + "productName": "Vesktop", "files": [ "!*", "dist/js", @@ -67,7 +67,7 @@ ], "linux": { "category": "Network", - "maintainer": "vendicated+vencord-desktop@riseup.net", + "maintainer": "vendicated+vesktop@riseup.net", "target": [ "deb", "tar.gz", @@ -75,7 +75,7 @@ "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 index 5d2e0ee..f210919 100644 --- 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 index 0f1bba2..f9ce52b 100644 --- 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 index d0c87ce..d285940 100644 --- 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 index 568e18a..9fdad8f 100644 --- 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 index c2cc154..afe3f75 100644 --- 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 index 1f72443..4a6f2e5 100644 --- 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 index 73afb64..1dd697f 100644 --- 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 index 2d2f2a9..a2c0a5f 100644 --- 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 index d05fe1b..4d39c4c 100644 --- 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 index 84ac4ad..4d9f541 100644 --- 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 index 2887498..0167600 100644 --- 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 index 16194d4..e0fd023 100644 --- 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 index 1a31b07..fbbc30e 100644 --- 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 index c53a758..8c30b03 100644 --- 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 index b91784e..b65b930 100644 --- 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 index 1461714..1d16094 100644 --- 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 */ @@ -61,10 +61,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 index c92d905..10181d2 100644 --- a/src/main/ipc.ts +++ b/src/main/ipc.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/mainWindow.ts b/src/main/mainWindow.ts index cd2c9b6..efe51c8 100644 --- a/src/main/mainWindow.ts +++ b/src/main/mainWindow.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 */ @@ -82,7 +82,7 @@ function initTray(win: BrowserWindow) { } }, { - label: "Quit Vencord Desktop", + label: "Quit Vesktop", click() { isQuitting = true; app.quit(); @@ -91,7 +91,7 @@ function initTray(win: BrowserWindow) { ]); tray = new Tray(ICON_PATH); - tray.setToolTip("Vencord Desktop"); + tray.setToolTip("Vesktop"); tray.setContextMenu(trayMenu); tray.on("click", () => win.show()); @@ -111,7 +111,7 @@ function initMenuBar(win: BrowserWindow) { const subMenu = [ { - label: "About Vencord Desktop", + label: "About Vesktop", click: createAboutWindow }, { @@ -121,7 +121,7 @@ function initMenuBar(win: BrowserWindow) { app.relaunch(); app.quit(); }, - toolTip: "Vencord Desktop will automatically restart after this operation" + toolTip: "Vesktop will automatically restart after this operation" }, { label: "Relaunch", @@ -168,7 +168,7 @@ function initMenuBar(win: BrowserWindow) { const menu = Menu.buildFromTemplate([ { - label: "Vencord Desktop", + label: "Vesktop", role: "appMenu", submenu: subMenu.filter(isTruthy) }, diff --git a/src/main/screenShare.ts b/src/main/screenShare.ts index f04053f..37ce4cd 100644 --- a/src/main/screenShare.ts +++ b/src/main/screenShare.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 */ @@ -36,7 +36,7 @@ export function registerScreenShareHandler() { })); const choice = await request.frame - .executeJavaScript(`VencordDesktop.Components.ScreenShare.openScreenSharePicker(${JSON.stringify(data)})`) + .executeJavaScript(`Vesktop.Components.ScreenShare.openScreenSharePicker(${JSON.stringify(data)})`) .then(e => e as StreamPick) .catch(() => null); diff --git a/src/main/settings.ts b/src/main/settings.ts index dfb7474..6fad97f 100644 --- a/src/main/settings.ts +++ b/src/main/settings.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 */ @@ -33,5 +33,5 @@ function loadSettings(file: string, name: string) { return store; } -export const Settings = loadSettings(SETTINGS_FILE, "Vencord Desktop"); +export const Settings = loadSettings(SETTINGS_FILE, "Vesktop"); export const VencordSettings = loadSettings(VENCORD_SETTINGS_FILE, "Vencord"); diff --git a/src/main/splash.ts b/src/main/splash.ts index 728c688..bf910fb 100644 --- a/src/main/splash.ts +++ b/src/main/splash.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/utils/http.ts b/src/main/utils/http.ts index fc50410..9a98384 100644 --- a/src/main/utils/http.ts +++ b/src/main/utils/http.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/utils/makeLinksOpenExternally.ts b/src/main/utils/makeLinksOpenExternally.ts index 4da4969..b30b865 100644 --- a/src/main/utils/makeLinksOpenExternally.ts +++ b/src/main/utils/makeLinksOpenExternally.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/utils/vencordLoader.ts b/src/main/utils/vencordLoader.ts index 0d88841..18a2211 100644 --- a/src/main/utils/vencordLoader.ts +++ b/src/main/utils/vencordLoader.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/preload/VencordDesktopNative.ts b/src/preload/VesktopNative.ts similarity index 95% rename from src/preload/VencordDesktopNative.ts rename to src/preload/VesktopNative.ts index 5d2f724..6a4415a 100644 --- a/src/preload/VencordDesktopNative.ts +++ b/src/preload/VesktopNative.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 */ @@ -19,7 +19,7 @@ ipcRenderer.on(IpcEvents.SPELLCHECK_RESULT, (_, w: string, s: string[]) => { spellCheckCallbacks.forEach(cb => cb(w, s)); }); -export const VencordDesktopNative = { +export const VesktopNative = { app: { relaunch: () => invoke(IpcEvents.RELAUNCH), getVersion: () => sendSync(IpcEvents.GET_VERSION), diff --git a/src/preload/index.ts b/src/preload/index.ts index 5b40c2e..6eb36fa 100644 --- a/src/preload/index.ts +++ b/src/preload/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 */ @@ -8,9 +8,11 @@ import { contextBridge, ipcRenderer, webFrame } from "electron"; import { readFileSync, watch } from "fs"; import { IpcEvents } from "../shared/IpcEvents"; -import { VencordDesktopNative } from "./VencordDesktopNative"; +import { VesktopNative } from "./VesktopNative"; -contextBridge.exposeInMainWorld("VencordDesktopNative", VencordDesktopNative); +contextBridge.exposeInMainWorld("VesktopNative", VesktopNative); +// TODO: remove legacy alias once main Vencord codebase has migrated and some time has passed +contextBridge.exposeInMainWorld("VencordDesktopNative", VesktopNative); require(ipcRenderer.sendSync(IpcEvents.GET_VENCORD_PRELOAD_FILE)); @@ -41,4 +43,4 @@ if (IS_DEV) { } // #endregion -VencordDesktopNative.spellcheck.setLanguages(window.navigator.languages); +VesktopNative.spellcheck.setLanguages(window.navigator.languages); diff --git a/src/preload/typedIpc.ts b/src/preload/typedIpc.ts index 6522de6..e8b519c 100644 --- a/src/preload/typedIpc.ts +++ b/src/preload/typedIpc.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/renderer/appBadge.ts b/src/renderer/appBadge.ts index ea40b60..de46701 100644 --- a/src/renderer/appBadge.ts +++ b/src/renderer/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 */ @@ -23,7 +23,7 @@ export function setBadge() { let totalCount = mentionCount + pendingRequests; if (!totalCount && hasUnread && !disableUnreadBadge) totalCount = -1; - VencordDesktopNative.app.setBadgeCount(totalCount); + VesktopNative.app.setBadgeCount(totalCount); } let toFind = 3; diff --git a/src/renderer/components/ScreenSharePicker.tsx b/src/renderer/components/ScreenSharePicker.tsx index 4533a76..bd7083c 100644 --- a/src/renderer/components/ScreenSharePicker.tsx +++ b/src/renderer/components/ScreenSharePicker.tsx @@ -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 */ @@ -118,7 +118,7 @@ function StreamSettings({ settings: StreamSettings; setSettings: Dispatch>; }) { - const [thumb] = useAwaiter(() => VencordDesktopNative.capturer.getLargeThumbnail(source.id), { + const [thumb] = useAwaiter(() => VesktopNative.capturer.getLargeThumbnail(source.id), { fallbackValue: source.url, deps: [source.id] }); diff --git a/src/renderer/components/Settings.tsx b/src/renderer/components/Settings.tsx index b5d8c3d..dcb2a64 100644 --- a/src/renderer/components/Settings.tsx +++ b/src/renderer/components/Settings.tsx @@ -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 */ @@ -13,17 +13,17 @@ import { useSettings } from "renderer/settings"; export default function SettingsUi() { const Settings = useSettings(); - const supportsWindowsTransparency = VencordDesktopNative.app.supportsWindowsTransparency(); + const supportsWindowsTransparency = VesktopNative.app.supportsWindowsTransparency(); - const { autostart } = VencordDesktopNative; + const { autostart } = VesktopNative; const [autoStartEnabled, setAutoStartEnabled] = useState(autostart.isEnabled()); const switches: [keyof typeof Settings, string, string, boolean?, (() => boolean)?][] = [ - ["tray", "Tray Icon", "Add a tray icon for Vencord Desktop", true], + ["tray", "Tray Icon", "Add a tray icon for Vesktop", true], [ "minimizeToTray", "Minimize to tray", - "Hitting X will make Vencord Desktop minimize to the tray instead of closing", + "Hitting X will make Vesktop minimize to the tray instead of closing", true, () => Settings.tray ?? true ], @@ -36,7 +36,7 @@ export default function SettingsUi() { [ "openLinksWithElectron", "Open Links in app (experimental)", - "Opens links in a new Vencord Desktop window instead of your web browser" + "Opens links in a new Vesktop window instead of your web browser" ], ["staticTitle", "Static Title", 'Makes the window title "Vencord" instead of changing to the current page'] ]; @@ -44,7 +44,7 @@ export default function SettingsUi() { return ( - Vencord Desktop Settings + Vesktop Settings Discord Branch @@ -69,7 +69,7 @@ export default function SettingsUi() { await autostart[v ? "enable" : "disable"](); setAutoStartEnabled(v); }} - note="Automatically start Vencord Desktop on computer start-up" + note="Automatically start Vesktop on computer start-up" > Start With System @@ -79,7 +79,7 @@ export default function SettingsUi() { onChange={v => { Settings.appBadge = v; if (v) setBadge(); - else VencordDesktopNative.app.setBadgeCount(0); + else VesktopNative.app.setBadgeCount(0); }} note="Show mention badge on the app icon" > @@ -121,7 +121,7 @@ export default function SettingsUi() { }, { label: "Tabbed (variant of Mica with stronger background tinting)", value: "tabbed" }, { - label: "Acrylic (blurs the window behind Vencord Desktop for a translucent background)", + label: "Acrylic (blurs the window behind Vesktop for a translucent background)", value: "acrylic" } ]} @@ -143,7 +143,7 @@ export default function SettingsUi() { href="about:blank" onClick={e => { e.preventDefault(); - VencordDesktopNative.fileManager.showItemInFolder(Settings.vencordDir!); + VesktopNative.fileManager.showItemInFolder(Settings.vencordDir!); }} > {Settings.vencordDir} @@ -156,7 +156,7 @@ export default function SettingsUi() {