From 6b26c12bfa1f28d40834478b50d2f7b09c9f54fb Mon Sep 17 00:00:00 2001 From: V Date: Tue, 4 Apr 2023 01:16:29 +0200 Subject: Add additional build flavours for Vencord Desktop (#765) --- src/Vencord.ts | 12 +- src/components/VencordSettings/Updater.tsx | 3 +- src/components/VencordSettings/VencordTab.tsx | 4 +- src/globals.d.ts | 3 + src/ipcMain/constants.ts | 35 ----- src/ipcMain/crxToZip.ts | 57 -------- src/ipcMain/extensions.ts | 85 ----------- src/ipcMain/index.ts | 99 ------------- src/ipcMain/simpleGet.ts | 37 ----- src/ipcMain/updater/common.ts | 59 -------- src/ipcMain/updater/git.ts | 83 ----------- src/ipcMain/updater/http.ts | 88 ----------- src/ipcMain/updater/index.ts | 19 --- src/main/index.ts | 108 ++++++++++++++ src/main/ipcMain.ts | 107 ++++++++++++++ src/main/patchWin32Updater.ts | 99 +++++++++++++ src/main/patcher.ts | 120 +++++++++++++++ src/main/updater/common.ts | 59 ++++++++ src/main/updater/git.ts | 83 +++++++++++ src/main/updater/http.ts | 104 +++++++++++++ src/main/updater/index.ts | 19 +++ src/main/utils/constants.ts | 37 +++++ src/main/utils/crxToZip.ts | 57 ++++++++ src/main/utils/extensions.ts | 85 +++++++++++ src/main/utils/simpleGet.ts | 37 +++++ src/patchWin32Updater.ts | 99 ------------- src/patcher.ts | 202 -------------------------- src/plugins/consoleShortcuts.ts | 3 +- src/plugins/settings.tsx | 1 + src/preload.ts | 4 +- src/utils/native.ts | 24 +++ src/utils/settingsSync.ts | 42 +++--- src/utils/updater.ts | 7 +- src/webpack/webpack.ts | 2 +- 34 files changed, 988 insertions(+), 895 deletions(-) delete mode 100644 src/ipcMain/constants.ts delete mode 100644 src/ipcMain/crxToZip.ts delete mode 100644 src/ipcMain/extensions.ts delete mode 100644 src/ipcMain/index.ts delete mode 100644 src/ipcMain/simpleGet.ts delete mode 100644 src/ipcMain/updater/common.ts delete mode 100644 src/ipcMain/updater/git.ts delete mode 100644 src/ipcMain/updater/http.ts delete mode 100644 src/ipcMain/updater/index.ts create mode 100644 src/main/index.ts create mode 100644 src/main/ipcMain.ts create mode 100644 src/main/patchWin32Updater.ts create mode 100644 src/main/patcher.ts create mode 100644 src/main/updater/common.ts create mode 100644 src/main/updater/git.ts create mode 100644 src/main/updater/http.ts create mode 100644 src/main/updater/index.ts create mode 100644 src/main/utils/constants.ts create mode 100644 src/main/utils/crxToZip.ts create mode 100644 src/main/utils/extensions.ts create mode 100644 src/main/utils/simpleGet.ts delete mode 100644 src/patchWin32Updater.ts delete mode 100644 src/patcher.ts create mode 100644 src/utils/native.ts (limited to 'src') diff --git a/src/Vencord.ts b/src/Vencord.ts index 00f8a58..73b53e8 100644 --- a/src/Vencord.ts +++ b/src/Vencord.ts @@ -30,7 +30,7 @@ import "./webpack/patchWebpack"; import { showNotification } from "./api/Notifications"; import { PlainSettings, Settings } from "./api/settings"; import { patches, PMLogger, startAllPlugins } from "./plugins"; -import { checkForUpdates, rebuild, update, UpdateLogger } from "./utils/updater"; +import { checkForUpdates, rebuild, update,UpdateLogger } from "./utils/updater"; import { onceReady } from "./webpack"; import { SettingsRouter } from "./webpack/common"; @@ -56,8 +56,12 @@ async function init() { permanent: true, noPersist: true, onClick() { - if (needsFullRestart) - window.DiscordNative.app.relaunch(); + if (needsFullRestart) { + if (IS_DISCORD_DESKTOP) + window.DiscordNative.app.relaunch(); + else + window.VencordDesktop.app.relaunch(); + } else location.reload(); } @@ -96,7 +100,7 @@ async function init() { init(); -if (!IS_WEB && Settings.winNativeTitleBar && navigator.platform.toLowerCase().startsWith("win")) { +if (IS_DISCORD_DESKTOP && Settings.winNativeTitleBar && navigator.platform.toLowerCase().startsWith("win")) { document.addEventListener("DOMContentLoaded", () => { document.head.append(Object.assign(document.createElement("style"), { id: "vencord-native-titlebar-style", diff --git a/src/components/VencordSettings/Updater.tsx b/src/components/VencordSettings/Updater.tsx index 3c3eb91..15a8c87 100644 --- a/src/components/VencordSettings/Updater.tsx +++ b/src/components/VencordSettings/Updater.tsx @@ -24,6 +24,7 @@ import { handleComponentFailed } from "@components/handleComponentFailed"; import { Link } from "@components/Link"; import { Margins } from "@utils/margins"; import { classes, useAwaiter } from "@utils/misc"; +import { relaunch } from "@utils/native"; import { changes, checkForUpdates, getRepo, isNewer, rebuild, update, updateError, UpdateLogger } from "@utils/updater"; import { Alerts, Button, Card, Forms, Parser, React, Switch, Toasts } from "@webpack/common"; @@ -133,7 +134,7 @@ function Updatable(props: CommonProps) { cancelText: "Not now!", onConfirm() { if (needFullRestart) - window.DiscordNative.app.relaunch(); + relaunch(); else location.reload(); r(); diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx index 7113421..8b86968 100644 --- a/src/components/VencordSettings/VencordTab.tsx +++ b/src/components/VencordSettings/VencordTab.tsx @@ -26,6 +26,7 @@ import { ErrorCard } from "@components/ErrorCard"; import IpcEvents from "@utils/IpcEvents"; import { Margins } from "@utils/margins"; import { identity, useAwaiter } from "@utils/misc"; +import { relaunch } from "@utils/native"; import { Button, Card, Forms, React, Select, Slider, Switch } from "@webpack/common"; const cl = classNameFactory("vc-settings-"); @@ -100,7 +101,7 @@ function VencordSettings() { ) : ( @@ -111,6 +112,7 @@ function VencordSettings() { Open QuickCSS File