MessageLinkEmbeds: Use api

.eslintrc.json

@@ -4,7 +4,7 @@
     "ignorePatterns": ["dist", "browser"],
     "plugins": [
         "@typescript-eslint",
-        "simple-header",
+        "header",
         "simple-import-sort",
         "unused-imports",
         "path-alias"
@@ -26,12 +26,35 @@
         // Since it's only been a month and Vencord has already been stolen
         // by random skids who rebranded it to "AlphaCord" and erased all license
         // information
-        "simple-header/header": [
+        "header/header": [
-            "error",
+            2,
-            {
+            "block",
-                "files": ["scripts/header-new.txt", "scripts/header-old.txt"],
+            [
-                "templates": { "author": [".*", "Vendicated and contributors"] }
+                {
-            }
+                    "pattern": "!?",
+                    "template": " "
+                },
+                " * Vencord, a modification for Discord's desktop app",
+                {
+                    "pattern": " \\* Copyright \\(c\\) \\d{4}",
+                    "template": " * Copyright (c) 2023 Vendicated and contributors"
+                },
+                " *",
+                " * This program is free software: you can redistribute it and/or modify",
+                " * it under the terms of the GNU General Public License as published by",
+                " * the Free Software Foundation, either version 3 of the License, or",
+                " * (at your option) any later version.",
+                " *",
+                " * This program is distributed in the hope that it will be useful,",
+                " * but WITHOUT ANY WARRANTY; without even the implied warranty of",
+                " * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the",
+                " * GNU General Public License for more details.",
+                " *",
+                " * You should have received a copy of the GNU General Public License",
+                " * along with this program.  If not, see <https://www.gnu.org/licenses/>.",
+                ""
+            ],
+            2
         ],
         "quotes": ["error", "double", { "avoidEscape": true }],
         "jsx-quotes": ["error", "prefer-double"],

.github/ISSUE_TEMPLATE/blank.yml

@@ -0,0 +1,22 @@
+name: Blank Template
+description: Use this only if your issue does not fit into another template. **DO NOT ASK FOR SUPPORT OR REQUEST PLUGINS**
+labels: []
+
+body:
+  - type: textarea
+    id: info-sec
+    attributes:
+      label: Tell us all about it.
+      description: Go nuts, let us know what you're wanting to bring attention to.
+      placeholder: ...
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: agreement-check
+    attributes:
+      label: Request Agreement
+      description: DO NOT USE THIS TEMPLATE FOR SUPPORT OR PLUGIN REQUESTS!!! For Support, **join our Discord**. For plugin requests, **use discussions**
+      options:
+        - label: This is not a support or plugin request
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
   - name: Vencord Support Server
     url: https://discord.gg/D9uwnFnqmd

README.md

@@ -51,16 +51,6 @@ As an alternative to the Discord Desktop app, Vencord also has its own standalon
 
 https://discord.gg/D9uwnFnqmd
 
-## Star History
-
-<a href="https://star-history.com/#Vendicated/Vencord&Timeline">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=Vendicated/Vencord&type=Timeline&theme=dark" />
-    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=Vendicated/Vencord&type=Timeline" />
-    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=Vendicated/Vencord&type=Timeline" />
-  </picture>
-</a>
-
 ## Disclaimer
 
 Discord is trademark of Discord Inc. and solely mentioned for the sake of descriptivity.

browser/VencordNativeStub.ts

@@ -23,7 +23,6 @@ import monacoHtml from "~fileContent/../src/components/monacoWin.html";
 import * as DataStore from "../src/api/DataStore";
 import { debounce } from "../src/utils";
 import { getTheme, Theme } from "../src/utils/discord";
-import { getThemeInfo } from "../src/main/themes";
 
 // Discord deletes this so need to store in variable
 const { localStorage } = window;
@@ -35,20 +34,8 @@ const NOOP_ASYNC = async () => { };
 
 const setCssDebounced = debounce((css: string) => VencordNative.quickCss.set(css));
 
-const themeStore = DataStore.createStore("VencordThemes", "VencordThemeData");
-
 // probably should make this less cursed at some point
 window.VencordNative = {
-    themes: {
-        uploadTheme: (fileName: string, fileData: string) => DataStore.set(fileName, fileData, themeStore),
-        deleteTheme: (fileName: string) => DataStore.del(fileName, themeStore),
-        getThemesDir: async () => "",
-        getThemesList: () => DataStore.entries(themeStore).then(entries =>
-            entries.map(([name, css]) => getThemeInfo(css, name.toString()))
-        ),
-        getThemeData: (fileName: string) => DataStore.get(fileName, themeStore)
-    },
-
     native: {
         getVersions: () => ({}),
         openExternal: async (url) => void open(url, "_blank")
@@ -70,7 +57,6 @@ window.VencordNative = {
         addChangeListener(cb) {
             cssListeners.add(cb);
         },
-        addThemeChangeListener: NOOP,
         openFile: NOOP_ASYNC,
         async openEditor() {
             const features = `popup,width=${Math.min(window.innerWidth, 1000)},height=${Math.min(window.innerHeight, 1000)}`;
@@ -95,7 +81,5 @@ window.VencordNative = {
         get: () => localStorage.getItem("VencordSettings") || "{}",
         set: async (s: string) => localStorage.setItem("VencordSettings", s),
         getSettingsDir: async () => "LocalStorage"
-    },
+    }
-
-    pluginHelpers: {} as any,
 };

docs/1_INSTALLING.md

@@ -1,6 +1,5 @@
-> [!WARNING]  
+> **Warning**
-> These instructions are only for advanced users. If you're not a Developer, you should use our [graphical installer](https://github.com/Vendicated/VencordInstaller#usage) instead.  
+> These instructions are only for advanced users. If you're not a Developer, you should use our [graphical installer](https://github.com/Vendicated/VencordInstaller#usage) instead.
-> No support will be provided for installing in this fashion. If you cannot figure it out, you should just stick to a regular install.  
 
 # Installation Guide
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.4.4",
+    "version": "1.2.9",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {
@@ -11,7 +11,7 @@
         "type": "git",
         "url": "git+https://github.com/Vendicated/Vencord.git"
     },
-    "license": "GPL-3.0-or-later",
+    "license": "GPL-3.0",
     "author": "Vendicated",
     "directories": {
         "doc": "docs"
@@ -31,10 +31,8 @@
         "watch": "node scripts/build/build.mjs --watch"
     },
     "dependencies": {
-        "@sapphi-red/web-noise-suppressor": "0.3.3",
         "@vap/core": "0.0.12",
         "@vap/shiki": "0.10.5",
-        "eslint-plugin-simple-header": "^1.0.2",
         "fflate": "^0.7.4",
         "nanoid": "^4.0.2",
         "virtual-merge": "^1.0.1"
@@ -51,8 +49,9 @@
         "diff": "^5.1.0",
         "discord-types": "^1.3.26",
         "esbuild": "^0.15.18",
-        "eslint": "^8.46.0",
+        "eslint": "^8.28.0",
         "eslint-import-resolver-alias": "^1.1.2",
+        "eslint-plugin-header": "^3.1.1",
         "eslint-plugin-path-alias": "^1.0.0",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-unused-imports": "^2.0.0",
@@ -70,7 +69,7 @@
     "pnpm": {
         "patchedDependencies": {
             "eslint-plugin-path-alias@1.0.0": "patches/eslint-plugin-path-alias@1.0.0.patch",
-            "eslint@8.46.0": "patches/eslint@8.46.0.patch"
+            "eslint@8.28.0": "patches/eslint@8.28.0.patch"
         },
         "peerDependencyRules": {
             "ignoreMissing": [

patches/eslint@8.28.0.patch

@@ -1,11 +1,11 @@
 diff --git a/lib/rules/no-useless-escape.js b/lib/rules/no-useless-escape.js
-index 0e0f6f09f2c35f3276173c08f832cde9f2cf56a0..7dc22851715f3574d935f513c1b5e35552985711 100644
+index 2046a148a17fd1d5f3a4bbc9f45f7700259d11fa..f4898c6b57355a4fd72c43a9f32bf1a36a6ccf4a 100644
 --- a/lib/rules/no-useless-escape.js
 +++ b/lib/rules/no-useless-escape.js
-@@ -65,13 +65,31 @@ module.exports = {
+@@ -97,12 +97,30 @@ module.exports = {
              escapeBackslash: "Replace the `\\` with `\\\\` to include the actual backslash character."
          },
-
+ 
 -        schema: []
 +        schema: [{
 +            type: "object",
@@ -22,28 +22,24 @@ index 0e0f6f09f2c35f3276173c08f832cde9f2cf56a0..7dc22851715f3574d935f513c1b5e355
 +            additionalProperties: false
 +        }]
      },
-
+ 
      create(context) {
 +        const options = context.options[0] || {};
-+        const { extra, extraCharClass } = options;
++        const { extra, extraCharClass } = options || ''
-         const sourceCode = context.sourceCode;
+         const sourceCode = context.getSourceCode();
-         const parser = new RegExpParser();
+ 
-
++        const NON_CHARCLASS_ESCAPES = union(REGEX_NON_CHARCLASS_ESCAPES, new Set(extra))
-+        const NON_CHARCLASS_ESCAPES = union(REGEX_NON_CHARCLASS_ESCAPES, new Set(extra));
++        const CHARCLASS_ESCAPES = union(REGEX_GENERAL_ESCAPES, new Set(extraCharClass))
-+        const CHARCLASS_ESCAPES = union(REGEX_GENERAL_ESCAPES, new Set(extraCharClass));
 +
          /**
           * Reports a node
           * @param {ASTNode} node The node to report
-@@ -200,9 +218,9 @@ module.exports = {
+@@ -238,7 +256,7 @@ module.exports = {
-                     let allowedEscapes;
+                     .filter(charInfo => charInfo.escaped)
-
+ 
-                     if (characterClassStack.length) {
+                     // Filter out characters that are valid to escape, based on their position in the regular expression.
--                        allowedEscapes = unicodeSets ? REGEX_CLASSSET_CHARACTER_ESCAPES : REGEX_GENERAL_ESCAPES;
+-                    .filter(charInfo => !(charInfo.inCharClass ? REGEX_GENERAL_ESCAPES : REGEX_NON_CHARCLASS_ESCAPES).has(charInfo.text))
-+                        allowedEscapes = unicodeSets ? REGEX_CLASSSET_CHARACTER_ESCAPES : CHARCLASS_ESCAPES;
++                    .filter(charInfo => !(charInfo.inCharClass ? CHARCLASS_ESCAPES : NON_CHARCLASS_ESCAPES).has(charInfo.text))
-                     } else {
+ 
--                        allowedEscapes = REGEX_NON_CHARCLASS_ESCAPES;
+                     // Report all the remaining characters.
-+                        allowedEscapes = NON_CHARCLASS_ESCAPES;
+                     .forEach(charInfo => report(node, charInfo.index, charInfo.text));
-                     }
-                     if (allowedEscapes.has(escapedChar)) {
-                         return;

pnpm-lock.yaml

@@ -4,23 +4,17 @@ patchedDependencies:
   eslint-plugin-path-alias@1.0.0:
     hash: m6sma4g6bh67km3q6igf6uxaja
     path: patches/eslint-plugin-path-alias@1.0.0.patch
-  eslint@8.46.0:
+  eslint@8.28.0:
-    hash: xm46kqcmdgzlmm4aifkfpxaho4
+    hash: 7wc6icvgtg3uswirb5tpsbjnbe
-    path: patches/eslint@8.46.0.patch
+    path: patches/eslint@8.28.0.patch
 
 dependencies:
-  '@sapphi-red/web-noise-suppressor':
-    specifier: 0.3.3
-    version: 0.3.3
   '@vap/core':
     specifier: 0.0.12
     version: 0.0.12
   '@vap/shiki':
     specifier: 0.10.5
     version: 0.10.5
-  eslint-plugin-simple-header:
-    specifier: ^1.0.2
-    version: 1.0.2
   fflate:
     specifier: ^0.7.4
     version: 0.7.4
@@ -52,10 +46,10 @@ devDependencies:
     version: 2.4.2
   '@typescript-eslint/eslint-plugin':
     specifier: ^5.59.1
-    version: 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4)
+    version: 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.28.0)(typescript@5.0.4)
   '@typescript-eslint/parser':
     specifier: ^5.59.1
-    version: 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+    version: 5.59.1(eslint@8.28.0)(typescript@5.0.4)
   diff:
     specifier: ^5.1.0
     version: 5.1.0
@@ -66,20 +60,23 @@ devDependencies:
     specifier: ^0.15.18
     version: 0.15.18
   eslint:
-    specifier: ^8.46.0
+    specifier: ^8.28.0
-    version: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+    version: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
   eslint-import-resolver-alias:
     specifier: ^1.1.2
     version: 1.1.2
+  eslint-plugin-header:
+    specifier: ^3.1.1
+    version: 3.1.1(eslint@8.28.0)
   eslint-plugin-path-alias:
     specifier: ^1.0.0
-    version: 1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0)
+    version: 1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.28.0)
   eslint-plugin-simple-import-sort:
     specifier: ^10.0.0
-    version: 10.0.0(eslint@8.46.0)
+    version: 10.0.0(eslint@8.28.0)
   eslint-plugin-unused-imports:
     specifier: ^2.0.0
-    version: 2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.46.0)
+    version: 2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.28.0)
   highlight.js:
     specifier: 10.6.0
     version: 10.6.0
@@ -110,11 +107,6 @@ devDependencies:
 
 packages:
 
-  /@aashutoshrathi/word-wrap@1.2.6:
-    resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /@babel/code-frame@7.21.4:
     resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==}
     engines: {node: '>=6.9.0'}
@@ -407,7 +399,7 @@ packages:
     dev: true
     optional: true
 
-  /@eslint-community/eslint-utils@4.4.0(eslint@8.46.0):
+  /@eslint-community/eslint-utils@4.4.0(eslint@8.28.0):
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -416,8 +408,8 @@ packages:
       eslint:
         optional: true
     dependencies:
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
-      eslint-visitor-keys: 3.4.2
+      eslint-visitor-keys: 3.4.0
     dev: true
 
   /@eslint-community/regexpp@4.5.1:
@@ -425,20 +417,15 @@ packages:
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
     dev: true
 
-  /@eslint-community/regexpp@4.6.2:
+  /@eslint/eslintrc@1.3.3:
-    resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==}
+    resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==}
-    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
-    dev: true
-
-  /@eslint/eslintrc@2.1.1:
-    resolution: {integrity: sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
       debug: 4.3.4
-      espree: 9.6.1
+      espree: 9.4.1
-      globals: 13.20.0
+      globals: 13.17.0
-      ignore: 5.2.4
+      ignore: 5.2.0
       import-fresh: 3.3.0
       js-yaml: 4.1.0
       minimatch: 3.1.2
@@ -447,13 +434,8 @@ packages:
       - supports-color
     dev: true
 
-  /@eslint/js@8.46.0:
+  /@humanwhocodes/config-array@0.11.7:
-    resolution: {integrity: sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==}
+    resolution: {integrity: sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
-
-  /@humanwhocodes/config-array@0.11.10:
-    resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==}
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
@@ -516,10 +498,6 @@ packages:
       - supports-color
     dev: true
 
-  /@sapphi-red/web-noise-suppressor@0.3.3:
-    resolution: {integrity: sha512-gAC33DCXYwNTI/k1PxOVHmbbzakUSMbb/DHpoV6rn4pKZtPI1dduULSmAAm/y1ipgIlArnk2JcnQzw4n2tCZHw==}
-    dev: false
-
   /@types/diff@5.0.3:
     resolution: {integrity: sha512-amrLbRqTU9bXMCc6uX0sWpxsQzRIo9z6MJPkH1pkez/qOxuqSZVuryJAWoBRq94CeG8JxY+VK4Le9HtjQR5T9A==}
     dev: true
@@ -591,7 +569,7 @@ packages:
       '@types/node': 18.16.3
     dev: true
 
-  /@typescript-eslint/eslint-plugin@5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4):
+  /@typescript-eslint/eslint-plugin@5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.28.0)(typescript@5.0.4):
     resolution: {integrity: sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -605,12 +583,12 @@ packages:
         optional: true
     dependencies:
       '@eslint-community/regexpp': 4.5.1
-      '@typescript-eslint/parser': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/parser': 5.59.1(eslint@8.28.0)(typescript@5.0.4)
       '@typescript-eslint/scope-manager': 5.59.1
-      '@typescript-eslint/type-utils': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/type-utils': 5.59.1(eslint@8.28.0)(typescript@5.0.4)
-      '@typescript-eslint/utils': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/utils': 5.59.1(eslint@8.28.0)(typescript@5.0.4)
       debug: 4.3.4
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
       grapheme-splitter: 1.0.4
       ignore: 5.2.4
       natural-compare-lite: 1.4.0
@@ -621,7 +599,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser@5.59.1(eslint@8.46.0)(typescript@5.0.4):
+  /@typescript-eslint/parser@5.59.1(eslint@8.28.0)(typescript@5.0.4):
     resolution: {integrity: sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -637,7 +615,7 @@ packages:
       '@typescript-eslint/types': 5.59.1
       '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.0.4)
       debug: 4.3.4
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
       typescript: 5.0.4
     transitivePeerDependencies:
       - supports-color
@@ -651,7 +629,7 @@ packages:
       '@typescript-eslint/visitor-keys': 5.59.1
     dev: true
 
-  /@typescript-eslint/type-utils@5.59.1(eslint@8.46.0)(typescript@5.0.4):
+  /@typescript-eslint/type-utils@5.59.1(eslint@8.28.0)(typescript@5.0.4):
     resolution: {integrity: sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -664,9 +642,9 @@ packages:
         optional: true
     dependencies:
       '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.0.4)
-      '@typescript-eslint/utils': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/utils': 5.59.1(eslint@8.28.0)(typescript@5.0.4)
       debug: 4.3.4
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
       tsutils: 3.21.0(typescript@5.0.4)
       typescript: 5.0.4
     transitivePeerDependencies:
@@ -699,7 +677,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils@5.59.1(eslint@8.46.0)(typescript@5.0.4):
+  /@typescript-eslint/utils@5.59.1(eslint@8.28.0)(typescript@5.0.4):
     resolution: {integrity: sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -708,13 +686,13 @@ packages:
       eslint:
         optional: true
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.28.0)
       '@types/json-schema': 7.0.11
       '@types/semver': 7.3.13
       '@typescript-eslint/scope-manager': 5.59.1
       '@typescript-eslint/types': 5.59.1
       '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.0.4)
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
       eslint-scope: 5.1.1
       semver: 7.5.0
     transitivePeerDependencies:
@@ -744,16 +722,16 @@ packages:
       vscode-textmate: 5.2.0
     dev: false
 
-  /acorn-jsx@5.3.2(acorn@8.10.0):
+  /acorn-jsx@5.3.2(acorn@8.8.0):
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 8.10.0
+      acorn: 8.8.0
     dev: true
 
-  /acorn@8.10.0:
+  /acorn@8.8.0:
-    resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
+    resolution: {integrity: sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==}
     engines: {node: '>=0.4.0'}
     hasBin: true
     dev: true
@@ -1468,7 +1446,18 @@ packages:
         optional: true
     dev: true
 
-  /eslint-plugin-path-alias@1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0):
+  /eslint-plugin-header@3.1.1(eslint@8.28.0):
+    resolution: {integrity: sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==}
+    peerDependencies:
+      eslint: '>=7.7.0'
+    peerDependenciesMeta:
+      eslint:
+        optional: true
+    dependencies:
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
+    dev: true
+
+  /eslint-plugin-path-alias@1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.28.0):
     resolution: {integrity: sha512-FXus57yC+Zd3sMv46pbloXYwFeNVNHJqlACr9V68FG/IzGFBBokGJpmjDbEjpt8ZCeVSndUubeDWWl2A8sCNVQ==}
     peerDependencies:
       eslint: ^7
@@ -1476,18 +1465,14 @@ packages:
       eslint:
         optional: true
     dependencies:
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
       nanomatch: 1.2.13
     transitivePeerDependencies:
       - supports-color
     dev: true
     patched: true
 
-  /eslint-plugin-simple-header@1.0.2:
+  /eslint-plugin-simple-import-sort@10.0.0(eslint@8.28.0):
-    resolution: {integrity: sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA==}
-    dev: false
-
-  /eslint-plugin-simple-import-sort@10.0.0(eslint@8.46.0):
     resolution: {integrity: sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==}
     peerDependencies:
       eslint: '>=5.0.0'
@@ -1495,10 +1480,10 @@ packages:
       eslint:
         optional: true
     dependencies:
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
     dev: true
 
-  /eslint-plugin-unused-imports@2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.46.0):
+  /eslint-plugin-unused-imports@2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.28.0):
     resolution: {integrity: sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1510,8 +1495,8 @@ packages:
       eslint:
         optional: true
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/eslint-plugin': 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.28.0)(typescript@5.0.4)
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
       eslint-rule-composer: 0.3.0
     dev: true
 
@@ -1528,34 +1513,49 @@ packages:
       estraverse: 4.3.0
     dev: true
 
-  /eslint-scope@7.2.2:
+  /eslint-scope@7.1.1:
-    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
+    resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       esrecurse: 4.3.0
       estraverse: 5.3.0
     dev: true
 
+  /eslint-utils@3.0.0(eslint@8.28.0):
+    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
+    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
+    peerDependencies:
+      eslint: '>=5'
+    peerDependenciesMeta:
+      eslint:
+        optional: true
+    dependencies:
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
+      eslint-visitor-keys: 2.1.0
+    dev: true
+
+  /eslint-visitor-keys@2.1.0:
+    resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /eslint-visitor-keys@3.3.0:
+    resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
   /eslint-visitor-keys@3.4.0:
     resolution: {integrity: sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint-visitor-keys@3.4.2:
+  /eslint@8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe):
-    resolution: {integrity: sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==}
+    resolution: {integrity: sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
-
-  /eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4):
-    resolution: {integrity: sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0)
+      '@eslint/eslintrc': 1.3.3
-      '@eslint-community/regexpp': 4.6.2
+      '@humanwhocodes/config-array': 0.11.7
-      '@eslint/eslintrc': 2.1.1
-      '@eslint/js': 8.46.0
-      '@humanwhocodes/config-array': 0.11.10
       '@humanwhocodes/module-importer': 1.0.1
       '@nodelib/fs.walk': 1.2.8
       ajv: 6.12.6
@@ -1564,46 +1564,60 @@ packages:
       debug: 4.3.4
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
-      eslint-scope: 7.2.2
+      eslint-scope: 7.1.1
-      eslint-visitor-keys: 3.4.2
+      eslint-utils: 3.0.0(eslint@8.28.0)
-      espree: 9.6.1
+      eslint-visitor-keys: 3.3.0
-      esquery: 1.5.0
+      espree: 9.4.0
+      esquery: 1.4.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
       file-entry-cache: 6.0.1
       find-up: 5.0.0
       glob-parent: 6.0.2
-      globals: 13.20.0
+      globals: 13.17.0
-      graphemer: 1.4.0
+      grapheme-splitter: 1.0.4
-      ignore: 5.2.4
+      ignore: 5.2.0
+      import-fresh: 3.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
       is-path-inside: 3.0.3
+      js-sdsl: 4.1.5
       js-yaml: 4.1.0
       json-stable-stringify-without-jsonify: 1.0.1
       levn: 0.4.1
       lodash.merge: 4.6.2
       minimatch: 3.1.2
       natural-compare: 1.4.0
-      optionator: 0.9.3
+      optionator: 0.9.1
+      regexpp: 3.2.0
       strip-ansi: 6.0.1
+      strip-json-comments: 3.1.1
       text-table: 0.2.0
     transitivePeerDependencies:
       - supports-color
     dev: true
     patched: true
 
-  /espree@9.6.1:
+  /espree@9.4.0:
-    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
+    resolution: {integrity: sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 8.10.0
+      acorn: 8.8.0
-      acorn-jsx: 5.3.2(acorn@8.10.0)
+      acorn-jsx: 5.3.2(acorn@8.8.0)
-      eslint-visitor-keys: 3.4.2
+      eslint-visitor-keys: 3.3.0
     dev: true
 
-  /esquery@1.5.0:
+  /espree@9.4.1:
-    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
+    resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      acorn: 8.8.0
+      acorn-jsx: 5.3.2(acorn@8.8.0)
+      eslint-visitor-keys: 3.3.0
+    dev: true
+
+  /esquery@1.4.0:
+    resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
     engines: {node: '>=0.10'}
     dependencies:
       estraverse: 5.3.0
@@ -1844,8 +1858,8 @@ packages:
       which: 1.3.1
     dev: true
 
-  /globals@13.20.0:
+  /globals@13.17.0:
-    resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==}
+    resolution: {integrity: sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==}
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.20.2
@@ -1871,10 +1885,6 @@ packages:
     resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
     dev: true
 
-  /graphemer@1.4.0:
-    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
-    dev: true
-
   /hard-rejection@2.1.0:
     resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
     engines: {node: '>=6'}
@@ -1962,6 +1972,11 @@ packages:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
     dev: true
 
+  /ignore@5.2.0:
+    resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}
+    engines: {node: '>= 4'}
+    dev: true
+
   /ignore@5.2.4:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
     engines: {node: '>= 4'}
@@ -2153,6 +2168,10 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /js-sdsl@4.1.5:
+    resolution: {integrity: sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==}
+    dev: true
+
   /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
     dev: true
@@ -2466,16 +2485,16 @@ packages:
       wrappy: 1.0.2
     dev: true
 
-  /optionator@0.9.3:
+  /optionator@0.9.1:
-    resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
+    resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
     engines: {node: '>= 0.8.0'}
     dependencies:
-      '@aashutoshrathi/word-wrap': 1.2.6
       deep-is: 0.1.4
       fast-levenshtein: 2.0.6
       levn: 0.4.1
       prelude-ls: 1.2.1
       type-check: 0.4.0
+      word-wrap: 1.2.3
     dev: true
 
   /p-limit@2.3.0:
@@ -2715,6 +2734,11 @@ packages:
       safe-regex: 1.1.0
     dev: true
 
+  /regexpp@3.2.0:
+    resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
+    engines: {node: '>=8'}
+    dev: true
+
   /require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -3299,6 +3323,11 @@ packages:
       isexe: 2.0.0
     dev: true
 
+  /word-wrap@1.2.3:
+    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /wrap-ansi@7.0.0:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
@@ -3376,7 +3405,3 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
     dev: true
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false

scripts/build/build.mjs

@@ -40,6 +40,8 @@ const nodeCommonOpts = {
     format: "cjs",
     platform: "node",
     target: ["esnext"],
+    minify: true,
+    bundle: true,
     external: ["electron", ...commonOpts.external],
     define: defines,
 };
@@ -48,7 +50,16 @@ const sourceMapFooter = s => watch ? "" : `//# sourceMappingURL=vencord://${s}.j
 const sourcemap = watch ? "inline" : "external";
 
 await Promise.all([
-    // Discord Desktop main & renderer & preload
+    // common preload
+    esbuild.build({
+        ...nodeCommonOpts,
+        entryPoints: ["src/preload.ts"],
+        outfile: "dist/preload.js",
+        footer: { js: "//# sourceURL=VencordPreload\n" + sourceMapFooter("preload") },
+        sourcemap,
+    }),
+
+    // Discord Desktop main & renderer
     esbuild.build({
         ...nodeCommonOpts,
         entryPoints: ["src/main/index.ts"],
@@ -58,7 +69,7 @@ await Promise.all([
         define: {
             ...defines,
             IS_DISCORD_DESKTOP: true,
-            IS_VESKTOP: false
+            IS_VENCORD_DESKTOP: false
         }
     }),
     esbuild.build({
@@ -78,23 +89,11 @@ await Promise.all([
             ...defines,
             IS_WEB: false,
             IS_DISCORD_DESKTOP: true,
-            IS_VESKTOP: false
+            IS_VENCORD_DESKTOP: false
-        }
-    }),
-    esbuild.build({
-        ...nodeCommonOpts,
-        entryPoints: ["src/preload.ts"],
-        outfile: "dist/preload.js",
-        footer: { js: "//# sourceURL=VencordPreload\n" + sourceMapFooter("preload") },
-        sourcemap,
-        define: {
-            ...defines,
-            IS_DISCORD_DESKTOP: true,
-            IS_VESKTOP: false
         }
     }),
 
-    // Vencord Desktop main & renderer & preload
+    // Vencord Desktop main & renderer
     esbuild.build({
         ...nodeCommonOpts,
         entryPoints: ["src/main/index.ts"],
@@ -104,7 +103,7 @@ await Promise.all([
         define: {
             ...defines,
             IS_DISCORD_DESKTOP: false,
-            IS_VESKTOP: true
+            IS_VENCORD_DESKTOP: true
         }
     }),
     esbuild.build({
@@ -124,19 +123,7 @@ await Promise.all([
             ...defines,
             IS_WEB: false,
             IS_DISCORD_DESKTOP: false,
-            IS_VESKTOP: true
+            IS_VENCORD_DESKTOP: true
-        }
-    }),
-    esbuild.build({
-        ...nodeCommonOpts,
-        entryPoints: ["src/preload.ts"],
-        outfile: "dist/vencordDesktopPreload.js",
-        footer: { js: "//# sourceURL=VencordPreload\n" + sourceMapFooter("vencordDesktopPreload") },
-        sourcemap,
-        define: {
-            ...defines,
-            IS_DISCORD_DESKTOP: false,
-            IS_VESKTOP: true
         }
     }),
 ]).catch(err => {

scripts/build/buildWeb.mjs

@@ -45,7 +45,7 @@ const commonOptions = {
         IS_STANDALONE: "true",
         IS_DEV: JSON.stringify(watch),
         IS_DISCORD_DESKTOP: "false",
-        IS_VESKTOP: "false",
+        IS_VENCORD_DESKTOP: "false",
         VERSION: JSON.stringify(VERSION),
         BUILD_TIMESTAMP: Date.now(),
     }

scripts/build/common.mjs

@@ -27,7 +27,6 @@ import { promisify } from "util";
 
 // wtf is this assert syntax
 import PackageJSON from "../../package.json" assert { type: "json" };
-import { getPluginTarget } from "../utils.mjs";
 
 export const VERSION = PackageJSON.version;
 export const BUILD_TIMESTAMP = Date.now();
@@ -82,13 +81,14 @@ export const globPlugins = kind => ({
                     if (file.startsWith("_") || file.startsWith(".")) continue;
                     if (file === "index.ts") continue;
 
-                    const target = getPluginTarget(file);
+                    const fileBits = file.split(".");
-                    if (target) {
+                    if (fileBits.length > 2 && ["ts", "tsx"].includes(fileBits.at(-1))) {
-                        if (target === "dev" && !watch) continue;
+                        const mod = fileBits.at(-2);
-                        if (target === "web" && kind === "discordDesktop") continue;
+                        if (mod === "dev" && !watch) continue;
-                        if (target === "desktop" && kind === "web") continue;
+                        if (mod === "web" && kind === "discordDesktop") continue;
-                        if (target === "discordDesktop" && kind !== "discordDesktop") continue;
+                        if (mod === "desktop" && kind === "web") continue;
-                        if (target === "vencordDesktop" && kind !== "vencordDesktop") continue;
+                        if (mod === "discordDesktop" && kind !== "discordDesktop") continue;
+                        if (mod === "vencordDesktop" && kind !== "vencordDesktop") continue;
                     }
 
                     const mod = `p${i}`;

scripts/generatePluginList.ts

@@ -21,8 +21,6 @@ import { access, readFile } from "fs/promises";
 import { join } from "path";
 import { BigIntLiteral, createSourceFile, Identifier, isArrayLiteralExpression, isCallExpression, isExportAssignment, isIdentifier, isObjectLiteralExpression, isPropertyAccessExpression, isPropertyAssignment, isSatisfiesExpression, isStringLiteral, isVariableStatement, NamedDeclaration, NodeArray, ObjectLiteralExpression, ScriptTarget, StringLiteral, SyntaxKind } from "typescript";
 
-import { getPluginTarget } from "./utils.mjs";
-
 interface Dev {
     name: string;
     id: string;
@@ -153,16 +151,18 @@ async function parseFile(fileName: string) {
                 case "required":
                 case "enabledByDefault":
                     data[key] = value.kind === SyntaxKind.TrueKeyword;
+                    if (!data[key] && value.kind !== SyntaxKind.FalseKeyword) throw fail(`${key} is not a boolean literal`);
                     break;
             }
         }
 
         if (!data.name || !data.description || !data.authors) throw fail("name, description or authors are missing");
 
-        const target = getPluginTarget(fileName);
+        const fileBits = fileName.split(".");
-        if (target) {
+        if (fileBits.length > 2 && ["ts", "tsx"].includes(fileBits.at(-1)!)) {
-            if (!["web", "discordDesktop", "vencordDesktop", "dev"].includes(target)) throw fail(`invalid target ${target}`);
+            const mod = fileBits.at(-2)!;
-            data.target = target as any;
+            if (!["web", "discordDesktop", "vencordDesktop", "dev"].includes(mod)) throw fail(`invalid target ${fileBits.at(-2)}`);
+            data.target = mod as any;
         }
 
         return data;

scripts/generateReport.ts

@@ -263,7 +263,7 @@ function runTime(token: string) {
             for (const id in ids) {
                 const isWasm = await fetch(wreq.p + wreq.u(id))
                     .then(r => r.text())
-                    .then(t => t.includes(".module.wasm") || !t.includes("(this.webpackChunkdiscord_app=this.webpackChunkdiscord_app||[]).push"));
+                    .then(t => t.includes(".module.wasm"));
 
                 if (!isWasm)
                     await wreq.e(id as any);

scripts/header-new.txt

@@ -1,3 +0,0 @@
-Vencord, a Discord client mod
-Copyright (c) {year} {author}
-SPDX-License-Identifier: GPL-3.0-or-later

scripts/header-old.txt

@@ -1,17 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) {year} {author}
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/

scripts/utils.mjs

@@ -1,30 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-/**
- * @param {string} filePath
- * @returns {string | null}
- */
-export function getPluginTarget(filePath) {
-    const pathParts = filePath.split(/[/\\]/);
-    if (/^index\.tsx?$/.test(filePath.at(-1))) pathParts.pop();
-
-    const identifier = pathParts.at(-1).replace(/\.tsx?$/, "");
-    const identiferBits = identifier.split(".");
-    return identiferBits.length === 1 ? null : identiferBits.at(-1);
-}

src/Vencord.ts

@@ -27,7 +27,6 @@ export { PlainSettings, Settings };
 import "./utils/quickCss";
 import "./webpack/patchWebpack";
 
-import { get as dsGet } from "./api/DataStore";
 import { showNotification } from "./api/Notifications";
 import { PlainSettings, Settings } from "./api/Settings";
 import { patches, PMLogger, startAllPlugins } from "./plugins";
@@ -39,22 +38,6 @@ import { onceReady } from "./webpack";
 import { SettingsRouter } from "./webpack/common";
 
 async function syncSettings() {
-    // pre-check for local shared settings
-    if (
-        Settings.cloud.authenticated &&
-        await dsGet("Vencord_cloudSecret") === null // this has been enabled due to local settings share or some other bug
-    ) {
-        // show a notification letting them know and tell them how to fix it
-        showNotification({
-            title: "Cloud Integrations",
-            body: "We've noticed you have cloud integrations enabled in another client! Due to limitations, you will " +
-                "need to re-authenticate to continue using them. Click here to go to the settings page to do so!",
-            color: "var(--yellow-360)",
-            onClick: () => SettingsRouter.open("VencordCloud")
-        });
-        return;
-    }
-
     if (
         Settings.cloud.settingsSync && // if it's enabled
         Settings.cloud.authenticated // if cloud integrations are enabled

src/VencordNative.ts

@@ -1,13 +1,24 @@
 /*
- * Vencord, a Discord client mod
+ * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
+ * Copyright (c) 2022
- * SPDX-License-Identifier: GPL-3.0-or-later
+ *
- */
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
 
 import { IpcEvents } from "@utils/IpcEvents";
 import { IpcRes } from "@utils/types";
 import { ipcRenderer } from "electron";
-import type { UserThemeHeader } from "main/themes";
 
 function invoke<T = any>(event: IpcEvents, ...args: any[]) {
     return ipcRenderer.invoke(event, ...args) as Promise<T>;
@@ -18,14 +29,6 @@ export function sendSync<T = any>(event: IpcEvents, ...args: any[]) {
 }
 
 export default {
-    themes: {
-        uploadTheme: (fileName: string, fileData: string) => invoke<void>(IpcEvents.UPLOAD_THEME, fileName, fileData),
-        deleteTheme: (fileName: string) => invoke<void>(IpcEvents.DELETE_THEME, fileName),
-        getThemesDir: () => invoke<string>(IpcEvents.GET_THEMES_DIR),
-        getThemesList: () => invoke<Array<UserThemeHeader>>(IpcEvents.GET_THEMES_LIST),
-        getThemeData: (fileName: string) => invoke<string | undefined>(IpcEvents.GET_THEME_DATA, fileName)
-    },
-
     updater: {
         getUpdates: () => invoke<IpcRes<Record<"hash" | "author" | "message", string>[]>>(IpcEvents.GET_UPDATES),
         update: () => invoke<IpcRes<boolean>>(IpcEvents.UPDATE),
@@ -47,10 +50,6 @@ export default {
             ipcRenderer.on(IpcEvents.QUICK_CSS_UPDATE, (_, css) => cb(css));
         },
 
-        addThemeChangeListener(cb: () => void) {
-            ipcRenderer.on(IpcEvents.THEME_UPDATE, cb);
-        },
-
         openFile: () => invoke<void>(IpcEvents.OPEN_QUICKCSS),
         openEditor: () => invoke<void>(IpcEvents.OPEN_MONACO_EDITOR),
     },
@@ -59,13 +58,4 @@ export default {
         getVersions: () => process.versions as Partial<NodeJS.ProcessVersions>,
         openExternal: (url: string) => invoke<void>(IpcEvents.OPEN_EXTERNAL, url)
     },
-
-    pluginHelpers: {
-        OpenInApp: {
-            resolveRedirect: (url: string) => invoke<string>(IpcEvents.OPEN_IN_APP__RESOLVE_REDIRECT, url),
-        },
-        VoiceMessages: {
-            readRecording: (path: string) => invoke<Uint8Array | null>(IpcEvents.VOICE_MESSAGES_READ_RECORDING, path),
-        }
-    }
 };

src/api/ComponentUpdater.ts

@@ -16,6 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { classNameFactory } from "@api/Styles";
+import { proxyLazy } from "@utils/lazy";
 
-export const cl = classNameFactory("vc-vmsg-");
+const p = proxyLazy<typeof import("plugins/_api/componentUpdater").default>(() => Vencord.Plugins.plugins.ComponentUpdaterAPI as any);
+
+/**
+ * Rerender a specific message
+ * @param messageId The id of the message to rerender
+ */
+export function updateMessageComponent(messageId: string) {
+    p.forceUpdaters.get(messageId)?.();
+}

src/api/DataStore/index.ts

@@ -1,4 +1,4 @@
-/* eslint-disable simple-header/header */
+/* eslint-disable header/header */
 
 /*!
  * idb-keyval v6.2.0

src/api/Settings.ts

@@ -34,7 +34,6 @@ export interface Settings {
     useQuickCss: boolean;
     enableReactDevtools: boolean;
     themeLinks: string[];
-    enabledThemes: string[];
     frameless: boolean;
     transparent: boolean;
     winCtrlQ: boolean;
@@ -69,7 +68,6 @@ const DefaultSettings: Settings = {
     autoUpdateNotification: true,
     useQuickCss: true,
     themeLinks: [],
-    enabledThemes: [],
     enableReactDevtools: false,
     frameless: false,
     transparent: false,
@@ -109,7 +107,7 @@ const saveSettingsOnFrequentAction = debounce(async () => {
     }
 }, 60_000);
 
-type SubscriptionCallback = ((newValue: any, path: string) => void) & { _paths?: Array<string>; };
+type SubscriptionCallback = ((newValue: any, path: string) => void) & { _path?: string; };
 const subscriptions = new Set<SubscriptionCallback>();
 
 const proxyCache = {} as Record<string, any>;
@@ -166,7 +164,7 @@ function makeProxy(settings: any, root = settings, path = ""): Settings {
             const setPath = `${path}${path && "."}${p}`;
             delete proxyCache[setPath];
             for (const subscription of subscriptions) {
-                if (!subscription._paths || subscription._paths.includes(setPath)) {
+                if (!subscription._path || subscription._path === setPath) {
                     subscription(v, setPath);
                 }
             }
@@ -237,7 +235,7 @@ type ResolvePropDeep<T, P> = P extends "" ? T :
 export function addSettingsListener<Path extends keyof Settings>(path: Path, onUpdate: (newValue: Settings[Path], path: Path) => void): void;
 export function addSettingsListener<Path extends string>(path: Path, onUpdate: (newValue: Path extends "" ? any : ResolvePropDeep<Settings, Path>, path: Path extends "" ? string : Path) => void): void;
 export function addSettingsListener(path: string, onUpdate: (newValue: any, path: string) => void) {
-    ((onUpdate as SubscriptionCallback)._paths ??= []).push(path);
+    (onUpdate as SubscriptionCallback)._path = path;
     subscriptions.add(onUpdate);
 }
 

src/api/Styles.ts

@@ -141,7 +141,7 @@ export const compileStyle = (style: Style) => {
  */
 export const classNameToSelector = (name: string, prefix = "") => name.split(" ").map(n => `.${prefix}${n}`).join("");
 
-type ClassNameFactoryArg = string | string[] | Record<string, unknown> | false | null | undefined | 0 | "";
+type ClassNameFactoryArg = string | string[] | Record<string, unknown>;
 /**
  * @param prefix The prefix to add to each class, defaults to `""`
  * @returns A classname generator function
@@ -154,9 +154,9 @@ type ClassNameFactoryArg = string | string[] | Record<string, unknown> | false |
 export const classNameFactory = (prefix: string = "") => (...args: ClassNameFactoryArg[]) => {
     const classNames = new Set<string>();
     for (const arg of args) {
-        if (arg && typeof arg === "string") classNames.add(arg);
+        if (typeof arg === "string") classNames.add(arg);
         else if (Array.isArray(arg)) arg.forEach(name => classNames.add(name));
-        else if (arg && typeof arg === "object") Object.entries(arg).forEach(([name, value]) => value && classNames.add(name));
+        else if (typeof arg === "object") Object.entries(arg).forEach(([name, value]) => value && classNames.add(name));
     }
     return Array.from(classNames, name => prefix + name).join(" ");
 };

src/api/index.ts

@@ -18,6 +18,7 @@
 
 import * as $Badges from "./Badges";
 import * as $Commands from "./Commands";
+import * as $ComponentUpdater from "./ComponentUpdater";
 import * as $ContextMenu from "./ContextMenu";
 import * as $DataStore from "./DataStore";
 import * as $MemberListDecorators from "./MemberListDecorators";
@@ -109,3 +110,8 @@ export const Notifications = $Notifications;
  * An api allowing you to patch and add/remove items to/from context menus
  */
 export const ContextMenu = $ContextMenu;
+
+/**
+ * An api allowing you to update/rerender components
+ */
+export const ComponentUpdater = $ComponentUpdater;

src/components/Icons.tsx

@@ -190,16 +190,3 @@ export function ImageInvisible(props: IconProps) {
         </Icon>
     );
 }
-
-export function Microphone(props: IconProps) {
-    return (
-        <Icon
-            {...props}
-            className={classes(props.className, "vc-microphone")}
-            viewBox="0 0 24 24"
-        >
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M14.99 11C14.99 12.66 13.66 14 12 14C10.34 14 9 12.66 9 11V5C9 3.34 10.34 2 12 2C13.66 2 15 3.34 15 5L14.99 11ZM12 16.1C14.76 16.1 17.3 14 17.3 11H19C19 14.42 16.28 17.24 13 17.72V21H11V17.72C7.72 17.23 5 14.41 5 11H6.7C6.7 14 9.24 16.1 12 16.1ZM12 4C11.2 4 11 4.66667 11 5V11C11 11.3333 11.2 12 12 12C12.8 12 13 11.3333 13 11V5C13 4.66667 12.8 4 12 4Z" fill="currentColor" />
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M14.99 11C14.99 12.66 13.66 14 12 14C10.34 14 9 12.66 9 11V5C9 3.34 10.34 2 12 2C13.66 2 15 3.34 15 5L14.99 11ZM12 16.1C14.76 16.1 17.3 14 17.3 11H19C19 14.42 16.28 17.24 13 17.72V22H11V17.72C7.72 17.23 5 14.41 5 11H6.7C6.7 14 9.24 16.1 12 16.1Z" fill="currentColor" />
-        </Icon >
-    );
-}

src/components/PluginSettings/PluginModal.tsx

@@ -226,7 +226,7 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
                         </Forms.FormSection>
                     </div>
                 )}
-                <Forms.FormSection className={Margins.bottom16}>
+                <Forms.FormSection>
                     <Forms.FormTitle tag="h3">Settings</Forms.FormTitle>
                     {renderSettings()}
                 </Forms.FormSection>

src/components/PluginSettings/components/SettingBooleanComponent.tsx

@@ -16,9 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { wordsFromCamel, wordsToTitle } from "@utils/text";
 import { PluginOptionBoolean } from "@utils/types";
-import { Forms, React, Switch } from "@webpack/common";
+import { Forms, React, Select } from "@webpack/common";
 
 import { ISettingElementProps } from ".";
 
@@ -32,6 +31,11 @@ export function SettingBooleanComponent({ option, pluginSettings, definedSetting
         onError(error !== null);
     }, [error]);
 
+    const options = [
+        { label: "Enabled", value: true, default: def === true },
+        { label: "Disabled", value: false, default: typeof def === "undefined" || def === false },
+    ];
+
     function handleChange(newValue: boolean): void {
         const isValid = option.isValid?.call(definedSettings, newValue) ?? true;
         if (typeof isValid === "string") setError(isValid);
@@ -45,17 +49,18 @@ export function SettingBooleanComponent({ option, pluginSettings, definedSetting
 
     return (
         <Forms.FormSection>
-            <Switch
+            <Forms.FormTitle>{option.description}</Forms.FormTitle>
-                value={state}
+            <Select
-                onChange={handleChange}
+                isDisabled={option.disabled?.call(definedSettings) ?? false}
-                note={option.description}
+                options={options}
-                disabled={option.disabled?.call(definedSettings) ?? false}
+                placeholder={option.placeholder ?? "Select an option"}
+                maxVisibleItems={5}
+                closeOnSelect={true}
+                select={handleChange}
+                isSelected={v => v === state}
+                serialize={v => String(v)}
                 {...option.componentProps}
-                hideBorder
+            />
-                style={{ marginBottom: "0.5em" }}
-            >
-                {wordsToTitle(wordsFromCamel(id))}
-            </Switch>
             {error && <Forms.FormText style={{ color: "var(--text-danger)" }}>{error}</Forms.FormText>}
         </Forms.FormSection>
     );

src/components/PluginSettings/index.tsx

@@ -22,8 +22,10 @@ import * as DataStore from "@api/DataStore";
 import { showNotice } from "@api/Notices";
 import { Settings, useSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
+import { Flex } from "@components/Flex";
+import { Badge } from "@components/PluginSettings/components";
 import PluginModal from "@components/PluginSettings/PluginModal";
-import { AddonCard } from "@components/VencordSettings/AddonCard";
+import { Switch } from "@components/Switch";
 import { SettingsTab } from "@components/VencordSettings/shared";
 import { ChangeList } from "@utils/ChangeList";
 import { Logger } from "@utils/Logger";
@@ -150,31 +152,31 @@ function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, onMouseLe
     }
 
     return (
-        <AddonCard
+        <Flex className={cl("card", { "card-disabled": disabled })} flexDirection="column" onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave}>
-            name={plugin.name}
+            <div className={cl("card-header")}>
-            description={plugin.description}
+                <Text variant="text-md/bold" className={cl("name")}>
-            isNew={isNew}
+                    {plugin.name}{isNew && <Badge text="NEW" color="#ED4245" />}
-            enabled={isEnabled()}
+                </Text>
-            setEnabled={toggleEnabled}
-            disabled={disabled}
-            onMouseEnter={onMouseEnter}
-            onMouseLeave={onMouseLeave}
-            infoButton={
                 <button role="switch" onClick={() => openModal()} className={classes(ButtonClasses.button, cl("info-button"))}>
                     {plugin.options
                         ? <CogWheel />
                         : <InfoIcon width="24" height="24" />}
                 </button>
-            }
+                <Switch
-        />
+                    checked={isEnabled()}
+                    onChange={toggleEnabled}
+                    disabled={disabled}
+                />
+            </div>
+            <Text className={cl("note")} variant="text-sm/normal">{plugin.description}</Text>
+        </Flex >
     );
 }
 
 const enum SearchStatus {
     ALL,
     ENABLED,
-    DISABLED,
+    DISABLED
-    NEW
 }
 
 export default function PluginSettings() {
@@ -227,7 +229,6 @@ export default function PluginSettings() {
         const enabled = settings.plugins[plugin.name]?.enabled;
         if (enabled && searchValue.status === SearchStatus.DISABLED) return false;
         if (!enabled && searchValue.status === SearchStatus.ENABLED) return false;
-        if (searchValue.status === SearchStatus.NEW && !newPlugins?.includes(plugin.name)) return false;
         if (!searchValue.value.length) return true;
 
         const v = searchValue.value.toLowerCase();
@@ -320,8 +321,7 @@ export default function PluginSettings() {
                         options={[
                             { label: "Show All", value: SearchStatus.ALL, default: true },
                             { label: "Show Enabled", value: SearchStatus.ENABLED },
-                            { label: "Show Disabled", value: SearchStatus.DISABLED },
+                            { label: "Show Disabled", value: SearchStatus.DISABLED }
-                            { label: "Show New", value: SearchStatus.NEW }
                         ]}
                         serialize={String}
                         select={onStatusChange}

src/components/PluginSettings/styles.css

@@ -23,6 +23,38 @@
     grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
 }
 
+.vc-plugins-card {
+    background-color: var(--background-secondary-alt);
+    color: var(--interactive-active);
+    border-radius: 8px;
+    display: block;
+    height: 100%;
+    padding: 12px;
+    width: 100%;
+    transition: 0.1s ease-out;
+    transition-property: box-shadow, transform, background, opacity;
+}
+
+.vc-plugins-card-disabled {
+    opacity: 0.6;
+}
+
+.vc-plugins-card:hover {
+    background-color: var(--background-tertiary);
+    transform: translateY(-1px);
+    box-shadow: var(--elevation-high);
+}
+
+.vc-plugins-card-header {
+    margin-top: auto;
+    display: flex;
+    width: 100%;
+    justify-content: flex-end;
+    height: 1.5rem;
+    align-items: center;
+    gap: 8px;
+}
+
 .vc-plugins-info-button {
     height: 24px;
     width: 24px;
@@ -54,6 +86,27 @@
     text-align: center;
 }
 
+.vc-plugins-note {
+    height: 36px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    line-clamp: 2;
+    -webkit-box-orient: vertical;
+    /* stylelint-disable-next-line property-no-unknown */
+    box-orient: vertical;
+}
+
+.vc-plugins-name {
+    display: flex;
+    width: 100%;
+    align-items: center;
+    flex-grow: 1;
+    gap: 8px;
+    cursor: "default";
+}
+
 .vc-plugins-dep-name {
     margin: 0 auto;
 }

src/components/VencordSettings/AddonCard.tsx

@@ -1,77 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import "./addonCard.css";
-
-import { classNameFactory } from "@api/Styles";
-import { Badge } from "@components/Badge";
-import { Switch } from "@components/Switch";
-import { Text } from "@webpack/common";
-import type { MouseEventHandler, ReactNode } from "react";
-
-const cl = classNameFactory("vc-addon-");
-
-interface Props {
-    name: ReactNode;
-    description: ReactNode;
-    enabled: boolean;
-    setEnabled: (enabled: boolean) => void;
-    disabled?: boolean;
-    isNew?: boolean;
-    onMouseEnter?: MouseEventHandler<HTMLDivElement>;
-    onMouseLeave?: MouseEventHandler<HTMLDivElement>;
-
-    infoButton?: ReactNode;
-    footer?: ReactNode;
-    author?: ReactNode;
-}
-
-export function AddonCard({ disabled, isNew, name, infoButton, footer, author, enabled, setEnabled, description, onMouseEnter, onMouseLeave }: Props) {
-    return (
-        <div
-            className={cl("card", { "card-disabled": disabled })}
-            onMouseEnter={onMouseEnter}
-            onMouseLeave={onMouseLeave}
-        >
-            <div className={cl("header")}>
-                <div className={cl("name-author")}>
-                    <Text variant="text-md/bold" className={cl("name")}>
-                        {name}{isNew && <Badge text="NEW" color="#ED4245" />}
-                    </Text>
-                    {!!author && (
-                        <Text variant="text-md/normal" className={cl("author")}>
-                            {author}
-                        </Text>
-                    )}
-                </div>
-
-                {infoButton}
-
-                <Switch
-                    checked={enabled}
-                    onChange={setEnabled}
-                    disabled={disabled}
-                />
-            </div>
-
-            <Text className={cl("note")} variant="text-sm/normal">{description}</Text>
-
-            {footer}
-        </div>
-    );
-}

src/components/VencordSettings/CloudTab.tsx

@@ -86,7 +86,7 @@ function SettingsSyncSection() {
                 <Button
                     size={Button.Sizes.SMALL}
                     disabled={!sectionEnabled}
-                    onClick={() => putCloudSettings(true)}
+                    onClick={() => putCloudSettings()}
                 >Sync to Cloud</Button>
                 <Tooltip text="This will overwrite your local settings with the ones on the cloud. Use wisely!">
                     {({ onMouseLeave, onMouseEnter }) => (

src/components/VencordSettings/ThemesTab.tsx

@@ -17,35 +17,16 @@
 */
 
 import { useSettings } from "@api/Settings";
-import { classNameFactory } from "@api/Styles";
-import { Flex } from "@components/Flex";
 import { Link } from "@components/Link";
 import { Margins } from "@utils/margins";
-import { classes } from "@utils/misc";
-import { showItemInFolder } from "@utils/native";
 import { useAwaiter } from "@utils/react";
-import { findByCodeLazy, findByPropsLazy, findLazy } from "@webpack";
+import { findLazy } from "@webpack";
-import { Button, Card, FluxDispatcher, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
+import { Card, Forms, React, TextArea } from "@webpack/common";
-import { UserThemeHeader } from "main/themes";
-import type { ComponentType, Ref, SyntheticEvent } from "react";
 
-import { AddonCard } from "./AddonCard";
 import { SettingsTab, wrapTab } from "./shared";
 
-type FileInput = ComponentType<{
-    ref: Ref<HTMLInputElement>;
-    onChange: (e: SyntheticEvent<HTMLInputElement>) => void;
-    multiple?: boolean;
-    filters?: { name?: string; extensions: string[]; }[];
-}>;
-
-const InviteActions = findByPropsLazy("resolveInvite");
-const TrashIcon = findByCodeLazy("M5 6.99902V18.999C5 20.101 5.897 20.999");
-const FileInput: FileInput = findByCodeLazy("activateUploadDialogue=");
 const TextAreaProps = findLazy(m => typeof m.textarea === "string");
 
-const cl = classNameFactory("vc-settings-theme-");
-
 function Validator({ link }: { link: string; }) {
     const [res, err, pending] = useAwaiter(() => fetch(link).then(res => {
         if (res.status > 300) throw `${res.status} ${res.statusText}`;
@@ -94,191 +75,10 @@ function Validators({ themeLinks }: { themeLinks: string[]; }) {
     );
 }
 
-interface ThemeCardProps {
-    theme: UserThemeHeader;
-    enabled: boolean;
-    onChange: (enabled: boolean) => void;
-    onDelete: () => void;
-}
-
-function ThemeCard({ theme, enabled, onChange, onDelete }: ThemeCardProps) {
-    return (
-        <AddonCard
-            name={theme.name}
-            description={theme.description}
-            author={theme.author}
-            enabled={enabled}
-            setEnabled={onChange}
-            infoButton={
-                IS_WEB && (
-                    <div style={{ cursor: "pointer", color: "var(--status-danger" }} onClick={onDelete}>
-                        <TrashIcon />
-                    </div>
-                )
-            }
-            footer={
-                <Flex flexDirection="row" style={{ gap: "0.2em" }}>
-                    {!!theme.website && <Link href={theme.website}>Website</Link>}
-                    {!!(theme.website && theme.invite) && " • "}
-                    {!!theme.invite && (
-                        <Link
-                            href={`https://discord.gg/${theme.invite}`}
-                            onClick={async e => {
-                                e.preventDefault();
-                                const { invite } = await InviteActions.resolveInvite(theme.invite, "Desktop Modal");
-                                if (!invite) return showToast("Invalid or expired invite");
-
-                                FluxDispatcher.dispatch({
-                                    type: "INVITE_MODAL_OPEN",
-                                    invite,
-                                    code: theme.invite,
-                                    context: "APP"
-                                });
-                            }}
-                        >
-                            Discord Server
-                        </Link>
-                    )}
-                </Flex>
-            }
-        />
-    );
-}
-
-enum ThemeTab {
-    LOCAL,
-    ONLINE
-}
-
 function ThemesTab() {
-    const settings = useSettings(["themeLinks", "enabledThemes"]);
+    const settings = useSettings(["themeLinks"]);
+    const [themeText, setThemeText] = React.useState(settings.themeLinks.join("\n"));
 
-    const fileInputRef = useRef<HTMLInputElement>(null);
-    const [currentTab, setCurrentTab] = useState(ThemeTab.LOCAL);
-    const [themeText, setThemeText] = useState(settings.themeLinks.join("\n"));
-    const [userThemes, setUserThemes] = useState<UserThemeHeader[] | null>(null);
-    const [themeDir, , themeDirPending] = useAwaiter(VencordNative.themes.getThemesDir);
-
-    useEffect(() => {
-        refreshLocalThemes();
-    }, []);
-
-    async function refreshLocalThemes() {
-        const themes = await VencordNative.themes.getThemesList();
-        setUserThemes(themes);
-    }
-
-    // When a local theme is enabled/disabled, update the settings
-    function onLocalThemeChange(fileName: string, value: boolean) {
-        if (value) {
-            if (settings.enabledThemes.includes(fileName)) return;
-            settings.enabledThemes = [...settings.enabledThemes, fileName];
-        } else {
-            settings.enabledThemes = settings.enabledThemes.filter(f => f !== fileName);
-        }
-    }
-
-    async function onFileUpload(e: SyntheticEvent<HTMLInputElement>) {
-        e.stopPropagation();
-        e.preventDefault();
-        if (!e.currentTarget?.files?.length) return;
-        const { files } = e.currentTarget;
-
-        const uploads = Array.from(files, file => {
-            const { name } = file;
-            if (!name.endsWith(".css")) return;
-
-            return new Promise<void>((resolve, reject) => {
-                const reader = new FileReader();
-                reader.onload = () => {
-                    VencordNative.themes.uploadTheme(name, reader.result as string)
-                        .then(resolve)
-                        .catch(reject);
-                };
-                reader.readAsText(file);
-            });
-        });
-
-        await Promise.all(uploads);
-        refreshLocalThemes();
-    }
-
-    function renderLocalThemes() {
-        return (
-            <>
-                <Card className="vc-settings-card">
-                    <Forms.FormTitle tag="h5">Find Themes:</Forms.FormTitle>
-                    <div style={{ marginBottom: ".5em", display: "flex", flexDirection: "column" }}>
-                        <Link style={{ marginRight: ".5em" }} href="https://betterdiscord.app/themes">
-                            BetterDiscord Themes
-                        </Link>
-                        <Link href="https://github.com/search?q=discord+theme">GitHub</Link>
-                    </div>
-                    <Forms.FormText>If using the BD site, click on "Download" and place the downloaded .theme.css file into your themes folder.</Forms.FormText>
-                </Card>
-
-                <Forms.FormSection title="Local Themes">
-                    <Card className="vc-settings-quick-actions-card">
-                        <>
-                            {IS_WEB ?
-                                (
-                                    <Button
-                                        size={Button.Sizes.SMALL}
-                                        disabled={themeDirPending}
-                                    >
-                                        Upload Theme
-                                        <FileInput
-                                            ref={fileInputRef}
-                                            onChange={onFileUpload}
-                                            multiple={true}
-                                            filters={[{ extensions: ["*.css"] }]}
-                                        />
-                                    </Button>
-                                ) : (
-                                    <Button
-                                        onClick={() => showItemInFolder(themeDir!)}
-                                        size={Button.Sizes.SMALL}
-                                        disabled={themeDirPending}
-                                    >
-                                        Open Themes Folder
-                                    </Button>
-                                )}
-                            <Button
-                                onClick={refreshLocalThemes}
-                                size={Button.Sizes.SMALL}
-                            >
-                                Load missing Themes
-                            </Button>
-                            <Button
-                                onClick={() => VencordNative.quickCss.openEditor()}
-                                size={Button.Sizes.SMALL}
-                            >
-                                Edit QuickCSS
-                            </Button>
-                        </>
-                    </Card>
-
-                    <div className={cl("grid")}>
-                        {userThemes?.map(theme => (
-                            <ThemeCard
-                                key={theme.fileName}
-                                enabled={settings.enabledThemes.includes(theme.fileName)}
-                                onChange={enabled => onLocalThemeChange(theme.fileName, enabled)}
-                                onDelete={async () => {
-                                    onLocalThemeChange(theme.fileName, false);
-                                    await VencordNative.themes.deleteTheme(theme.fileName);
-                                    refreshLocalThemes();
-                                }}
-                                theme={theme}
-                            />
-                        ))}
-                    </div>
-                </Forms.FormSection>
-            </>
-        );
-    }
-
-    // When the user leaves the online theme textbox, update the settings
     function onBlur() {
         settings.themeLinks = [...new Set(
             themeText
@@ -289,56 +89,42 @@ function ThemesTab() {
         )];
     }
 
-    function renderOnlineThemes() {
-        return (
-            <>
-                <Card className="vc-settings-card vc-text-selectable">
-                    <Forms.FormTitle tag="h5">Paste links to css files here</Forms.FormTitle>
-                    <Forms.FormText>One link per line</Forms.FormText>
-                    <Forms.FormText>Make sure to use direct links to files (raw or github.io)!</Forms.FormText>
-                </Card>
-
-                <Forms.FormSection title="Online Themes" tag="h5">
-                    <TextArea
-                        value={themeText}
-                        onChange={setThemeText}
-                        className={classes(TextAreaProps.textarea, "vc-settings-theme-links")}
-                        placeholder="Theme Links"
-                        spellCheck={false}
-                        onBlur={onBlur}
-                        rows={10}
-                    />
-                    <Validators themeLinks={settings.themeLinks} />
-                </Forms.FormSection>
-            </>
-        );
-    }
-
     return (
         <SettingsTab title="Themes">
-            <TabBar
+            <Card className="vc-settings-card vc-text-selectable">
-                type="top"
+                <Forms.FormTitle tag="h5">Paste links to .theme.css files here</Forms.FormTitle>
-                look="brand"
+                <Forms.FormText>One link per line</Forms.FormText>
-                className="vc-settings-tab-bar"
+                <Forms.FormText><strong>Make sure to use the raw links or github.io links!</strong></Forms.FormText>
-                selectedItem={currentTab}
+                <Forms.FormDivider className={Margins.top8 + " " + Margins.bottom8} />
-                onItemSelect={setCurrentTab}
+                <Forms.FormTitle tag="h5">Find Themes:</Forms.FormTitle>
-            >
+                <div style={{ marginBottom: ".5em" }}>
-                <TabBar.Item
+                    <Link style={{ marginRight: ".5em" }} href="https://betterdiscord.app/themes">
-                    className="vc-settings-tab-bar-item"
+                        BetterDiscord Themes
-                    id={ThemeTab.LOCAL}
+                    </Link>
-                >
+                    <Link href="https://github.com/search?q=discord+theme">GitHub</Link>
-                    Local Themes
+                </div>
-                </TabBar.Item>
+                <Forms.FormText>If using the BD site, click on "Source" somewhere below the Download button</Forms.FormText>
-                <TabBar.Item
+                <Forms.FormText>In the GitHub repository of your theme, find X.theme.css, click on it, then click the "Raw" button</Forms.FormText>
-                    className="vc-settings-tab-bar-item"
+                <Forms.FormText>
-                    id={ThemeTab.ONLINE}
+                    If the theme has configuration that requires you to edit the file:
-                >
+                    <ul>
-                    Online Themes
+                        <li>• Make a <Link href="https://github.com/signup">GitHub</Link> account</li>
-                </TabBar.Item>
+                        <li>• Click the fork button on the top right</li>
-            </TabBar>
+                        <li>• Edit the file</li>
-
+                        <li>• Use the link to your own repository instead</li>
-            {currentTab === ThemeTab.LOCAL && renderLocalThemes()}
+                    </ul>
-            {currentTab === ThemeTab.ONLINE && renderOnlineThemes()}
+                </Forms.FormText>
+            </Card>
+            <Forms.FormTitle tag="h5">Themes</Forms.FormTitle>
+            <TextArea
+                value={themeText}
+                onChange={setThemeText}
+                className={`${TextAreaProps.textarea} vc-settings-theme-links`}
+                placeholder="Theme Links"
+                spellCheck={false}
+                onBlur={onBlur}
+            />
+            <Validators themeLinks={settings.themeLinks} />
         </SettingsTab>
     );
 }

src/components/VencordSettings/VencordTab.tsx

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+
 import { openNotificationLogModal } from "@api/Notifications/notificationLog";
 import { Settings, useSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";

src/components/VencordSettings/addonCard.css

@@ -1,63 +0,0 @@
-.vc-addon-card {
-    background-color: var(--background-secondary-alt);
-    color: var(--interactive-active);
-    border-radius: 8px;
-    display: block;
-    height: 100%;
-    padding: 12px;
-    width: 100%;
-    transition: 0.1s ease-out;
-    transition-property: box-shadow, transform, background, opacity;
-}
-
-.vc-addon-card-disabled {
-    opacity: 0.6;
-}
-
-.vc-addon-card:hover {
-    background-color: var(--background-tertiary);
-    transform: translateY(-1px);
-    box-shadow: var(--elevation-high);
-}
-
-.vc-addon-header {
-    margin-top: auto;
-    display: flex;
-    width: 100%;
-    justify-content: flex-end;
-    align-items: center;
-    gap: 8px;
-    margin-bottom: 0.5em;
-}
-
-.vc-addon-note {
-    height: 36px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    line-clamp: 2;
-    -webkit-box-orient: vertical;
-    /* stylelint-disable-next-line property-no-unknown */
-    box-orient: vertical;
-}
-
-.vc-addon-name-author {
-    width: 100%;
-}
-
-.vc-addon-name {
-    display: flex;
-    width: 100%;
-    align-items: center;
-    flex-grow: 1;
-    gap: 8px;
-}
-
-.vc-addon-author {
-    font-size: 0.8em;
-}
-
-.vc-addon-author::before {
-    content: "by ";
-}

src/components/VencordSettings/settingsStyles.css

@@ -1,6 +1,6 @@
 .vc-settings-tab-bar {
     margin-top: 20px;
-    margin-bottom: 10px;
+    margin-bottom: -2px;
     border-bottom: 2px solid var(--background-modifier-accent);
 }
 
@@ -43,7 +43,6 @@
     color: var(--text-normal) !important;
     padding: 0.5em;
     border: 1px solid var(--background-modifier-accent);
-    max-height: unset;
 }
 
 .vc-cloud-settings-sync-grid {

src/components/VencordSettings/shared.tsx

@@ -17,7 +17,6 @@
 */
 
 import "./settingsStyles.css";
-import "./themesStyles.css";
 
 import ErrorBoundary from "@components/ErrorBoundary";
 import { handleComponentFailed } from "@components/handleComponentFailed";

src/components/VencordSettings/themesStyles.css

@@ -1,29 +0,0 @@
-.vc-settings-theme-grid {
-    display: grid;
-    grid-gap: 16px;
-    grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
-}
-
-.vc-settings-theme-card {
-    display: flex;
-    flex-direction: column;
-    background-color: var(--background-secondary-alt);
-    color: var(--interactive-active);
-    border-radius: 8px;
-    padding: 1em;
-    width: 100%;
-    transition: 0.1s ease-out;
-    transition-property: box-shadow, transform, background, opacity;
-}
-
-.vc-settings-theme-card-text {
-    text-overflow: ellipsis;
-    height: 1.2em;
-    margin-bottom: 2px;
-    white-space: nowrap;
-    overflow: hidden;
-}
-
-.vc-settings-theme-author::before {
-    content: "by ";
-}

src/components/monacoWin.html

@@ -5,8 +5,8 @@
         <title>Vencord QuickCSS Editor</title>
         <link
             rel="stylesheet"
-            href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.40.0/min/vs/editor/editor.main.min.css"
+            href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs/editor/editor.main.min.css"
-            integrity="sha512-MOoQ02h80hklccfLrXFYkCzG+WVjORflOp9Zp8dltiaRP+35LYnO4LKOklR64oMGfGgJDLO8WJpkM1o5gZXYZQ=="
+            integrity="sha512-wB3xfL98hWg1bpkVYSyL0js/Jx9s7FsDg9aYO6nOMSJTgPuk/PFqxXQJKKSUjteZjeYrfgo9NFBOA1r9HwDuZw=="
             crossorigin="anonymous"
             referrerpolicy="no-referrer"
         />
@@ -29,8 +29,8 @@
     <body>
         <div id="container"></div>
         <script
-            src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.40.0/min/vs/loader.min.js"
+            src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs/loader.min.js"
-            integrity="sha512-QzMpXeCPciAHP4wbYlV2PYgrQcaEkDQUjzkPU4xnjyVSD9T36/udamxtNBqb4qK4/bMQMPZ8ayrBe9hrGdBFjQ=="
+            integrity="sha512-A+6SvPGkIN9Rf0mUXmW4xh7rDvALXf/f0VtOUiHlDUSPknu2kcfz1KzLpOJyL2pO+nZS13hhIjLqVgiQExLJrw=="
             crossorigin="anonymous"
             referrerpolicy="no-referrer"
         ></script>
@@ -38,7 +38,7 @@
         <script>
             require.config({
                 paths: {
-                    vs: "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.40.0/min/vs",
+                    vs: "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs",
                 },
             });
 

src/globals.d.ts

@@ -36,7 +36,7 @@ declare global {
     export var IS_DEV: boolean;
     export var IS_STANDALONE: boolean;
     export var IS_DISCORD_DESKTOP: boolean;
-    export var IS_VESKTOP: boolean;
+    export var IS_VENCORD_DESKTOP: boolean;
     export var VERSION: string;
     export var BUILD_TIMESTAMP: number;
 
@@ -58,8 +58,8 @@ declare global {
      * If you really must use it, mark your plugin as Desktop App only by naming it Foo.desktop.ts(x)
      */
     export var DiscordNative: any;
-    export var Vesktop: any;
+    export var VencordDesktop: any;
-    export var VesktopNative: any;
+    export var VencordDesktopNative: any;
 
     interface Window {
         webpackChunkdiscord_app: {

src/main/index.ts

@@ -19,32 +19,21 @@
 import { app, protocol, session } from "electron";
 import { join } from "path";
 
-import { ensureSafePath, getSettings } from "./ipcMain";
+import { getSettings } from "./ipcMain";
-import { IS_VANILLA, THEMES_DIR } from "./utils/constants";
+import { IS_VANILLA } from "./utils/constants";
 import { installExt } from "./utils/extensions";
 
-if (IS_VESKTOP || !IS_VANILLA) {
+if (IS_VENCORD_DESKTOP || !IS_VANILLA) {
     app.whenReady().then(() => {
         // Source Maps! Maybe there's a better way but since the renderer is executed
         // from a string I don't think any other form of sourcemaps would work
         protocol.registerFileProtocol("vencord", ({ url: unsafeUrl }, cb) => {
             let url = unsafeUrl.slice("vencord://".length);
             if (url.endsWith("/")) url = url.slice(0, -1);
-            if (url.startsWith("/themes/")) {
-                const theme = url.slice("/themes/".length);
-                const safeUrl = ensureSafePath(THEMES_DIR, theme);
-                if (!safeUrl) {
-                    cb({ statusCode: 403 });
-                    return;
-                }
-                cb(safeUrl.replace(/\?v=\d+$/, ""));
-                return;
-            }
             switch (url) {
                 case "renderer.js.map":
                 case "vencordDesktopRenderer.js.map":
                 case "preload.js.map":
-                case "vencordDesktopPreload.js.map":
                 case "patcher.js.map":
                 case "vencordDesktopMain.js.map":
                     cb(join(__dirname, url));
@@ -86,7 +75,7 @@ if (IS_VESKTOP || !IS_VANILLA) {
                 const csp = parsePolicy(headers[header][0]);
 
                 for (const directive of ["style-src", "connect-src", "img-src", "font-src", "media-src", "worker-src"]) {
-                    csp[directive] = ["*", "blob:", "data:", "vencord:", "'unsafe-inline'"];
+                    csp[directive] = ["*", "blob:", "data:", "'unsafe-inline'"];
                 }
                 // TODO: Restrict this to only imported packages with fixed version.
                 // Perhaps auto generate with esbuild

src/main/ipcMain.ts

@@ -17,58 +17,25 @@
 */
 
 import "./updater";
-import "./ipcPlugins";
 
 import { debounce } from "@utils/debounce";
 import { IpcEvents } from "@utils/IpcEvents";
 import { Queue } from "@utils/Queue";
 import { BrowserWindow, ipcMain, shell } from "electron";
 import { mkdirSync, readFileSync, watch } from "fs";
-import { open, readdir, readFile, writeFile } from "fs/promises";
+import { open, readFile, writeFile } from "fs/promises";
-import { join, normalize } from "path";
+import { join } from "path";
 
 import monacoHtml from "~fileContent/../components/monacoWin.html;base64";
 
-import { getThemeInfo, stripBOM, UserThemeHeader } from "./themes";
+import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE } from "./utils/constants";
-import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE, THEMES_DIR } from "./utils/constants";
-import { makeLinksOpenExternally } from "./utils/externalLinks";
 
 mkdirSync(SETTINGS_DIR, { recursive: true });
-mkdirSync(THEMES_DIR, { recursive: true });
-
-export function ensureSafePath(basePath: string, path: string) {
-    const normalizedBasePath = normalize(basePath);
-    const newPath = join(basePath, path);
-    const normalizedPath = normalize(newPath);
-    return normalizedPath.startsWith(normalizedBasePath) ? normalizedPath : null;
-}
 
 function readCss() {
     return readFile(QUICKCSS_PATH, "utf-8").catch(() => "");
 }
 
-async function listThemes(): Promise<UserThemeHeader[]> {
-    const files = await readdir(THEMES_DIR).catch(() => []);
-
-    const themeInfo: UserThemeHeader[] = [];
-
-    for (const fileName of files) {
-        const data = await getThemeData(fileName).then(stripBOM).catch(() => null);
-        if (!data) continue;
-        const parsed = getThemeInfo(data, fileName);
-        themeInfo.push(parsed);
-    }
-
-    return themeInfo;
-}
-
-function getThemeData(fileName: string) {
-    fileName = fileName.replace(/\?v=\d+$/, "");
-    const safePath = ensureSafePath(THEMES_DIR, fileName);
-    if (!safePath) return Promise.reject(`Unsafe path ${fileName}`);
-    return readFile(safePath, "utf-8");
-}
-
 export function readSettings() {
     try {
         return readFileSync(SETTINGS_FILE, "utf-8");
@@ -107,10 +74,6 @@ ipcMain.handle(IpcEvents.SET_QUICK_CSS, (_, css) =>
     cssWriteQueue.push(() => writeFile(QUICKCSS_PATH, css))
 );
 
-ipcMain.handle(IpcEvents.GET_THEMES_DIR, () => THEMES_DIR);
-ipcMain.handle(IpcEvents.GET_THEMES_LIST, () => listThemes());
-ipcMain.handle(IpcEvents.GET_THEME_DATA, (_, fileName) => getThemeData(fileName));
-
 ipcMain.handle(IpcEvents.GET_SETTINGS_DIR, () => SETTINGS_DIR);
 ipcMain.on(IpcEvents.GET_SETTINGS, e => e.returnValue = readSettings());
 
@@ -126,10 +89,6 @@ export function initIpc(mainWindow: BrowserWindow) {
             mainWindow.webContents.postMessage(IpcEvents.QUICK_CSS_UPDATE, await readCss());
         }, 50));
     });
-
-    watch(THEMES_DIR, { persistent: false }, debounce(() => {
-        mainWindow.webContents.postMessage(IpcEvents.THEME_UPDATE, void 0);
-    }));
 }
 
 ipcMain.handle(IpcEvents.OPEN_MONACO_EDITOR, async () => {
@@ -138,14 +97,11 @@ ipcMain.handle(IpcEvents.OPEN_MONACO_EDITOR, async () => {
         autoHideMenuBar: true,
         darkTheme: true,
         webPreferences: {
-            preload: join(__dirname, IS_DISCORD_DESKTOP ? "preload.js" : "vencordDesktopPreload.js"),
+            preload: join(__dirname, "preload.js"),
             contextIsolation: true,
             nodeIntegration: false,
             sandbox: false
         }
     });
-
-    makeLinksOpenExternally(win);
-
     await win.loadURL(`data:text/html;base64,${monacoHtml}`);
 });

src/main/ipcPlugins.ts

@@ -1,67 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { IpcEvents } from "@utils/IpcEvents";
-import { app, ipcMain } from "electron";
-import { readFile } from "fs/promises";
-import { request } from "https";
-import { basename, normalize } from "path";
-
-// #region OpenInApp
-// These links don't support CORS, so this has to be native
-const validRedirectUrls = /^https:\/\/(spotify\.link|s\.team)\/.+$/;
-
-function getRedirect(url: string) {
-    return new Promise<string>((resolve, reject) => {
-        const req = request(new URL(url), { method: "HEAD" }, res => {
-            resolve(
-                res.headers.location
-                    ? getRedirect(res.headers.location)
-                    : url
-            );
-        });
-        req.on("error", reject);
-        req.end();
-    });
-}
-
-ipcMain.handle(IpcEvents.OPEN_IN_APP__RESOLVE_REDIRECT, async (_, url: string) => {
-    if (!validRedirectUrls.test(url)) return url;
-
-    return getRedirect(url);
-});
-// #endregion
-
-
-// #region VoiceMessages
-ipcMain.handle(IpcEvents.VOICE_MESSAGES_READ_RECORDING, async (_, filePath: string) => {
-    filePath = normalize(filePath);
-    const filename = basename(filePath);
-    const discordBaseDirWithTrailingSlash = normalize(app.getPath("userData") + "/");
-    console.log(filename, discordBaseDirWithTrailingSlash, filePath);
-    if (filename !== "recording.ogg" || !filePath.startsWith(discordBaseDirWithTrailingSlash)) return null;
-
-    try {
-        const buf = await readFile(filePath);
-        return new Uint8Array(buf.buffer);
-    } catch {
-        return null;
-    }
-});
-
-// #endregion

src/main/patcher.ts

@@ -71,7 +71,7 @@ if (!IS_VANILLA) {
         constructor(options: BrowserWindowConstructorOptions) {
             if (options?.webPreferences?.preload && options.title) {
                 const original = options.webPreferences.preload;
-                options.webPreferences.preload = join(__dirname, IS_DISCORD_DESKTOP ? "preload.js" : "vencordDesktopPreload.js");
+                options.webPreferences.preload = join(__dirname, "preload.js");
                 options.webPreferences.sandbox = false;
                 if (settings.frameless) {
                     options.frame = false;

src/main/themes/LICENSE

@@ -1,177 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS

src/main/themes/index.ts

@@ -1,81 +0,0 @@
-/* eslint-disable simple-header/header */
-
-/*!
- * BetterDiscord addon meta parser
- * Copyright 2023 BetterDiscord contributors
- * Copyright 2023 Vendicated and Vencord contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-const splitRegex = /[^\S\r\n]*?\r?(?:\r\n|\n)[^\S\r\n]*?\*[^\S\r\n]?/;
-const escapedAtRegex = /^\\@/;
-
-export interface UserThemeHeader {
-    fileName: string;
-    name: string;
-    author: string;
-    description: string;
-    version?: string;
-    license?: string;
-    source?: string;
-    website?: string;
-    invite?: string;
-}
-
-function makeHeader(fileName: string, opts: Partial<UserThemeHeader> = {}): UserThemeHeader {
-    return {
-        fileName,
-        name: opts.name ?? fileName.replace(/\.css$/i, ""),
-        author: opts.author ?? "Unknown Author",
-        description: opts.description ?? "A Discord Theme.",
-        version: opts.version,
-        license: opts.license,
-        source: opts.source,
-        website: opts.website,
-        invite: opts.invite
-    };
-}
-
-export function stripBOM(fileContent: string) {
-    if (fileContent.charCodeAt(0) === 0xFEFF) {
-        fileContent = fileContent.slice(1);
-    }
-    return fileContent;
-}
-
-export function getThemeInfo(css: string, fileName: string): UserThemeHeader {
-    if (!css) return makeHeader(fileName);
-
-    const block = css.split("/**", 2)?.[1]?.split("*/", 1)?.[0];
-    if (!block) return makeHeader(fileName);
-
-    const header: Partial<UserThemeHeader> = {};
-    let field = "";
-    let accum = "";
-    for (const line of block.split(splitRegex)) {
-        if (line.length === 0) continue;
-        if (line.charAt(0) === "@" && line.charAt(1) !== " ") {
-            header[field] = accum.trim();
-            const l = line.indexOf(" ");
-            field = line.substring(1, l);
-            accum = line.substring(l + 1);
-        }
-        else {
-            accum += " " + line.replace("\\n", "\n").replace(escapedAtRegex, "@");
-        }
-    }
-    header[field] = accum.trim();
-    delete header[""];
-    return makeHeader(fileName, header);
-}

src/main/updater/common.ts

@@ -16,11 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+
 export const VENCORD_FILES = [
     IS_DISCORD_DESKTOP ? "patcher.js" : "vencordDesktopMain.js",
-    IS_DISCORD_DESKTOP ? "preload.js" : "vencordDesktopPreload.js",
+    "preload.js",
     IS_DISCORD_DESKTOP ? "renderer.js" : "vencordDesktopRenderer.js",
-    IS_DISCORD_DESKTOP ? "renderer.css" : "vencordDesktopRenderer.css",
+    "renderer.css"
 ];
 
 export function serializeErrors(func: (...args: any[]) => any) {

src/main/utils/constants.ts

@@ -25,15 +25,13 @@ export const DATA_DIR = process.env.VENCORD_USER_DATA_DIR ?? (
         : join(app.getPath("userData"), "..", "Vencord")
 );
 export const SETTINGS_DIR = join(DATA_DIR, "settings");
-export const THEMES_DIR = join(DATA_DIR, "themes");
 export const QUICKCSS_PATH = join(SETTINGS_DIR, "quickCss.css");
 export const SETTINGS_FILE = join(SETTINGS_DIR, "settings.json");
 export const ALLOWED_PROTOCOLS = [
     "https:",
     "http:",
     "steam:",
-    "spotify:",
+    "spotify:"
-    "com.epicgames.launcher:",
 ];
 
 export const IS_VANILLA = /* @__PURE__ */ process.argv.includes("--vanilla");

src/main/utils/crxToZip.ts

@@ -1,4 +1,4 @@
-/* eslint-disable simple-header/header */
+/* eslint-disable header/header */
 
 /*!
  * crxToZip

src/main/utils/externalLinks.ts

@@ -1,48 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { type BrowserWindow, shell } from "electron";
-
-export function makeLinksOpenExternally(win: BrowserWindow) {
-    win.webContents.setWindowOpenHandler(({ url }) => {
-        switch (url) {
-            case "about:blank":
-            case "https://discord.com/popout":
-            case "https://ptb.discord.com/popout":
-            case "https://canary.discord.com/popout":
-                return { action: "allow" };
-        }
-
-        try {
-            var { protocol } = new URL(url);
-        } catch {
-            return { action: "deny" };
-        }
-
-        switch (protocol) {
-            case "http:":
-            case "https:":
-            case "mailto:":
-            case "steam:":
-            case "spotify:":
-                shell.openExternal(url);
-        }
-
-        return { action: "deny" };
-    });
-}

src/plugins/_api/badges.tsx

@@ -80,8 +80,8 @@ export default definePlugin({
             find: "Messages.PROFILE_USER_BADGES,role:",
             replacement: [
                 {
-                    match: /&&(\i)\.push\(\{id:"premium".+?\}\);/,
+                    match: /(?<=(\i)\.isTryItOutFlow,)(.{0,300})null==\i\?void 0:(\i)\.getBadges\(\)/,
-                    replace: "$&$1.unshift(...Vencord.Api.Badges._getBadges(arguments[0]));",
+                    replace: (_, props, restCode, badgesMod) => `vencordProps=${props},${restCode}Vencord.Api.Badges._getBadges(vencordProps).concat(${badgesMod}?.getBadges()??[])`,
                 },
                 {
                     // alt: "", aria-hidden: false, src: originalSrc

src/plugins/_api/componentUpdater.ts

@@ -17,19 +17,35 @@
 */
 
 import { Devs } from "@utils/constants";
+import { useForceUpdater } from "@utils/react";
 import definePlugin from "@utils/types";
+import { useEffect } from "@webpack/common";
+import { Channel, Message } from "discord-types/general";
+
+const forceUpdaters = new Map<string, () => void>();
+
+function useUpdater(data: { channel: Channel; message: Message; }) {
+    const forceUpdater = useForceUpdater();
+
+    useEffect(() => {
+        forceUpdaters.set(data.message.id, forceUpdater);
+        return () => void forceUpdaters.delete(data.message.id);
+    }, [data.message.id]);
+}
 
 export default definePlugin({
-    name: "SecretRingToneEnabler",
+    name: "ComponentUpdaterAPI",
-    description: "Always play the secret version of the discord ringtone",
+    description: "API to update / force rerender several components, such as messages",
-    authors: [Devs.AndrewDLO],
+    authors: [Devs.Ven],
-    patches: [
+
-        {
+    patches: [{
-            find: "84a1b4e11d634dbfa1e5dd97a96de3ad",
+        find: ".renderContentOnly;",
-            replacement: {
+        replacement: {
-                match: "84a1b4e11d634dbfa1e5dd97a96de3ad.mp3",
+            match: /=(\i)\.renderContentOnly;/,
-                replace: "b9411af07f154a6fef543e7e442e4da9.mp3",
+            replace: "$&$self.useUpdater($1);"
-            },
+        }
-        },
+    }],
-    ],
+
+    useUpdater,
+    forceUpdaters
 });

src/plugins/_api/serverList.ts

@@ -27,8 +27,8 @@ export default definePlugin({
         {
             find: "Messages.DISCODO_DISABLED",
             replacement: {
-                match: /(Messages\.DISCODO_DISABLED.+?return)(\(.{0,75}?tutorialContainer.+?}\))(?=}function)/,
+                match: /(Messages\.DISCODO_DISABLED\);return)(.*?homeIcon.*?)(\}function)/,
-                replace: "$1[$2].concat(Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.Above))"
+                replace: "$1[$2].concat(Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.Above))$3"
             }
         },
         {

src/plugins/_core/noTrack.ts

@@ -22,7 +22,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "NoTrack",
     description: "Disable Discord's tracking ('science'), metrics and Sentry crash reporting",
-    authors: [Devs.Cyn, Devs.Ven, Devs.Nuckyz, Devs.Arrow],
+    authors: [Devs.Cyn, Devs.Ven, Devs.Nuckyz],
     required: true,
     patches: [
         {
@@ -51,13 +51,6 @@ export default definePlugin({
                     replace: "return;"
                 }
             ]
-        },
+        }
-        {
-            find: ".installedLogHooks)",
-            replacement: {
-                match: /if\(\i\.getDebugLogging\(\)&&!\i\.installedLogHooks\)/,
-                replace: "if(false)"
-            }
-        },
     ]
 });

src/plugins/_core/settings.tsx

@@ -19,6 +19,7 @@
 import { addContextMenuPatch } from "@api/ContextMenu";
 import { Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
+import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { React, SettingsRouter } from "@webpack/common";
 
@@ -62,14 +63,19 @@ export default definePlugin({
         replacement: {
             get match() {
                 switch (Settings.plugins.Settings.settingsLocation) {
-                    case "top": return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.USER_SETTINGS\}/;
+                    case "top": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.USER_SETTINGS\}/;
-                    case "aboveNitro": return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.BILLING_SETTINGS\}/;
+                    case "aboveNitro": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.BILLING_SETTINGS\}/;
-                    case "belowNitro": return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.APP_SETTINGS\}/;
+                    case "belowNitro": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.APP_SETTINGS\}/;
-                    case "belowActivity": return /(?<=\{section:(\i)\.ID\.DIVIDER},)\{section:"changelog"/;
+                    case "aboveActivity": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.ACTIVITY_SETTINGS\}/;
-                    case "bottom": return /\{section:(\i)\.ID\.CUSTOM,\s*element:.+?}/;
+                    case "belowActivity": return /(?<=\{section:(.{1,2})\.ID\.DIVIDER},)\{section:"changelog"/;
-                    case "aboveActivity":
+                    case "bottom": return /\{section:(.{1,2})\.ID\.CUSTOM,\s*element:.+?}/;
-                    default:
+                    default: {
-                        return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.ACTIVITY_SETTINGS\}/;
+                        new Logger("Settings").error(
+                            new Error("No switch case matched????? Don't mess with the settings, silly")
+                        );
+                        // matches nothing
+                        return /(?!a)a/;
+                    }
                 }
             },
             replace: "...$self.makeSettingsCategories($1),$&"
@@ -82,50 +88,48 @@ export default definePlugin({
         return [
             {
                 section: ID.HEADER,
-                label: "Vencord",
+                label: "Vencord"
-                className: "vc-settings-header"
             },
             {
                 section: "VencordSettings",
                 label: "Vencord",
-                element: require("@components/VencordSettings/VencordTab").default,
+                element: require("@components/VencordSettings/VencordTab").default
-                className: "vc-settings"
             },
             {
                 section: "VencordPlugins",
                 label: "Plugins",
                 element: require("@components/VencordSettings/PluginsTab").default,
-                className: "vc-plugins"
             },
             {
                 section: "VencordThemes",
                 label: "Themes",
                 element: require("@components/VencordSettings/ThemesTab").default,
-                className: "vc-themes"
             },
             !IS_WEB && {
                 section: "VencordUpdater",
                 label: "Updater",
                 element: require("@components/VencordSettings/UpdaterTab").default,
-                className: "vc-updater"
             },
             {
                 section: "VencordCloud",
                 label: "Cloud",
                 element: require("@components/VencordSettings/CloudTab").default,
-                className: "vc-cloud"
             },
             {
                 section: "VencordSettingsSync",
                 label: "Backup & Restore",
                 element: require("@components/VencordSettings/BackupAndRestoreTab").default,
-                className: "vc-backup-restore"
             },
             IS_DEV && {
                 section: "VencordPatchHelper",
                 label: "Patch Helper",
                 element: require("@components/VencordSettings/PatchHelperTab").default,
-                className: "vc-patch-helper"
+            },
+            // TODO: make this use customSections
+            IS_VENCORD_DESKTOP && {
+                section: "VencordDesktop",
+                label: "Desktop Settings",
+                element: VencordDesktop.Components.Settings,
             },
             ...this.customSections.map(func => func(ID)),
             {
@@ -168,7 +172,7 @@ export default definePlugin({
     get additionalInfo() {
         if (IS_DEV) return " (Dev)";
         if (IS_WEB) return " (Web)";
-        if (IS_VESKTOP) return ` (Vesktop v${VesktopNative.app.getVersion()})`;
+        if (IS_VENCORD_DESKTOP) return ` (VencordDesktop v${VencordDesktopNative.app.getVersion()})`;
         if (IS_STANDALONE) return " (Standalone)";
         return "";
     },

src/plugins/anonymiseFileNames.ts

@@ -26,8 +26,6 @@ const enum Methods {
     Timestamp,
 }
 
-const tarExtMatcher = /\.tar\.\w+$/;
-
 export default definePlugin({
     name: "AnonymiseFileNames",
     authors: [Devs.obscurity],
@@ -69,8 +67,7 @@ export default definePlugin({
 
     anonymise(file: string) {
         let name = "image";
-        const tarMatch = tarExtMatcher.exec(file);
+        const extIdx = file.lastIndexOf(".");
-        const extIdx = tarMatch?.index ?? file.lastIndexOf(".");
         const ext = extIdx !== -1 ? file.slice(extIdx) : "";
 
         switch (Settings.plugins.AnonymiseFileNames.method) {

src/plugins/betterGifAltText.ts

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 
@@ -34,7 +35,7 @@ export default definePlugin({
             },
         },
         {
-            find: ".embedGallerySide",
+            find: 'preload:"none","aria',
             replacement: {
                 match: /(?<==(.{1,3})\.alt.{0,20})\?.{0,5}\.Messages\.GIF/,
                 replace:

src/plugins/biggerStreamPreview/webpack/stores.ts

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+
 import { findStoreLazy } from "@webpack";
 
 import * as t from "./types/stores";

src/plugins/callTimer.tsx

@@ -19,7 +19,6 @@
 import { Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import { useTimer } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
 import { React } from "@webpack/common";
 
@@ -86,10 +85,17 @@ export default definePlugin({
     },
 
     Timer({ channelId }: { channelId: string; }) {
-        const time = useTimer({
+        const [time, setTime] = React.useState(0);
-            deps: [channelId]
+        const startTime = React.useMemo(() => Date.now(), [channelId]);
-        });
 
-        return <p style={{ margin: 0 }}>Connected for <span style={{ fontFamily: "var(--font-code)" }}>{formatDuration(time)}</span></p>;
+        React.useEffect(() => {
+            const interval = setInterval(() => setTime(Date.now() - startTime), 1000);
+            return () => {
+                clearInterval(interval);
+                setTime(0);
+            };
+        }, [channelId]);
+
+        return <p style={{ margin: 0 }}>Connected for {formatDuration(time)}</p>;
     }
 });

src/plugins/clearURLs/defaultRules.ts

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+
 export const defaultRules = [
     "action_object_map",
     "action_type_map",
@@ -134,5 +135,4 @@ export const defaultRules = [
     "utm_campaign",
     "utm_term",
     "si@open.spotify.com",
-    "igshid",
 ];

src/plugins/customRPC.tsx

@@ -23,12 +23,21 @@ import { isTruthy } from "@utils/guards";
 import { useAwaiter } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
 import { filters, findByCodeLazy, findByPropsLazy, mapMangledModuleLazy } from "@webpack";
-import { FluxDispatcher, Forms, GuildStore, React, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common";
+import {
+    FluxDispatcher,
+    Forms,
+    GuildStore,
+    React,
+    SelectedChannelStore,
+    SelectedGuildStore,
+    UserStore
+} from "@webpack/common";
 
 const ActivityComponent = findByCodeLazy("onOpenGameProfile");
 const ActivityClassName = findByPropsLazy("activity", "buttonColor");
 const Colors = findByPropsLazy("profileColors");
 
+// START yoinked from lastfm.tsx
 const assetManager = mapMangledModuleLazy(
     "getAssetImage: size must === [number, number] for Twitch",
     {
@@ -37,7 +46,6 @@ const assetManager = mapMangledModuleLazy(
 );
 
 async function getApplicationAsset(key: string): Promise<string> {
-    if (/https?:\/\/(cdn|media)\.discordapp\.(com|net)\/attachments\//.test(key)) return "mp:" + key.replace(/https?:\/\/(cdn|media)\.discordapp\.(com|net)\//, "");
     return (await assetManager.getAsset(settings.store.appID, [key, undefined]))[0];
 }
 
@@ -63,240 +71,66 @@ interface Activity {
         button_urls?: Array<string>;
     };
     type: ActivityType;
-    url?: string;
     flags: number;
 }
 
 const enum ActivityType {
     PLAYING = 0,
-    STREAMING = 1,
     LISTENING = 2,
     WATCHING = 3,
     COMPETING = 5
 }
+// END
+
+const strOpt = (description: string) => ({
+    type: OptionType.STRING,
+    description,
+    onChange: setRpc
+}) as const;
+
+const numOpt = (description: string) => ({
+    type: OptionType.NUMBER,
+    description,
+    onChange: setRpc
+}) as const;
+
+const choice = (label: string, value: any, _default?: boolean) => ({
+    label,
+    value,
+    default: _default
+}) as const;
+
+const choiceOpt = <T,>(description: string, options: T) => ({
+    type: OptionType.SELECT,
+    description,
+    onChange: setRpc,
+    options
+}) as const;
 
-const enum TimestampMode {
-    NONE,
-    NOW,
-    TIME,
-    CUSTOM,
-}
 
 const settings = definePluginSettings({
-    appID: {
+    appID: strOpt("The ID of the application for the rich presence."),
-        type: OptionType.STRING,
+    appName: strOpt("The name of the presence."),
-        description: "Application ID (required)",
+    details: strOpt("Line 1 of rich presence."),
-        restartNeeded: true,
+    state: strOpt("Line 2 of rich presence."),
-        onChange: setRpc,
+    type: choiceOpt("Type of presence", [
-        isValid: (value: string) => {
+        choice("Playing", ActivityType.PLAYING, true),
-            if (!value) return "Application ID is required.";
+        choice("Listening", ActivityType.LISTENING),
-            if (value && !/^\d+$/.test(value)) return "Application ID must be a number.";
+        choice("Watching", ActivityType.WATCHING),
-            return true;
+        choice("Competing", ActivityType.COMPETING)
-        }
+    ]),
-    },
+    startTime: numOpt("Unix Timestamp for beginning of activity."),
-    appName: {
+    endTime: numOpt("Unix Timestamp for end of activity."),
-        type: OptionType.STRING,
+    imageBig: strOpt("Sets the big image to the specified image."),
-        description: "Application name (required)",
+    imageBigTooltip: strOpt("Sets the tooltip text for the big image."),
-        restartNeeded: true,
+    imageSmall: strOpt("Sets the small image to the specified image."),
-        onChange: setRpc,
+    imageSmallTooltip: strOpt("Sets the tooltip text for the small image."),
-        isValid: (value: string) => {
+    buttonOneText: strOpt("The text for the first button"),
-            if (!value) return "Application name is required.";
+    buttonOneURL: strOpt("The URL for the first button"),
-            if (value.length > 128) return "Application name must be not longer than 128 characters.";
+    buttonTwoText: strOpt("The text for the second button"),
-            return true;
+    buttonTwoURL: strOpt("The URL for the second button")
-        }
-    },
-    details: {
-        type: OptionType.STRING,
-        description: "Details (line 1)",
-        restartNeeded: true,
-        onChange: setRpc,
-        isValid: (value: string) => {
-            if (value && value.length > 128) return "Details (line 1) must be not longer than 128 characters.";
-            return true;
-        }
-    },
-    state: {
-        type: OptionType.STRING,
-        description: "State (line 2)",
-        restartNeeded: true,
-        onChange: setRpc,
-        isValid: (value: string) => {
-            if (value && value.length > 128) return "State (line 2) must be not longer than 128 characters.";
-            return true;
-        }
-    },
-    type: {
-        type: OptionType.SELECT,
-        description: "Activity type",
-        restartNeeded: true,
-        onChange: setRpc,
-        options: [
-            {
-                label: "Playing",
-                value: ActivityType.PLAYING,
-                default: true
-            },
-            {
-                label: "Streaming",
-                value: ActivityType.STREAMING
-            },
-            {
-                label: "Listening",
-                value: ActivityType.LISTENING
-            },
-            {
-                label: "Watching",
-                value: ActivityType.WATCHING
-            },
-            {
-                label: "Competing",
-                value: ActivityType.COMPETING
-            }
-        ]
-    },
-    streamLink: {
-        type: OptionType.STRING,
-        description: "Twitch.tv or Youtube.com link (only for Streaming activity type)",
-        restartNeeded: true,
-        onChange: setRpc,
-        isDisabled: isStreamLinkDisabled,
-        isValid: isStreamLinkValid
-    },
-    timestampMode: {
-        type: OptionType.SELECT,
-        description: "Timestamp mode",
-        restartNeeded: true,
-        onChange: setRpc,
-        options: [
-            {
-                label: "None",
-                value: TimestampMode.NONE,
-                default: true
-            },
-            {
-                label: "Since discord open",
-                value: TimestampMode.NOW
-            },
-            {
-                label: "Same as your current time",
-                value: TimestampMode.TIME
-            },
-            {
-                label: "Custom",
-                value: TimestampMode.CUSTOM
-            }
-        ]
-    },
-    startTime: {
-        type: OptionType.NUMBER,
-        description: "Start timestamp (only for custom timestamp mode)",
-        restartNeeded: true,
-        onChange: setRpc,
-        isDisabled: isTimestampDisabled,
-        isValid: (value: number) => {
-            if (value && value < 0) return "Start timestamp must be greater than 0.";
-            return true;
-        }
-    },
-    endTime: {
-        type: OptionType.NUMBER,
-        description: "End timestamp (only for custom timestamp mode)",
-        restartNeeded: true,
-        onChange: setRpc,
-        isDisabled: isTimestampDisabled,
-        isValid: (value: number) => {
-            if (value && value < 0) return "End timestamp must be greater than 0.";
-            return true;
-        }
-    },
-    imageBig: {
-        type: OptionType.STRING,
-        description: "Big image key",
-        restartNeeded: true,
-        onChange: setRpc,
-        isValid: isImageKeyValid
-    },
-    imageBigTooltip: {
-        type: OptionType.STRING,
-        description: "Big image tooltip",
-        restartNeeded: true,
-        onChange: setRpc,
-        isValid: (value: string) => {
-            if (value && value.length > 128) return "Big image tooltip must be not longer than 128 characters.";
-            return true;
-        }
-    },
-    imageSmall: {
-        type: OptionType.STRING,
-        description: "Small image key",
-        restartNeeded: true,
-        onChange: setRpc,
-        isValid: isImageKeyValid
-    },
-    imageSmallTooltip: {
-        type: OptionType.STRING,
-        description: "Small image tooltip",
-        restartNeeded: true,
-        onChange: setRpc,
-        isValid: (value: string) => {
-            if (value && value.length > 128) return "Small image tooltip must be not longer than 128 characters.";
-            return true;
-        }
-    },
-    buttonOneText: {
-        type: OptionType.STRING,
-        description: "Button 1 text",
-        restartNeeded: true,
-        onChange: setRpc,
-        isValid: (value: string) => {
-            if (value && value.length > 31) return "Button 1 text must be not longer than 31 characters.";
-            return true;
-        }
-    },
-    buttonOneURL: {
-        type: OptionType.STRING,
-        description: "Button 1 URL",
-        restartNeeded: true,
-        onChange: setRpc
-    },
-    buttonTwoText: {
-        type: OptionType.STRING,
-        description: "Button 2 text",
-        restartNeeded: true,
-        onChange: setRpc,
-        isValid: (value: string) => {
-            if (value && value.length > 31) return "Button 2 text must be not longer than 31 characters.";
-            return true;
-        }
-    },
-    buttonTwoURL: {
-        type: OptionType.STRING,
-        description: "Button 2 URL",
-        restartNeeded: true,
-        onChange: setRpc
-    }
 });
 
-function isStreamLinkDisabled(): boolean {
-    return settings.store.type !== ActivityType.STREAMING;
-}
-
-function isStreamLinkValid(): boolean | string {
-    if (settings.store.type === ActivityType.STREAMING && settings.store.streamLink && !/(https?:\/\/(www\.)?(twitch\.tv|youtube\.com)\/\w+)/.test(settings.store.streamLink)) return "Streaming link must be a valid URL.";
-    return true;
-}
-
-function isTimestampDisabled(): boolean {
-    return settings.store.timestampMode !== TimestampMode.CUSTOM;
-}
-
-function isImageKeyValid(value: string) {
-    if (!/https?:\/\//.test(value)) return true;
-    if (/https?:\/\/(?!i\.)?imgur\.com\//.test(value)) return "Imgur link must be a direct link to the image. (e.g. https://i.imgur.com/...)";
-    if (/https?:\/\/(?!media\.)?tenor\.com\//.test(value)) return "Tenor link must be a direct link to the image. (e.g. https://media.tenor.com/...)";
-    return true;
-}
-
 async function createActivity(): Promise<Activity | undefined> {
     const {
         appID,
@@ -304,7 +138,6 @@ async function createActivity(): Promise<Activity | undefined> {
         details,
         state,
         type,
-        streamLink,
         startTime,
         endTime,
         imageBig,
@@ -328,32 +161,13 @@ async function createActivity(): Promise<Activity | undefined> {
         flags: 1 << 0,
     };
 
-    if (type === ActivityType.STREAMING) activity.url = streamLink;
+    if (startTime) {
-
+        activity.timestamps = {
-    switch (settings.store.timestampMode) {
+            start: startTime,
-        case TimestampMode.NOW:
+        };
-            activity.timestamps = {
+        if (endTime) {
-                start: Math.floor(Date.now() / 1000)
+            activity.timestamps.end = endTime;
-            };
+        }
-            break;
-        case TimestampMode.TIME:
-            activity.timestamps = {
-                start: Math.floor(Date.now() / 1000) - (new Date().getHours() * 3600) - (new Date().getMinutes() * 60) - new Date().getSeconds()
-            };
-            break;
-        case TimestampMode.CUSTOM:
-            if (startTime) {
-                activity.timestamps = {
-                    start: startTime,
-                };
-                if (endTime) {
-                    activity.timestamps.end = endTime;
-                }
-            }
-            break;
-        case TimestampMode.NONE:
-        default:
-            break;
     }
 
     if (buttonOneText) {
@@ -373,7 +187,7 @@ async function createActivity(): Promise<Activity | undefined> {
     if (imageBig) {
         activity.assets = {
             large_image: await getApplicationAsset(imageBig),
-            large_text: imageBigTooltip || undefined
+            large_text: imageBigTooltip
         };
     }
 
@@ -381,13 +195,13 @@ async function createActivity(): Promise<Activity | undefined> {
         activity.assets = {
             ...activity.assets,
             small_image: await getApplicationAsset(imageSmall),
-            small_text: imageSmallTooltip || undefined
+            small_text: imageSmallTooltip
         };
     }
 
 
     for (const k in activity) {
-        if (k === "type") continue;
+        if (k === "type") continue; // without type, the presence is considered invalid.
         const v = activity[k];
         if (!v || v.length === 0)
             delete activity[k];
@@ -409,7 +223,7 @@ async function setRpc(disable?: boolean) {
 export default definePlugin({
     name: "CustomRPC",
     description: "Allows you to set a custom rich presence.",
-    authors: [Devs.captain, Devs.AutumnVN],
+    authors: [Devs.captain],
     start: setRpc,
     stop: () => setRpc(true),
     settings,
@@ -418,15 +232,11 @@ export default definePlugin({
         const activity = useAwaiter(createActivity);
         return (
             <>
+                <Forms.FormTitle tag="h2">NOTE:</Forms.FormTitle>
                 <Forms.FormText>
-                    Go to <Link href="https://discord.com/developers/applications">Discord Deverloper Portal</Link> to create an application and
+                    You will need to <Link href="https://discord.com/developers/applications">create an
-                    get the application ID.
+                        application</Link> and
-                </Forms.FormText>
+                    get its ID to use this plugin.
-                <Forms.FormText>
-                    Upload images in the Rich Presence tab to get the image keys.
-                </Forms.FormText>
-                <Forms.FormText>
-                    If you want to use image link, download your image and reupload the image to <Link href="https://imgur.com">Imgur</Link> and get the image link by right-clicking the image and select "Copy image address".
                 </Forms.FormText>
                 <Forms.FormDivider />
                 <div style={{ width: "284px" }} className={Colors.profileColors}>

src/plugins/disableDMCallIdle.ts

@@ -21,7 +21,7 @@ import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "DisableDMCallIdle",
-    description: "Disables automatically getting kicked from a DM voice call after 3 minutes.",
+    description: "Disables automatically getting kicked from a DM voice call after 5 minutes.",
     authors: [Devs.Nuckyz],
     patches: [
         {

src/plugins/experiments.tsx

@@ -75,7 +75,7 @@ export default definePlugin({
             replacement: [
                 {
                     match: /return\s*?(\i)\.hasFlag\((\i\.\i)\.STAFF\)}/,
-                    replace: (_, user, flags) => `return Vencord.Webpack.Common.UserStore.getCurrentUser()?.id===${user}.id||${user}.hasFlag(${flags}.STAFF)}`
+                    replace: (_, user, flags) => `return Vencord.Webpack.Common.UserStore.getCurrentUser().id===${user}.id||${user}.hasFlag(${flags}.STAFF)}`
                 },
                 {
                     match: /hasFreePremium=function\(\){return this.isStaff\(\)\s*?\|\|/,

src/plugins/fakeNitro.ts

@@ -313,7 +313,7 @@ export default definePlugin({
             find: ".Messages.EMOJI_POPOUT_PREMIUM_JOINED_GUILD_DESCRIPTION",
             predicate: () => settings.store.transformEmojis,
             replacement: {
-                match: /((\i)=\i\.node,\i=\i\.expressionSourceGuild)(.+?return )(.{0,450}Messages\.EMOJI_POPOUT_PREMIUM_JOINED_GUILD_DESCRIPTION.+?}\))/,
+                match: /((\i)=\i\.node,\i=\i\.emojiSourceDiscoverableGuild)(.+?return )(.{0,450}Messages\.EMOJI_POPOUT_PREMIUM_JOINED_GUILD_DESCRIPTION.+?}\))/,
                 replace: (_, rest1, node, rest2, reactNode) => `${rest1},fakeNitroNode=${node}${rest2}$self.addFakeNotice("EMOJI",${reactNode},fakeNitroNode.fake)`
             }
         }
@@ -565,11 +565,7 @@ export default definePlugin({
 
         switch (embed.type) {
             case "image": {
-                if (
+                if (!settings.store.transformCompoundSentence && !contentItems.includes(embed.url!) && !contentItems.includes(embed.image!.proxyURL)) return false;
-                    !settings.store.transformCompoundSentence
-                    && !contentItems.includes(embed.url!)
-                    && !contentItems.includes(embed.image?.proxyURL!)
-                ) return false;
 
                 if (settings.store.transformEmojis) {
                     if (fakeNitroEmojiRegex.test(embed.url!)) return true;

src/plugins/favGifSearch.tsx

@@ -1,241 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { definePluginSettings } from "@api/Settings";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
-import { useCallback, useEffect, useRef, useState } from "@webpack/common";
-
-interface SearchBarComponentProps {
-    ref?: React.MutableRefObject<any>;
-    autoFocus: boolean;
-    className: string;
-    size: string;
-    onChange: (query: string) => void;
-    onClear: () => void;
-    query: string;
-    placeholder: string;
-}
-
-type TSearchBarComponent =
-    React.FC<SearchBarComponentProps> & { Sizes: Record<"SMALL" | "MEDIUM" | "LARGE", string>; };
-
-interface Gif {
-    format: number;
-    src: string;
-    width: number;
-    height: number;
-    order: number;
-    url: string;
-}
-
-interface Instance {
-    dead?: boolean;
-    state: {
-        resultType?: string;
-    };
-    props: {
-        favCopy: Gif[],
-
-        favorites: Gif[],
-    },
-    forceUpdate: () => void;
-}
-
-
-const containerClasses: { searchBar: string; } = findByPropsLazy("searchBar", "searchHeader", "gutterSize");
-
-export const settings = definePluginSettings({
-    searchOption: {
-        type: OptionType.SELECT,
-        description: "The part of the url you want to search",
-        options: [
-            {
-                label: "Entire Url",
-                value: "url"
-            },
-            {
-                label: "Path Only (/somegif.gif)",
-                value: "path"
-            },
-            {
-                label: "Host & Path (tenor.com somgif.gif)",
-                value: "hostandpath",
-                default: true
-            }
-        ] as const
-    }
-});
-
-export default definePlugin({
-    name: "FavoriteGifSearch",
-    authors: [Devs.Aria],
-    description: "Adds a search bar for favorite gifs",
-
-    patches: [
-        {
-            find: "renderCategoryExtras",
-            replacement: [
-                {
-                    // https://regex101.com/r/4uHtTE/1
-                    // ($1 renderHeaderContent=function { ... switch (x) ... case FAVORITES:return) ($2) ($3 case default:return r.jsx(($<searchComp>), {...props}))
-                    match: /(renderHeaderContent=function.{1,150}FAVORITES:return)(.{1,150};)(case.{1,200}default:return\(0,\i\.jsx\)\((?<searchComp>\i\.\i))/,
-                    replace: "$1 this.state.resultType === \"Favorites\" ? $self.renderSearchBar(this, $<searchComp>) : $2; $3"
-                },
-                {
-                    // to persist filtered favorites when component re-renders.
-                    // when resizing the window the component rerenders and we loose the filtered favorites and have to type in the search bar to get them again
-                    match: /(,suggestions:\i,favorites:)(\i),/,
-                    replace: "$1$self.getFav($2),favCopy:$2,"
-                }
-
-            ]
-        }
-    ],
-
-    settings,
-
-    getTargetString,
-
-    instance: null as Instance | null,
-    renderSearchBar(instance: Instance, SearchBarComponent: TSearchBarComponent) {
-        this.instance = instance;
-        return (
-            <ErrorBoundary noop={true}>
-                <SearchBar instance={instance} SearchBarComponent={SearchBarComponent} />
-            </ErrorBoundary>
-        );
-    },
-
-    getFav(favorites: Gif[]) {
-        if (!this.instance || this.instance.dead) return favorites;
-        const { favorites: filteredFavorites } = this.instance.props;
-
-        return filteredFavorites != null && filteredFavorites?.length !== favorites.length ? filteredFavorites : favorites;
-
-    }
-});
-
-
-function SearchBar({ instance, SearchBarComponent }: { instance: Instance; SearchBarComponent: TSearchBarComponent; }) {
-    const [query, setQuery] = useState("");
-    const ref = useRef<{ containerRef?: React.MutableRefObject<HTMLDivElement>; } | null>(null);
-
-    const onChange = useCallback((searchQuery: string) => {
-        setQuery(searchQuery);
-        const { props } = instance;
-
-        // return early
-        if (searchQuery === "") {
-            props.favorites = props.favCopy;
-            instance.forceUpdate();
-            return;
-        }
-
-
-        // scroll back to top
-        ref.current?.containerRef?.current
-            .closest("#gif-picker-tab-panel")
-            ?.querySelector("[class|=\"content\"]")
-            ?.firstElementChild?.scrollTo(0, 0);
-
-
-        const result =
-            props.favCopy
-                .map(gif => ({
-                    score: fuzzySearch(searchQuery.toLowerCase(), getTargetString(gif.url ?? gif.src).replace(/(%20|[_-])/g, " ").toLowerCase()),
-                    gif,
-                }))
-                .filter(m => m.score != null) as { score: number; gif: Gif; }[];
-
-        result.sort((a, b) => b.score - a.score);
-        props.favorites = result.map(e => e.gif);
-
-        instance.forceUpdate();
-    }, [instance.state]);
-
-    useEffect(() => {
-        return () => {
-            instance.dead = true;
-        };
-    }, []);
-
-    return (
-        <SearchBarComponent
-            ref={ref}
-            autoFocus={true}
-            className={containerClasses.searchBar}
-            size={SearchBarComponent.Sizes.MEDIUM}
-            onChange={onChange}
-            onClear={() => {
-                setQuery("");
-                if (instance.props.favCopy != null) {
-                    instance.props.favorites = instance.props.favCopy;
-                    instance.forceUpdate();
-                }
-            }}
-            query={query}
-            placeholder="Search Favorite Gifs"
-        />
-    );
-}
-
-
-
-export function getTargetString(urlStr: string) {
-    const url = new URL(urlStr);
-    switch (settings.store.searchOption) {
-        case "url":
-            return url.href;
-        case "path":
-            if (url.host === "media.discordapp.net" || url.host === "tenor.com")
-                // /attachments/899763415290097664/1095711736461537381/attachment-1.gif -> attachment-1.gif
-                // /view/some-gif-hi-24248063 -> some-gif-hi-24248063
-                return url.pathname.split("/").at(-1) ?? url.pathname;
-            return url.pathname;
-        case "hostandpath":
-            if (url.host === "media.discordapp.net" || url.host === "tenor.com")
-                return `${url.host} ${url.pathname.split("/").at(-1) ?? url.pathname}`;
-            return `${url.host} ${url.pathname}`;
-
-        default:
-            return "";
-    }
-}
-
-function fuzzySearch(searchQuery: string, searchString: string) {
-    let searchIndex = 0;
-    let score = 0;
-
-    for (let i = 0; i < searchString.length; i++) {
-        if (searchString[i] === searchQuery[searchIndex]) {
-            score++;
-            searchIndex++;
-        } else {
-            score--;
-        }
-
-        if (searchIndex === searchQuery.length) {
-            return score;
-        }
-    }
-
-    return null;
-}

src/plugins/ignoreActivities.tsx

@@ -45,7 +45,7 @@ function ToggleIconOff() {
             className={RegisteredGamesClasses.overlayToggleIconOff}
             height="24"
             width="24"
-            viewBox="0 2.2 32 26"
+            viewBox="0 0 32 26"
             aria-hidden={true}
             role="img"
         >
@@ -77,7 +77,7 @@ function ToggleIconOn({ forceWhite }: { forceWhite?: boolean; }) {
             className={RegisteredGamesClasses.overlayToggleIconOn}
             height="24"
             width="24"
-            viewBox="0 2.2 32 26"
+            viewBox="0 0 32 26"
         >
             <path
                 className={forceWhite ? "" : RegisteredGamesClasses.fill}
@@ -119,7 +119,7 @@ function ToggleActivityComponentWithBackground({ activity }: { activity: Ignored
     return (
         <div
             className={`${TryItOutClasses.tryItOutBadge} ${BaseShapeRoundClasses.baseShapeRound}`}
-            style={{ padding: "0px 2px", height: 28 }}
+            style={{ padding: "0px 2px" }}
         >
             <ToggleActivityComponent activity={activity} forceWhite={true} />
         </div>
@@ -157,16 +157,10 @@ export default definePlugin({
         },
         {
             find: ".overlayBadge",
-            replacement: [
+            replacement: {
-                {
+                match: /(?<=\(\)\.badgeContainer.+?(\i)\.name}\):null)/,
-                    match: /(?<=\(\)\.badgeContainer,children:).{0,50}?name:(\i)\.name.+?null/,
+                replace: (_, props) => `,$self.renderToggleActivityButton(${props})`
-                    replace: (m, props) => `[${m},$self.renderToggleActivityButton(${props})]`
+            }
-                },
-                {
-                    match: /(?<=\(\)\.badgeContainer,children:).{0,50}?name:(\i\.application)\.name.+?null/,
-                    replace: (m, props) => `${m},$self.renderToggleActivityButton(${props})`
-                }
-            ]
         },
         {
             find: '.displayName="LocalActivityStore"',

src/plugins/imageZoom/components/Magnifier.tsx

@@ -16,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { classNameFactory } from "@api/Styles";
 import { FluxDispatcher, React, useRef, useState } from "@webpack/common";
 
 import { ELEMENT_ID } from "../constants";
@@ -34,8 +33,6 @@ export interface MagnifierProps {
     instance: any;
 }
 
-const cl = classNameFactory("vc-imgzoom-");
-
 export const Magnifier: React.FC<MagnifierProps> = ({ instance, size: initialSize, zoom: initalZoom }) => {
     const [ready, setReady] = useState(false);
 
@@ -159,7 +156,7 @@ export const Magnifier: React.FC<MagnifierProps> = ({ instance, size: initialSiz
 
     return (
         <div
-            className={cl("lens", { "nearest-neighbor": settings.store.nearestNeighbour, square: settings.store.square })}
+            className="vc-imgzoom-lens"
             style={{
                 opacity,
                 width: size.current + "px",

src/plugins/imageZoom/index.tsx

@@ -23,7 +23,7 @@ import { makeRange } from "@components/PluginSettings/components";
 import { Devs } from "@utils/constants";
 import { debounce } from "@utils/debounce";
 import definePlugin, { OptionType } from "@utils/types";
-import { ContextMenu, Menu, React, ReactDOM } from "@webpack/common";
+import { Menu, React, ReactDOM } from "@webpack/common";
 import type { Root } from "react-dom/client";
 
 import { Magnifier, MagnifierProps } from "./components/Magnifier";
@@ -50,18 +50,6 @@ export const settings = definePluginSettings({
         default: true,
     },
 
-    nearestNeighbour: {
-        type: OptionType.BOOLEAN,
-        description: "Use Nearest Neighbour Interpolation when scaling images",
-        default: false,
-    },
-
-    square: {
-        type: OptionType.BOOLEAN,
-        description: "Make the lens square",
-        default: false,
-    },
-
     zoom: {
         description: "Zoom of the lens",
         type: OptionType.SLIDER,
@@ -90,17 +78,9 @@ export const settings = definePluginSettings({
 const imageContextMenuPatch: NavContextMenuPatchCallback = children => () => {
     children.push(
         <Menu.MenuGroup id="image-zoom">
-            <Menu.MenuCheckboxItem
+            {/* thanks SpotifyControls */}
-                id="vc-square"
-                label="Square Lens"
-                checked={settings.store.square}
-                action={() => {
-                    settings.store.square = !settings.store.square;
-                    ContextMenu.close();
-                }}
-            />
             <Menu.MenuControlItem
-                id="vc-zoom"
+                id="zoom"
                 label="Zoom"
                 control={(props, ref) => (
                     <Menu.MenuSliderControl
@@ -114,7 +94,7 @@ const imageContextMenuPatch: NavContextMenuPatchCallback = children => () => {
                 )}
             />
             <Menu.MenuControlItem
-                id="vc-size"
+                id="size"
                 label="Lens Size"
                 control={(props, ref) => (
                     <Menu.MenuSliderControl
@@ -128,7 +108,7 @@ const imageContextMenuPatch: NavContextMenuPatchCallback = children => () => {
                 )}
             />
             <Menu.MenuControlItem
-                id="vc-zoom-speed"
+                id="zoom-speed"
                 label="Zoom Speed"
                 control={(props, ref) => (
                     <Menu.MenuSliderControl

src/plugins/imageZoom/styles.css

@@ -11,14 +11,6 @@
     pointer-events: none;
 }
 
-.vc-imgzoom-square {
-    border-radius: 0;
-}
-
-.vc-imgzoom-nearest-neighbor > img {
-    image-rendering: pixelated; /* https://googlechrome.github.io/samples/image-rendering-pixelated/index.html */
-}
-
 /* make the carousel take up less space so we can click the backdrop and exit out of it */
 [class|="carouselModal"] {
     height: fit-content;

src/plugins/invisibleChat/components/EncryptionModal.tsx

@@ -35,7 +35,7 @@ function EncModal(props: ModalProps) {
     const [password, setPassword] = React.useState("password");
     const [noCover, setNoCover] = React.useState(false);
 
-    const isValid = secret && (noCover || (cover && cover.trim().split(" ").length > 1));
+    const isValid = secret && (noCover || (cover && /\w \w/.test(cover)));
 
     return (
         <ModalRoot {...props}>

src/plugins/invisibleChat/index.tsx

@@ -132,7 +132,7 @@ export default definePlugin({
             find: ".Messages.MESSAGE_EDITED,",
             replacement: {
                 match: /var .,.,.=(.)\.className,.=.\.message,.=.\.children,.=.\.content,.=.\.onUpdate/gm,
-                replace: "try {$1 && $self.INV_REGEX.test($1.message.content) ? $1.content.push($self.indicator()) : null } catch {};$&"
+                replace: "try {$1 && $self.INV_REGEX.test($1.content[0]) ? $1.content.push($self.indicator()) : null } catch {};$&"
             }
         },
         {
@@ -200,11 +200,8 @@ export default definePlugin({
             },
         });
 
-        if (urlCheck?.length) {
+        if (urlCheck?.length)
-            const embed = await this.getEmbed(new URL(urlCheck[0]));
+            message.embeds.push(await this.getEmbed(new URL(urlCheck[0])));
-            if (embed)
-                message.embeds.push(embed);
-        }
 
         this.updateMessage(message);
     },

src/plugins/memberCount.tsx

@@ -52,6 +52,7 @@ function MemberCount() {
     return (
         <Flex id="vc-membercount" style={{
             marginTop: "1em",
+            marginBottom: "-.5em",
             paddingInline: "1em",
             justifyContent: "center",
             alignContent: "center",
@@ -105,7 +106,7 @@ export default definePlugin({
         find: ".isSidebarVisible,",
         replacement: {
             match: /(var (\i)=\i\.className.+?children):\[(\i\.useMemo[^}]+"aria-multiselectable")/,
-            replace: "$1:[$2?.startsWith('members')?$self.render():null,$3"
+            replace: "$1:[$2.startsWith('members')?$self.render():null,$3"
         }
     }],
 

src/plugins/messageLinkEmbeds.tsx

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { updateMessageComponent } from "@api/ComponentUpdater";
 import { addAccessory } from "@api/MessageAccessories";
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
@@ -28,7 +29,6 @@ import { find, findByCode, findByPropsLazy } from "@webpack";
 import {
     Button,
     ChannelStore,
-    FluxDispatcher,
     GuildStore,
     MessageStore,
     Parser,
@@ -93,26 +93,6 @@ const settings = definePluginSettings({
             }
         ]
     },
-    listMode: {
-        description: "Whether to use ID list as blacklist or whitelist",
-        type: OptionType.SELECT,
-        options: [
-            {
-                label: "Blacklist",
-                value: "blacklist",
-                default: true
-            },
-            {
-                label: "Whitelist",
-                value: "whitelist"
-            }
-        ]
-    },
-    idList: {
-        description: "Guild/channel/user IDs to blacklist or whitelist (separate with comma)",
-        type: OptionType.STRING,
-        default: ""
-    },
     clearMessageCache: {
         type: OptionType.COMPONENT,
         description: "Clear the linked message cache",
@@ -237,13 +217,6 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
             continue;
         }
 
-        const { listMode, idList } = settings.store;
-
-        const isListed = [guildID, channelID, message.author.id].some(id => id && idList.includes(id));
-
-        if (listMode === "blacklist" && isListed) continue;
-        if (listMode === "whitelist" && !isListed) continue;
-
         let linkedMessage = messageCache.get(messageID)?.message;
         if (!linkedMessage) {
             linkedMessage ??= MessageStore.getMessage(channelID, messageID);
@@ -255,10 +228,7 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
                 delete msg.interaction;
 
                 messageFetchQueue.push(() => fetchMessage(channelID, messageID)
-                    .then(m => m && FluxDispatcher.dispatch({
+                    .then(m => m && updateMessageComponent(message.id))
-                        type: "MESSAGE_UPDATE",
-                        message: msg
-                    }))
                 );
                 continue;
             }
@@ -362,7 +332,7 @@ function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
 export default definePlugin({
     name: "MessageLinkEmbeds",
     description: "Adds a preview to messages that link another message",
-    authors: [Devs.TheSun, Devs.Ven, Devs.RyanCaoDev],
+    authors: [Devs.TheSun, Devs.Ven],
     dependencies: ["MessageAccessoriesAPI"],
     patches: [
         {
@@ -390,9 +360,7 @@ export default definePlugin({
 
             return (
                 <ErrorBoundary>
-                    <MessageEmbedAccessory
+                    <MessageEmbedAccessory message={props.message} />
-                        message={props.message}
-                    />
                 </ErrorBoundary>
             );
         }, 4 /* just above rich embeds */);

src/plugins/messageLogger/index.tsx

@@ -26,7 +26,7 @@ import { Devs } from "@utils/constants";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { ChannelStore, FluxDispatcher, i18n, Menu, moment, Parser, Timestamp, UserStore } from "@webpack/common";
+import { FluxDispatcher, i18n, Menu, moment, Parser, Timestamp, UserStore } from "@webpack/common";
 
 import overlayStyle from "./deleteStyleOverlay.css?managed";
 import textStyle from "./deleteStyleText.css?managed";
@@ -92,7 +92,7 @@ const patchMessageContextMenu: NavContextMenuPatchCallback = (children, props) =
 export default definePlugin({
     name: "MessageLogger",
     description: "Temporarily logs deleted and edited messages.",
-    authors: [Devs.rushii, Devs.Ven, Devs.AutumnVN],
+    authors: [Devs.rushii, Devs.Ven],
 
     start() {
         addDeleteStyle();
@@ -152,24 +152,14 @@ export default definePlugin({
             type: OptionType.STRING,
             description: "Comma-separated list of user IDs to ignore",
             default: ""
-        },
+        }
-        ignoreChannels: {
-            type: OptionType.STRING,
-            description: "Comma-separated list of channel IDs to ignore",
-            default: ""
-        },
-        ignoreGuilds: {
-            type: OptionType.STRING,
-            description: "Comma-separated list of guild IDs to ignore",
-            default: ""
-        },
     },
 
     handleDelete(cache: any, data: { ids: string[], id: string; mlDeleted?: boolean; }, isBulk: boolean) {
         try {
             if (cache == null || (!isBulk && !cache.has(data.id))) return cache;
 
-            const { ignoreBots, ignoreSelf, ignoreUsers, ignoreChannels, ignoreGuilds } = Settings.plugins.MessageLogger;
+            const { ignoreBots, ignoreSelf, ignoreUsers } = Settings.plugins.MessageLogger;
             const myId = UserStore.getCurrentUser().id;
 
             function mutate(id: string) {
@@ -181,9 +171,7 @@ export default definePlugin({
                     (msg.flags & EPHEMERAL) === EPHEMERAL ||
                     ignoreBots && msg.author?.bot ||
                     ignoreSelf && msg.author?.id === myId ||
-                    ignoreUsers.includes(msg.author?.id) ||
+                    ignoreUsers.includes(msg.author?.id);
-                    ignoreChannels.includes(msg.channel_id) ||
-                    ignoreGuilds.includes(ChannelStore.getChannel(msg.channel_id)?.guild_id);
 
                 if (shouldIgnore) {
                     cache = cache.remove(id);

src/plugins/moyai.ts

@@ -21,7 +21,7 @@ import { makeRange } from "@components/PluginSettings/components/SettingSliderCo
 import { Devs } from "@utils/constants";
 import { sleep } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
-import { RelationshipStore, SelectedChannelStore, UserStore } from "@webpack/common";
+import { SelectedChannelStore, UserStore } from "@webpack/common";
 import { Message, ReactionEmoji } from "discord-types/general";
 
 interface IMessageCreate {
@@ -37,7 +37,6 @@ interface IReactionAdd {
     optimistic: boolean;
     channelId: string;
     messageId: string;
-    messageAuthorId: string;
     userId: "195136840355807232";
     emoji: ReactionEmoji;
 }
@@ -72,11 +71,6 @@ const settings = definePluginSettings({
         description: "Ignore bots",
         type: OptionType.BOOLEAN,
         default: true
-    },
-    ignoreBlocked: {
-        description: "Ignore blocked users",
-        type: OptionType.BOOLEAN,
-        default: true
     }
 });
 
@@ -91,7 +85,6 @@ export default definePlugin({
             if (optimistic || type !== "MESSAGE_CREATE") return;
             if (message.state === "SENDING") return;
             if (settings.store.ignoreBots && message.author?.bot) return;
-            if (settings.store.ignoreBlocked && RelationshipStore.isBlocked(message.author?.id)) return;
             if (!message.content) return;
             if (channelId !== SelectedChannelStore.getChannelId()) return;
 
@@ -103,10 +96,9 @@ export default definePlugin({
             }
         },
 
-        MESSAGE_REACTION_ADD({ optimistic, type, channelId, userId, messageAuthorId, emoji }: IReactionAdd) {
+        MESSAGE_REACTION_ADD({ optimistic, type, channelId, userId, emoji }: IReactionAdd) {
             if (optimistic || type !== "MESSAGE_REACTION_ADD") return;
             if (settings.store.ignoreBots && UserStore.getUser(userId)?.bot) return;
-            if (settings.store.ignoreBlocked && RelationshipStore.isBlocked(messageAuthorId)) return;
             if (channelId !== SelectedChannelStore.getChannelId()) return;
 
             const name = emoji.name.toLowerCase();

src/plugins/muteNewGuild.tsx

@@ -36,7 +36,7 @@ const settings = definePluginSettings({
         description: "Suppress All Role @mentions",
         type: OptionType.BOOLEAN,
         default: true
-    }
+    },
 });
 
 export default definePlugin({
@@ -50,13 +50,6 @@ export default definePlugin({
                 match: /INVITE_ACCEPT_SUCCESS.+?;(\i)=null.+?;/,
                 replace: (m, guildId) => `${m}$self.handleMute(${guildId});`
             }
-        },
-        {
-            find: "{joinGuild:function",
-            replacement: {
-                match: /guildId:(\w+),lurker:(\w+).{0,20}\)}\)\);/,
-                replace: (m, guildId, lurker) => `${m}if(!${lurker})$self.handleMute(${guildId});`
-            }
         }
     ],
     settings,

src/plugins/mutualGroupDMs.tsx

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+
 import { Devs } from "@utils/constants";
 import { isNonNullish } from "@utils/guards";
 import definePlugin from "@utils/types";

src/plugins/noPendingCount.ts

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";

src/plugins/noScreensharePreview.ts

@@ -27,10 +27,10 @@ export default definePlugin({
         {
             find: '("ApplicationStreamPreviewUploadManager")',
             replacement: [
-                String.raw`\i\.\i\.makeChunkedRequest\(`,
+                "\\i\\.default\\.makeChunkedRequest\\(",
-                String.raw`\i\.\i\.post\({url:`
+                "\\i\\.\\i\\.post\\({url:"
             ].map(match => ({
-                match: new RegExp(String.raw`(?=return\[(\d),${match}\i\.\i\.STREAM_PREVIEW.+?}\)\];)`),
+                match: new RegExp(`(?=return\\[(\\d),${match}\\i\\.\\i\\.STREAM_PREVIEW.+?}\\)\\];)`),
                 replace: (_, code) => `return[${code},Promise.resolve({body:"",status:204})];`
             }))
         }

src/plugins/openInApp.ts

@@ -1,147 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { definePluginSettings } from "@api/Settings";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-import { showToast, Toasts } from "@webpack/common";
-import type { MouseEvent } from "react";
-
-const ShortUrlMatcher = /^https:\/\/(spotify\.link|s\.team)\/.+$/;
-const SpotifyMatcher = /^https:\/\/open\.spotify\.com\/(track|album|artist|playlist|user)\/(.+)(?:\?.+?)?$/;
-const SteamMatcher = /^https:\/\/(steamcommunity\.com|(?:help|store)\.steampowered\.com)\/.+$/;
-const EpicMatcher = /^https:\/\/store\.epicgames\.com\/(.+)$/;
-
-const settings = definePluginSettings({
-    spotify: {
-        type: OptionType.BOOLEAN,
-        description: "Open Spotify links in the Spotify app",
-        default: true,
-    },
-    steam: {
-        type: OptionType.BOOLEAN,
-        description: "Open Steam links in the Steam app",
-        default: true,
-    },
-    epic: {
-        type: OptionType.BOOLEAN,
-        description: "Open Epic Games links in the Epic Games Launcher",
-        default: true,
-    }
-});
-
-export default definePlugin({
-    name: "OpenInApp",
-    description: "Open Spotify, Steam and Epic Games URLs in their respective apps instead of your browser",
-    authors: [Devs.Ven],
-    settings,
-
-    patches: [
-        {
-            find: '"MaskedLinkStore"',
-            replacement: {
-                match: /return ((\i)\.apply\(this,arguments\))(?=\}function \i.{0,200}\.trusted)/,
-                replace: "return $self.handleLink(...arguments).then(handled => handled || $1)"
-            }
-        },
-        // Make Spotify profile activity links open in app on web
-        {
-            find: "WEB_OPEN(",
-            predicate: () => !IS_DISCORD_DESKTOP && settings.store.spotify,
-            replacement: {
-                match: /\i\.\i\.isProtocolRegistered\(\)(.{0,100})window.open/g,
-                replace: "true$1VencordNative.native.openExternal"
-            }
-        },
-        {
-            find: ".CONNECTED_ACCOUNT_VIEWED,",
-            replacement: {
-                match: /(?<=href:\i,onClick:function\(\i\)\{)(?=\i=(\i)\.type,.{0,50}CONNECTED_ACCOUNT_VIEWED)/,
-                replace: "$self.handleAccountView(arguments[0],$1.type,$1.id);"
-            }
-        }
-    ],
-
-    async handleLink(data: { href: string; }, event?: MouseEvent) {
-        if (!data) return false;
-
-        let url = data.href;
-        if (!IS_WEB && ShortUrlMatcher.test(url)) {
-            event?.preventDefault();
-            // CORS jumpscare
-            url = await VencordNative.pluginHelpers.OpenInApp.resolveRedirect(url);
-        }
-
-        spotify: {
-            if (!settings.store.spotify) break spotify;
-
-            const match = SpotifyMatcher.exec(url);
-            if (!match) break spotify;
-
-            const [, type, id] = match;
-            VencordNative.native.openExternal(`spotify:${type}:${id}`);
-
-            event?.preventDefault();
-            return true;
-        }
-
-        steam: {
-            if (!settings.store.steam) break steam;
-
-            if (!SteamMatcher.test(url)) break steam;
-
-            VencordNative.native.openExternal(`steam://openurl/${url}`);
-            event?.preventDefault();
-
-            // Steam does not focus itself so show a toast so it's slightly less confusing
-            showToast("Opened link in Steam", Toasts.Type.SUCCESS);
-            return true;
-        }
-
-        epic: {
-            if (!settings.store.epic) break epic;
-
-            const match = EpicMatcher.exec(url);
-            if (!match) break epic;
-
-            VencordNative.native.openExternal(`com.epicgames.launcher://store/${match[1]}`);
-            event?.preventDefault();
-
-            return true;
-        }
-
-        // in case short url didn't end up being something we can handle
-        if (event?.defaultPrevented) {
-            window.open(url, "_blank");
-            return true;
-        }
-
-        return false;
-    },
-
-    handleAccountView(event: { preventDefault(): void; }, platformType: string, userId: string) {
-        if (platformType === "spotify" && settings.store.spotify) {
-            VencordNative.native.openExternal(`spotify:user:${userId}`);
-            event.preventDefault();
-        } else if (platformType === "steam" && settings.store.steam) {
-            VencordNative.native.openExternal(`steam://openurl/https://steamcommunity.com/profiles/${userId}`);
-            showToast("Opened link in Steam", Toasts.Type.SUCCESS);
-            event.preventDefault();
-        }
-    }
-});

src/plugins/pronoundb/components/PronounsChatComponent.tsx

@@ -52,7 +52,7 @@ export function CompactPronounsChatComponentWrapper({ message }: { message: Mess
 }
 
 function PronounsChatComponent({ message }: { message: Message; }) {
-    const [result] = useFormattedPronouns(message.author.id);
+    const result = useFormattedPronouns(message.author.id);
 
     return result
         ? (
@@ -64,7 +64,7 @@ function PronounsChatComponent({ message }: { message: Message; }) {
 }
 
 export function CompactPronounsChatComponent({ message }: { message: Message; }) {
-    const [result] = useFormattedPronouns(message.author.id);
+    const result = useFormattedPronouns(message.author.id);
 
     return result
         ? (

src/plugins/pronoundb/index.ts

@@ -26,11 +26,6 @@ import { CompactPronounsChatComponentWrapper, PronounsChatComponentWrapper } fro
 import { useProfilePronouns } from "./pronoundbUtils";
 import { settings } from "./settings";
 
-const PRONOUN_TOOLTIP_PATCH = {
-    match: /text:(.{0,10}.Messages\.USER_PROFILE_PRONOUNS)(?=,)/,
-    replace: '$& + (typeof vcPronounSource !== "undefined" ? ` (${vcPronounSource})` : "")'
-};
-
 export default definePlugin({
     name: "PronounDB",
     authors: [Devs.Tyman, Devs.TheKodeToad, Devs.Ven],
@@ -55,25 +50,18 @@ export default definePlugin({
         // Patch the profile popout username header to use our pronoun hook instead of Discord's pronouns
         {
             find: ".userTagNoNickname",
-            replacement: [
+            replacement: {
-                {
+                match: /=(\i)\.pronouns/,
-                    match: /,(\i)=(\i)\.pronouns/,
+                replace: "=$self.useProfilePronouns($1.user.id,$1.pronouns)"
-                    replace: ",[$1,vcPronounSource]=$self.useProfilePronouns($2.user.id)"
+            }
-                },
-                PRONOUN_TOOLTIP_PATCH
-            ]
         },
         // Patch the profile modal username header to use our pronoun hook instead of Discord's pronouns
         {
             find: ".USER_PROFILE_ACTIVITY",
-            replacement: [
+            replacement: {
-                {
+                match: /\).showPronouns/,
-                    /* FIXME: old name is getGlobalName, new name is getName. Remove optional Global once stable has also migrated */
+                replace: ").showPronouns||true;const vcPronounce=$self.useProfilePronouns(arguments[0].user.id,arguments[0].displayProfile?.pronouns);if(arguments[0].displayProfile&&vcPronounce)arguments[0].displayProfile.pronouns=vcPronounce"
-                    match: /\.get(?:Global)?Name\(\i\);(?<=displayProfile.{0,200})/,
+            }
-                    replace: "$&const [vcPronounce,vcPronounSource]=$self.useProfilePronouns(arguments[0].user.id,true);if(arguments[0].displayProfile&&vcPronounce)arguments[0].displayProfile.pronouns=vcPronounce;"
-                },
-                PRONOUN_TOOLTIP_PATCH
-            ]
         }
     ],
 

src/plugins/pronoundb/pronoundbUtils.ts

@@ -29,9 +29,6 @@ import { PronounCode, PronounMapping, PronounsResponse } from "./types";
 
 const UserProfileStore = findStoreLazy("UserProfileStore");
 
-type PronounsWithSource = [string | null, string];
-const EmptyPronouns: PronounsWithSource = [null, ""];
-
 export const enum PronounsFormat {
     Lowercase = "LOWERCASE",
     Capitalized = "CAPITALIZED"
@@ -58,59 +55,52 @@ const bulkFetch = debounce(async () => {
     }
 });
 
-function getDiscordPronouns(id: string, useGlobalProfile: boolean = false) {
+function getDiscordPronouns(id: string) {
-    const globalPronouns = UserProfileStore.getUserProfile(id)?.pronouns;
-
-    if (useGlobalProfile) return globalPronouns;
-
     return (
         UserProfileStore.getGuildMemberProfile(id, getCurrentChannel()?.guild_id)?.pronouns
-        || globalPronouns
+        || UserProfileStore.getUserProfile(id)?.pronouns
     );
 }
 
-export function useFormattedPronouns(id: string, useGlobalProfile: boolean = false): PronounsWithSource {
+export function useFormattedPronouns(id: string, discordPronouns: string = getDiscordPronouns(id)): string | null {
-    // Discord is so stupid you can put tons of newlines in pronouns
+    const [result] = useAwaiter(() => fetchPronouns(id, discordPronouns), {
-    const discordPronouns = getDiscordPronouns(id, useGlobalProfile)?.trim().replace(NewLineRe, " ");
+        fallbackValue: getCachedPronouns(id, discordPronouns),
-
-    const [result] = useAwaiter(() => fetchPronouns(id), {
-        fallbackValue: getCachedPronouns(id),
         onError: e => console.error("Fetching pronouns failed: ", e)
     });
 
-    if (settings.store.pronounSource === PronounSource.PreferDiscord && discordPronouns)
-        return [discordPronouns, "Discord"];
-
     if (result && result !== "unspecified")
-        return [formatPronouns(result), "PronounDB"];
+        return Object.hasOwn(PronounMapping, result)
+            ? formatPronouns(result) // PronounDB
+            : result; // Discord
 
-    return [discordPronouns, "Discord"];
+    return null;
 }
 
-export function useProfilePronouns(id: string, useGlobalProfile: boolean = false): PronounsWithSource {
+export function useProfilePronouns(id: string, discordPronouns: string) {
-    const pronouns = useFormattedPronouns(id, useGlobalProfile);
+    const pronouns = useFormattedPronouns(id, discordPronouns);
 
-    if (!settings.store.showInProfile) return EmptyPronouns;
+    if (!settings.store.showInProfile) return null;
-    if (!settings.store.showSelf && id === UserStore.getCurrentUser().id) return EmptyPronouns;
+    if (!settings.store.showSelf && id === UserStore.getCurrentUser().id) return null;
 
     return pronouns;
 }
 
 
-const NewLineRe = /\n+/g;
-
 // Gets the cached pronouns, if you're too impatient for a promise!
-export function getCachedPronouns(id: string): string | null {
+export function getCachedPronouns(id: string, discordPronouns: string): string | null {
+    if (settings.store.pronounSource === PronounSource.PreferDiscord && discordPronouns)
+        return discordPronouns;
+
     const cached = cache[id];
     if (cached && cached !== "unspecified") return cached;
 
-    return cached || null;
+    return discordPronouns || cached || null;
 }
 
 // Fetches the pronouns for one id, returning a promise that resolves if it was cached, or once the request is completed
-export function fetchPronouns(id: string): Promise<string> {
+export function fetchPronouns(id: string, discordPronouns: string): Promise<string> {
     return new Promise(res => {
-        const cached = getCachedPronouns(id);
+        const cached = getCachedPronouns(id, discordPronouns);
         if (cached) return res(cached);
 
         // If there is already a request added, then just add this callback to it

src/plugins/relationshipNotifier/functions.ts

@@ -50,7 +50,7 @@ export async function onRelationshipRemove({ relationship: { type, id } }: Relat
                     () => openUserProfile(user.id)
                 );
             break;
-        case RelationshipType.INCOMING_REQUEST:
+        case RelationshipType.FRIEND_REQUEST:
             if (settings.store.friendRequestCancels)
                 notify(
                     `A friend request from ${getUniqueUsername(user)} has been removed.`,

src/plugins/relationshipNotifier/types.ts

@@ -58,7 +58,5 @@ export const enum ChannelType {
 
 export const enum RelationshipType {
     FRIEND = 1,
-    BLOCKED = 2,
+    FRIEND_REQUEST = 3,
-    INCOMING_REQUEST = 3,
-    OUTGOING_REQUEST = 4,
 }

src/plugins/relationshipNotifier/utils.ts

@@ -80,10 +80,7 @@ export async function syncAndRunChecks() {
 
         if (settings.store.friendRequestCancels && oldFriends?.requests?.length) {
             for (const id of oldFriends.requests) {
-                if (
+                if (friends.requests.includes(id)) continue;
-                    friends.requests.includes(id) ||
-                    [RelationshipType.FRIEND, RelationshipType.BLOCKED, RelationshipType.OUTGOING_REQUEST].includes(RelationshipStore.getRelationshipType(id))
-                ) continue;
 
                 const user = await UserUtils.fetchUser(id).catch(() => void 0);
                 if (user)
@@ -167,7 +164,7 @@ export async function syncFriends() {
             case RelationshipType.FRIEND:
                 friends.friends.push(id);
                 break;
-            case RelationshipType.INCOMING_REQUEST:
+            case RelationshipType.FRIEND_REQUEST:
                 friends.requests.push(id);
                 break;
         }

src/plugins/reviewDB/components/ReviewComponent.tsx

@@ -33,7 +33,7 @@ export default LazyComponent(() => {
     // this is terrible, blame mantika
     const p = filters.byProps;
     const [
-        { cozyMessage, buttons, message, buttonsInner, groupStart },
+        { cozyMessage, buttons, message, groupStart },
         { container, isHeader },
         { avatar, clickable, username, messageContent, wrapper, cozy },
         buttonClasses,
@@ -134,7 +134,7 @@ export default LazyComponent(() => {
                     <div className={classes(container, isHeader, buttons)} style={{
                         padding: "0px",
                     }}>
-                        <div className={classes(buttonClasses.wrapper, buttonsInner)} >
+                        <div className={buttonClasses.wrapper} >
                             <ReportButton onClick={reportRev} />
 
                             {canDeleteReview(review, UserStore.getCurrentUser().id) && (

src/plugins/reviewDB/components/ReviewsView.tsx

@@ -19,7 +19,7 @@
 import { classes } from "@utils/misc";
 import { useAwaiter, useForceUpdater } from "@utils/react";
 import { findByPropsLazy } from "@webpack";
-import { Forms, React, RelationshipStore, UserStore } from "@webpack/common";
+import { Forms, React, UserStore } from "@webpack/common";
 import type { KeyboardEvent } from "react";
 
 import { Review } from "../entities";
@@ -60,9 +60,6 @@ export default function ReviewsView({
         fallbackValue: null,
         deps: [refetchSignal, signal, page],
         onSuccess: data => {
-            if (settings.store.hideBlockedUsers)
-                data!.reviews = data!.reviews?.filter(r => !RelationshipStore.isBlocked(r.sender.discordID));
-
             scrollToTop?.();
             onFetchReviews(data!);
         }

src/plugins/reviewDB/reviewDbApi.ts

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+
 import { Review, ReviewDBUser } from "./entities";
 import { settings } from "./settings";
 import { authorize, showToast } from "./utils";

src/plugins/reviewDB/settings.tsx

@@ -48,11 +48,6 @@ export const settings = definePluginSettings({
         description: "Hide timestamps on reviews",
         default: false,
     },
-    hideBlockedUsers: {
-        type: OptionType.BOOLEAN,
-        description: "Hide reviews from blocked users",
-        default: true,
-    },
     website: {
         type: OptionType.COMPONENT,
         description: "ReviewDB website",

src/plugins/rnnoise.web/icons.tsx

@@ -1,21 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-export const SupressionIcon = ({ enabled }: { enabled: boolean; }) => enabled
-    ? <svg aria-hidden="true" role="img" width="20" height="20" viewBox="0 0 24 24"><path d="M10.889 4C10.889 3.44772 11.3367 3 11.889 3H12.1112C12.6635 3 13.1112 3.44772 13.1112 4V20C13.1112 20.5523 12.6635 21 12.1112 21H11.889C11.3367 21 10.889 20.5523 10.889 20V4Z" fill="currentColor"></path><path d="M6.44439 6.25C6.44439 5.69772 6.89211 5.25 7.44439 5.25H7.66661C8.2189 5.25 8.66661 5.69772 8.66661 6.25V17.75C8.66661 18.3023 8.2189 18.75 7.66661 18.75H7.44439C6.89211 18.75 6.44439 18.3023 6.44439 17.75V6.25Z" fill="currentColor"></path><path d="M3.22222 15.375C3.77451 15.375 4.22222 14.9273 4.22222 14.375L4.22222 9.625C4.22222 9.07272 3.77451 8.625 3.22222 8.625H3C2.44772 8.625 2 9.07272 2 9.625V14.375C2 14.9273 2.44772 15.375 3 15.375H3.22222Z" fill="currentColor"></path><path d="M22.0001 13.25C22.0001 13.8023 21.5523 14.25 21.0001 14.25H20.7778C20.2255 14.25 19.7778 13.8023 19.7778 13.25V10.75C19.7778 10.1977 20.2255 9.75 20.7778 9.75H21.0001C21.5523 9.75 22.0001 10.1977 22.0001 10.75V13.25Z" fill="currentColor"></path><path d="M16.3333 7.5C15.781 7.5 15.3333 7.94772 15.3333 8.5V15.5C15.3333 16.0523 15.781 16.5 16.3333 16.5H16.5555C17.1078 16.5 17.5555 16.0523 17.5555 15.5V8.5C17.5555 7.94772 17.1078 7.5 16.5555 7.5H16.3333Z" fill="currentColor"></path></svg>
-    : <svg aria-hidden="true" role="img" width="20" height="20" viewBox="0 0 48 48"><path d="M30.6666 24.9644L35.1111 20.5199V31C35.1111 32.1046 34.2156 33 33.1111 33H32.6666C31.562 33 30.6666 32.1046 30.6666 31V24.9644Z" fill="currentColor"></path><path d="M26.2224 14.1463V8C26.2224 6.89543 25.327 6 24.2224 6H23.7779C22.6734 6 21.7779 6.89543 21.7779 8V18.5907L26.2224 14.1463Z" fill="currentColor"></path><path d="M21.7779 33.8543L21.9254 33.7056L26.2224 29.4086V40C26.2224 41.1046 25.327 42 24.2224 42H23.7779C22.6734 42 21.7779 41.1046 21.7779 40V33.8543Z" fill="currentColor"></path><path d="M17.3332 23.0354L12.8888 27.4799V12.5C12.8888 11.3954 13.7842 10.5 14.8888 10.5H15.3332C16.4378 10.5 17.3332 11.3954 17.3332 12.5V23.0354Z" fill="currentColor"></path><path d="M8.44445 28.75C8.44445 29.8546 7.54902 30.75 6.44445 30.75H6C4.89543 30.75 4 29.8546 4 28.75V19.25C4 18.1454 4.89543 17.25 6 17.25H6.44445C7.54902 17.25 8.44445 18.1454 8.44445 19.25L8.44445 28.75Z" fill="currentColor"></path><path d="M44.0001 26.5C44.0001 27.6046 43.1047 28.5 42.0001 28.5H41.5557C40.4511 28.5 39.5557 27.6046 39.5557 26.5V21.5C39.5557 20.3954 40.4511 19.5 41.5557 19.5H42.0001C43.1047 19.5 44.0001 20.3954 44.0001 21.5V26.5Z" fill="currentColor"></path><path d="M42 8.54L39.46 6L6 39.46L8.54 42L16.92 33.64L19.38 31.16L22.7 27.84L29.98 20.56L42 8.54Z" fill="currentColor"></path></svg>;

src/plugins/rnnoise.web/index.tsx

@@ -1,249 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import "./styles.css";
-
-import { definePluginSettings } from "@api/Settings";
-import { classNameFactory } from "@api/Styles";
-import { Switch } from "@components/Switch";
-import { loadRnnoise, RnnoiseWorkletNode } from "@sapphi-red/web-noise-suppressor";
-import { Devs } from "@utils/constants";
-import { rnnoiseWasmSrc, rnnoiseWorkletSrc } from "@utils/dependencies";
-import { makeLazy } from "@utils/lazy";
-import { Logger } from "@utils/Logger";
-import { LazyComponent } from "@utils/react";
-import definePlugin from "@utils/types";
-import { findByCode } from "@webpack";
-import { FluxDispatcher, Popout, React } from "@webpack/common";
-import { MouseEvent, ReactNode } from "react";
-
-import { SupressionIcon } from "./icons";
-
-const RNNOISE_OPTION = "RNNOISE";
-
-interface PanelButtonProps {
-    tooltipText: string;
-    icon: () => ReactNode;
-    onClick: (event: MouseEvent<HTMLElement>) => void;
-    tooltipClassName?: string;
-    disabled?: boolean;
-    shouldShow?: boolean;
-}
-const PanelButton = LazyComponent<PanelButtonProps>(() => findByCode("Masks.PANEL_BUTTON"));
-const enum SpinnerType {
-    SpinningCircle = "spinningCircle",
-    ChasingDots = "chasingDots",
-    LowMotion = "lowMotion",
-    PulsingEllipsis = "pulsingEllipsis",
-    WanderingCubes = "wanderingCubes",
-}
-export interface SpinnerProps {
-    type: SpinnerType;
-    animated?: boolean;
-    className?: string;
-    itemClassName?: string;
-}
-const Spinner = LazyComponent<SpinnerProps>(() => findByCode(".spinningCircleInner"));
-
-function createExternalStore<S>(init: () => S) {
-    const subscribers = new Set<() => void>();
-    let state = init();
-
-    return {
-        get: () => state,
-        set: (newStateGetter: (oldState: S) => S) => {
-            state = newStateGetter(state);
-            for (const cb of subscribers) cb();
-        },
-        use: () => {
-            return React.useSyncExternalStore<S>(onStoreChange => {
-                subscribers.add(onStoreChange);
-                return () => subscribers.delete(onStoreChange);
-            }, () => state);
-        },
-    } as const;
-}
-
-const cl = classNameFactory("vc-rnnoise-");
-
-const loadedStore = createExternalStore(() => ({
-    isLoaded: false,
-    isLoading: false,
-    isError: false,
-}));
-const getRnnoiseWasm = makeLazy(() => {
-    loadedStore.set(s => ({ ...s, isLoading: true }));
-    return loadRnnoise({
-        url: rnnoiseWasmSrc(),
-        simdUrl: rnnoiseWasmSrc(true),
-    }).then(buffer => {
-        // Check WASM magic number cus fetch doesnt throw on 4XX or 5XX
-        if (new DataView(buffer.slice(0, 4)).getUint32(0) !== 0x0061736D) throw buffer;
-
-        loadedStore.set(s => ({ ...s, isLoaded: true }));
-        return buffer;
-    }).catch(error => {
-        if (error instanceof ArrayBuffer) error = new TextDecoder().decode(error);
-        logger.error("Failed to load RNNoise WASM:", error);
-        loadedStore.set(s => ({ ...s, isError: true }));
-        return null;
-    }).finally(() => {
-        loadedStore.set(s => ({ ...s, isLoading: false }));
-    });
-});
-
-const logger = new Logger("RNNoise");
-const settings = definePluginSettings({}).withPrivateSettings<{ isEnabled: boolean; }>();
-const setEnabled = (enabled: boolean) => {
-    settings.store.isEnabled = enabled;
-    FluxDispatcher.dispatch({ type: "AUDIO_SET_NOISE_SUPPRESSION", enabled });
-};
-
-function NoiseSupressionPopout() {
-    const { isEnabled } = settings.use();
-    const { isLoading, isError } = loadedStore.use();
-    const isWorking = isEnabled && !isError;
-
-    return <div className={cl("popout")}>
-        <div className={cl("popout-heading")}>
-            <span>Noise Supression</span>
-            <div style={{ flex: 1 }} />
-            {isLoading && <Spinner type={SpinnerType.PulsingEllipsis} />}
-            <Switch checked={isWorking} onChange={setEnabled} disabled={isError} />
-        </div>
-        <div className={cl("popout-desc")}>
-            Enable AI noise suppression! Make some noise&mdash;like becoming an air conditioner, or a vending machine fan&mdash;while speaking. Your friends will hear nothing but your beautiful voice ✨
-        </div>
-    </div>;
-}
-
-export default definePlugin({
-    name: "AI Noise Suppression",
-    description: "Uses an open-source AI model (RNNoise) to remove background noise from your microphone",
-    authors: [Devs.Vap],
-    settings,
-    enabledByDefault: true,
-
-    patches: [
-        {
-            // Pass microphone stream to RNNoise
-            find: "window.webkitAudioContext",
-            replacement: {
-                match: /(?<=\i\.acquire=function\((\i)\)\{return )navigator\.mediaDevices\.getUserMedia\(\1\)(?=\})/,
-                replace: m => `${m}.then(stream => $self.connectRnnoise(stream))`
-            },
-        },
-        {
-            // Noise suppression button in call modal
-            find: "renderNoiseCancellation()",
-            replacement: {
-                match: /(?<=(\i)\.jsxs?.{0,70}children:\[)(?=\i\?\i\.renderNoiseCancellation\(\))/,
-                replace: (_, react) => `${react}.jsx($self.NoiseSupressionButton, {}),`
-            },
-        },
-        {
-            // Give noise suppression component a "shouldShow" prop
-            find: "Masks.PANEL_BUTTON",
-            replacement: {
-                match: /(?<==(\i)\.tooltipForceOpen.{0,100})(?=tooltipClassName:)/,
-                replace: (_, props) => `shouldShow: ${props}.shouldShow,`
-            }
-        },
-        {
-            // Noise suppression option in voice settings
-            find: "Messages.USER_SETTINGS_NOISE_CANCELLATION_KRISP",
-            replacement: [{
-                match: /(?<=(\i)=\i\?\i\.KRISP:\i.{1,20}?;)/,
-                replace: (_, option) => `if ($self.isEnabled()) ${option} = ${JSON.stringify(RNNOISE_OPTION)};`,
-            }, {
-                match: /(?=\i&&(\i)\.push\(\{name:(?:\i\.){1,2}Messages.USER_SETTINGS_NOISE_CANCELLATION_KRISP)/,
-                replace: (_, options) => `${options}.push({ name: "AI (RNNoise)", value: "${RNNOISE_OPTION}" });`,
-            }, {
-                match: /(?<=onChange:function\((\i)\)\{)(?=(?:\i\.){1,2}setNoiseCancellation)/,
-                replace: (_, option) => `$self.setEnabled(${option}.value === ${JSON.stringify(RNNOISE_OPTION)});`,
-            }],
-        },
-    ],
-
-    setEnabled,
-    isEnabled: () => settings.store.isEnabled,
-    async connectRnnoise(stream: MediaStream): Promise<MediaStream> {
-        if (!settings.store.isEnabled) return stream;
-
-        const audioCtx = new AudioContext();
-        await audioCtx.audioWorklet.addModule(rnnoiseWorkletSrc);
-
-        const rnnoiseWasm = await getRnnoiseWasm();
-        if (!rnnoiseWasm) {
-            logger.warn("Failed to load RNNoise, noise suppression won't work");
-            return stream;
-        }
-
-        const rnnoise = new RnnoiseWorkletNode(audioCtx, {
-            wasmBinary: rnnoiseWasm,
-            maxChannels: 1,
-        });
-
-        const source = audioCtx.createMediaStreamSource(stream);
-        source.connect(rnnoise);
-
-        const dest = audioCtx.createMediaStreamDestination();
-        rnnoise.connect(dest);
-
-        // Cleanup
-        const onEnded = () => {
-            rnnoise.disconnect();
-            source.disconnect();
-            audioCtx.close();
-            rnnoise.destroy();
-        };
-        stream.addEventListener("inactive", onEnded, { once: true });
-
-        return dest.stream;
-    },
-    NoiseSupressionButton(): ReactNode {
-        const { isEnabled } = settings.use();
-        const { isLoading, isError } = loadedStore.use();
-
-        return <Popout
-            key="rnnoise-popout"
-            align="center"
-            animation={Popout.Animation.TRANSLATE}
-            autoInvert={true}
-            nudgeAlignIntoViewport={true}
-            position="top"
-            renderPopout={() => <NoiseSupressionPopout />}
-            spacing={8}
-        >
-            {(props, { isShown }) => (
-                <PanelButton
-                    {...props}
-                    tooltipText="Noise Suppression powered by RNNoise"
-                    tooltipClassName={cl("tooltip")}
-                    shouldShow={!isShown}
-                    icon={() => <div style={{
-                        color: isError ? "var(--status-danger)" : "inherit",
-                        opacity: isLoading ? 0.5 : 1,
-                    }}>
-                        <SupressionIcon enabled={isEnabled} />
-                    </div>}
-                />
-            )}
-        </Popout>;
-    },
-});

src/plugins/rnnoise.web/styles.css

@@ -1,29 +0,0 @@
-.vc-rnnoise-popout {
-    background: var(--background-floating);
-    border-radius: 0.25em;
-    padding: 1em;
-    width: 16em;
-}
-
-.vc-rnnoise-popout-heading {
-    color: var(--text-normal);
-    font-weight: 500;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    font-size: 1.1em;
-    margin-bottom: 1em;
-    gap: 0.5em;
-}
-
-.vc-rnnoise-popout-desc {
-    color: var(--text-muted);
-    font-size: 0.9em;
-    display: flex;
-    align-items: center;
-    line-height: 1.5;
-}
-
-.vc-rnnoise-tooltip {
-    text-align: center;
-}

src/plugins/sendTimestamps/index.tsx

@@ -146,7 +146,7 @@ export default definePlugin({
                     <div style={{ display: "flex" }}>
                         <Button
                             aria-haspopup="dialog"
-                            aria-label="Insert Timestamp"
+                            aria-label=""
                             size=""
                             look={ButtonLooks.BLANK}
                             onMouseEnter={onMouseEnter}

src/plugins/shikiCodeblocks/api/shiki.ts

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+
 import { shikiOnigasmSrc, shikiWorkerSrc } from "@utils/dependencies";
 import { WorkerClient } from "@vap/core/ipc";
 import type { IShikiTheme, IThemedToken } from "@vap/shiki";

src/plugins/shikiCodeblocks/previewExample.tsx

@@ -1,4 +1,4 @@
-/* eslint-disable simple-header/header */
+/* eslint-disable header/header */
 import React from "react";
 
 const handleClick = async () =>

src/plugins/showAllMessageButtons.ts

@@ -28,8 +28,8 @@ export default definePlugin({
         {
             find: ".Messages.MESSAGE_UTILITIES_A11Y_LABEL",
             replacement: {
-                // isExpanded: V, (?<=,V = shiftKeyDown && !H...,|;)
+                // isExpanded: V, (?<=,V = shiftKeyDown && !H...;)
-                match: /isExpanded:(\i),(?<=,\1=\i&&(?=(!.+?)[,;]).+?)/,
+                match: /isExpanded:(\i),(?<=,\1=\i&&(!.+);.+?)/,
                 replace: "isExpanded:$2,"
             }
         }

src/plugins/showConnections/index.tsx

@@ -147,13 +147,6 @@ function CompactConnectionComponent({ connection, theme }: { connection: Connect
                         className="vc-user-connection"
                         href={url}
                         target="_blank"
-                        onClick={e => {
-                            if (Vencord.Plugins.isPluginEnabled("OpenInApp")) {
-                                const OpenInApp = Vencord.Plugins.plugins.OpenInApp as any as typeof import("../openInApp").default;
-                                // handleLink will .preventDefault() if applicable
-                                OpenInApp.handleLink(e.currentTarget, e);
-                            }
-                        }}
                     >
                         {img}
                     </a>

src/plugins/showHiddenChannels/index.tsx

@@ -29,7 +29,7 @@ import type { Channel, Role } from "discord-types/general";
 
 import HiddenChannelLockScreen, { setChannelBeginHeaderComponent } from "./components/HiddenChannelLockScreen";
 
-const ChannelListClasses = findByPropsLazy("channelEmoji", "unread", "icon");
+const ChannelListClasses = findByPropsLazy("channelName", "subtitle", "modeMuted", "iconContainer");
 
 export const VIEW_CHANNEL = 1n << 10n;
 const CONNECT = 1n << 20n;
@@ -342,27 +342,32 @@ export default definePlugin({
             ]
         },
         {
-            find: "useNotificationSettingsItem: channel cannot be undefined",
+            find: "Guild voice channel without guild id.",
             replacement: [
                 {
                     // Render our HiddenChannelLockScreen component instead of the main stage channel component
-                    match: /"124px".+?children:(?<=var (\i)=\i\.channel.+?)(?=.{0,20}?}\)}function)/,
+                    match: /Guild voice channel without guild id.+?children:(?<=(\i)\.getGuildId\(\).+?)(?=.{0,20}?}\)}function)/,
                     replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?$self.HiddenChannelLockScreen(${channel}):`
                 },
                 {
                     // Disable useless components for the HiddenChannelLockScreen of stage channels
-                    match: /render(?:BottomLeft|BottomCenter|BottomRight|ChatToasts):(?<=var (\i)=\i\.channel.+?)/g,
+                    match: /render(?!Header).{0,30}?:(?<=(\i)\.getGuildId\(\).+?Guild voice channel without guild id.+?)/g,
                     replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?null:`
                 },
+                // Prevent Discord from replacing our route if we aren't connected to the stage channel
+                {
+                    match: /(?=!\i&&!\i&&!\i.{0,80}?(\i)\.getGuildId\(\).{0,50}?Guild voice channel without guild id)(?<=if\()/,
+                    replace: (_, channel) => `!$self.isHiddenChannel(${channel})&&`
+                },
                 {
                     // Disable gradients for the HiddenChannelLockScreen of stage channels
-                    match: /"124px".+?disableGradients:(?<=(\i)\.getGuildId\(\).+?)/,
+                    match: /Guild voice channel without guild id.+?disableGradients:(?<=(\i)\.getGuildId\(\).+?)/,
                     replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})||`
                 },
                 {
                     // Disable strange styles applied to the header for the HiddenChannelLockScreen of stage channels
-                    match: /"124px".+?style:(?<=(\i)\.getGuildId\(\).+?)/,
+                    match: /Guild voice channel without guild id.+?style:(?<=(\i)\.getGuildId\(\).+?)/,
-                    replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?void 0:`
+                    replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?undefined:`
                 },
                 {
                     // Remove the divider and amount of users in stage channel components for the HiddenChannelLockScreen
@@ -371,7 +376,7 @@ export default definePlugin({
                 },
                 {
                     // Remove the open chat button for the HiddenChannelLockScreen
-                    match: /"recents".+?&&(?=\(.+?channelId:(\i)\.id,showRequestToSpeakSidebar)/,
+                    match: /"recents".+?null,(?=.+?channelId:(\i)\.id,showRequestToSpeakSidebar)/,
                     replace: (m, channel) => `${m}!$self.isHiddenChannel(${channel})&&`
                 }
             ],
@@ -472,7 +477,7 @@ export default definePlugin({
 
     HiddenChannelLockScreen: (channel: any) => <HiddenChannelLockScreen channel={channel} />,
 
-    LockIcon: ErrorBoundary.wrap(() => (
+    LockIcon: () => (
         <svg
             className={ChannelListClasses.icon}
             height="18"
@@ -483,7 +488,7 @@ export default definePlugin({
         >
             <path className="shc-evenodd-fill-current-color" d="M17 11V7C17 4.243 14.756 2 12 2C9.242 2 7 4.243 7 7V11C5.897 11 5 11.896 5 13V20C5 21.103 5.897 22 7 22H17C18.103 22 19 21.103 19 20V13C19 11.896 18.103 11 17 11ZM12 18C11.172 18 10.5 17.328 10.5 16.5C10.5 15.672 11.172 15 12 15C12.828 15 13.5 15.672 13.5 16.5C13.5 17.328 12.828 18 12 18ZM15 11H9V7C9 5.346 10.346 4 12 4C13.654 4 15 5.346 15 7V11Z" />
         </svg>
-    ), { noop: true }),
+    ),
 
     HiddenChannelIcon: ErrorBoundary.wrap(() => (
         <Tooltip text="Hidden Channel">

src/plugins/showMeYourName/index.tsx

@@ -40,11 +40,6 @@ const settings = definePluginSettings({
             { label: "Username only", value: "user" },
         ],
     },
-    displayNames: {
-        type: OptionType.BOOLEAN,
-        description: "Use display names in place of usernames",
-        default: false
-    },
     inReplies: {
         type: OptionType.BOOLEAN,
         default: false,
@@ -55,7 +50,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "ShowMeYourName",
     description: "Display usernames next to nicks, or no nicks at all",
-    authors: [Devs.dzshn, Devs.TheKodeToad],
+    authors: [Devs.dzshn],
     patches: [
         {
             find: ".withMentionPrefix",
@@ -68,11 +63,9 @@ export default definePlugin({
     settings,
 
     renderUsername: ({ author, message, isRepliedMessage, withMentionPrefix }: UsernameProps) => {
+        if (message.interaction) return author?.nick;
         try {
-            let { username } = message.author;
+            const { username } = message.author;
-            if (settings.store.displayNames)
-                username = (message.author as any).globalName || username;
-
             const { nick } = author;
             const prefix = withMentionPrefix ? "@" : "";
             if (username === nick || isRepliedMessage && !settings.store.inReplies)

src/plugins/spotifyControls/PlayerComponent.tsx

@@ -21,8 +21,8 @@ import "./spotifyStyles.css";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { ImageIcon, LinkIcon, OpenExternalIcon } from "@components/Icons";
+import { Link } from "@components/Link";
 import { debounce } from "@utils/debounce";
-import { openImageModal } from "@utils/discord";
 import { classes, copyWithToast } from "@utils/misc";
 import { ContextMenu, FluxDispatcher, Forms, Menu, React, useEffect, useState, useStateFromStores } from "@webpack/common";
 
@@ -231,7 +231,7 @@ function AlbumContextMenu({ track }: { track: Track; }) {
                 id="view-cover"
                 label="View Album Cover"
                 // trolley
-                action={() => openImageModal(track.album.image.url)}
+                action={() => (Vencord.Plugins.plugins.ViewIcons as any).openImage(track.album.image.url)}
                 icon={ImageIcon}
             />
             <Menu.MenuControlItem
@@ -253,16 +253,6 @@ function AlbumContextMenu({ track }: { track: Track; }) {
     );
 }
 
-function makeLinkProps(name: string, condition: unknown, path: string) {
-    if (!condition) return {};
-
-    return {
-        role: "link",
-        onClick: () => SpotifyStore.openExternal(path),
-        onContextMenu: makeContextMenu(name, path)
-    } satisfies React.HTMLAttributes<HTMLElement>;
-}
-
 function Info({ track }: { track: Track; }) {
     const img = track?.album?.image;
 
@@ -298,8 +288,12 @@ function Info({ track }: { track: Track; }) {
                     variant="text-sm/semibold"
                     id={cl("song-title")}
                     className={cl("ellipoverflow")}
+                    role={track.id ? "link" : undefined}
                     title={track.name}
-                    {...makeLinkProps("Song", track.id, `/track/${track.id}`)}
+                    onClick={track.id ? () => {
+                        SpotifyStore.openExternal(`/track/${track.id}`);
+                    } : void 0}
+                    onContextMenu={track.id ? makeContextMenu("Song", `/track/${track.id}`) : void 0}
                 >
                     {track.name}
                 </Forms.FormText>
@@ -308,14 +302,16 @@ function Info({ track }: { track: Track; }) {
                         by&nbsp;
                         {track.artists.map((a, i) => (
                             <React.Fragment key={a.name}>
-                                <span
+                                <Link
                                     className={cl("artist")}
+                                    disabled={!a.id}
+                                    href={`https://open.spotify.com/artist/${a.id}`}
                                     style={{ fontSize: "inherit" }}
                                     title={a.name}
-                                    {...makeLinkProps("Artist", a.id, `/artist/${a.id}`)}
+                                    onContextMenu={makeContextMenu("Artist", `/artist/${a.id}`)}
                                 >
                                     {a.name}
-                                </span>
+                                </Link>
                                 {i !== track.artists.length - 1 && <span className={cl("comma")}>{", "}</span>}
                             </React.Fragment>
                         ))}
@@ -324,15 +320,17 @@ function Info({ track }: { track: Track; }) {
                 {track.album.name && (
                     <Forms.FormText variant="text-sm/normal" className={cl("ellipoverflow")}>
                         on&nbsp;
-                        <span
+                        <Link id={cl("album-title")}
-                            id={cl("album-title")}
+                            href={`https://open.spotify.com/album/${track.album.id}`}
+                            target="_blank"
                             className={cl("album")}
+                            disabled={!track.album.id}
                             style={{ fontSize: "inherit" }}
                             title={track.album.name}
-                            {...makeLinkProps("Album", track.album.id, `/album/${track.album.id}`)}
+                            onContextMenu={makeContextMenu("Album", `/album/${track.album.id}`)}
                         >
                             {track.album.name}
-                        </span>
+                        </Link>
                     </Forms.FormText>
                 )}
             </div>