alpha version

.env.example

@@ -5,4 +5,4 @@
 # https://github.com/settings/personal-access-tokens/new
 GITHUB_TOKEN=
 
-ELECTRON_LAUNCH_FLAGS="--enable-source-maps --ozone-platform-hint=auto"
+ELECTRON_LAUNCH_FLAGS="--ozone-platform-hint=auto --enable-webrtc-pipewire-capturer --enable-features=WaylandWindowDecorations"

.eslintrc.json

@@ -0,0 +1,69 @@
+{
+    "root": true,
+    "parser": "@typescript-eslint/parser",
+    "ignorePatterns": ["dist", "node_modules"],
+    "plugins": [
+        "@typescript-eslint",
+        "license-header",
+        "simple-import-sort",
+        "unused-imports",
+        "path-alias",
+        "prettier"
+    ],
+    "settings": {
+        "import/resolver": {
+            "alias": {
+                "map": []
+            }
+        }
+    },
+    "rules": {
+        "license-header/header": ["error", "scripts/header.txt"],
+        "eqeqeq": ["error", "always", { "null": "ignore" }],
+        "spaced-comment": ["error", "always", { "markers": ["!"] }],
+        "yoda": "error",
+        "prefer-destructuring": [
+            "error",
+            {
+                "VariableDeclarator": { "array": false, "object": true },
+                "AssignmentExpression": { "array": false, "object": false }
+            }
+        ],
+        "operator-assignment": ["error", "always"],
+        "no-useless-computed-key": "error",
+        "no-unneeded-ternary": ["error", { "defaultAssignment": false }],
+        "no-invalid-regexp": "error",
+        "no-constant-condition": ["error", { "checkLoops": false }],
+        "no-duplicate-imports": "error",
+        "no-extra-semi": "error",
+        "dot-notation": "error",
+        "no-useless-escape": "error",
+        "no-fallthrough": "error",
+        "for-direction": "error",
+        "no-async-promise-executor": "error",
+        "no-cond-assign": "error",
+        "no-dupe-else-if": "error",
+        "no-duplicate-case": "error",
+        "no-irregular-whitespace": "error",
+        "no-loss-of-precision": "error",
+        "no-misleading-character-class": "error",
+        "no-prototype-builtins": "error",
+        "no-regex-spaces": "error",
+        "no-shadow-restricted-names": "error",
+        "no-unexpected-multiline": "error",
+        "no-unsafe-optional-chaining": "error",
+        "no-useless-backreference": "error",
+        "use-isnan": "error",
+        "prefer-const": "error",
+        "prefer-spread": "error",
+
+        "simple-import-sort/imports": "error",
+        "simple-import-sort/exports": "error",
+
+        "unused-imports/no-unused-imports": "error",
+
+        "path-alias/no-relative": "error",
+
+        "prettier/prettier": "error"
+    }
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,58 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!--
+
+Please do not open issues for the following things. We cannot help you with them:
+- "Vesktop.app is damaged" on MacOs ~ Fake issue created by crApple. Google how to fix it https://google.it/search?q=fix+app+is+damaged
+- Screenshare does not start / is black ~ This is an issue with your desktop environment, specifically its xdg-desktop-portal
+- Purely graphical glitches, like flickering, scaling issues, short whitescreens, etc ~ These are most likely issues with your GPU. try to disable hardware acceleration
+- Vencord related issues ~ This is the Vesktop repo, not Vencord
+- Getting logged out after restart ~ If you use DevTools, make sure you have NoDevtoolsWarning enabled. Otherwise try reinstalling Vesktop
+
+-->
+
+**Describe the bug**
+
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+
+<!--
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+-->
+
+**Expected behavior**
+
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Screenshots**
+
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+**Desktop (please complete the following information):**
+ - OS/Distro: [e.g. Windows / Fedora Linux / MacOs]
+ - Desktop Environment (linux only): [e.g. gnome, kde, sway]
+ - Version: [e.g. 22]
+
+**Command line output**
+
+<!-- Run vesktop from the command line. Include the relevant command line output here: -->
+
+```
+paste inside these backticks
+```
+
+**Additional context**
+
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-    - name: Vencord Support Server
-      url: https://discord.gg/D9uwnFnqmd
-      about: "Need Help? Join our support server and ask in the #vesktop-support channel!"

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/dev-issue.yml

@@ -1,20 +0,0 @@
-name: Vesktop Developer Issue
-description: Reserved for Vesktop Developers. Join our support server for support.
-
-body:
-    - type: markdown
-      attributes:
-          value: |
-              # This form is reserved for Vesktop Developers. Do not open an issue.
-
-              Instead, use the [#vesktop-support channel](https://discord.com/channels/1015060230222131221/1345457031426871417) on our [Discord server](https://vencord.dev/discord) for help and reporting issues.
-
-              Your issue will be closed immediately with no comment and you will be blocked if you ignore this.
-
-              This is because 99% of issues are not actually bugs, but rather user or system issues and it adds a lot of noise to our development process.
-    - type: textarea
-      id: content
-      attributes:
-          label: Content
-      validations:
-          required: true

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/meta.yml

@@ -6,37 +6,33 @@ on:
             - published
     workflow_dispatch:
 
-permissions:
-  contents: write
-
 jobs:
     update:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v4
-            - uses: pnpm/action-setup@v4 # Install pnpm using packageManager key in package.json
+        - uses: actions/checkout@v3
+        - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
 
-            - name: Use Node.js 20
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20
+        - name: Use Node.js 18.18.2
+          uses: actions/setup-node@v3
+          with:
+              node-version: 18.18.2
 
-            - name: Install dependencies
-              run: pnpm i
+        - name: Install dependencies
+          run: pnpm i
 
-            - name: Update metainfo
-              run: pnpm updateMeta
+        - name: Update metainfo
+          run: pnpm updateMeta
 
-            - name: Commit and merge in changes
-              run: |
-                  git config user.name "github-actions[bot]"
-                  git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-                  gh release upload "${{ github.event.release.tag_name }}" meta/dev.vencord.Vesktop.metainfo.xml
-
-                  git add meta/dev.vencord.Vesktop.metainfo.xml
-                  git commit -m "metainfo: add entry for ${{ github.event.release.tag_name }}"
-                  git push origin HEAD:main
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        - name: Commit and merge in changes
+          run: |
+              git config user.name "github-actions[bot]"
+              git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+              git checkout -b ci/meta-update
+              git add meta/dev.vencord.Vesktop.metainfo.xml
+              git commit -m "Insert release changes for ${{ github.event.release.tag_name }}"
+              git push origin ci/meta-update
+              gh pr create -B main -H ci/meta-update -t "Metainfo for ${{ github.event.release.tag_name }}" -b "This PR updates the metainfo for release ${{ github.event.release.tag_name }}. @lewisakura @Vendicated"
+          env:
+              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -22,13 +22,13 @@ jobs:
                       platform: windows
 
         steps:
-            - uses: actions/checkout@v4
-            - uses: pnpm/action-setup@v4 # Install pnpm using packageManager key in package.json
+            - uses: actions/checkout@v3
+            - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
 
-            - name: Use Node.js 20
-              uses: actions/setup-node@v4
+            - name: Use Node.js 18.18.2
+              uses: actions/setup-node@v3
               with:
-                  node-version: 20
+                  node-version: 18.18.2
                   cache: "pnpm"
 
             - name: Install dependencies
@@ -43,17 +43,11 @@ jobs:
                   pnpm electron-builder --${{ matrix.platform }} --publish always
               env:
                   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+                  
             - name: Run Electron Builder
               if: ${{ matrix.platform == 'mac' }}
               run: |
-                  echo "$API_KEY" > apple.p8
                   pnpm electron-builder --${{ matrix.platform }} --publish always
               env:
-                GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                CSC_LINK: ${{ secrets.APPLE_SIGNING_CERT }}
-                CSC_KEY_PASSWORD: ${{ secrets.APPLE_SIGNING_CERT_PASSWORD }}
-                API_KEY: ${{ secrets.APPLE_API_KEY }}
-                APPLE_API_KEY: apple.p8
-                APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
-                APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  CSC_LINK: ${{ secrets.APPLE_SIGNING_CERT }}

.github/workflows/test.yml

@@ -11,13 +11,13 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v4
-            - uses: pnpm/action-setup@v4 # Install pnpm using packageManager key in package.json
+            - uses: actions/checkout@v3
+            - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
 
-            - name: Use Node.js 20
-              uses: actions/setup-node@v4
+            - name: Use Node.js 18.18.2
+              uses: actions/setup-node@v3
               with:
-                  node-version: 20
+                  node-version: 18.18.2
                   cache: "pnpm"
 
             - name: Install dependencies

.github/workflows/update-vencord-dev.yml

@@ -1,29 +0,0 @@
-name: Update vencord.dev Vesktop version
-
-on:
-    release:
-        types:
-            - published
-
-jobs:
-    update:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Update scripts/_latestVesktopVersion.txt file in vencord.dev repo
-              run: |
-                  git config --global user.name "$USERNAME"
-                  git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-                  git clone https://$USERNAME:$API_TOKEN@github.com/$GH_REPO.git repo
-
-                  cd repo
-                  version="${{ github.event.release.tag_name }}"
-                  echo "${version#v}" > scripts/_latestVesktopVersion.txt
-                  
-                  git add scripts/_latestVesktopVersion.txt
-                  git commit -m "Update Vesktop version to ${{ github.event.release.tag_name }}"
-                  git push https://$USERNAME:$API_TOKEN@github.com/$GH_REPO.git
-              env:
-                  API_TOKEN: ${{ secrets.VENCORD_DEV_GITHUB_TOKEN }}
-                  GH_REPO: Vencord/vencord.dev
-                  USERNAME: GitHub-Actions

.github/workflows/winget-submission.yml

@@ -13,10 +13,10 @@ on:
 jobs:
   winget:
     name: Publish winget package
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Submit package to Winget Community Repo
-        uses: vedantmgoyal2009/winget-releaser@0db4f0a478166abd0fa438c631849f0b8dcfb99f
+        uses: vedantmgoyal2009/winget-releaser@e68d386d5d6a1cef8cb0fb5e62b77ebcb83e7d58 # v2
         with:
           identifier: Vencord.Vesktop
           token: ${{ secrets.WINGET_PAT }}

.npmrc

@@ -1,2 +1 @@
 node-linker=hoisted
-package-manager-strict=false

README.md

@@ -21,18 +21,15 @@ Vesktop is a custom Discord desktop app
 
 If you don't know the difference, pick the Installer.
 
-- [Installer](https://vencord.dev/download/vesktop/universal/windows)
-- Portable:
-  - [x64 / amd64](https://vencord.dev/download/vesktop/amd64/windows-portable)
-  - [Arm® 64](https://vencord.dev/download/vesktop/arm64/windows-portable)
+- [Installer](https://vencord.dev/download/vesktop/amd64/windows)
+- [Portable](https://vencord.dev/download/vesktop/amd64/windows-portable)
 
 ### Mac
 
-Download the latest [Vesktop.dmg](https://vencord.dev/download/vesktop/universal/dmg) or use [Homebrew](https://brew.sh/)
+If you don't know the difference, pick amd64
 
-```sh
-brew install vesktop
-```
+- [amd64 / x86_64](https://vencord.dev/download/vesktop/amd64/dmg)
+- [arm64 / aarch64](https://vencord.dev/download/vesktop/arm64/dmg)
 
 ### Linux
 
@@ -45,7 +42,7 @@ If you don't know the difference, pick amd64.
   - [Ubuntu/Debian (.deb)](https://vencord.dev/download/vesktop/amd64/deb)
   - [Fedora/RHEL (.rpm)](https://vencord.dev/download/vesktop/amd64/rpm)
   - [tarball](https://vencord.dev/download/vesktop/amd64/tar)
-- Arm® 64 / aarch64
+- arm64 / aarch64
   - [AppImage](https://vencord.dev/download/vesktop/arm64/appimage)
   - [Ubuntu/Debian (.deb)](https://vencord.dev/download/vesktop/arm64/deb)
   - [Fedora/RHEL (.rpm)](https://vencord.dev/download/vesktop/arm64/rpm)
@@ -56,17 +53,11 @@ If you don't know the difference, pick amd64.
 Below you can find unofficial packages created by the community. They are not officially supported by us, so before reporting issues, please first confirm the issue also happens on official builds. When in doubt, consult with their packager first. The flatpak and AppImage should work on any distro that [supports them](https://flatpak.org/setup/), so I recommend you just use those instead!
 
 - Arch Linux: [Vesktop on the Arch user repository](https://aur.archlinux.org/packages?K=vesktop)
-- NixOS: https://wiki.nixos.org/wiki/Discord#Vesktop
-- Slackware: [Vesktop on the SlackBuilds](https://slackbuilds.org/result/?search=vesktop)
+- NixOS: https://nixos.wiki/wiki/Discord#Vesktop
 - Windows - Scoop: https://scoop.sh/#/apps?q=Vesktop
 
 ## Building from Source
 
-You need to have the following dependencies installed:
-- [Git](https://git-scm.com/downloads)
-- [Node.js](https://nodejs.org/en/download)
-- pnpm: `npm install --global pnpm`
-
 Packaging will create builds in the dist/ folder
 
 ```sh
@@ -79,12 +70,10 @@ pnpm i
 # Either run it without packaging
 pnpm start
 
-# Or package (will build packages for your OS)
+# Or package
 pnpm package
-
-# Or only build the Linux Pacman package
+# Or only build the pacman target
 pnpm package --linux pacman
-
 # Or package to a directory only
 pnpm package:dir
 ```

eslint.config.mjs

@@ -1,103 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-//@ts-check
-
-import stylistic from "@stylistic/eslint-plugin";
-import pathAlias from "eslint-plugin-path-alias";
-import simpleHeader from "eslint-plugin-simple-header";
-import importSort from "eslint-plugin-simple-import-sort";
-import unusedImports from "eslint-plugin-unused-imports";
-import tseslint from "typescript-eslint";
-import prettier from "eslint-plugin-prettier";
-
-export default tseslint.config(
-    { ignores: ["dist"] },
-
-    {
-        files: ["src/**/*.{tsx,ts,mts,mjs,js,jsx}"],
-        plugins: {
-            simpleHeader,
-            stylistic,
-            importSort,
-            unusedImports,
-            pathAlias,
-            prettier
-        },
-        settings: {
-            "import/resolver": {
-                alias: {
-                    map: []
-                }
-            }
-        },
-        languageOptions: {
-            parser: tseslint.parser,
-            parserOptions: {
-                project: true,
-                tsconfigRootDir: import.meta.dirname
-            }
-        },
-        rules: {
-            "simpleHeader/header": [
-                "error",
-                {
-                    files: ["scripts/header.txt"],
-                    templates: { author: [".*", "Vendicated and Vesktop contributors"] }
-                }
-            ],
-
-            // ESLint Rules
-
-            yoda: "error",
-            eqeqeq: ["error", "always", { null: "ignore" }],
-            "prefer-destructuring": [
-                "error",
-                {
-                    VariableDeclarator: { array: false, object: true },
-                    AssignmentExpression: { array: false, object: false }
-                }
-            ],
-            "operator-assignment": ["error", "always"],
-            "no-useless-computed-key": "error",
-            "no-unneeded-ternary": ["error", { defaultAssignment: false }],
-            "no-invalid-regexp": "error",
-            "no-constant-condition": ["error", { checkLoops: false }],
-            "no-duplicate-imports": "error",
-            "dot-notation": "error",
-            "no-useless-escape": "error",
-            "no-fallthrough": "error",
-            "for-direction": "error",
-            "no-async-promise-executor": "error",
-            "no-cond-assign": "error",
-            "no-dupe-else-if": "error",
-            "no-duplicate-case": "error",
-            "no-irregular-whitespace": "error",
-            "no-loss-of-precision": "error",
-            "no-misleading-character-class": "error",
-            "no-prototype-builtins": "error",
-            "no-regex-spaces": "error",
-            "no-shadow-restricted-names": "error",
-            "no-unexpected-multiline": "error",
-            "no-unsafe-optional-chaining": "error",
-            "no-useless-backreference": "error",
-            "use-isnan": "error",
-            "prefer-const": "error",
-            "prefer-spread": "error",
-
-            // Styling Rules
-            "stylistic/spaced-comment": ["error", "always", { markers: ["!"] }],
-            "stylistic/no-extra-semi": "error",
-
-            // Plugin Rules
-            "importSort/imports": "error",
-            "importSort/exports": "error",
-            "unusedImports/no-unused-imports": "error",
-            "pathAlias/no-relative": "error",
-            "prettier/prettier": "error"
-        }
-    }
-);

meta/dev.vencord.Vesktop.metainfo.xml

@@ -28,107 +28,6 @@
     </screenshot>
   </screenshots>
   <releases>
-    <release version="1.5.7" date="2025-06-08" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.7</url>
-      <description>
-        <p>What's Changed</p>
-        <ul>
-          <li>Starting a screenshare on Windows will no longer mute system audio</li>
-          <li>Fixed showing "Invalid URL" errors in some edge cases (spotty network)</li>
-          <li>Now respects your Autogain preference</li>
-          <li>Improved the flow for linking third party accounts</li>
-          <li>Fixed issue that would cause the AppImage to have no icon and be unpinnable</li>
-          <li>Added the ability to screenshare with stereo audio</li>
-          <li>Added Video Hardware Acceleration switch - Used to always be enabled. Now it is opt-in (disabled by default) to fix graphical glitches that were affecting many users</li>
-          <li>Fixed Discord titlebar buttons</li>
-          <li>Fixed "Object has been destroyed" error in some edge cases</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.5.6" date="2025-04-13" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.6</url>
-      <description>
-        <p>What's Changed</p>
-        <ul>
-          <li>Fixes the new Discord titlebar @Sqaaakoi</li>
-          <li>Fixes Clipboard copy actions not working</li>
-          <li>Should now properly hide the "Download Apps" button again</li>
-          <li>No longer responds to Browser Tab shortcuts like Ctrl+W by @rushiiMachine</li>
-          <li>DevTools keybind should now work properly on Mac @ryanccn</li>
-          <li>Should no longer throw Sandbox errors on Ubuntu</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.5.5" date="2025-02-06" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.5</url>
-      <description>
-        <p>What's Changed</p>
-        <ul>
-          <li>Now remembers your previous Screenshare resolution &amp; FPS</li>
-          <li>You can now disable the splash screen in Vesktop Settings</li>
-          <li>Now supports deep links (opening Discord Message Links in Vesktop) by @Covkie</li>
-          <li>Now supports discord:// uri scheme, allowing it to open things like invites from your Browser even while closed by @Covkie</li>
-          <li>Added 4k resolution to screenshare by @makindotcc</li>
-          <li>Fixed some performance issues caused by a recent Discord update</li>
-          <li>Updated Electron to v34 &amp; chromium to v132, bringing new features and fixes</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.5.4" date="2024-12-05" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.4</url>
-      <description>
-        <p>What's Changed</p>
-        <ul>
-          <li>Upgraded electron to version 33 which brings many improvements and bug fixes</li>
-          <li>AudioShare: add even more granular selection, Allow device sharing by @Curve</li>
-          <li>Enable speech-dispatcher support for TTS on linux by @adryd325</li>
-          <li>fixed screenshare picker window subtitle alignment by @ryawaa</li>
-          <li>fixed splash corners by @Covkie</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.5.3" date="2024-07-04" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.3</url>
-      <description>
-        <p>Features</p>
-        <ul>
-          <li>added arm64 Windows support</li>
-          <li>windows &amp; macOS builds are now universal</li>
-          <li>added option to configure spellcheck languages</li>
-          <li>will auto-update from now on</li>
-          <li>updated electron to 31 &amp; Chromium to 126</li>
-          <li>macOS: Added customized dmg background by @khcrysalis</li>
-          <li>Windows Portable: store settings in portable folder by @MrGarlic1</li>
-          <li>linux audioshare: added granular selection, more options, better ui by @Curve</li>
-          <li>changed default screen-sharing quality to 720p 30 FPS by @Tiagoquix</li>
-        </ul>
-        <p>Fixes</p>
-        <ul>
-          <li>macOS: Added workaround for making things in draggable area clickable by @HAHALOSAH</li>
-          <li>fixed Screenshare UI for non-linux systems by @PolisanTheEasyNick</li>
-          <li>fixed opening on screen that was disconnected by @MrGarlic1</li>
-          <li>mac: hide native window controls with custom titlebar enabled by @MrGarlic1</li>
-          <li>fixed some broken patches by @D3SOX</li>
-          <li>fixed framerate in constraints by @kittykel</li>
-          <li>fixed some first launch switches not applying</li>
-          <li>fixed potential sandbox escape via custom vencord location</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.5.2" date="2024-05-01" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.2</url>
-      <description>
-        <p>What's Changed</p>
-        <ul>
-          <li>Fixed scrollbars looking wrong (actually Discord's fault)</li>
-          <li>Tray: Added left click hide/show feature by @0bCdian</li>
-          <li>MacOS: Fixed the app not properly requesting microphone permissions by @ssalggnikool</li>
-          <li>Linux: Various fixed related to audio screenshare by @Curve</li>
-          <li>Linux: Overhauled &amp; improved screenshare with better framerate by @kaitlynkittyy</li>
-          <li>Users can now pass --enable/disable-features command line flags by @takase1121</li>
-        </ul>
-      </description>
-    </release>
     <release version="1.5.1" date="2024-03-12" type="stable">
       <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.1</url>
       <description>
@@ -269,7 +168,7 @@
   <url type="vcs-browser">https://github.com/Vencord/Vesktop</url>
   <categories>
     <category>InstantMessaging</category>
-    <category>Network</category>
+    <category>AudioVideo</category>
   </categories>
   <requires>
     <control>pointing</control>
@@ -295,4 +194,4 @@
     <keyword>Privacy</keyword>
     <keyword>Mod</keyword>
   </keywords>
-</component>
+</component>

package.json

@@ -1,11 +1,11 @@
 {
     "name": "vesktop",
-    "version": "1.5.8",
+    "version": "1.5.2-alpha.1",
     "private": true,
-    "description": "Vesktop is a custom Discord desktop app",
+    "description": "",
     "keywords": [],
     "homepage": "https://vencord.dev/",
-    "license": "GPL-3.0-or-later",
+    "license": "GPL-3.0",
     "author": "Vendicated <vendicated@riseup.net>",
     "main": "dist/js/main.js",
     "scripts": {
@@ -13,7 +13,7 @@
         "build:dev": "pnpm build --dev",
         "package": "pnpm build && electron-builder",
         "package:dir": "pnpm build && electron-builder --dir",
-        "lint": "eslint",
+        "lint": "eslint . --ext .js,.jsx,.ts,.tsx,.mts,.mjs",
         "lint:fix": "pnpm lint --fix",
         "start": "pnpm build && electron .",
         "start:dev": "pnpm build:dev && electron .",
@@ -21,43 +21,41 @@
         "test": "pnpm lint && pnpm testTypes",
         "testTypes": "tsc --noEmit",
         "watch": "pnpm build --watch",
-        "updateMeta": "tsx scripts/utils/updateMeta.mts",
-        "updateArrpcDB": "node ./node_modules/arrpc/update_db.js",
-        "postinstall": "pnpm updateArrpcDB"
+        "updateMeta": "tsx scripts/utils/updateMeta.mts"
     },
     "dependencies": {
-        "arrpc": "github:OpenAsar/arrpc#2234e9c9111f4c42ebcc3aa6a2215bfd979eef77",
-        "electron-updater": "^6.6.2"
+        "arrpc": "github:OpenAsar/arrpc#6960a8fd4d65d566da93dbdb8a7ca474aa0a3c9c"
     },
     "optionalDependencies": {
-        "@vencord/venmic": "^6.1.0"
+        "@vencord/venmic": "^3.4.2"
     },
     "devDependencies": {
         "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
-        "@stylistic/eslint-plugin": "^5.1.0",
-        "@types/node": "^24.0.10",
-        "@types/react": "18.3.1",
-        "@vencord/types": "^1.11.5",
-        "dotenv": "^16.5.0",
-        "electron": "^37.2.0",
-        "electron-builder": "^26.0.12",
-        "esbuild": "^0.25.5",
-        "eslint": "^9.30.1",
+        "@types/node": "^20.11.26",
+        "@types/react": "^18.2.65",
+        "@typescript-eslint/eslint-plugin": "^7.2.0",
+        "@typescript-eslint/parser": "^7.2.0",
+        "@vencord/types": "^0.1.2",
+        "dotenv": "^16.4.5",
+        "electron": "^29.1.1",
+        "electron-builder": "^24.13.3",
+        "esbuild": "^0.20.1",
+        "eslint": "^8.57.0",
+        "eslint-config-prettier": "^9.1.0",
         "eslint-import-resolver-alias": "^1.1.2",
-        "eslint-plugin-path-alias": "^2.1.0",
-        "eslint-plugin-prettier": "^5.5.1",
-        "eslint-plugin-simple-header": "^1.2.2",
-        "eslint-plugin-simple-import-sort": "^12.1.1",
-        "eslint-plugin-unused-imports": "^4.1.4",
-        "prettier": "^3.6.2",
+        "eslint-plugin-license-header": "^0.6.0",
+        "eslint-plugin-path-alias": "^1.0.0",
+        "eslint-plugin-prettier": "^5.1.3",
+        "eslint-plugin-simple-import-sort": "^12.0.0",
+        "eslint-plugin-unused-imports": "^3.1.0",
+        "prettier": "^3.2.5",
         "source-map-support": "^0.5.21",
-        "tsx": "^4.20.3",
-        "type-fest": "^4.41.0",
-        "typescript": "^5.8.3",
-        "typescript-eslint": "^8.35.1",
-        "xml-formatter": "^3.6.6"
+        "tsx": "^4.7.1",
+        "type-fest": "^4.12.0",
+        "typescript": "^5.4.2",
+        "xml-formatter": "^3.6.2"
     },
-    "packageManager": "pnpm@10.7.1",
+    "packageManager": "pnpm@8.11.0",
     "engines": {
         "node": ">=18",
         "pnpm": ">=8"
@@ -67,18 +65,11 @@
         "productName": "Vesktop",
         "files": [
             "!*",
-            "!node_modules",
             "dist/js",
             "static",
             "package.json",
             "LICENSE"
         ],
-        "protocols": {
-            "name": "Discord",
-            "schemes": [
-                "discord"
-            ]
-        },
         "beforePack": "scripts/build/sandboxFix.js",
         "linux": {
             "icon": "build/icon.icns",
@@ -115,15 +106,11 @@
                 }
             ],
             "desktop": {
-                "entry": {
-                    "Name": "Vesktop",
-                    "GenericName": "Internet Messenger",
-                    "Type": "Application",
-                    "Categories": "Network;InstantMessaging;Chat;",
-                    "Keywords": "discord;vencord;electron;chat;",
-                    "MimeType": "x-scheme-handler/discord",
-                    "StartupWMClass": "vesktop"
-                }
+                "Name": "Vesktop",
+                "GenericName": "Internet Messenger",
+                "Type": "Application",
+                "Categories": "Network;InstantMessaging;Chat;",
+                "Keywords": "discord;vencord;electron;chat;"
             }
         },
         "mac": {
@@ -131,40 +118,18 @@
                 {
                     "target": "default",
                     "arch": [
-                        "universal"
+                        "x64",
+                        "arm64"
                     ]
                 }
             ],
-            "category": "public.app-category.social-networking",
-            "darkModeSupport": true,
+            "category": "Network",
             "extendInfo": {
                 "NSMicrophoneUsageDescription": "This app needs access to the microphone",
                 "NSCameraUsageDescription": "This app needs access to the camera",
                 "com.apple.security.device.audio-input": true,
                 "com.apple.security.device.camera": true
-            },
-            "notarize": true
-        },
-        "dmg": {
-            "background": "build/background.tiff",
-            "icon": "build/icon.icns",
-            "iconSize": 105,
-            "window": {
-                "width": 512,
-                "height": 340
-            },
-            "contents": [
-                {
-                    "x": 140,
-                    "y": 160
-                },
-                {
-                    "x": 372,
-                    "y": 160,
-                    "type": "link",
-                    "path": "/Applications"
-                }
-            ]
+            }
         },
         "nsis": {
             "include": "build/installer.nsh",
@@ -172,40 +137,12 @@
         },
         "win": {
             "target": [
-                {
-                    "target": "nsis",
-                    "arch": [
-                        "x64",
-                        "arm64"
-                    ]
-                },
-                {
-                    "target": "zip",
-                    "arch": [
-                        "x64",
-                        "arm64"
-                    ]
-                }
+                "nsis",
+                "zip"
             ]
         },
         "publish": {
             "provider": "github"
-        },
-        "rpm": {
-            "fpm": [
-                "--rpm-rpmbuild-define=_build_id_links none"
-            ]
         }
-    },
-    "pnpm": {
-        "patchedDependencies": {
-            "arrpc@3.5.0": "patches/arrpc@3.5.0.patch",
-            "electron-updater": "patches/electron-updater.patch"
-        },
-        "onlyBuiltDependencies": [
-            "@vencord/venmic",
-            "electron",
-            "esbuild"
-        ]
     }
 }

patches/arrpc@3.5.0.patch

@@ -1,27 +0,0 @@
-diff --git a/src/process/index.js b/src/process/index.js
-index 389b0845256a34b4536d6da99edb00d17f13a6b4..f17a0ac687e9110ebfd33cb91fd2f6250d318643 100644
---- a/src/process/index.js
-+++ b/src/process/index.js
-@@ -5,8 +5,20 @@ import fs from 'node:fs';
- import { dirname, join } from 'path';
- import { fileURLToPath } from 'url';
- 
--const __dirname = dirname(fileURLToPath(import.meta.url));
--const DetectableDB = JSON.parse(fs.readFileSync(join(__dirname, 'detectable.json'), 'utf8'));
-+const DetectableDB = require('./detectable.json');
-+DetectableDB.push(
-+  {
-+    aliases: ["Obs"],
-+    executables: [
-+      { is_launcher: false, name: "obs", os: "linux" },
-+      { is_launcher: false, name: "obs.exe", os: "win32" },
-+      { is_launcher: false, name: "obs.app", os: "darwin" }
-+    ],
-+    hook: true,
-+    id: "STREAMERMODE",
-+    name: "OBS"
-+  }
-+);
- 
- import * as Natives from './native/index.js';
- const Native = Natives[process.platform];

patches/electron-updater.patch

@@ -1,16 +0,0 @@
-diff --git a/out/RpmUpdater.js b/out/RpmUpdater.js
-index 563187bb18cb0bd154dff6620cb62b8c8f534cd6..d91594026c2bac9cc78ef3b1183df3241d7d9624 100644
---- a/out/RpmUpdater.js
-+++ b/out/RpmUpdater.js
-@@ -32,7 +32,10 @@ class RpmUpdater extends BaseUpdater_1.BaseUpdater {
-         const sudo = this.wrapSudo();
-         // pkexec doesn't want the command to be wrapped in " quotes
-         const wrapper = /pkexec/i.test(sudo) ? "" : `"`;
--        const packageManager = this.spawnSyncLog("which zypper");
-+        let packageManager;
-+        try {
-+            packageManager = this.spawnSyncLog("which zypper");
-+        } catch {}
-         const installerPath = this.installerPath;
-         if (installerPath == null) {
-             this.dispatchError(new Error("No valid update available, can't quit and install"));

scripts/build/build.mts

@@ -1,14 +1,13 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { BuildContext, BuildOptions, context } from "esbuild";
 import { copyFile } from "fs/promises";
 
 import vencordDep from "./vencordDep.mjs";
-import { includeDirPlugin } from "./includeDirPlugin.mts";
 
 const isDev = process.argv.includes("--dev");
 
@@ -58,12 +57,6 @@ await Promise.all([
         outfile: "dist/js/main.js",
         footer: { js: "//# sourceURL=VCDMain" }
     }),
-    createContext({
-        ...NodeCommonOpts,
-        entryPoints: ["src/main/arrpc/worker.ts"],
-        outfile: "dist/js/arRpcWorker.js",
-        footer: { js: "//# sourceURL=VCDArRpcWorker" }
-    }),
     createContext({
         ...NodeCommonOpts,
         entryPoints: ["src/preload/index.ts"],
@@ -72,8 +65,9 @@ await Promise.all([
     }),
     createContext({
         ...NodeCommonOpts,
-        entryPoints: ["src/preload/splash.ts"],
-        outfile: "dist/js/splashPreload.js"
+        entryPoints: ["src/updater/preload.ts"],
+        outfile: "dist/js/updaterPreload.js",
+        footer: { js: "//# sourceURL=VCDUpdaterPreload" }
     }),
     createContext({
         ...CommonOpts,
@@ -85,7 +79,7 @@ await Promise.all([
         jsxFactory: "VencordCreateElement",
         jsxFragment: "VencordFragment",
         external: ["@vencord/types/*"],
-        plugins: [vencordDep, includeDirPlugin("patches", "src/renderer/patches")],
+        plugins: [vencordDep],
         footer: { js: "//# sourceURL=VCDRenderer" }
     })
 ]);

scripts/build/includeDirPlugin.mts

@@ -1,25 +0,0 @@
-import { Plugin } from "esbuild";
-import { readdir } from "fs/promises";
-
-const makeImportAllCode = (files: string[]) =>
-    files.map(f => `require("./${f.replace(/\.[cm]?[tj]sx?$/, "")}")`).join("\n");
-
-const makeImportDirRecursiveCode = (dir: string) => readdir(dir).then(files => makeImportAllCode(files));
-
-export function includeDirPlugin(namespace: string, path: string): Plugin {
-    return {
-        name: `include-dir-plugin:${namespace}`,
-        setup(build) {
-            const filter = new RegExp(`^__${namespace}__$`);
-
-            build.onResolve({ filter }, args => ({ path: args.path, namespace }));
-
-            build.onLoad({ filter, namespace }, async args => {
-                return {
-                    contents: await makeImportDirRecursiveCode(path),
-                    resolveDir: path
-                };
-            });
-        }
-    };
-}

scripts/build/injectReact.mjs

@@ -1,3 +1,9 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
 export const VencordFragment = /* #__PURE__*/ Symbol.for("react.fragment");
 export let VencordCreateElement = (...args) =>
     (VencordCreateElement = Vencord.Webpack.Common.React.createElement)(...args);

scripts/build/sandboxFix.js

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 // Based on https://github.com/gergof/electron-builder-sandbox-fix/blob/master/lib/index.js

scripts/build/vencordDep.mts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { globalExternalsWithRegExp } from "@fal-works/esbuild-plugin-global-externals";

scripts/header.txt

@@ -1,5 +1,5 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) {year} {author}
- * SPDX-License-Identifier: GPL-3.0-or-later
+ * Copyright (c) 2023 Vendicated and Vencord contributors
  */

scripts/startWatch.mts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import "./start";

scripts/utils/dotenv.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { config } from "dotenv";

scripts/utils/spawn.mts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { spawn as spaaawn, SpawnOptions } from "child_process";

scripts/utils/updateMeta.mts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { promises as fs } from "node:fs";

src/globals.d.ts

@@ -1,13 +1,13 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 declare global {
     export var VesktopNative: typeof import("preload/VesktopNative").VesktopNative;
     export var Vesktop: typeof import("renderer/index");
-    export var VesktopPatchGlobals: any;
+    export var VCDP: any;
 
     export var IS_DEV: boolean;
 }

src/main/about.ts

@@ -1,36 +1,28 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { app, BrowserWindow } from "electron";
+import { BrowserWindow } from "electron";
 import { join } from "path";
 import { ICON_PATH, VIEW_DIR } from "shared/paths";
 
 import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
 
-export async function createAboutWindow() {
-    const height = 750;
-    const width = height * (4 / 3);
-
+export function createAboutWindow() {
     const about = new BrowserWindow({
         center: true,
         autoHideMenuBar: true,
         icon: ICON_PATH,
-        height,
-        width
+        webPreferences: {
+            preload: join(__dirname, "updaterPreload.js")
+        }
     });
 
     makeLinksOpenExternally(about);
 
-    const data = new URLSearchParams({
-        APP_VERSION: app.getVersion()
-    });
-
-    about.loadFile(join(VIEW_DIR, "about.html"), {
-        search: data.toString()
-    });
+    about.loadFile(join(VIEW_DIR, "about.html"));
 
     return about;
 }

src/main/appBadge.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { app, NativeImage, nativeImage } from "electron";
@@ -29,10 +29,10 @@ export function setBadgeCount(count: number) {
             break;
         case "darwin":
             if (count === 0) {
-                app.dock!.setBadge("");
+                app.dock.setBadge("");
                 break;
             }
-            app.dock!.setBadge(count === -1 ? "•" : count.toString());
+            app.dock.setBadge(count === -1 ? "•" : count.toString());
             break;
         case "win32":
             const [index, description] = getBadgeIndexAndDescription(count);

src/main/arrpc.ts

@@ -0,0 +1,38 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+import Server from "arrpc";
+import { IpcEvents } from "shared/IpcEvents";
+
+import { mainWin } from "./mainWindow";
+import { Settings } from "./settings";
+
+let server: any;
+
+const inviteCodeRegex = /^(\w|-)+$/;
+
+export async function initArRPC() {
+    if (server || !Settings.store.arRPC) return;
+
+    try {
+        server = await new Server();
+        server.on("activity", (data: any) => mainWin.webContents.send(IpcEvents.ARRPC_ACTIVITY, JSON.stringify(data)));
+        server.on("invite", (invite: string, callback: (valid: boolean) => void) => {
+            invite = String(invite);
+            if (!inviteCodeRegex.test(invite)) return callback(false);
+
+            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(`Vesktop.openInviteModal(${JSON.stringify(invite)})`)
+                .then(callback);
+        });
+    } catch (e) {
+        console.error("Failed to start arRPC server", e);
+    }
+}
+
+Settings.addChangeListener("arRPC", initArRPC);

src/main/arrpc/index.ts

@@ -1,77 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { resolve } from "path";
-import { IpcCommands } from "shared/IpcEvents";
-import { MessageChannel, Worker } from "worker_threads";
-
-import { sendRendererCommand } from "../ipcCommands";
-import { Settings } from "../settings";
-import { ArRpcEvent, ArRpcHostEvent } from "./types";
-
-let worker: Worker;
-
-const inviteCodeRegex = /^(\w|-)+$/;
-
-export async function initArRPC() {
-    if (worker || !Settings.store.arRPC) return;
-
-    try {
-        const { port1: hostPort, port2: workerPort } = new MessageChannel();
-
-        worker = new Worker(resolve(__dirname, "./arRpcWorker.js"), {
-            workerData: {
-                workerPort
-            },
-            transferList: [workerPort]
-        });
-
-        hostPort.on("message", async ({ type, nonce, data }: ArRpcEvent) => {
-            switch (type) {
-                case "activity": {
-                    sendRendererCommand(IpcCommands.RPC_ACTIVITY, data);
-                    break;
-                }
-
-                case "invite": {
-                    const invite = String(data);
-
-                    const response: ArRpcHostEvent = {
-                        type: "ack-invite",
-                        nonce,
-                        data: false
-                    };
-
-                    if (!inviteCodeRegex.test(invite)) {
-                        return hostPort.postMessage(response);
-                    }
-
-                    response.data = await sendRendererCommand(IpcCommands.RPC_INVITE, invite).catch(() => false);
-
-                    hostPort.postMessage(response);
-                    break;
-                }
-
-                case "link": {
-                    const response: ArRpcHostEvent = {
-                        type: "ack-link",
-                        nonce: nonce,
-                        data: false
-                    };
-
-                    response.data = await sendRendererCommand(IpcCommands.RPC_DEEP_LINK, data).catch(() => false);
-
-                    hostPort.postMessage(response);
-                    break;
-                }
-            }
-        });
-    } catch (e) {
-        console.error("Failed to start arRPC server", e);
-    }
-}
-
-Settings.addChangeListener("arRPC", initArRPC);

src/main/arrpc/types.ts

@@ -1,38 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vesktop contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-export type ArRpcEvent = ArRpcActivityEvent | ArRpcInviteEvent | ArRpcLinkEvent;
-export type ArRpcHostEvent = ArRpcHostAckInviteEvent | ArRpcHostAckLinkEvent;
-
-export interface ArRpcActivityEvent {
-    type: "activity";
-    nonce: string;
-    data: string;
-}
-
-export interface ArRpcInviteEvent {
-    type: "invite";
-    nonce: string;
-    data: string;
-}
-
-export interface ArRpcLinkEvent {
-    type: "link";
-    nonce: string;
-    data: any;
-}
-
-export interface ArRpcHostAckInviteEvent {
-    type: "ack-invite";
-    nonce: string;
-    data: boolean;
-}
-
-export interface ArRpcHostAckLinkEvent {
-    type: "ack-link";
-    nonce: string;
-    data: boolean;
-}

src/main/arrpc/worker.ts

@@ -1,73 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vesktop contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import Server from "arrpc";
-import { randomUUID } from "crypto";
-import { MessagePort, workerData } from "worker_threads";
-
-import { ArRpcEvent, ArRpcHostEvent } from "./types";
-
-let server: any;
-
-type InviteCallback = (valid: boolean) => void;
-type LinkCallback = InviteCallback;
-
-const inviteCallbacks = new Map<string, InviteCallback>();
-const linkCallbacks = new Map<string, LinkCallback>();
-
-(async function () {
-    const { workerPort } = workerData as { workerPort: MessagePort };
-
-    server = await new Server();
-
-    server.on("activity", (data: any) => {
-        const event: ArRpcEvent = {
-            type: "activity",
-            data: JSON.stringify(data),
-            nonce: randomUUID()
-        };
-        workerPort.postMessage(event);
-    });
-
-    server.on("invite", (invite: string, callback: InviteCallback) => {
-        const nonce = randomUUID();
-        inviteCallbacks.set(nonce, callback);
-
-        const event: ArRpcEvent = {
-            type: "invite",
-            data: invite,
-            nonce
-        };
-        workerPort.postMessage(event);
-    });
-
-    server.on("link", async (data: any, callback: LinkCallback) => {
-        const nonce = randomUUID();
-        linkCallbacks.set(nonce, callback);
-
-        const event: ArRpcEvent = {
-            type: "link",
-            data,
-            nonce
-        };
-        workerPort.postMessage(event);
-    });
-
-    workerPort.on("message", (e: ArRpcHostEvent) => {
-        switch (e.type) {
-            case "ack-invite": {
-                inviteCallbacks.get(e.nonce)?.(e.data);
-                inviteCallbacks.delete(e.nonce);
-                break;
-            }
-            case "ack-link": {
-                linkCallbacks.get(e.nonce)?.(e.data);
-                linkCallbacks.delete(e.nonce);
-                break;
-            }
-        }
-    });
-})();

src/main/autoStart.ts

@@ -1,13 +1,12 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { app } from "electron";
 import { existsSync, mkdirSync, renameSync, rmSync, writeFileSync } from "fs";
 import { join } from "path";
-import { stripIndent } from "shared/utils/text";
 
 interface AutoStart {
     isEnabled(): boolean;
@@ -32,15 +31,15 @@ function makeAutoStartLinux(): AutoStart {
     return {
         isEnabled: () => existsSync(file),
         enable() {
-            const desktopFile = stripIndent`
-                [Desktop Entry]
-                Type=Application
-                Name=Vesktop
-                Comment=Vesktop autostart script
-                Exec=${commandLine}
-                StartupNotify=false
-                Terminal=false
-            `;
+            const desktopFile = `
+[Desktop Entry]
+Type=Application
+Name=Vesktop
+Comment=Vesktop autostart script
+Exec=${commandLine}
+StartupNotify=false
+Terminal=false
+`.trim();
 
             mkdirSync(dir, { recursive: true });
             writeFileSync(file, desktopFile);

src/main/constants.ts

@@ -1,27 +1,32 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { app } from "electron";
-import { existsSync, mkdirSync } from "fs";
-import { dirname, join } from "path";
+import { existsSync, readdirSync, renameSync, rmdirSync } from "fs";
+import { join } from "path";
 
-const vesktopDir = dirname(process.execPath);
-
-export const PORTABLE =
-    process.platform === "win32" &&
-    !process.execPath.toLowerCase().endsWith("electron.exe") &&
-    !existsSync(join(vesktopDir, "Uninstall Vesktop.exe"));
-
-export const DATA_DIR =
-    process.env.VENCORD_USER_DATA_DIR || (PORTABLE ? join(vesktopDir, "Data") : join(app.getPath("userData")));
-
-mkdirSync(DATA_DIR, { recursive: true });
-
-const SESSION_DATA_DIR = join(DATA_DIR, "sessionData");
-app.setPath("sessionData", SESSION_DATA_DIR);
+const LEGACY_DATA_DIR = join(app.getPath("appData"), "VencordDesktop", "VencordDesktop");
+export const DATA_DIR = process.env.VENCORD_USER_DATA_DIR || join(app.getPath("userData"));
+// TODO: remove eventually
+if (existsSync(LEGACY_DATA_DIR)) {
+    try {
+        console.warn("Detected legacy settings dir", LEGACY_DATA_DIR + ".", "migrating to", DATA_DIR);
+        for (const file of readdirSync(LEGACY_DATA_DIR)) {
+            renameSync(join(LEGACY_DATA_DIR, file), join(DATA_DIR, file));
+        }
+        rmdirSync(LEGACY_DATA_DIR);
+        renameSync(
+            join(app.getPath("appData"), "VencordDesktop", "IndexedDB"),
+            join(DATA_DIR, "sessionData", "IndexedDB")
+        );
+    } catch (e) {
+        console.error("Migration failed", e);
+    }
+}
+app.setPath("sessionData", join(DATA_DIR, "sessionData"));
 
 export const VENCORD_SETTINGS_DIR = join(DATA_DIR, "settings");
 export const VENCORD_QUICKCSS_FILE = join(VENCORD_SETTINGS_DIR, "quickCss.css");
@@ -31,8 +36,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes");
 // needs to be inline require because of circular dependency
 // as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised
 export const VENCORD_FILES_DIR =
-    (require("./settings") as typeof import("./settings")).State.store.vencordDir ||
-    join(SESSION_DATA_DIR, "vencordFiles");
+    (require("./settings") as typeof import("./settings")).Settings.store.vencordDir || join(DATA_DIR, "vencordDist");
 
 export const USER_AGENT = `Vesktop/${app.getVersion()} (https://github.com/Vencord/Vesktop)`;
 
@@ -44,11 +48,11 @@ export const DEFAULT_HEIGHT = 720;
 
 export const DISCORD_HOSTNAMES = ["discord.com", "canary.discord.com", "ptb.discord.com"];
 
-const VersionString = `AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${process.versions.chrome.split(".")[0]}.0.0.0 Safari/537.36`;
 const BrowserUserAgents = {
-    darwin: `Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) ${VersionString}`,
-    linux: `Mozilla/5.0 (X11; Linux x86_64) ${VersionString}`,
-    windows: `Mozilla/5.0 (Windows NT 10.0; Win64; x64) ${VersionString}`
+    darwin: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
+    linux: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
+    windows:
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36"
 };
 
 export const BrowserUserAgent = BrowserUserAgents[process.platform] || BrowserUserAgents.windows;

src/main/firstLaunch.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { app } from "electron";
@@ -18,17 +18,16 @@ import { Settings, State } from "./settings";
 import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
 
 interface Data {
+    minimizeToTray: boolean;
     discordBranch: "stable" | "canary" | "ptb";
-    minimizeToTray?: "on";
-    autoStart?: "on";
-    importSettings?: "on";
-    richPresence?: "on";
+    autoStart: boolean;
+    importSettings: boolean;
+    richPresence: boolean;
 }
 
 export function createFirstLaunchTour() {
     const win = new BrowserWindow({
         ...SplashProps,
-        transparent: false,
         frame: true,
         autoHideMenuBar: true,
         height: 470,
@@ -45,11 +44,10 @@ export function createFirstLaunchTour() {
         if (!msg.startsWith("form:")) return;
         const data = JSON.parse(msg.slice(5)) as Data;
 
-        console.log(data);
         State.store.firstLaunch = false;
+        Settings.store.minimizeToTray = data.minimizeToTray;
         Settings.store.discordBranch = data.discordBranch;
-        Settings.store.minimizeToTray = !!data.minimizeToTray;
-        Settings.store.arRPC = !!data.richPresence;
+        Settings.store.arRPC = data.richPresence;
 
         if (data.autoStart) autoStart.enable();
 

src/main/index.ts

@@ -1,13 +1,13 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import "./ipc";
 
 import { app, BrowserWindow, nativeTheme } from "electron";
-import { autoUpdater } from "electron-updater";
+import { checkUpdates } from "updater/main";
 
 import { DATA_DIR } from "./constants";
 import { createFirstLaunchTour } from "./firstLaunch";
@@ -17,86 +17,44 @@ import { registerScreenShareHandler } from "./screenShare";
 import { Settings, State } from "./settings";
 import { isDeckGameMode } from "./utils/steamOS";
 
-if (!IS_DEV) {
-    autoUpdater.checkForUpdatesAndNotify();
+if (IS_DEV) {
+    require("source-map-support").install();
 }
 
-console.log("Vesktop v" + app.getVersion());
-
 // Make the Vencord files use our DATA_DIR
 process.env.VENCORD_USER_DATA_DIR = DATA_DIR;
 
-const isLinux = process.platform === "linux";
-
-export let enableHardwareAcceleration = true;
-
 function init() {
-    app.setAsDefaultProtocolClient("discord");
+    const { disableSmoothScroll, hardwareAcceleration } = Settings.store;
 
-    const { disableSmoothScroll, hardwareAcceleration, hardwareVideoAcceleration } = Settings.store;
+    const enabledFeatures = app.commandLine.getSwitchValue("enable-features").split(",");
+    const disabledFeatures = app.commandLine.getSwitchValue("disable-features").split(",");
 
-    const enabledFeatures = new Set(app.commandLine.getSwitchValue("enable-features").split(","));
-    const disabledFeatures = new Set(app.commandLine.getSwitchValue("disable-features").split(","));
-    app.commandLine.removeSwitch("enable-features");
-    app.commandLine.removeSwitch("disable-features");
-
-    if (hardwareAcceleration === false || process.argv.includes("--disable-gpu")) {
-        enableHardwareAcceleration = false;
+    if (hardwareAcceleration === false) {
         app.disableHardwareAcceleration();
     } else {
-        if (hardwareVideoAcceleration) {
-            enabledFeatures.add("AcceleratedVideoEncoder");
-            enabledFeatures.add("AcceleratedVideoDecoder");
-
-            if (isLinux) {
-                enabledFeatures.add("AcceleratedVideoDecodeLinuxGL");
-                enabledFeatures.add("AcceleratedVideoDecodeLinuxZeroCopyGL");
-            }
-        }
+        enabledFeatures.push("VaapiVideoDecodeLinuxGL", "VaapiVideoEncoder", "VaapiVideoDecoder");
     }
 
     if (disableSmoothScroll) {
         app.commandLine.appendSwitch("disable-smooth-scrolling");
     }
 
-    // disable renderer backgrounding to prevent the app from unloading when in the background
-    // https://github.com/electron/electron/issues/2822
-    // https://github.com/GoogleChrome/chrome-launcher/blob/5a27dd574d47a75fec0fb50f7b774ebf8a9791ba/docs/chrome-flags-for-tools.md#task-throttling
-    app.commandLine.appendSwitch("disable-renderer-backgrounding");
-    app.commandLine.appendSwitch("disable-background-timer-throttling");
-    app.commandLine.appendSwitch("disable-backgrounding-occluded-windows");
-    if (process.platform === "win32") {
-        disabledFeatures.add("CalculateNativeWinOcclusion");
-    }
-
     // work around chrome 66 disabling autoplay by default
     app.commandLine.appendSwitch("autoplay-policy", "no-user-gesture-required");
-
     // WinRetrieveSuggestionsOnlyOnDemand: Work around electron 13 bug w/ async spellchecking on Windows.
-    // HardwareMediaKeyHandling, MediaSessionService: Prevent Discord from registering as a media service.
-    disabledFeatures.add("WinRetrieveSuggestionsOnlyOnDemand");
-    disabledFeatures.add("HardwareMediaKeyHandling");
-    disabledFeatures.add("MediaSessionService");
+    // HardwareMediaKeyHandling,MediaSessionService: Prevent Discord from registering as a media service.
+    //
+    // WidgetLayering (Vencord Added): Fix DevTools context menus https://github.com/electron/electron/issues/38790
+    disabledFeatures.push(
+        "WinRetrieveSuggestionsOnlyOnDemand",
+        "HardwareMediaKeyHandling",
+        "MediaSessionService",
+        "WidgetLayering"
+    );
 
-    if (isLinux) {
-        // Support TTS on Linux using https://wiki.archlinux.org/title/Speech_dispatcher
-        app.commandLine.appendSwitch("enable-speech-dispatcher");
-    }
-
-    disabledFeatures.forEach(feat => enabledFeatures.delete(feat));
-
-    const enabledFeaturesArray = enabledFeatures.values().filter(Boolean).toArray();
-    const disabledFeaturesArray = disabledFeatures.values().filter(Boolean).toArray();
-
-    if (enabledFeaturesArray.length) {
-        app.commandLine.appendSwitch("enable-features", enabledFeaturesArray.join(","));
-        console.log("Enabled Chromium features:", enabledFeaturesArray.join(", "));
-    }
-
-    if (disabledFeaturesArray.length) {
-        app.commandLine.appendSwitch("disable-features", disabledFeaturesArray.join(","));
-        console.log("Disabled Chromium features:", disabledFeaturesArray.join(", "));
-    }
+    app.commandLine.appendSwitch("enable-features", [...new Set(enabledFeatures)].filter(Boolean).join(","));
+    app.commandLine.appendSwitch("disable-features", [...new Set(disabledFeatures)].filter(Boolean).join(","));
 
     // In the Flatpak on SteamOS the theme is detected as light, but SteamOS only has a dark mode, so we just override it
     if (isDeckGameMode) nativeTheme.themeSource = "dark";
@@ -111,6 +69,7 @@ function init() {
     });
 
     app.whenReady().then(async () => {
+        checkUpdates();
         if (process.platform === "win32") app.setAppUserModelId("dev.vencord.vesktop");
 
         registerScreenShareHandler();
@@ -144,12 +103,6 @@ async function bootstrap() {
     }
 }
 
-// MacOS only event
-export let darwinURL: string | undefined;
-app.on("open-url", (_, url) => {
-    darwinURL = url;
-});
-
 app.on("window-all-closed", () => {
     if (process.platform !== "darwin") app.quit();
 });

src/main/ipc.ts

@@ -1,26 +1,15 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 if (process.platform === "linux") import("./venmic");
 
 import { execFile } from "child_process";
-import {
-    app,
-    BrowserWindow,
-    clipboard,
-    dialog,
-    IpcMainInvokeEvent,
-    nativeImage,
-    RelaunchOptions,
-    session,
-    shell
-} from "electron";
+import { app, BrowserWindow, clipboard, dialog, nativeImage, RelaunchOptions, session, shell } from "electron";
 import { mkdirSync, readFileSync, watch } from "fs";
 import { open, readFile } from "fs/promises";
-import { enableHardwareAcceleration } from "main";
 import { release } from "os";
 import { join } from "path";
 import { debounce } from "shared/utils/debounce";
@@ -30,7 +19,7 @@ import { setBadgeCount } from "./appBadge";
 import { autoStart } from "./autoStart";
 import { VENCORD_FILES_DIR, VENCORD_QUICKCSS_FILE, VENCORD_THEMES_DIR } from "./constants";
 import { mainWin } from "./mainWindow";
-import { Settings, State } from "./settings";
+import { Settings } from "./settings";
 import { handle, handleSync } from "./utils/ipcWrappers";
 import { PopoutWindows } from "./utils/popout";
 import { isDeckGameMode, showGamePage } from "./utils/steamOS";
@@ -46,7 +35,6 @@ handleSync(IpcEvents.GET_RENDERER_CSS_FILE, () => join(__dirname, "renderer.css"
 
 handleSync(IpcEvents.GET_SETTINGS, () => Settings.plain);
 handleSync(IpcEvents.GET_VERSION, () => app.getVersion());
-handleSync(IpcEvents.GET_ENABLE_HARDWARE_ACCELERATION, () => enableHardwareAcceleration);
 
 handleSync(
     IpcEvents.SUPPORTS_WINDOWS_TRANSPARENCY,
@@ -80,34 +68,37 @@ handle(IpcEvents.SHOW_ITEM_IN_FOLDER, (_, path) => {
     shell.showItemInFolder(path);
 });
 
-function getWindow(e: IpcMainInvokeEvent, key?: string) {
-    return key ? PopoutWindows.get(key)! : (BrowserWindow.fromWebContents(e.sender) ?? mainWin);
-}
-
 handle(IpcEvents.FOCUS, () => {
     mainWin.show();
     mainWin.setSkipTaskbar(false);
 });
 
 handle(IpcEvents.CLOSE, (e, key?: string) => {
-    getWindow(e, key).close();
+    const popout = PopoutWindows.get(key!);
+    if (popout) return popout.close();
+
+    const win = BrowserWindow.fromWebContents(e.sender) ?? e.sender;
+    win.close();
 });
 
-handle(IpcEvents.MINIMIZE, (e, key?: string) => {
-    getWindow(e, key).minimize();
+handle(IpcEvents.MINIMIZE, e => {
+    mainWin.minimize();
 });
 
-handle(IpcEvents.MAXIMIZE, (e, key?: string) => {
-    const win = getWindow(e, key);
-    if (win.isMaximized()) {
-        win.unmaximize();
+handle(IpcEvents.MAXIMIZE, e => {
+    if (mainWin.isMaximized()) {
+        mainWin.unmaximize();
     } else {
-        win.maximize();
+        mainWin.maximize();
     }
 });
 
-handleSync(IpcEvents.SPELLCHECK_GET_AVAILABLE_LANGUAGES, e => {
-    e.returnValue = session.defaultSession.availableSpellCheckerLanguages;
+handle(IpcEvents.SPELLCHECK_SET_LANGUAGES, (_, languages: string[]) => {
+    const ses = session.defaultSession;
+
+    const available = ses.availableSpellCheckerLanguages;
+    const applicable = languages.filter(l => available.includes(l)).slice(0, 3);
+    if (applicable.length) ses.setSpellCheckerLanguages(applicable);
 });
 
 handle(IpcEvents.SPELLCHECK_REPLACE_MISSPELLING, (e, word: string) => {
@@ -118,14 +109,7 @@ handle(IpcEvents.SPELLCHECK_ADD_TO_DICTIONARY, (e, word: string) => {
     e.sender.session.addWordToSpellCheckerDictionary(word);
 });
 
-handleSync(IpcEvents.GET_VENCORD_DIR, e => (e.returnValue = State.store.vencordDir));
-
-handle(IpcEvents.SELECT_VENCORD_DIR, async (_e, value?: null) => {
-    if (value === null) {
-        delete State.store.vencordDir;
-        return "ok";
-    }
-
+handle(IpcEvents.SELECT_VENCORD_DIR, async () => {
     const res = await dialog.showOpenDialog(mainWin!, {
         properties: ["openDirectory"]
     });
@@ -134,9 +118,7 @@ handle(IpcEvents.SELECT_VENCORD_DIR, async (_e, value?: null) => {
     const dir = res.filePaths[0];
     if (!isValidVencordInstall(dir)) return "invalid";
 
-    State.store.vencordDir = dir;
-
-    return "ok";
+    return dir;
 });
 
 handle(IpcEvents.SET_BADGE_COUNT, (_, count: number) => setBadgeCount(count));
@@ -148,17 +130,6 @@ handle(IpcEvents.CLIPBOARD_COPY_IMAGE, async (_, buf: ArrayBuffer, src: string)
     });
 });
 
-function openDebugPage(page: string) {
-    const win = new BrowserWindow({
-        autoHideMenuBar: true
-    });
-
-    win.loadURL(page);
-}
-
-handle(IpcEvents.DEBUG_LAUNCH_GPU, () => openDebugPage("chrome://gpu"));
-handle(IpcEvents.DEBUG_LAUNCH_WEBRTC_INTERNALS, () => openDebugPage("chrome://webrtc-internals"));
-
 function readCss() {
     return readFile(VENCORD_QUICKCSS_FILE, "utf-8").catch(() => "");
 }

src/main/ipcCommands.ts

@@ -1,61 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { randomUUID } from "crypto";
-import { ipcMain } from "electron";
-import { IpcEvents } from "shared/IpcEvents";
-
-import { mainWin } from "./mainWindow";
-
-const resolvers = new Map<string, Record<"resolve" | "reject", (data: any) => void>>();
-
-export interface IpcMessage {
-    nonce: string;
-    message: string;
-    data?: any;
-}
-
-export interface IpcResponse {
-    nonce: string;
-    ok: boolean;
-    data?: any;
-}
-
-/**
- * Sends a message to the renderer process and waits for a response.
- * `data` must be serializable as it will be sent over IPC.
- *
- * You must add a handler for the message in the renderer process.
- */
-export function sendRendererCommand<T = any>(message: string, data?: any) {
-    if (mainWin.isDestroyed()) {
-        console.warn("Main window is destroyed, cannot send IPC command:", message);
-        return Promise.reject(new Error("Main window is destroyed"));
-    }
-
-    const nonce = randomUUID();
-
-    const promise = new Promise<T>((resolve, reject) => {
-        resolvers.set(nonce, { resolve, reject });
-    });
-
-    mainWin.webContents.send(IpcEvents.IPC_COMMAND, { nonce, message, data });
-
-    return promise;
-}
-
-ipcMain.on(IpcEvents.IPC_COMMAND, (_event, { nonce, ok, data }: IpcResponse) => {
-    const resolver = resolvers.get(nonce);
-    if (!resolver) throw new Error(`Unknown message: ${nonce}`);
-
-    if (ok) {
-        resolver.resolve(data);
-    } else {
-        resolver.reject(data);
-    }
-
-    resolvers.delete(nonce);
-});

src/main/mainWindow.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import {
@@ -12,14 +12,11 @@ import {
     Menu,
     MenuItemConstructorOptions,
     nativeTheme,
-    screen,
-    session,
     Tray
 } from "electron";
-import { EventEmitter } from "events";
 import { rm } from "fs/promises";
 import { join } from "path";
-import { IpcCommands, IpcEvents } from "shared/IpcEvents";
+import { IpcEvents } from "shared/IpcEvents";
 import { isTruthy } from "shared/utils/guards";
 import { once } from "shared/utils/once";
 import type { SettingsStore } from "shared/utils/SettingsStore";
@@ -37,10 +34,8 @@ import {
     MIN_WIDTH,
     VENCORD_FILES_DIR
 } from "./constants";
-import { darwinURL } from "./index";
-import { sendRendererCommand } from "./ipcCommands";
 import { Settings, State, VencordSettings } from "./settings";
-import { createSplashWindow, updateSplashMessage } from "./splash";
+import { createSplashWindow } from "./splash";
 import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
 import { applyDeckKeyboardFix, askToApplySteamLayout, isDeckGameMode } from "./utils/steamOS";
 import { downloadVencordFiles, ensureVencordFiles } from "./utils/vencordLoader";
@@ -94,7 +89,7 @@ function initTray(win: BrowserWindow) {
             click: createAboutWindow
         },
         {
-            label: "Repair Vencord",
+            label: "Update Vencord",
             async click() {
                 await downloadVencordFiles();
                 app.relaunch();
@@ -111,14 +106,14 @@ function initTray(win: BrowserWindow) {
             type: "separator"
         },
         {
-            label: "Restart",
+            label: "Relaunch",
             click() {
                 app.relaunch();
                 app.quit();
             }
         },
         {
-            label: "Quit",
+            label: "Quit Vesktop",
             click() {
                 isQuitting = true;
                 app.quit();
@@ -201,7 +196,9 @@ function initMenuBar(win: BrowserWindow) {
                       label: "Settings",
                       accelerator: "CmdOrCtrl+,",
                       async click() {
-                          sendRendererCommand(IpcCommands.NAVIGATE_SETTINGS);
+                          mainWin.webContents.executeJavaScript(
+                              "Vencord.Webpack.Common.SettingsRouter.open('My Account')"
+                          );
                       }
                   },
                   {
@@ -246,7 +243,7 @@ function initMenuBar(win: BrowserWindow) {
         }
     ] satisfies MenuItemList;
 
-    const menuItems = [
+    const menu = Menu.buildFromTemplate([
         {
             label: "Vesktop",
             role: "appMenu",
@@ -255,10 +252,8 @@ function initMenuBar(win: BrowserWindow) {
         { role: "fileMenu" },
         { role: "editMenu" },
         { role: "viewMenu" },
-        isDarwin && { role: "windowMenu" }
-    ] satisfies MenuItemList;
-
-    const menu = Menu.buildFromTemplate(menuItems.filter(isTruthy));
+        { role: "windowMenu" }
+    ]);
 
     Menu.setApplicationMenu(menu);
 }
@@ -274,9 +269,7 @@ function getWindowBoundsOptions(): BrowserWindowConstructorOptions {
         height: height ?? DEFAULT_HEIGHT
     } as BrowserWindowConstructorOptions;
 
-    const storedDisplay = screen.getAllDisplays().find(display => display.id === State.store.displayId);
-
-    if (x != null && y != null && storedDisplay) {
+    if (x != null && y != null) {
         options.x = x;
         options.y = y;
     }
@@ -302,7 +295,7 @@ function getDarwinOptions(): BrowserWindowConstructorOptions {
         options.vibrancy = "sidebar";
         options.backgroundColor = "#ffffff00";
     } else {
-        if (splashTheming !== false) {
+        if (splashTheming) {
             options.backgroundColor = splashBackground;
         } else {
             options.backgroundColor = nativeTheme.shouldUseDarkColors ? "#313338" : "#ffffff";
@@ -324,7 +317,6 @@ function initWindowBoundsListeners(win: BrowserWindow) {
 
     const saveBounds = () => {
         State.store.windowBounds = win.getBounds();
-        State.store.displayId = screen.getDisplayMatching(State.store.windowBounds).id;
     };
 
     win.on("resize", saveBounds);
@@ -336,7 +328,6 @@ function initSettingsListeners(win: BrowserWindow) {
         if (enable) initTray(win);
         else tray?.destroy();
     });
-
     addSettingsListener("disableMinSize", disable => {
         if (disable) {
             // 0 no work
@@ -365,51 +356,12 @@ function initSettingsListeners(win: BrowserWindow) {
     addSettingsListener("enableMenu", enabled => {
         win.setAutoHideMenuBar(enabled ?? false);
     });
-
-    addSettingsListener("spellCheckLanguages", languages => initSpellCheckLanguages(win, languages));
-}
-
-async function initSpellCheckLanguages(win: BrowserWindow, languages?: string[]) {
-    languages ??= await sendRendererCommand(IpcCommands.GET_LANGUAGES);
-    if (!languages) return;
-
-    const ses = session.defaultSession;
-
-    const available = ses.availableSpellCheckerLanguages;
-    const applicable = languages.filter(l => available.includes(l)).slice(0, 5);
-    if (applicable.length) ses.setSpellCheckerLanguages(applicable);
 }
 
 function initSpellCheck(win: BrowserWindow) {
     win.webContents.on("context-menu", (_, data) => {
         win.webContents.send(IpcEvents.SPELLCHECK_RESULT, data.misspelledWord, data.dictionarySuggestions);
     });
-
-    initSpellCheckLanguages(win, Settings.store.spellCheckLanguages);
-}
-
-function initDevtoolsListeners(win: BrowserWindow) {
-    win.webContents.on("devtools-opened", () => {
-        win.webContents.send(IpcEvents.DEVTOOLS_OPENED);
-    });
-    win.webContents.on("devtools-closed", () => {
-        win.webContents.send(IpcEvents.DEVTOOLS_CLOSED);
-    });
-}
-
-function initStaticTitle(win: BrowserWindow) {
-    const listener = (e: { preventDefault: Function }) => e.preventDefault();
-
-    if (Settings.store.staticTitle) win.on("page-title-updated", listener);
-
-    addSettingsListener("staticTitle", enabled => {
-        if (enabled) {
-            win.setTitle("Vesktop");
-            win.on("page-title-updated", listener);
-        } else {
-            win.off("page-title-updated", listener);
-        }
-    });
 }
 
 function createMainWindow() {
@@ -417,27 +369,21 @@ function createMainWindow() {
     removeSettingsListeners();
     removeVencordSettingsListeners();
 
-    const { staticTitle, transparencyOption, enableMenu, customTitleBar, splashTheming, splashBackground } =
-        Settings.store;
+    const { staticTitle, transparencyOption, enableMenu, customTitleBar } = Settings.store;
 
     const { frameless, transparent } = VencordSettings.store;
 
     const noFrame = frameless === true || customTitleBar === true;
-    const backgroundColor =
-        splashTheming !== false ? splashBackground : nativeTheme.shouldUseDarkColors ? "#313338" : "#ffffff";
 
     const win = (mainWin = new BrowserWindow({
-        show: Settings.store.enableSplashScreen === false,
-        backgroundColor,
+        show: false,
         webPreferences: {
             nodeIntegration: false,
             sandbox: false,
             contextIsolation: true,
             devTools: true,
             preload: join(__dirname, "preload.js"),
-            spellcheck: true,
-            // disable renderer backgrounding to prevent the app from unloading when in the background
-            backgroundThrottling: false
+            spellcheck: true
         },
         icon: ICON_PATH,
         frame: !noFrame,
@@ -462,7 +408,6 @@ function createMainWindow() {
         autoHideMenuBar: enableMenu
     }));
     win.setMenuBarVisibility(false);
-    if (process.platform === "darwin" && customTitleBar) win.setWindowButtonVisibility(false);
 
     win.on("close", e => {
         const useTray = !isDeckGameMode && Settings.store.minimizeToTray !== false && Settings.store.tray !== false;
@@ -476,68 +421,44 @@ function createMainWindow() {
         return false;
     });
 
+    if (Settings.store.staticTitle) win.on("page-title-updated", e => e.preventDefault());
+
     initWindowBoundsListeners(win);
     if (!isDeckGameMode && (Settings.store.tray ?? true) && process.platform !== "darwin") initTray(win);
     initMenuBar(win);
     makeLinksOpenExternally(win);
     initSettingsListeners(win);
     initSpellCheck(win);
-    initDevtoolsListeners(win);
-    initStaticTitle(win);
 
     win.webContents.setUserAgent(BrowserUserAgent);
 
-    // if the open-url event is fired (in index.ts) while starting up, darwinURL will be set. If not fall back to checking the process args (which Windows and Linux use for URI calling.)
-    // win.webContents.session.clearCache().then(() => {
-    loadUrl(darwinURL || process.argv.find(arg => arg.startsWith("discord://")));
-    // });
+    const subdomain =
+        Settings.store.discordBranch === "canary" || Settings.store.discordBranch === "ptb"
+            ? `${Settings.store.discordBranch}.`
+            : "";
+
+    win.loadURL(`https://${subdomain}discord.com/app`);
 
     return win;
 }
 
 const runVencordMain = once(() => require(join(VENCORD_FILES_DIR, "vencordDesktopMain.js")));
 
-const loadEvents = new EventEmitter();
-
-export function loadUrl(uri: string | undefined) {
-    const branch = Settings.store.discordBranch;
-    const subdomain = branch === "canary" || branch === "ptb" ? `${branch}.` : "";
-
-    // we do not rely on 'did-finish-load' because it fires even if loadURL fails which triggers early detruction of the splash
-    mainWin
-        .loadURL(`https://${subdomain}discord.com/${uri ? new URL(uri).pathname.slice(1) || "app" : "app"}`)
-        .then(() => loadEvents.emit("app-loaded"))
-        .catch(error => retryUrl(error.url, error.code));
-}
-
-const retryDelay = 1000;
-function retryUrl(url: string, description: string) {
-    console.log(`retrying in ${retryDelay}ms`);
-    updateSplashMessage(`Failed to load Discord: ${description}`);
-    setTimeout(() => loadUrl(url), retryDelay);
-}
-
 export async function createWindows() {
     const startMinimized = process.argv.includes("--start-minimized");
-
-    let splash: BrowserWindow | undefined;
-    if (Settings.store.enableSplashScreen !== false) {
-        splash = createSplashWindow(startMinimized);
-
-        // SteamOS letterboxes and scales it terribly, so just full screen it
-        if (isDeckGameMode) splash.setFullScreen(true);
-    }
-
+    const splash = createSplashWindow(startMinimized);
+    // SteamOS letterboxes and scales it terribly, so just full screen it
+    if (isDeckGameMode) splash.setFullScreen(true);
     await ensureVencordFiles();
     runVencordMain();
 
     mainWin = createMainWindow();
 
-    loadEvents.on("app-loaded", () => {
-        splash?.destroy();
+    mainWin.webContents.on("did-finish-load", () => {
+        splash.destroy();
 
         if (!startMinimized) {
-            if (splash) mainWin!.show();
+            mainWin!.show();
             if (State.store.maximized && !isDeckGameMode) mainWin!.maximize();
         }
 
@@ -555,15 +476,5 @@ export async function createWindows() {
         });
     });
 
-    mainWin.webContents.on("did-navigate", (_, url: string, responseCode: number) => {
-        updateSplashMessage(""); // clear the splash message
-
-        // check url to ensure app doesn't loop
-        if (responseCode >= 300 && new URL(url).pathname !== `/app`) {
-            loadUrl(undefined);
-            console.warn(`'did-navigate': Caught bad page response: ${responseCode}, redirecting to main app`);
-        }
-    });
-
     initArRPC();
 }

src/main/mediaPermissions.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { session, systemPreferences } from "electron";
@@ -12,13 +12,11 @@ export function registerMediaPermissionsHandler() {
     session.defaultSession.setPermissionRequestHandler(async (_webContents, permission, callback, details) => {
         let granted = true;
 
-        if ("mediaTypes" in details) {
-            if (details.mediaTypes?.includes("audio")) {
-                granted &&= await systemPreferences.askForMediaAccess("microphone");
-            }
-            if (details.mediaTypes?.includes("video")) {
-                granted &&= await systemPreferences.askForMediaAccess("camera");
-            }
+        if (details.mediaTypes?.includes("audio")) {
+            granted = await systemPreferences.askForMediaAccess("microphone");
+        }
+        if (details.mediaTypes?.includes("video")) {
+            granted &&= await systemPreferences.askForMediaAccess("camera");
         }
 
         callback(granted);

src/main/screenShare.ts

@@ -1,14 +1,13 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { desktopCapturer, session, Streams } from "electron";
 import type { StreamPick } from "renderer/components/ScreenSharePicker";
-import { IpcCommands, IpcEvents } from "shared/IpcEvents";
+import { IpcEvents } from "shared/IpcEvents";
 
-import { sendRendererCommand } from "./ipcCommands";
 import { handle } from "./utils/ipcWrappers";
 
 const isWayland =
@@ -50,11 +49,11 @@ export function registerScreenShareHandler() {
         if (isWayland) {
             const video = data[0];
             if (video) {
-                const stream = await sendRendererCommand<StreamPick>(IpcCommands.SCREEN_SHARE_PICKER, {
-                    screens: [video],
-                    skipPicker: true
-                }).catch(() => null);
-
+                const stream = await request.frame
+                    .executeJavaScript(
+                        `Vesktop.Components.ScreenShare.openScreenSharePicker(${JSON.stringify([video])},true)`
+                    )
+                    .catch(() => null);
                 if (stream === null) return callback({});
             }
 
@@ -62,13 +61,13 @@ export function registerScreenShareHandler() {
             return;
         }
 
-        const choice = await sendRendererCommand<StreamPick>(IpcCommands.SCREEN_SHARE_PICKER, {
-            screens: data,
-            skipPicker: false
-        }).catch(e => {
-            console.error("Error during screenshare picker", e);
-            return null;
-        });
+        const choice = await request.frame
+            .executeJavaScript(`Vesktop.Components.ScreenShare.openScreenSharePicker(${JSON.stringify(data)})`)
+            .then(e => e as StreamPick)
+            .catch(e => {
+                console.error("Error during screenshare picker", e);
+                return null;
+            });
 
         if (!choice) return callback({});
 

src/main/settings.ts

@@ -1,10 +1,10 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { mkdirSync, readFileSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
 import type { Settings as TSettings, State as TState } from "shared/settings";
 import { SettingsStore } from "shared/utils/SettingsStore";
@@ -35,5 +35,30 @@ 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.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 [
+        "firstLaunch",
+        "maximized",
+        "minimized",
+        "skippedUpdate",
+        "steamOSLayoutVersion",
+        "windowBounds"
+    ] as const) {
+        state[prop] = Settings.plain[prop];
+        delete Settings.plain[prop];
+    }
+    Settings.markAsChanged();
+    writeFileSync(STATE_FILE, JSON.stringify(state, null, 4));
+}
+
 export const State = loadSettings<TState>(STATE_FILE, "Vesktop state");

src/main/splash.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { BrowserWindow } from "electron";
@@ -11,23 +11,18 @@ import { ICON_PATH, VIEW_DIR } from "shared/paths";
 
 import { Settings } from "./settings";
 
-let splash: BrowserWindow | undefined;
-
 export function createSplashWindow(startMinimized = false) {
-    splash = new BrowserWindow({
+    const splash = new BrowserWindow({
         ...SplashProps,
         icon: ICON_PATH,
-        show: !startMinimized,
-        webPreferences: {
-            preload: join(__dirname, "splashPreload.js")
-        }
+        show: !startMinimized
     });
 
     splash.loadFile(join(VIEW_DIR, "splash.html"));
 
     const { splashBackground, splashColor, splashTheming } = Settings.store;
 
-    if (splashTheming !== false) {
+    if (splashTheming) {
         if (splashColor) {
             const semiTransparentSplashColor = splashColor.replace("rgb(", "rgba(").replace(")", ", 0.2)");
 
@@ -42,7 +37,3 @@ export function createSplashWindow(startMinimized = false) {
 
     return splash;
 }
-
-export function updateSplashMessage(message: string) {
-    if (splash && !splash.isDestroyed()) splash.webContents.send("update-splash-message", message);
-}

src/main/utils/http.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { createWriteStream } from "fs";

src/main/utils/ipcWrappers.ts

@@ -1,40 +1,30 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { ipcMain, IpcMainEvent, IpcMainInvokeEvent, WebFrameMain } from "electron";
 import { DISCORD_HOSTNAMES } from "main/constants";
 import { IpcEvents } from "shared/IpcEvents";
 
-export function validateSender(frame: WebFrameMain | null, event: string) {
-    if (!frame) throw new Error(`ipc[${event}]: No sender frame`);
-    if (!frame.url) return;
-
-    try {
-        var { hostname, protocol } = new URL(frame.url);
-    } catch (e) {
-        throw new Error(`ipc[${event}]: Invalid URL ${frame.url}`);
-    }
-
+export function validateSender(frame: WebFrameMain) {
+    const { hostname, protocol } = new URL(frame.url);
     if (protocol === "file:") return;
 
-    if (!DISCORD_HOSTNAMES.includes(hostname)) {
-        throw new Error(`ipc[${event}]: Disallowed hostname ${hostname}`);
-    }
+    if (!DISCORD_HOSTNAMES.includes(hostname)) throw new Error("ipc: Disallowed host " + hostname);
 }
 
 export function handleSync(event: IpcEvents, cb: (e: IpcMainEvent, ...args: any[]) => any) {
     ipcMain.on(event, (e, ...args) => {
-        validateSender(e.senderFrame, event);
+        validateSender(e.senderFrame);
         e.returnValue = cb(e, ...args);
     });
 }
 
 export function handle(event: IpcEvents, cb: (e: IpcMainInvokeEvent, ...args: any[]) => any) {
     ipcMain.handle(event, (e, ...args) => {
-        validateSender(e.senderFrame, event);
+        validateSender(e.senderFrame);
         return cb(e, ...args);
     });
 }

src/main/utils/makeLinksOpenExternally.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { BrowserWindow, shell } from "electron";
@@ -50,7 +50,7 @@ export function handleExternalUrl(url: string, protocol?: string): { action: "de
 export function makeLinksOpenExternally(win: BrowserWindow) {
     win.webContents.setWindowOpenHandler(({ url, frameName, features }) => {
         try {
-            var { protocol, hostname, pathname, searchParams } = new URL(url);
+            var { protocol, hostname, pathname } = new URL(url);
         } catch {
             return { action: "deny" };
         }
@@ -59,10 +59,8 @@ export function makeLinksOpenExternally(win: BrowserWindow) {
             return createOrFocusPopup(frameName, features);
         }
 
-        if (url === "about:blank") return { action: "allow" };
-
-        // Drop the static temp page Discord web loads for the connections popout
-        if (frameName === "authorize" && searchParams.get("loading") === "true") return { action: "deny" };
+        if (url === "about:blank" || (frameName === "authorize" && DISCORD_HOSTNAMES.includes(hostname)))
+            return { action: "allow" };
 
         return handleExternalUrl(url, protocol);
     });

src/main/utils/popout.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { BrowserWindow, BrowserWindowConstructorOptions } from "electron";

src/main/utils/steamOS.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { BrowserWindow, dialog } from "electron";

src/main/utils/vencordLoader.ts

@@ -1,11 +1,10 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { mkdirSync } from "fs";
-import { access, constants as FsConstants, writeFile } from "fs/promises";
+import { existsSync, mkdirSync } from "fs";
 import { join } from "path";
 
 import { USER_AGENT, VENCORD_FILES_DIR } from "../constants";
@@ -57,20 +56,13 @@ export async function downloadVencordFiles() {
     );
 }
 
-const existsAsync = (path: string) =>
-    access(path, FsConstants.F_OK)
-        .then(() => true)
-        .catch(() => false);
-
-export async function isValidVencordInstall(dir: string) {
-    const results = await Promise.all(["package.json", ...FILES_TO_DOWNLOAD].map(f => existsAsync(join(dir, f))));
-    return !results.includes(false);
+export function isValidVencordInstall(dir: string) {
+    return FILES_TO_DOWNLOAD.every(f => existsSync(join(dir, f)));
 }
 
 export async function ensureVencordFiles() {
-    if (await isValidVencordInstall(VENCORD_FILES_DIR)) return;
-
+    if (isValidVencordInstall(VENCORD_FILES_DIR)) return;
     mkdirSync(VENCORD_FILES_DIR, { recursive: true });
 
-    await Promise.all([downloadVencordFiles(), writeFile(join(VENCORD_FILES_DIR, "package.json"), "{}")]);
+    await downloadVencordFiles();
 }

src/main/venmic.ts

@@ -1,16 +1,16 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import type { LinkData, Node, PatchBay as PatchBayType } from "@vencord/venmic";
+import type { PatchBay as PatchBayType } from "@vencord/venmic";
 import { app, ipcMain } from "electron";
 import { join } from "path";
 import { IpcEvents } from "shared/IpcEvents";
 import { STATIC_DIR } from "shared/paths";
 
-import { Settings } from "./settings";
+type LinkData = Parameters<PatchBayType["link"]>[0];
 
 let PatchBay: typeof PatchBayType | undefined;
 let patchBayInstance: PatchBayType | undefined;
@@ -69,64 +69,47 @@ function getRendererAudioServicePid() {
 ipcMain.handle(IpcEvents.VIRT_MIC_LIST, () => {
     const audioPid = getRendererAudioServicePid();
 
-    const { granularSelect } = Settings.store.audio ?? {};
+    const list = obtainVenmic()
+        ?.list()
+        .filter(s => s["application.process.id"] !== audioPid)
+        .map(s => s["application.name"]);
 
-    const targets = obtainVenmic()
-        ?.list(granularSelect ? ["node.name"] : undefined)
-        .filter(s => s["application.process.id"] !== audioPid);
+    const uniqueTargets = [...new Set(list)];
 
-    return targets ? { ok: true, targets, hasPipewirePulse } : { ok: false, isGlibCxxOutdated };
+    return list ? { ok: true, targets: uniqueTargets, hasPipewirePulse } : { ok: false, isGlibCxxOutdated };
 });
 
-ipcMain.handle(IpcEvents.VIRT_MIC_START, (_, include: Node[]) => {
+ipcMain.handle(IpcEvents.VIRT_MIC_START, (_, targets: string[], workaround?: boolean) => {
     const pid = getRendererAudioServicePid();
-    const { ignoreDevices, ignoreInputMedia, ignoreVirtual, workaround } = Settings.store.audio ?? {};
 
     const data: LinkData = {
-        include,
-        exclude: [{ "application.process.id": pid }],
-        ignore_devices: ignoreDevices
+        include: targets.map(target => ({ key: "application.name", value: target })),
+        exclude: [{ key: "application.process.id", value: pid }]
     };
 
-    if (ignoreInputMedia ?? true) {
-        data.exclude.push({ "media.class": "Stream/Input/Audio" });
-    }
-
-    if (ignoreVirtual) {
-        data.exclude.push({ "node.virtual": "true" });
-    }
-
     if (workaround) {
-        data.workaround = [{ "application.process.id": pid, "media.name": "RecordStream" }];
+        data.workaround = [
+            { key: "application.process.id", value: pid },
+            { key: "media.name", value: "RecordStream" }
+        ];
     }
 
     return obtainVenmic()?.link(data);
 });
 
-ipcMain.handle(IpcEvents.VIRT_MIC_START_SYSTEM, (_, exclude: Node[]) => {
+ipcMain.handle(IpcEvents.VIRT_MIC_START_SYSTEM, (_, workaround?: boolean, onlyDefaultSpeakers?: boolean) => {
     const pid = getRendererAudioServicePid();
 
-    const { workaround, ignoreDevices, ignoreInputMedia, ignoreVirtual, onlySpeakers, onlyDefaultSpeakers } =
-        Settings.store.audio ?? {};
-
     const data: LinkData = {
-        include: [],
-        exclude: [{ "application.process.id": pid }, ...exclude],
-        only_speakers: onlySpeakers,
-        ignore_devices: ignoreDevices,
+        exclude: [{ key: "application.process.id", value: pid }],
         only_default_speakers: onlyDefaultSpeakers
     };
 
-    if (ignoreInputMedia ?? true) {
-        data.exclude.push({ "media.class": "Stream/Input/Audio" });
-    }
-
-    if (ignoreVirtual) {
-        data.exclude.push({ "node.virtual": "true" });
-    }
-
     if (workaround) {
-        data.workaround = [{ "application.process.id": pid, "media.name": "RecordStream" }];
+        data.workaround = [
+            { key: "application.process.id", value: pid },
+            { key: "media.name", value: "RecordStream" }
+        ];
     }
 
     return obtainVenmic()?.link(data);

src/module.d.ts

@@ -1,10 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vesktop contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-declare module "__patches__" {
-    const never: never;
-    export default never;
-}

src/preload/VesktopNative.ts

@@ -1,13 +1,12 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { Node } from "@vencord/venmic";
 import { ipcRenderer } from "electron";
-import { IpcMessage, IpcResponse } from "main/ipcCommands";
 import type { Settings } from "shared/settings";
+import type { LiteralUnion } from "type-fest";
 
 import { IpcEvents } from "../shared/IpcEvents";
 import { invoke, sendSync } from "./typedIpc";
@@ -20,19 +19,12 @@ ipcRenderer.on(IpcEvents.SPELLCHECK_RESULT, (_, w: string, s: string[]) => {
     spellCheckCallbacks.forEach(cb => cb(w, s));
 });
 
-let onDevtoolsOpen = () => {};
-let onDevtoolsClose = () => {};
-
-ipcRenderer.on(IpcEvents.DEVTOOLS_OPENED, () => onDevtoolsOpen());
-ipcRenderer.on(IpcEvents.DEVTOOLS_CLOSED, () => onDevtoolsClose());
-
 export const VesktopNative = {
     app: {
         relaunch: () => invoke<void>(IpcEvents.RELAUNCH),
         getVersion: () => sendSync<void>(IpcEvents.GET_VERSION),
         setBadgeCount: (count: number) => invoke<void>(IpcEvents.SET_BADGE_COUNT, count),
-        supportsWindowsTransparency: () => sendSync<boolean>(IpcEvents.SUPPORTS_WINDOWS_TRANSPARENCY),
-        getEnableHardwareAcceleration: () => sendSync<boolean>(IpcEvents.GET_ENABLE_HARDWARE_ACCELERATION)
+        supportsWindowsTransparency: () => sendSync<boolean>(IpcEvents.SUPPORTS_WINDOWS_TRANSPARENCY)
     },
     autostart: {
         isEnabled: () => sendSync<boolean>(IpcEvents.AUTOSTART_ENABLED),
@@ -41,15 +33,14 @@ export const VesktopNative = {
     },
     fileManager: {
         showItemInFolder: (path: string) => invoke<void>(IpcEvents.SHOW_ITEM_IN_FOLDER, path),
-        getVencordDir: () => sendSync<string | undefined>(IpcEvents.GET_VENCORD_DIR),
-        selectVencordDir: (value?: null) => invoke<"cancelled" | "invalid" | "ok">(IpcEvents.SELECT_VENCORD_DIR, value)
+        selectVencordDir: () => invoke<LiteralUnion<"cancelled" | "invalid", string>>(IpcEvents.SELECT_VENCORD_DIR)
     },
     settings: {
         get: () => sendSync<Settings>(IpcEvents.GET_SETTINGS),
         set: (settings: Settings, path?: string) => invoke<void>(IpcEvents.SET_SETTINGS, settings, path)
     },
     spellcheck: {
-        getAvailableLanguages: () => sendSync<string[]>(IpcEvents.SPELLCHECK_GET_AVAILABLE_LANGUAGES),
+        setLanguages: (languages: readonly string[]) => invoke<void>(IpcEvents.SPELLCHECK_SET_LANGUAGES, languages),
         onSpellcheckResult(cb: SpellCheckerResultCallback) {
             spellCheckCallbacks.add(cb);
         },
@@ -62,12 +53,8 @@ export const VesktopNative = {
     win: {
         focus: () => invoke<void>(IpcEvents.FOCUS),
         close: (key?: string) => invoke<void>(IpcEvents.CLOSE, key),
-        minimize: (key?: string) => invoke<void>(IpcEvents.MINIMIZE, key),
-        maximize: (key?: string) => invoke<void>(IpcEvents.MAXIMIZE, key),
-        setDevtoolsCallbacks: (onOpen: () => void, onClose: () => void) => {
-            onDevtoolsOpen = onOpen;
-            onDevtoolsClose = onClose;
-        }
+        minimize: () => invoke<void>(IpcEvents.MINIMIZE),
+        maximize: () => invoke<void>(IpcEvents.MAXIMIZE)
     },
     capturer: {
         getLargeThumbnail: (id: string) => invoke<string>(IpcEvents.CAPTURER_GET_LARGE_THUMBNAIL, id)
@@ -76,24 +63,20 @@ export const VesktopNative = {
     virtmic: {
         list: () =>
             invoke<
-                { ok: false; isGlibCxxOutdated: boolean } | { ok: true; targets: Node[]; hasPipewirePulse: boolean }
+                { ok: false; isGlibCxxOutdated: boolean } | { ok: true; targets: string[]; hasPipewirePulse: boolean }
             >(IpcEvents.VIRT_MIC_LIST),
-        start: (include: Node[]) => invoke<void>(IpcEvents.VIRT_MIC_START, include),
-        startSystem: (exclude: Node[]) => invoke<void>(IpcEvents.VIRT_MIC_START_SYSTEM, exclude),
+        start: (targets: string[], workaround?: boolean) => invoke<void>(IpcEvents.VIRT_MIC_START, targets, workaround),
+        startSystem: (workaround?: boolean, onlyDefaultSpeakers?: boolean) =>
+            invoke<void>(IpcEvents.VIRT_MIC_START_SYSTEM, workaround, onlyDefaultSpeakers),
         stop: () => invoke<void>(IpcEvents.VIRT_MIC_STOP)
     },
+    arrpc: {
+        onActivity(cb: (data: string) => void) {
+            ipcRenderer.on(IpcEvents.ARRPC_ACTIVITY, (_, data: string) => cb(data));
+        }
+    },
     clipboard: {
         copyImage: (imageBuffer: Uint8Array, imageSrc: string) =>
             invoke<void>(IpcEvents.CLIPBOARD_COPY_IMAGE, imageBuffer, imageSrc)
-    },
-    debug: {
-        launchGpu: () => invoke<void>(IpcEvents.DEBUG_LAUNCH_GPU),
-        launchWebrtcInternals: () => invoke<void>(IpcEvents.DEBUG_LAUNCH_WEBRTC_INTERNALS)
-    },
-    commands: {
-        onCommand(cb: (message: IpcMessage) => void) {
-            ipcRenderer.on(IpcEvents.IPC_COMMAND, (_, message) => cb(message));
-        },
-        respond: (response: IpcResponse) => ipcRenderer.send(IpcEvents.IPC_COMMAND, response)
     }
 };

src/preload/index.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { contextBridge, ipcRenderer, webFrame } from "electron";
@@ -40,3 +40,5 @@ if (IS_DEV) {
     });
 }
 // #endregion
+
+VesktopNative.spellcheck.setLanguages(window.navigator.languages);

src/preload/splash.ts

@@ -1,13 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vesktop contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { contextBridge, ipcRenderer } from "electron";
-
-contextBridge.exposeInMainWorld("VesktopSplashNative", {
-    onUpdateMessage(callback: (message: string) => void) {
-        ipcRenderer.on("update-splash-message", (_, message: string) => callback(message));
-    }
-});

src/preload/typedIpc.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { ipcRenderer } from "electron";

src/renderer/appBadge.ts

@@ -1,13 +1,12 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { filters, waitFor } from "@vencord/types/webpack";
 import { RelationshipStore } from "@vencord/types/webpack/common";
 
-import { VesktopLogger } from "./logger";
 import { Settings } from "./settings";
 
 let GuildReadStateStore: any;
@@ -27,7 +26,7 @@ export function setBadge() {
 
         VesktopNative.app.setBadgeCount(totalCount);
     } catch (e) {
-        VesktopLogger.error("Failed to update badge count", e);
+        console.error(e);
     }
 }
 

src/renderer/arrpc.ts

@@ -1,68 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Logger } from "@vencord/types/utils";
-import { findLazy, findStoreLazy, onceReady } from "@vencord/types/webpack";
-import { FluxDispatcher, InviteActions } from "@vencord/types/webpack/common";
-import { IpcCommands } from "shared/IpcEvents";
-
-import { onIpcCommand } from "./ipcCommands";
-import { Settings } from "./settings";
-
-const logger = new Logger("VesktopRPC", "#5865f2");
-const StreamerModeStore = findStoreLazy("StreamerModeStore");
-
-const arRPC = Vencord.Plugins.plugins["WebRichPresence (arRPC)"] as any as {
-    handleEvent(e: MessageEvent): void;
-};
-
-onIpcCommand(IpcCommands.RPC_ACTIVITY, async jsonData => {
-    if (!Settings.store.arRPC) return;
-
-    await onceReady;
-
-    const data = JSON.parse(jsonData);
-
-    if (data.socketId === "STREAMERMODE" && StreamerModeStore.autoToggle) {
-        FluxDispatcher.dispatch({
-            type: "STREAMER_MODE_UPDATE",
-            key: "enabled",
-            value: data.activity?.application_id === "STREAMERMODE"
-        });
-        return;
-    }
-
-    arRPC.handleEvent(new MessageEvent("message", { data: jsonData }));
-});
-
-onIpcCommand(IpcCommands.RPC_INVITE, async code => {
-    const { invite } = await InviteActions.resolveInvite(code, "Desktop Modal");
-    if (!invite) return false;
-
-    VesktopNative.win.focus();
-
-    FluxDispatcher.dispatch({
-        type: "INVITE_MODAL_OPEN",
-        invite,
-        code,
-        context: "APP"
-    });
-
-    return true;
-});
-
-const { DEEP_LINK } = findLazy(m => m.DEEP_LINK?.handler);
-
-onIpcCommand(IpcCommands.RPC_DEEP_LINK, async data => {
-    logger.debug("Opening deep link:", data);
-    try {
-        DEEP_LINK.handler({ args: data });
-        return true;
-    } catch (err) {
-        logger.error("Failed to open deep link:", err);
-        return false;
-    }
-});

src/renderer/common.ts

@@ -1,9 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vesktop contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { findStoreLazy } from "@vencord/types/webpack";
-
-export const MediaEngineStore = findStoreLazy("MediaEngineStore");

src/renderer/components/ScreenSharePicker.tsx

@@ -1,13 +1,13 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import "./screenSharePicker.css";
 
-import { closeModal, Logger, Modals, ModalSize, openModal, useAwaiter } from "@vencord/types/utils";
-import { onceReady } from "@vencord/types/webpack";
+import { closeModal, Logger, Margins, Modals, ModalSize, openModal, useAwaiter } from "@vencord/types/utils";
+import { findStoreLazy, onceReady } from "@vencord/types/webpack";
 import {
     Button,
     Card,
@@ -19,36 +19,26 @@ import {
     UserStore,
     useState
 } from "@vencord/types/webpack/common";
-import { Node } from "@vencord/venmic";
 import type { Dispatch, SetStateAction } from "react";
-import { MediaEngineStore } from "renderer/common";
 import { addPatch } from "renderer/patches/shared";
-import { State, useSettings, useVesktopState } from "renderer/settings";
-import { classNameFactory, isLinux, isWindows } from "renderer/utils";
+import { isLinux, isWindows } from "renderer/utils";
 
-const StreamResolutions = ["480", "720", "1080", "1440", "2160"] as const;
+const StreamResolutions = ["480", "720", "1080", "1440"] as const;
 const StreamFps = ["15", "30", "60"] as const;
 
-const cl = classNameFactory("vcd-screen-picker-");
+const MediaEngineStore = findStoreLazy("MediaEngineStore");
 
 export type StreamResolution = (typeof StreamResolutions)[number];
 export type StreamFps = (typeof StreamFps)[number];
 
-type SpecialSource = "None" | "Entire System";
-
-type AudioSource = SpecialSource | Node;
-type AudioSources = SpecialSource | Node[];
-
-interface AudioItem {
-    name: string;
-    value: AudioSource;
-}
-
 interface StreamSettings {
+    resolution: StreamResolution;
+    fps: StreamFps;
     audio: boolean;
+    audioSource?: string;
     contentHint?: string;
-    includeSources?: AudioSources;
-    excludeSources?: AudioSources;
+    workaround?: boolean;
+    onlyDefaultSpeakers?: boolean;
 }
 
 export interface StreamPick extends StreamSettings {
@@ -73,14 +63,27 @@ addPatch({
                 match: /this.localWant=/,
                 replace: "$self.patchStreamQuality(this);$&"
             }
+        },
+        {
+            find: "x-google-max-bitrate",
+            replacement: [
+                {
+                    // eslint-disable-next-line no-useless-escape
+                    match: /"x-google-max-bitrate=".concat\(\i\)/,
+                    replace: '"x-google-max-bitrate=".concat("80_000")'
+                },
+                {
+                    match: /;level-asymmetry-allowed=1/,
+                    replace: ";b=AS:800000;level-asymmetry-allowed=1"
+                }
+            ]
         }
     ],
     patchStreamQuality(opts: any) {
-        const { screenshareQuality } = State.store;
-        if (!screenshareQuality) return;
+        if (!currentSettings) return;
 
-        const framerate = Number(screenshareQuality.frameRate);
-        const height = Number(screenshareQuality.resolution);
+        const framerate = Number(currentSettings.fps);
+        const height = Number(currentSettings.resolution);
         const width = Math.round(height * (16 / 9));
 
         Object.assign(opts, {
@@ -129,17 +132,13 @@ export function openScreenSharePicker(screens: Source[], skipPicker: boolean) {
                     modalProps={props}
                     submit={async v => {
                         didSubmit = true;
-
-                        if (v.includeSources && v.includeSources !== "None") {
-                            if (v.includeSources === "Entire System") {
-                                await VesktopNative.virtmic.startSystem(
-                                    !v.excludeSources || isSpecialSource(v.excludeSources) ? [] : v.excludeSources
-                                );
+                        if (v.audioSource && v.audioSource !== "None") {
+                            if (v.audioSource === "Entire System") {
+                                await VesktopNative.virtmic.startSystem(v.workaround);
                             } else {
-                                await VesktopNative.virtmic.start(v.includeSources);
+                                await VesktopNative.virtmic.start([v.audioSource], v.workaround);
                             }
                         }
-
                         resolve(v);
                     }}
                     close={() => {
@@ -161,188 +160,20 @@ export function openScreenSharePicker(screens: Source[], skipPicker: boolean) {
 
 function ScreenPicker({ screens, chooseScreen }: { screens: Source[]; chooseScreen: (id: string) => void }) {
     return (
-        <div className={cl("screen-grid")}>
+        <div className="vcd-screen-picker-grid">
             {screens.map(({ id, name, url }) => (
-                <label key={id} className={cl("screen-label")}>
-                    <input
-                        type="radio"
-                        className={cl("screen-radio")}
-                        name="screen"
-                        value={id}
-                        onChange={() => chooseScreen(id)}
-                    />
+                <label key={id}>
+                    <input type="radio" name="screen" value={id} onChange={() => chooseScreen(id)} />
 
                     <img src={url} alt="" />
-                    <Text className={cl("screen-name")} variant="text-sm/normal">
-                        {name}
-                    </Text>
+                    <Text variant="text-sm/normal">{name}</Text>
                 </label>
             ))}
         </div>
     );
 }
 
-function AudioSettingsModal({
-    modalProps,
-    close,
-    setAudioSources
-}: {
-    modalProps: any;
-    close: () => void;
-    setAudioSources: (s: AudioSources) => void;
-}) {
-    const Settings = useSettings();
-
-    return (
-        <Modals.ModalRoot {...modalProps} size={ModalSize.MEDIUM}>
-            <Modals.ModalHeader className={cl("header")}>
-                <Forms.FormTitle tag="h2" className={cl("header-title")}>
-                    Venmic Settings
-                </Forms.FormTitle>
-                <Modals.ModalCloseButton onClick={close} />
-            </Modals.ModalHeader>
-            <Modals.ModalContent className={cl("modal")}>
-                <Switch
-                    hideBorder
-                    onChange={v => (Settings.audio = { ...Settings.audio, workaround: v })}
-                    value={Settings.audio?.workaround ?? false}
-                    note={
-                        <>
-                            Work around an issue that causes the microphone to be shared instead of the correct audio.
-                            Only enable if you're experiencing this issue.
-                        </>
-                    }
-                >
-                    Microphone Workaround
-                </Switch>
-                <Switch
-                    hideBorder
-                    onChange={v => (Settings.audio = { ...Settings.audio, onlySpeakers: v })}
-                    value={Settings.audio?.onlySpeakers ?? true}
-                    note={
-                        <>
-                            When sharing entire desktop audio, only share apps that play to a speaker. You may want to
-                            disable this when using "mix bussing".
-                        </>
-                    }
-                >
-                    Only Speakers
-                </Switch>
-                <Switch
-                    hideBorder
-                    onChange={v => (Settings.audio = { ...Settings.audio, onlyDefaultSpeakers: v })}
-                    value={Settings.audio?.onlyDefaultSpeakers ?? true}
-                    note={
-                        <>
-                            When sharing entire desktop audio, only share apps that play to the <b>default</b> speakers.
-                            You may want to disable this when using "mix bussing".
-                        </>
-                    }
-                >
-                    Only Default Speakers
-                </Switch>
-                <Switch
-                    hideBorder
-                    onChange={v => (Settings.audio = { ...Settings.audio, ignoreInputMedia: v })}
-                    value={Settings.audio?.ignoreInputMedia ?? true}
-                    note={<>Exclude nodes that are intended to capture audio.</>}
-                >
-                    Ignore Inputs
-                </Switch>
-                <Switch
-                    hideBorder
-                    onChange={v => (Settings.audio = { ...Settings.audio, ignoreVirtual: v })}
-                    value={Settings.audio?.ignoreVirtual ?? false}
-                    note={
-                        <>
-                            Exclude virtual nodes, such as nodes belonging to loopbacks. This might be useful when using
-                            "mix bussing".
-                        </>
-                    }
-                >
-                    Ignore Virtual
-                </Switch>
-                <Switch
-                    hideBorder
-                    onChange={v =>
-                        (Settings.audio = {
-                            ...Settings.audio,
-                            ignoreDevices: v,
-                            deviceSelect: v ? false : Settings.audio?.deviceSelect
-                        })
-                    }
-                    value={Settings.audio?.ignoreDevices ?? true}
-                    note={<>Exclude device nodes, such as nodes belonging to microphones or speakers.</>}
-                >
-                    Ignore Devices
-                </Switch>
-                <Switch
-                    hideBorder
-                    onChange={value => {
-                        Settings.audio = { ...Settings.audio, granularSelect: value };
-                        setAudioSources("None");
-                    }}
-                    value={Settings.audio?.granularSelect ?? false}
-                    note={<>Allow to select applications more granularly.</>}
-                >
-                    Granular Selection
-                </Switch>
-                <Switch
-                    hideBorder
-                    onChange={value => {
-                        Settings.audio = { ...Settings.audio, deviceSelect: value };
-                        setAudioSources("None");
-                    }}
-                    value={Settings.audio?.deviceSelect ?? false}
-                    disabled={Settings.audio?.ignoreDevices}
-                    note={
-                        <>
-                            Allow to select devices such as microphones. Requires <b>Ignore Devices</b> to be turned
-                            off.
-                        </>
-                    }
-                >
-                    Device Selection
-                </Switch>
-            </Modals.ModalContent>
-            <Modals.ModalFooter className={cl("footer")}>
-                <Button color={Button.Colors.TRANSPARENT} onClick={close}>
-                    Back
-                </Button>
-            </Modals.ModalFooter>
-        </Modals.ModalRoot>
-    );
-}
-
-function OptionRadio<Settings extends object, Key extends keyof Settings>(props: {
-    options: Array<string> | ReadonlyArray<string>;
-    labels?: Array<string>;
-    settings: Settings;
-    settingsKey: Key;
-    onChange: (option: string) => void;
-}) {
-    const { options, settings, settingsKey, labels, onChange } = props;
-
-    return (
-        <div className={cl("option-radios")}>
-            {(options as string[]).map((option, idx) => (
-                <label className={cl("option-radio")} data-checked={settings[settingsKey] === option} key={option}>
-                    <Text variant="text-sm/bold">{labels?.[idx] ?? option}</Text>
-                    <input
-                        className={cl("option-input")}
-                        type="radio"
-                        name="fps"
-                        value={option}
-                        checked={settings[settingsKey] === option}
-                        onChange={() => onChange(option)}
-                    />
-                </label>
-            ))}
-        </div>
-    );
-}
-
-function StreamSettingsUi({
+function StreamSettings({
     source,
     settings,
     setSettings,
@@ -353,9 +184,6 @@ function StreamSettingsUi({
     setSettings: Dispatch<SetStateAction<StreamSettings>>;
     skipPicker: boolean;
 }) {
-    const Settings = useSettings();
-    const qualitySettings = State.store.screenshareQuality!;
-
     const [thumb] = useAwaiter(
         () => (skipPicker ? Promise.resolve(source.url) : VesktopNative.capturer.getLargeThumbnail(source.id)),
         {
@@ -364,318 +192,227 @@ function StreamSettingsUi({
         }
     );
 
-    const openSettings = () => {
-        const key = openModal(props => (
-            <AudioSettingsModal
-                modalProps={props}
-                close={() => props.onClose()}
-                setAudioSources={sources =>
-                    setSettings(s => ({ ...s, includeSources: sources, excludeSources: sources }))
-                }
-            />
-        ));
-    };
-
     return (
-        <div>
-            <Forms.FormTitle>What you're streaming</Forms.FormTitle>
-            <Card className={cl("card", "preview")}>
-                <img src={thumb} alt="" className={cl(isLinux ? "preview-img-linux" : "preview-img")} />
-                <Text variant="text-sm/normal">{source.name}</Text>
-            </Card>
+        <div className="vcd-screen-picker-settings-grid">
+            <div>
+                <Forms.FormTitle>What you're streaming</Forms.FormTitle>
+                <Card className="vcd-screen-picker-card vcd-screen-picker-preview">
+                    <img src={thumb} alt="" />
+                    <Text variant="text-sm/normal">{source.name}</Text>
+                </Card>
 
-            <Forms.FormTitle>Stream Settings</Forms.FormTitle>
+                <Forms.FormTitle>Stream Settings</Forms.FormTitle>
 
-            <Card className={cl("card")}>
-                <div className={cl("quality")}>
-                    <section className={cl("quality-section")}>
-                        <Forms.FormTitle>Resolution</Forms.FormTitle>
-                        <OptionRadio
-                            options={StreamResolutions}
-                            settings={qualitySettings}
-                            settingsKey="resolution"
-                            onChange={value => (qualitySettings.resolution = value)}
-                        />
-                    </section>
-
-                    <section className={cl("quality-section")}>
-                        <Forms.FormTitle>Frame Rate</Forms.FormTitle>
-                        <OptionRadio
-                            options={StreamFps}
-                            settings={qualitySettings}
-                            settingsKey="frameRate"
-                            onChange={value => (qualitySettings.frameRate = value)}
-                        />
-                    </section>
-                </div>
-                <div className={cl("quality")}>
-                    <section className={cl("quality-section")}>
-                        <Forms.FormTitle>Content Type</Forms.FormTitle>
-                        <div>
-                            <OptionRadio
-                                options={["motion", "detail"]}
-                                labels={["Prefer Smoothness", "Prefer Clarity"]}
-                                settings={settings}
-                                settingsKey="contentHint"
-                                onChange={option => setSettings(s => ({ ...s, contentHint: option }))}
-                            />
-                            <div className={cl("hint-description")}>
-                                <p>
-                                    Choosing "Prefer Clarity" will result in a significantly lower framerate in exchange
-                                    for a much sharper and clearer image.
-                                </p>
+                <Card className="vcd-screen-picker-card">
+                    <div className="vcd-screen-picker-quality">
+                        <section>
+                            <Forms.FormTitle>Resolution</Forms.FormTitle>
+                            <div className="vcd-screen-picker-radios">
+                                {StreamResolutions.map(res => (
+                                    <label
+                                        className="vcd-screen-picker-radio"
+                                        data-checked={settings.resolution === res}
+                                    >
+                                        <Text variant="text-sm/bold">{res}</Text>
+                                        <input
+                                            type="radio"
+                                            name="resolution"
+                                            value={res}
+                                            checked={settings.resolution === res}
+                                            onChange={() => setSettings(s => ({ ...s, resolution: res }))}
+                                        />
+                                    </label>
+                                ))}
                             </div>
-                        </div>
-                        {isWindows && (
-                            <Switch
-                                value={settings.audio}
-                                onChange={checked => setSettings(s => ({ ...s, audio: checked }))}
-                                hideBorder
-                                className={cl("audio")}
-                            >
-                                Stream With Audio
-                            </Switch>
-                        )}
-                    </section>
-                </div>
+                        </section>
+
+                        <section>
+                            <Forms.FormTitle>Frame Rate</Forms.FormTitle>
+                            <div className="vcd-screen-picker-radios">
+                                {StreamFps.map(fps => (
+                                    <label className="vcd-screen-picker-radio" data-checked={settings.fps === fps}>
+                                        <Text variant="text-sm/bold">{fps}</Text>
+                                        <input
+                                            type="radio"
+                                            name="fps"
+                                            value={fps}
+                                            checked={settings.fps === fps}
+                                            onChange={() => setSettings(s => ({ ...s, fps }))}
+                                        />
+                                    </label>
+                                ))}
+                            </div>
+                        </section>
+                    </div>
+                    <div className="vcd-screen-picker-quality">
+                        <section>
+                            <Forms.FormTitle>Content Type</Forms.FormTitle>
+                            <div>
+                                <div className="vcd-screen-picker-radios">
+                                    <label
+                                        className="vcd-screen-picker-radio"
+                                        data-checked={settings.contentHint === "motion"}
+                                    >
+                                        <Text variant="text-sm/bold">Prefer Smoothness</Text>
+                                        <input
+                                            type="radio"
+                                            name="contenthint"
+                                            value="motion"
+                                            checked={settings.contentHint === "motion"}
+                                            onChange={() => setSettings(s => ({ ...s, contentHint: "motion" }))}
+                                        />
+                                    </label>
+                                    <label
+                                        className="vcd-screen-picker-radio"
+                                        data-checked={settings.contentHint === "detail"}
+                                    >
+                                        <Text variant="text-sm/bold">Prefer Clarity</Text>
+                                        <input
+                                            type="radio"
+                                            name="contenthint"
+                                            value="detail"
+                                            checked={settings.contentHint === "detail"}
+                                            onChange={() => setSettings(s => ({ ...s, contentHint: "detail" }))}
+                                        />
+                                    </label>
+                                </div>
+                                <div className="vcd-screen-picker-hint-description">
+                                    <p>
+                                        Choosing "Prefer Clarity" will result in a significantly lower framerate in
+                                        exchange for a much sharper and clearer image.
+                                    </p>
+                                </div>
+                            </div>
+                        </section>
+                    </div>
+                </Card>
+            </div>
+
+            <div>
+                {isWindows && (
+                    <Switch
+                        value={settings.audio}
+                        onChange={checked => setSettings(s => ({ ...s, audio: checked }))}
+                        hideBorder
+                        className="vcd-screen-picker-audio"
+                    >
+                        Stream With Audio
+                    </Switch>
+                )}
 
                 {isLinux && (
                     <AudioSourcePickerLinux
-                        openSettings={openSettings}
-                        includeSources={settings.includeSources}
-                        excludeSources={settings.excludeSources}
-                        deviceSelect={Settings.audio?.deviceSelect}
-                        granularSelect={Settings.audio?.granularSelect}
-                        setIncludeSources={sources => setSettings(s => ({ ...s, includeSources: sources }))}
-                        setExcludeSources={sources => setSettings(s => ({ ...s, excludeSources: sources }))}
+                        audioSource={settings.audioSource}
+                        workaround={settings.workaround}
+                        onlyDefaultSpeakers={settings.onlyDefaultSpeakers}
+                        setAudioSource={source => setSettings(s => ({ ...s, audioSource: source }))}
+                        setWorkaround={value => setSettings(s => ({ ...s, workaround: value }))}
+                        setOnlyDefaultSpeakers={value => setSettings(s => ({ ...s, onlyDefaultSpeakers: value }))}
                     />
                 )}
-            </Card>
+            </div>
         </div>
     );
 }
 
-function isSpecialSource(value?: AudioSource | AudioSources): value is SpecialSource {
-    return typeof value === "string";
-}
-
-function hasMatchingProps(value: Node, other: Node) {
-    return Object.keys(value).every(key => value[key] === other[key]);
-}
-
-function mapToAudioItem(node: AudioSource, granularSelect?: boolean, deviceSelect?: boolean): AudioItem[] {
-    if (isSpecialSource(node)) {
-        return [{ name: node, value: node }];
-    }
-
-    const rtn: AudioItem[] = [];
-
-    const mediaClass = node["media.class"];
-
-    if (mediaClass?.includes("Video") || mediaClass?.includes("Midi")) {
-        return rtn;
-    }
-
-    if (!deviceSelect && node["device.id"]) {
-        return rtn;
-    }
-
-    const name = node["application.name"];
-
-    if (name) {
-        rtn.push({ name: name, value: { "application.name": name } });
-    }
-
-    if (!granularSelect) {
-        return rtn;
-    }
-
-    const rawName = node["node.name"];
-
-    if (!name) {
-        rtn.push({ name: rawName, value: { "node.name": rawName } });
-    }
-
-    const binary = node["application.process.binary"];
-
-    if (!name && binary) {
-        rtn.push({ name: binary, value: { "application.process.binary": binary } });
-    }
-
-    const pid = node["application.process.id"];
-
-    const first = rtn[0];
-    const firstValues = first.value as Node;
-
-    if (pid) {
-        rtn.push({
-            name: `${first.name} (${pid})`,
-            value: { ...firstValues, "application.process.id": pid }
-        });
-    }
-
-    const mediaName = node["media.name"];
-
-    if (mediaName) {
-        rtn.push({
-            name: `${first.name} [${mediaName}]`,
-            value: { ...firstValues, "media.name": mediaName }
-        });
-    }
-
-    if (mediaClass) {
-        rtn.push({
-            name: `${first.name} [${mediaClass}]`,
-            value: { ...firstValues, "media.class": mediaClass }
-        });
-    }
-
-    return rtn;
-}
-
-function isItemSelected(sources?: AudioSources) {
-    return (value: AudioSource) => {
-        if (!sources) {
-            return false;
-        }
-
-        if (isSpecialSource(sources) || isSpecialSource(value)) {
-            return sources === value;
-        }
-
-        return sources.some(source => hasMatchingProps(source, value));
-    };
-}
-
-function updateItems(setSources: (s: AudioSources) => void, sources?: AudioSources) {
-    return (value: AudioSource) => {
-        if (isSpecialSource(value)) {
-            setSources(value);
-            return;
-        }
-
-        if (isSpecialSource(sources)) {
-            setSources([value]);
-            return;
-        }
-
-        if (isItemSelected(sources)(value)) {
-            setSources(sources?.filter(x => !hasMatchingProps(x, value)) ?? "None");
-            return;
-        }
-
-        setSources([...(sources || []), value]);
-    };
-}
-
 function AudioSourcePickerLinux({
-    includeSources,
-    excludeSources,
-    deviceSelect,
-    granularSelect,
-    openSettings,
-    setIncludeSources,
-    setExcludeSources
+    audioSource,
+    workaround,
+    onlyDefaultSpeakers,
+    setAudioSource,
+    setWorkaround,
+    setOnlyDefaultSpeakers
 }: {
-    includeSources?: AudioSources;
-    excludeSources?: AudioSources;
-    deviceSelect?: boolean;
-    granularSelect?: boolean;
-    openSettings: () => void;
-    setIncludeSources: (s: AudioSources) => void;
-    setExcludeSources: (s: AudioSources) => void;
+    audioSource?: string;
+    workaround?: boolean;
+    onlyDefaultSpeakers?: boolean;
+    setAudioSource(s: string): void;
+    setWorkaround(b: boolean): void;
+    setOnlyDefaultSpeakers(b: boolean): void;
 }) {
     const [sources, _, loading] = useAwaiter(() => VesktopNative.virtmic.list(), {
         fallbackValue: { ok: true, targets: [], hasPipewirePulse: true }
     });
 
+    const allSources = sources.ok ? ["None", "Entire System", ...sources.targets] : null;
     const hasPipewirePulse = sources.ok ? sources.hasPipewirePulse : true;
+
     const [ignorePulseWarning, setIgnorePulseWarning] = useState(false);
 
-    if (!sources.ok && sources.isGlibCxxOutdated) {
-        return (
-            <Forms.FormText>
-                Failed to retrieve Audio Sources because your C++ library is too old to run
-                <a href="https://github.com/Vencord/venmic" target="_blank">
-                    venmic
-                </a>
-                . See{" "}
-                <a href="https://gist.github.com/Vendicated/b655044ffbb16b2716095a448c6d827a" target="_blank">
-                    this guide
-                </a>{" "}
-                for possible solutions.
-            </Forms.FormText>
-        );
-    }
-
-    if (!hasPipewirePulse && !ignorePulseWarning) {
-        return (
-            <Text variant="text-sm/normal">
-                Could not find pipewire-pulse. See{" "}
-                <a href="https://gist.github.com/the-spyke/2de98b22ff4f978ebf0650c90e82027e#install" target="_blank">
-                    this guide
-                </a>{" "}
-                on how to switch to pipewire. <br />
-                You can still continue, however, please{" "}
-                <b>beware that you can only share audio of apps that are running under pipewire</b>.{" "}
-                <a onClick={() => setIgnorePulseWarning(true)}>I know what I'm doing!</a>
-            </Text>
-        );
-    }
-
-    const specialSources: SpecialSource[] = ["None", "Entire System"] as const;
-
-    const uniqueName = (value: AudioItem, index: number, list: AudioItem[]) =>
-        list.findIndex(x => x.name === value.name) === index;
-
-    const allSources = sources.ok
-        ? [...specialSources, ...sources.targets]
-              .map(target => mapToAudioItem(target, granularSelect, deviceSelect))
-              .flat()
-              .filter(uniqueName)
-        : [];
-
     return (
         <>
-            <div className={cl({ quality: includeSources === "Entire System" })}>
-                <section>
-                    <Forms.FormTitle>{loading ? "Loading Sources..." : "Audio Sources"}</Forms.FormTitle>
-                    <Select
-                        options={allSources.map(({ name, value }) => ({
-                            label: name,
-                            value: value,
-                            default: name === "None"
-                        }))}
-                        isSelected={isItemSelected(includeSources)}
-                        select={updateItems(setIncludeSources, includeSources)}
-                        serialize={String}
-                        popoutPosition="top"
-                        closeOnSelect={false}
-                    />
-                </section>
-                {includeSources === "Entire System" && (
-                    <section>
-                        <Forms.FormTitle>Exclude Sources</Forms.FormTitle>
-                        <Select
-                            options={allSources
-                                .filter(x => x.name !== "Entire System")
-                                .map(({ name, value }) => ({
-                                    label: name,
-                                    value: value,
-                                    default: name === "None"
-                                }))}
-                            isSelected={isItemSelected(excludeSources)}
-                            select={updateItems(setExcludeSources, excludeSources)}
-                            serialize={String}
-                            popoutPosition="top"
-                            closeOnSelect={false}
-                        />
-                    </section>
+            <Forms.FormTitle>Audio Settings</Forms.FormTitle>
+            <Card className="vcd-screen-picker-card">
+                {loading ? (
+                    <Forms.FormTitle>Loading Audio Sources...</Forms.FormTitle>
+                ) : (
+                    <Forms.FormTitle>Audio Source</Forms.FormTitle>
                 )}
-            </div>
-            <Button color={Button.Colors.TRANSPARENT} onClick={openSettings} className={cl("settings-button")}>
-                Open Audio Settings
-            </Button>
+
+                {!sources.ok && sources.isGlibCxxOutdated && (
+                    <Forms.FormText>
+                        Failed to retrieve Audio Sources because your C++ library is too old to run
+                        <a href="https://github.com/Vencord/venmic" target="_blank">
+                            venmic
+                        </a>
+                        . See{" "}
+                        <a href="https://gist.github.com/Vendicated/b655044ffbb16b2716095a448c6d827a" target="_blank">
+                            this guide
+                        </a>{" "}
+                        for possible solutions.
+                    </Forms.FormText>
+                )}
+
+                {hasPipewirePulse || ignorePulseWarning ? (
+                    allSources && (
+                        <Select
+                            options={allSources.map(s => ({ label: s, value: s, default: s === "None" }))}
+                            isSelected={s => s === audioSource}
+                            select={setAudioSource}
+                            serialize={String}
+                        />
+                    )
+                ) : (
+                    <Text variant="text-sm/normal">
+                        Could not find pipewire-pulse. This usually means that you do not run pipewire as your main
+                        audio-server. <br />
+                        You can still continue, however, please beware that you can only share audio of apps that are
+                        running under pipewire.
+                        <br />
+                        <a onClick={() => setIgnorePulseWarning(true)}>I know what I'm doing</a>
+                    </Text>
+                )}
+
+                <Forms.FormDivider className={Margins.top16 + " " + Margins.bottom16} />
+
+                <Switch
+                    onChange={setWorkaround}
+                    value={workaround ?? false}
+                    note={
+                        <>
+                            Work around an issue that causes the microphone to be shared instead of the correct audio.
+                            Only enable if you're experiencing this issue.
+                        </>
+                    }
+                >
+                    Microphone Workaround
+                </Switch>
+
+                <Switch
+                    hideBorder
+                    onChange={setOnlyDefaultSpeakers}
+                    disabled={audioSource !== "Entire System"}
+                    value={onlyDefaultSpeakers ?? true}
+                    note={
+                        <>
+                            When sharing entire desktop audio, only share apps that play to the default speakers and
+                            ignore apps that play to other speakers or devices.
+                        </>
+                    }
+                >
+                    Only Default Speakers
+                </Switch>
+            </Card>
         </>
     );
 }
@@ -695,26 +432,23 @@ function ModalComponent({
 }) {
     const [selected, setSelected] = useState<string | undefined>(skipPicker ? screens[0].id : void 0);
     const [settings, setSettings] = useState<StreamSettings>({
+        resolution: "1080",
+        fps: "60",
         contentHint: "motion",
-        audio: true,
-        includeSources: "None"
-    });
-    const qualitySettings = (useVesktopState().screenshareQuality ??= {
-        resolution: "720",
-        frameRate: "30"
+        audio: true
     });
 
     return (
         <Modals.ModalRoot {...modalProps} size={ModalSize.MEDIUM}>
-            <Modals.ModalHeader className={cl("header")}>
+            <Modals.ModalHeader className="vcd-screen-picker-header">
                 <Forms.FormTitle tag="h2">ScreenShare</Forms.FormTitle>
                 <Modals.ModalCloseButton onClick={close} />
             </Modals.ModalHeader>
-            <Modals.ModalContent className={cl("modal")}>
+            <Modals.ModalContent className="vcd-screen-picker-modal">
                 {!selected ? (
                     <ScreenPicker screens={screens} chooseScreen={setSelected} />
                 ) : (
-                    <StreamSettingsUi
+                    <StreamSettings
                         source={screens.find(s => s.id === selected)!}
                         settings={settings}
                         setSettings={setSettings}
@@ -722,14 +456,14 @@ function ModalComponent({
                     />
                 )}
             </Modals.ModalContent>
-            <Modals.ModalFooter className={cl("footer")}>
+            <Modals.ModalFooter className="vcd-screen-picker-footer">
                 <Button
                     disabled={!selected}
                     onClick={() => {
                         currentSettings = settings;
                         try {
-                            const frameRate = Number(qualitySettings.frameRate);
-                            const height = Number(qualitySettings.resolution);
+                            const frameRate = Number(settings.fps);
+                            const height = Number(settings.resolution);
                             const width = Math.round(height * (16 / 9));
 
                             const conn = [...MediaEngineStore.getMediaEngine().connections].find(
@@ -757,7 +491,7 @@ function ModalComponent({
 
                                 const constraints = {
                                     ...track.getConstraints(),
-                                    frameRate: { min: frameRate, ideal: frameRate },
+                                    frameRate,
                                     width: { min: 640, ideal: width, max: width },
                                     height: { min: 480, ideal: height, max: height },
                                     advanced: [{ width: width, height: height }],

src/renderer/components/index.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 export * as ScreenShare from "./ScreenSharePicker";

src/renderer/components/screenSharePicker.css

@@ -2,7 +2,7 @@
     padding: 1em;
 }
 
-.vcd-screen-picker-header-title {
+.vcd-screen-picker-header h1 {
     margin: 0;
 }
 
@@ -11,36 +11,49 @@
     gap: 1em;
 }
 
+.vcd-screen-picker-settings-grid {
+    gap: 1em;
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+}
+
+.vcd-screen-picker-settings-grid > div {
+    display: flex;
+    flex-direction: column;
+}
+
 .vcd-screen-picker-card {
     flex-grow: 1;
 }
 
-
-/* Screen Grid */
-.vcd-screen-picker-screen-grid {
+.vcd-screen-picker-grid {
     display: grid;
     grid-template-columns: 1fr 1fr;
     gap: 2em 1em;
 }
 
-.vcd-screen-picker-screen-radio {
+.vcd-screen-picker-grid input {
     appearance: none;
     cursor: pointer;
 }
 
-.vcd-screen-picker-screen-label {
+.vcd-screen-picker-selected img {
+    border: 2px solid var(--brand-experiment);
+    border-radius: 3px;
+}
+
+.vcd-screen-picker-grid label {
     overflow: hidden;
-    padding: 8px;
+    padding: 4px 0px;
     cursor: pointer;
-    display: grid;
-    justify-items: center;
 }
 
-.vcd-screen-picker-screen-label:hover {
-    outline: 2px solid var(--brand-500);
+.vcd-screen-picker-grid label:hover {
+    outline: 2px solid var(--brand-experiment);
 }
 
-.vcd-screen-picker-screen-name {
+
+.vcd-screen-picker-grid div {
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
@@ -54,13 +67,8 @@
     box-sizing: border-box;
 }
 
-.vcd-screen-picker-preview-img-linux {
-    width: 60%;
-    margin-bottom: 0.5em;
-}
-
-.vcd-screen-picker-preview-img {
-    width: 90%;
+.vcd-screen-picker-preview img {
+    width: 100%;
     margin-bottom: 0.5em;
 }
 
@@ -72,56 +80,59 @@
     margin-bottom: 1em;
 }
 
-
-/* Option Radios */
-
-.vcd-screen-picker-option-radios {
-    display: flex;
-    width: 100%;
-    border-radius: 3px;
+.vcd-screen-picker-radio input {
+    display: none;
 }
 
-.vcd-screen-picker-option-radio {
-    flex: 1 1 auto;
-    text-align: center;
+.vcd-screen-picker-radio {
     background-color: var(--background-secondary);
     border: 1px solid var(--primary-800);
     padding: 0.3em;
     cursor: pointer;
 }
 
-.vcd-screen-picker-option-radio:first-child {
-    border-radius: 3px 0 0 3px;
+.vcd-screen-picker-radio h2 {
+    margin: 0;
 }
 
-.vcd-screen-picker-option-radio:last-child {
-    border-radius: 0 3px 3px 0;
+.vcd-screen-picker-radio[data-checked="true"] {
+    background-color: var(--brand-experiment);
+    border-color: var(--brand-experiment);
 }
 
-.vcd-screen-picker-option-input {
-    display: none;
-}
-
-.vcd-screen-picker-option-radio[data-checked="true"] {
-    background-color: var(--brand-500);
-    border-color: var(--brand-500);
+.vcd-screen-picker-radio[data-checked="true"] h2 {
+    color: var(--interactive-active);
 }
 
 .vcd-screen-picker-quality {
     display: flex;
     gap: 1em;
+
     margin-bottom: 0.5em;
 }
 
-.vcd-screen-picker-quality-section {
+.vcd-screen-picker-quality section {
     flex: 1 1 auto;
 }
 
-.vcd-screen-picker-settings-button {
-    margin-left: auto;
-    margin-top: 0.3rem;
+.vcd-screen-picker-radios {
+    display: flex;
+    width: 100%;
+    border-radius: 3px;
 }
 
+.vcd-screen-picker-radios label {
+    flex: 1 1 auto;
+    text-align: center;
+}
+
+.vcd-screen-picker-radios label:first-child {
+    border-radius: 3px 0 0 3px;
+}
+
+.vcd-screen-picker-radios label:last-child {
+    border-radius: 0 3px 3px 0;
+}
 
 .vcd-screen-picker-audio {
     margin-bottom: 0;
@@ -132,4 +143,4 @@
     font-size: 14px;
     line-height: 20px;
     font-weight: 400;
-}
+}

src/renderer/components/settings/AutoStartToggle.tsx

@@ -1,19 +1,18 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { useState } from "@vencord/types/webpack/common";
+import { Switch, useState } from "@vencord/types/webpack/common";
 
 import { SettingsComponent } from "./Settings";
-import { VesktopSettingsSwitch } from "./VesktopSettingsSwitch";
 
 export const AutoStartToggle: SettingsComponent = () => {
     const [autoStartEnabled, setAutoStartEnabled] = useState(VesktopNative.autostart.isEnabled());
 
     return (
-        <VesktopSettingsSwitch
+        <Switch
             value={autoStartEnabled}
             onChange={async v => {
                 await VesktopNative.autostart[v ? "enable" : "disable"]();
@@ -22,6 +21,6 @@ export const AutoStartToggle: SettingsComponent = () => {
             note="Automatically start Vesktop on computer start-up"
         >
             Start With System
-        </VesktopSettingsSwitch>
+        </Switch>
     );
 };

src/renderer/components/settings/DeveloperOptions.tsx

@@ -1,120 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import {
-    Margins,
-    ModalCloseButton,
-    ModalContent,
-    ModalHeader,
-    ModalRoot,
-    ModalSize,
-    openModal,
-    useForceUpdater
-} from "@vencord/types/utils";
-import { Button, Forms, Text, Toasts } from "@vencord/types/webpack/common";
-import { Settings } from "shared/settings";
-
-import { SettingsComponent } from "./Settings";
-
-export const DeveloperOptionsButton: SettingsComponent = ({ settings }) => {
-    return <Button onClick={() => openDeveloperOptionsModal(settings)}>Open Developer Settings</Button>;
-};
-
-function openDeveloperOptionsModal(settings: Settings) {
-    openModal(props => (
-        <ModalRoot {...props} size={ModalSize.MEDIUM}>
-            <ModalHeader>
-                <Text variant="heading-lg/semibold" style={{ flexGrow: 1 }}>
-                    Vesktop Developer Options
-                </Text>
-                <ModalCloseButton onClick={props.onClose} />
-            </ModalHeader>
-
-            <ModalContent>
-                <div style={{ padding: "1em 0" }}>
-                    <Forms.FormTitle tag="h5">Vencord Location</Forms.FormTitle>
-                    <VencordLocationPicker settings={settings} />
-
-                    <Forms.FormTitle tag="h5" className={Margins.top16}>
-                        Debugging
-                    </Forms.FormTitle>
-                    <div className="vcd-settings-button-grid">
-                        <Button onClick={() => VesktopNative.debug.launchGpu()}>Open chrome://gpu</Button>
-                        <Button onClick={() => VesktopNative.debug.launchWebrtcInternals()}>
-                            Open chrome://webrtc-internals
-                        </Button>
-                    </div>
-                </div>
-            </ModalContent>
-        </ModalRoot>
-    ));
-}
-
-const VencordLocationPicker: SettingsComponent = ({ settings }) => {
-    const forceUpdate = useForceUpdater();
-    const vencordDir = VesktopNative.fileManager.getVencordDir();
-
-    return (
-        <>
-            <Forms.FormText>
-                Vencord files are loaded from{" "}
-                {vencordDir ? (
-                    <a
-                        href="about:blank"
-                        onClick={e => {
-                            e.preventDefault();
-                            VesktopNative.fileManager.showItemInFolder(vencordDir!);
-                        }}
-                    >
-                        {vencordDir}
-                    </a>
-                ) : (
-                    "the default location"
-                )}
-            </Forms.FormText>
-            <div className="vcd-settings-button-grid">
-                <Button
-                    size={Button.Sizes.SMALL}
-                    onClick={async () => {
-                        const choice = await VesktopNative.fileManager.selectVencordDir();
-                        switch (choice) {
-                            case "cancelled":
-                                break;
-                            case "ok":
-                                Toasts.show({
-                                    message: "Vencord install changed. Fully restart Vesktop to apply.",
-                                    id: Toasts.genId(),
-                                    type: Toasts.Type.SUCCESS
-                                });
-                                break;
-                            case "invalid":
-                                Toasts.show({
-                                    message:
-                                        "You did not choose a valid Vencord install. Make sure you're selecting the dist dir!",
-                                    id: Toasts.genId(),
-                                    type: Toasts.Type.FAILURE
-                                });
-                                break;
-                        }
-                        forceUpdate();
-                    }}
-                >
-                    Change
-                </Button>
-                <Button
-                    size={Button.Sizes.SMALL}
-                    color={Button.Colors.RED}
-                    onClick={async () => {
-                        await VesktopNative.fileManager.selectVencordDir(null);
-                        forceUpdate();
-                    }}
-                >
-                    Reset
-                </Button>
-            </div>
-        </>
-    );
-};

src/renderer/components/settings/DiscordBranchPicker.tsx

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { Select } from "@vencord/types/webpack/common";

src/renderer/components/settings/NotificationBadgeToggle.tsx

@@ -1,17 +1,17 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { Switch } from "@vencord/types/webpack/common";
 import { setBadge } from "renderer/appBadge";
 
 import { SettingsComponent } from "./Settings";
-import { VesktopSettingsSwitch } from "./VesktopSettingsSwitch";
 
 export const NotificationBadgeToggle: SettingsComponent = ({ settings }) => {
     return (
-        <VesktopSettingsSwitch
+        <Switch
             value={settings.appBadge ?? true}
             onChange={v => {
                 settings.appBadge = v;
@@ -21,6 +21,6 @@ export const NotificationBadgeToggle: SettingsComponent = ({ settings }) => {
             note="Show mention badge on the app icon"
         >
             Notification Badge
-        </VesktopSettingsSwitch>
+        </Switch>
     );
 };

src/renderer/components/settings/Settings.tsx

@@ -1,22 +1,20 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import "./settings.css";
 
-import { ErrorBoundary } from "@vencord/types/components";
-import { Forms, Text } from "@vencord/types/webpack/common";
+import { Forms, Switch, Text } from "@vencord/types/webpack/common";
 import { ComponentType } from "react";
 import { Settings, useSettings } from "renderer/settings";
 import { isMac, isWindows } from "renderer/utils";
 
 import { AutoStartToggle } from "./AutoStartToggle";
-import { DeveloperOptionsButton } from "./DeveloperOptions";
 import { DiscordBranchPicker } from "./DiscordBranchPicker";
 import { NotificationBadgeToggle } from "./NotificationBadgeToggle";
-import { VesktopSettingsSwitch } from "./VesktopSettingsSwitch";
+import { VencordLocationPicker } from "./VencordLocationPicker";
 import { WindowsTransparencyControls } from "./WindowsTransparencyControls";
 
 interface BooleanSetting {
@@ -39,14 +37,6 @@ const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>>
             title: "Hardware Acceleration",
             description: "Enable hardware acceleration",
             defaultValue: true
-        },
-        {
-            key: "hardwareVideoAcceleration",
-            title: "Video Hardware Acceleration",
-            description:
-                "Enable hardware video acceleration. This can improve performance of screenshare and video playback, but may cause graphical glitches and infinitely loading streams.",
-            defaultValue: false,
-            disabled: () => Settings.store.hardwareAcceleration === false
         }
     ],
     "User Interface": [
@@ -69,18 +59,11 @@ const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>>
             defaultValue: false,
             disabled: () => Settings.store.customTitleBar ?? isWindows
         },
-        {
-            key: "enableSplashScreen",
-            title: "Enable Splash Screen",
-            description:
-                "Shows a small splash screen while Vesktop is loading. Disabling this option will show the main window earlier while it's still loading.",
-            defaultValue: true
-        },
         {
             key: "splashTheming",
             title: "Splash theming",
             description: "Adapt the splash window colors to your custom theme",
-            defaultValue: true
+            defaultValue: false
         },
         WindowsTransparencyControls
     ],
@@ -119,8 +102,16 @@ const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>>
             defaultValue: false
         }
     ],
-    Notifications: [NotificationBadgeToggle],
-    Miscellaneous: [
+    "Notifications & Updates": [
+        NotificationBadgeToggle,
+        {
+            key: "checkUpdates",
+            title: "Check for updates",
+            description: "Automatically check for Vesktop updates",
+            defaultValue: true
+        }
+    ],
+    Miscelleanous: [
         {
             key: "arRPC",
             title: "Rich Presence",
@@ -135,61 +126,51 @@ const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>>
             defaultValue: false
         }
     ],
-    "Developer Options": [DeveloperOptionsButton]
+    "Vencord Location": [VencordLocationPicker]
 };
 
 function SettingsSections() {
     const Settings = useSettings();
 
-    const sections = Object.entries(SettingsOptions).map(([title, settings], i, arr) => (
-        <div key={title} className="vcd-settings-category">
-            <Text variant="heading-lg/semibold" color="header-primary" className="vcd-settings-category-title">
-                {title}
-            </Text>
+    const sections = Object.entries(SettingsOptions).map(([title, settings]) => (
+        <Forms.FormSection
+            title={title}
+            key={title}
+            className="vcd-settings-section"
+            titleClassName="vcd-settings-title"
+        >
+            {settings.map(Setting => {
+                if (typeof Setting === "function") return <Setting settings={Settings} />;
 
-            <div className="vcd-settings-category-content">
-                {settings.map(Setting => {
-                    if (typeof Setting === "function") return <Setting settings={Settings} />;
+                const { defaultValue, title, description, key, disabled, invisible } = Setting;
+                if (invisible?.()) return null;
 
-                    const { defaultValue, title, description, key, disabled, invisible } = Setting;
-                    if (invisible?.()) return null;
-
-                    return (
-                        <VesktopSettingsSwitch
-                            value={Settings[key as any] ?? defaultValue}
-                            onChange={v => (Settings[key as any] = v)}
-                            note={description}
-                            disabled={disabled?.()}
-                            key={key}
-                        >
-                            {title}
-                        </VesktopSettingsSwitch>
-                    );
-                })}
-            </div>
-
-            {i < arr.length - 1 && <Forms.FormDivider className="vcd-settings-category-divider" />}
-        </div>
+                return (
+                    <Switch
+                        value={Settings[key as any] ?? defaultValue}
+                        onChange={v => (Settings[key as any] = v)}
+                        note={description}
+                        disabled={disabled?.()}
+                        key={key}
+                    >
+                        {title}
+                    </Switch>
+                );
+            })}
+        </Forms.FormSection>
     ));
 
     return <>{sections}</>;
 }
 
-export default ErrorBoundary.wrap(
-    function SettingsUI() {
-        return (
-            <Forms.FormSection>
-                {/* FIXME: Outdated type */}
-                {/* @ts-expect-error Outdated type */}
-                <Text variant="heading-xl/semibold" color="header-primary" className="vcd-settings-title">
-                    Vesktop Settings
-                </Text>
-                <SettingsSections />
-            </Forms.FormSection>
-        );
-    },
-    {
-        message:
-            "Failed to render the Vesktop Settings tab. If this issue persists, try to right click the Vesktop tray icon, then click 'Repair Vencord'. And make sure your Vesktop is up to date."
-    }
-);
+export default function SettingsUi() {
+    return (
+        <Forms.FormSection>
+            <Text variant="heading-lg/semibold" style={{ color: "var(--header-primary)" }} tag="h2">
+                Vesktop Settings
+            </Text>
+
+            <SettingsSections />
+        </Forms.FormSection>
+    );
+}

src/renderer/components/settings/VencordLocationPicker.tsx

@@ -0,0 +1,62 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+import { Button, Forms, Toasts } from "@vencord/types/webpack/common";
+
+import { SettingsComponent } from "./Settings";
+
+export const VencordLocationPicker: SettingsComponent = ({ settings }) => {
+    return (
+        <>
+            <Forms.FormText>
+                Vencord files are loaded from{" "}
+                {settings.vencordDir ? (
+                    <a
+                        href="about:blank"
+                        onClick={e => {
+                            e.preventDefault();
+                            VesktopNative.fileManager.showItemInFolder(settings.vencordDir!);
+                        }}
+                    >
+                        {settings.vencordDir}
+                    </a>
+                ) : (
+                    "the default location"
+                )}
+            </Forms.FormText>
+            <div className="vcd-location-btns">
+                <Button
+                    size={Button.Sizes.SMALL}
+                    onClick={async () => {
+                        const choice = await VesktopNative.fileManager.selectVencordDir();
+                        switch (choice) {
+                            case "cancelled":
+                                return;
+                            case "invalid":
+                                Toasts.show({
+                                    message:
+                                        "You did not choose a valid Vencord install. Make sure you're selecting the dist dir!",
+                                    id: Toasts.genId(),
+                                    type: Toasts.Type.FAILURE
+                                });
+                                return;
+                        }
+                        settings.vencordDir = choice;
+                    }}
+                >
+                    Change
+                </Button>
+                <Button
+                    size={Button.Sizes.SMALL}
+                    color={Button.Colors.RED}
+                    onClick={() => (settings.vencordDir = void 0)}
+                >
+                    Reset
+                </Button>
+            </div>
+        </>
+    );
+};

src/renderer/components/settings/VesktopSettingsSwitch.tsx

@@ -1,16 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vesktop contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Switch } from "@vencord/types/webpack/common";
-import { ComponentProps } from "react";
-
-export function VesktopSettingsSwitch(props: ComponentProps<typeof Switch>) {
-    return (
-        <Switch {...props} hideBorder className="vcd-settings-switch">
-            {props.children}
-        </Switch>
-    );
-}

src/renderer/components/settings/WindowsTransparencyControls.tsx

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { Margins } from "@vencord/types/utils";
@@ -13,8 +13,8 @@ export const WindowsTransparencyControls: SettingsComponent = ({ settings }) =>
     if (!VesktopNative.app.supportsWindowsTransparency()) return null;
 
     return (
-        <div>
-            <Forms.FormTitle className={Margins.bottom8}>Transparency Options</Forms.FormTitle>
+        <>
+            <Forms.FormTitle className={Margins.top16 + " " + Margins.bottom8}>Transparency Options</Forms.FormTitle>
             <Forms.FormText className={Margins.bottom8}>
                 Requires a full restart. You will need a theme that supports transparency for this to work.
             </Forms.FormText>
@@ -42,6 +42,8 @@ export const WindowsTransparencyControls: SettingsComponent = ({ settings }) =>
                 isSelected={v => v === settings.transparencyOption}
                 serialize={s => s}
             />
-        </div>
+
+            <Forms.FormDivider className={Margins.top16 + " " + Margins.bottom16} />
+        </>
     );
 };

src/renderer/components/settings/settings.css

@@ -1,34 +1,14 @@
-.vcd-settings-button-grid {
+.vcd-location-btns {
     display: grid;
     grid-template-columns: 1fr 1fr;
     gap: 0.5em;
     margin-top: 0.5em;
 }
 
+.vcd-settings-section {
+    margin-top: 1.5rem;
+}
+
 .vcd-settings-title {
-    margin-bottom: 32px;
-}
-
-.vcd-settings-category {
-    display: flex;
-    flex-direction: column;
-}
-
-.vcd-settings-category-title {
-    margin-bottom: 16px;
-}
-
-.vcd-settings-category-content {
-    display: flex;
-    flex-direction: column;
-    gap: 24px;
-}
-
-.vcd-settings-category-divider {
-    margin-top: 32px;
-    margin-bottom: 32px;
-}
-
-.vcd-settings-switch {
-    margin-bottom: 0;
+    margin-bottom: 0.5rem;
 }

src/renderer/fixes.css

@@ -0,0 +1,11 @@
+/* Download Desktop button in guilds list */
+[class^=listItem_]:has([data-list-item-id=guildsnav___app-download-button]),
+[class^=listItem_]:has(+ [class^=listItem_] [data-list-item-id=guildsnav___app-download-button]) {
+    display: none;
+}
+
+/* FIXME: remove this once Discord fixes their css to not explode scrollbars on chromium >=121 */
+* {
+    scrollbar-width: unset !important;
+    scrollbar-color: unset !important;
+}

src/renderer/fixes.ts

@@ -1,10 +1,12 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { localStorage } from "./utils";
+import "./fixes.css";
+
+import { isWindows, localStorage } from "./utils";
 
 // Make clicking Notifications focus the window
 const originalSetOnClick = Object.getOwnPropertyDescriptor(Notification.prototype, "onclick")!.set!;
@@ -20,3 +22,14 @@ Object.defineProperty(Notification.prototype, "onclick", {
 
 // Hide "Download Discord Desktop now!!!!" banner
 localStorage.setItem("hideNag", "true");
+
+// FIXME: Remove eventually.
+// Originally, Vencord always used a Windows user agent. This seems to cause captchas
+// Now, we use a platform specific UA - HOWEVER, discord FOR SOME REASON????? caches
+// device props in localStorage. This code fixes their cache to properly update the platform in SuperProps
+if (!isWindows)
+    try {
+        const deviceProperties = localStorage.getItem("deviceProperties");
+        if (deviceProperties && JSON.parse(deviceProperties).os === "Windows")
+            localStorage.removeItem("deviceProperties");
+    } catch {}

src/renderer/index.ts

@@ -1,29 +1,45 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import "./themedSplash";
-import "./ipcCommands";
-import "./appBadge";
 import "./fixes";
-import "./arrpc";
-import "__patches__"; // auto generated by the build script
+import "./appBadge";
+import "./patches";
+import "./themedSplash";
+
+console.log("read if cute :3");
 
 export * as Components from "./components";
+import { findByPropsLazy } from "@vencord/types/webpack";
+import { FluxDispatcher } from "@vencord/types/webpack/common";
 
 import SettingsUi from "./components/settings/Settings";
-import { VesktopLogger } from "./logger";
 import { Settings } from "./settings";
 export { Settings };
 
-import type SettingsPlugin from "@vencord/types/plugins/_core/settings";
+const InviteActions = findByPropsLazy("resolveInvite");
 
-VesktopLogger.log("read if cute :3");
-VesktopLogger.log("Vesktop v" + VesktopNative.app.getVersion());
+export async function openInviteModal(code: string) {
+    const { invite } = await InviteActions.resolveInvite(code, "Desktop Modal");
+    if (!invite) return false;
 
-const customSettingsSections = (Vencord.Plugins.plugins.Settings as any as typeof SettingsPlugin).customSections;
+    VesktopNative.win.focus();
+
+    FluxDispatcher.dispatch({
+        type: "INVITE_MODAL_OPEN",
+        invite,
+        code,
+        context: "APP"
+    });
+
+    return true;
+}
+
+const customSettingsSections = (
+    Vencord.Plugins.plugins.Settings as any as { customSections: ((ID: Record<string, unknown>) => any)[] }
+).customSections;
 
 customSettingsSections.push(() => ({
     section: "Vesktop",
@@ -31,3 +47,13 @@ customSettingsSections.push(() => ({
     element: SettingsUi,
     className: "vc-vesktop-settings"
 }));
+
+const arRPC = Vencord.Plugins.plugins["WebRichPresence (arRPC)"] as any as {
+    handleEvent(e: MessageEvent): void;
+};
+
+VesktopNative.arrpc.onActivity(data => {
+    if (!Settings.store.arRPC) return;
+
+    arRPC.handleEvent(new MessageEvent("message", { data }));
+});

src/renderer/ipcCommands.ts

@@ -1,54 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { SettingsRouter } from "@vencord/types/webpack/common";
-import { IpcCommands } from "shared/IpcEvents";
-
-import { openScreenSharePicker } from "./components/ScreenSharePicker";
-
-type IpcCommandHandler = (data: any) => any;
-
-const handlers = new Map<string, IpcCommandHandler>();
-
-function respond(nonce: string, ok: boolean, data: any) {
-    VesktopNative.commands.respond({ nonce, ok, data });
-}
-
-VesktopNative.commands.onCommand(async ({ message, nonce, data }) => {
-    const handler = handlers.get(message);
-    if (!handler) {
-        return respond(nonce, false, `No handler for message: ${message}`);
-    }
-
-    try {
-        const result = await handler(data);
-        respond(nonce, true, result);
-    } catch (err) {
-        respond(nonce, false, String(err));
-    }
-});
-
-export function onIpcCommand(channel: string, handler: IpcCommandHandler) {
-    if (handlers.has(channel)) {
-        throw new Error(`Handler for message ${channel} already exists`);
-    }
-
-    handlers.set(channel, handler);
-}
-
-export function offIpcCommand(channel: string) {
-    handlers.delete(channel);
-}
-
-/* Generic Handlers */
-
-onIpcCommand(IpcCommands.NAVIGATE_SETTINGS, () => {
-    SettingsRouter.open("My Account");
-});
-
-onIpcCommand(IpcCommands.GET_LANGUAGES, () => navigator.languages);
-
-onIpcCommand(IpcCommands.SCREEN_SHARE_PICKER, data => openScreenSharePicker(data.screens, data.skipPicker));

src/renderer/logger.ts

@@ -1,9 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Logger } from "@vencord/types/utils";
-
-export const VesktopLogger = new Logger("Vesktop", "#d3869b");

src/renderer/patches/devtoolsFixes.ts

@@ -1,41 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vesktop contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        // Discord Web blocks the devtools keybin on mac specifically, disable that
-        {
-            find: '"mod+alt+i"',
-            replacement: {
-                match: /"discord\.com"===location\.host/,
-                replace: "false"
-            }
-        },
-
-        // Discord Web uses an incredibly broken devtools detector with false positives.
-        // They "hide" (aka remove from storage) your token if it "detects" open devtools.
-        // Due to the false positives, this leads to random logouts.
-        // Patch their devtools detection to use proper Electron APIs instead to fix the false positives
-        {
-            find: ".setDevtoolsCallbacks(",
-            group: true,
-            replacement: [
-                {
-                    // eslint-disable-next-line no-useless-escape
-                    match: /if\(null!=(\i)\)(?=.{0,50}\1\.window\.setDevtoolsCallbacks)/,
-                    replace: "if(true)"
-                },
-                {
-                    // eslint-disable-next-line no-useless-escape
-                    match: /\b\i\.window\.setDevtoolsCallbacks/g,
-                    replace: "VesktopNative.win.setDevtoolsCallbacks"
-                }
-            ]
-        }
-    ]
-});

src/renderer/patches/enableNotificationsByDefault.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { addPatch } from "./shared";
@@ -13,7 +13,7 @@ addPatch({
             replacement: {
                 // FIXME: fix eslint rule
                 // eslint-disable-next-line no-useless-escape
-                match: /\.isPlatformEmbedded(?=\?\i\.\i\.ALL)/g,
+                match: /\.isPlatformEmbedded(?=\?\i\.DesktopNotificationTypes\.ALL)/g,
                 replace: "$&||true"
             }
         }

src/renderer/patches/fixAutoGainToggle.ts

@@ -1,51 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vesktop contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Logger } from "@vencord/types/utils";
-import { MediaEngineStore } from "renderer/common";
-
-const logger = new Logger("FixAutoGain");
-
-function fixTrackConstraints(constraint: MediaTrackConstraints) {
-    const target = constraint.advanced?.find(opt => Object.hasOwn(opt, "autoGainControl")) ?? constraint;
-
-    target.autoGainControl = MediaEngineStore.getAutomaticGainControl();
-}
-
-function fixStreamConstraints(constraints: MediaStreamConstraints | undefined) {
-    if (!constraints?.audio) return;
-
-    if (typeof constraints.audio !== "object") {
-        constraints.audio = {};
-    }
-
-    fixTrackConstraints(constraints.audio);
-}
-
-const originalGetUserMedia = navigator.mediaDevices.getUserMedia;
-navigator.mediaDevices.getUserMedia = function (constraints) {
-    try {
-        fixStreamConstraints(constraints);
-        logger.debug("Fixed getUserMedia constraints", constraints);
-    } catch (e) {
-        logger.error("Failed to fix getUserMedia constraints", e);
-    }
-
-    return originalGetUserMedia.call(this, constraints);
-};
-
-const originalApplyConstraints = MediaStreamTrack.prototype.applyConstraints;
-MediaStreamTrack.prototype.applyConstraints = function (constraints) {
-    if (constraints) {
-        try {
-            fixTrackConstraints(constraints);
-            logger.debug("Fixed applyConstraints constraints", constraints);
-        } catch (e) {
-            logger.error("Failed to fix applyConstraints constraints", e);
-        }
-    }
-    return originalApplyConstraints.call(this, constraints);
-};

src/renderer/patches/hideDownloadAppsButton.ts

@@ -1,19 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        {
-            find: '"app-download-button"',
-            replacement: {
-                match: /return(?=.{0,50}id:"app-download-button")/,
-                replace: "return null;return"
-            }
-        }
-    ]
-});

src/renderer/patches/hideSwitchDevice.tsx

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { addPatch } from "./shared";
@@ -12,13 +12,13 @@ addPatch({
             find: "lastOutputSystemDevice.justChanged",
             replacement: {
                 // eslint-disable-next-line no-useless-escape
-                match: /(\i)\.\i\.getState\(\).neverShowModal/,
-                replace: "$& || $self.shouldIgnoreDevice($1)"
+                match: /(\i)\.default\.getState\(\).neverShowModal/,
+                replace: "$& || $self.shouldIgnore($1)"
             }
         }
     ],
 
-    shouldIgnoreDevice(state: any) {
+    shouldIgnore(state: any) {
         return Object.keys(state?.default?.lastDeviceConnected ?? {})?.[0] === "vencord-screen-share";
     }
 });

src/renderer/patches/hideVenmicInput.tsx

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { addPatch } from "./shared";

src/renderer/patches/index.ts

@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+// TODO: Possibly auto generate glob if we have more patches in the future
+import "./enableNotificationsByDefault";
+import "./platformClass";
+import "./hideSwitchDevice";
+import "./hideVenmicInput";
+import "./screenShareFixes";
+import "./spellCheck";
+import "./windowsTitleBar";

src/renderer/patches/platformClass.tsx

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { Settings } from "renderer/settings";

src/renderer/patches/screenShareFixes.ts

@@ -1,12 +1,11 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { Logger } from "@vencord/types/utils";
 import { currentSettings } from "renderer/components/ScreenSharePicker";
-import { State } from "renderer/settings";
 import { isLinux } from "renderer/utils";
 
 const logger = new Logger("VesktopStreamFixes");
@@ -28,8 +27,8 @@ if (isLinux) {
         const stream = await original.call(this, opts);
         const id = await getVirtmic();
 
-        const frameRate = Number(State.store.screenshareQuality?.frameRate ?? 30);
-        const height = Number(State.store.screenshareQuality?.resolution ?? 720);
+        const frameRate = Number(currentSettings?.fps);
+        const height = Number(currentSettings?.resolution);
         const width = Math.round(height * (16 / 9));
         const track = stream.getVideoTracks()[0];
 
@@ -37,7 +36,7 @@ if (isLinux) {
 
         const constraints = {
             ...track.getConstraints(),
-            frameRate: { min: frameRate, ideal: frameRate },
+            frameRate,
             width: { min: 640, ideal: width, max: width },
             height: { min: 480, ideal: height, max: height },
             advanced: [{ width: width, height: height }],
@@ -59,15 +58,10 @@ if (isLinux) {
                     },
                     autoGainControl: false,
                     echoCancellation: false,
-                    noiseSuppression: false,
-                    channelCount: 2,
-                    sampleRate: 48000,
-                    sampleSize: 16
+                    noiseSuppression: false
                 }
             });
-
-            stream.getAudioTracks().forEach(t => stream.removeTrack(t));
-            stream.addTrack(audio.getAudioTracks()[0]);
+            audio.getAudioTracks().forEach(t => stream.addTrack(t));
         }
 
         return stream;

src/renderer/patches/shared.ts

@@ -1,12 +1,12 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { Patch } from "@vencord/types/utils/types";
 
-window.VesktopPatchGlobals = {};
+window.VCDP = {};
 
 interface PatchData {
     patches: Omit<Patch, "plugin">[];
@@ -16,9 +16,15 @@ interface PatchData {
 export function addPatch<P extends PatchData>(p: P) {
     const { patches, ...globals } = p;
 
-    for (const patch of patches) {
-        Vencord.Plugins.addPatch(patch, "Vesktop", "VesktopPatchGlobals");
+    for (const patch of patches as Patch[]) {
+        if (!Array.isArray(patch.replacement)) patch.replacement = [patch.replacement];
+        for (const r of patch.replacement) {
+            if (typeof r.replace === "string") r.replace = r.replace.replaceAll("$self", "VCDP");
+        }
+
+        patch.plugin = "Vesktop";
+        Vencord.Plugins.patches.push(patch);
     }
 
-    Object.assign(VesktopPatchGlobals, globals);
+    Object.assign(VCDP, globals);
 }

src/renderer/patches/spellCheck.tsx

@@ -1,13 +1,12 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { addContextMenuPatch } from "@vencord/types/api/ContextMenu";
 import { findStoreLazy } from "@vencord/types/webpack";
-import { FluxDispatcher, Menu, useMemo, useStateFromStores } from "@vencord/types/webpack/common";
-import { useSettings } from "renderer/settings";
+import { FluxDispatcher, Menu, useStateFromStores } from "@vencord/types/webpack/common";
 
 import { addPatch } from "./shared";
 
@@ -51,16 +50,7 @@ addContextMenuPatch("textarea-context", children => {
     const spellCheckEnabled = useStateFromStores([SpellCheckStore], () => SpellCheckStore.isEnabled());
     const hasCorrections = Boolean(word && corrections?.length);
 
-    const availableLanguages = useMemo(VesktopNative.spellcheck.getAvailableLanguages, []);
-
-    const settings = useSettings();
-    const spellCheckLanguages = (settings.spellCheckLanguages ??= [...new Set(navigator.languages)]);
-
-    const pasteSectionIndex = children.findIndex(c => c?.props?.children?.some?.(c => c?.props?.id === "paste"));
-
-    children.splice(
-        pasteSectionIndex === -1 ? children.length : pasteSectionIndex,
-        0,
+    children.push(
         <Menu.MenuGroup>
             {hasCorrections && (
                 <>
@@ -79,39 +69,14 @@ addContextMenuPatch("textarea-context", children => {
                     />
                 </>
             )}
-
-            <Menu.MenuItem id="vcd-spellcheck-settings" label="Spellcheck Settings">
-                <Menu.MenuCheckboxItem
-                    id="vcd-spellcheck-enabled"
-                    label="Enable Spellcheck"
-                    checked={spellCheckEnabled}
-                    action={() => {
-                        FluxDispatcher.dispatch({ type: "SPELLCHECK_TOGGLE" });
-                    }}
-                />
-
-                <Menu.MenuItem id="vcd-spellcheck-languages" label="Languages" disabled={!spellCheckEnabled}>
-                    {availableLanguages.map(lang => {
-                        const isEnabled = spellCheckLanguages.includes(lang);
-                        return (
-                            <Menu.MenuCheckboxItem
-                                id={"vcd-spellcheck-lang-" + lang}
-                                label={lang}
-                                checked={isEnabled}
-                                disabled={!isEnabled && spellCheckLanguages.length >= 5}
-                                action={() => {
-                                    const newSpellCheckLanguages = spellCheckLanguages.filter(l => l !== lang);
-                                    if (newSpellCheckLanguages.length === spellCheckLanguages.length) {
-                                        newSpellCheckLanguages.push(lang);
-                                    }
-
-                                    settings.spellCheckLanguages = newSpellCheckLanguages;
-                                }}
-                            />
-                        );
-                    })}
-                </Menu.MenuItem>
-            </Menu.MenuItem>
+            <Menu.MenuCheckboxItem
+                id="vcd-spellcheck-enabled"
+                label="Enable Spellcheck"
+                checked={spellCheckEnabled}
+                action={() => {
+                    FluxDispatcher.dispatch({ type: "SPELLCHECK_TOGGLE" });
+                }}
+            />
         </Menu.MenuGroup>
     );
 });

src/renderer/patches/streamerMode.ts

@@ -1,21 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        {
-            find: ".STREAMER_MODE_ENABLE,",
-            replacement: {
-                // remove if (platformEmbedded) check from streamer mode toggle
-                // eslint-disable-next-line no-useless-escape
-                match: /if\(\i\.\i\)(?=return.{0,200}?"autoToggle")/g,
-                replace: ""
-            }
-        }
-    ]
-});

src/renderer/patches/windowMethods.tsx

@@ -1,32 +0,0 @@
-/*
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
- * Copyright (c) 2025 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        {
-            find: ",setSystemTrayApplications",
-            replacement: [
-                {
-                    // eslint-disable-next-line no-useless-escape
-                    match: /\i\.window\.(close|minimize|maximize)/g,
-                    replace: `VesktopNative.win.$1`
-                },
-                {
-                    // TODO: Fix eslint rule
-                    // eslint-disable-next-line no-useless-escape
-                    match: /(focus(\(\i\)){).{0,150}?\.focus\(\i,\i\)/,
-                    replace: "$1VesktopNative.win.focus$2"
-                },
-                {
-                    match: /,getEnableHardwareAcceleration/,
-                    replace: "$&:VesktopNative.app.getEnableHardwareAcceleration,_oldGetEnableHardwareAcceleration"
-                }
-            ]
-        }
-    ]
-});

src/renderer/patches/windowsTitleBar.tsx

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { Settings } from "renderer/settings";
@@ -19,25 +19,11 @@ if (Settings.store.customTitleBar)
                         // eslint-disable-next-line no-useless-escape
                         match: /case \i\.\i\.WINDOWS:/,
                         replace: 'case "WEB":'
-                    }
-                ]
-            },
-            // Visual Refresh
-            {
-                find: ".systemBar,",
-                replacement: [
-                    {
-                        // TODO: Fix eslint rule
-                        // eslint-disable-next-line no-useless-escape
-                        match: /\i===\i\.PlatformTypes\.WINDOWS/g,
-                        replace: "true"
                     },
-                    {
-                        // TODO: Fix eslint rule
-                        // eslint-disable-next-line no-useless-escape
-                        match: /\i===\i\.PlatformTypes\.WEB/g,
-                        replace: "false"
-                    }
+                    ...["close", "minimize", "maximize"].map(op => ({
+                        match: new RegExp(String.raw`\i\.\i\.${op}\b`),
+                        replace: `VesktopNative.win.${op}`
+                    }))
                 ]
             }
         ]

src/renderer/settings.ts

@@ -1,15 +1,12 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { useEffect, useReducer } from "@vencord/types/webpack/common";
 import { SettingsStore } from "shared/utils/SettingsStore";
 
-import { VesktopLogger } from "./logger";
-import { localStorage } from "./utils";
-
 export const Settings = new SettingsStore(VesktopNative.settings.get());
 Settings.addGlobalChangeListener((o, p) => VesktopNative.settings.set(o, p));
 
@@ -31,38 +28,3 @@ export function getValueAndOnChange(key: keyof typeof Settings.store) {
         onChange: (value: any) => (Settings.store[key] = value)
     };
 }
-
-interface TState {
-    screenshareQuality?: {
-        resolution: string;
-        frameRate: string;
-    };
-}
-
-const stateKey = "VesktopState";
-
-const currentState: TState = (() => {
-    const stored = localStorage.getItem(stateKey);
-    if (!stored) return {};
-    try {
-        return JSON.parse(stored);
-    } catch (e) {
-        VesktopLogger.error("Failed to parse stored state", e);
-        return {};
-    }
-})();
-
-export const State = new SettingsStore<TState>(currentState);
-State.addGlobalChangeListener((o, p) => localStorage.setItem(stateKey, JSON.stringify(o)));
-
-export function useVesktopState() {
-    const [, update] = useReducer(x => x + 1, 0);
-
-    useEffect(() => {
-        State.addGlobalChangeListener(update);
-
-        return () => State.removeGlobalChangeListener(update);
-    }, []);
-
-    return State.store;
-}

src/renderer/themedSplash.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import { Settings } from "./settings";
@@ -10,56 +10,22 @@ function isValidColor(color: CSSStyleValue | undefined): color is CSSUnparsedVal
     return color instanceof CSSUnparsedValue && typeof color[0] === "string" && CSS.supports("color", color[0]);
 }
 
-// https://gist.github.com/earthbound19/e7fe15fdf8ca3ef814750a61bc75b5ce
-function clamp(value: number, min: number, max: number) {
-    return Math.max(Math.min(value, max), min);
-}
-const linearToGamma = (c: number) => (c >= 0.0031308 ? 1.055 * Math.pow(c, 1 / 2.4) - 0.055 : 12.92 * c);
-
-function oklabToSRGB({ L, a, b }: { L: number; a: number; b: number }) {
-    let l = L + a * +0.3963377774 + b * +0.2158037573;
-    let m = L + a * -0.1055613458 + b * -0.0638541728;
-    let s = L + a * -0.0894841775 + b * -1.291485548;
-    l **= 3;
-    m **= 3;
-    s **= 3;
-    let R = l * +4.0767416621 + m * -3.3077115913 + s * +0.2309699292;
-    let G = l * -1.2684380046 + m * +2.6097574011 + s * -0.3413193965;
-    let B = l * -0.0041960863 + m * -0.7034186147 + s * +1.707614701;
-    R = 255 * linearToGamma(R);
-    G = 255 * linearToGamma(G);
-    B = 255 * linearToGamma(B);
-    R = Math.round(clamp(R, 0, 255));
-    G = Math.round(clamp(G, 0, 255));
-    B = Math.round(clamp(B, 0, 255));
-
-    return `rgb(${R}, ${G}, ${B})`;
-}
-
 function resolveColor(color: string) {
     const span = document.createElement("span");
     span.style.color = color;
     span.style.display = "none";
 
     document.body.append(span);
-    let rgbColor = getComputedStyle(span).color;
+    const rgbColor = getComputedStyle(span).color;
     span.remove();
 
-    if (rgbColor.startsWith("oklab(")) {
-        // scam
-        const [_, L, a, b] = rgbColor.match(/oklab\((.+?)[, ]+(.+?)[, ]+(.+?)\)/) ?? [];
-        if (L && a && b) {
-            rgbColor = oklabToSRGB({ L: parseFloat(L), a: parseFloat(a), b: parseFloat(b) });
-        }
-    }
-
     return rgbColor;
 }
 
 const updateSplashColors = () => {
     const bodyStyles = document.body.computedStyleMap();
 
-    const color = bodyStyles.get("--text-default");
+    const color = bodyStyles.get("--text-normal");
     const backgroundColor = bodyStyles.get("--background-primary");
 
     if (isValidColor(color)) {

src/renderer/utils.ts

@@ -1,10 +1,9 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-// Discord deletes this from the window so we need to capture it in a variable
 export const { localStorage } = window;
 
 export const isFirstRun = (() => {
@@ -19,26 +18,3 @@ const { platform } = navigator;
 export const isWindows = platform.startsWith("Win");
 export const isMac = platform.startsWith("Mac");
 export const isLinux = platform.startsWith("Linux");
-
-type ClassNameFactoryArg = string | string[] | Record<string, unknown> | false | null | undefined | 0 | "";
-/**
- * @param prefix The prefix to add to each class, defaults to `""`
- * @returns A classname generator function
- * @example
- * const cl = classNameFactory("plugin-");
- *
- * cl("base", ["item", "editable"], { selected: null, disabled: true })
- * // => "plugin-base plugin-item plugin-editable plugin-disabled"
- */
-export const classNameFactory =
-    (prefix: string = "") =>
-    (...args: ClassNameFactoryArg[]) => {
-        const classNames = new Set<string>();
-        for (const arg of args) {
-            if (arg && typeof arg === "string") classNames.add(arg);
-            else if (Array.isArray(arg)) arg.forEach(name => classNames.add(name));
-            else if (arg && typeof arg === "object")
-                Object.entries(arg).forEach(([name, value]) => value && classNames.add(name));
-        }
-        return Array.from(classNames, name => prefix + name).join(" ");
-    };

src/shared/IpcEvents.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 export const enum IpcEvents {
@@ -12,7 +12,6 @@ export const enum IpcEvents {
 
     GET_VERSION = "VCD_GET_VERSION",
     SUPPORTS_WINDOWS_TRANSPARENCY = "VCD_SUPPORTS_WINDOWS_TRANSPARENCY",
-    GET_ENABLE_HARDWARE_ACCELERATION = "VCD_GET_ENABLE_HARDWARE_ACCELERATION",
 
     RELAUNCH = "VCD_RELAUNCH",
     CLOSE = "VCD_CLOSE",
@@ -24,14 +23,13 @@ export const enum IpcEvents {
     GET_SETTINGS = "VCD_GET_SETTINGS",
     SET_SETTINGS = "VCD_SET_SETTINGS",
 
-    GET_VENCORD_DIR = "VCD_GET_VENCORD_DIR",
     SELECT_VENCORD_DIR = "VCD_SELECT_VENCORD_DIR",
 
     UPDATER_GET_DATA = "VCD_UPDATER_GET_DATA",
     UPDATER_DOWNLOAD = "VCD_UPDATER_DOWNLOAD",
     UPDATE_IGNORE = "VCD_UPDATE_IGNORE",
 
-    SPELLCHECK_GET_AVAILABLE_LANGUAGES = "VCD_SPELLCHECK_GET_AVAILABLE_LANGUAGES",
+    SPELLCHECK_SET_LANGUAGES = "VCD_SPELLCHECK_SET_LANGUAGES",
     SPELLCHECK_RESULT = "VCD_SPELLCHECK_RESULT",
     SPELLCHECK_REPLACE_MISSPELLING = "VCD_SPELLCHECK_REPLACE_MISSPELLING",
     SPELLCHECK_ADD_TO_DICTIONARY = "VCD_SPELLCHECK_ADD_TO_DICTIONARY",
@@ -49,25 +47,7 @@ export const enum IpcEvents {
     VIRT_MIC_START_SYSTEM = "VCD_VIRT_MIC_START_ALL",
     VIRT_MIC_STOP = "VCD_VIRT_MIC_STOP",
 
-    CLIPBOARD_COPY_IMAGE = "VCD_CLIPBOARD_COPY_IMAGE",
+    ARRPC_ACTIVITY = "VCD_ARRPC_ACTIVITY",
 
-    DEBUG_LAUNCH_GPU = "VCD_DEBUG_LAUNCH_GPU",
-    DEBUG_LAUNCH_WEBRTC_INTERNALS = "VCD_DEBUG_LAUNCH_WEBRTC",
-
-    IPC_COMMAND = "VCD_IPC_COMMAND",
-
-    DEVTOOLS_OPENED = "VCD_DEVTOOLS_OPENED",
-    DEVTOOLS_CLOSED = "VCD_DEVTOOLS_CLOSED"
-}
-
-export const enum IpcCommands {
-    RPC_ACTIVITY = "rpc:activity",
-    RPC_INVITE = "rpc:invite",
-    RPC_DEEP_LINK = "rpc:link",
-
-    NAVIGATE_SETTINGS = "navigate:settings",
-
-    GET_LANGUAGES = "navigator.languages",
-
-    SCREEN_SHARE_PICKER = "screenshare:picker"
+    CLIPBOARD_COPY_IMAGE = "VCD_CLIPBOARD_COPY_IMAGE"
 }

src/shared/browserWinProperties.ts

@@ -1,7 +1,7 @@
 /*
+ * SPDX-License-Identifier: GPL-3.0
  * Vesktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 import type { BrowserWindowConstructorOptions } from "electron";