Merge branch 'Vencord:main' into main

Author: RobinRMC

.github/workflows/release.yml

@@ -37,8 +37,16 @@ jobs:
               run: pnpm build
 
             - name: Run Electron Builder
+              if: ${{ matrix.platform != 'mac' }}
               run: |
                   pnpm electron-builder --${{ matrix.platform }} --publish always
               env:
                   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                  CSC_LINK: ${{ matrix.platform == "mac" && secrets.APPLE_SIGNING_CERT }}
+                  
+            - name: Run Electron Builder
+              if: ${{ matrix.platform == 'mac' }}
+              run: |
+                  pnpm electron-builder --${{ matrix.platform }} --publish always
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  CSC_LINK_: ${{ secrets.APPLE_SIGNING_CERT }}

meta/dev.vencord.Vesktop.metainfo.xml

@@ -28,6 +28,22 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release version="1.5.0" date="2024-01-16" type="stable">
+      <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.0</url>
+      <description>
+        <p>What's Changed</p>
+        <ul>
+          <li>fully renamed to Vesktop. You will likely have to login to Discord again. You might have to re-create your vesktop shortcut</li>
+          <li>added option to disable smooth scrolling by @ZirixCZ</li>
+          <li>added setting to disable hardware acceleration by @zt64</li>
+          <li>fixed adding connections</li>
+          <li>fixed / improved discord popouts</li>
+          <li>you can now use the custom discord titlebar on linux/mac</li>
+          <li>the splash window is now draggable</li>
+          <li>now signed on mac</li>
+        </ul>
+      </description>
+    </release>
     <release version="0.4.4" date="2023-12-02" type="stable">
       <url>https://github.com/Vencord/Vesktop/releases/tag/v0.4.4</url>
       <description>

package.json

