owo

.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": [
-            "error",
-            {
-                "files": ["scripts/header-new.txt", "scripts/header-old.txt"],
-                "templates": { "author": [".*", "Vendicated and contributors"] }
-            }
+        "header/header": [
+            2,
+            "block",
+            [
+                {
+                    "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

@@ -1,10 +0,0 @@
-name: Blank Issue
-description: Create a blank issue. ALWAYS FIRST USE OUR SUPPORT CHANNEL! ONLY USE THIS FORM IF YOU ARE A CONTRIBUTOR OR WERE TOLD TO DO SO IN THE SUPPORT CHANNEL.
-
-body:
-  - type: textarea
-    id: content
-    attributes:
-      label: Content
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,5 @@
 name: Bug/Crash Report
-description: Create a bug or crash report for Vencord. ALWAYS FIRST USE OUR SUPPORT CHANNEL! ONLY USE THIS FORM IF YOU ARE A CONTRIBUTOR OR WERE TOLD TO DO SO IN THE SUPPORT CHANNEL.
+description: Create a bug or crash report for Vencord
 labels: [bug]
 title: "[Bug] <title>"
 

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,32 @@
+name: Feature Request
+description: Create a feature request for Vencord. To request new plugins, please use the Discussions tab
+labels: [enhancement]
+title: "[Feature Request] <title>"
+
+body:
+  - type: input
+    id: discord
+    attributes:
+      label: Discord Account
+      description: Who on Discord is making this request? Not required but encouraged for easier follow-up
+      placeholder: username#0000
+    validations:
+      required: false
+
+  - type: textarea
+    id: feature-basic-description
+    attributes:
+      label: What is it that you'd like to see?
+      description: Describe the feature you want added as detailed as possible
+      placeholder: I think ... would be a cool feature to add. This would be awesome, thanks!
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: agreement-check
+    attributes:
+      label: Request Agreement
+      description: DO NOT USE THIS TEMPLATE FOR PLUGIN REQUESTS!!! For plugin requests, **use discussions**
+      options:
+        - label: This is not a plugin request
+          required: true

.github/workflows/build.yml

@@ -38,11 +38,11 @@ jobs:
               run: pnpm build --standalone
 
             - name: Generate plugin list
-              run: pnpm generatePluginJson dist/plugins.json dist/plugin-readmes.json
+              run: pnpm generatePluginJson dist/plugins.json
 
             - name: Clean up obsolete files
               run: |
-                  rm -rf dist/*-unpacked dist/monaco Vencord.user.css vencordDesktopRenderer.css vencordDesktopRenderer.css.map
+                  rm -rf dist/*-unpacked Vencord.user.css vencordDesktopRenderer.css vencordDesktopRenderer.css.map
 
             - name: Get some values needed for the release
               id: release_values

CONTRIBUTING.md

@@ -65,7 +65,7 @@ Also pay attention to the following:
     -   Match any but a guaranteed terminating character: `[^;]+`, for example to match the entire assigned value in `var a=b||c||func();`,
         `var .{1,2}=([^;]+);`
     -   If you don't care about that part, just match a bunch of chars: `.{0,50}`, for example to extract the variable "b" in `createElement("div",{a:"foo",c:"bar"},b)`, `createElement\("div".{0,30},(.{1,2})\),`. Note the `.{0,30}`, this is essentially the same as `.+`, but safer as you can't end up accidently eating thousands of characters
--   Additionally, as you might have noticed, all of the above approaches use regex groups (`(...)`) to capture the variable name. You can then use those groups in your replacement to access those variables dynamically
+-   Additionally, as you might have noticed, all of the appove approaches use regex groups (`(...)`) to capture the variable name. You can then use those groups in your replacement to access those variables dynamically
 
 #### "replace"
 

README.md

@@ -4,7 +4,8 @@
 
 The cutest Discord client mod
 
-![image](https://github.com/Vendicated/Vencord/assets/45497981/706722b1-32de-4d99-bee9-93993b504334)
+![](https://user-images.githubusercontent.com/45497981/235015332-0453d3eb-1da6-4601-963e-ef5e454123a1.png)
+*A screenshot of Vencord featuring the [ClearVision-v6 theme](https://github.com/ClearVision/ClearVision-v6) (Vencord does not come with it pre-installed, it is only an example)*
 
 ## Features
 

browser/VencordNativeStub.ts

@@ -19,11 +19,9 @@
 /// <reference path="../src/modules.d.ts" />
 /// <reference path="../src/globals.d.ts" />
 
-import monacoHtmlLocal from "~fileContent/monacoWin.html";
-import monacoHtmlCdn from "~fileContent/../src/main/monacoWin.html";
+import monacoHtml from "~fileContent/../src/components/monacoWin.html";
 import * as DataStore from "../src/api/DataStore";
 import { debounce } from "../src/utils";
-import { EXTENSION_BASE_URL } from "../src/utils/web-metadata";
 import { getTheme, Theme } from "../src/utils/discord";
 import { getThemeInfo } from "../src/main/themes";
 
@@ -48,8 +46,7 @@ window.VencordNative = {
         getThemesList: () => DataStore.entries(themeStore).then(entries =>
             entries.map(([name, css]) => getThemeInfo(css, name.toString()))
         ),
-        getThemeData: (fileName: string) => DataStore.get(fileName, themeStore),
-        getSystemValues: async () => ({}),
+        getThemeData: (fileName: string) => DataStore.get(fileName, themeStore)
     },
 
     native: {
@@ -83,7 +80,6 @@ window.VencordNative = {
                 return;
             }
 
-            win.baseUrl = EXTENSION_BASE_URL;
             win.setCss = setCssDebounced;
             win.getCurrentCss = () => VencordNative.quickCss.get();
             win.getTheme = () =>
@@ -91,7 +87,7 @@ window.VencordNative = {
                     ? "vs-light"
                     : "vs-dark";
 
-            win.document.write(IS_EXTENSION ? monacoHtmlLocal : monacoHtmlCdn);
+            win.document.write(monacoHtml);
         },
     },
 

browser/background.js

@@ -0,0 +1,32 @@
+/**
+ * @template T
+ * @param {T[]} arr
+ * @param {(v: T) => boolean} predicate
+ */
+function removeFirst(arr, predicate) {
+    const idx = arr.findIndex(predicate);
+    if (idx !== -1) arr.splice(idx, 1);
+}
+
+chrome.webRequest.onHeadersReceived.addListener(
+    ({ responseHeaders, type, url }) => {
+        if (!responseHeaders) return;
+
+        if (type === "main_frame") {
+            // In main frame requests, the CSP needs to be removed to enable fetching of custom css
+            // as desired by the user
+            removeFirst(responseHeaders, h => h.name.toLowerCase() === "content-security-policy");
+        } else if (type === "stylesheet" && url.startsWith("https://raw.githubusercontent.com/")) {
+            // Most users will load css from GitHub, but GitHub doesn't set the correct content type,
+            // so we fix it here
+            removeFirst(responseHeaders, h => h.name.toLowerCase() === "content-type");
+            responseHeaders.push({
+                name: "Content-Type",
+                value: "text/css"
+            });
+        }
+        return { responseHeaders };
+    },
+    { urls: ["https://raw.githubusercontent.com/*", "*://*.discord.com/*"], types: ["main_frame", "stylesheet"] },
+    ["blocking", "responseHeaders"]
+);

browser/content.js

@@ -4,11 +4,6 @@ if (typeof browser === "undefined") {
 
 const script = document.createElement("script");
 script.src = browser.runtime.getURL("dist/Vencord.js");
-script.id = "vencord-script";
-Object.assign(script.dataset, {
-    extensionBaseUrl: browser.runtime.getURL(""),
-    version: browser.runtime.getManifest().version
-});
 
 const style = document.createElement("link");
 style.type = "text/css";

browser/manifest.json

@@ -28,7 +28,7 @@
 
     "web_accessible_resources": [
         {
-            "resources": ["dist/*", "third-party/*"],
+            "resources": ["dist/Vencord.js", "dist/Vencord.css"],
             "matches": ["*://*.discord.com/*"]
         }
     ],

browser/manifestv2.json

@@ -26,7 +26,11 @@
         }
     ],
 
-    "web_accessible_resources": ["dist/*", "third-party/*"],
+    "background": {
+        "scripts": ["background.js"]
+    },
+
+    "web_accessible_resources": ["dist/Vencord.js", "dist/Vencord.css"],
 
     "browser_specific_settings": {
         "gecko": {

browser/monaco.ts

@@ -1,43 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import "./patch-worker";
-
-import * as monaco from "monaco-editor/esm/vs/editor/editor.main.js";
-
-declare global {
-    const baseUrl: string;
-    const getCurrentCss: () => Promise<string>;
-    const setCss: (css: string) => void;
-    const getTheme: () => string;
-}
-
-const BASE = "/dist/monaco/vs";
-
-self.MonacoEnvironment = {
-    getWorkerUrl(_moduleId: unknown, label: string) {
-        const path = label === "css" ? "/language/css/css.worker.js" : "/editor/editor.worker.js";
-        return new URL(BASE + path, baseUrl).toString();
-    }
-};
-
-getCurrentCss().then(css => {
-    const editor = monaco.editor.create(
-        document.getElementById("container")!,
-        {
-            value: css,
-            language: "css",
-            theme: getTheme(),
-        }
-    );
-    editor.onDidChangeModelContent(() =>
-        setCss(editor.getValue())
-    );
-    window.addEventListener("resize", () => {
-        // make monaco re-layout
-        editor.layout();
-    });
-});

browser/monacoWin.html

@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8" />
-        <title>Vencord QuickCSS Editor</title>
-        <style>
-            html,
-            body,
-            #container {
-                position: absolute;
-                left: 0;
-                top: 0;
-                width: 100%;
-                height: 100%;
-                margin: 0;
-                padding: 0;
-                overflow: hidden;
-            }
-        </style>
-    </head>
-
-    <body>
-        <div id="container"></div>
-
-        <script>
-            const script = document.createElement("script");
-            script.src = new URL("/dist/monaco/index.js", baseUrl);
-
-            const style = document.createElement("link");
-            style.type = "text/css";
-            style.rel = "stylesheet";
-            style.href = new URL("/dist/monaco/index.css", baseUrl);
-
-            document.body.append(style, script);
-        </script>
-    </body>
-</html>

browser/patch-worker.js

@@ -1,135 +0,0 @@
-/*
-Copyright 2013 Rob Wu <gwnRob@gmail.com>
-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.
-*/
-// Target: Chrome 20+
-
-// W3-compliant Worker proxy.
-// This module replaces the global Worker object.
-// When invoked, the default Worker object is called.
-// If this call fails with SECURITY_ERR, the script is fetched
-//  using async XHR, and transparently proxies all calls and
-//  setters/getters to the new Worker object.
-// Note: This script does not magically circumvent the Same origin policy.
-
-(function () {
-    'use strict';
-    var Worker_ = window.Worker;
-    var URL = window.URL || window.webkitURL;
-    // Create dummy worker for the following purposes:
-    // 1. Don't override the global Worker object if the fallback isn't
-    //    going to work (future API changes?)
-    // 2. Use it to trigger early validation of postMessage calls
-    // Note: Blob constructor is supported since Chrome 20, but since
-    // some of the used Chrome APIs are only supported as of Chrome 20,
-    //  I don't bother adding a BlobBuilder fallback.
-    var dummyWorker = new Worker_(
-        URL.createObjectURL(new Blob([], { type: 'text/javascript' })));
-    window.Worker = function Worker(scriptURL) {
-        if (arguments.length === 0) {
-            throw new TypeError('Not enough arguments');
-        }
-        try {
-            return new Worker_(scriptURL);
-        } catch (e) {
-            if (e.code === 18/*DOMException.SECURITY_ERR*/) {
-                return new WorkerXHR(scriptURL);
-            } else {
-                throw e;
-            }
-        }
-    };
-    // Bind events and replay queued messages
-    function bindWorker(worker, workerURL) {
-        if (worker._terminated) {
-            return;
-        }
-        worker.Worker = new Worker_(workerURL);
-        worker.Worker.onerror = worker._onerror;
-        worker.Worker.onmessage = worker._onmessage;
-        var o;
-        while ((o = worker._replayQueue.shift())) {
-            worker.Worker[o.method].apply(worker.Worker, o.arguments);
-        }
-        while ((o = worker._messageQueue.shift())) {
-            worker.Worker.postMessage.apply(worker.Worker, o);
-        }
-    }
-    function WorkerXHR(scriptURL) {
-        var worker = this;
-        var x = new XMLHttpRequest();
-        x.responseType = 'blob';
-        x.onload = function () {
-            // http://stackoverflow.com/a/10372280/938089
-            var workerURL = URL.createObjectURL(x.response);
-            bindWorker(worker, workerURL);
-        };
-        x.open('GET', scriptURL);
-        x.send();
-        worker._replayQueue = [];
-        worker._messageQueue = [];
-    }
-    WorkerXHR.prototype = {
-        constructor: Worker_,
-        terminate: function () {
-            if (!this._terminated) {
-                this._terminated = true;
-                if (this.Worker)
-                    this.Worker.terminate();
-            }
-        },
-        postMessage: function (message, transfer) {
-            if (!(this instanceof WorkerXHR))
-                throw new TypeError('Illegal invocation');
-            if (this.Worker) {
-                this.Worker.postMessage.apply(this.Worker, arguments);
-            } else {
-                // Trigger validation:
-                dummyWorker.postMessage(message);
-                // Alright, push the valid message to the queue.
-                this._messageQueue.push(arguments);
-            }
-        }
-    };
-    // Implement the EventTarget interface
-    [
-        'addEventListener',
-        'removeEventListener',
-        'dispatchEvent'
-    ].forEach(function (method) {
-        WorkerXHR.prototype[method] = function () {
-            if (!(this instanceof WorkerXHR)) {
-                throw new TypeError('Illegal invocation');
-            }
-            if (this.Worker) {
-                this.Worker[method].apply(this.Worker, arguments);
-            } else {
-                this._replayQueue.push({ method: method, arguments: arguments });
-            }
-        };
-    });
-    Object.defineProperties(WorkerXHR.prototype, {
-        onmessage: {
-            get: function () { return this._onmessage || null; },
-            set: function (func) {
-                this._onmessage = typeof func === 'function' ? func : null;
-            }
-        },
-        onerror: {
-            get: function () { return this._onerror || null; },
-            set: function (func) {
-                this._onerror = typeof func === 'function' ? func : null;
-            }
-        }
-    });
-})();

docs/1_INSTALLING.md

@@ -63,7 +63,7 @@ Then fully close Discord from your taskbar or task manager, and restart it. Venc
 
 If you're using Discord already, go into the `Updater` tab in settings.
 
-Sometimes it may be necessary to manually update if the GUI updater fails.
+Sometimes it may be neccessary to manually update if the GUI updater fails.
 
 To pull latest changes:
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.5.3",
+    "version": "1.4.2",
     "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,18 +31,13 @@
         "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",
-        "gifenc": "github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3",
-        "monaco-editor": "^0.43.0",
         "nanoid": "^4.0.2",
         "virtual-merge": "^1.0.1"
     },
     "devDependencies": {
-        "@types/chrome": "^0.0.246",
         "@types/diff": "^5.0.3",
         "@types/lodash": "^4.14.194",
         "@types/node": "^18.16.3",
@@ -54,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",
@@ -67,14 +63,13 @@
         "stylelint-config-standard": "^33.0.0",
         "tsx": "^3.12.7",
         "type-fest": "^3.9.0",
-        "typescript": "^5.0.4",
-        "zip-local": "^0.3.5"
+        "typescript": "^5.0.4"
     },
     "packageManager": "pnpm@8.1.1",
     "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 sourceCode = context.sourceCode;
-         const parser = new RegExpParser();
-
-+        const NON_CHARCLASS_ESCAPES = union(REGEX_NON_CHARCLASS_ESCAPES, new Set(extra));
-+        const CHARCLASS_ESCAPES = union(REGEX_GENERAL_ESCAPES, new Set(extraCharClass));
++        const { extra, extraCharClass } = options || ''
+         const sourceCode = context.getSourceCode();
+ 
++        const NON_CHARCLASS_ESCAPES = union(REGEX_NON_CHARCLASS_ESCAPES, new Set(extra))
++        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 = {
-                     let allowedEscapes;
-
-                     if (characterClassStack.length) {
--                        allowedEscapes = unicodeSets ? REGEX_CLASSSET_CHARACTER_ESCAPES : REGEX_GENERAL_ESCAPES;
-+                        allowedEscapes = unicodeSets ? REGEX_CLASSSET_CHARACTER_ESCAPES : CHARCLASS_ESCAPES;
-                     } else {
--                        allowedEscapes = REGEX_NON_CHARCLASS_ESCAPES;
-+                        allowedEscapes = NON_CHARCLASS_ESCAPES;
-                     }
-                     if (allowedEscapes.has(escapedChar)) {
-                         return;
+@@ -238,7 +256,7 @@ module.exports = {
+                     .filter(charInfo => charInfo.escaped)
+ 
+                     // Filter out characters that are valid to escape, based on their position in the regular expression.
+-                    .filter(charInfo => !(charInfo.inCharClass ? REGEX_GENERAL_ESCAPES : REGEX_NON_CHARCLASS_ESCAPES).has(charInfo.text))
++                    .filter(charInfo => !(charInfo.inCharClass ? CHARCLASS_ESCAPES : NON_CHARCLASS_ESCAPES).has(charInfo.text))
+ 
+                     // Report all the remaining characters.
+                     .forEach(charInfo => report(node, charInfo.index, charInfo.text));

pnpm-lock.yaml

@@ -1,39 +1,23 @@
 lockfileVersion: '6.0'
 
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
 patchedDependencies:
   eslint-plugin-path-alias@1.0.0:
     hash: m6sma4g6bh67km3q6igf6uxaja
     path: patches/eslint-plugin-path-alias@1.0.0.patch
-  eslint@8.46.0:
-    hash: xm46kqcmdgzlmm4aifkfpxaho4
-    path: patches/eslint@8.46.0.patch
+  eslint@8.28.0:
+    hash: 7wc6icvgtg3uswirb5tpsbjnbe
+    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
-  gifenc:
-    specifier: github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3
-    version: github.com/mattdesl/gifenc/64842fca317b112a8590f8fef2bf3825da8f6fe3
-  monaco-editor:
-    specifier: ^0.43.0
-    version: 0.43.0
   nanoid:
     specifier: ^4.0.2
     version: 4.0.2
@@ -42,9 +26,6 @@ dependencies:
     version: 1.0.1
 
 devDependencies:
-  '@types/chrome':
-    specifier: ^0.0.246
-    version: 0.0.246
   '@types/diff':
     specifier: ^5.0.3
     version: 5.0.3
@@ -65,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
@@ -79,20 +60,23 @@ devDependencies:
     specifier: ^0.15.18
     version: 0.15.18
   eslint:
-    specifier: ^8.46.0
-    version: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+    specifier: ^8.28.0
+    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
@@ -120,17 +104,9 @@ devDependencies:
   typescript:
     specifier: ^5.0.4
     version: 5.0.4
-  zip-local:
-    specifier: ^0.3.5
-    version: 0.3.5
 
 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'}
@@ -423,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:
@@ -432,8 +408,8 @@ packages:
       eslint:
         optional: true
     dependencies:
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
-      eslint-visitor-keys: 3.4.2
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
+      eslint-visitor-keys: 3.4.0
     dev: true
 
   /@eslint-community/regexpp@4.5.1:
@@ -441,20 +417,15 @@ packages:
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
     dev: true
 
-  /@eslint-community/regexpp@4.6.2:
-    resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==}
-    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==}
+  /@eslint/eslintrc@1.3.3:
+    resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
       debug: 4.3.4
-      espree: 9.6.1
-      globals: 13.20.0
-      ignore: 5.2.4
+      espree: 9.4.1
+      globals: 13.17.0
+      ignore: 5.2.0
       import-fresh: 3.3.0
       js-yaml: 4.1.0
       minimatch: 3.1.2
@@ -463,13 +434,8 @@ packages:
       - supports-color
     dev: true
 
-  /@eslint/js@8.46.0:
-    resolution: {integrity: sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
-
-  /@humanwhocodes/config-array@0.11.10:
-    resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==}
+  /@humanwhocodes/config-array@0.11.7:
+    resolution: {integrity: sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==}
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
@@ -532,35 +498,10 @@ packages:
       - supports-color
     dev: true
 
-  /@sapphi-red/web-noise-suppressor@0.3.3:
-    resolution: {integrity: sha512-gAC33DCXYwNTI/k1PxOVHmbbzakUSMbb/DHpoV6rn4pKZtPI1dduULSmAAm/y1ipgIlArnk2JcnQzw4n2tCZHw==}
-    dev: false
-
-  /@types/chrome@0.0.246:
-    resolution: {integrity: sha512-MxGxEomGxsJiL9xe/7ZwVgwdn8XVKWbPvxpVQl3nWOjrS0Ce63JsfzxUc4aU3GvRcUPYsfufHmJ17BFyKxeA4g==}
-    dependencies:
-      '@types/filesystem': 0.0.33
-      '@types/har-format': 1.2.13
-    dev: true
-
   /@types/diff@5.0.3:
     resolution: {integrity: sha512-amrLbRqTU9bXMCc6uX0sWpxsQzRIo9z6MJPkH1pkez/qOxuqSZVuryJAWoBRq94CeG8JxY+VK4Le9HtjQR5T9A==}
     dev: true
 
-  /@types/filesystem@0.0.33:
-    resolution: {integrity: sha512-2KedRPzwu2K528vFkoXnnWdsG0MtUwPjuA7pRy4vKxlxHEe8qUDZibYHXJKZZr2Cl/ELdCWYqyb/MKwsUuzBWw==}
-    dependencies:
-      '@types/filewriter': 0.0.30
-    dev: true
-
-  /@types/filewriter@0.0.30:
-    resolution: {integrity: sha512-lB98tui0uxc7erbj0serZfJlHKLNJHwBltPnbmO1WRpL5T325GOHRiQfr2E29V2q+S1brDO63Fpdt6vb3bES9Q==}
-    dev: true
-
-  /@types/har-format@1.2.13:
-    resolution: {integrity: sha512-PwBsCBD3lDODn4xpje3Y1di0aDJp4Ww7aSfMRVw6ysnxD4I7Wmq2mBkSKaDtN403hqH5sp6c9xQUvFYY3+lkBg==}
-    dev: true
-
   /@types/json-schema@7.0.11:
     resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
     dev: true
@@ -628,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:
@@ -642,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/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.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
@@ -658,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:
@@ -674,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
@@ -688,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:
@@ -701,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:
@@ -736,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:
@@ -745,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:
@@ -781,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:
-    resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
+  /acorn@8.8.0:
+    resolution: {integrity: sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==}
     engines: {node: '>=0.4.0'}
     hasBin: true
     dev: true
@@ -880,10 +821,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /async@1.5.2:
-    resolution: {integrity: sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==}
-    dev: true
-
   /atob@2.1.2:
     resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
     engines: {node: '>= 4.5.0'}
@@ -1509,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
@@ -1517,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:
-    resolution: {integrity: sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA==}
-    dev: false
-
-  /eslint-plugin-simple-import-sort@10.0.0(eslint@8.46.0):
+  /eslint-plugin-simple-import-sort@10.0.0(eslint@8.28.0):
     resolution: {integrity: sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==}
     peerDependencies:
       eslint: '>=5.0.0'
@@ -1536,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:
@@ -1551,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)
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      '@typescript-eslint/eslint-plugin': 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.28.0)(typescript@5.0.4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
       eslint-rule-composer: 0.3.0
     dev: true
 
@@ -1569,34 +1513,49 @@ packages:
       estraverse: 4.3.0
     dev: true
 
-  /eslint-scope@7.2.2:
-    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
+  /eslint-scope@7.1.1:
+    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:
-    resolution: {integrity: sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==}
-    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==}
+  /eslint@8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe):
+    resolution: {integrity: sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==}
     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-community/regexpp': 4.6.2
