.env.example

@@ -4,5 +4,3 @@
 # all permissions at the defaults (public repos read only, 0 permissions):
 # https://github.com/settings/personal-access-tokens/new
 GITHUB_TOKEN=
-
-ELECTRON_LAUNCH_FLAGS="--ozone-platform-hint=auto --enable-webrtc-pipewire-capturer --enable-features=WaylandWindowDecorations"

.eslintrc.json

@@ -0,0 +1,63 @@
+{
+    "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", { "object": true, "array": 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/blank.yml

@@ -1,18 +0,0 @@
-name: Blank Issue
-description: Reserved for developers. Use the bug report or feature request templates instead.
-
-body:
-    - type: markdown
-      attributes:
-          value: |
-              # READ THIS BEFORE OPENING AN ISSUE
-
-              This form is only meant for Vesktop developers. If you don't know what you're doing,
-              please use the bug report or feature request templates instead.
-
-    - type: textarea
-      id: content
-      attributes:
-          label: Content
-      validations:
-          required: true

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,130 +0,0 @@
-name: 🐛 Bug / Crash Report
-description: Create a bug or crash report for Vesktop
-labels: [bug]
-title: "[Bug] <title>"
-
-body:
-    - type: markdown
-      attributes:
-          value: |
-              **Thanks 🩷 for taking the time to fill out this bug report! Before proceeding, please read the following**
-
-              Make sure a similar issue doesn't already exist by [searching the existing issues](https://github.com/Vencord/Vesktop/issues?q=is%3Aissue) for keywords!
-
-              Make sure both Vesktop and Vencord are fully up to date. You can update Vencord by right-clicking the Vesktop tray icon and pressing "Repair Vencord"
-
-              **DO NOT REPORT** any of the following issues:
-              - Purely graphical glitches like flickering, scaling issues[^1]
-              - App crashing / not showing window with mentions of the gpu process in the stacktrace[^1]
-              - Screenshare not starting, black screening or crashing[^2]
-              - Vencord related issues: This is the Vesktop repo, not Vencord
-              - Captchas[^3]
-              - Issues with opening URLs[^4]
-              - Issues with Notifications[^4]
-              - Issues with Input Methods[^4]
-              - Issues with File Drag and Drop[^5] 
-              - Network Errors[^6]
-
-              Linux users: Please only report issues with supported packages (flatpak and any builds from the README / releases).
-              We do not support other packages, like the AUR or Nix packages, so please first make sure your issue is reproducible with official releases,
-              like [our Flatpak](https://flathub.org/apps/dev.vencord.Vesktop) or [AppImage](https://vencord.dev/download/vesktop/amd64/appimage)
-
-
-              [^1]: GPU issue. Disable hardware acceleration in Vesktop Settings or run with `--disable-gpu`
-              [^2]: System issue. You will have to fix it
-              [^3]: If you are receiving a lot of captchas, it means Discord thinks you might be a bot. Make sure you're not using a VPN/Proxy
-              [^4]: These things are handled by Chromium / Electron, not us. If they don't work, it's either an issue with your system or a bug with Chromium.
-              [^5]: You are likely using the Vesktop flatpak and trying to drop a file the flatpak can't access. You can fix this by installing Flatseal and using it to grant Vesktop full access to your files
-              [^6]: Issue on your end, you have to fix it. Try changing your DNS to [1.1.1.1 (Cloudflare DNS)](https://developers.cloudflare.com/1.1.1.1/setup/)
-              
-    - type: input
-      id: discord
-      attributes:
-          label: Discord Account
-          description: Who on Discord is making this request? Not required but encouraged for easier follow-up
-          placeholder: username#0000
-      validations:
-          required: false
-
-    - type: input
-      id: os
-      attributes:
-          label: Operating System
-          description: What operating system are you using (eg Windows 10, macOS Big Sur, Ubuntu 20.04)?
-          placeholder: Windows 10
-      validations:
-          required: true
-
-    - type: input
-      id: linux-de
-      attributes:
-          label: Linux Only ~ Desktop Environment
-          description: If you are on Linux, what Desktop environment are you using (eg GNOME, KDE, XFCE)? Are you using Wayland or Xorg?
-          placeholder: Gnome on Wayland
-      validations:
-          required: false
-
-    - type: input
-      id: install-type
-      attributes:
-          label: Package Type
-          description: What kind of Vesktop package are you using? (Setup exe, Portable, Flatpak, AppImage, Deb, etc)
-          placeholder: Flatpak
-      validations:
-          required: true
-
-    - type: textarea
-      id: bug-description
-      attributes:
-          label: What happens when the bug or crash occurs?
-          description: Where does this bug or crash occur, when does it occur, etc.
-          placeholder: The bug/crash happens sometimes when I do ..., causing this to not work/the app to crash. I think it happens because of ...
-      validations:
-          required: true
-
-    - type: textarea
-      id: expected-behaviour
-      attributes:
-          label: What is the expected behaviour?
-          description: Simply detail what the expected behaviour is.
-          placeholder: I expect Vencord/Discord to open the ... page instead of ..., it prevents me from doing ...
-      validations:
-          required: true
-
-    - type: textarea
-      id: steps-to-take
-      attributes:
-          label: How do you recreate this bug or crash?
-          description: Give us a list of steps in order to recreate the bug or crash.
-          placeholder: |
-              1. Do ...
-              2. Then ...
-              3. Do this ..., ... and then ...
-              4. Observe "the bug" or "the crash"
-      validations:
-          required: true
-
-    - type: textarea
-      id: debug-logs
-      attributes:
-          label: Debug Logs
-          description: Run vesktop from the command line. Include the relevant command line output here. If there are any lines that seem relevant, try googling them or searching existing issues
-          value: |
-              ```
-              Replace this text with your crash-log. Do not remove the backticks
-              ```
-      validations:
-          required: true
-
-    - type: checkboxes
-      id: agreement-check
-      attributes:
-          label: Request Agreement
-          description: We only accept reports for bugs that happen on supported and up to date Vesktop releases
-          options:
-              - label: I have searched the existing issues and found no similar issue
-                required: true
-              - label: I am using the latest Vesktop and Vencord versions
-                required: true
-              - label: This issue occurs on an official release (not just the AUR or Nix packages)
-                required: true

.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: If you need help regarding Vesktop or Vencord, please join our support server!

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,74 +0,0 @@
-name: 🛠️ Feature Request
-description: Request a feature for Vesktop
-labels: [enhancement]
-title: "[Feature Request] <title>"
-
-body:
-    - type: markdown
-      attributes:
-          value: |
-              **Thanks 🩷 for taking the time to fill out this request! Before proceeding, please read the following**
-
-              Make sure a similar request doesn't already exist by [searching the existing issues](https://github.com/Vencord/Vesktop/issues?q=is%3Aissue) for keywords!
-
-              This form is only meant for **Vesktop feature requests**.
-              For plugin requests or Vencord feature requests, go [here](https://github.com/Vencord/plugin-requests/issues/new?template=request.yml) instead!
-
-              **DO NOT** make any icon related requests or you will be blocked.
-
-    - type: input
-      id: discord
-      attributes:
-          label: Discord Account
-          description: Who on Discord is making this request? Not required but encouraged for easier follow-up
-          placeholder: username#0000
-      validations:
-          required: false
-
-    - type: textarea
-      id: motivation
-      attributes:
-          label: Motivation
-          description: If your feature request related to a problem? Please describe
-          placeholder: I'm always frustrated when ..., I think it would be better if ...
-      validations:
-          required: true
-
-    - type: textarea
-      id: solution
-      attributes:
-          label: Solution
-          description: Describe the solution you'd like
-          placeholder: A clear and concise description of what you want to happen.
-      validations:
-          required: true
-
-    - type: textarea
-      id: alternatives
-      attributes:
-          label: Alternatives
-          description: Describe alternatives you've considered
-          placeholder: A clear and concise description of any alternative solutions or features you've considered.
-      validations:
-          required: true
-
-    - type: textarea
-      id: additional-context
-      attributes:
-          label: Additional context
-          description: Add any other context here. Screenshots or mockups could help greatly
-      validations:
-          required: false
-
-    - type: checkboxes
-      id: agreement-check
-      attributes:
-          label: Request Agreement
-          description: This form is only for Vesktop feature requests. If the following don't apply, re-read the introduction text
-          options:
-              - label: I have searched the existing issues and found no similar issue
-                required: true
-              - label: This is not a plugin request
-                required: true
-              - label: This is not a Vencord feature request
-                required: true

.github/workflows/meta.yml

@@ -1,38 +0,0 @@
-name: Update metainfo on release
-
-on:
-    release:
-        types:
-            - published
-    workflow_dispatch:
-
-jobs:
-    update:
-        runs-on: ubuntu-latest
-
-        steps:
-            - uses: actions/checkout@v4
-            - uses: pnpm/action-setup@v4 # Install pnpm using packageManager key in package.json
-
-            - name: Use Node.js 20
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20
-
-            - name: Install dependencies
-              run: pnpm i
-
-            - 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"
-                  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 }}."
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -4,7 +4,6 @@ on:
     push:
         tags:
             - v*
-    workflow_dispatch:
 
 jobs:
     release:
@@ -13,47 +12,17 @@ jobs:
         strategy:
             matrix:
                 os: [macos-latest, ubuntu-latest, windows-latest]
-                include:
-                    - os: macos-latest
-                      platform: mac
-                    - os: ubuntu-latest
-                      platform: linux
-                    - os: windows-latest
-                      platform: windows
 
         steps:
-            - uses: actions/checkout@v4
-            - uses: pnpm/action-setup@v4 # Install pnpm using packageManager key in package.json
+            - name: Check out Git repository
+              uses: actions/checkout@v3
 
-            - name: Use Node.js 20
-              uses: actions/setup-node@v4
+            - uses: actions/setup-node@v3
               with:
-                  node-version: 20
-                  cache: "pnpm"
-
-            - name: Install dependencies
-              run: pnpm install --frozen-lockfile
-
-            - name: Build
-              run: pnpm build
+                  node-version: 18
 
             - name: Run Electron Builder
-              if: ${{ matrix.platform != 'mac' }}
-              run: |
-                  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 }}
+              uses: samuelmeuli/action-electron-builder@e4b12cd06ddf023422f1ac4e39632bd76f6e6928
+              with:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  RELEASE: true

.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
+              uses: actions/setup-node@v3
               with:
-                  node-version: 20
+                  node-version: 18
                   cache: "pnpm"
 
             - name: Install dependencies

.github/workflows/winget-submission.yml

@@ -1,25 +0,0 @@
-name: Submit to Winget Community Repo
-
-on:
-  release:
-    types: [published]
-  workflow_dispatch:
-    inputs:
-      tag:
-        type: string
-        description: The release tag to submit
-        required: true
-
-jobs:
-  winget:
-    name: Publish winget package
-    runs-on: windows-latest
-    steps:
-      - name: Submit package to Winget Community Repo
-        uses: vedantmgoyal2009/winget-releaser@0db4f0a478166abd0fa438c631849f0b8dcfb99f
-        with:
-          identifier: Vencord.Vesktop
-          token: ${{ secrets.WINGET_PAT }}
-          installers-regex: '\.exe$'
-          release-tag: ${{ inputs.tag || github.event.release.tag_name }}
-          fork-user: shiggybot

.gitignore

@@ -1,6 +1,3 @@
 dist
 node_modules
 .env
-.DS_Store
-.idea/
-.pnpm-store/

.npmrc

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

.vscode/settings.json

@@ -1,25 +1,24 @@
-{
-    "editor.formatOnSave": true,
-    "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": "explicit"
-    },
-    "[typescript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[javascript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[typescriptreact]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[javascriptreact]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[json]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[jsonc]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "cSpell.words": ["Vesktop"]
-}
+{
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true
+    },
+    "[typescript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[javascript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[typescriptreact]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[javascriptreact]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[json]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[jsonc]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    }
+}

README.md

@@ -1,67 +1,53 @@
-# Vesktop
+# Vencord Desktop
 
-Vesktop is a custom Discord desktop app
+Vencord Desktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
 
-**Main features**:
-- Vencord preinstalled
-- Much more lightweight and faster than the official Discord app
-- Linux Screenshare with sound & wayland
-- Much better privacy, since Discord has no access to your system
+Vencord Desktop is currently in beta
 
 **Not yet supported**:
 - Global Keybinds
