Bump to v0.4.1

Co-authored-by: wearrrrr <contact@wearr.dev>
Co-authored-by: V <vendicated@riseup.net>

.github/workflows/winget-submission.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Submit package to Winget Community Repo
-        uses: vedantmgoyal2009/winget-releaser@52ef3f3028ed79a9606d7678d0a88d295bc0c690 # v2
+        uses: vedantmgoyal2009/winget-releaser@e68d386d5d6a1cef8cb0fb5e62b77ebcb83e7d58 # v2
         with:
           identifier: Vencord.Vesktop
           token: ${{ secrets.WINGET_PAT }}

.gitignore

@@ -3,3 +3,4 @@ node_modules
 .env
 .DS_Store
 .idea/
+.pnpm-store/

package.json

@@ -1,6 +1,6 @@
 {
     "name": "VencordDesktop",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "private": true,
     "description": "",
     "keywords": [],
@@ -73,10 +73,34 @@
             "category": "Network",
             "maintainer": "vendicated+vesktop@riseup.net",
             "target": [
-                "deb",
-                "tar.gz",
-                "rpm",
-                "AppImage"
+                {
+                    "target": "deb",
+                    "arch": [
+                        "x64",
+                        "arm64"
+                    ]
+                },
+                {
+                    "target": "tar.gz",
+                    "arch": [
+                        "x64",
+                        "arm64"
+                    ]
+                },
+                {
+                    "target": "rpm",
+                    "arch": [
+                        "x64",
+                        "arm64"
+                    ]
+                },
+                {
+                    "target": "AppImage",
+                    "arch": [
+                        "x64",
+                        "arm64"
+                    ]
+                }
             ],
             "desktop": {
                 "Name": "Vesktop",
@@ -84,7 +108,8 @@
                 "Type": "Application",
                 "Categories": "Network;InstantMessaging;Chat;",
                 "Keywords": "discord;vencord;electron;chat;",
-                "WMClass": "VencordDesktop"
+                "WMClass": "VencordDesktop",
+                "StartupWMClass": "VencordDesktop"
             }
         },
         "mac": {

src/main/ipc.ts

@@ -7,7 +7,7 @@
 if (process.platform === "linux") import("./virtmic");
 
 import { execFile } from "child_process";
-import { app, dialog, RelaunchOptions, session, shell } from "electron";
+import { app, BrowserWindow, dialog, RelaunchOptions, session, shell } from "electron";
 import { mkdirSync, readFileSync, watch } from "fs";
 import { open, readFile } from "fs/promises";
 import { release } from "os";
@@ -71,7 +71,7 @@ handle(IpcEvents.FOCUS, () => {
 });
 
 handle(IpcEvents.CLOSE, e => {
-    mainWin.close();
+    (BrowserWindow.fromWebContents(e.sender) ?? e.sender).close();
 });
 
 handle(IpcEvents.MINIMIZE, e => {

src/main/mainWindow.ts

@@ -278,6 +278,28 @@ function getWindowBoundsOptions(): BrowserWindowConstructorOptions {
     return options;
 }
 
+function getDarwinOptions(): BrowserWindowConstructorOptions {
+    const options = {
+        titleBarStyle: "hiddenInset"
+    } as BrowserWindowConstructorOptions;
+
+    const { splashTheming, splashBackground } = Settings.store;
+    const { macosTranslucency } = VencordSettings.store;
+
+    if (macosTranslucency) {
+        options.vibrancy = "sidebar";
+        options.backgroundColor = "#ffffff00";
+    } else {
+        if (splashTheming) {
+            options.backgroundColor = splashBackground;
+        } else {
+            options.backgroundColor = nativeTheme.shouldUseDarkColors ? "#313338" : "#ffffff";
+        }
+    }
+
+    return options;
+}
+
 function initWindowBoundsListeners(win: BrowserWindow) {
     const saveState = () => {
         Settings.store.maximized = win.isMaximized();
@@ -342,10 +364,9 @@ function createMainWindow() {
     removeSettingsListeners();
     removeVencordSettingsListeners();
 
-    const { staticTitle, transparencyOption, splashTheming, splashBackground, enableMenu, discordWindowsTitleBar } =
-        Settings.store;
+    const { staticTitle, transparencyOption, enableMenu, discordWindowsTitleBar } = Settings.store;
 
-    const { frameless, macosTranslucency } = VencordSettings.store;
+    const { frameless } = VencordSettings.store;
 
     const noFrame = frameless === true || (process.platform === "win32" && discordWindowsTitleBar === true);
 
@@ -361,28 +382,14 @@ function createMainWindow() {
         },
         icon: ICON_PATH,
         frame: !noFrame,
-        ...(transparencyOption && transparencyOption !== "none"
-            ? {
-                  backgroundColor: "#00000000",
-                  backgroundMaterial: transparencyOption,
-                  transparent: true
-              }
-            : {}),
-        ...(staticTitle ? { title: "Vesktop" } : {}),
-        ...(macosTranslucency
-            ? {
-                  vibrancy: "sidebar",
-                  backgroundColor: "#ffffff00"
-              }
-            : {
-                  backgroundColor: splashTheming
-                      ? splashBackground
-                      : nativeTheme.shouldUseDarkColors
-                      ? "#313338"
-                      : "#ffffff",
-                  transparent: false
-              }),
-        ...(process.platform === "darwin" ? { titleBarStyle: "hiddenInset" } : {}),
+        ...(transparencyOption &&
+            transparencyOption !== "none" && {
+                backgroundColor: "#00000000",
+                backgroundMaterial: transparencyOption,
+                transparent: true
+            }),
+        ...(staticTitle && { title: "Vesktop" }),
+        ...(process.platform === "darwin" && getDarwinOptions()),
         ...getWindowBoundsOptions(),
         autoHideMenuBar: enableMenu
     }));

src/main/virtmic.ts

@@ -37,10 +37,13 @@ function obtainVenmic() {
 
 ipcMain.handle(IpcEvents.VIRT_MIC_LIST, () => {
     const audioPid = getRendererAudioServicePid();
-    return obtainVenmic()
+    const list = obtainVenmic()
         ?.list()
         .filter(s => s["application.process.id"] !== audioPid)
         .map(s => s["application.name"]);
+
+    // Remove duplicates
+    return list && [...new Set(list)];
 });
 
 ipcMain.handle(

src/renderer/appBadge.ts

@@ -15,15 +15,19 @@ let NotificationSettingsStore: any;
 export function setBadge() {
     if (Settings.store.appBadge === false) return;
 
-    const mentionCount = GuildReadStateStore.getTotalMentionCount();
-    const pendingRequests = RelationshipStore.getPendingCount();
-    const hasUnread = GuildReadStateStore.hasAnyUnread();
-    const disableUnreadBadge = NotificationSettingsStore.getDisableUnreadBadge();
+    try {
+        const mentionCount = GuildReadStateStore.getTotalMentionCount();
+        const pendingRequests = RelationshipStore.getPendingCount();
+        const hasUnread = GuildReadStateStore.hasAnyUnread();
+        const disableUnreadBadge = NotificationSettingsStore.getDisableUnreadBadge();
 
-    let totalCount = mentionCount + pendingRequests;
-    if (!totalCount && hasUnread && !disableUnreadBadge) totalCount = -1;
+        let totalCount = mentionCount + pendingRequests;
+        if (!totalCount && hasUnread && !disableUnreadBadge) totalCount = -1;
 
-    VesktopNative.app.setBadgeCount(totalCount);
+        VesktopNative.app.setBadgeCount(totalCount);
+    } catch (e) {
+        console.error(e);
+    }
 }
 
 let toFind = 3;

src/renderer/components/Settings.tsx

@@ -47,7 +47,8 @@ export default function SettingsUi() {
             "openLinksWithElectron",
             "Open Links in app (experimental)",
             "Opens links in a new Vesktop window instead of your web browser"
-        ]
+        ],
+        ["checkUpdates", "Check for updates", "Automatically check for Vesktop updates", true]
     ];
 
     const switches = allSwitches.filter(isTruthy);

src/shared/settings.d.ts

@@ -24,6 +24,7 @@ export interface Settings {
     windowBounds?: Rectangle;
     disableMinSize?: boolean;
 
+    checkUpdates?: boolean;
     skippedUpdate?: string;
     firstLaunch?: boolean;
 

src/updater/main.ts

@@ -77,7 +77,8 @@ function isOutdated(oldVersion: string, newVersion: string) {
 }
 
 export async function checkUpdates() {
-    // if (IS_DEV) return;
+    if (Settings.store.checkUpdates === false) return;
+
     try {
         const raw = await githubGet("/repos/Vencord/Vesktop/releases/latest");
         const data = JSON.parse(raw.toString("utf-8")) as ReleaseData;

static/views/splash.html

@@ -32,7 +32,7 @@
     <div class="wrapper">
         <img
             draggable="false"
-            src="https://cdn.discordapp.com/emojis/1024751291504791654.gif?size=512"
+            src="../shiggy.gif"
             alt="shiggy"
             role="presentation"
         />