-      '@eslint/eslintrc': 2.1.1
-      '@eslint/js': 8.46.0
-      '@humanwhocodes/config-array': 0.11.10
+      '@eslint/eslintrc': 1.3.3
+      '@humanwhocodes/config-array': 0.11.7
       '@humanwhocodes/module-importer': 1.0.1
       '@nodelib/fs.walk': 1.2.8
       ajv: 6.12.6
@@ -1605,46 +1564,60 @@ packages:
       debug: 4.3.4
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
-      eslint-scope: 7.2.2
-      eslint-visitor-keys: 3.4.2
-      espree: 9.6.1
-      esquery: 1.5.0
+      eslint-scope: 7.1.1
+      eslint-utils: 3.0.0(eslint@8.28.0)
+      eslint-visitor-keys: 3.3.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
-      graphemer: 1.4.0
-      ignore: 5.2.4
+      globals: 13.17.0
+      grapheme-splitter: 1.0.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:
-    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
+  /espree@9.4.0:
+    resolution: {integrity: sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 8.10.0
-      acorn-jsx: 5.3.2(acorn@8.10.0)
-      eslint-visitor-keys: 3.4.2
+      acorn: 8.8.0
+      acorn-jsx: 5.3.2(acorn@8.8.0)
+      eslint-visitor-keys: 3.3.0
     dev: true
 
-  /esquery@1.5.0:
-    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
+  /espree@9.4.1:
+    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
@@ -1885,8 +1858,8 @@ packages:
       which: 1.3.1
     dev: true
 
-  /globals@13.20.0:
-    resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==}
+  /globals@13.17.0:
+    resolution: {integrity: sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==}
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.20.2
@@ -1908,18 +1881,10 @@ packages:
     resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
     dev: true
 
-  /graceful-fs@4.2.11:
-    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
-    dev: true
-
   /grapheme-splitter@1.0.4:
     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'}
@@ -2007,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'}
@@ -2198,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
@@ -2229,12 +2203,6 @@ packages:
     resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
     dev: false
 
-  /jszip@2.7.0:
-    resolution: {integrity: sha512-JIsRKRVC3gTRo2vM4Wy9WBC3TRcfnIZU8k65Phi3izkvPH975FowRYtKGT6PxevA0XnJ/yO8b0QwV0ydVyQwfw==}
-    dependencies:
-      pako: 1.0.11
-    dev: true
-
   /kind-of@3.2.2:
     resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
     engines: {node: '>=0.10.0'}
@@ -2405,10 +2373,6 @@ packages:
     resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==}
     dev: true
 
-  /monaco-editor@0.43.0:
-    resolution: {integrity: sha512-cnoqwQi/9fml2Szamv1XbSJieGJ1Dc8tENVMD26Kcfl7xGQWp7OBKMjlwKVGYFJ3/AXJjSOGvcqK7Ry/j9BM1Q==}
-    dev: false
-
   /ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
     dev: true
@@ -2521,16 +2485,16 @@ packages:
       wrappy: 1.0.2
     dev: true
 
-  /optionator@0.9.3:
-    resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
+  /optionator@0.9.1:
+    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:
@@ -2566,10 +2530,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /pako@1.0.11:
-    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
-    dev: true
-
   /parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
@@ -2721,11 +2681,6 @@ packages:
       - utf-8-validate
     dev: true
 
-  /q@1.5.1:
-    resolution: {integrity: sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==}
-    engines: {node: '>=0.6.0', teleport: '>=0.2.0'}
-    dev: true
-
   /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
     dev: true
@@ -2779,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'}
@@ -3363,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'}
@@ -3440,18 +3405,3 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
     dev: true