-- see the [Roadmap](https://github.com/Vencord/Vesktop/issues/324)
 
-![](https://github.com/Vencord/Vesktop/assets/45497981/8608a899-96a9-4027-9725-2cb02ba189fd)
-![](https://github.com/Vencord/Vesktop/assets/45497981/8701e5de-52c4-4346-a990-719cb971642e)
+Bug reports, feature requests & contributions are highly appreciated!!
+
+![image](https://user-images.githubusercontent.com/45497981/235024615-94565eaf-f412-4384-a3f5-d8cde7458f6d.png)
 
 ## Installing
 
 ### Windows
 
-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)
+Download and run Vencord-Desktop-Setup-VERSION.exe from [releases](https://github.com/Vencord/Desktop/releases/latest)
 
 ### Mac
 
-[Vesktop.dmg](https://vencord.dev/download/vesktop/universal/dmg)
+Download and run Vencord-Desktop-VERSION.dmg from [releases](https://github.com/Vencord/Desktop/releases/latest)
 
 ### Linux
 
-[![Download on Flathub](https://dl.flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/dev.vencord.Vesktop)
+#### Arch based
 
-If you don't know the difference, pick amd64.
+Install [vencord-desktop-git](https://aur.archlinux.org/packages/vencord-desktop-git) from the AUR using your favourite AUR helper, for example [yay](https://github.com/Jguer/yay)
 
-- amd64 / x86_64
-  - [AppImage](https://vencord.dev/download/vesktop/amd64/appimage)
-  - [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
-  - [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)
-  - [tarball](https://vencord.dev/download/vesktop/arm64/tar)
+#### Ubuntu/Debian based
 
-#### Community packages
+Download Vencord-Desktop-VERSION.deb from [releases](https://github.com/Vencord/Desktop/releases/latest)
 
-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!
+#### Fedora/RHEL based
 
-- Arch Linux: [Vesktop on the Arch user repository](https://aur.archlinux.org/packages?K=vesktop)
-- NixOS: https://wiki.nixos.org/wiki/Discord#Vesktop
-- Windows - Scoop: https://scoop.sh/#/apps?q=Vesktop
+Download Vencord-Desktop-VERSION.rpm from [releases](https://github.com/Vencord/Desktop/releases/latest)
 
-## Building from Source
+#### Other
 
-Packaging will create builds in the dist/ folder
+Either download Vencord-Desktop-VERSION.AppImage and just run it directly or grab Vencord-Desktop-VERSION.tar.gz, extract it somewhere and run `vencorddesktop`.
+
+A flatpak is planned, if you want packages for other repos, feel free to create them and they can be linked as unofficial here
+
+## Building
+
+Packaging will create builds in the dist/ folder. You can then install them like mentioned above or distribute them
 
 ```sh
-git clone https://github.com/Vencord/Vesktop
-cd Vesktop
+git clone https://github.com/Vencord/Desktop
+cd Desktop
 
 # Install Dependencies
 pnpm i
@@ -76,3 +62,11 @@ pnpm package --linux pacman
 # Or package to a directory only
 pnpm package:dir
 ```
+
+## Motivation
+
+The official Discord Desktop app is very resource heavy compared to Discord in your Browser. There are multiple alternative Electron apps (ArmCord, WebCord, probably more) that prove how much of a performance gain you can gain by using a custom app. ArmCord already supports Vencord but makes it pretty limited for us. Making our own standalone app gives us much more control.
+
+This is just a random idea I (V) got, and might not actually ever be finished heh
+
+Gluon also seems very attractive for this because of how lightweight it can be and because unlike electron, streaming just works out of the box like in any chromium browser. However, at the time of writing this, it still lacks some features necessary to make it work (synchronous ipc or a way to get node process variables into the onLoad function for instance, plus onLoad seems to load a little too late sometimes)

build/entitlements.mac.plist

@@ -1,21 +0,0 @@
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-	<true/>
-	<key>com.apple.security.cs.allow-jit</key>
-	<true/>
-	<key>com.apple.security.network.client</key>
-	<true/>
-	<key>com.apple.security.device.audio-input</key>
-	<true/>
-	<key>com.apple.security.device.camera</key>
-	<true/>
-	<key>com.apple.security.device.bluetooth</key>
-	<true/>
-	<key>com.apple.security.cs.allow-dyld-environment-variables</key>
-	<true/>
-	<key>com.apple.security.cs.disable-library-validation</key>
-	<true/>
-  </dict>
-</plist>

build/installer.nsh

@@ -1,8 +1,8 @@
 !macro preInit
  SetRegView 64
-  WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\vesktop"
-  WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\vesktop"
+  WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\VencordDesktop"
+  WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\VencordDesktop"
  SetRegView 32
-  WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\vesktop"
-  WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\vesktop"
+  WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\VencordDesktop"
+  WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\VencordDesktop"
 !macroend

eslint.config.mjs

@@ -1,102 +0,0 @@
-/*
- * 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
- */
-
-//@ts-check
-
-import stylistic from "@stylistic/eslint-plugin";
-import pathAlias from "eslint-plugin-path-alias";
-import header 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: {
-            header,
-            stylistic,
-            importSort,
-            unusedImports,
-            pathAlias,
-            prettier
-        },
-        settings: {
-            "import/resolver": {
-                alias: {
-                    map: []
-                }
-            }
-        },
-        languageOptions: {
-            parser: tseslint.parser,
-            parserOptions: {
-                project: true,
-                tsconfigRootDir: import.meta.dirname
-            }
-        },
-        rules: {
-            "header/header": [
-                "error",
-                {
-                    files: ["scripts/header.txt"]
-                }
-            ],
-
-            // 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

@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component type="desktop-application">
-  <!--Created with jdAppStreamEdit 7.1-->
-  <id>dev.vencord.Vesktop</id>
-  <name>Vesktop</name>
-  <summary>Snappier Discord app with Vencord</summary>
-  <developer_name>Vencord Contributors</developer_name>
-  <launchable type="desktop-id">dev.vencord.Vesktop.desktop</launchable>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0</project_license>
-  <project_group>Vencord</project_group>
-  <description>
-    <p>Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed.</p>
-    <p>Vesktop comes bundled with Venmic, a purpose-built library to provide functioning audio screenshare.</p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <caption>Vencord settings page and about window open</caption>
-      <image type="source">https://vencord.dev/assets/screenshots/vesktop-1-appstream.png</image>
-    </screenshot>
-    <screenshot>
-      <caption>A dialog showing screenshare options</caption>
-      <image type="source">https://vencord.dev/assets/screenshots/vesktop-2-appstream.png</image>
-    </screenshot>
-    <screenshot>
-      <caption>A screenshot of a Discord server</caption>
-      <image type="source">https://vencord.dev/assets/screenshots/vesktop-3-appstream.png</image>
-    </screenshot>
-  </screenshots>
-  <releases>
-    <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>
-        <p>New Features</p>
-        <ul>
-          <li>Added categories to Vesktop settings to reduce visual clutter by @justin13888</li>
-          <li>Added support for Vencord's transparent window options</li>
-        </ul>
-        <p>Fixes</p>
-        <ul>
-          <li>Fixed ugly error popups when starting Vesktop without working internet connection</li>
-          <li>Fixed popout title bars on Windows</li>
-          <li>Fixed spellcheck entries</li>
-          <li>Fixed screenshare audio using microphone on debian, by @Curve</li>
-          <li>Fixed a bug where autostart on Linux won't preserve command line flags</li>
-        </ul>
-      </description>
-    </release>
-    <release version="1.5.0" date="2024-01-16" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.0</url>
-      <description>
-        <p>What's Changed</p>
-        <ul>
-          <li>fully renamed to Vesktop. You will likely have to login to Discord again. You might have to re-create your vesktop shortcut</li>
-          <li>added option to disable smooth scrolling by @ZirixCZ</li>
-          <li>added setting to disable hardware acceleration by @zt64</li>
-          <li>fixed adding connections</li>
-          <li>fixed / improved discord popouts</li>
-          <li>you can now use the custom discord titlebar on linux/mac</li>
-          <li>the splash window is now draggable</li>
-          <li>now signed on mac</li>
-        </ul>
-      </description>
-    </release>
-    <release version="0.4.4" date="2023-12-02" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.4.4</url>
-      <description>
-        <p>What's Changed</p>
-        <ul>
-          <li>improve venmic system compatibility by @Curve</li>
-          <li>Update steamdeck controller layout by @AAGaming00</li>
-          <li>feat: Add option to disable smooth scrolling by @ZirixCZ</li>
-          <li>unblur shiggy in splash screen by @viacoro</li>
-          <li>update electron &amp; arrpc @D3SOX</li>
-        </ul>
-      </description>
-    </release>
-    <release version="0.4.3" date="2023-11-01" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.4.3</url>
-    </release>
-    <release version="0.4.2" date="2023-10-26" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.4.2</url>
-    </release>
-    <release version="0.4.1" date="2023-10-24" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.4.1</url>
-    </release>
-    <release version="0.4.0" date="2023-10-21" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.4.0</url>
-    </release>
-    <release version="0.3.3" date="2023-09-30" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.3.3</url>
-    </release>
-    <release version="0.3.2" date="2023-09-25" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.3.2</url>
-    </release>
-    <release version="0.3.1" date="2023-09-25" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.3.1</url>
-    </release>
-    <release version="0.3.0" date="2023-08-16" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.3.0</url>
-    </release>
-    <release version="0.2.9" date="2023-08-12" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.2.9</url>
-    </release>
-    <release version="0.2.8" date="2023-08-02" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.2.8</url>
-    </release>
-    <release version="0.2.7" date="2023-07-26" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.2.7</url>
-    </release>
-    <release version="0.2.6" date="2023-07-04" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.2.6</url>
-    </release>
-    <release version="0.2.5" date="2023-06-26" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.2.5</url>
-    </release>
-    <release version="0.2.4" date="2023-06-25" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.2.4</url>
-    </release>
-    <release version="0.2.3" date="2023-06-23" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.2.3</url>
-    </release>
-    <release version="0.2.2" date="2023-06-21" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.2.2</url>
-    </release>
-    <release version="0.2.1" date="2023-06-21" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.2.1</url>
-    </release>
-    <release version="0.2.0" date="2023-05-03" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.2.0</url>
-    </release>
-    <release version="0.1.9" date="2023-04-27" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.1.9</url>
-    </release>
-    <release version="0.1.8" date="2023-04-15" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.1.8</url>
-    </release>
-    <release version="0.1.7" date="2023-04-15" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.1.7</url>
-    </release>
-    <release version="0.1.6" date="2023-04-11" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.1.6</url>
-    </release>
-    <release version="0.1.5" date="2023-04-10" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.1.5</url>
-    </release>
-    <release version="0.1.4" date="2023-04-09" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.1.4</url>
-    </release>
-    <release version="0.1.3" date="2023-04-06" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.1.3</url>
-    </release>
-    <release version="0.1.2" date="2023-04-05" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.1.2</url>
-    </release>
-    <release version="0.1.1" date="2023-04-04" type="stable">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.1.1</url>
-    </release>
-    <release version="0.1.0" date="2023-04-04" type="development">
-      <url>https://github.com/Vencord/Vesktop/releases/tag/v0.1.0</url>
-    </release>
-  </releases>
-  <url type="homepage">https://vencord.dev/</url>
-  <url type="bugtracker">https://github.com/Vencord/Vesktop/issues</url>
-  <url type="faq">https://vencord.dev/faq/</url>
-  <url type="help">https://github.com/Vencord/Vesktop/issues</url>
-  <url type="donation">https://github.com/sponsors/Vendicated</url>
-  <url type="vcs-browser">https://github.com/Vencord/Vesktop</url>
-  <categories>
-    <category>InstantMessaging</category>
-    <category>Network</category>
-  </categories>
-  <requires>
-    <control>pointing</control>
-    <control>keyboard</control>
-    <display_length compare="ge">420</display_length>
-    <internet>always</internet>
-  </requires>
-  <recommends>
-    <control>voice</control>
-    <display_length compare="ge">760</display_length>
-    <display_length compare="le">1200</display_length>
-  </recommends>
-  <content_rating type="oars-1.1">
-    <content_attribute id="social-chat">intense</content_attribute>
-    <content_attribute id="social-audio">intense</content_attribute>
-    <content_attribute id="social-contacts">intense</content_attribute>
-    <content_attribute id="social-info">intense</content_attribute>
-  </content_rating>
-  <keywords>
-    <keyword>Discord</keyword>
-    <keyword>Vencord</keyword>
-    <keyword>Vesktop</keyword>
-    <keyword>Privacy</keyword>
-    <keyword>Mod</keyword>
-  </keywords>
-</component>

package.json

@@ -1,8 +1,8 @@
 {
-    "name": "vesktop",
-    "version": "1.5.3",
+    "name": "VencordDesktop",
+    "version": "0.2.2",
     "private": true,
-    "description": "Vesktop is a custom Discord desktop app",
+    "description": "",
     "keywords": [],
     "homepage": "https://vencord.dev/",
     "license": "GPL-3.0",
@@ -13,101 +13,69 @@
         "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 .",
         "start:watch": "pnpm build:dev && tsx scripts/startWatch.mts",
         "test": "pnpm lint && pnpm testTypes",
         "testTypes": "tsc --noEmit",
-        "watch": "pnpm build --watch",
-        "updateMeta": "tsx scripts/utils/updateMeta.mts"
+        "watch": "pnpm build --watch"
     },
     "dependencies": {
-        "arrpc": "github:OpenAsar/arrpc#5aadc307cb9bf4479f0a12364a253b07a77ace22",
-        "electron-updater": "^6.3.4"
-    },
-    "optionalDependencies": {
-        "@vencord/venmic": "^6.1.0"
+        "arrpc": "^3.1.0"
     },
     "devDependencies": {
         "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
-        "@stylistic/eslint-plugin": "^2.8.0",
-        "@types/node": "^22.5.5",
-        "@types/react": "^18.3.8",
-        "@vencord/types": "^1.8.4",
-        "dotenv": "^16.4.5",
-        "electron": "^33.0.2",
-        "electron-builder": "^25.0.5",
-        "esbuild": "^0.23.1",
-        "eslint": "^9.11.0",
+        "@types/node": "^18.15.11",
+        "@types/react": "^18.0.33",
+        "@typescript-eslint/eslint-plugin": "^5.57.1",
+        "@typescript-eslint/parser": "^5.57.1",
+        "@vencord/types": "^0.1.2",
+        "dotenv": "^16.0.3",
+        "electron": "^23.2.0",
+        "electron-builder": "^23.6.0",
+        "esbuild": "^0.17.14",
+        "eslint": "^8.38.0",
+        "eslint-config-prettier": "^8.8.0",
         "eslint-import-resolver-alias": "^1.1.2",
-        "eslint-plugin-path-alias": "^2.1.0",
-        "eslint-plugin-prettier": "^5.2.1",
-        "eslint-plugin-simple-header": "^1.2.1",
-        "eslint-plugin-simple-import-sort": "^12.1.1",
-        "eslint-plugin-unused-imports": "^4.1.4",
-        "prettier": "^3.3.3",
+        "eslint-plugin-license-header": "^0.6.0",
+        "eslint-plugin-path-alias": "^1.0.0",
+        "eslint-plugin-prettier": "^4.2.1",
+        "eslint-plugin-simple-import-sort": "^10.0.0",
+        "eslint-plugin-unused-imports": "^2.0.0",
+        "prettier": "^2.8.7",
         "source-map-support": "^0.5.21",
-        "tsx": "^4.19.1",
-        "type-fest": "^4.26.1",
-        "typescript": "^5.6.2",
-        "typescript-eslint": "^8.6.0",
-        "xml-formatter": "^3.6.3"
+        "tsx": "^3.12.6",
+        "type-fest": "^3.8.0",
+        "typescript": "^5.0.2"
     },
-    "packageManager": "pnpm@9.1.0",
+    "packageManager": "pnpm@8.1.1",
     "engines": {
         "node": ">=18",
         "pnpm": ">=8"
     },
     "build": {
-        "appId": "dev.vencord.vesktop",
-        "productName": "Vesktop",
+        "appId": "dev.vencord.desktop",
+        "productName": "Vencord Desktop",
         "files": [
             "!*",
-            "!node_modules",
             "dist/js",
             "static",
             "package.json",
             "LICENSE"
         ],
-        "beforePack": "scripts/build/sandboxFix.js",
         "linux": {
-            "icon": "build/icon.icns",
             "category": "Network",
-            "maintainer": "vendicated+vesktop@riseup.net",
+            "maintainer": "vendicated+vencord-desktop@riseup.net",
             "target": [
-                {
-                    "target": "deb",
-                    "arch": [
-                        "x64",
-                        "arm64"
-                    ]
-                },
-                {
-                    "target": "tar.gz",
-                    "arch": [
-                        "x64",
-                        "arm64"
-                    ]
-                },
-                {
-                    "target": "rpm",
-                    "arch": [
-                        "x64",
-                        "arm64"
-                    ]
-                },
-                {
-                    "target": "AppImage",
-                    "arch": [
-                        "x64",
-                        "arm64"
-                    ]
-                }
+                "deb",
+                "tar.gz",
+                "rpm",
+                "AppImage"
             ],
             "desktop": {
-                "Name": "Vesktop",
+                "Name": "Vencord Desktop",
                 "GenericName": "Internet Messenger",
                 "Type": "Application",
                 "Categories": "Network;InstantMessaging;Chat;",
@@ -119,40 +87,12 @@
                 {
                     "target": "default",
                     "arch": [
-                        "universal"
+                        "x64",
+                        "arm64"
                     ]
                 }
             ],
-            "category": "public.app-category.social-networking",
-            "darkModeSupport": true,
-            "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"
-                }
-            ]
+            "category": "Network"
         },
         "nsis": {
             "include": "build/installer.nsh",
@@ -160,34 +100,13 @@
         },
         "win": {
             "target": [
-                {
-                    "target": "nsis",
-                    "arch": [
-                        "x64",
-                        "arm64"
-                    ]
-                },
-                {
-                    "target": "zip",
-                    "arch": [
-                        "x64",
-                        "arm64"
-                    ]
-                }
+                "nsis",
+                "portable"
             ]
         },
         "publish": {
-            "provider": "github"
-        },
-        "rpm": {
-            "fpm": [
-                "--rpm-rpmbuild-define=_build_id_links none"
-            ]
-        }
-    },
-    "pnpm": {
-        "patchedDependencies": {
-            "arrpc@3.5.0": "patches/arrpc@3.5.0.patch"
+            "provider": "github",
+            "releaseType": "release"
         }
     }
 }

patches/arrpc@3.5.0.patch

@@ -1,14 +0,0 @@
-diff --git a/src/process/index.js b/src/process/index.js
-index 97ea6514b54dd9c5df588c78f0397d31ab5f882a..c2bdbd6aaa5611bc6ff1d993beeb380b1f5ec575 100644
---- a/src/process/index.js
-+++ b/src/process/index.js
-@@ -5,8 +5,7 @@ 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');
- 
- import * as Natives from './native/index.js';
- const Native = Natives[process.platform];

scripts/build/build.mts

@@ -1,11 +1,10 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 import { BuildContext, BuildOptions, context } from "esbuild";
-import { copyFile } from "fs/promises";
 
 import vencordDep from "./vencordDep.mjs";
 
@@ -34,23 +33,7 @@ async function createContext(options: BuildOptions) {
     contexts.push(await context(options));
 }
 
-async function copyVenmic() {
-    if (process.platform !== "linux") return;
-
-    return Promise.all([
-        copyFile(
-            "./node_modules/@vencord/venmic/prebuilds/venmic-addon-linux-x64/node-napi-v7.node",
-            "./static/dist/venmic-x64.node"
-        ),
-        copyFile(
-            "./node_modules/@vencord/venmic/prebuilds/venmic-addon-linux-arm64/node-napi-v7.node",
-            "./static/dist/venmic-arm64.node"
-        )
-    ]).catch(() => console.warn("Failed to copy venmic. Building without venmic support"));
-}
-
 await Promise.all([
-    copyVenmic(),
     createContext({
         ...NodeCommonOpts,
         entryPoints: ["src/main/index.ts"],
@@ -63,15 +46,23 @@ await Promise.all([
         outfile: "dist/js/preload.js",
         footer: { js: "//# sourceURL=VCDPreload" }
     }),
+    createContext({
+        ...NodeCommonOpts,
+        entryPoints: ["src/updater/preload.ts"],
+        outfile: "dist/js/updaterPreload.js",
+        footer: { js: "//# sourceURL=VCDUpdaterPreload" }
+    }),
     createContext({
         ...CommonOpts,
-        globalName: "Vesktop",
+        globalName: "VencordDesktop",
         entryPoints: ["src/renderer/index.ts"],
         outfile: "dist/js/renderer.js",
         format: "iife",
         inject: ["./scripts/build/injectReact.mjs"],
         jsxFactory: "VencordCreateElement",
         jsxFragment: "VencordFragment",
+        // Work around https://github.com/evanw/esbuild/issues/2460
+        tsconfig: "./scripts/build/tsconfig.esbuild.json",
         external: ["@vencord/types/*"],
         plugins: [vencordDep],
         footer: { js: "//# sourceURL=VCDRenderer" }

scripts/build/injectReact.mjs

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

scripts/build/sandboxFix.js

@@ -1,74 +0,0 @@
-/*
- * 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
- */
-
-// Based on https://github.com/gergof/electron-builder-sandbox-fix/blob/master/lib/index.js
-
-const fs = require("fs/promises");
-const path = require("path");
-let isApplied = false;
-
-const hook = async () => {
-    if (isApplied) return;
-    isApplied = true;
-    if (process.platform !== "linux") {
-        // this fix is only required on linux
-        return;
-    }
-    const AppImageTarget = require("app-builder-lib/out/targets/AppImageTarget");
-    const oldBuildMethod = AppImageTarget.default.prototype.build;
-    AppImageTarget.default.prototype.build = async function (...args) {
-        console.log("Running AppImage builder hook", args);
-        const oldPath = args[0];
-        const newPath = oldPath + "-appimage-sandbox-fix";
-        // just in case
-        try {
-            await fs.rm(newPath, {
-                recursive: true
-            });
-        } catch {}
-
-        console.log("Copying to apply appimage fix", oldPath, newPath);
-        await fs.cp(oldPath, newPath, {
-            recursive: true
-        });
-        args[0] = newPath;
-
-        const executable = path.join(newPath, this.packager.executableName);
-
-        const loaderScript = `
-#!/usr/bin/env bash
-
-SCRIPT_DIR="$( cd "$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
-IS_STEAMOS=0
-
-if [[ "$SteamOS" == "1" && "$SteamGamepadUI" == "1" ]]; then
-    echo "Running Vesktop on SteamOS, disabling sandbox"
-    IS_STEAMOS=1
-fi
-
-exec "$SCRIPT_DIR/${this.packager.executableName}.bin" "$([ "$IS_STEAMOS" == 1 ] && echo '--no-sandbox')" "$@"
-                `.trim();
-
-        try {
-            await fs.rename(executable, executable + ".bin");
-            await fs.writeFile(executable, loaderScript);
-            await fs.chmod(executable, 0o755);
-        } catch (e) {
-            console.error("failed to create loder for sandbox fix: " + e.message);
-            throw new Error("Failed to create loader for sandbox fix");
-        }
-
-        const ret = await oldBuildMethod.apply(this, args);
-
-        await fs.rm(newPath, {
-            recursive: true
-        });
-
-        return ret;
-    };
-};
-
-module.exports = hook;

scripts/build/tsconfig.esbuild.json

@@ -0,0 +1,7 @@
+// Work around https://github.com/evanw/esbuild/issues/2460
+{
+    "extends": "../../tsconfig.json",
+    "compilerOptions": {
+        "jsx": "react"
+    }
+}

scripts/build/vencordDep.mts

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

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
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */

scripts/start.ts

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
@@ -8,4 +8,4 @@ import "./utils/dotenv";
 
 import { spawnNodeModuleBin } from "./utils/spawn.mjs";
 
-spawnNodeModuleBin("electron", [process.cwd(), ...(process.env.ELECTRON_LAUNCH_FLAGS?.split(" ") ?? [])]);
+spawnNodeModuleBin("electron", ["."]);

scripts/startWatch.mts

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

scripts/utils/dotenv.ts

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

scripts/utils/spawn.mts

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

scripts/utils/updateMeta.mts

@@ -1,93 +0,0 @@
-/*
- * 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 { promises as fs } from "node:fs";
-
-import { DOMParser, XMLSerializer } from "@xmldom/xmldom";
-import xmlFormat from "xml-formatter";
-
-function generateDescription(description: string, descriptionNode: Element) {
-    const lines = description.replace(/\r/g, "").split("\n");
-    let currentList: Element | null = null;
-
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i];
-
-        if (line.includes("New Contributors")) {
-            // we're done, don't parse any more since the new contributors section is the last one
-            break;
-        }
-
-        if (line.startsWith("## ")) {
-            const pNode = descriptionNode.ownerDocument.createElement("p");
-            pNode.textContent = line.slice(3);
-            descriptionNode.appendChild(pNode);
-        } else if (line.startsWith("* ")) {
-            const liNode = descriptionNode.ownerDocument.createElement("li");
-            liNode.textContent = line.slice(2).split("in https://github.com")[0].trim(); // don't include links to github
-
-            if (!currentList) {
-                currentList = descriptionNode.ownerDocument.createElement("ul");
-            }
-
-            currentList.appendChild(liNode);
-        }
-
-        if (currentList && !lines[i + 1].startsWith("* ")) {
-            descriptionNode.appendChild(currentList);
-            currentList = null;
-        }
-    }
-}
-
-const latestReleaseInformation = await fetch("https://api.github.com/repos/Vencord/Vesktop/releases/latest", {
-    headers: {
-        Accept: "application/vnd.github+json",
-        "X-Github-Api-Version": "2022-11-28"
-    }
-}).then(res => res.json());
-
-const metaInfo = await fs.readFile("./meta/dev.vencord.Vesktop.metainfo.xml", "utf-8");
-
-const parser = new DOMParser().parseFromString(metaInfo, "text/xml");
-
-const releaseList = parser.getElementsByTagName("releases")[0];
-
-for (let i = 0; i < releaseList.childNodes.length; i++) {
-    const release = releaseList.childNodes[i] as Element;
-
-    if (release.nodeType === 1 && release.getAttribute("version") === latestReleaseInformation.name) {
-        console.log("Latest release already added, nothing to be done");
-        process.exit(0);
-    }
-}
-
-const release = parser.createElement("release");
-release.setAttribute("version", latestReleaseInformation.name);
-release.setAttribute("date", latestReleaseInformation.published_at.split("T")[0]);
-release.setAttribute("type", "stable");
-
-const releaseUrl = parser.createElement("url");
-releaseUrl.textContent = latestReleaseInformation.html_url;
-
-release.appendChild(releaseUrl);
-
-const description = parser.createElement("description");
-
-// we're not using a full markdown parser here since we don't have a lot of formatting options to begin with
-generateDescription(latestReleaseInformation.body, description);
-
-release.appendChild(description);
-
-releaseList.insertBefore(release, releaseList.childNodes[0]);
-
-const output = xmlFormat(new XMLSerializer().serializeToString(parser), {
-    lineSeparator: "\n",
-    collapseContent: true,
-    indentation: "  "
-});
-
-await fs.writeFile("./meta/dev.vencord.Vesktop.metainfo.xml", output, "utf-8");

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
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 declare global {
-    export var VesktopNative: typeof import("preload/VesktopNative").VesktopNative;
-    export var Vesktop: typeof import("renderer/index");
-    export var VCDP: any;
+    export var VencordDesktopNative: typeof import("preload/VencordDesktopNative").VencordDesktopNative;
+    export var VencordDesktop: typeof import("renderer/index");
+    export var vcdLS: typeof localStorage;
 
     export var IS_DEV: boolean;
 }

src/main/about.ts

@@ -1,12 +1,13 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
-import { BrowserWindow } from "electron";
+import { app, BrowserWindow } from "electron";
+import { readFileSync } from "fs";
 import { join } from "path";
-import { ICON_PATH, VIEW_DIR } from "shared/paths";
+import { ICON_PATH, STATIC_DIR } from "shared/paths";
 
 import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
 
@@ -14,15 +15,14 @@ export function createAboutWindow() {
     const about = new BrowserWindow({
         center: true,
         autoHideMenuBar: true,
-        icon: ICON_PATH,
-        webPreferences: {
-            preload: join(__dirname, "updaterPreload.js")
-        }
+        icon: ICON_PATH
     });
 
     makeLinksOpenExternally(about);
 
-    about.loadFile(join(VIEW_DIR, "about.html"));
+    const html = readFileSync(join(STATIC_DIR, "about.html"), "utf-8").replaceAll("%VERSION%", app.getVersion());
+
+    about.loadURL("data:text/html;charset=utf-8," + html);
 
     return about;
 }

src/main/appBadge.ts

@@ -1,56 +0,0 @@
-/*
- * 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 { app, NativeImage, nativeImage } from "electron";
-import { join } from "path";
-import { BADGE_DIR } from "shared/paths";
-
-const imgCache = new Map<number, NativeImage>();
-function loadBadge(index: number) {
-    const cached = imgCache.get(index);
-    if (cached) return cached;
-
-    const img = nativeImage.createFromPath(join(BADGE_DIR, `${index}.ico`));
-    imgCache.set(index, img);
-
-    return img;
-}
-
-let lastIndex: null | number = -1;
-
-export function setBadgeCount(count: number) {
-    switch (process.platform) {
-        case "linux":
-            if (count === -1) count = 0;
-            app.setBadgeCount(count);
-            break;
-        case "darwin":
-            if (count === 0) {
-                app.dock.setBadge("");
-                break;
-            }
-            app.dock.setBadge(count === -1 ? "•" : count.toString());
-            break;
-        case "win32":
-            const [index, description] = getBadgeIndexAndDescription(count);
-            if (lastIndex === index) break;
-
-            lastIndex = index;
-
-            // circular import shenanigans
-            const { mainWin } = require("./mainWindow") as typeof import("./mainWindow");
-            mainWin.setOverlayIcon(index === null ? null : loadBadge(index), description);
-            break;
-    }
-}
-
-function getBadgeIndexAndDescription(count: number): [number | null, string] {
-    if (count === -1) return [11, "Unread Messages"];
-    if (count === 0) return [null, "No Notifications"];
-
-    const index = Math.max(1, Math.min(count, 10));
-    return [index, `${index} Notification`];
-}

src/main/arrpc.ts

@@ -1,38 +1,21 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, 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 { send as sendToBridge } from "arrpc/src/bridge";
 
-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);
-    }
+    server = await new Server();
+    server.on("activity", sendToBridge);
 }
 
 Settings.addChangeListener("arRPC", initArRPC);

src/main/autoStart.ts

@@ -1,11 +1,11 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 import { app } from "electron";
-import { existsSync, mkdirSync, renameSync, rmSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, rmSync, writeFileSync } from "fs";
 import { join } from "path";
 
 interface AutoStart {
@@ -17,16 +17,7 @@ interface AutoStart {
 function makeAutoStartLinux(): AutoStart {
     const configDir = process.env.XDG_CONFIG_HOME || join(process.env.HOME!, ".config");
     const dir = join(configDir, "autostart");
-    const file = join(dir, "vesktop.desktop");
-
-    // IM STUPID
-    const legacyName = join(dir, "vencord.desktop");
-    if (existsSync(legacyName)) renameSync(legacyName, file);
-
-    // "Quoting must be done by enclosing the argument between double quotes and escaping the double quote character,
-    // backtick character ("`"), dollar sign ("$") and backslash character ("\") by preceding it with an additional backslash character"
-    // https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables
-    const commandLine = process.argv.map(arg => '"' + arg.replace(/["$`\\]/g, "\\$&") + '"').join(" ");
+    const file = join(dir, "vencord.desktop");
 
     return {
         isEnabled: () => existsSync(file),
@@ -34,11 +25,12 @@ function makeAutoStartLinux(): AutoStart {
             const desktopFile = `
 [Desktop Entry]
 Type=Application
-Name=Vesktop
-Comment=Vesktop autostart script
-Exec=${commandLine}
-StartupNotify=false
+Version=1.0
+Name=Vencord
+Comment=Vencord autostart script
+Exec=${process.execPath}
 Terminal=false
+StartupNotify=false
 `.trim();
 
             mkdirSync(dir, { recursive: true });

src/main/constants.ts

@@ -1,76 +1,26 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 import { app } from "electron";
-import { existsSync, mkdirSync, readdirSync, renameSync, rmdirSync } from "fs";
-import { dirname, 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"));
-
-const LEGACY_DATA_DIR = join(app.getPath("appData"), "VencordDesktop", "VencordDesktop");
-export const DATA_DIR =
-    process.env.VENCORD_USER_DATA_DIR || (PORTABLE ? join(vesktopDir, "Data") : join(app.getPath("userData")));
-
-mkdirSync(DATA_DIR, { recursive: true });
-
-// 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);
-    }
-}
-const SESSION_DATA_DIR = join(DATA_DIR, "sessionData");
-app.setPath("sessionData", SESSION_DATA_DIR);
+import { join } from "path";
 
+export const DATA_DIR = process.env.VENCORD_USER_DATA_DIR || join(app.getPath("userData"), "VencordDesktop");
 export const VENCORD_SETTINGS_DIR = join(DATA_DIR, "settings");
 export const VENCORD_QUICKCSS_FILE = join(VENCORD_SETTINGS_DIR, "quickCss.css");
 export const VENCORD_SETTINGS_FILE = join(VENCORD_SETTINGS_DIR, "settings.json");
-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)`;
+export const USER_AGENT = `VencordDesktop/${app.getVersion()} (https://github.com/Vencord/Electron)`;
 
 // dimensions shamelessly stolen from Discord Desktop :3
 export const MIN_WIDTH = 940;
 export const MIN_HEIGHT = 500;
 export const DEFAULT_WIDTH = 1280;
 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}`
-};
-
-export const BrowserUserAgent = BrowserUserAgents[process.platform] || BrowserUserAgents.windows;
-
-export const enum MessageBoxChoice {
-    Default,
-    Cancel
-}

src/main/firstLaunch.ts

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
@@ -9,20 +9,18 @@ import { BrowserWindow } from "electron/main";
 import { copyFileSync, mkdirSync, readdirSync } from "fs";
 import { join } from "path";
 import { SplashProps } from "shared/browserWinProperties";
-import { ICON_PATH, VIEW_DIR } from "shared/paths";
+import { STATIC_DIR } from "shared/paths";
 
 import { autoStart } from "./autoStart";
 import { DATA_DIR } from "./constants";
 import { createWindows } from "./mainWindow";
-import { Settings, State } from "./settings";
-import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
+import { Settings } from "./settings";
 
 interface Data {
+    minimizeToTray: boolean;
     discordBranch: "stable" | "canary" | "ptb";
-    minimizeToTray?: "on";
-    autoStart?: "on";
-    importSettings?: "on";
-    richPresence?: "on";
+    autoStart: boolean;
+    importSettings: boolean;
 }
 
 export function createFirstLaunchTour() {
@@ -30,25 +28,20 @@ export function createFirstLaunchTour() {
         ...SplashProps,
         frame: true,
         autoHideMenuBar: true,
-        height: 470,
-        width: 550,
-        icon: ICON_PATH
+        height: 420,
+        width: 550
     });
 
-    makeLinksOpenExternally(win);
-
-    win.loadFile(join(VIEW_DIR, "first-launch.html"));
+    win.loadFile(join(STATIC_DIR, "first-launch.html"));
     win.webContents.addListener("console-message", (_e, _l, msg) => {
         if (msg === "cancel") return app.exit();
 
         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.firstLaunch = false;
 
         if (data.autoStart) autoStart.enable();
 

src/main/index.ts

@@ -1,73 +1,42 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 import "./ipc";
 
-import { app, BrowserWindow, nativeTheme } from "electron";
-import { autoUpdater } from "electron-updater";
+import { app, BrowserWindow } from "electron";
+import { checkUpdates } from "updater/main";
 
+import { ICON_PATH } from "../shared/paths";
 import { DATA_DIR } from "./constants";
 import { createFirstLaunchTour } from "./firstLaunch";
 import { createWindows, mainWin } from "./mainWindow";
-import { registerMediaPermissionsHandler } from "./mediaPermissions";
 import { registerScreenShareHandler } from "./screenShare";
-import { Settings, State } from "./settings";
-import { isDeckGameMode } from "./utils/steamOS";
+import { Settings } from "./settings";
 
 if (IS_DEV) {
     require("source-map-support").install();
-} else {
-    autoUpdater.checkForUpdatesAndNotify();
 }
 
 // Make the Vencord files use our DATA_DIR
 process.env.VENCORD_USER_DATA_DIR = DATA_DIR;
 
 function init() {
-    const { disableSmoothScroll, hardwareAcceleration } = Settings.store;
-
-    const enabledFeatures = app.commandLine.getSwitchValue("enable-features").split(",");
-    const disabledFeatures = app.commandLine.getSwitchValue("disable-features").split(",");
-
-    if (hardwareAcceleration === false) {
-        app.disableHardwareAcceleration();
-    } else {
-        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.push("CalculateNativeWinOcclusion");
-    }
+    // <-- BEGIN COPY PASTED FROM DISCORD -->
 
     // 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.
-    //
-    // WidgetLayering (Vencord Added): Fix DevTools context menus https://github.com/electron/electron/issues/38790
-    disabledFeatures.push("WinRetrieveSuggestionsOnlyOnDemand", "HardwareMediaKeyHandling", "MediaSessionService");
+    app.commandLine.appendSwitch(
+        "disable-features",
+        "WinRetrieveSuggestionsOnlyOnDemand,HardwareMediaKeyHandling,MediaSessionService"
+    );
 
-    // Support TTS on Linux using speech-dispatcher
-    app.commandLine.appendSwitch("enable-speech-dispatcher");
-
-    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";
+    // <-- END COPY PASTED FROM DISCORD -->
 
     app.on("second-instance", (_event, _cmdLine, _cwd, data: any) => {
         if (data.IS_DEV) app.quit();
@@ -79,11 +48,11 @@ function init() {
     });
 
     app.whenReady().then(async () => {
-        if (process.platform === "win32") app.setAppUserModelId("dev.vencord.vesktop");
+        checkUpdates();
+        if (process.platform === "win32") app.setAppUserModelId("dev.vencord.desktop");
+        else if (process.platform === "darwin") app.dock.setIcon(ICON_PATH);
 
         registerScreenShareHandler();
-        registerMediaPermissionsHandler();
-
         bootstrap();
 
         app.on("activate", () => {
@@ -94,10 +63,10 @@ function init() {
 
 if (!app.requestSingleInstanceLock({ IS_DEV })) {
     if (IS_DEV) {
-        console.log("Vesktop is already running. Quitting previous instance...");
+        console.log("Vencord Desktop is already running. Quitting previous instance...");
         init();
     } else {
-        console.log("Vesktop is already running. Quitting...");
+        console.log("Vencord Desktop is already running. Quitting...");
         app.quit();
     }
 } else {
@@ -105,7 +74,7 @@ if (!app.requestSingleInstanceLock({ IS_DEV })) {
 }
 
 async function bootstrap() {
-    if (!Object.hasOwn(State.store, "firstLaunch")) {
+    if (!Object.hasOwn(Settings.store, "firstLaunch")) {
         createFirstLaunchTour();
     } else {
         createWindows();

src/main/ipc.ts

@@ -1,138 +1,92 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
-if (process.platform === "linux") import("./venmic");
-
-import { execFile } from "child_process";
-import { app, BrowserWindow, clipboard, dialog, nativeImage, RelaunchOptions, session, shell } from "electron";
-import { mkdirSync, readFileSync, watch } from "fs";
+import { app, dialog, ipcMain, session, shell } from "electron";
+import { existsSync, readFileSync, watch } from "fs";
 import { open, readFile } from "fs/promises";
-import { release } from "os";
 import { join } from "path";
 import { debounce } from "shared/utils/debounce";
 
 import { IpcEvents } from "../shared/IpcEvents";
-import { setBadgeCount } from "./appBadge";
 import { autoStart } from "./autoStart";
-import { VENCORD_FILES_DIR, VENCORD_QUICKCSS_FILE, VENCORD_THEMES_DIR } from "./constants";
+import { VENCORD_FILES_DIR, VENCORD_QUICKCSS_FILE } from "./constants";
 import { mainWin } from "./mainWindow";
-import { Settings, State } from "./settings";
-import { handle, handleSync } from "./utils/ipcWrappers";
-import { PopoutWindows } from "./utils/popout";
-import { isDeckGameMode, showGamePage } from "./utils/steamOS";
-import { isValidVencordInstall } from "./utils/vencordLoader";
+import { Settings } from "./settings";
 
-handleSync(IpcEvents.GET_VENCORD_PRELOAD_FILE, () => join(VENCORD_FILES_DIR, "vencordDesktopPreload.js"));
-handleSync(IpcEvents.GET_VENCORD_RENDERER_SCRIPT, () =>
-    readFileSync(join(VENCORD_FILES_DIR, "vencordDesktopRenderer.js"), "utf-8")
-);
+ipcMain.on(IpcEvents.GET_VENCORD_PRELOAD_FILE, e => {
+    e.returnValue = join(VENCORD_FILES_DIR, "preload.js");
+});
 
-handleSync(IpcEvents.GET_RENDERER_SCRIPT, () => readFileSync(join(__dirname, "renderer.js"), "utf-8"));
-handleSync(IpcEvents.GET_RENDERER_CSS_FILE, () => join(__dirname, "renderer.css"));
+ipcMain.on(IpcEvents.GET_VENCORD_RENDERER_SCRIPT, e => {
+    e.returnValue = readFileSync(join(VENCORD_FILES_DIR, "vencordDesktopRenderer.js"), "utf-8");
+});
 
-handleSync(IpcEvents.GET_SETTINGS, () => Settings.plain);
-handleSync(IpcEvents.GET_VERSION, () => app.getVersion());
+ipcMain.on(IpcEvents.GET_RENDERER_SCRIPT, e => {
+    e.returnValue = readFileSync(join(__dirname, "renderer.js"), "utf-8");
+});
 
-handleSync(
-    IpcEvents.SUPPORTS_WINDOWS_TRANSPARENCY,
-    () => process.platform === "win32" && Number(release().split(".").pop()) >= 22621
-);
+ipcMain.on(IpcEvents.GET_RENDERER_CSS_FILE, e => {
+    e.returnValue = join(__dirname, "renderer.css");
+});
 
-handleSync(IpcEvents.AUTOSTART_ENABLED, () => autoStart.isEnabled());
-handle(IpcEvents.ENABLE_AUTOSTART, autoStart.enable);
-handle(IpcEvents.DISABLE_AUTOSTART, autoStart.disable);
+ipcMain.on(IpcEvents.GET_SETTINGS, e => {
+    e.returnValue = Settings.plain;
+});
 
-handle(IpcEvents.SET_SETTINGS, (_, settings: typeof Settings.store, path?: string) => {
+ipcMain.on(IpcEvents.GET_VERSION, e => {
+    e.returnValue = app.getVersion();
+});
+
+ipcMain.on(IpcEvents.AUTOSTART_ENABLED, e => {
+    e.returnValue = autoStart.isEnabled();
+});
+ipcMain.handle(IpcEvents.ENABLE_AUTOSTART, autoStart.enable);
+ipcMain.handle(IpcEvents.DISABLE_AUTOSTART, autoStart.disable);
+
+ipcMain.handle(IpcEvents.SET_SETTINGS, (_, settings: typeof Settings.store, path?: string) => {
     Settings.setData(settings, path);
 });
 
-handle(IpcEvents.RELAUNCH, async () => {
-    const options: RelaunchOptions = {
-        args: process.argv.slice(1).concat(["--relaunch"])
-    };
-    if (isDeckGameMode) {
-        // We can't properly relaunch when running under gamescope, but we can at least navigate to our page in Steam.
-        await showGamePage();
-    } else if (app.isPackaged && process.env.APPIMAGE) {
-        execFile(process.env.APPIMAGE, options.args);
-    } else {
-        app.relaunch(options);
-    }
+ipcMain.handle(IpcEvents.RELAUNCH, () => {
+    app.relaunch();
     app.exit();
 });
 
-handle(IpcEvents.SHOW_ITEM_IN_FOLDER, (_, path) => {
+ipcMain.handle(IpcEvents.SHOW_ITEM_IN_FOLDER, (_, path) => {
     shell.showItemInFolder(path);
 });
 
-handle(IpcEvents.FOCUS, () => {
-    mainWin.show();
-    mainWin.setSkipTaskbar(false);
+ipcMain.handle(IpcEvents.FOCUS, e => {
+    e.sender.focus();
 });
 
-handle(IpcEvents.CLOSE, (e, key?: string) => {
-    const popout = PopoutWindows.get(key!);
-    if (popout) return popout.close();
-
-    const win = BrowserWindow.fromWebContents(e.sender) ?? e.sender;
-    win.close();
+ipcMain.handle(IpcEvents.CLOSE, e => {
+    e.sender.close();
 });
 
-handle(IpcEvents.MINIMIZE, e => {
-    mainWin.minimize();
+ipcMain.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.MAXIMIZE, e => {
-    if (mainWin.isMaximized()) {
-        mainWin.unmaximize();
-    } else {
-        mainWin.maximize();
-    }
-});
-
-handleSync(IpcEvents.SPELLCHECK_GET_AVAILABLE_LANGUAGES, e => {
-    e.returnValue = session.defaultSession.availableSpellCheckerLanguages;
-});
-
-handle(IpcEvents.SPELLCHECK_REPLACE_MISSPELLING, (e, word: string) => {
-    e.sender.replaceMisspelling(word);
-});
-
-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";
-    }
-
+ipcMain.handle(IpcEvents.SELECT_VENCORD_DIR, async () => {
     const res = await dialog.showOpenDialog(mainWin!, {
         properties: ["openDirectory"]
     });
     if (!res.filePaths.length) return "cancelled";
 
     const dir = res.filePaths[0];
-    if (!isValidVencordInstall(dir)) return "invalid";
+    for (const file of ["vencordDesktopMain.js", "preload.js", "vencordDesktopRenderer.js", "renderer.css"]) {
+        if (!existsSync(join(dir, file))) return "invalid";
+    }
 
-    State.store.vencordDir = dir;
-
-    return "ok";
-});
-
-handle(IpcEvents.SET_BADGE_COUNT, (_, count: number) => setBadgeCount(count));
-
-handle(IpcEvents.CLIPBOARD_COPY_IMAGE, async (_, buf: ArrayBuffer, src: string) => {
-    clipboard.write({
-        html: `<img src="${src.replaceAll('"', '\\"')}">`,
-        image: nativeImage.createFromBuffer(Buffer.from(buf))
-    });
+    return dir;
 });
 
 function readCss() {
@@ -149,12 +103,3 @@ open(VENCORD_QUICKCSS_FILE, "a+").then(fd => {
         }, 50)
     );
 });
-
-mkdirSync(VENCORD_THEMES_DIR, { recursive: true });
-watch(
-    VENCORD_THEMES_DIR,
-    { persistent: false },
-    debounce(() => {
-        mainWin?.webContents.postMessage("VencordThemeUpdate", void 0);
-    })
-);

src/main/mainWindow.ts

@@ -1,121 +1,64 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
-import {
-    app,
-    BrowserWindow,
-    BrowserWindowConstructorOptions,
-    dialog,
-    Menu,
-    MenuItemConstructorOptions,
-    nativeTheme,
-    screen,
-    session,
-    Tray
-} from "electron";
-import { rm } from "fs/promises";
+import { app, BrowserWindow, BrowserWindowConstructorOptions, Menu, Tray } from "electron";
 import { join } from "path";
-import { IpcEvents } from "shared/IpcEvents";
-import { isTruthy } from "shared/utils/guards";
 import { once } from "shared/utils/once";
-import type { SettingsStore } from "shared/utils/SettingsStore";
 
 import { ICON_PATH } from "../shared/paths";
 import { createAboutWindow } from "./about";
 import { initArRPC } from "./arrpc";
-import {
-    BrowserUserAgent,
-    DATA_DIR,
-    DEFAULT_HEIGHT,
-    DEFAULT_WIDTH,
-    MessageBoxChoice,
-    MIN_HEIGHT,
-    MIN_WIDTH,
-    VENCORD_FILES_DIR
-} from "./constants";
-import { Settings, State, VencordSettings } from "./settings";
+import { DEFAULT_HEIGHT, DEFAULT_WIDTH, MIN_HEIGHT, MIN_WIDTH, VENCORD_FILES_DIR } from "./constants";
+import { Settings, VencordSettings } from "./settings";
 import { createSplashWindow } from "./splash";
 import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
-import { applyDeckKeyboardFix, askToApplySteamLayout, isDeckGameMode } from "./utils/steamOS";
 import { downloadVencordFiles, ensureVencordFiles } from "./utils/vencordLoader";
 
 let isQuitting = false;
 let tray: Tray;
 
-applyDeckKeyboardFix();
-
 app.on("before-quit", () => {
     isQuitting = true;
 });
 
 export let mainWin: BrowserWindow;
 
-function makeSettingsListenerHelpers<O extends object>(o: SettingsStore<O>) {
-    const listeners = new Map<(data: any) => void, PropertyKey>();
-
-    const addListener: typeof o.addChangeListener = (path, cb) => {
-        listeners.set(cb, path);
-        o.addChangeListener(path, cb);
-    };
-    const removeAllListeners = () => {
-        for (const [listener, path] of listeners) {
-            o.removeChangeListener(path as any, listener);
-        }
-
-        listeners.clear();
-    };
-
-    return [addListener, removeAllListeners] as const;
-}
-
-const [addSettingsListener, removeSettingsListeners] = makeSettingsListenerHelpers(Settings);
-const [addVencordSettingsListener, removeVencordSettingsListeners] = makeSettingsListenerHelpers(VencordSettings);
-
 function initTray(win: BrowserWindow) {
-    const onTrayClick = () => {
-        if (Settings.store.clickTrayToShowHide && win.isVisible()) win.hide();
-        else win.show();
-    };
     const trayMenu = Menu.buildFromTemplate([
         {
             label: "Open",
             click() {
                 win.show();
-            }
+            },
+            enabled: false
         },
         {
             label: "About",
             click: createAboutWindow
         },
         {
-            label: "Repair Vencord",
+            label: "Update Vencord",
             async click() {
                 await downloadVencordFiles();
                 app.relaunch();
                 app.quit();
             }
         },
-        {
-            label: "Reset Vesktop",
-            async click() {
-                await clearData(win);
-            }
-        },
         {
             type: "separator"
         },
         {
-            label: "Restart",
+            label: "Relaunch",
             click() {
                 app.relaunch();
                 app.quit();
             }
         },
         {
-            label: "Quit",
+            label: "Quit Vencord Desktop",
             click() {
                 isQuitting = true;
                 app.quit();
@@ -124,132 +67,75 @@ function initTray(win: BrowserWindow) {
     ]);
 
     tray = new Tray(ICON_PATH);
-    tray.setToolTip("Vesktop");
+    tray.setToolTip("Vencord Desktop");
     tray.setContextMenu(trayMenu);
-    tray.on("click", onTrayClick);
-}
+    tray.on("click", () => win.show());
 
-async function clearData(win: BrowserWindow) {
-    const { response } = await dialog.showMessageBox(win, {
-        message: "Are you sure you want to reset Vesktop?",
-        detail: "This will log you out, clear caches and reset all your settings!\n\nVesktop will automatically restart after this operation.",
-        buttons: ["Yes", "No"],
-        cancelId: MessageBoxChoice.Cancel,
-        defaultId: MessageBoxChoice.Default,
-        type: "warning"
+    win.on("show", () => {
+        trayMenu.items[0].enabled = false;
     });
 
-    if (response === MessageBoxChoice.Cancel) return;
-
-    win.close();
-
-    await win.webContents.session.clearStorageData();
-    await win.webContents.session.clearCache();
-    await win.webContents.session.clearCodeCaches({});
-    await rm(DATA_DIR, { force: true, recursive: true });
-
-    app.relaunch();
-    app.quit();
+    win.on("hide", () => {
+        trayMenu.items[0].enabled = true;
+    });
 }
 
-type MenuItemList = Array<MenuItemConstructorOptions | false>;
-
 function initMenuBar(win: BrowserWindow) {
     const isWindows = process.platform === "win32";
-    const isDarwin = process.platform === "darwin";
     const wantCtrlQ = !isWindows || VencordSettings.store.winCtrlQ;
 
-    const subMenu = [
-        {
-            label: "About Vesktop",
-            click: createAboutWindow
-        },
-        {
-            label: "Force Update Vencord",
-            async click() {
-                await downloadVencordFiles();
-                app.relaunch();
-                app.quit();
-            },
-            toolTip: "Vesktop will automatically restart after this operation"
-        },
-        {
-            label: "Reset Vesktop",
-            async click() {
-                await clearData(win);
-            },
-            toolTip: "Vesktop will automatically restart after this operation"
-        },
-        {
-            label: "Relaunch",
-            accelerator: "CmdOrCtrl+Shift+R",
-            click() {
-                app.relaunch();
-                app.quit();
-            }
-        },
-        ...(!isDarwin
-            ? []
-            : ([
-                  {
-                      type: "separator"
-                  },
-                  {
-                      label: "Settings",
-                      accelerator: "CmdOrCtrl+,",
-                      async click() {
-                          mainWin.webContents.executeJavaScript(
-                              "Vencord.Webpack.Common.SettingsRouter.open('My Account')"
-                          );
-                      }
-                  },
-                  {
-                      type: "separator"
-                  },
-                  {
-                      role: "hide"
-                  },
-                  {
-                      role: "hideOthers"
-                  },
-                  {
-                      role: "unhide"
-                  },
-                  {
-                      type: "separator"
-                  }
-              ] satisfies MenuItemList)),
-        {
-            label: "Quit",
-            accelerator: wantCtrlQ ? "CmdOrCtrl+Q" : void 0,
-            visible: !isWindows,
-            role: "quit",
-            click() {
-                app.quit();
-            }
-        },
-        isWindows && {
-            label: "Quit",
-            accelerator: "Alt+F4",
-            role: "quit",
-            click() {
-                app.quit();
-            }
-        },
-        // See https://github.com/electron/electron/issues/14742 and https://github.com/electron/electron/issues/5256
-        {
-            label: "Zoom in (hidden, hack for Qwertz and others)",
-            accelerator: "CmdOrCtrl+=",
-            role: "zoomIn",
-            visible: false
-        }
-    ] satisfies MenuItemList;
-
     const menu = Menu.buildFromTemplate([
         {
-            label: "Vesktop",
+            label: "Vencord Desktop",
             role: "appMenu",
-            submenu: subMenu.filter(isTruthy)
+            submenu: [
+                {
+                    label: "About Vencord Desktop",
+                    click: createAboutWindow
+                },
+                {
+                    label: "Force Update Vencord",
+                    async click() {
+                        await downloadVencordFiles();
+                        app.relaunch();
+                        app.quit();
+                    },
+                    toolTip: "Vencord Desktop will automatically restart after this operation"
+                },
+                {
+                    label: "Relaunch",
+                    accelerator: "CmdOrCtrl+Shift+R",
+                    click() {
+                        app.relaunch();
+                        app.quit();
+                    }
+                },
+                {
+                    label: "Quit",
+                    accelerator: wantCtrlQ ? "CmdOrCtrl+Q" : void 0,
+                    visible: !isWindows,
+                    role: "quit",
+                    click() {
+                        app.quit();
+                    }
+                },
+                {
+                    label: "Quit",
+                    accelerator: isWindows ? "Alt+F4" : void 0,
+                    visible: isWindows,
+                    role: "quit",
+                    click() {
+                        app.quit();
+                    }
+                },
+                // See https://github.com/electron/electron/issues/14742 and https://github.com/electron/electron/issues/5256
+                {
+                    label: "Zoom in (hidden, hack for Qwertz and others)",
+                    accelerator: "CmdOrCtrl+=",
+                    role: "zoomIn",
+                    visible: false
+                }
+            ]
         },
         { role: "fileMenu" },
         { role: "editMenu" },
@@ -261,19 +147,14 @@ function initMenuBar(win: BrowserWindow) {
 }
 
 function getWindowBoundsOptions(): BrowserWindowConstructorOptions {
-    // We want the default window behaivour to apply in game mode since it expects everything to be fullscreen and maximized.
-    if (isDeckGameMode) return {};
-
-    const { x, y, width, height } = State.store.windowBounds ?? {};
+    const { x, y, width, height } = Settings.store.windowBounds ?? {};
 
     const options = {
         width: width ?? DEFAULT_WIDTH,
         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;
     }
@@ -286,33 +167,10 @@ function getWindowBoundsOptions(): BrowserWindowConstructorOptions {
     return options;
 }
 
-function getDarwinOptions(): BrowserWindowConstructorOptions {
-    const options = {
-        titleBarStyle: "hidden",
-        trafficLightPosition: { x: 10, y: 10 }
-    } as BrowserWindowConstructorOptions;
-
-    const { splashTheming, splashBackground } = Settings.store;
-    const { macosTranslucency } = VencordSettings.store;
-
-    if (macosTranslucency) {
-        options.vibrancy = "sidebar";
-        options.backgroundColor = "#ffffff00";
-    } else {
-        if (splashTheming) {
-            options.backgroundColor = splashBackground;
-        } else {
-            options.backgroundColor = nativeTheme.shouldUseDarkColors ? "#313338" : "#ffffff";
-        }
-    }
-
-    return options;
-}
-
 function initWindowBoundsListeners(win: BrowserWindow) {
     const saveState = () => {
-        State.store.maximized = win.isMaximized();
-        State.store.minimized = win.isMinimized();
+        Settings.store.maximized = win.isMaximized();
+        Settings.store.minimized = win.isMinimized();
     };
 
     win.on("maximize", saveState);
@@ -320,8 +178,7 @@ function initWindowBoundsListeners(win: BrowserWindow) {
     win.on("unmaximize", saveState);
 
     const saveBounds = () => {
-        State.store.windowBounds = win.getBounds();
-        State.store.displayid = screen.getDisplayMatching(State.store.windowBounds).id;
+        Settings.store.windowBounds = win.getBounds();
     };
 
     win.on("resize", saveBounds);
@@ -329,11 +186,11 @@ function initWindowBoundsListeners(win: BrowserWindow) {
 }
 
 function initSettingsListeners(win: BrowserWindow) {
-    addSettingsListener("tray", enable => {
+    Settings.addChangeListener("tray", enable => {
         if (enable) initTray(win);
         else tray?.destroy();
     });
-    addSettingsListener("disableMinSize", disable => {
+    Settings.addChangeListener("disableMinSize", disable => {
         if (disable) {
             // 0 no work
             win.setMinimumSize(1, 1);
@@ -348,7 +205,7 @@ function initSettingsListeners(win: BrowserWindow) {
         }
     });
 
-    addVencordSettingsListener("macosTranslucency", enabled => {
+    VencordSettings.addChangeListener("macosTranslucency", enabled => {
         if (enabled) {
             win.setVibrancy("sidebar");
             win.setBackgroundColor("#ffffff00");
@@ -357,89 +214,36 @@ function initSettingsListeners(win: BrowserWindow) {
             win.setBackgroundColor("#ffffff");
         }
     });
-
-    addSettingsListener("enableMenu", enabled => {
-        win.setAutoHideMenuBar(enabled ?? false);
-    });
-
-    addSettingsListener("spellCheckLanguages", languages => initSpellCheckLanguages(win, languages));
-}
-
-async function initSpellCheckLanguages(win: BrowserWindow, languages?: string[]) {
-    languages ??= await win.webContents.executeJavaScript("[...new Set(navigator.languages)]").catch(() => []);
-    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 createMainWindow() {
-    // Clear up previous settings listeners
-    removeSettingsListeners();
-    removeVencordSettingsListeners();
-
-    const { staticTitle, transparencyOption, enableMenu, customTitleBar } = Settings.store;
-
-    const { frameless, transparent } = VencordSettings.store;
-
-    const noFrame = frameless === true || customTitleBar === true;
-
     const win = (mainWin = new BrowserWindow({
         show: false,
+        autoHideMenuBar: true,
         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
+            preload: join(__dirname, "preload.js")
         },
         icon: ICON_PATH,
-        frame: !noFrame,
-        ...(transparent && {
-            transparent: true,
-            backgroundColor: "#00000000"
-        }),
-        ...(transparencyOption &&
-            transparencyOption !== "none" && {
-                backgroundColor: "#00000000",
-                backgroundMaterial: transparencyOption
-            }),
-        // Fix transparencyOption for custom discord titlebar
-        ...(customTitleBar &&
-            transparencyOption &&
-            transparencyOption !== "none" && {
-                transparent: true
-            }),
-        ...(staticTitle && { title: "Vesktop" }),
-        ...(process.platform === "darwin" && getDarwinOptions()),
-        ...getWindowBoundsOptions(),
-        autoHideMenuBar: enableMenu
+        frame: VencordSettings.store.frameless !== true,
+        ...(Settings.store.staticTitle ? { title: "Vencord" } : {}),
+        ...(VencordSettings.store.macosTranslucency
+            ? {
+                  vibrancy: "sidebar",
+                  backgroundColor: "#ffffff00"
+              }
+            : {}),
+        ...getWindowBoundsOptions()
     }));
-    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;
-        if (isQuitting || (process.platform !== "darwin" && !useTray)) return;
+        if (isQuitting || Settings.store.minimizeToTray === false || Settings.store.tray === false) return;
 
         e.preventDefault();
-
-        if (process.platform === "darwin") app.hide();
-        else win.hide();
+        win.hide();
 
         return false;
     });
@@ -447,13 +251,14 @@ function createMainWindow() {
     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);
+    if (Settings.store.tray ?? true) initTray(win);
     initMenuBar(win);
     makeLinksOpenExternally(win);
     initSettingsListeners(win);
-    initSpellCheck(win);
 
-    win.webContents.setUserAgent(BrowserUserAgent);
+    win.webContents.setUserAgent(
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36"
+    );
 
     const subdomain =
         Settings.store.discordBranch === "canary" || Settings.store.discordBranch === "ptb"
@@ -468,47 +273,20 @@ function createMainWindow() {
 const runVencordMain = once(() => require(join(VENCORD_FILES_DIR, "vencordDesktopMain.js")));
 
 export async function createWindows() {
-    const startMinimized = process.argv.includes("--start-minimized");
-    const splash = createSplashWindow(startMinimized);
-    // SteamOS letterboxes and scales it terribly, so just full screen it
-    if (isDeckGameMode) splash.setFullScreen(true);
+    const splash = createSplashWindow();
+
     await ensureVencordFiles();
     runVencordMain();
 
     mainWin = createMainWindow();
 
-    mainWin.webContents.on("did-finish-load", () => {
+    mainWin.once("ready-to-show", () => {
         splash.destroy();
+        mainWin!.show();
 
-        if (!startMinimized) {
-            mainWin!.show();
-            if (State.store.maximized && !isDeckGameMode) mainWin!.maximize();
+        if (Settings.store.maximized) {
+            mainWin!.maximize();
         }
-
-        if (isDeckGameMode) {
-            // always use entire display
-            mainWin!.setFullScreen(true);
-
-            askToApplySteamLayout(mainWin);
-        }
-
-        mainWin.once("show", () => {
-            if (State.store.maximized && !mainWin!.isMaximized() && !isDeckGameMode) {
-                mainWin!.maximize();
-            }
-        });
-    });
-
-    // evil hack to fix electron 32 regression that makes devtools always light theme
-    // https://github.com/electron/electron/issues/43367
-    // TODO: remove once fixed
-    mainWin.webContents.on("devtools-opened", () => {
-        if (!nativeTheme.shouldUseDarkColors) return;
-
-        nativeTheme.themeSource = "light";
-        setTimeout(() => {
-            nativeTheme.themeSource = "dark";
-        }, 100);
     });
 
     initArRPC();

src/main/mediaPermissions.ts

@@ -1,26 +0,0 @@
-/*
- * 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 { session, systemPreferences } from "electron";
-
-export function registerMediaPermissionsHandler() {
-    if (process.platform !== "darwin") return;
-
-    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");
-            }
-        }
-
-        callback(granted);
-    });
-}

src/main/screenShare.ts

@@ -1,20 +1,15 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
-import { desktopCapturer, session, Streams } from "electron";
+import { desktopCapturer, ipcMain, session, Streams } from "electron";
 import type { StreamPick } from "renderer/components/ScreenSharePicker";
 import { IpcEvents } from "shared/IpcEvents";
 
-import { handle } from "./utils/ipcWrappers";
-
-const isWayland =
-    process.platform === "linux" && (process.env.XDG_SESSION_TYPE === "wayland" || !!process.env.WAYLAND_DISPLAY);
-
 export function registerScreenShareHandler() {
-    handle(IpcEvents.CAPTURER_GET_LARGE_THUMBNAIL, async (_, id: string) => {
+    ipcMain.handle(IpcEvents.CAPTURER_GET_LARGE_THUMBNAIL, async (_, id: string) => {
         const sources = await desktopCapturer.getSources({
             types: ["window", "screen"],
             thumbnailSize: {
@@ -26,19 +21,13 @@ export function registerScreenShareHandler() {
     });
 
     session.defaultSession.setDisplayMediaRequestHandler(async (request, callback) => {
-        // request full resolution on wayland right away because we always only end up with one result anyway
-        const width = isWayland ? 1920 : 176;
-        const sources = await desktopCapturer
-            .getSources({
-                types: ["window", "screen"],
-                thumbnailSize: {
-                    width,
-                    height: width * (9 / 16)
-                }
-            })
-            .catch(err => console.error("Error during screenshare picker", err));
-
-        if (!sources) return callback({});
+        const sources = await desktopCapturer.getSources({
+            types: ["window", "screen"],
+            thumbnailSize: {
+                width: 176,
+                height: 99
+            }
+        });
 
         const data = sources.map(({ id, name, thumbnail }) => ({
             id,
@@ -46,28 +35,10 @@ export function registerScreenShareHandler() {
             url: thumbnail.toDataURL()
         }));
 
-        if (isWayland) {
-            const video = data[0];
-            if (video) {
-                const stream = await request.frame
-                    .executeJavaScript(
-                        `Vesktop.Components.ScreenShare.openScreenSharePicker(${JSON.stringify([video])},true)`
-                    )
-                    .catch(() => null);
-                if (stream === null) return callback({});
-            }
-
-            callback(video ? { video: sources[0] } : {});
-            return;
-        }
-
         const choice = await request.frame
-            .executeJavaScript(`Vesktop.Components.ScreenShare.openScreenSharePicker(${JSON.stringify(data)})`)
+            .executeJavaScript(`VencordDesktop.Components.ScreenShare.openScreenSharePicker(${JSON.stringify(data)})`)
             .then(e => e as StreamPick)
-            .catch(e => {
-                console.error("Error during screenshare picker", e);
-                return null;
-            });
+            .catch(() => null);
 
         if (!choice) return callback({});
 

src/main/settings.ts

@@ -1,18 +1,17 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
-import type { Settings as TSettings, State as TState } from "shared/settings";
+import type { Settings as TSettings } from "shared/settings";
 import { SettingsStore } from "shared/utils/SettingsStore";
 
 import { DATA_DIR, VENCORD_SETTINGS_FILE } from "./constants";
 
 const SETTINGS_FILE = join(DATA_DIR, "settings.json");
-const STATE_FILE = join(DATA_DIR, "state.json");
 
 function loadSettings<T extends object = any>(file: string, name: string) {
     let settings = {} as T;
@@ -21,7 +20,7 @@ function loadSettings<T extends object = any>(file: string, name: string) {
         try {
             settings = JSON.parse(content);
         } catch (err) {
-            console.error(`Failed to parse ${name}.json:`, err);
+            console.error(`Failed to parse ${name} settings.json:`, err);
         }
     } catch {}
 
@@ -34,19 +33,5 @@ function loadSettings<T extends object = any>(file: string, name: string) {
     return store;
 }
 
-export const Settings = loadSettings<TSettings>(SETTINGS_FILE, "Vesktop settings");
-
-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", "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");
+export const Settings = loadSettings<TSettings>(SETTINGS_FILE, "Vencord Desktop");
+export const VencordSettings = loadSettings<any>(VENCORD_SETTINGS_FILE, "Vencord");

src/main/splash.ts

@@ -1,39 +1,18 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 import { BrowserWindow } from "electron";
 import { join } from "path";
 import { SplashProps } from "shared/browserWinProperties";
-import { ICON_PATH, VIEW_DIR } from "shared/paths";
+import { STATIC_DIR } from "shared/paths";
 
-import { Settings } from "./settings";
+export function createSplashWindow() {
+    const splash = new BrowserWindow(SplashProps);
 
-export function createSplashWindow(startMinimized = false) {
-    const splash = new BrowserWindow({
-        ...SplashProps,
-        icon: ICON_PATH,
-        show: !startMinimized
-    });
-
-    splash.loadFile(join(VIEW_DIR, "splash.html"));
-
-    const { splashBackground, splashColor, splashTheming } = Settings.store;
-
-    if (splashTheming) {
-        if (splashColor) {
-            const semiTransparentSplashColor = splashColor.replace("rgb(", "rgba(").replace(")", ", 0.2)");
-
-            splash.webContents.insertCSS(`body { --fg: ${splashColor} !important }`);
-            splash.webContents.insertCSS(`body { --fg-semi-trans: ${semiTransparentSplashColor} !important }`);
-        }
-
-        if (splashBackground) {
-            splash.webContents.insertCSS(`body { --bg: ${splashBackground} !important }`);
-        }
-    }
+    splash.loadFile(join(STATIC_DIR, "splash.html"));
 
     return splash;
 }

src/main/utils/http.ts

@@ -1,58 +1,45 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 import { createWriteStream } from "fs";
-import { Readable } from "stream";
-import { pipeline } from "stream/promises";
-import { setTimeout } from "timers/promises";
+import type { IncomingMessage } from "http";
+import { get, RequestOptions } from "https";
+import { finished } from "stream/promises";
 
-interface FetchieOptions {
-    retryOnNetworkError?: boolean;
-}
-
-export async function downloadFile(url: string, file: string, options: RequestInit = {}, fetchieOpts?: FetchieOptions) {
-    const res = await fetchie(url, options, fetchieOpts);
-    await pipeline(
-        // @ts-expect-error odd type error
-        Readable.fromWeb(res.body!),
-        createWriteStream(file, {
-            autoClose: true
-        })
+export async function downloadFile(url: string, file: string, options: RequestOptions = {}) {
+    const res = await simpleReq(url, options);
+    await finished(
+        res.pipe(
+            createWriteStream(file, {
+                autoClose: true
+            })
+        )
     );
 }
 
-const ONE_MINUTE_MS = 1000 * 60;
+export function simpleReq(url: string, options: RequestOptions = {}) {
+    return new Promise<IncomingMessage>((resolve, reject) => {
+        get(url, options, res => {
+            const { statusCode, statusMessage, headers } = res;
+            if (statusCode! >= 400) return void reject(`${statusCode}: ${statusMessage} - ${url}`);
+            if (statusCode! >= 300) return simpleReq(headers.location!, options).then(resolve).catch(reject);
 
-export async function fetchie(url: string, options?: RequestInit, { retryOnNetworkError }: FetchieOptions = {}) {
-    let res: Response | undefined;
-
-    try {
-        res = await fetch(url, options);
-    } catch (err) {
-        if (retryOnNetworkError) {
-            console.error("Failed to fetch", url + ".", "Gonna retry with backoff.");
-
-            for (let tries = 0, delayMs = 500; tries < 20; tries++, delayMs = Math.min(2 * delayMs, ONE_MINUTE_MS)) {
-                await setTimeout(delayMs);
-                try {
-                    res = await fetch(url, options);
-                    break;
-                } catch {}
-            }
-        }
-
-        if (!res) throw new Error(`Failed to fetch ${url}\n${err}`);
-    }
-
-    if (res.ok) return res;
-
-    let msg = `Got non-OK response for ${url}: ${res.status} ${res.statusText}`;
-
-    const reason = await res.text().catch(() => "");
-    if (reason) msg += `\n${reason}`;
-
-    throw new Error(msg);
+            resolve(res);
+        });
+    });
+}
+
+export async function simpleGet(url: string, options: RequestOptions = {}) {
+    const res = await simpleReq(url, options);
+
+    return new Promise<Buffer>((resolve, reject) => {
+        const chunks = [] as Buffer[];
+
+        res.once("error", reject);
+        res.on("data", chunk => chunks.push(chunk));
+        res.once("end", () => resolve(Buffer.concat(chunks)));
+    });
 }

src/main/utils/ipcWrappers.ts

@@ -1,30 +0,0 @@
-/*
- * 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 { ipcMain, IpcMainEvent, IpcMainInvokeEvent, WebFrameMain } from "electron";
-import { DISCORD_HOSTNAMES } from "main/constants";
-import { IpcEvents } from "shared/IpcEvents";
-
-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: Disallowed host " + hostname);
-}
-
-export function handleSync(event: IpcEvents, cb: (e: IpcMainEvent, ...args: any[]) => any) {
-    ipcMain.on(event, (e, ...args) => {
-        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);
-        return cb(e, ...args);
-    });
-}

src/main/utils/makeLinksOpenExternally.ts

@@ -1,71 +1,40 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 import { BrowserWindow, shell } from "electron";
-import { DISCORD_HOSTNAMES } from "main/constants";
 
 import { Settings } from "../settings";
-import { createOrFocusPopup, setupPopout } from "./popout";
-import { execSteamURL, isDeckGameMode, steamOpenURL } from "./steamOS";
-
-export function handleExternalUrl(url: string, protocol?: string): { action: "deny" | "allow" } {
-    if (protocol == null) {
-        try {
-            protocol = new URL(url).protocol;
-        } catch {
-            return { action: "deny" };
-        }
-    }
-
-    switch (protocol) {
-        case "http:":
-        case "https:":
-            if (Settings.store.openLinksWithElectron) {
-                return { action: "allow" };
-            }
-        // eslint-disable-next-line no-fallthrough
-        case "mailto:":
-        case "spotify:":
-            if (isDeckGameMode) {
-                steamOpenURL(url);
-            } else {
-                shell.openExternal(url);
-            }
-            break;
-        case "steam:":
-            if (isDeckGameMode) {
-                execSteamURL(url);
-            } else {
-                shell.openExternal(url);
-            }
-            break;
-    }
-
-    return { action: "deny" };
-}
 
 export function makeLinksOpenExternally(win: BrowserWindow) {
-    win.webContents.setWindowOpenHandler(({ url, frameName, features }) => {
+    win.webContents.setWindowOpenHandler(({ url }) => {
+        switch (url) {
+            case "about:blank":
+            case "https://discord.com/popout":
+                return { action: "allow" };
+        }
+
         try {
-            var { protocol, hostname, pathname } = new URL(url);
+            var { protocol } = new URL(url);
         } catch {
             return { action: "deny" };
         }
 
-        if (frameName.startsWith("DISCORD_") && pathname === "/popout" && DISCORD_HOSTNAMES.includes(hostname)) {
-            return createOrFocusPopup(frameName, features);
+        switch (protocol) {
+            case "http:":
+            case "https:":
+                if (Settings.store.openLinksWithElectron) {
+                    return { action: "allow" };
+                }
+            // eslint-disable-next-line no-fallthrough
+            case "mailto:":
+            case "steam:":
+            case "spotify:":
+                shell.openExternal(url);
         }
 
-        if (url === "about:blank" || (frameName === "authorize" && DISCORD_HOSTNAMES.includes(hostname)))
-            return { action: "allow" };
-
-        return handleExternalUrl(url, protocol);
-    });
-
-    win.webContents.on("did-create-window", (win, { frameName }) => {
-        if (frameName.startsWith("DISCORD_")) setupPopout(win, frameName);
+        return { action: "deny" };
     });
 }

src/main/utils/popout.ts

@@ -1,116 +0,0 @@
-/*
- * 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 { BrowserWindow, BrowserWindowConstructorOptions } from "electron";
-import { Settings } from "main/settings";
-
-import { handleExternalUrl } from "./makeLinksOpenExternally";
-
-const ALLOWED_FEATURES = new Set([
-    "width",
-    "height",
-    "left",
-    "top",
-    "resizable",
-    "movable",
-    "alwaysOnTop",
-    "frame",
-    "transparent",
-    "hasShadow",
-    "closable",
-    "skipTaskbar",
-    "backgroundColor",
-    "menubar",
-    "toolbar",
-    "location",
-    "directories",
-    "titleBarStyle"
-]);
-
-const MIN_POPOUT_WIDTH = 320;
-const MIN_POPOUT_HEIGHT = 180;
-const DEFAULT_POPOUT_OPTIONS: BrowserWindowConstructorOptions = {
-    title: "Discord Popout",
-    backgroundColor: "#2f3136",
-    minWidth: MIN_POPOUT_WIDTH,
-    minHeight: MIN_POPOUT_HEIGHT,
-    frame: Settings.store.customTitleBar !== true,
-    titleBarStyle: process.platform === "darwin" ? "hidden" : undefined,
-    trafficLightPosition:
-        process.platform === "darwin"
-            ? {
-                  x: 10,
-                  y: 3
-              }
-            : undefined,
-    webPreferences: {
-        nodeIntegration: false,
-        contextIsolation: true
-    },
-    autoHideMenuBar: Settings.store.enableMenu
-};
-
-export const PopoutWindows = new Map<string, BrowserWindow>();
-
-function focusWindow(window: BrowserWindow) {
-    window.setAlwaysOnTop(true);
-    window.focus();
-    window.setAlwaysOnTop(false);
-}
-
-function parseFeatureValue(feature: string) {
-    if (feature === "yes") return true;
-    if (feature === "no") return false;
-
-    const n = Number(feature);
-    if (!isNaN(n)) return n;
-
-    return feature;
-}
-
-function parseWindowFeatures(features: string) {
-    const keyValuesParsed = features.split(",");
-
-    return keyValuesParsed.reduce((features, feature) => {
-        const [key, value] = feature.split("=");
-        if (ALLOWED_FEATURES.has(key)) features[key] = parseFeatureValue(value);
-
-        return features;
-    }, {});
-}
-
-export function createOrFocusPopup(key: string, features: string) {
-    const existingWindow = PopoutWindows.get(key);
-    if (existingWindow) {
-        focusWindow(existingWindow);
-        return <const>{ action: "deny" };
-    }
-
-    return <const>{
-        action: "allow",
-        overrideBrowserWindowOptions: {
-            ...DEFAULT_POPOUT_OPTIONS,
-            ...parseWindowFeatures(features)
-        }
-    };
-}
-
-export function setupPopout(win: BrowserWindow, key: string) {
-    win.setMenuBarVisibility(false);
-
-    PopoutWindows.set(key, win);
-
-    /* win.webContents.on("will-navigate", (evt, url) => {
-        // maybe prevent if not origin match
-    })*/
-
-    win.webContents.setWindowOpenHandler(({ url }) => handleExternalUrl(url));
-
-    win.once("closed", () => {
-        win.removeAllListeners();
-        PopoutWindows.delete(key);
-    });
-}

src/main/utils/steamOS.ts

@@ -1,97 +0,0 @@
-/*
- * 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 { BrowserWindow, dialog } from "electron";
-import { writeFile } from "fs/promises";
-import { join } from "path";
-
-import { MessageBoxChoice } from "../constants";
-import { State } from "../settings";
-
-// Bump this to re-show the prompt
-const layoutVersion = 2;
-// Get this from "show details" on the profile after exporting as a shared personal layout or using share with community
-const layoutId = "3080264545"; // Vesktop Layout v2
-const numberRegex = /^[0-9]*$/;
-
-let steamPipeQueue = Promise.resolve();
-
-export const isDeckGameMode = process.env.SteamOS === "1" && process.env.SteamGamepadUI === "1";
-
-export function applyDeckKeyboardFix() {
-    if (!isDeckGameMode) return;
-    // Prevent constant virtual keyboard spam that eventually crashes Steam.
-    process.env.GTK_IM_MODULE = "None";
-}
-
-// For some reason SteamAppId is always 0 for non-steam apps so we do this insanity instead.
-function getAppId(): string | null {
-    // /home/deck/.local/share/Steam/steamapps/shadercache/APPID/fozmediav1
-    const path = process.env.STEAM_COMPAT_MEDIA_PATH;
-    if (!path) return null;
-    const pathElems = path?.split("/");
-    const appId = pathElems[pathElems.length - 2];
-    if (appId.match(numberRegex)) {
-        console.log(`Got Steam App ID ${appId}`);
-        return appId;
-    }
-    return null;
-}
-
-export function execSteamURL(url: string) {
-    // This doesn't allow arbitrary execution despite the weird syntax.
-    steamPipeQueue = steamPipeQueue.then(() =>
-        writeFile(
-            join(process.env.HOME || "/home/deck", ".steam", "steam.pipe"),
-            // replace ' to prevent argument injection
-            `'${process.env.HOME}/.local/share/Steam/ubuntu12_32/steam' '-ifrunning' '${url.replaceAll("'", "%27")}'\n`,
-            "utf-8"
-        )
-    );
-}
-
-export function steamOpenURL(url: string) {
-    execSteamURL(`steam://openurl/${url}`);
-}
-
-export async function showGamePage() {
-    const appId = getAppId();
-    if (!appId) return;
-    await execSteamURL(`steam://nav/games/details/${appId}`);
-}
-
-async function showLayout(appId: string) {
-    execSteamURL(`steam://controllerconfig/${appId}/${layoutId}`);
-}
-
-export async function askToApplySteamLayout(win: BrowserWindow) {
-    const appId = getAppId();
-    if (!appId) return;
-    if (State.store.steamOSLayoutVersion === layoutVersion) return;
-    const update = Boolean(State.store.steamOSLayoutVersion);
-
-    // Touch screen breaks in some menus when native touch mode is enabled on latest SteamOS beta, remove most of the update specific text once that's fixed.
-    const { response } = await dialog.showMessageBox(win, {
-        message: `${update ? "Update" : "Apply"} Vesktop Steam Input Layout?`,
-        detail: `Would you like to ${update ? "Update" : "Apply"} Vesktop's recommended Steam Deck controller settings?
-${update ? "Click yes using the touchpad" : "Tap yes"}, then press the X button or tap Apply Layout to confirm.${
-            update ? " Doing so will undo any customizations you have made." : ""
-        }
-${update ? "Click" : "Tap"} no to keep your current layout.`,
-        buttons: ["Yes", "No"],
-        cancelId: MessageBoxChoice.Cancel,
-        defaultId: MessageBoxChoice.Default,
-        type: "question"
-    });
-
-    if (State.store.steamOSLayoutVersion !== layoutVersion) {
-        State.store.steamOSLayoutVersion = layoutVersion;
-    }
-
-    if (response === MessageBoxChoice.Cancel) return;
-
-    await showLayout(appId);
-}

src/main/utils/vencordLoader.ts

@@ -1,24 +1,19 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
-import { mkdirSync } from "fs";
-import { access, constants as FsConstants } from "fs/promises";
+import { existsSync, mkdirSync } from "fs";
+import type { RequestOptions } from "https";
 import { join } from "path";
 
 import { USER_AGENT, VENCORD_FILES_DIR } from "../constants";
-import { downloadFile, fetchie } from "./http";
+import { downloadFile, simpleGet } from "./http";
 
 const API_BASE = "https://api.github.com";
 
-export const FILES_TO_DOWNLOAD = [
-    "vencordDesktopMain.js",
-    "vencordDesktopPreload.js",
-    "vencordDesktopRenderer.js",
-    "vencordDesktopRenderer.css"
-];
+const FILES_TO_DOWNLOAD = ["vencordDesktopMain.js", "preload.js", "vencordDesktopRenderer.js", "renderer.css"];
 
 export interface ReleaseData {
     name: string;
@@ -31,44 +26,32 @@ export interface ReleaseData {
 }
 
 export async function githubGet(endpoint: string) {
-    const opts: RequestInit = {
+    const opts: RequestOptions = {
         headers: {
             Accept: "application/vnd.github+json",
             "User-Agent": USER_AGENT
         }
     };
 
-    if (process.env.GITHUB_TOKEN) (opts.headers! as any).Authorization = `Bearer ${process.env.GITHUB_TOKEN}`;
+    if (process.env.GITHUB_TOKEN) opts.headers!.Authorization = `Bearer ${process.env.GITHUB_TOKEN}`;
 
-    return fetchie(API_BASE + endpoint, opts, { retryOnNetworkError: true });
+    return simpleGet(API_BASE + endpoint, opts);
 }
 
 export async function downloadVencordFiles() {
     const release = await githubGet("/repos/Vendicated/Vencord/releases/latest");
 
-    const { assets }: ReleaseData = await release.json();
+    const { assets } = JSON.parse(release.toString("utf-8")) as ReleaseData;
 
     await Promise.all(
         assets
             .filter(({ name }) => FILES_TO_DOWNLOAD.some(f => name.startsWith(f)))
-            .map(({ name, browser_download_url }) =>
-                downloadFile(browser_download_url, join(VENCORD_FILES_DIR, name), {}, { retryOnNetworkError: true })
-            )
+            .map(({ name, browser_download_url }) => downloadFile(browser_download_url, join(VENCORD_FILES_DIR, name)))
     );
 }
 
-const existsAsync = (path: string) =>
-    access(path, FsConstants.F_OK)
-        .then(() => true)
-        .catch(() => false);
-
-export async function isValidVencordInstall(dir: string) {
-    return Promise.all(FILES_TO_DOWNLOAD.map(f => existsAsync(join(dir, f)))).then(arr => !arr.includes(false));
-}
-
 export async function ensureVencordFiles() {
-    if (await isValidVencordInstall(VENCORD_FILES_DIR)) return;
-
+    if (existsSync(join(VENCORD_FILES_DIR, "vencordDesktopMain.js"))) return;
     mkdirSync(VENCORD_FILES_DIR, { recursive: true });
 
     await downloadVencordFiles();

src/main/venmic.ts

@@ -1,135 +0,0 @@
-/*
- * 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 type { LinkData, Node, 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";
-
-let PatchBay: typeof PatchBayType | undefined;
-let patchBayInstance: PatchBayType | undefined;
-
-let imported = false;
-let initialized = false;
-
-let hasPipewirePulse = false;
-let isGlibCxxOutdated = false;
-
-function importVenmic() {
-    if (imported) {
-        return;
-    }
-
-    imported = true;
-
-    try {
-        PatchBay = (require(join(STATIC_DIR, `dist/venmic-${process.arch}.node`)) as typeof import("@vencord/venmic"))
-            .PatchBay;
-
-        hasPipewirePulse = PatchBay.hasPipeWire();
-    } catch (e: any) {
-        console.error("Failed to import venmic", e);
-        isGlibCxxOutdated = (e?.stack || e?.message || "").toLowerCase().includes("glibc");
-    }
-}
-
-function obtainVenmic() {
-    if (!imported) {
-        importVenmic();
-    }
-
-    if (PatchBay && !initialized) {
-        initialized = true;
-
-        try {
-            patchBayInstance = new PatchBay();
-        } catch (e: any) {
-            console.error("Failed to instantiate venmic", e);
-        }
-    }
-
-    return patchBayInstance;
-}
-
-function getRendererAudioServicePid() {
-    return (
-        app
-            .getAppMetrics()
-            .find(proc => proc.name === "Audio Service")
-            ?.pid?.toString() ?? "owo"
-    );
-}
-
-ipcMain.handle(IpcEvents.VIRT_MIC_LIST, () => {
-    const audioPid = getRendererAudioServicePid();
-
-    const { granularSelect } = Settings.store.audio ?? {};
-
-    const targets = obtainVenmic()
-        ?.list(granularSelect ? ["node.name"] : undefined)
-        .filter(s => s["application.process.id"] !== audioPid);
-
-    return targets ? { ok: true, targets, hasPipewirePulse } : { ok: false, isGlibCxxOutdated };
-});
-
-ipcMain.handle(IpcEvents.VIRT_MIC_START, (_, include: Node[]) => {
-    const pid = getRendererAudioServicePid();
-    const { ignoreDevices, ignoreInputMedia, ignoreVirtual, workaround } = Settings.store.audio ?? {};
-
-    const data: LinkData = {
-        include,
-        exclude: [{ "application.process.id": pid }],
-        ignore_devices: ignoreDevices
-    };
-
-    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" }];
-    }
-
-    return obtainVenmic()?.link(data);
-});
-
-ipcMain.handle(IpcEvents.VIRT_MIC_START_SYSTEM, (_, exclude: Node[]) => {
-    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,
-        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" }];
-    }
-
-    return obtainVenmic()?.link(data);
-});
-
-ipcMain.handle(IpcEvents.VIRT_MIC_STOP, () => obtainVenmic()?.unlink());

src/preload/VencordDesktopNative.ts

@@ -0,0 +1,41 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+import type { Settings } from "shared/settings";
+import type { LiteralUnion } from "type-fest";
+
+import { IpcEvents } from "../shared/IpcEvents";
+import { invoke, sendSync } from "./typedIpcs";
+
+export const VencordDesktopNative = {
+    app: {
+        relaunch: () => invoke<void>(IpcEvents.RELAUNCH),
+        getVersion: () => sendSync<void>(IpcEvents.GET_VERSION)
+    },
+    autostart: {
+        isEnabled: () => sendSync<boolean>(IpcEvents.AUTOSTART_ENABLED),
+        enable: () => invoke<void>(IpcEvents.ENABLE_AUTOSTART),
+        disable: () => invoke<void>(IpcEvents.DISABLE_AUTOSTART)
+    },
+    fileManager: {
+        showItemInFolder: (path: string) => invoke<void>(IpcEvents.SHOW_ITEM_IN_FOLDER, path),
+        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: {
+        setLanguages: (languages: readonly string[]) => invoke<void>(IpcEvents.SPELLCHECK_SET_LANGUAGES, languages)
+        // todo: perhaps add ways to learn words
+    },
+    win: {
+        focus: () => invoke<void>(IpcEvents.FOCUS)
+    },
+    capturer: {
+        getLargeThumbnail: (id: string) => invoke<string>(IpcEvents.CAPTURER_GET_LARGE_THUMBNAIL, id)
+    }
+};

src/preload/VesktopNative.ts

@@ -1,82 +0,0 @@
-/*
- * 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 { Node } from "@vencord/venmic";
-import { ipcRenderer } from "electron";
-import type { Settings } from "shared/settings";
-
-import { IpcEvents } from "../shared/IpcEvents";
-import { invoke, sendSync } from "./typedIpc";
-
-type SpellCheckerResultCallback = (word: string, suggestions: string[]) => void;
-
-const spellCheckCallbacks = new Set<SpellCheckerResultCallback>();
-
-ipcRenderer.on(IpcEvents.SPELLCHECK_RESULT, (_, w: string, s: string[]) => {
-    spellCheckCallbacks.forEach(cb => cb(w, s));
-});
-
-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)
-    },
-    autostart: {
-        isEnabled: () => sendSync<boolean>(IpcEvents.AUTOSTART_ENABLED),
-        enable: () => invoke<void>(IpcEvents.ENABLE_AUTOSTART),
-        disable: () => invoke<void>(IpcEvents.DISABLE_AUTOSTART)
-    },
-    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)
-    },
-    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),
-        onSpellcheckResult(cb: SpellCheckerResultCallback) {
-            spellCheckCallbacks.add(cb);
-        },
-        offSpellcheckResult(cb: SpellCheckerResultCallback) {
-            spellCheckCallbacks.delete(cb);
-        },
-        replaceMisspelling: (word: string) => invoke<void>(IpcEvents.SPELLCHECK_REPLACE_MISSPELLING, word),
-        addToDictionary: (word: string) => invoke<void>(IpcEvents.SPELLCHECK_ADD_TO_DICTIONARY, word)
-    },
-    win: {
-        focus: () => invoke<void>(IpcEvents.FOCUS),
-        close: (key?: string) => invoke<void>(IpcEvents.CLOSE, key),
-        minimize: () => invoke<void>(IpcEvents.MINIMIZE),
-        maximize: () => invoke<void>(IpcEvents.MAXIMIZE)
-    },
-    capturer: {
-        getLargeThumbnail: (id: string) => invoke<string>(IpcEvents.CAPTURER_GET_LARGE_THUMBNAIL, id)
-    },
-    /** only available on Linux. */
-    virtmic: {
-        list: () =>
-            invoke<
-                { ok: false; isGlibCxxOutdated: boolean } | { ok: true; targets: Node[]; 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),
-        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)
-    }
-};

src/preload/index.ts

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
@@ -8,9 +8,9 @@ import { contextBridge, ipcRenderer, webFrame } from "electron";
 import { readFileSync, watch } from "fs";
 
 import { IpcEvents } from "../shared/IpcEvents";
-import { VesktopNative } from "./VesktopNative";
+import { VencordDesktopNative } from "./VencordDesktopNative";
 
-contextBridge.exposeInMainWorld("VesktopNative", VesktopNative);
+contextBridge.exposeInMainWorld("VencordDesktopNative", VencordDesktopNative);
 
 require(ipcRenderer.sendSync(IpcEvents.GET_VENCORD_PRELOAD_FILE));
 
@@ -40,3 +40,5 @@ if (IS_DEV) {
     });
 }
 // #endregion
+
+VencordDesktopNative.spellcheck.setLanguages(window.navigator.languages);

src/preload/typedIpcs.ts

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

src/renderer/appBadge.ts

@@ -1,47 +0,0 @@
-/*
- * 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 { filters, waitFor } from "@vencord/types/webpack";
-import { RelationshipStore } from "@vencord/types/webpack/common";
-
-import { Settings } from "./settings";
-
-let GuildReadStateStore: any;
-let NotificationSettingsStore: any;
-
-export function setBadge() {
-    if (Settings.store.appBadge === false) return;
-
-    try {
-        const mentionCount = GuildReadStateStore.getTotalMentionCount();
-        const pendingRequests = RelationshipStore.getPendingCount();
-        const hasUnread = GuildReadStateStore.hasAnyUnread();
-        const disableUnreadBadge = NotificationSettingsStore.getDisableUnreadBadge();
-
-        let totalCount = mentionCount + pendingRequests;
-        if (!totalCount && hasUnread && !disableUnreadBadge) totalCount = -1;
-
-        VesktopNative.app.setBadgeCount(totalCount);
-    } catch (e) {
-        console.error(e);
-    }
-}
-
-let toFind = 3;
-
-function waitForAndSubscribeToStore(name: string, cb?: (m: any) => void) {
-    waitFor(filters.byStoreName(name), store => {
-        cb?.(store);
-        store.addChangeListener(setBadge);
-
-        toFind--;
-        if (toFind === 0) setBadge();
-    });
-}
-
-waitForAndSubscribeToStore("GuildReadStateStore", store => (GuildReadStateStore = store));
-waitForAndSubscribeToStore("NotificationSettingsStore", store => (NotificationSettingsStore = store));
-waitForAndSubscribeToStore("RelationshipStore");

src/renderer/components/ScreenSharePicker.tsx

@@ -1,55 +1,29 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 import "./screenSharePicker.css";
 
-import { closeModal, Logger, Modals, ModalSize, openModal, useAwaiter } from "@vencord/types/utils";
-import { findStoreLazy, onceReady } from "@vencord/types/webpack";
-import {
-    Button,
-    Card,
-    FluxDispatcher,
-    Forms,
-    Select,
-    Switch,
-    Text,
-    UserStore,
-    useState
-} from "@vencord/types/webpack/common";
-import { Node } from "@vencord/venmic";
+import { classes, closeModal, Margins, Modals, openModal, useAwaiter } from "@vencord/types/utils";
+import { findByPropsLazy } from "@vencord/types/webpack";
+import { Button, Card, Forms, Switch, Text, useState } from "@vencord/types/webpack/common";
 import type { Dispatch, SetStateAction } from "react";
-import { addPatch } from "renderer/patches/shared";
-import { useSettings } from "renderer/settings";
-import { isLinux, isWindows } from "renderer/utils";
+import { isWindows } from "renderer/utils";
 
-const StreamResolutions = ["480", "720", "1080", "1440"] as const;
+const StreamResolutions = ["720", "1080", "1440", "Source"] as const;
 const StreamFps = ["15", "30", "60"] as const;
 
-const MediaEngineStore = findStoreLazy("MediaEngineStore");
+const WarningIconClasses = findByPropsLazy("warning", "error", "container");
 
 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;
-    contentHint?: string;
-    includeSources?: AudioSources;
-    excludeSources?: AudioSources;
 }
 
 export interface StreamPick extends StreamSettings {
@@ -62,91 +36,18 @@ interface Source {
     url: string;
 }
 
-export let currentSettings: StreamSettings | null = null;
-
-const logger = new Logger("VesktopScreenShare");
-
-addPatch({
-    patches: [
-        {
-            find: "this.localWant=",
-            replacement: {
-                match: /this.localWant=/,
-                replace: "$self.patchStreamQuality(this);$&"
-            }
-        }
-    ],
-    patchStreamQuality(opts: any) {
-        if (!currentSettings) return;
-
-        const framerate = Number(currentSettings.fps);
-        const height = Number(currentSettings.resolution);
-        const width = Math.round(height * (16 / 9));
-
-        Object.assign(opts, {
-            bitrateMin: 500000,
-            bitrateMax: 8000000,
-            bitrateTarget: 600000
-        });
-        if (opts?.encode) {
-            Object.assign(opts.encode, {
-                framerate,
-                width,
-                height,
-                pixelCount: height * width
-            });
-        }
-        Object.assign(opts.capture, {
-            framerate,
-            width,
-            height,
-            pixelCount: height * width
-        });
-    }
-});
-
-if (isLinux) {
-    onceReady.then(() => {
-        FluxDispatcher.subscribe("STREAM_CLOSE", ({ streamKey }: { streamKey: string }) => {
-            const owner = streamKey.split(":").at(-1);
-
-            if (owner !== UserStore.getCurrentUser().id) {
-                return;
-            }
-
-            VesktopNative.virtmic.stop();
-        });
-    });
-}
-
-export function openScreenSharePicker(screens: Source[], skipPicker: boolean) {
-    let didSubmit = false;
+export function openScreenSharePicker(screens: Source[]) {
     return new Promise<StreamPick>((resolve, reject) => {
         const key = openModal(
             props => (
                 <ModalComponent
                     screens={screens}
                     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
-                                );
-                            } else {
-                                await VesktopNative.virtmic.start(v.includeSources);
-                            }
-                        }
-
-                        resolve(v);
-                    }}
+                    submit={resolve}
                     close={() => {
                         props.onClose();
-                        if (!didSubmit) reject("Aborted");
+                        reject("Aborted");
                     }}
-                    skipPicker={skipPicker}
                 />
             ),
             {
@@ -174,184 +75,37 @@ function ScreenPicker({ screens, chooseScreen }: { screens: Source[]; chooseScre
     );
 }
 
-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="vcd-screen-picker-header">
-                <Forms.FormTitle tag="h2">Venmic Settings</Forms.FormTitle>
-                <Modals.ModalCloseButton onClick={close} />
-            </Modals.ModalHeader>
-            <Modals.ModalContent className="vcd-screen-picker-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="vcd-screen-picker-footer">
-                <Button color={Button.Colors.TRANSPARENT} onClick={close}>
-                    Back
-                </Button>
-            </Modals.ModalFooter>
-        </Modals.ModalRoot>
-    );
-}
-
 function StreamSettings({
     source,
     settings,
-    setSettings,
-    skipPicker
+    setSettings
 }: {
     source: Source;
     settings: StreamSettings;
     setSettings: Dispatch<SetStateAction<StreamSettings>>;
-    skipPicker: boolean;
 }) {
-    const Settings = useSettings();
-
-    const [thumb] = useAwaiter(
-        () => (skipPicker ? Promise.resolve(source.url) : VesktopNative.capturer.getLargeThumbnail(source.id)),
-        {
-            fallbackValue: source.url,
-            deps: [source.id]
-        }
-    );
-
-    const openSettings = () => {
-        const key = openModal(props => (
-            <AudioSettingsModal
-                modalProps={props}
-                close={() => props.onClose()}
-                setAudioSources={sources =>
-                    setSettings(s => ({ ...s, includeSources: sources, excludeSources: sources }))
-                }
-            />
-        ));
-    };
+    const [thumb] = useAwaiter(() => VencordDesktopNative.capturer.getLargeThumbnail(source.id), {
+        fallbackValue: source.url,
+        deps: [source.id]
+    });
 
     return (
         <div>
             <Forms.FormTitle>What you're streaming</Forms.FormTitle>
             <Card className="vcd-screen-picker-card vcd-screen-picker-preview">
-                <img
-                    src={thumb}
-                    alt=""
-                    className={isLinux ? "vcd-screen-picker-preview-img-linux" : "vcd-screen-picker-preview-img"}
-                />
+                <img src={thumb} alt="" />
                 <Text variant="text-sm/normal">{source.name}</Text>
             </Card>
 
             <Forms.FormTitle>Stream Settings</Forms.FormTitle>
 
             <Card className="vcd-screen-picker-card">
+                <Card className={classes(WarningIconClasses.container, WarningIconClasses.warning, Margins.bottom8)}>
+                    <Forms.FormText>
+                        Resolution and Frame Rate aren't implemented for now. Locked to 720p 30fps
+                    </Forms.FormText>
+                </Card>
+
                 <div className="vcd-screen-picker-quality">
                     <section>
                         <Forms.FormTitle>Resolution</Forms.FormTitle>
@@ -389,331 +143,47 @@ function StreamSettings({
                         </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>
-                        {isWindows && (
-                            <Switch
-                                value={settings.audio}
-                                onChange={checked => setSettings(s => ({ ...s, audio: checked }))}
-                                hideBorder
-                                className="vcd-screen-picker-audio"
-                            >
-                                Stream With Audio
-                            </Switch>
-                        )}
-                    </section>
-                </div>
 
-                {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 }))}
-                    />
+                {isWindows && (
+                    <Switch
+                        value={settings.audio}
+                        onChange={checked => setSettings(s => ({ ...s, audio: checked }))}
+                        hideBorder
+                        className="vcd-screen-picker-audio"
+                    >
+                        Stream With Audio
+                    </Switch>
                 )}
             </Card>
         </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
-}: {
-    includeSources?: AudioSources;
-    excludeSources?: AudioSources;
-    deviceSelect?: boolean;
-    granularSelect?: boolean;
-    openSettings: () => void;
-    setIncludeSources: (s: AudioSources) => void;
-    setExcludeSources: (s: AudioSources) => void;
-}) {
-    const [sources, _, loading] = useAwaiter(() => VesktopNative.virtmic.list(), {
-        fallbackValue: { ok: true, targets: [], hasPipewirePulse: true }
-    });
-
-    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={includeSources === "Entire System" ? "vcd-screen-picker-quality" : undefined}>
-                <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>
-                )}
-            </div>
-            <Button
-                color={Button.Colors.TRANSPARENT}
-                onClick={openSettings}
-                className="vcd-screen-picker-settings-button"
-            >
-                Open Audio Settings
-            </Button>
-        </>
-    );
-}
-
 function ModalComponent({
     screens,
     modalProps,
     submit,
-    close,
-    skipPicker
+    close
 }: {
     screens: Source[];
     modalProps: any;
     submit: (data: StreamPick) => void;
     close: () => void;
-    skipPicker: boolean;
 }) {
-    const [selected, setSelected] = useState<string | undefined>(skipPicker ? screens[0].id : void 0);
+    const [selected, setSelected] = useState<string>();
     const [settings, setSettings] = useState<StreamSettings>({
-        resolution: "720",
-        fps: "30",
-        contentHint: "motion",
-        audio: true,
-        includeSources: "None"
+        resolution: "1080",
+        fps: "60",
+        audio: true
     });
 
     return (
-        <Modals.ModalRoot {...modalProps} size={ModalSize.MEDIUM}>
+        <Modals.ModalRoot {...modalProps}>
             <Modals.ModalHeader className="vcd-screen-picker-header">
                 <Forms.FormTitle tag="h2">ScreenShare</Forms.FormTitle>
                 <Modals.ModalCloseButton onClick={close} />
             </Modals.ModalHeader>
+
             <Modals.ModalContent className="vcd-screen-picker-modal">
                 {!selected ? (
                     <ScreenPicker screens={screens} chooseScreen={setSelected} />
@@ -722,74 +192,25 @@ function ModalComponent({
                         source={screens.find(s => s.id === selected)!}
                         settings={settings}
                         setSettings={setSettings}
-                        skipPicker={skipPicker}
                     />
                 )}
             </Modals.ModalContent>
+
             <Modals.ModalFooter className="vcd-screen-picker-footer">
                 <Button
                     disabled={!selected}
                     onClick={() => {
-                        currentSettings = settings;
-                        try {
-                            const frameRate = Number(settings.fps);
-                            const height = Number(settings.resolution);
-                            const width = Math.round(height * (16 / 9));
-
-                            const conn = [...MediaEngineStore.getMediaEngine().connections].find(
-                                connection => connection.streamUserId === UserStore.getCurrentUser().id
-                            );
-
-                            if (conn) {
-                                conn.videoStreamParameters[0].maxFrameRate = frameRate;
-                                conn.videoStreamParameters[0].maxResolution.height = height;
-                                conn.videoStreamParameters[0].maxResolution.width = width;
-                            }
-
-                            submit({
-                                id: selected!,
-                                ...settings
-                            });
-
-                            setTimeout(async () => {
-                                const conn = [...MediaEngineStore.getMediaEngine().connections].find(
-                                    connection => connection.streamUserId === UserStore.getCurrentUser().id
-                                );
-                                if (!conn) return;
-
-                                const track = conn.input.stream.getVideoTracks()[0];
-
-                                const constraints = {
-                                    ...track.getConstraints(),
-                                    frameRate: { min: frameRate, ideal: frameRate },
-                                    width: { min: 640, ideal: width, max: width },
-                                    height: { min: 480, ideal: height, max: height },
-                                    advanced: [{ width: width, height: height }],
-                                    resizeMode: "none"
-                                };
-
-                                try {
-                                    await track.applyConstraints(constraints);
-
-                                    logger.info(
-                                        "Applied constraints successfully. New constraints:",
-                                        track.getConstraints()
-                                    );
-                                } catch (e) {
-                                    logger.error("Failed to apply constraints.", e);
-                                }
-                            }, 100);
-                        } catch (error) {
-                            logger.error("Error while submitting stream.", error);
-                        }
-
+                        submit({
+                            id: selected!,
+                            ...settings
+                        });
                         close();
                     }}
                 >
                     Go Live
                 </Button>
 
-                {selected && !skipPicker ? (
+                {selected ? (
                     <Button color={Button.Colors.TRANSPARENT} onClick={() => setSelected(void 0)}>
                         Back
                     </Button>

src/renderer/components/Settings.tsx

@@ -0,0 +1,130 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+import "./settings.css";
+
+import { Margins } from "@vencord/types/utils";
+import { Button, Forms, Select, Switch, Text, useState } from "@vencord/types/webpack/common";
+import { useSettings } from "renderer/settings";
+
+export default function SettingsUi() {
+    const Settings = useSettings();
+
+    const { autostart } = VencordDesktopNative;
+    const [autoStartEnabled, setAutoStartEnabled] = useState(autostart.isEnabled());
+
+    const switches: [keyof typeof Settings, string, string, boolean?, (() => boolean)?][] = [
+        ["tray", "Tray Icon", "Add a tray icon for Vencord Desktop", true],
+        [
+            "minimizeToTray",
+            "Minimize to tray",
+            "Hitting X will make Vencord Desktop minimize to the tray instead of closing",
+            true,
+            () => Settings.tray ?? true
+        ],
+        ["arRPC", "Rich Presence", "Enables Rich Presence via arRPC", false],
+        [
+            "disableMinSize",
+            "Disable minimum window size",
+            "Allows you to make the window as small as your heart desires"
+        ],
+        [
+            "openLinksWithElectron",
+            "Open Links in app (experimental)",
+            "Opens links in a new Vencord Desktop window instead of your web browser"
+        ],
+        ["staticTitle", "Static Title", 'Makes the window title "Vencord" instead of changing to the current page']
+    ];
+
+    return (
+        <Forms.FormSection>
+            <Text variant="heading-lg/semibold" style={{ color: "var(--header-primary)" }} tag="h2">
+                Vencord Desktop Settings
+            </Text>
+
+            <Forms.FormTitle className={Margins.top16}>Discord Branch</Forms.FormTitle>
+            <Select
+                placeholder="Stable"
+                options={[
+                    { label: "Stable", value: "stable", default: true },
+                    { label: "Canary", value: "canary" },
+                    { label: "PTB", value: "ptb" }
+                ]}
+                closeOnSelect={true}
+                select={v => (Settings.discordBranch = v)}
+                isSelected={v => v === Settings.discordBranch}
+                serialize={s => s}
+            />
+
+            <Forms.FormDivider className={Margins.top16 + " " + Margins.bottom16} />
+
+            <Switch
+                value={autoStartEnabled}
+                onChange={async v => {
+                    await autostart[v ? "enable" : "disable"]();
+                    setAutoStartEnabled(v);
+                }}
+                note="Automatically start Vencord Desktop on computer start-up"
+            >
+                Start With System
+            </Switch>
+
+            {switches.map(([key, text, note, def, predicate]) => (
+                <Switch
+                    value={(Settings[key as any] ?? def ?? false) && predicate?.() !== false}
+                    disabled={predicate && !predicate()}
+                    onChange={v => (Settings[key as any] = v)}
+                    note={note}
+                    key={key}
+                >
+                    {text}
+                </Switch>
+            ))}
+
+            <Forms.FormTitle>Vencord Location</Forms.FormTitle>
+            <Forms.FormText>
+                Vencord files are loaded from{" "}
+                {Settings.vencordDir ? (
+                    <a
+                        href="about:blank"
+                        onClick={e => {
+                            e.preventDefault();
+                            VencordDesktopNative.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 VencordDesktopNative.fileManager.selectVencordDir();
+                        switch (choice) {
+                            case "cancelled":
+                            case "invalid":
+                                // TODO
+                                return;
+                        }
+                        Settings.vencordDir = choice;
+                    }}
+                >
+                    Change
+                </Button>
+                <Button
+                    size={Button.Sizes.SMALL}
+                    color={Button.Colors.RED}
+                    onClick={() => (Settings.vencordDir = void 0)}
+                >
+                    Reset
+                </Button>
+            </div>
+        </Forms.FormSection>
+    );
+}

src/renderer/components/index.ts

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

src/renderer/components/screenSharePicker.css

@@ -11,10 +11,6 @@
     gap: 1em;
 }
 
-.vcd-screen-picker-card {
-    flex-grow: 1;
-}
-
 .vcd-screen-picker-grid {
     display: grid;
     grid-template-columns: 1fr 1fr;
@@ -27,22 +23,21 @@
 }
 
 .vcd-screen-picker-selected img {
-    border: 2px solid var(--brand-500);
+    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-grid label:hover {
-    outline: 2px solid var(--brand-500);
+    outline: 2px solid var(--brand-experiment);
 }
 
+
 .vcd-screen-picker-grid div {
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -57,13 +52,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;
 }
 
@@ -91,8 +81,8 @@
 }
 
 .vcd-screen-picker-radio[data-checked="true"] {
-    background-color: var(--brand-500);
-    border-color: var(--brand-500);
+    background-color: var(--brand-experiment);
+    border-color: var(--brand-experiment);
 }
 
 .vcd-screen-picker-radio[data-checked="true"] h2 {
@@ -102,18 +92,16 @@
 .vcd-screen-picker-quality {
     display: flex;
     gap: 1em;
+
     margin-bottom: 0.5em;
+
+    opacity: 0.3;
 }
 
 .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%;
@@ -136,10 +124,3 @@
 .vcd-screen-picker-audio {
     margin-bottom: 0;
 }
-
-.vcd-screen-picker-hint-description {
-    color: var(--header-secondary);
-    font-size: 14px;
-    line-height: 20px;
-    font-weight: 400;
-}

src/renderer/components/settings.css

@@ -4,11 +4,3 @@
     gap: 0.5em;
     margin-top: 0.5em;
 }
-
-.vcd-settings-section {
-    margin-top: 1.5rem;
-}
-
-.vcd-settings-title {
-    margin-bottom: 0.5rem;
-}

src/renderer/components/settings/AutoStartToggle.tsx

@@ -1,26 +0,0 @@
-/*
- * 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 { Switch, useState } from "@vencord/types/webpack/common";
-
-import { SettingsComponent } from "./Settings";
-
-export const AutoStartToggle: SettingsComponent = () => {
-    const [autoStartEnabled, setAutoStartEnabled] = useState(VesktopNative.autostart.isEnabled());
-
-    return (
-        <Switch
-            value={autoStartEnabled}
-            onChange={async v => {
-                await VesktopNative.autostart[v ? "enable" : "disable"]();
-                setAutoStartEnabled(v);
-            }}
-            note="Automatically start Vesktop on computer start-up"
-        >
-            Start With System
-        </Switch>
-    );
-};

src/renderer/components/settings/DiscordBranchPicker.tsx

@@ -1,26 +0,0 @@
-/*
- * 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 { Select } from "@vencord/types/webpack/common";
-
-import { SettingsComponent } from "./Settings";
-
-export const DiscordBranchPicker: SettingsComponent = ({ settings }) => {
-    return (
-        <Select
-            placeholder="Stable"
-            options={[
-                { label: "Stable", value: "stable", default: true },
-                { label: "Canary", value: "canary" },
-                { label: "PTB", value: "ptb" }
-            ]}
-            closeOnSelect={true}
-            select={v => (settings.discordBranch = v)}
-            isSelected={v => v === settings.discordBranch}
-            serialize={s => s}
-        />
-    );
-};

src/renderer/components/settings/NotificationBadgeToggle.tsx

@@ -1,26 +0,0 @@
-/*
- * 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 { Switch } from "@vencord/types/webpack/common";
-import { setBadge } from "renderer/appBadge";
-
-import { SettingsComponent } from "./Settings";
-
-export const NotificationBadgeToggle: SettingsComponent = ({ settings }) => {
-    return (
-        <Switch
-            value={settings.appBadge ?? true}
-            onChange={v => {
-                settings.appBadge = v;
-                if (v) setBadge();
-                else VesktopNative.app.setBadgeCount(0);
-            }}
-            note="Show mention badge on the app icon"
-        >
-            Notification Badge
-        </Switch>
-    );
-};

src/renderer/components/settings/Settings.tsx

@@ -1,168 +0,0 @@
-/*
- * 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 "./settings.css";
-
-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 { DiscordBranchPicker } from "./DiscordBranchPicker";
-import { NotificationBadgeToggle } from "./NotificationBadgeToggle";
-import { VencordLocationPicker } from "./VencordLocationPicker";
-import { WindowsTransparencyControls } from "./WindowsTransparencyControls";
-
-interface BooleanSetting {
-    key: keyof typeof Settings.store;
-    title: string;
-    description: string;
-    defaultValue: boolean;
-    disabled?(): boolean;
-    invisible?(): boolean;
-}
-
-export type SettingsComponent = ComponentType<{ settings: typeof Settings.store }>;
-
-const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>> = {
-    "Discord Branch": [DiscordBranchPicker],
-    "System Startup & Performance": [
-        AutoStartToggle,
-        {
-            key: "hardwareAcceleration",
-            title: "Hardware Acceleration",
-            description: "Enable hardware acceleration",
-            defaultValue: true
-        }
-    ],
-    "User Interface": [
-        {
-            key: "customTitleBar",
-            title: "Discord Titlebar",
-            description: "Use Discord's custom title bar instead of the native system one. Requires a full restart.",
-            defaultValue: isWindows
-        },
-        {
-            key: "staticTitle",
-            title: "Static Title",
-            description: 'Makes the window title "Vesktop" instead of changing to the current page',
-            defaultValue: false
-        },
-        {
-            key: "enableMenu",
-            title: "Enable Menu Bar",
-            description: "Enables the application menu bar. Press ALT to toggle visibility.",
-            defaultValue: false,
-            disabled: () => Settings.store.customTitleBar ?? isWindows
-        },
-        {
-            key: "splashTheming",
-            title: "Splash theming",
-            description: "Adapt the splash window colors to your custom theme",
-            defaultValue: false
-        },
-        WindowsTransparencyControls
-    ],
-    Behaviour: [
-        {
-            key: "tray",
-            title: "Tray Icon",
-            description: "Add a tray icon for Vesktop",
-            defaultValue: true,
-            invisible: () => isMac
-        },
-        {
-            key: "minimizeToTray",
-            title: "Minimize to tray",
-            description: "Hitting X will make Vesktop minimize to the tray instead of closing",
-            defaultValue: true,
-            invisible: () => isMac,
-            disabled: () => Settings.store.tray === false
-        },
-        {
-            key: "clickTrayToShowHide",
-            title: "Hide/Show on tray click",
-            description: "Left clicking tray icon will toggle the vesktop window visibility.",
-            defaultValue: false
-        },
-        {
-            key: "disableMinSize",
-            title: "Disable minimum window size",
-            description: "Allows you to make the window as small as your heart desires",
-            defaultValue: false
-        },
-        {
-            key: "disableSmoothScroll",
-            title: "Disable smooth scrolling",
-            description: "Disables smooth scrolling",
-            defaultValue: false
-        }
-    ],
-    Notifications: [NotificationBadgeToggle],
-    Miscellaneous: [
-        {
-            key: "arRPC",
-            title: "Rich Presence",
-            description: "Enables Rich Presence via arRPC",
-            defaultValue: false
-        },
-
-        {
-            key: "openLinksWithElectron",
-            title: "Open Links in app (experimental)",
-            description: "Opens links in a new Vesktop window instead of your web browser",
-            defaultValue: false
-        }
-    ],
-    "Vencord Location": [VencordLocationPicker]
-};
-
-function SettingsSections() {
-    const Settings = useSettings();
-
-    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} />;
-
-                const { defaultValue, title, description, key, disabled, invisible } = Setting;
-                if (invisible?.()) return null;
-
-                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 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

@@ -1,76 +0,0 @@
-/*
- * 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 { useForceUpdater } from "@vencord/types/utils";
-import { Button, Forms, Toasts } from "@vencord/types/webpack/common";
-
-import { SettingsComponent } from "./Settings";
-
-export 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-location-btns">
-                <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/WindowsTransparencyControls.tsx

@@ -1,49 +0,0 @@
-/*
- * 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 { Margins } from "@vencord/types/utils";
-import { Forms, Select } from "@vencord/types/webpack/common";
-
-import { SettingsComponent } from "./Settings";
-
-export const WindowsTransparencyControls: SettingsComponent = ({ settings }) => {
-    if (!VesktopNative.app.supportsWindowsTransparency()) return null;
-
-    return (
-        <>
-            <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>
-
-            <Select
-                placeholder="None"
-                options={[
-                    {
-                        label: "None",
-                        value: "none",
-                        default: true
-                    },
-                    {
-                        label: "Mica (incorporates system theme + desktop wallpaper to paint the background)",
-                        value: "mica"
-                    },
-                    { label: "Tabbed (variant of Mica with stronger background tinting)", value: "tabbed" },
-                    {
-                        label: "Acrylic (blurs the window behind Vesktop for a translucent background)",
-                        value: "acrylic"
-                    }
-                ]}
-                closeOnSelect={true}
-                select={v => (settings.transparencyOption = v)}
-                isSelected={v => v === settings.transparencyOption}
-                serialize={s => s}
-            />
-
-            <Forms.FormDivider className={Margins.top16 + " " + Margins.bottom16} />
-        </>
-    );
-};

src/renderer/fixes.css

@@ -1,16 +0,0 @@
-/* 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;
-}
-
-/* Workaround for making things in the draggable area clickable again on macOS */
-.platform-osx [class*=topic_], .platform-osx [class*=notice_] button {
-    -webkit-app-region: no-drag;
-}

src/renderer/fixes.ts

@@ -1,12 +1,14 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
-import "./fixes.css";
+import "./hideGarbage.css";
 
-import { isWindows, localStorage } from "./utils";
+import { waitFor } from "@vencord/types/webpack";
+
+import { isFirstRun, localStorage } from "./utils";
 
 // Make clicking Notifications focus the window
 const originalSetOnClick = Object.getOwnPropertyDescriptor(Notification.prototype, "onclick")!.set!;
@@ -14,22 +16,18 @@ Object.defineProperty(Notification.prototype, "onclick", {
     set(onClick) {
         originalSetOnClick.call(this, function (this: unknown) {
             onClick.apply(this, arguments);
-            VesktopNative.win.focus();
+            VencordDesktopNative.win.focus();
         });
     },
     configurable: true
 });
 
-// Hide "Download Discord Desktop now!!!!" banner
-localStorage.setItem("hideNag", "true");
+// Enable Desktop Notifications by default
+if (isFirstRun) {
+    // 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 {}
+    waitFor("setDesktopType", m => {
+        m.setDesktopType("all");
+    });
+}

src/renderer/hideGarbage.css

@@ -0,0 +1,5 @@
+/* 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;
+}

src/renderer/index.ts

@@ -1,77 +1,25 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 import "./fixes";
-import "./appBadge";
-import "./patches";
-import "./themedSplash";
 
 console.log("read if cute :3");
 
 export * as Components from "./components";
-import { findByPropsLazy, onceReady } from "@vencord/types/webpack";
-import { Alerts, FluxDispatcher } from "@vencord/types/webpack/common";
-
-import SettingsUi from "./components/settings/Settings";
 import { Settings } from "./settings";
 export { Settings };
 
-const InviteActions = findByPropsLazy("resolveInvite");
+const arRPC = Vencord.Plugins.plugins["WebRichPresence (arRPC)"];
 
-export async function openInviteModal(code: string) {
-    const { invite } = await InviteActions.resolveInvite(code, "Desktop Modal");
-    if (!invite) return false;
+arRPC.required = !!Settings.store.arRPC;
 
-    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",
-    label: "Vesktop Settings",
-    element: SettingsUi,
-    className: "vc-vesktop-settings"
-}));
-
-const arRPC = Vencord.Plugins.plugins["WebRichPresence (arRPC)"] as any as {
-    handleEvent(e: MessageEvent): void;
-};
-
-VesktopNative.arrpc.onActivity(async data => {
-    if (!Settings.store.arRPC) return;
-
-    await onceReady;
-
-    arRPC.handleEvent(new MessageEvent("message", { data }));
+Settings.addChangeListener("arRPC", v => {
+    arRPC.required = !!v;
+    if (v && !arRPC.started) Vencord.Plugins.startPlugin(arRPC);
+    else if (arRPC.started) {
+        Vencord.Plugins.stopPlugin(arRPC);
+    }
 });
-
-// TODO: remove soon
-const vencordDir = "vencordDir" as keyof typeof Settings.store;
-if (Settings.store[vencordDir]) {
-    onceReady.then(() =>
-        setTimeout(
-            () =>
-                Alerts.show({
-                    title: "Custom Vencord Location",
-                    body: "Due to security hardening changes in Vesktop, your custom Vencord location had to be reset. Please configure it again in the settings.",
-                    onConfirm: () => delete Settings.store[vencordDir]
-                }),
-            5000
-        )
-    );
-}

src/renderer/patches/enableNotificationsByDefault.ts

@@ -1,21 +0,0 @@
-/*
- * 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 { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        {
-            find: '"NotificationSettingsStore',
-            replacement: {
-                // FIXME: fix eslint rule
-                // eslint-disable-next-line no-useless-escape
-                match: /\.isPlatformEmbedded(?=\?\i\.\i\.ALL)/g,
-                replace: "$&||true"
-            }
-        }
-    ]
-});

src/renderer/patches/hideSwitchDevice.tsx

@@ -1,24 +0,0 @@
-/*
- * 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 { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        {
-            find: "lastOutputSystemDevice.justChanged",
-            replacement: {
-                // eslint-disable-next-line no-useless-escape
-                match: /(\i)\.\i\.getState\(\).neverShowModal/,
-                replace: "$& || $self.shouldIgnore($1)"
-            }
-        }
-    ],
-
-    shouldIgnore(state: any) {
-        return Object.keys(state?.default?.lastDeviceConnected ?? {})?.[0] === "vencord-screen-share";
-    }
-});

src/renderer/patches/hideVenmicInput.tsx

@@ -1,25 +0,0 @@
-/*
- * 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 { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        {
-            find: 'setSinkId"in',
-            replacement: {
-                // eslint-disable-next-line no-useless-escape
-                match: /return (\i)\?navigator\.mediaDevices\.enumerateDevices/,
-                replace: "return $1 ? $self.filteredDevices"
-            }
-        }
-    ],
-
-    async filteredDevices() {
-        const original = await navigator.mediaDevices.enumerateDevices();
-        return original.filter(x => x.label !== "vencord-screen-share");
-    }
-});

src/renderer/patches/index.ts

@@ -1,14 +0,0 @@
-/*
- * 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,29 +0,0 @@
-/*
- * 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 { Settings } from "renderer/settings";
-import { isMac } from "renderer/utils";
-
-import { addPatch } from "./shared";
-
-addPatch({
-    patches: [
-        {
-            find: "platform-web",
-            replacement: {
-                // eslint-disable-next-line no-useless-escape
-                match: /(?<=" platform-overlay"\):)\i/,
-                replace: "$self.getPlatformClass()"
-            }
-        }
-    ],
-
-    getPlatformClass() {
-        if (Settings.store.customTitleBar) return "platform-win";
-        if (isMac) return "platform-osx";
-        return "platform-web";
-    }
-});

src/renderer/patches/screenShareFixes.ts

@@ -1,69 +0,0 @@
-/*
- * 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 { Logger } from "@vencord/types/utils";
-import { currentSettings } from "renderer/components/ScreenSharePicker";
-import { isLinux } from "renderer/utils";
-
-const logger = new Logger("VesktopStreamFixes");
-
-if (isLinux) {
-    const original = navigator.mediaDevices.getDisplayMedia;
-
-    async function getVirtmic() {
-        try {
-            const devices = await navigator.mediaDevices.enumerateDevices();
-            const audioDevice = devices.find(({ label }) => label === "vencord-screen-share");
-            return audioDevice?.deviceId;
-        } catch (error) {
-            return null;
-        }
-    }
-
-    navigator.mediaDevices.getDisplayMedia = async function (opts) {
-        const stream = await original.call(this, opts);
-        const id = await getVirtmic();
-
-        const frameRate = Number(currentSettings?.fps);
-        const height = Number(currentSettings?.resolution);
-        const width = Math.round(height * (16 / 9));
-        const track = stream.getVideoTracks()[0];
-
-        track.contentHint = String(currentSettings?.contentHint);
-
-        const constraints = {
-            ...track.getConstraints(),
-            frameRate: { min: frameRate, ideal: frameRate },
-            width: { min: 640, ideal: width, max: width },
-            height: { min: 480, ideal: height, max: height },
-            advanced: [{ width: width, height: height }],
-            resizeMode: "none"
-        };
-
-        track
-            .applyConstraints(constraints)
-            .then(() => {
-                logger.info("Applied constraints successfully. New constraints: ", track.getConstraints());
-            })
-            .catch(e => logger.error("Failed to apply constraints.", e));
-
-        if (id) {
-            const audio = await navigator.mediaDevices.getUserMedia({
-                audio: {
-                    deviceId: {
-                        exact: id
-                    },
-                    autoGainControl: false,
-                    echoCancellation: false,
-                    noiseSuppression: false
-                }
-            });
-            audio.getAudioTracks().forEach(t => stream.addTrack(t));
-        }
-
-        return stream;
-    };
-}

src/renderer/patches/shared.ts

@@ -1,30 +0,0 @@
-/*
- * 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 { Patch } from "@vencord/types/utils/types";
-
-window.VCDP = {};
-
-interface PatchData {
-    patches: Omit<Patch, "plugin">[];
-    [key: string]: any;
-}
-
-export function addPatch<P extends PatchData>(p: P) {
-    const { patches, ...globals } = p;
-
-    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(VCDP, globals);
-}

src/renderer/patches/spellCheck.tsx

@@ -1,117 +0,0 @@
-/*
- * 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 { 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 { addPatch } from "./shared";
-
-let word: string;
-let corrections: string[];
-
-const SpellCheckStore = findStoreLazy("SpellcheckStore");
-
-// Make spellcheck suggestions work
-addPatch({
-    patches: [
-        {
-            find: ".enableSpellCheck)",
-            replacement: {
-                // if (isDesktop) { DiscordNative.onSpellcheck(openMenu(props)) } else { e.preventDefault(); openMenu(props) }
-                match: /else (.{1,3})\.preventDefault\(\),(.{1,3}\(.{1,3}\))(?<=:(.{1,3})\.enableSpellCheck\).+?)/,
-                // ... else { $self.onSlateContext(() => openMenu(props)) }
-                replace: "else {$self.onSlateContext($1, $3?.enableSpellCheck, () => $2)}"
-            }
-        }
-    ],
-
-    onSlateContext(e: MouseEvent, hasSpellcheck: boolean | undefined, openMenu: () => void) {
-        if (!hasSpellcheck) {
-            e.preventDefault();
-            openMenu();
-            return;
-        }
-
-        const cb = (w: string, c: string[]) => {
-            VesktopNative.spellcheck.offSpellcheckResult(cb);
-            word = w;
-            corrections = c;
-            openMenu();
-        };
-        VesktopNative.spellcheck.onSpellcheckResult(cb);
-    }
-});
-
-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,
-        <Menu.MenuGroup>
-            {hasCorrections && (
-                <>
-                    {corrections.map(c => (
-                        <Menu.MenuItem
-                            id={"vcd-spellcheck-suggestion-" + c}
-                            label={c}
-                            action={() => VesktopNative.spellcheck.replaceMisspelling(c)}
-                        />
-                    ))}
-                    <Menu.MenuSeparator />
-                    <Menu.MenuItem
-                        id="vcd-spellcheck-learn"
-                        label={`Add ${word} to dictionary`}
-                        action={() => VesktopNative.spellcheck.addToDictionary(word)}
-                    />
-                </>
-            )}
-
-            <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.MenuGroup>
-    );
-});

src/renderer/patches/windowsTitleBar.tsx

@@ -1,30 +0,0 @@
-/*
- * 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 { Settings } from "renderer/settings";
-
-import { addPatch } from "./shared";
-
-if (Settings.store.customTitleBar)
-    addPatch({
-        patches: [
-            {
-                find: ".wordmarkWindows",
-                replacement: [
-                    {
-                        // TODO: Fix eslint rule
-                        // eslint-disable-next-line no-useless-escape
-                        match: /case \i\.\i\.WINDOWS:/,
-                        replace: 'case "WEB":'
-                    },
-                    ...["close", "minimize", "maximize"].map(op => ({
-                        match: new RegExp(String.raw`\i\.\i\.${op}\b`),
-                        replace: `VesktopNative.win.${op}`
-                    }))
-                ]
-            }
-        ]
-    });

src/renderer/settings.ts

@@ -1,14 +1,14 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 import { useEffect, useReducer } from "@vencord/types/webpack/common";
 import { SettingsStore } from "shared/utils/SettingsStore";
 
-export const Settings = new SettingsStore(VesktopNative.settings.get());
-Settings.addGlobalChangeListener((o, p) => VesktopNative.settings.set(o, p));
+export const Settings = new SettingsStore(VencordDesktopNative.settings.get());
+Settings.addGlobalChangeListener((o, p) => VencordDesktopNative.settings.set(o, p));
 
 export function useSettings() {
     const [, update] = useReducer(x => x + 1, 0);

src/renderer/themedSplash.ts

@@ -1,46 +0,0 @@
-/*
- * 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 { Settings } from "./settings";
-
-function isValidColor(color: CSSStyleValue | undefined): color is CSSUnparsedValue & { [0]: string } {
-    return color instanceof CSSUnparsedValue && typeof color[0] === "string" && CSS.supports("color", color[0]);
-}
-
-function resolveColor(color: string) {
-    const span = document.createElement("span");
-    span.style.color = color;
-    span.style.display = "none";
-
-    document.body.append(span);
-    const rgbColor = getComputedStyle(span).color;
-    span.remove();
-
-    return rgbColor;
-}
-
-const updateSplashColors = () => {
-    const bodyStyles = document.body.computedStyleMap();
-
-    const color = bodyStyles.get("--text-normal");
-    const backgroundColor = bodyStyles.get("--background-primary");
-
-    if (isValidColor(color)) {
-        Settings.store.splashColor = resolveColor(color[0]);
-    }
-
-    if (isValidColor(backgroundColor)) {
-        Settings.store.splashBackground = resolveColor(backgroundColor[0]);
-    }
-};
-
-if (document.readyState === "complete") {
-    updateSplashColors();
-} else {
-    window.addEventListener("load", updateSplashColors);
-}
-
-window.addEventListener("beforeunload", updateSplashColors);

src/renderer/utils.ts

@@ -1,10 +1,10 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
-export const { localStorage } = window;
+export const localStorage = (window.vcdLS = window.localStorage);
 
 export const isFirstRun = (() => {
     const key = "VCD_FIRST_RUN";
@@ -16,5 +16,3 @@ export const isFirstRun = (() => {
 const { platform } = navigator;
 
 export const isWindows = platform.startsWith("Win");
-export const isMac = platform.startsWith("Mac");
-export const isLinux = platform.startsWith("Linux");

src/shared/IpcEvents.ts

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
@@ -11,44 +11,26 @@ export const enum IpcEvents {
     GET_RENDERER_CSS_FILE = "VCD_GET_RENDERER_CSS_FILE",
 
     GET_VERSION = "VCD_GET_VERSION",
-    SUPPORTS_WINDOWS_TRANSPARENCY = "VCD_SUPPORTS_WINDOWS_TRANSPARENCY",
 
     RELAUNCH = "VCD_RELAUNCH",
     CLOSE = "VCD_CLOSE",
     FOCUS = "VCD_FOCUS",
-    MINIMIZE = "VCD_MINIMIZE",
-    MAXIMIZE = "VCD_MAXIMIZE",
 
     SHOW_ITEM_IN_FOLDER = "VCD_SHOW_ITEM_IN_FOLDER",
     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_RESULT = "VCD_SPELLCHECK_RESULT",
-    SPELLCHECK_REPLACE_MISSPELLING = "VCD_SPELLCHECK_REPLACE_MISSPELLING",
-    SPELLCHECK_ADD_TO_DICTIONARY = "VCD_SPELLCHECK_ADD_TO_DICTIONARY",
-
-    SET_BADGE_COUNT = "VCD_SET_BADGE_COUNT",
+    SPELLCHECK_SET_LANGUAGES = "VCD_SPELLCHECK_SET_LANGUAGES",
 
     CAPTURER_GET_LARGE_THUMBNAIL = "VCD_CAPTURER_GET_LARGE_THUMBNAIL",
 
     AUTOSTART_ENABLED = "VCD_AUTOSTART_ENABLED",
     ENABLE_AUTOSTART = "VCD_ENABLE_AUTOSTART",
-    DISABLE_AUTOSTART = "VCD_DISABLE_AUTOSTART",
-
-    VIRT_MIC_LIST = "VCD_VIRT_MIC_LIST",
-    VIRT_MIC_START = "VCD_VIRT_MIC_START",
-    VIRT_MIC_START_SYSTEM = "VCD_VIRT_MIC_START_ALL",
-    VIRT_MIC_STOP = "VCD_VIRT_MIC_STOP",
-
-    ARRPC_ACTIVITY = "VCD_ARRPC_ACTIVITY",
-
-    CLIPBOARD_COPY_IMAGE = "VCD_CLIPBOARD_COPY_IMAGE"
+    DISABLE_AUTOSTART = "VCD_DISABLE_AUTOSTART"
 }

src/shared/browserWinProperties.ts

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

src/shared/paths.ts

@@ -1,12 +1,10 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 import { join } from "path";
 
 export const STATIC_DIR = /* @__PURE__ */ join(__dirname, "..", "..", "static");
-export const VIEW_DIR = /* @__PURE__ */ join(STATIC_DIR, "views");
-export const BADGE_DIR = /* @__PURE__ */ join(STATIC_DIR, "badges");
 export const ICON_PATH = /* @__PURE__ */ join(STATIC_DIR, "icon.png");

src/shared/settings.d.ts

@@ -1,57 +1,24 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
 import type { Rectangle } from "electron";
 
 export interface Settings {
-    discordBranch?: "stable" | "canary" | "ptb";
-    transparencyOption?: "none" | "mica" | "tabbed" | "acrylic";
-    tray?: boolean;
-    minimizeToTray?: boolean;
-    openLinksWithElectron?: boolean;
-    staticTitle?: boolean;
-    enableMenu?: boolean;
-    disableSmoothScroll?: boolean;
-    hardwareAcceleration?: boolean;
-    arRPC?: boolean;
-    appBadge?: boolean;
-    disableMinSize?: boolean;
-    clickTrayToShowHide?: boolean;
-    customTitleBar?: boolean;
-
-    splashTheming?: boolean;
-    splashColor?: string;
-    splashBackground?: string;
-
-    spellCheckLanguages?: string[];
-
-    audio?: {
-        workaround?: boolean;
-
-        deviceSelect?: boolean;
-        granularSelect?: boolean;
-
-        ignoreVirtual?: boolean;
-        ignoreDevices?: boolean;
-        ignoreInputMedia?: boolean;
-
-        onlySpeakers?: boolean;
-        onlyDefaultSpeakers?: boolean;
-    };
-}
-
-export interface State {
     maximized?: boolean;
     minimized?: boolean;
     windowBounds?: Rectangle;
-    displayid: int;
+    discordBranch?: "stable" | "canary" | "ptb";
+    openLinksWithElectron?: boolean;
+    vencordDir?: string;
+    disableMinSize?: boolean;
+    tray?: boolean;
+    minimizeToTray?: boolean;
+    skippedUpdate?: string;
+    staticTitle?: boolean;
+    arRPC?: boolean;
 
     firstLaunch?: boolean;
-
-    steamOSLayoutVersion?: number;
-
-    vencordDir?: string;
 }

src/shared/utils/SettingsStore.ts

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
@@ -12,8 +12,8 @@ type ResolvePropDeep<T, P> = P extends `${infer Pre}.${infer Suf}`
         ? ResolvePropDeep<T[Pre], Suf>
         : any
     : P extends keyof T
-      ? T[P]
-      : any;
+    ? T[P]
+    : any;
 
 /**
  * The SettingsStore allows you to easily create a mutable store that
@@ -59,19 +59,6 @@ export class SettingsStore<T extends object> {
                 self.pathListeners.get(setPath)?.forEach(cb => cb(value));
 
                 return true;
-            },
-            deleteProperty(target, key: string) {
-                if (!(key in target)) return true;
-
-                const res = Reflect.deleteProperty(target, key);
-                if (!res) return false;
-
-                const setPath = `${path}${path && "."}${key}`;
-
-                self.globalListeners.forEach(cb => cb(root, setPath));
-                self.pathListeners.get(setPath)?.forEach(cb => cb(undefined));
-
-                return res;
             }
         });
     }
@@ -157,11 +144,4 @@ export class SettingsStore<T extends object> {
         listeners.delete(cb);
         if (!listeners.size) this.pathListeners.delete(path as string);
     }
-
-    /**
-     * Call all global change listeners
-     */
-    public markAsChanged() {
-        this.globalListeners.forEach(cb => cb(this.plain, ""));
-    }
 }

src/shared/utils/debounce.ts

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

src/shared/utils/guards.ts

@@ -1,13 +0,0 @@
-/*
- * 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 function isTruthy<T>(item: T): item is Exclude<T, 0 | "" | false | null | undefined> {
-    return Boolean(item);
-}
-
-export function isNonNullish<T>(item: T): item is Exclude<T, null | undefined> {
-    return item != null;
-}

src/shared/utils/monkeyPatch.ts

@@ -0,0 +1,23 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+type Func = (...args: any[]) => any;
+
+export function monkeyPatch<O extends object>(
+    object: O,
+    key: keyof O,
+    replacement: (original: Func, ...args: any[]) => any
+): void {
+    const original = object[key] as Func;
+
+    const replacer = (object[key] = function (this: unknown, ...args: any[]) {
+        return replacement.call(this, original, ...args);
+    } as any);
+
+    Object.defineProperties(replacer, Object.getOwnPropertyDescriptors(original));
+    replacer.toString = () => original.toString();
+    replacer.$$original = original;
+}

src/shared/utils/once.ts

@@ -1,6 +1,6 @@
 /*
  * SPDX-License-Identifier: GPL-3.0
- * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 

src/shared/utils/sleep.ts

@@ -1,9 +0,0 @@
-/*
- * 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 function sleep(ms: number): Promise<void> {
-    return new Promise(r => setTimeout(r, ms));
-}

src/updater/main.ts

@@ -0,0 +1,105 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+import { app, BrowserWindow, ipcMain, shell } from "electron";
+import { Settings } from "main/settings";
+import { githubGet, ReleaseData } from "main/utils/vencordLoader";
+import { join } from "path";
+import { SplashProps } from "shared/browserWinProperties";
+import { IpcEvents } from "shared/IpcEvents";
+import { STATIC_DIR } from "shared/paths";
+
+export interface UpdateData {
+    currentVersion: string;
+    latestVersion: string;
+    release: ReleaseData;
+}
+
+let updateData: UpdateData;
+
+ipcMain.handle(IpcEvents.UPDATER_GET_DATA, () => updateData);
+ipcMain.handle(IpcEvents.UPDATER_DOWNLOAD, () => {
+    const portable = !!process.env.PORTABLE_EXECUTABLE_FILE;
+
+    const { assets } = updateData.release;
+    const url = (() => {
+        switch (process.platform) {
+            case "win32":
+                return assets.find(a => {
+                    if (!a.name.endsWith(".exe")) return false;
+
+                    const isSetup = a.name.includes("Setup");
+                    return portable ? !isSetup : isSetup;
+                })!.browser_download_url;
+            case "darwin":
+                return assets.find(a => a.name.endsWith(".dmg"))!.browser_download_url;
+            case "linux":
+                return updateData.release.html_url;
+            default:
+                throw new Error(`Unsupported platform: ${process.platform}`);
+        }
+    })();
+
+    shell.openExternal(url);
+});
+
+ipcMain.handle(IpcEvents.UPDATE_IGNORE, () => {
+    Settings.store.skippedUpdate = updateData.latestVersion;
+});
+
+function isOutdated(oldVersion: string, newVersion: string) {
+    const oldParts = oldVersion.split(".");
+    const newParts = newVersion.split(".");
+
+    if (oldParts.length !== newParts.length)
+        throw new Error(`Incompatible version strings (old: ${oldVersion}, new: ${newVersion})`);
+
+    for (let i = 0; i < oldParts.length; i++) {
+        const oldPart = Number(oldParts[i]);
+        const newPart = Number(newParts[i]);
+
+        if (isNaN(oldPart) || isNaN(newPart))
+            throw new Error(`Invalid version string (old: ${oldVersion}, new: ${newVersion})`);
+
+        if (oldPart < newPart) return true;
+        if (oldPart > newPart) return false;
+    }
+
+    return false;
+}
+
+export async function checkUpdates() {
+    // if (IS_DEV) return;
+    try {
+        const raw = await githubGet("/repos/Vencord/Desktop/releases/latest");
+        const data = JSON.parse(raw.toString("utf-8")) as ReleaseData;
+
+        const oldVersion = app.getVersion();
+        const newVersion = data.tag_name.replace(/^v/, "");
+        if (Settings.store.skippedUpdate !== newVersion && isOutdated(oldVersion, newVersion)) {
+            updateData = {
+                currentVersion: oldVersion,
+                latestVersion: newVersion,
+                release: data
+            };
+
+            openNewUpdateWindow();
+        }
+    } catch (e) {
+        console.error("AppUpdater: Failed to check for updates\n", e);
+    }
+}
+
+function openNewUpdateWindow() {
+    const win = new BrowserWindow({
+        ...SplashProps,
+        webPreferences: {
+            preload: join(__dirname, "updaterPreload.js")
+        }
+    });
+
+    win.loadFile(join(STATIC_DIR, "updater.html"));
+}

src/updater/preload.ts

@@ -0,0 +1,21 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vencord Desktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+import { contextBridge } from "electron";
+import { invoke } from "preload/typedIpcs";
+import { IpcEvents } from "shared/IpcEvents";
+
+import type { UpdateData } from "./main";
+
+contextBridge.exposeInMainWorld("Updater", {
+    getData: () => invoke<UpdateData>(IpcEvents.UPDATER_GET_DATA),
+    download: () => {
+        invoke<void>(IpcEvents.UPDATER_DOWNLOAD);
+        invoke<void>(IpcEvents.CLOSE);
+    },
+    ignore: () => invoke<void>(IpcEvents.UPDATE_IGNORE),
+    close: () => invoke<void>(IpcEvents.CLOSE)
+});

static/about.html

@@ -1,9 +1,9 @@
 <head>
-    <link rel="stylesheet" href="./style.css" type="text/css" />
-
     <style>
         body {
             padding: 2em;
+            font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell,
+                "Open Sans", "Helvetica Neue", sans-serif;
         }
 
         h1 {
@@ -13,10 +13,10 @@
 </head>
 
 <body>
-    <h1 id="title">Vesktop</h1>
+    <h1>Vencord Desktop %VERSION%</h1>
     <p>
-        Vesktop is a free/libre cross platform desktop app aiming to give you a snappier Discord experience with Vencord
-        pre-installed
+        Vencord Desktop is a free/libre cross platform desktop app aiming to give you a snappier Discord experience with
+        Vencord pre-installed
     </p>
 
     <section>
@@ -26,17 +26,17 @@
                 <a href="https://vencord.dev" target="_blank">Vencord Website</a>
             </li>
             <li>
-                <a href="https://github.com/Vencord/Vesktop" target="_blank">Source Code</a>
+                <a href="https://github.com/Vencord/Desktop" target="_blank">Source Code</a>
             </li>
             <li>
-                <a href="https://github.com/Vencord/Vesktop/issues" target="_blank">Report bugs / Request features</a>
+                <a href="https://github.com/Vencord/Desktop/issues" target="_blank">Report bugs / Request features</a>
             </li>
         </ul>
     </section>
 
     <section>
         <h2>Acknowledgements</h2>
-        <p>These awesome libraries empower Vesktop</p>
+        <p>These awesome libraries empower Vencord Desktop</p>
         <ul>
             <li>
                 <a href="https://github.com/electron/electron" target="_blank">Electron</a>
@@ -51,25 +51,12 @@
                 <a href="https://github.com/OpenAsar/arrpc" target="_blank">arrpc</a>
                 - An open implementation of Discord's Rich Presence server
             </li>
-            <li>
-                <a href="https://github.com/Soundux/rohrkabel" target="_blank">rohrkabel</a>
-                - A C++ RAII Pipewire-API Wrapper 
-            </li>
             <li>
                 And many
-                <a href="https://github.com/Vencord/Vesktop/blob/main/pnpm-lock.yaml" target="_blank"
+                <a href="https://github.com/Vencord/Desktop/blob/main/pnpm-lock.yaml" target="_blank"
                     >more awesome open source libraries</a
                 >
             </li>
         </ul>
     </section>
 </body>
-
-<script type="module">
-    const data = await Updater.getData();
-    if (data.currentVersion) {
-        const title = document.getElementById("title");
-
-        title.textContent += ` v${data.currentVersion}`;
-    }
-</script>