@@ -1,6 +1,6 @@
 {
     "name": "vesktop",
-    "version": "0.4.4",
+    "version": "1.5.0",
     "private": true,
     "description": "",
     "keywords": [],
@@ -27,7 +27,7 @@
         "arrpc": "github:OpenAsar/arrpc#98879cae0565e6fce34e4cb6f544bf42c6a7e7c8"
     },
     "optionalDependencies": {
-        "@vencord/venmic": "^3.2.2"
+        "@vencord/venmic": "^3.2.3"
     },
     "devDependencies": {
         "@fal-works/esbuild-plugin-global-externals": "^2.1.2",

pnpm-lock.yaml

@@ -78,8 +78,7 @@ function initTray(win: BrowserWindow) {
             label: "Open",
             click() {
                 win.show();
-            },
-            enabled: false
+            }
         },
         {
             label: "About",
@@ -122,14 +121,6 @@ function initTray(win: BrowserWindow) {
     tray.setToolTip("Vesktop");
     tray.setContextMenu(trayMenu);
     tray.on("click", () => win.show());
-
-    win.on("show", () => {
-        trayMenu.items[0].enabled = false;
-    });
-
-    win.on("hide", () => {
-        trayMenu.items[0].enabled = true;
-    });
 }
 
 async function clearData(win: BrowserWindow) {
@@ -374,11 +365,11 @@ function createMainWindow() {
     removeSettingsListeners();
     removeVencordSettingsListeners();
 
-    const { staticTitle, transparencyOption, enableMenu, discordWindowsTitleBar } = Settings.store;
+    const { staticTitle, transparencyOption, enableMenu, customTitleBar } = Settings.store;
 
     const { frameless } = VencordSettings.store;
 
-    const noFrame = frameless === true || (process.platform === "win32" && discordWindowsTitleBar === true);
+    const noFrame = frameless === true || customTitleBar === true;
 
     const win = (mainWin = new BrowserWindow({
         show: false,
@@ -398,7 +389,7 @@ function createMainWindow() {
                 backgroundMaterial: transparencyOption
             }),
         // Fix transparencyOption for custom discord titlebar
-        ...(discordWindowsTitleBar &&
+        ...(customTitleBar &&
             transparencyOption &&
             transparencyOption !== "none" && {
                 transparent: true

src/main/mainWindow.ts

@@ -35,9 +35,15 @@ function loadSettings<T extends object = any>(file: string, name: string) {
 }
 
 export const Settings = loadSettings<TSettings>(SETTINGS_FILE, "Vesktop settings");
+if (Object.hasOwn(Settings.plain, "discordWindowsTitleBar")) {
+    Settings.plain.customTitleBar = Settings.plain.discordWindowsTitleBar;
+    delete Settings.plain.discordWindowsTitleBar;
+    Settings.markAsChanged();
+}
+
 export const VencordSettings = loadSettings<any>(VENCORD_SETTINGS_FILE, "Vencord settings");
 
-if (Object.hasOwn(Settings.store, "firstLaunch") && !existsSync(STATE_FILE)) {
+if (Object.hasOwn(Settings.plain, "firstLaunch") && !existsSync(STATE_FILE)) {
     console.warn("legacy state in settings.json detected. migrating to state.json");
     const state = {} as TState;
     for (const prop of [
@@ -47,7 +53,7 @@ if (Object.hasOwn(Settings.store, "firstLaunch") && !existsSync(STATE_FILE)) {
         "skippedUpdate",
         "steamOSLayoutVersion",
         "windowBounds"
-    ]) {
+    ] as const) {
         state[prop] = Settings.plain[prop];
         delete Settings.plain[prop];
     }

src/main/settings.ts

@@ -10,7 +10,7 @@ import { Margins } from "@vencord/types/utils";
 import { Button, Forms, Select, Switch, Text, Toasts, useState } from "@vencord/types/webpack/common";
 import { setBadge } from "renderer/appBadge";
 import { useSettings } from "renderer/settings";
-import { isMac, isWindows } from "renderer/utils";
+import { isMac } from "renderer/utils";
 import { isTruthy } from "shared/utils/guards";
 
 export default function SettingsUi() {
@@ -21,10 +21,10 @@ export default function SettingsUi() {
     const [autoStartEnabled, setAutoStartEnabled] = useState(autostart.isEnabled());
 
     const allSwitches: Array<false | [keyof typeof Settings, string, string, boolean?, (() => boolean)?]> = [
-        isWindows && [
-            "discordWindowsTitleBar",
+        [
+            "customTitleBar",
             "Discord Titlebar",
-            "Use Discord's custom title bar instead of the Windows one. Requires a full restart."
+            "Use Discord's custom title bar instead of the native system one. Requires a full restart."
         ],
         !isMac && ["tray", "Tray Icon", "Add a tray icon for Vesktop", true],
         !isMac && [

src/renderer/components/Settings.tsx

@@ -5,7 +5,7 @@
  */
 
 import { Settings } from "renderer/settings";
-import { isMac, isWindows } from "renderer/utils";
+import { isMac } from "renderer/utils";
 
 import { addPatch } from "./shared";
 
@@ -22,8 +22,8 @@ addPatch({
     ],
 
     getPlatformClass() {
+        if (Settings.store.customTitleBar) return "platform-win";
         if (isMac) return "platform-osx";
-        if (isWindows && Settings.store.discordWindowsTitleBar) return "platform-win";
         return "platform-web";
     }
 });

src/renderer/patches/platformClass.tsx

@@ -8,7 +8,7 @@ import { Settings } from "renderer/settings";
 
 import { addPatch } from "./shared";
 
-if (Settings.store.discordWindowsTitleBar)
+if (Settings.store.customTitleBar)
     addPatch({
         patches: [
             {

src/renderer/patches/windowsTitleBar.tsx

@@ -19,9 +19,12 @@ export interface Settings {
     hardwareAcceleration?: boolean;
     arRPC?: boolean;
     appBadge?: boolean;
-    discordWindowsTitleBar?: boolean;
     disableMinSize?: boolean;
 
+    /** @deprecated use customTitleBar */
+    discordWindowsTitleBar?: boolean;
+    customTitleBar?: boolean;
+
     checkUpdates?: boolean;
 
     splashTheming?: boolean;