-
-  /zip-local@0.3.5:
-    resolution: {integrity: sha512-GRV3D5TJY+/PqyeRm5CYBs7xVrKTKzljBoEXvocZu0HJ7tPEcgpSOYa2zFIsCZWgKWMuc4U3yMFgFkERGFIB9w==}
-    dependencies:
-      async: 1.5.2
-      graceful-fs: 4.2.11
-      jszip: 2.7.0
-      q: 1.5.1
-    dev: true
-
-  github.com/mattdesl/gifenc/64842fca317b112a8590f8fef2bf3825da8f6fe3:
-    resolution: {tarball: https://codeload.github.com/mattdesl/gifenc/tar.gz/64842fca317b112a8590f8fef2bf3825da8f6fe3}
-    name: gifenc
-    version: 1.0.3
-    dev: false

scripts/build/build.mjs

@@ -19,16 +19,13 @@
 
 import esbuild from "esbuild";
 
-import { BUILD_TIMESTAMP, commonOpts, globPlugins, isStandalone, updaterDisabled, VERSION, watch } from "./common.mjs";
+import { commonOpts, globPlugins, isStandalone, VERSION, watch } from "./common.mjs";
 
 const defines = {
     IS_STANDALONE: isStandalone,
     IS_DEV: JSON.stringify(watch),
-    IS_UPDATER_DISABLED: updaterDisabled,
-    IS_WEB: false,
-    IS_EXTENSION: false,
     VERSION: JSON.stringify(VERSION),
-    BUILD_TIMESTAMP,
+    BUILD_TIMESTAMP: Date.now(),
 };
 if (defines.IS_STANDALONE === "false")
     // If this is a local build (not standalone), optimise
@@ -43,6 +40,8 @@ const nodeCommonOpts = {
     format: "cjs",
     platform: "node",
     target: ["esnext"],
+    minify: true,
+    bundle: true,
     external: ["electron", ...commonOpts.external],
     define: defines,
 };
@@ -51,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"],
@@ -61,7 +69,7 @@ await Promise.all([
         define: {
             ...defines,
             IS_DISCORD_DESKTOP: true,
-            IS_VESKTOP: false
+            IS_VENCORD_DESKTOP: false
         }
     }),
     esbuild.build({
@@ -79,24 +87,13 @@ await Promise.all([
         ],
         define: {
             ...defines,
+            IS_WEB: false,
             IS_DISCORD_DESKTOP: true,
-            IS_VESKTOP: 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
+            IS_VENCORD_DESKTOP: false
         }
     }),
 
-    // Vencord Desktop main & renderer & preload
+    // Vencord Desktop main & renderer
     esbuild.build({
         ...nodeCommonOpts,
         entryPoints: ["src/main/index.ts"],
@@ -106,7 +103,7 @@ await Promise.all([
         define: {
             ...defines,
             IS_DISCORD_DESKTOP: false,
-            IS_VESKTOP: true
+            IS_VENCORD_DESKTOP: true
         }
     }),
     esbuild.build({
@@ -124,20 +121,9 @@ await Promise.all([
         ],
         define: {
             ...defines,
+            IS_WEB: false,
             IS_DISCORD_DESKTOP: false,
-            IS_VESKTOP: 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
+            IS_VENCORD_DESKTOP: true
         }
     }),
 ]).catch(err => {

scripts/build/buildWeb.mjs

@@ -17,13 +17,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import esbuild from "esbuild";
-import { readFileSync } from "fs";
-import { appendFile, mkdir, readdir, readFile, rm, writeFile } from "fs/promises";
-import { join } from "path";
-import Zip from "zip-local";
 
-import { BUILD_TIMESTAMP, commonOpts, globPlugins, VERSION, watch } from "./common.mjs";
+import esbuild from "esbuild";
+import { zip } from "fflate";
+import { readFileSync } from "fs";
+import { appendFile, mkdir, readFile, rm, writeFile } from "fs/promises";
+import { join } from "path";
+
+import { commonOpts, globPlugins, VERSION, watch } from "./common.mjs";
 
 /**
  * @type {esbuild.BuildOptions}
@@ -41,69 +42,28 @@ const commonOptions = {
     target: ["esnext"],
     define: {
         IS_WEB: "true",
-        IS_EXTENSION: "false",
         IS_STANDALONE: "true",
         IS_DEV: JSON.stringify(watch),
         IS_DISCORD_DESKTOP: "false",
-        IS_VESKTOP: "false",
-        IS_UPDATER_DISABLED: "true",
+        IS_VENCORD_DESKTOP: "false",
         VERSION: JSON.stringify(VERSION),
-        BUILD_TIMESTAMP,
+        BUILD_TIMESTAMP: Date.now(),
     }
 };
 
-const MonacoWorkerEntryPoints = [
-    "vs/language/css/css.worker.js",
-    "vs/editor/editor.worker.js"
-];
-
-const RnNoiseFiles = [
-    "dist/rnnoise.wasm",
-    "dist/rnnoise_simd.wasm",
-    "dist/rnnoise/workletProcessor.js",
-    "LICENSE"
-];
-
 await Promise.all(
     [
-        esbuild.build({
-            entryPoints: MonacoWorkerEntryPoints.map(entry => `node_modules/monaco-editor/esm/${entry}`),
-            bundle: true,
-            minify: true,
-            format: "iife",
-            outbase: "node_modules/monaco-editor/esm/",
-            outdir: "dist/monaco"
-        }),
-        esbuild.build({
-            entryPoints: ["browser/monaco.ts"],
-            bundle: true,
-            minify: true,
-            format: "iife",
-            outfile: "dist/monaco/index.js",
-            loader: {
-                ".ttf": "file"
-            }
-        }),
         esbuild.build({
             ...commonOptions,
             outfile: "dist/browser.js",
             footer: { js: "//# sourceURL=VencordWeb" },
         }),
-        esbuild.build({
-            ...commonOptions,
-            outfile: "dist/extension.js",
-            define: {
-                ...commonOptions?.define,
-                IS_EXTENSION: "true",
-            },
-            footer: { js: "//# sourceURL=VencordWeb" },
-        }),
         esbuild.build({
             ...commonOptions,
             inject: ["browser/GMPolyfill.js", ...(commonOptions?.inject || [])],
             define: {
-                ...(commonOptions?.define),
-                window: "unsafeWindow",
+                "window": "unsafeWindow",
+                ...(commonOptions?.define)
             },
             outfile: "dist/Vencord.user.js",
             banner: {
@@ -118,41 +78,12 @@ await Promise.all(
 );
 
 /**
- * @type {(dir: string) => Promise<string[]>}
+  * @type {(target: string, files: string[], shouldZip: boolean) => Promise<void>}
  */
-async function globDir(dir) {
-    const files = [];
-
-    for (const child of await readdir(dir, { withFileTypes: true })) {
-        const p = join(dir, child.name);
-        if (child.isDirectory())
-            files.push(...await globDir(p));
-        else
-            files.push(p);
-    }
-
-    return files;
-}
-
-/**
- * @type {(dir: string, basePath?: string) => Promise<Record<string, string>>}
- */
-async function loadDir(dir, basePath = "") {
-    const files = await globDir(dir);
-    return Object.fromEntries(await Promise.all(files.map(async f => [f.slice(basePath.length), await readFile(f)])));
-}
-
-/**
-  * @type {(target: string, files: string[]) => Promise<void>}
- */
-async function buildExtension(target, files, noMonaco = false) {
+async function buildPluginZip(target, files, shouldZip) {
     const entries = {
-        "dist/Vencord.js": await readFile("dist/extension.js"),
-        "dist/Vencord.css": await readFile("dist/extension.css"),
-        ...(noMonaco ? {} : await loadDir("dist/monaco")),
-        ...Object.fromEntries(await Promise.all(RnNoiseFiles.map(async file =>
-            [`third-party/rnnoise/${file.replace(/^dist\//, "")}`, await readFile(`node_modules/@sapphi-red/web-noise-suppressor/${file}`)]
-        ))),
+        "dist/Vencord.js": await readFile("dist/browser.js"),
+        "dist/Vencord.css": await readFile("dist/browser.css"),
         ...Object.fromEntries(await Promise.all(files.map(async f => {
             let content = await readFile(join("browser", f));
             if (f.startsWith("manifest")) {
@@ -168,15 +99,31 @@ async function buildExtension(target, files, noMonaco = false) {
         }))),
     };
 
-    await rm(target, { recursive: true, force: true });
-    await Promise.all(Object.entries(entries).map(async ([file, content]) => {
-        const dest = join("dist", target, file);
-        const parentDirectory = join(dest, "..");
-        await mkdir(parentDirectory, { recursive: true });
-        await writeFile(dest, content);
-    }));
+    if (shouldZip) {
+        return new Promise((resolve, reject) => {
+            zip(entries, {}, (err, data) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    const out = join("dist", target);
+                    writeFile(out, data).then(() => {
+                        console.info("Extension written to " + out);
+                        resolve();
+                    }).catch(reject);
+                }
+            });
+        });
+    } else {
+        await rm(target, { recursive: true, force: true });
+        await Promise.all(Object.entries(entries).map(async ([file, content]) => {
+            const dest = join("dist", target, file);
+            const parentDirectory = join(dest, "..");
+            await mkdir(parentDirectory, { recursive: true });
+            await writeFile(dest, content);
+        }));
 
-    console.info("Unpacked Extension written to dist/" + target);
+        console.info("Unpacked Extension written to dist/" + target);
+    }
 }
 
 const appendCssRuntime = readFile("dist/Vencord.user.css", "utf-8").then(content => {
@@ -194,9 +141,8 @@ const appendCssRuntime = readFile("dist/Vencord.user.css", "utf-8").then(content
 
 await Promise.all([
     appendCssRuntime,
-    buildExtension("chromium-unpacked", ["modifyResponseHeaders.json", "content.js", "manifest.json", "icon.png"]),
-    buildExtension("firefox-unpacked", ["content.js", "manifestv2.json", "icon.png"], true),
+    buildPluginZip("extension.zip", ["modifyResponseHeaders.json", "content.js", "manifest.json", "icon.png"], true),
+    buildPluginZip("chromium-unpacked", ["modifyResponseHeaders.json", "content.js", "manifest.json", "icon.png"], false),
+    buildPluginZip("firefox-unpacked", ["background.js", "content.js", "manifestv2.json", "icon.png"], false),
 ]);
 
-Zip.sync.zip("dist/chromium-unpacked").compress().save("dist/extension.zip");
-console.info("Packed Chromium Extension written to dist/extension.zip");

scripts/build/common.mjs

@@ -27,21 +27,17 @@ 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;
-// https://reproducible-builds.org/docs/source-date-epoch/
-export const BUILD_TIMESTAMP = Number(process.env.SOURCE_DATE_EPOCH) || Date.now();
+export const BUILD_TIMESTAMP = Date.now();
 export const watch = process.argv.includes("--watch");
 export const isStandalone = JSON.stringify(process.argv.includes("--standalone"));
-export const updaterDisabled = JSON.stringify(process.argv.includes("--disable-updater"));
-export const gitHash = process.env.VENCORD_HASH || execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim();
+export const gitHash = execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim();
 export const banner = {
     js: `
 // Vencord ${gitHash}
 // Standalone: ${isStandalone}
 // Platform: ${isStandalone === "false" ? process.platform : "Universal"}
-// Updater disabled: ${updaterDisabled}
 `.trim()
 };
 
@@ -85,13 +81,14 @@ export const globPlugins = kind => ({
                     if (file.startsWith("_") || file.startsWith(".")) continue;
                     if (file === "index.ts") continue;
 
-                    const target = getPluginTarget(file);
-                    if (target) {
-                        if (target === "dev" && !watch) continue;
-                        if (target === "web" && kind === "discordDesktop") continue;
-                        if (target === "desktop" && kind === "web") continue;
-                        if (target === "discordDesktop" && kind !== "discordDesktop") continue;
-                        if (target === "vencordDesktop" && kind !== "vencordDesktop") continue;
+                    const fileBits = file.split(".");
+                    if (fileBits.length > 2 && ["ts", "tsx"].includes(fileBits.at(-1))) {
+                        const mod = fileBits.at(-2);
+                        if (mod === "dev" && !watch) continue;
+                        if (mod === "web" && kind === "discordDesktop") continue;
+                        if (mod === "desktop" && kind === "web") continue;
+                        if (mod === "discordDesktop" && kind !== "discordDesktop") continue;
+                        if (mod === "vencordDesktop" && kind !== "vencordDesktop") continue;
                     }
 
                     const mod = `p${i}`;
@@ -136,14 +133,11 @@ export const gitRemotePlugin = {
             namespace: "git-remote", path: args.path
         }));
         build.onLoad({ filter, namespace: "git-remote" }, async () => {
-            let remote = process.env.VENCORD_REMOTE;
-            if (!remote) {
-                const res = await promisify(exec)("git remote get-url origin", { encoding: "utf-8" });
-                remote = res.stdout.trim()
-                    .replace("https://github.com/", "")
-                    .replace("git@github.com:", "")
-                    .replace(/.git$/, "");
-            }
+            const res = await promisify(exec)("git remote get-url origin", { encoding: "utf-8" });
+            const remote = res.stdout.trim()
+                .replace("https://github.com/", "")
+                .replace("git@github.com:", "")
+                .replace(/.git$/, "");
 
             return { contents: `export default "${remote}"` };
         });

scripts/generatePluginList.ts

@@ -18,12 +18,9 @@
 
 import { Dirent, readdirSync, readFileSync, writeFileSync } from "fs";
 import { access, readFile } from "fs/promises";
-import { join, sep } from "path";
-import { normalize as posixNormalize, sep as posixSep } from "path/posix";
+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;
@@ -40,7 +37,6 @@ interface PluginData {
     required: boolean;
     enabledByDefault: boolean;
     target: "discordDesktop" | "vencordDesktop" | "web" | "dev";
-    filePath: string;
 }
 
 const devs = {} as Record<string, Dev>;
@@ -161,23 +157,14 @@ async function parseFile(fileName: string) {
 
         if (!data.name || !data.description || !data.authors) throw fail("name, description or authors are missing");
 
-        const target = getPluginTarget(fileName);
-        if (target) {
-            if (!["web", "discordDesktop", "vencordDesktop", "desktop", "dev"].includes(target)) throw fail(`invalid target ${target}`);
-            data.target = target as any;
+        const fileBits = fileName.split(".");
+        if (fileBits.length > 2 && ["ts", "tsx"].includes(fileBits.at(-1)!)) {
+            const mod = fileBits.at(-2)!;
+            if (!["web", "discordDesktop", "vencordDesktop", "dev"].includes(mod)) throw fail(`invalid target ${fileBits.at(-2)}`);
+            data.target = mod as any;
         }
 
-        data.filePath = posixNormalize(fileName)
-            .split(sep)
-            .join(posixSep)
-            .replace(/\/index\.([jt]sx?)$/, "")
-            .replace(/^src\/plugins\//, "");
-
-        let readme = "";
-        try {
-            readme = readFileSync(join(fileName, "..", "README.md"), "utf-8");
-        } catch { }
-        return [data, readme] as const;
+        return data;
     }
 
     throw fail("no default export called 'definePlugin' found");
@@ -206,24 +193,18 @@ function isPluginFile({ name }: { name: string; }) {
 (async () => {
     parseDevs();
 
-    const plugins = [] as PluginData[];
-    const readmes = {} as Record<string, string>;
-
-    await Promise.all(["src/plugins", "src/plugins/_core"].flatMap(dir =>
+    const plugins = ["src/plugins", "src/plugins/_core"].flatMap(dir =>
         readdirSync(dir, { withFileTypes: true })
             .filter(isPluginFile)
-            .map(async dirent => {
-                const [data, readme] = await parseFile(await getEntryPoint(dir, dirent));
-                plugins.push(data);
-                if (readme) readmes[data.name] = readme;
-            })
-    ));
+            .map(async dirent =>
+                parseFile(await getEntryPoint(dir, dirent))
+            )
+    );
 
-    const data = JSON.stringify(plugins);
+    const data = JSON.stringify(await Promise.all(plugins));
 
-    if (process.argv.length > 3) {
+    if (process.argv.length > 2) {
         writeFileSync(process.argv[2], data);
-        writeFileSync(process.argv[3], JSON.stringify(readmes));
     } else {
         console.log(data);
     }

scripts/generateReport.ts

@@ -171,7 +171,7 @@ page.on("console", async e => {
                     plugin,
                     type,
                     id,
-                    match: regex.replace(/\[A-Za-z_\$\]\[\\w\$\]\*/g, "\\i"),
+                    match: regex,
                     error: cause
                 });
                 break;
@@ -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(pathParts.at(-1))) pathParts.pop();
-
-    const identifier = pathParts.at(-1).replace(/\.tsx?$/, "");
-    const identiferBits = identifier.split(".");
-    return identiferBits.length === 1 ? null : identiferBits.at(-1);
-}

src/VencordNative.ts

@@ -1,8 +1,20 @@
 /*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022
+ *
+ * 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";
@@ -23,8 +35,7 @@ export default {
         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),
-        getSystemValues: () => invoke<Record<string, string>>(IpcEvents.GET_THEME_SYSTEM_VALUES),
+        getThemeData: (fileName: string) => invoke<string | undefined>(IpcEvents.GET_THEME_DATA, fileName)
     },
 
     updater: {
@@ -49,7 +60,7 @@ export default {
         },
 
         addThemeChangeListener(cb: () => void) {
-            ipcRenderer.on(IpcEvents.THEME_UPDATE, () => cb());
+            ipcRenderer.on(IpcEvents.THEME_UPDATE, cb);
         },
 
         openFile: () => invoke<void>(IpcEvents.OPEN_QUICKCSS),

src/api/DataStore/index.ts

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

src/components/CodeBlock.tsx

@@ -1,21 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { findByPropsLazy } from "@webpack";
-import { Parser } from "@webpack/common";
-
-const CodeContainerClasses = findByPropsLazy("markup", "codeContainer");
-
-/**
- * Renders code in a Discord codeblock
- */
-export function CodeBlock(props: { content?: string, lang: string; }) {
-    return (
-        <div className={CodeContainerClasses.markup}>
-            {Parser.defaultRules.codeBlock.react(props, null, {})}
-        </div>
-    );
-}

src/components/Icons.tsx

@@ -28,8 +28,8 @@ interface BaseIconProps extends IconProps {
 
 interface IconProps extends SVGProps<SVGSVGElement> {
     className?: string;
-    height?: string | number;
-    width?: string | number;
+    height?: number;
+    width?: number;
 }
 
 function Icon({ height = 24, width = 24, className, children, viewBox, ...svgProps }: PropsWithChildren<BaseIconProps>) {
@@ -97,7 +97,7 @@ export function OpenExternalIcon(props: IconProps) {
         >
             <polygon
                 fill="currentColor"
-                fillRule="nonzero"
+                fill-rule="nonzero"
                 points="13 20 11 20 11 8 5.5 13.5 4.08 12.08 12 4.16 19.92 12.08 18.5 13.5 13 8"
             />
         </Icon>
@@ -121,13 +121,9 @@ export function InfoIcon(props: IconProps) {
         <Icon
             {...props}
             className={classes(props.className, "vc-info-icon")}
-            viewBox="0 0 24 24"
+            viewBox="0 0 12 12"
         >
-            <path
-                fill="currentColor"
-                transform="translate(2 2)"
-                d="M9,7 L11,7 L11,5 L9,5 L9,7 Z M10,18 C5.59,18 2,14.41 2,10 C2,5.59 5.59,2 10,2 C14.41,2 18,5.59 18,10 C18,14.41 14.41,18 10,18 L10,18 Z M10,4.4408921e-16 C4.4771525,-1.77635684e-15 4.4408921e-16,4.4771525 0,10 C-1.33226763e-15,12.6521649 1.0535684,15.195704 2.92893219,17.0710678 C4.80429597,18.9464316 7.3478351,20 10,20 C12.6521649,20 15.195704,18.9464316 17.0710678,17.0710678 C18.9464316,15.195704 20,12.6521649 20,10 C20,7.3478351 18.9464316,4.80429597 17.0710678,2.92893219 C15.195704,1.0535684 12.6521649,2.22044605e-16 10,0 L10,4.4408921e-16 Z M9,15 L11,15 L11,9 L9,9 L9,15 L9,15 Z"
-            />
+            <path fill="currentColor" d="M6 1C3.243 1 1 3.244 1 6c0 2.758 2.243 5 5 5s5-2.242 5-5c0-2.756-2.243-5-5-5zm0 2.376a.625.625 0 110 1.25.625.625 0 010-1.25zM7.5 8.5h-3v-1h1V6H5V5h1a.5.5 0 01.5.5v2h1v1z" />
         </Icon>
     );
 }
@@ -143,8 +139,8 @@ export function OwnerCrownIcon(props: IconProps) {
         >
             <path
                 fill="currentColor"
-                fillRule="evenodd"
-                clipRule="evenodd"
+                fill-rule="evenodd"
+                clip-rule="evenodd"
                 d="M13.6572 5.42868C13.8879 5.29002 14.1806 5.30402 14.3973 5.46468C14.6133 5.62602 14.7119 5.90068 14.6473 6.16202L13.3139 11.4954C13.2393 11.7927 12.9726 12.0007 12.6666 12.0007H3.33325C3.02725 12.0007 2.76058 11.792 2.68592 11.4954L1.35258 6.16202C1.28792 5.90068 1.38658 5.62602 1.60258 5.46468C1.81992 5.30468 2.11192 5.29068 2.34325 5.42868L5.13192 7.10202L7.44592 3.63068C7.46173 3.60697 7.48377 3.5913 7.50588 3.57559C7.5192 3.56612 7.53255 3.55663 7.54458 3.54535L6.90258 2.90268C6.77325 2.77335 6.77325 2.56068 6.90258 2.43135L7.76458 1.56935C7.89392 1.44002 8.10658 1.44002 8.23592 1.56935L9.09792 2.43135C9.22725 2.56068 9.22725 2.77335 9.09792 2.90268L8.45592 3.54535C8.46794 3.55686 8.48154 3.56651 8.49516 3.57618C8.51703 3.5917 8.53897 3.60727 8.55458 3.63068L10.8686 7.10202L13.6572 5.42868ZM2.66667 12.6673H13.3333V14.0007H2.66667V12.6673Z"
             />
         </Icon>
@@ -163,6 +159,8 @@ export function ScreenshareIcon(props: IconProps) {
         >
             <path
                 fill="currentColor"
+                fill-rule="evenodd"
+                clip-rule="evenodd"
                 d="M2 4.5C2 3.397 2.897 2.5 4 2.5H20C21.103 2.5 22 3.397 22 4.5V15.5C22 16.604 21.103 17.5 20 17.5H13V19.5H17V21.5H7V19.5H11V17.5H4C2.897 17.5 2 16.604 2 15.5V4.5ZM13.2 14.3375V11.6C9.864 11.6 7.668 12.6625 6 15C6.672 11.6625 8.532 8.3375 13.2 7.6625V5L18 9.6625L13.2 14.3375Z"
             />
         </Icon>
@@ -200,58 +198,8 @@ export function Microphone(props: IconProps) {
             className={classes(props.className, "vc-microphone")}
             viewBox="0 0 24 24"
         >
-            <path fillRule="evenodd" clipRule="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 fillRule="evenodd" clipRule="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" />
+            <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 >
     );
 }
-
-export function CogWheel(props: IconProps) {
-    return (
-        <Icon
-            {...props}
-            className={classes(props.className, "vc-cog-wheel")}
-            viewBox="0 0 24 24"
-        >
-            <path
-                clipRule="evenodd"
-                fill="currentColor"
-                d="M19.738 10H22V14H19.739C19.498 14.931 19.1 15.798 18.565 16.564L20 18L18 20L16.565 18.564C15.797 19.099 14.932 19.498 14 19.738V22H10V19.738C9.069 19.498 8.203 19.099 7.436 18.564L6 20L4 18L5.436 16.564C4.901 15.799 4.502 14.932 4.262 14H2V10H4.262C4.502 9.068 4.9 8.202 5.436 7.436L4 6L6 4L7.436 5.436C8.202 4.9 9.068 4.502 10 4.262V2H14V4.261C14.932 4.502 15.797 4.9 16.565 5.435L18 3.999L20 5.999L18.564 7.436C19.099 8.202 19.498 9.069 19.738 10ZM12 16C14.2091 16 16 14.2091 16 12C16 9.79086 14.2091 8 12 8C9.79086 8 8 9.79086 8 12C8 14.2091 9.79086 16 12 16Z"
-            />
-        </Icon>
-    );
-}
-
-export function ReplyIcon(props: IconProps) {
-    return (
-        <Icon
-            {...props}
-            className={classes(props.className, "vc-reply-icon")}
-            viewBox="0 0 24 24"
-        >
-            <path
-                fill="currentColor"
-                d="M10 8.26667V4L3 11.4667L10 18.9333V14.56C15 14.56 18.5 16.2667 21 20C20 14.6667 17 9.33333 10 8.26667Z"
-            />
-        </Icon>
-    );
-}
-
-export function DeleteIcon(props: IconProps) {
-    return (
-        <Icon
-            {...props}
-            className={classes(props.className, "vc-delete-icon")}
-            viewBox="0 0 24 24"
-        >
-            <path
-                fill="currentColor"
-                d="M15 3.999V2H9V3.999H3V5.999H21V3.999H15Z"
-            />
-            <path
-                fill="currentColor"
-                d="M5 6.99902V18.999C5 20.101 5.897 20.999 7 20.999H17C18.103 20.999 19 20.101 19 18.999V6.99902H5ZM11 17H9V11H11V17ZM15 17H13V11H15V17Z"
-            />
-        </Icon>
-    );
-}

src/components/PluginSettings/ContributorModal.tsx

@@ -1,113 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import "./contributorModal.css";
-
-import { useSettings } from "@api/Settings";
-import { classNameFactory } from "@api/Styles";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { DevsById } from "@utils/constants";
-import { fetchUserProfile, getTheme, Theme } from "@utils/discord";
-import { ModalContent, ModalRoot, openModal } from "@utils/modal";
-import { Forms, MaskedLink, showToast, useEffect, useMemo, UserProfileStore, useStateFromStores } from "@webpack/common";
-import { User } from "discord-types/general";
-
-import Plugins from "~plugins";
-
-import { PluginCard } from ".";
-
-const WebsiteIconDark = "/assets/e1e96d89e192de1997f73730db26e94f.svg";
-const WebsiteIconLight = "/assets/730f58bcfd5a57a5e22460c445a0c6cf.svg";
-const GithubIconLight = "/assets/3ff98ad75ac94fa883af5ed62d17c459.svg";
-const GithubIconDark = "/assets/6a853b4c87fce386cbfef4a2efbacb09.svg";
-
-const cl = classNameFactory("vc-author-modal-");
-
-export function openContributorModal(user: User) {
-    openModal(modalProps =>
-        <ModalRoot {...modalProps}>
-            <ErrorBoundary>
-                <ModalContent className={cl("root")}>
-                    <ContributorModal user={user} />
-                </ModalContent>
-            </ErrorBoundary>
-        </ModalRoot>
-    );
-}
-
-function GithubIcon() {
-    const src = getTheme() === Theme.Light ? GithubIconLight : GithubIconDark;
-    return <img src={src} alt="GitHub" />;
-}
-
-function WebsiteIcon() {
-    const src = getTheme() === Theme.Light ? WebsiteIconLight : WebsiteIconDark;
-    return <img src={src} alt="Website" />;
-}
-
-function ContributorModal({ user }: { user: User; }) {
-    useSettings();
-
-    const profile = useStateFromStores([UserProfileStore], () => UserProfileStore.getUserProfile(user.id));
-
-    useEffect(() => {
-        if (!profile && !user.bot && user.id)
-            fetchUserProfile(user.id);
-    }, [user.id]);
-
-    const githubName = profile?.connectedAccounts?.find(a => a.type === "github")?.name;
-    const website = profile?.connectedAccounts?.find(a => a.type === "domain")?.name;
-
-    const plugins = useMemo(() => {
-        const allPlugins = Object.values(Plugins);
-        const pluginsByAuthor = DevsById[user.id]
-            ? allPlugins.filter(p => p.authors.includes(DevsById[user.id]))
-            : allPlugins.filter(p => p.authors.some(a => a.name === user.username));
-
-        return pluginsByAuthor
-            .filter(p => !p.name.endsWith("API"))
-            .sort((a, b) => Number(a.required ?? false) - Number(b.required ?? false));
-    }, [user.id, user.username]);
-
-    return (
-        <>
-            <div className={cl("header")}>
-                <img
-                    className={cl("avatar")}
-                    src={user.getAvatarURL(void 0, 512, true)}
-                    alt=""
-                />
-                <Forms.FormTitle tag="h2" className={cl("name")}>{user.username}</Forms.FormTitle>
-
-                <div className={cl("links")}>
-                    {website && (
-                        <MaskedLink
-                            href={"https://" + website}
-                        >
-                            <WebsiteIcon />
-                        </MaskedLink>
-                    )}
-                    {githubName && (
-                        <MaskedLink href={`https://github.com/${githubName}`}>
-                            <GithubIcon />
-                        </MaskedLink>
-                    )}
-                </div>
-            </div>
-
-            <div className={cl("plugins")}>
-                {plugins.map(p =>
-                    <PluginCard
-                        key={p.name}
-                        plugin={p}
-                        disabled={p.required ?? false}
-                        onRestartNeeded={() => showToast("Restart to apply changes!")}
-                    />
-                )}
-            </div>
-        </>
-    );
-}

src/components/PluginSettings/PluginModal.tsx

@@ -18,16 +18,17 @@
 
 import { generateId } from "@api/Commands";
 import { useSettings } from "@api/Settings";
+import { disableStyle, enableStyle } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { proxyLazy } from "@utils/lazy";
 import { Margins } from "@utils/margins";
-import { classes, isObjectEmpty } from "@utils/misc";
+import { classes } from "@utils/misc";
 import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize } from "@utils/modal";
 import { LazyComponent } from "@utils/react";
 import { OptionType, Plugin } from "@utils/types";
 import { findByCode, findByPropsLazy } from "@webpack";
-import { Button, Clickable, FluxDispatcher, Forms, React, Text, Tooltip, UserStore, UserUtils } from "@webpack/common";
+import { Button, FluxDispatcher, Forms, React, Text, Tooltip, UserStore, UserUtils } from "@webpack/common";
 import { User } from "discord-types/general";
 import { Constructor } from "type-fest";
 
@@ -40,7 +41,7 @@ import {
     SettingSliderComponent,
     SettingTextComponent
 } from "./components";
-import { openContributorModal } from "./ContributorModal";
+import hideBotTagStyle from "./userPopoutHideBotTag.css?managed";
 
 const UserSummaryItem = LazyComponent(() => findByCode("defaultRenderUser", "showDefaultAvatarsForNullUsers"));
 const AvatarStyles = findByPropsLazy("moreUsers", "emptyUser", "avatarContainer", "clickableAvatar");
@@ -88,19 +89,30 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
 
     const canSubmit = () => Object.values(errors).every(e => !e);
 
-    const hasSettings = Boolean(pluginSettings && plugin.options && !isObjectEmpty(plugin.options));
+    const hasSettings = Boolean(pluginSettings && plugin.options);
 
     React.useEffect(() => {
+        enableStyle(hideBotTagStyle);
+
+        let originalUser: User;
         (async () => {
             for (const user of plugin.authors.slice(0, 6)) {
                 const author = user.id
                     ? await UserUtils.fetchUser(`${user.id}`)
+                        // only show name & pfp and no actions so users cannot harass plugin devs for support (send dms, add as friend, etc)
+                        .then(u => (originalUser = u, makeDummyUser(u)))
                         .catch(() => makeDummyUser({ username: user.name }))
                     : makeDummyUser({ username: user.name });
 
                 setAuthors(a => [...a, author]);
             }
         })();
+
+        return () => {
+            disableStyle(hideBotTagStyle);
+            if (originalUser)
+                FluxDispatcher.dispatch({ type: "USER_UPDATE", user: originalUser });
+        };
     }, []);
 
     async function saveAndClose() {
@@ -202,19 +214,6 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
                             showDefaultAvatarsForNullUsers
                             showUserPopout
                             renderMoreUsers={renderMoreUsers}
-                            renderUser={(user: User) => (
-                                <Clickable
-                                    className={AvatarStyles.clickableAvatar}
-                                    onClick={() => openContributorModal(user)}
-                                >
-                                    <img
-                                        className={AvatarStyles.avatar}
-                                        src={user.getAvatarURL(void 0, 80, true)}
-                                        alt={user.username}
-                                        title={user.username}
-                                    />
-                                </Clickable>
-                            )}
                         />
                     </div>
                 </Forms.FormSection>
@@ -238,7 +237,7 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
                         <Button
                             onClick={onClose}
                             size={Button.Sizes.SMALL}
-                            color={Button.Colors.PRIMARY}
+                            color={Button.Colors.WHITE}
                             look={Button.Looks.LINK}
                         >
                             Cancel

src/components/PluginSettings/components/SettingTextComponent.tsx

@@ -33,10 +33,11 @@ export function SettingTextComponent({ option, pluginSettings, definedSettings,
         const isValid = option.isValid?.call(definedSettings, newValue) ?? true;
         if (typeof isValid === "string") setError(isValid);
         else if (!isValid) setError("Invalid input provided.");
-        else setError(null);
-
-        setState(newValue);
-        onChange(newValue);
+        else {
+            setError(null);
+            setState(newValue);
+            onChange(newValue);
+        }
     }
 
     return (

src/components/PluginSettings/contributorModal.css

@@ -1,57 +0,0 @@
-.vc-author-modal-root {
-    padding: 1em;
-}
-
-.vc-author-modal-header {
-    display: flex;
-    align-items: center;
-    margin-bottom: 1em;
-}
-
-.vc-author-modal-name {
-    text-transform: none;
-    flex-grow: 0;
-    background: var(--background-tertiary);
-    border-radius: 0 9999px 9999px 0;
-    padding: 6px 0.8em 6px 0.5em;
-    font-size: 20px;
-    height: 20px;
-    position: relative;
-}
-
-.vc-author-modal-name::before {
-    content: "";
-    display: block;
-    position: absolute;
-    height: 100%;
-    width: 16px;
-    background: var(--background-tertiary);
-    z-index: -1;
-    left: -16px;
-    top: 0;
-}
-
-.vc-author-modal-avatar {
-    height: 32px;
-    width: 32px;
-    border-radius: 50%;
-}
-
-.vc-author-modal-links {
-    margin-left: auto;
-    display: flex;
-    gap: 0.2em;
-}
-
-.vc-author-modal-links img {
-    height: 32px;
-    width: 32px;
-    border-radius: 50%;
-    border: 4px solid var(--background-tertiary);
-    box-sizing: border-box
-}
-
-.vc-author-modal-plugins {
-    display: grid;
-    gap: 0.5em;
-}

src/components/PluginSettings/index.tsx

@@ -22,18 +22,17 @@ import * as DataStore from "@api/DataStore";
 import { showNotice } from "@api/Notices";
 import { Settings, useSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
-import { CogWheel, InfoIcon } from "@components/Icons";
 import PluginModal from "@components/PluginSettings/PluginModal";
 import { AddonCard } from "@components/VencordSettings/AddonCard";
 import { SettingsTab } from "@components/VencordSettings/shared";
 import { ChangeList } from "@utils/ChangeList";
 import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
-import { classes, isObjectEmpty } from "@utils/misc";
+import { classes } from "@utils/misc";
 import { openModalLazy } from "@utils/modal";
-import { useAwaiter } from "@utils/react";
+import { LazyComponent, useAwaiter } from "@utils/react";
 import { Plugin } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { findByCode, findByPropsLazy } from "@webpack";
 import { Alerts, Button, Card, Forms, Parser, React, Select, Text, TextInput, Toasts, Tooltip } from "@webpack/common";
 
 import Plugins from "~plugins";
@@ -47,6 +46,8 @@ const logger = new Logger("PluginSettings", "#a6d189");
 const InputStyles = findByPropsLazy("inputDefault", "inputWrapper");
 const ButtonClasses = findByPropsLazy("button", "disabled", "enabled");
 
+const CogWheel = LazyComponent(() => findByCode("18.564C15.797 19.099 14.932 19.498 14 19.738V22H10V19.738C9.069"));
+const InfoIcon = LazyComponent(() => findByCode("4.4408921e-16 C4.4771525,-1.77635684e-15 4.4408921e-16"));
 
 function showErrorToast(message: string) {
     Toasts.show({
@@ -90,7 +91,7 @@ interface PluginCardProps extends React.HTMLProps<HTMLDivElement> {
     isNew?: boolean;
 }
 
-export function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, onMouseLeave, isNew }: PluginCardProps) {
+function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, onMouseLeave, isNew }: PluginCardProps) {
     const settings = Settings.plugins[plugin.name];
 
     const isEnabled = () => settings.enabled ?? false;
@@ -160,9 +161,9 @@ export function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, on
             onMouseLeave={onMouseLeave}
             infoButton={
                 <button role="switch" onClick={() => openModal()} className={classes(ButtonClasses.button, cl("info-button"))}>
-                    {plugin.options && !isObjectEmpty(plugin.options)
+                    {plugin.options
                         ? <CogWheel />
-                        : <InfoIcon />}
+                        : <InfoIcon width="24" height="24" />}
                 </button>
             }
         />

src/components/PluginSettings/userPopoutHideBotTag.css

@@ -0,0 +1,3 @@
+[class|="userPopoutOuter"] [class*="botTag"] {
+    display: none;
+}

src/components/VencordSettings/PatchHelperTab.tsx

@@ -17,7 +17,6 @@
 */
 
 import { CheckedTextInput } from "@components/CheckedTextInput";
-import { CodeBlock } from "@components/CodeBlock";
 import { debounce } from "@utils/debounce";
 import { Margins } from "@utils/margins";
 import { canonicalizeMatch, canonicalizeReplace } from "@utils/patches";
@@ -300,7 +299,7 @@ function PatchHelper() {
             {!!(find && match && replacement) && (
                 <>
                     <Forms.FormTitle className={Margins.top20}>Code</Forms.FormTitle>
-                    <CodeBlock lang="js" content={code} />
+                    <div style={{ userSelect: "text" }}>{Parser.parse(makeCodeblock(code, "ts"))}</div>
                     <Button onClick={() => Clipboard.copy(code)}>Copy to Clipboard</Button>
                 </>
             )}

src/components/VencordSettings/ThemesTab.tsx

@@ -18,11 +18,8 @@
 
 import { useSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
-import { ErrorCard } from "@components/ErrorCard";
 import { Flex } from "@components/Flex";
-import { DeleteIcon } from "@components/Icons";
 import { Link } from "@components/Link";
-import { IsFirefox } from "@utils/constants";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
 import { showItemInFolder } from "@utils/native";
@@ -43,6 +40,7 @@ type FileInput = ComponentType<{
 }>;
 
 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");
 
@@ -114,7 +112,7 @@ function ThemeCard({ theme, enabled, onChange, onDelete }: ThemeCardProps) {
             infoButton={
                 IS_WEB && (
                     <div style={{ cursor: "pointer", color: "var(--status-danger" }} onClick={onDelete}>
-                        <DeleteIcon />
+                        <TrashIcon />
                     </div>
                 )
             }
@@ -233,7 +231,7 @@ function ThemesTab() {
                                             ref={fileInputRef}
                                             onChange={onFileUpload}
                                             multiple={true}
-                                            filters={[{ extensions: ["css"] }]}
+                                            filters={[{ extensions: ["*.css"] }]}
                                         />
                                     </Button>
                                 ) : (
@@ -251,14 +249,12 @@ function ThemesTab() {
                             >
                                 Load missing Themes
                             </Button>
-                            {!IsFirefox && (
-                                <Button
-                                    onClick={() => VencordNative.quickCss.openEditor()}
-                                    size={Button.Sizes.SMALL}
-                                >
-                                    Edit QuickCSS
-                                </Button>
-                            )}
+                            <Button
+                                onClick={() => VencordNative.quickCss.openEditor()}
+                                size={Button.Sizes.SMALL}
+                            >
+                                Edit QuickCSS
+                            </Button>
                         </>
                     </Card>
 
@@ -320,15 +316,6 @@ function ThemesTab() {
 
     return (
         <SettingsTab title="Themes">
-            {IsFirefox && (
-                <ErrorCard>
-                    <Forms.FormTitle tag="h5">Warning</Forms.FormTitle>
-                    <Forms.FormText>
-                        You are using Firefox. Expect the vast majority of themes to not work.
-                        If this is a problem, use a chromium browser or Discord Desktop / Vesktop.
-                    </Forms.FormText>
-                </ErrorCard>
-            )}
             <TabBar
                 type="top"
                 look="brand"

src/components/VencordSettings/UpdaterTab.tsx

@@ -249,4 +249,4 @@ function Updater() {
     );
 }
 
-export default IS_UPDATER_DISABLED ? null : wrapTab(Updater, "Updater");
+export default IS_WEB ? null : wrapTab(Updater, "Updater");

src/components/VencordSettings/VencordTab.tsx

@@ -16,12 +16,12 @@
  * 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";
 import DonateButton from "@components/DonateButton";
 import { ErrorCard } from "@components/ErrorCard";
-import { IsFirefox } from "@utils/constants";
 import { Margins } from "@utils/margins";
 import { identity } from "@utils/misc";
 import { relaunch, showItemInFolder } from "@utils/native";
@@ -110,14 +110,12 @@ function VencordSettings() {
                                 Restart Client
                             </Button>
                         )}
-                        {!IsFirefox && (
-                            <Button
-                                onClick={() => VencordNative.quickCss.openEditor()}
-                                size={Button.Sizes.SMALL}
-                                disabled={settingsDir === "Loading..."}>
-                                Open QuickCSS File
-                            </Button>
-                        )}
+                        <Button
+                            onClick={() => VencordNative.quickCss.openEditor()}
+                            size={Button.Sizes.SMALL}
+                            disabled={settingsDir === "Loading..."}>
+                            Open QuickCSS File
+                        </Button>
                         {!IS_WEB && (
                             <Button
                                 onClick={() => showItemInFolder(settingsDir)}
@@ -260,11 +258,7 @@ function DonateCard({ image }: DonateCardProps) {
                 src={image}
                 alt=""
                 height={128}
-                style={{
-                    imageRendering: image === SHIGGY_DONATE_IMAGE ? "pixelated" : void 0,
-                    marginLeft: "auto",
-                    transform: image === DEFAULT_DONATE_IMAGE ? "rotate(10deg)" : void 0
-                }}
+                style={{ marginLeft: "auto", transform: image === DEFAULT_DONATE_IMAGE ? "rotate(10deg)" : "" }}
             />
         </Card>
     );

src/components/VencordSettings/addonCard.css

@@ -8,7 +8,6 @@
     width: 100%;
     transition: 0.1s ease-out;
     transition-property: box-shadow, transform, background, opacity;
-    box-sizing: border-box;
 }
 
 .vc-addon-card-disabled {

src/globals.d.ts

@@ -33,12 +33,10 @@ declare global {
      * replace: `${IS_WEB}?foo:bar`
      */
     export var IS_WEB: boolean;
-    export var IS_EXTENSION: boolean;
     export var IS_DEV: boolean;
     export var IS_STANDALONE: boolean;
-    export var IS_UPDATER_DISABLED: 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;
 
@@ -60,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 VesktopNative: any;
+    export var VencordDesktop: any;
+    export var VencordDesktopNative: any;
 
     interface Window {
         webpackChunkdiscord_app: {

src/main/index.ts

@@ -23,7 +23,7 @@ import { ensureSafePath, getSettings } from "./ipcMain";
 import { IS_VANILLA, THEMES_DIR } 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
@@ -44,7 +44,6 @@ if (IS_VESKTOP || !IS_VANILLA) {
                 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));

src/main/ipcMain.ts

@@ -22,12 +22,12 @@ import "./ipcPlugins";
 import { debounce } from "@utils/debounce";
 import { IpcEvents } from "@utils/IpcEvents";
 import { Queue } from "@utils/Queue";
-import { BrowserWindow, ipcMain, shell, systemPreferences } from "electron";
+import { BrowserWindow, ipcMain, shell } from "electron";
 import { mkdirSync, readFileSync, watch } from "fs";
 import { open, readdir, readFile, writeFile } from "fs/promises";
 import { join, normalize } from "path";
 
-import monacoHtml from "~fileContent/monacoWin.html;base64";
+import monacoHtml from "~fileContent/../components/monacoWin.html;base64";
 
 import { getThemeInfo, stripBOM, UserThemeHeader } from "./themes";
 import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE, THEMES_DIR } from "./utils/constants";
@@ -53,12 +53,10 @@ async function listThemes(): Promise<UserThemeHeader[]> {
     const themeInfo: UserThemeHeader[] = [];
 
     for (const fileName of files) {
-        if (!fileName.endsWith(".css")) continue;
-
         const data = await getThemeData(fileName).then(stripBOM).catch(() => null);
-        if (data == null) continue;
-
-        themeInfo.push(getThemeInfo(data, fileName));
+        if (!data) continue;
+        const parsed = getThemeInfo(data, fileName);
+        themeInfo.push(parsed);
     }
 
     return themeInfo;
@@ -112,10 +110,6 @@ ipcMain.handle(IpcEvents.SET_QUICK_CSS, (_, 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_THEME_SYSTEM_VALUES, () => ({
-    // win & mac only
-    "os-accent-color": `#${systemPreferences.getAccentColor?.() || ""}`
-}));
 
 ipcMain.handle(IpcEvents.GET_SETTINGS_DIR, () => SETTINGS_DIR);
 ipcMain.on(IpcEvents.GET_SETTINGS, e => e.returnValue = readSettings());
@@ -144,7 +138,7 @@ 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

src/main/ipcPlugins.ts

@@ -22,28 +22,6 @@ import { readFile } from "fs/promises";
 import { request } from "https";
 import { basename, normalize } from "path";
 
-import { getSettings } from "./ipcMain";
-
-// FixSpotifyEmbeds
-app.on("browser-window-created", (_, win) => {
-    win.webContents.on("frame-created", (_, { frame }) => {
-        frame.once("dom-ready", () => {
-            if (frame.url.startsWith("https://open.spotify.com/embed/")) {
-                const settings = getSettings().plugins?.FixSpotifyEmbeds;
-                if (!settings?.enabled) return;
-
-                frame.executeJavaScript(`
-                    const original = Audio.prototype.play;
-                    Audio.prototype.play = function() {
-                        this.volume = ${(settings.volume / 100) || 0.1};
-                        return original.apply(this, arguments);
-                    }
-                `);
-            }
-        });
-    });
-});
-
 // #region OpenInApp
 // These links don't support CORS, so this has to be native
 const validRedirectUrls = /^https:\/\/(spotify\.link|s\.team)\/.+$/;

src/main/patchWin32Updater.ts

@@ -16,10 +16,22 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { app } from "electron";
+import { app, autoUpdater } from "electron";
 import { existsSync, mkdirSync, readdirSync, renameSync, statSync, writeFileSync } from "fs";
 import { basename, dirname, join } from "path";
 
+const { setAppUserModelId } = app;
+
+// Apparently requiring Discords updater too early leads into issues,
+// copied this workaround from powerCord
+app.setAppUserModelId = function (id: string) {
+    app.setAppUserModelId = setAppUserModelId;
+
+    setAppUserModelId.call(this, id);
+
+    patchUpdater();
+};
+
 function isNewer($new: string, old: string) {
     const newParts = $new.slice(4).split(".").map(Number);
     const oldParts = old.slice(4).split(".").map(Number);
@@ -65,6 +77,23 @@ function patchLatest() {
     }
 }
 
-// Try to patch latest on before-quit
-// Discord's Win32 updater will call app.quit() on restart and open new version on will-quit
-app.on("before-quit", patchLatest);
+// Windows Host Updates install to a new folder app-{HOST_VERSION}, so we
+// need to reinject
+function patchUpdater() {
+    try {
+        const autoStartScript = join(require.main!.filename, "..", "autoStart", "win32.js");
+        const { update } = require(autoStartScript);
+
+        require.cache[autoStartScript]!.exports.update = function () {
+            update.apply(this, arguments);
+            patchLatest();
+        };
+    } catch {
+        // OpenAsar uses electrons autoUpdater on Windows
+        const { quitAndInstall } = autoUpdater;
+        autoUpdater.quitAndInstall = function () {
+            patchLatest();
+            quitAndInstall.call(this);
+        };
+    }
+}

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/index.ts

@@ -1,4 +1,4 @@
-/* eslint-disable simple-header/header */
+/* eslint-disable header/header */
 
 /*!
  * BetterDiscord addon meta parser

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/updater/index.ts

@@ -16,5 +16,4 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-if (!IS_UPDATER_DISABLED)
-    import(IS_STANDALONE ? "./http" : "./git");
+import(IS_STANDALONE ? "./http" : "./git");

src/main/utils/crxToZip.ts

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

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)/,
-                replace: "$1[$2].concat(Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.Above))"
+                match: /(Messages\.DISCODO_DISABLED\);return)(.*?homeIcon.*?)(\}function)/,
+                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 "aboveNitro": return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.BILLING_SETTINGS\}/;
-                    case "belowNitro": return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.APP_SETTINGS\}/;
-                    case "belowActivity": return /(?<=\{section:(\i)\.ID\.DIVIDER},)\{section:"changelog"/;
-                    case "bottom": return /\{section:(\i)\.ID\.CUSTOM,\s*element:.+?}/;
-                    case "aboveActivity":
-                    default:
-                        return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.ACTIVITY_SETTINGS\}/;
+                    case "top": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.USER_SETTINGS\}/;
+                    case "aboveNitro": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.BILLING_SETTINGS\}/;
+                    case "belowNitro": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.APP_SETTINGS\}/;
+                    case "aboveActivity": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.ACTIVITY_SETTINGS\}/;
+                    case "belowActivity": return /(?<=\{section:(.{1,2})\.ID\.DIVIDER},)\{section:"changelog"/;
+                    case "bottom": return /\{section:(.{1,2})\.ID\.CUSTOM,\s*element:.+?}/;
+                    default: {
+                        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",
-                className: "vc-settings-header"
+                label: "Vencord"
             },
             {
                 section: "VencordSettings",
                 label: "Vencord",
-                element: require("@components/VencordSettings/VencordTab").default,
-                className: "vc-settings"
+                element: require("@components/VencordSettings/VencordTab").default
             },
             {
                 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_UPDATER_DISABLED && {
+            !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 = tarMatch?.index ?? file.lastIndexOf(".");
+        const extIdx = 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/betterRoleDot.ts

@@ -23,7 +23,7 @@ import { Clipboard, Toasts } from "@webpack/common";
 
 export default definePlugin({
     name: "BetterRoleDot",
-    authors: [Devs.Ven, Devs.AutumnVN],
+    authors: [Devs.Ven],
     description:
         "Copy role colour on RoleDot (accessibility setting) click. Also allows using both RoleDot and coloured names simultaneously",
 
@@ -43,23 +43,6 @@ export default definePlugin({
                 match: /"(?:username|dot)"===\i(?!\.\i)/g,
                 replace: "true",
             },
-        },
-
-        {
-            find: ".ADD_ROLE_A11Y_LABEL",
-            predicate: () => Settings.plugins.BetterRoleDot.copyRoleColorInProfilePopout && !Settings.plugins.BetterRoleDot.bothStyles,
-            replacement: {
-                match: /"dot"===\i/,
-                replace: "true"
-            }
-        },
-        {
-            find: ".roleVerifiedIcon",
-            predicate: () => Settings.plugins.BetterRoleDot.copyRoleColorInProfilePopout && !Settings.plugins.BetterRoleDot.bothStyles,
-            replacement: {
-                match: /"dot"===\i/,
-                replace: "true"
-            }
         }
     ],
 
@@ -67,14 +50,7 @@ export default definePlugin({
         bothStyles: {
             type: OptionType.BOOLEAN,
             description: "Show both role dot and coloured names",
-            restartNeeded: true,
             default: false,
-        },
-        copyRoleColorInProfilePopout: {
-            type: OptionType.BOOLEAN,
-            description: "Allow click on role dot in profile popout to copy role color",
-            restartNeeded: true,
-            default: false
         }
     },
 

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/blurNsfw.ts

@@ -49,7 +49,7 @@ export default definePlugin({
                 replace: "$1,vcProps=$2$3+(vcProps.channel.nsfw?' vc-nsfw-img':'')"
             }, {
                 match: /(\.renderAttachments=.+?(.)=this\.props)(.+?\.embedWrapper)/g,
-                replace: "$1,vcProps=$2$3+(vcProps.nsfw?' vc-nsfw-img':'')"
+                replace: "$1,vcProps=$2$3+(vcProps.channel.nsfw?' vc-nsfw-img':'')"
             }]
         }
     ],

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",
@@ -127,9 +128,6 @@ export const defaultRules = [
     "redircnt@yandex.*",
     "feature@youtube.com",
     "kw@youtube.com",
-    "si@youtube.com",
-    "pp@youtube.com",
-    "si@youtu.be",
     "wt_zmc",
     "utm_source",
     "utm_content",
@@ -138,5 +136,4 @@ export const defaultRules = [
     "utm_term",
     "si@open.spotify.com",
     "igshid",
-    "share_id@reddit.com",
 ];

src/plugins/copyUserURLs/index.tsx

@@ -1,55 +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 { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
-import { LinkIcon } from "@components/Icons";
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-import { Clipboard, Menu } from "@webpack/common";
-import type { Channel, User } from "discord-types/general";
-
-interface UserContextProps {
-    channel: Channel;
-    guildId?: string;
-    user: User;
-}
-
-const UserContextMenuPatch: NavContextMenuPatchCallback = (children, { user }: UserContextProps) => () => {
-    children.push(
-        <Menu.MenuItem
-            id="vc-copy-user-url"
-            label="Copy User URL"
-            action={() => Clipboard.copy(`<https://discord.com/users/${user.id}>`)}
-            icon={LinkIcon}
-        />
-    );
-};
-
-export default definePlugin({
-    name: "CopyUserURLs",
-    authors: [Devs.castdrian],
-    description: "Adds a 'Copy User URL' option to the user context menu.",
-
-    start() {
-        addContextMenuPatch("user-context", UserContextMenuPatch);
-    },
-
-    stop() {
-        removeContextMenuPatch("user-context", UserContextMenuPatch);
-    },
-});

src/plugins/crashHandler.ts

@@ -23,12 +23,10 @@ import { Logger } from "@utils/Logger";
 import { closeAllModals } from "@utils/modal";
 import definePlugin, { OptionType } from "@utils/types";
 import { maybePromptToUpdate } from "@utils/updater";
-import { findByPropsLazy } from "@webpack";
 import { FluxDispatcher, NavigationRouter } from "@webpack/common";
 import type { ReactElement } from "react";
 
 const CrashHandlerLogger = new Logger("CrashHandler");
-const ModalStack = findByPropsLazy("pushLazy", "popAll");
 
 const settings = definePluginSettings({
     attemptToPreventCrashes: {
@@ -53,6 +51,8 @@ export default definePlugin({
     authors: [Devs.Nuckyz],
     enabledByDefault: true,
 
+    popAllModals: undefined as (() => void) | undefined,
+
     settings,
 
     patches: [
@@ -62,6 +62,13 @@ export default definePlugin({
                 match: /(?=this\.setState\()/,
                 replace: "$self.handleCrash(this)||"
             }
+        },
+        {
+            find: 'dispatch({type:"MODAL_POP_ALL"})',
+            replacement: {
+                match: /"MODAL_POP_ALL".+?};(?<=(\i)=function.+?)/,
+                replace: (m, popAll) => `${m}$self.popAllModals=${popAll};`
+            }
         }
     ],
 
@@ -121,7 +128,7 @@ export default definePlugin({
             CrashHandlerLogger.debug("Failed to close open context menu.", err);
         }
         try {
-            ModalStack?.popAll();
+            this.popAllModals?.();
         } catch (err) {
             CrashHandlerLogger.debug("Failed to close old modals.", err);
         }

src/plugins/customRPC.tsx

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { definePluginSettings, Settings } from "@api/Settings";
+import { definePluginSettings } from "@api/Settings";
 import { Link } from "@components/Link";
 import { Devs } from "@utils/constants";
 import { isTruthy } from "@utils/guards";
@@ -86,7 +86,8 @@ const settings = definePluginSettings({
     appID: {
         type: OptionType.STRING,
         description: "Application ID (required)",
-        onChange: onChange,
+        restartNeeded: true,
+        onChange: setRpc,
         isValid: (value: string) => {
             if (!value) return "Application ID is required.";
             if (value && !/^\d+$/.test(value)) return "Application ID must be a number.";
@@ -96,7 +97,8 @@ const settings = definePluginSettings({
     appName: {
         type: OptionType.STRING,
         description: "Application name (required)",
-        onChange: onChange,
+        restartNeeded: true,
+        onChange: setRpc,
         isValid: (value: string) => {
             if (!value) return "Application name is required.";
             if (value.length > 128) return "Application name must be not longer than 128 characters.";
@@ -106,7 +108,8 @@ const settings = definePluginSettings({
     details: {
         type: OptionType.STRING,
         description: "Details (line 1)",
-        onChange: onChange,
+        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;
@@ -115,7 +118,8 @@ const settings = definePluginSettings({
     state: {
         type: OptionType.STRING,
         description: "State (line 2)",
-        onChange: onChange,
+        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;
@@ -124,7 +128,8 @@ const settings = definePluginSettings({
     type: {
         type: OptionType.SELECT,
         description: "Activity type",
-        onChange: onChange,
+        restartNeeded: true,
+        onChange: setRpc,
         options: [
             {
                 label: "Playing",
@@ -152,14 +157,16 @@ const settings = definePluginSettings({
     streamLink: {
         type: OptionType.STRING,
         description: "Twitch.tv or Youtube.com link (only for Streaming activity type)",
-        onChange: onChange,
-        disabled: isStreamLinkDisabled,
+        restartNeeded: true,
+        onChange: setRpc,
+        isDisabled: isStreamLinkDisabled,
         isValid: isStreamLinkValid
     },
     timestampMode: {
         type: OptionType.SELECT,
         description: "Timestamp mode",
-        onChange: onChange,
+        restartNeeded: true,
+        onChange: setRpc,
         options: [
             {
                 label: "None",
@@ -183,8 +190,9 @@ const settings = definePluginSettings({
     startTime: {
         type: OptionType.NUMBER,
         description: "Start timestamp (only for custom timestamp mode)",
-        onChange: onChange,
-        disabled: isTimestampDisabled,
+        restartNeeded: true,
+        onChange: setRpc,
+        isDisabled: isTimestampDisabled,
         isValid: (value: number) => {
             if (value && value < 0) return "Start timestamp must be greater than 0.";
             return true;
@@ -193,8 +201,9 @@ const settings = definePluginSettings({
     endTime: {
         type: OptionType.NUMBER,
         description: "End timestamp (only for custom timestamp mode)",
-        onChange: onChange,
-        disabled: isTimestampDisabled,
+        restartNeeded: true,
+        onChange: setRpc,
+        isDisabled: isTimestampDisabled,
         isValid: (value: number) => {
             if (value && value < 0) return "End timestamp must be greater than 0.";
             return true;
@@ -202,14 +211,16 @@ const settings = definePluginSettings({
     },
     imageBig: {
         type: OptionType.STRING,
-        description: "Big image key/link",
-        onChange: onChange,
+        description: "Big image key",
+        restartNeeded: true,
+        onChange: setRpc,
         isValid: isImageKeyValid
     },
     imageBigTooltip: {
         type: OptionType.STRING,
         description: "Big image tooltip",
-        onChange: onChange,
+        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;
@@ -217,14 +228,16 @@ const settings = definePluginSettings({
     },
     imageSmall: {
         type: OptionType.STRING,
-        description: "Small image key/link",
-        onChange: onChange,
+        description: "Small image key",
+        restartNeeded: true,
+        onChange: setRpc,
         isValid: isImageKeyValid
     },
     imageSmallTooltip: {
         type: OptionType.STRING,
         description: "Small image tooltip",
-        onChange: onChange,
+        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;
@@ -233,7 +246,8 @@ const settings = definePluginSettings({
     buttonOneText: {
         type: OptionType.STRING,
         description: "Button 1 text",
-        onChange: onChange,
+        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;
@@ -242,12 +256,14 @@ const settings = definePluginSettings({
     buttonOneURL: {
         type: OptionType.STRING,
         description: "Button 1 URL",
-        onChange: onChange
+        restartNeeded: true,
+        onChange: setRpc
     },
     buttonTwoText: {
         type: OptionType.STRING,
         description: "Button 2 text",
-        onChange: onChange,
+        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;
@@ -256,29 +272,26 @@ const settings = definePluginSettings({
     buttonTwoURL: {
         type: OptionType.STRING,
         description: "Button 2 URL",
-        onChange: onChange
+        restartNeeded: true,
+        onChange: setRpc
     }
 });
 
-function onChange() {
-    setRpc(true);
-    if (Settings.plugins.CustomRPC.enabled) setRpc();
-}
-
-function isStreamLinkDisabled() {
+function isStreamLinkDisabled(): boolean {
     return settings.store.type !== ActivityType.STREAMING;
 }
 
-function isStreamLinkValid(value: string) {
-    if (!isStreamLinkDisabled() && !/https?:\/\/(www\.)?(twitch\.tv|youtube\.com)\/\w+/.test(value)) return "Streaming link must be a valid URL.";
+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() {
+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;
@@ -329,10 +342,13 @@ async function createActivity(): Promise<Activity | undefined> {
             };
             break;
         case TimestampMode.CUSTOM:
-            if (startTime || endTime) {
-                activity.timestamps = {};
-                if (startTime) activity.timestamps.start = startTime;
-                if (endTime) activity.timestamps.end = endTime;
+            if (startTime) {
+                activity.timestamps = {
+                    start: startTime,
+                };
+                if (endTime) {
+                    activity.timestamps.end = endTime;
+                }
             }
             break;
         case TimestampMode.NONE:

src/plugins/dearrow/README.md

@@ -1,5 +0,0 @@
-# Dearrow
-
-Makes YouTube embed titles and thumbnails less sensationalist, powered by [Dearrow](https://dearrow.ajay.app/)
-
-https://github.com/Vendicated/Vencord/assets/45497981/7bf81108-102d-47c5-8ba5-357db4db1283

src/plugins/dearrow/index.tsx

@@ -1,161 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import "./styles.css";
-
-import ErrorBoundary from "@components/ErrorBoundary";
-import { Devs } from "@utils/constants";
-import { Logger } from "@utils/Logger";
-import definePlugin from "@utils/types";
-import { Tooltip } from "@webpack/common";
-import type { Component } from "react";
-
-interface Props {
-    embed: {
-        rawTitle: string;
-        provider?: {
-            name: string;
-        };
-        thumbnail: {
-            proxyURL: string;
-        };
-        video: {
-            url: string;
-        };
-
-        dearrow: {
-            enabled: boolean;
-            oldTitle?: string;
-            oldThumb?: string;
-        };
-    };
-}
-
-const embedUrlRe = /https:\/\/www\.youtube\.com\/embed\/([a-zA-Z0-9_-]{11})/;
-
-async function embedDidMount(this: Component<Props>) {
-    try {
-        const { embed } = this.props;
-        if (!embed || embed.dearrow || embed.provider?.name !== "YouTube" || !embed.video?.url) return;
-
-        const videoId = embedUrlRe.exec(embed.video.url)?.[1];
-        if (!videoId) return;
-
-        const res = await fetch(`https://sponsor.ajay.app/api/branding?videoID=${videoId}`);
-        if (!res.ok) return;
-
-        const { titles, thumbnails } = await res.json();
-
-        const hasTitle = titles[0]?.votes >= 0;
-        const hasThumb = thumbnails[0]?.votes >= 0;
-
-        if (!hasTitle && !hasThumb) return;
-
-        embed.dearrow = {
-            enabled: true
-        };
-
-        if (titles[0]?.votes >= 0) {
-            embed.dearrow.oldTitle = embed.rawTitle;
-            embed.rawTitle = titles[0].title;
-        }
-
-        if (thumbnails[0]?.votes >= 0) {
-            embed.dearrow.oldThumb = embed.thumbnail.proxyURL;
-            embed.thumbnail.proxyURL = `https://dearrow-thumb.ajay.app/api/v1/getThumbnail?videoID=${videoId}&time=${thumbnails[0].timestamp}`;
-        }
-
-        this.forceUpdate();
-    } catch (err) {
-        new Logger("Dearrow").error("Failed to dearrow embed", err);
-    }
-}
-
-function DearrowButton({ component }: { component: Component<Props>; }) {
-    const { embed } = component.props;
-    if (!embed?.dearrow) return null;
-
-    return (
-        <Tooltip text={embed.dearrow.enabled ? "This embed has been dearrowed, click to restore" : "Click to dearrow"}>
-            {({ onMouseEnter, onMouseLeave }) => (
-                <button
-                    onMouseEnter={onMouseEnter}
-                    onMouseLeave={onMouseLeave}
-                    className={"vc-dearrow-toggle-" + (embed.dearrow.enabled ? "on" : "off")}
-                    onClick={() => {
-                        const { enabled, oldThumb, oldTitle } = embed.dearrow;
-                        embed.dearrow.enabled = !enabled;
-                        if (oldTitle) {
-                            embed.dearrow.oldTitle = embed.rawTitle;
-                            embed.rawTitle = oldTitle;
-                        }
-                        if (oldThumb) {
-                            embed.dearrow.oldThumb = embed.thumbnail.proxyURL;
-                            embed.thumbnail.proxyURL = oldThumb;
-                        }
-
-                        component.forceUpdate();
-                    }}
-                >
-                    {/* Dearrow Icon, taken from https://dearrow.ajay.app/logo.svg (and optimised) */}
-                    <svg
-                        xmlns="http://www.w3.org/2000/svg"
-                        width="24px"
-                        height="24px"
-                        viewBox="0 0 36 36"
-                        aria-label="Toggle Dearrow"
-                    >
-                        <path
-                            fill="#1213BD"
-                            d="M36 18.302c0 4.981-2.46 9.198-5.655 12.462s-7.323 5.152-12.199 5.152s-9.764-1.112-12.959-4.376S0 23.283 0 18.302s2.574-9.38 5.769-12.644S13.271 0 18.146 0s9.394 2.178 12.589 5.442C33.931 8.706 36 13.322 36 18.302z"
-                        />
-                        <path
-                            fill="#88c9f9"
-                            d="m 30.394282,18.410186 c 0,3.468849 -1.143025,6.865475 -3.416513,9.137917 -2.273489,2.272442 -5.670115,2.92874 -9.137918,2.92874 -3.467803,0 -6.373515,-1.147212 -8.6470033,-3.419654 -2.2734888,-2.272442 -3.5871299,-5.178154 -3.5871299,-8.647003 0,-3.46885 0.9420533,-6.746149 3.2144954,-9.0196379 2.2724418,-2.2734888 5.5507878,-3.9513905 9.0196378,-3.9513905 3.46885,0 6.492841,1.9322561 8.76633,4.204698 2.273489,2.2724424 3.788101,5.2974804 3.788101,8.7663304 z"
-                        />
-                        <path
-                            fill="#0a62a5"
-                            d="m 23.95823,17.818306 c 0,3.153748 -2.644888,5.808102 -5.798635,5.808102 -3.153748,0 -5.599825,-2.654354 -5.599825,-5.808102 0,-3.153747 2.446077,-5.721714 5.599825,-5.721714 3.153747,0 5.798635,2.567967 5.798635,5.721714 z"
-                        />
-                    </svg>
-
-                </button>
-            )}
-        </Tooltip>
-    );
-}
-
-export default definePlugin({
-    name: "Dearrow",
-    description: "Makes YouTube embed titles and thumbnails less sensationalist, powered by Dearrow",
-    authors: [Devs.Ven],
-
-    embedDidMount,
-    renderButton(component: Component<Props>) {
-        return (
-            <ErrorBoundary noop>
-                <DearrowButton component={component} />
-            </ErrorBoundary>
-        );
-    },
-
-    patches: [{
-        find: "this.renderInlineMediaEmbed",
-        replacement: [
-            // patch componentDidMount to replace embed thumbnail and title
-            {
-                match: /(\i).render=function.{0,50}\i\.embed/,
-                replace: "$1.componentDidMount=$self.embedDidMount,$&"
-            },
-
-            // add dearrow button
-            {
-                match: /children:\[(?=null!=\i\?\i\.renderSuppressButton)/,
-                replace: "children:[$self.renderButton(this),"
-            }
-        ]
-    }],
-});

src/plugins/dearrow/styles.css

@@ -1,12 +0,0 @@
-.vc-dearrow-toggle-off svg {
-    filter: grayscale(1);
-}
-
-.vc-dearrow-toggle-on, .vc-dearrow-toggle-off {
-    all: unset;
-    display: inline;
-    cursor: pointer;
-    position: absolute;
-    top: 0.75rem;
-    right: 0.75rem;
-}

src/plugins/emoteCloner.tsx

@@ -24,9 +24,11 @@ import { Margins } from "@utils/margins";
 import { ModalContent, ModalHeader, ModalRoot, openModalLazy } from "@utils/modal";
 import definePlugin from "@utils/types";
 import { findByCodeLazy, findStoreLazy } from "@webpack";
-import { EmojiStore, FluxDispatcher, Forms, GuildStore, Menu, PermissionsBits, PermissionStore, React, RestAPI, Toasts, Tooltip, UserStore } from "@webpack/common";
+import { EmojiStore, FluxDispatcher, Forms, GuildStore, Menu, PermissionStore, React, RestAPI, Toasts, Tooltip, UserStore } from "@webpack/common";
 import { Promisable } from "type-fest";
 
+const MANAGE_EMOJIS_AND_STICKERS = 1n << 30n;
+
 const StickersStore = findStoreLazy("StickersStore");
 const uploadEmoji = findByCodeLazy('"EMOJI_UPLOAD_START"', "GUILD_EMOJIS(");
 
@@ -118,7 +120,7 @@ function getGuildCandidates(data: Data) {
 
     return Object.values(GuildStore.getGuilds()).filter(g => {
         const canCreate = g.ownerId === meId ||
-            (PermissionStore.getGuildPermissions({ id: g.id }) & PermissionsBits.CREATE_GUILD_EXPRESSIONS) === PermissionsBits.CREATE_GUILD_EXPRESSIONS;
+            BigInt(PermissionStore.getGuildPermissions({ id: g.id }) & MANAGE_EMOJIS_AND_STICKERS) === MANAGE_EMOJIS_AND_STICKERS;
         if (!canCreate) return false;
 
         if (data.t === "Sticker") return true;

src/plugins/fakeNitro.ts

@@ -19,7 +19,7 @@
 import { addPreEditListener, addPreSendListener, removePreEditListener, removePreSendListener } from "@api/MessageEvents";
 import { definePluginSettings, Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import { ApngBlendOp, ApngDisposeOp, importApngJs } from "@utils/dependencies";
+import { ApngBlendOp, ApngDisposeOp, getGifEncoder, importApngJs } from "@utils/dependencies";
 import { getCurrentGuild } from "@utils/discord";
 import { proxyLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
@@ -27,7 +27,6 @@ import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
 import { ChannelStore, EmojiStore, FluxDispatcher, Parser, PermissionStore, UserStore } from "@webpack/common";
 import type { Message } from "discord-types/general";
-import { applyPalette, GIFEncoder, quantize } from "gifenc";
 import type { ReactElement, ReactNode } from "react";
 
 const DRAFT_TYPE = 0;
@@ -103,11 +102,6 @@ interface StickerPack {
     stickers: Sticker[];
 }
 
-const enum FakeNoticeType {
-    Sticker,
-    Emoji
-}
-
 const fakeNitroEmojiRegex = /\/emojis\/(\d+?)\.(png|webp|gif)/;
 const fakeNitroStickerRegex = /\/stickers\/(\d+?)\./;
 const fakeNitroGifStickerRegex = /\/attachments\/\d+?\/\d+?\/(\d+?)\.gif/;
@@ -218,15 +212,15 @@ export default definePlugin({
             }
         },
         {
-            find: "canUseHighVideoUploadQuality:function",
+            find: "canStreamHighQuality:function",
             predicate: () => settings.store.enableStreamQualityBypass,
             replacement: [
                 "canUseHighVideoUploadQuality",
-                // TODO: Remove the last two when they get removed from stable
-                "(?:canStreamQuality|canStreamHighQuality|canStreamMidQuality)",
+                "canStreamHighQuality",
+                "canStreamMidQuality"
             ].map(func => {
                 return {
-                    match: new RegExp(`${func}:function\\(\\i(?:,\\i)?\\){`, "g"),
+                    match: new RegExp(`${func}:function\\(\\i\\){`),
                     replace: "$&return true;"
                 };
             })
@@ -311,24 +305,16 @@ export default definePlugin({
                 },
                 {
                     match: /(emojiSection.{0,50}description:)(\i)(?<=(\i)\.sticker,.+?)(?=,)/,
-                    replace: (_, rest, reactNode, props) => `${rest}$self.addFakeNotice(${FakeNoticeType.Sticker},${reactNode},!!${props}.renderableSticker?.fake)`
+                    replace: (_, rest, reactNode, props) => `${rest}$self.addFakeNotice("STICKER",${reactNode},!!${props}.renderableSticker?.fake)`
                 }
             ]
         },
         {
-            find: ".EMOJI_UPSELL_POPOUT_MORE_EMOJIS_OPENED,",
+            find: ".Messages.EMOJI_POPOUT_PREMIUM_JOINED_GUILD_DESCRIPTION",
             predicate: () => settings.store.transformEmojis,
             replacement: {
-                match: /isDiscoverable:\i,shouldHideRoleSubscriptionCTA:\i,(?<=(\i)=\i\.node.+?)/,
-                replace: (m, node) => `${m}fakeNitroNode:${node},`
-            }
-        },
-        {
-            find: ".Messages.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION",
-            predicate: () => settings.store.transformEmojis,
-            replacement: {
-                match: /(?<=\.Messages\.EMOJI_POPOUT_ADDED_PACK_DESCRIPTION.+?return ).{0,1200}\.Messages\.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION.+?(?=}\()/,
-                replace: reactNode => `$self.addFakeNotice(${FakeNoticeType.Emoji},${reactNode},!!arguments[0]?.fakeNitroNode?.fake)`
+                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)`
             }
         }
     ],
@@ -624,18 +610,18 @@ export default definePlugin({
         return link.target && fakeNitroEmojiRegex.test(link.target);
     },
 
-    addFakeNotice(type: FakeNoticeType, node: Array<ReactNode>, fake: boolean) {
+    addFakeNotice(type: "STICKER" | "EMOJI", node: Array<ReactNode>, fake: boolean) {
         if (!fake) return node;
 
         node = Array.isArray(node) ? node : [node];
 
         switch (type) {
-            case FakeNoticeType.Sticker: {
+            case "STICKER": {
                 node.push(" This is a FakeNitro sticker and renders like a real sticker only for you. Appears as a link to non-plugin users.");
 
                 return node;
             }
-            case FakeNoticeType.Emoji: {
+            case "EMOJI": {
                 node.push(" This is a FakeNitro emoji and renders like a real emoji only for you. Appears as a link to non-plugin users.");
 
                 return node;
@@ -664,11 +650,15 @@ export default definePlugin({
     },
 
     async sendAnimatedSticker(stickerLink: string, stickerId: string, channelId: string) {
-        const { parseURL } = importApngJs();
+        const [{ parseURL }, {
+            GIFEncoder,
+            quantize,
+            applyPalette
+        }] = await Promise.all([importApngJs(), getGifEncoder()]);
 
         const { frames, width, height } = await parseURL(stickerLink);
 
-        const gif = GIFEncoder();
+        const gif = new GIFEncoder();
         const resolution = Settings.plugins.FakeNitro.stickerSize;
 
         const canvas = document.createElement("canvas");

src/plugins/favEmojiFirst/README.md

@@ -1,6 +0,0 @@
-# FavoriteEmojiFirst
-
-Puts your favorite emoji first in the emoji autocomplete.
-
-![a screenshot of the favourite emojis section](https://github.com/Vendicated/Vencord/assets/45497981/419c8c16-1afc-46e0-9cc2-20b9c3489711)
-![a comparison of the emoji picker before and after enabling this plugin](https://github.com/Vendicated/Vencord/assets/45497981/4f57626d-cfc6-4155-a47c-2eac191231bb)

src/plugins/favGifSearch.tsx

@@ -60,7 +60,7 @@ interface Instance {
 }
 
 
-const containerClasses: { searchBar: string; } = findByPropsLazy("searchBar", "searchHeader", "searchInput");
+const containerClasses: { searchBar: string; } = findByPropsLazy("searchBar", "searchHeader", "gutterSize");
 
 export const settings = definePluginSettings({
     searchOption: {
@@ -87,7 +87,7 @@ export const settings = definePluginSettings({
 export default definePlugin({
     name: "FavoriteGifSearch",
     authors: [Devs.Aria],
-    description: "Adds a search bar to favorite gifs.",
+    description: "Adds a search bar for favorite gifs",
 
     patches: [
         {

src/plugins/favGifSearch/README.md

@@ -1,5 +0,0 @@
-# FavoriteGifSearch
-
-Adds a search bar to favorite gifs.
-
-![Screenshot](https://github.com/Vendicated/Vencord/assets/45497981/19552adc-d921-4153-976e-e9361dc8fdaf)

src/plugins/fixInbox.tsx

@@ -0,0 +1,56 @@
+/*
+ * 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 { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { Forms } from "@webpack/common";
+
+export default definePlugin({
+    name: "FixInbox",
+    description: "Fixes the Unreads Inbox from crashing Discord when you're in lots of guilds.",
+    authors: [Devs.Megu],
+
+    patches: [{
+        find: "INBOX_OPEN:function",
+        replacement: {
+            // This function normally dispatches a subscribe event to every guild.
+            // this is badbadbadbadbad so we just get rid of it.
+            match: /INBOX_OPEN:function.+?\{/,
+            replace: "$&return true;"
+        }
+    }],
+
+    settingsAboutComponent() {
+        return (
+            <Forms.FormSection>
+                <Forms.FormTitle tag="h3">What's the problem?</Forms.FormTitle>
+                <Forms.FormText style={{ marginBottom: 8 }}>
+                    By default, Discord emits a GUILD_SUBSCRIPTIONS event for every guild you're in.
+                    When you're in a lot of guilds, this can cause the gateway to ratelimit you.
+                    This causes the client to crash and get stuck in an infinite ratelimit loop as it tries to reconnect.
+                </Forms.FormText>
+
+                <Forms.FormTitle tag="h3">How does it work?</Forms.FormTitle>
+                <Forms.FormText>
+                    This plugin works by stopping the client from sending GUILD_SUBSCRIPTIONS events to the gateway when you open the unreads inbox.
+                    This means that not all unreads will be shown, instead only already-subscribed guilds' unreads will be shown, but your client won't crash anymore.
+                </Forms.FormText>
+            </Forms.FormSection>
+        );
+    }
+});

src/plugins/fixSpotifyEmbeds.desktop/index.ts

@@ -1,26 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { definePluginSettings } from "@api/Settings";
-import { makeRange } from "@components/PluginSettings/components";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-
-// The entire code of this plugin can be found in ipcPlugins
-export default definePlugin({
-    name: "FixSpotifyEmbeds",
-    description: "Fixes spotify embeds being incredibly loud by letting you customise the volume",
-    authors: [Devs.Ven],
-    settings: definePluginSettings({
-        volume: {
-            type: OptionType.SLIDER,
-            description: "The volume % to set for spotify embeds. Anything above 10% is veeeery loud",
-            markers: makeRange(0, 100, 10),
-            stickToMarkers: false,
-            default: 10
-        }
-    })
-});

src/plugins/friendInvites.ts

@@ -1,6 +1,6 @@
 /*
  * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
+ * Copyright (c) 2022 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
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, sendBotMessage } from "@api/Commands";
+import { ApplicationCommandInputType, sendBotMessage } from "@api/Commands";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
@@ -35,47 +35,30 @@ export default definePlugin({
             name: "create friend invite",
             description: "Generates a friend invite link.",
             inputType: ApplicationCommandInputType.BOT,
-            options: [{
-                name: "Uses",
-                description: "How many uses?",
-                choices: [
-                    { label: "1", name: "1", value: "1" },
-                    { label: "5", name: "5", value: "5" }
-                ],
-                required: false,
-                type: ApplicationCommandOptionType.INTEGER
-            }],
-
-            execute: async (args, ctx) => {
-                const uses = findOption<number>(args, "Uses", 5);
-
-                if (uses === 1 && !UserStore.getCurrentUser().phone)
+            execute: async (_, ctx) => {
+                if (!UserStore.getCurrentUser().phone)
                     return sendBotMessage(ctx.channel.id, {
-                        content: "You need to have a phone number connected to your account to create a friend invite with 1 use!"
+                        content: "You need to have a phone number connected to your account to create a friend invite!"
                     });
 
-                let invite: any;
-                if (uses === 1) {
-                    const random = uuid.v4();
-                    const { body: { invite_suggestions } } = await RestAPI.post({
-                        url: "/friend-finder/find-friends",
-                        body: {
-                            modified_contacts: {
-                                [random]: [1, "", ""]
-                            },
-                            phone_contact_methods_count: 1
-                        }
-                    });
-                    invite = await FriendInvites.createFriendInvite({
-                        code: invite_suggestions[0][3],
+                const random = uuid.v4();
+                const invite = await RestAPI.post({
+                    url: "/friend-finder/find-friends",
+                    body: {
+                        modified_contacts: {
+                            [random]: [1, "", ""]
+                        },
+                        phone_contact_methods_count: 1
+                    }
+                }).then(res =>
+                    FriendInvites.createFriendInvite({
+                        code: res.body.invite_suggestions[0][3],
                         recipient_phone_number_or_email: random,
                         contact_visibility: 1,
                         filter_visibilities: [],
                         filtered_invite_suggestions_index: 1
-                    });
-                } else {
-                    invite = await FriendInvites.createFriendInvite();
-                }
+                    })
+                );
 
                 sendBotMessage(ctx.channel.id, {
                     content: `
@@ -84,7 +67,7 @@ export default definePlugin({
                         Max uses: \`${invite.max_uses}\`
                     `.trim().replace(/\s+/g, " ")
                 });
-            }
+            },
         },
         {
             name: "view friend invites",
@@ -112,7 +95,7 @@ export default definePlugin({
             execute: async (_, ctx) => {
                 await FriendInvites.revokeFriendInvites();
 
-                sendBotMessage(ctx.channel.id, {
+                return void sendBotMessage(ctx.channel.id, {
                     content: "All friend invites have been revoked."
                 });
             },

src/plugins/gameActivityToggle/index.tsx

@@ -32,18 +32,12 @@ function makeIcon(showCurrentGame?: boolean) {
     return function () {
         return (
             <svg
-                width="20"
-                height="20"
-                viewBox="0 0 24 24"
+                width="24"
+                height="24"
+                viewBox="0 96 960 960"
             >
-                <path fill="currentColor" mask="url(#gameActivityMask)" d="M3.06 20.4q-1.53 0-2.37-1.065T.06 16.74l1.26-9q.27-1.8 1.605-2.97T6.06 3.6h11.88q1.8 0 3.135 1.17t1.605 2.97l1.26 9q.21 1.53-.63 2.595T20.94 20.4q-.63 0-1.17-.225T18.78 19.5l-2.7-2.7H7.92l-2.7 2.7q-.45.45-.99.675t-1.17.225Zm14.94-7.2q.51 0 .855-.345T19.2 12q0-.51-.345-.855T18 10.8q-.51 0-.855.345T16.8 12q0 .51.345 .855T18 13.2Zm-2.4-3.6q.51 0 .855-.345T16.8 8.4q0-.51-.345-.855T15.6 7.2q-.51 0-.855.345T14.4 8.4q0 .51.345 .855T15.6 9.6ZM6.9 13.2h1.8v-2.1h2.1v-1.8h-2.1v-2.1h-1.8v2.1h-2.1v1.8h2.1v2.1Z" />
-                {!showCurrentGame && <>
-                    <mask id="gameActivityMask" >
-                        <rect fill="white" x="0" y="0" width="24" height="24" />
-                        <path fill="black" d="M23.27 4.54 19.46.73 .73 19.46 4.54 23.27 23.27 4.54Z"/>
-                    </mask>
-                    <path fill="var(--status-danger)" d="M23 2.27 21.73 1 1 21.73 2.27 23 23 2.27Z" />
-                </>}
+                <path fill="currentColor" d="M182 856q-51 0-79-35.5T82 734l42-300q9-60 53.5-99T282 296h396q60 0 104.5 39t53.5 99l42 300q7 51-21 86.5T778 856q-21 0-39-7.5T706 826l-90-90H344l-90 90q-15 15-33 22.5t-39 7.5Zm498-240q17 0 28.5-11.5T720 576q0-17-11.5-28.5T680 536q-17 0-28.5 11.5T640 576q0 17 11.5 28.5T680 616Zm-80-120q17 0 28.5-11.5T640 456q0-17-11.5-28.5T600 416q-17 0-28.5 11.5T560 456q0 17 11.5 28.5T600 496ZM310 616h60v-70h70v-60h-70v-70h-60v70h-70v60h70v70Z" />
+                {!showCurrentGame && <line x1="920" y1="280" x2="40" y2="880" stroke="var(--status-danger)" stroke-width="80" />}
             </svg>
         );
     };
@@ -66,7 +60,7 @@ function GameActivityToggleButton() {
 export default definePlugin({
     name: "GameActivityToggle",
     description: "Adds a button next to the mic and deafen button to toggle game activity.",
-    authors: [Devs.Nuckyz, Devs.RuukuLada],
+    authors: [Devs.Nuckyz],
     dependencies: ["SettingsStoreAPI"],
 
     patches: [

src/plugins/hideAttachments.tsx

@@ -49,7 +49,7 @@ export default definePlugin({
         await this.buildCss();
 
         addButton("HideAttachments", msg => {
-            if (!msg.attachments.length && !msg.embeds.length && !msg.stickerItems.length) return null;
+            if (!msg.attachments.length && !msg.embeds.length) return null;
 
             const isHidden = hiddenMessages.has(msg.id);
 
@@ -72,7 +72,7 @@ export default definePlugin({
     async buildCss() {
         const elements = [...hiddenMessages].map(id => `#message-accessories-${id}`).join(",");
         style.textContent = `
-        :is(${elements}) :is([class*="embedWrapper"], [class*="clickableSticker"]) {
+        :is(${elements}) [class*="embedWrapper"] {
             /* important is not necessary, but add it to make sure bad themes won't break it */
             display: none !important;
         }

src/plugins/imageZoom/README.md

@@ -1,6 +0,0 @@
-# ImageZoom
-
-Lets you zoom in to images and gifs. Use scroll wheel to zoom in and shift + scroll wheel to increase lens radius / size
-
-![the plugin in action](https://github.com/Vendicated/Vencord/assets/45497981/408cd77d-c5f4-40bc-8de2-f977a31b3e5f)
-![the context menu options offered by the plugin](https://github.com/Vendicated/Vencord/assets/45497981/3bede636-f1ce-493f-af46-788b920cb81c)