grammar lol

.github/workflows/build.yml

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

.github/workflows/reportBrokenPlugins.yml

@@ -36,7 +36,7 @@ jobs:
                 export PATH="$PWD/node_modules/.bin:$PATH"
                 export CHROMIUM_BIN=$(which chromium-browser)
 
-                esbuild scripts/generateReport.ts > dist/report.mjs
+                esbuild test/generateReport.ts > dist/report.mjs
                 node dist/report.mjs >> $GITHUB_STEP_SUMMARY
               env:
                 DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
@@ -50,7 +50,7 @@ jobs:
                 export CHROMIUM_BIN=$(which chromium-browser)
                 export USE_CANARY=true
 
-                esbuild scripts/generateReport.ts > dist/report.mjs
+                esbuild test/generateReport.ts > dist/report.mjs
                 node dist/report.mjs >> $GITHUB_STEP_SUMMARY
               env:
                 DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
             - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
 
             - name: Use Node.js 18
-              uses: actions/setup-node@v3
+              uses: actions/setup-node@v2
               with:
                   node-version: 18
                   cache: "pnpm"

CODE_OF_CONDUCT.md

@@ -1,20 +0,0 @@
-# Code of Conduct
-
-Our community is welcoming to everyone, regardless of their characteristics.
-
-As such, we expect you to treat everyone with respect and contribute to an open and welcoming community.
-
-DO
-- have empathy and be nice to others
-- be respectful of differing opinions, even if you disagree
-- give and accept constructive criticism
-
-DON'T
-- use offensive or derogatory language
-- troll or spam
-- personally attack or harass others
-
-Repetitive violations of these guidelines might get your access to the repository restricted.
-
-
-If you feel like a user is violating these guidelines or feel treated unfairly, please refrain from publicly challenging them and instead contact a Moderator on our Discord server or send an email to vendicated+conduct@riseup.net!

README.md

@@ -4,14 +4,12 @@ The cutest Discord client mod
 
 ## Features
 
--   Super easy to install (Download Installer, open, click install button, done)
+-   Super easy to install (one click installer)
--   100+ plugins built in: [See a list](https://gist.github.com/Vendicated/8696cde7b92548064a3ae92ead84d033)
+-   90+ plugins built in: [See a list](https://gist.github.com/Vendicated/8696cde7b92548064a3ae92ead84d033)
-    -   Some highlights: SpotifyControls, GameActivityToggle, Experiments, NoTrack, MessageLogger, QuickReply, Free Emotes/Stickers, CustomCommands, ShowHiddenChannels, PronounDB
+    -   Some highlights: SpotifyControls, Experiments, NoTrack, MessageLogger, QuickReply, Free Emotes/Stickers, CustomCommands, ShowHiddenChannels, PronounDB
--   Fairly lightweight despite the many inbuilt plugins
 -   Excellent Browser Support: Run Vencord in your Browser via extension or UserScript
--   Works on any Discord branch: Stable, Canary or PTB all work (though for the best experience I recommend stable!)
 -   Custom CSS and Themes: Inbuilt css editor with support to import any css files (including BetterDiscord themes)
--   Privacy friendly, blocks Discord analytics & crash reporting out of the box and has no telemetry
+-   Works in all Electron versions (Confirmed working on versions 13-23)
 -   Maintained very actively, broken plugins are usually fixed within 12 hours
 
 ## Installing / Uninstalling
@@ -22,7 +20,7 @@ The cutest Discord client mod
 
 [![Get it on the Firefox Webstore](https://blog.mozilla.org/addons/files/2015/11/get-the-addon.png)](https://addons.mozilla.org/en-GB/firefox/addon/vencord-web/) [![Get it on the Chrome Webstore](https://storage.googleapis.com/web-dev-uploads/image/WlD8wC6g8khYWPJUsQceQkhXSlv1/UV4C4ybeBTsZt43U4xis.png)](https://chrome.google.com/webstore/detail/vencord-web/cbghhgpcnddeihccjmnadmkaejncjndb)
 
-Or use the [UserScript](https://raw.githubusercontent.com/Vencord/builds/main/Vencord.user.js) - Please note that the CSS Editor, Themes loaded from remote sources and co. will not work in the UserScript. Use the extension if you need any of those
+Or use the [UserScript](https://raw.githubusercontent.com/Vencord/builds/main/Vencord.user.js) - Please note that QuickCSS and plugins making use of external resources will not work with the UserScript.
 
 ## Building from Source
 
@@ -41,8 +39,3 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) and [Megu's Plugin Guide!](docs/2_PLUGINS
 [join]: https://discord.gg/D9uwnFnqmd
 
 [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join]
-
-## Disclaimer
-
-Discord is trademark of Discord Inc. and solely mentioned for the sake of descriptivity.
-Mention of it does not imply any affiliation with or endorsement by Discord Inc.

browser/GMPolyfill.js

@@ -92,7 +92,6 @@ function GM_fetch(url, opt) {
                         resp.arrayBuffer = () => blobTo("arrayBuffer", blob);
                         resp.text = () => blobTo("text", blob);
                         resp.json = async () => JSON.parse(await blobTo("text", blob));
-                        resp.headers = new Headers(parseHeaders(resp.responseHeaders));
                         resolve(resp);
                     };
                     options.ontimeout = () => reject("fetch timeout");

docs/1_INSTALLING.md

@@ -13,6 +13,12 @@ Welcome to Megu's Installation Guide! In this file, you will learn about how to
   - [Installing Vencord](#installing-vencord)
   - [Updating Vencord](#updating-vencord)
   - [Uninstalling Vencord](#uninstalling-vencord)
+  - [Manually Installing Vencord](#manually-installing-vencord)
+    - [On Windows](#on-windows)
+    - [On Linux](#on-linux)
+    - [On MacOS](#on-macos)
+    - [Manual Patching](#manual-patching)
+    - [Manually Uninstalling Vencord](#manually-uninstalling-vencord)
 
 ## Dependencies
 
@@ -21,16 +27,16 @@ Welcome to Megu's Installation Guide! In this file, you will learn about how to
 
 ## Installing Vencord
 
+> :exclamation: If this doesn't work, see [Manually Installing Vencord](#manually-installing-vencord)
+
 Install `pnpm`:
 
-> :exclamation: This next command may need to be run as admin/root depending on your system, and you may need to close and reopen your terminal for pnpm to be in your PATH.
+> :exclamation: this may need to be run as admin depending on your system, and you may need to close and reopen your terminal.
 
 ```shell
 npm i -g pnpm
 ```
 
-> :exclamation: **IMPORTANT** Make sure you aren't using an admin/root terminal from here onwards. It **will** mess up your Discord/Vencord instance and you **will** most likely have to reinstall.
-
 Clone Vencord:
 
 ```shell
@@ -95,4 +101,102 @@ Simply run:
 pnpm uninject
 ```
 
+The above command may ask you to also run:
+
+```shell
+pnpm install --frozen-lockfile
+pnpm uninject
+```
+
+## Manually Installing Vencord
+
+-   [Windows](#on-windows)
+-   [Linux](#on-linux)
+-   [MacOS](#on-macos)
+
+### On Windows
+
+Press Win+R and enter: `%LocalAppData%` and hit enter. In this page, find the page (Discord, DiscordPTB, DiscordCanary, etc) that you want to patch.
+
+Now follow the instructions at [Manual Patching](#manual-patching)
+
+### On Linux
+
+The Discord folder is usually in one of the following paths:
+
+-   /usr/share
+-   /usr/lib64
+-   /opt
+-   /home/$USER/.local/share
+
+If you use flatpak, it will usually be in one of the following paths:
+
+-   /var/lib/flatpak/app/com.discordapp.Discord/current/active/files
+-   /home/$USER/.local/share/flatpak/app/com.discordapp.Discord/current/active/files
+
+You will need to give flatpak access to vencord with one of the following commands:
+
+> :exclamation: If not on stable, replace `com.discordapp.Discord` with your branch name, e.g., `com.discordapp.DiscordCanary`
+
+> :exclamation: Replace `/path/to/vencord/` with the path to your vencord folder (NOT the dist folder)
+
+If Discord flatpak install is in /home/:
+
+```shell
+flatpak override --user com.discordapp.Discord --filesystem="/path/to/vencord/"
+```
+
+If Discord flatpak install not in /home/:
+
+```shell
+sudo flatpak override com.discordapp.Discord --filesystem="/path/to/vencord"
+```
+
+Now follow the instructions at [Manual Patching](#manual-patching)
+
+### On MacOS
+
+Open finder and go to your Applications folder. Right-Click on the Discord application you want to patch, and view contents.
+
+Go to the `Contents/Resources` folder.
+
+Now follow the instructions at [Manual Patching](#manual-patching)
+
+### Manual Patching
+
+> :exclamation: If using Flatpak on linux, go to the folder that contains the `app.asar` file, and skip to where we create the `app` folder below.
+
+> :exclamation: On Linux/MacOS, there's a chance there won't be an `app-<number>` folder, but there probably is a `resources` folder, so keep reading :)
+
+Inside there, look for the `app-<number>` folders. If you have multiple, use the highest number. If that doesn't work, do it for the rest of the `app-<number>` folders.
+
+Inside there, go to the `resources` folder. There should be a file called `app.asar`. If there isn't, look at a different `app-<number>` folder instead.
+
+Make a new folder in `resources` called `app`. In here, we will make two files:
+
+`package.json` and `index.js`
+
+In `index.js`:
+
+> :exclamation: Replace the path in the first line with the path to `patcher.js` in your vencord dist folder.
+> On Windows, you can get this by shift-rightclicking the patcher.js file and selecting "copy as path"
+
+```js
+require("C:/Users/<your user>/path/to/vencord/dist/patcher.js");
+```
+
+And in `package.json`:
+
+```json
+{ "name": "discord", "main": "index.js" }
+```
+
+Finally, fully close & reopen your Discord client and check to see that `Vencord` appears in settings!
+
+### Manually Uninstalling Vencord
+
+> :exclamation: Do not delete `app.asar` - Only delete the `app` folder we created.
+
+Use the instructions above to find the `app` folder, and delete it. Then Close & Reopen Discord.
+
 If you need more help, ask in the support channel in our [Discord Server](https://discord.gg/D9uwnFnqmd).

docs/2_PLUGINS.md

@@ -26,10 +26,6 @@ export default definePlugin({
             name: "Your Name",
         },
     ],
-    // Delete `patches` if you are not using code patches, as it will make
-    // your plugin require restarts, and your stop() method will not be
-    // invoked at all.  The presence of the key in the object alone is
-    // enough to trigger this behavior, even if the value is an empty array.
     patches: [],
     // Delete these two below if you are only using code patches
     start() {},

package.json

@@ -1,8 +1,9 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.1.6",
+    "version": "1.0.6",
     "description": "The cutest Discord client mod",
+    "keywords": [],
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {
         "url": "https://github.com/Vendicated/Vencord/issues"
@@ -19,10 +20,9 @@
     "scripts": {
         "build": "node scripts/build/build.mjs",
         "buildWeb": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/buildWeb.mjs",
-        "generatePluginJson": "tsx scripts/generatePluginList.ts",
         "inject": "node scripts/runInstaller.mjs",
-        "lint": "eslint . --ext .js,.jsx,.ts,.tsx --ignore-pattern src/userplugins",
+        "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
-        "lint-styles": "stylelint \"src/**/*.css\" --ignore-pattern src/userplugins",
+        "lint-styles": "stylelint \"src/**/*.css\"",
         "lint:fix": "pnpm lint --fix",
         "test": "pnpm build && pnpm lint && pnpm lint-styles && pnpm testTsc",
         "testWeb": "pnpm lint && pnpm buildWeb && pnpm testTsc",
@@ -33,9 +33,7 @@
     "dependencies": {
         "@vap/core": "0.0.12",
         "@vap/shiki": "0.10.3",
-        "fflate": "^0.7.4",
+        "fflate": "^0.7.4"
-        "nanoid": "^4.0.2",
-        "virtual-merge": "^1.0.1"
     },
     "devDependencies": {
         "@types/diff": "^5.0.2",
@@ -61,11 +59,10 @@
         "standalone-electron-types": "^1.0.0",
         "stylelint": "^14.16.1",
         "stylelint-config-standard": "^29.0.0",
-        "tsx": "^3.12.6",
         "type-fest": "^3.5.3",
         "typescript": "^4.9.4"
     },
-    "packageManager": "pnpm@8.1.1",
+    "packageManager": "pnpm@7.13.4",
     "pnpm": {
         "patchedDependencies": {
             "eslint-plugin-path-alias@1.0.0": "patches/eslint-plugin-path-alias@1.0.0.patch",
@@ -92,7 +89,6 @@
         "sourceDir": "./dist/extension-v2-unpacked"
     },
     "engines": {
-        "node": ">=18",
+        "node": ">=18"
-        "pnpm": ">=8"
     }
 }

scripts/build/build.mjs

@@ -48,7 +48,6 @@ const sourceMapFooter = s => watch ? "" : `//# sourceMappingURL=vencord://${s}.j
 const sourcemap = watch ? "inline" : "external";
 
 await Promise.all([
-    // common preload
     esbuild.build({
         ...nodeCommonOpts,
         entryPoints: ["src/preload.ts"],
@@ -56,19 +55,12 @@ await Promise.all([
         footer: { js: "//# sourceURL=VencordPreload\n" + sourceMapFooter("preload") },
         sourcemap,
     }),
-
-    // Discord Desktop main & renderer
     esbuild.build({
         ...nodeCommonOpts,
-        entryPoints: ["src/main/index.ts"],
+        entryPoints: ["src/patcher.ts"],
         outfile: "dist/patcher.js",
         footer: { js: "//# sourceURL=VencordPatcher\n" + sourceMapFooter("patcher") },
         sourcemap,
-        define: {
-            ...defines,
-            IS_DISCORD_DESKTOP: true,
-            IS_VENCORD_DESKTOP: false
-        }
     }),
     esbuild.build({
         ...commonOpts,
@@ -80,48 +72,12 @@ await Promise.all([
         globalName: "Vencord",
         sourcemap,
         plugins: [
-            globPlugins("discordDesktop"),
+            globPlugins,
             ...commonOpts.plugins
         ],
         define: {
             ...defines,
-            IS_WEB: false,
+            IS_WEB: false
-            IS_DISCORD_DESKTOP: true,
-            IS_VENCORD_DESKTOP: false
-        }
-    }),
-
-    // Vencord Desktop main & renderer
-    esbuild.build({
-        ...nodeCommonOpts,
-        entryPoints: ["src/main/index.ts"],
-        outfile: "dist/vencordDesktopMain.js",
-        footer: { js: "//# sourceURL=VencordDesktopMain\n" + sourceMapFooter("vencordDesktopMain") },
-        sourcemap,
-        define: {
-            ...defines,
-            IS_DISCORD_DESKTOP: false,
-            IS_VENCORD_DESKTOP: true
-        }
-    }),
-    esbuild.build({
-        ...commonOpts,
-        entryPoints: ["src/Vencord.ts"],
-        outfile: "dist/vencordDesktopRenderer.js",
-        format: "iife",
-        target: ["esnext"],
-        footer: { js: "//# sourceURL=VencordDesktopRenderer\n" + sourceMapFooter("vencordDesktopRenderer") },
-        globalName: "Vencord",
-        sourcemap,
-        plugins: [
-            globPlugins("vencordDesktop"),
-            ...commonOpts.plugins
-        ],
-        define: {
-            ...defines,
-            IS_WEB: false,
-            IS_DISCORD_DESKTOP: false,
-            IS_VENCORD_DESKTOP: true
         }
     }),
 ]).catch(err => {

scripts/build/buildWeb.mjs

@@ -36,18 +36,16 @@ const commonOptions = {
     entryPoints: ["browser/Vencord.ts"],
     globalName: "Vencord",
     format: "iife",
-    external: ["plugins", "git-hash", "/assets/*"],
+    external: ["plugins", "git-hash"],
     plugins: [
-        globPlugins("web"),
+        globPlugins,
         ...commonOpts.plugins,
     ],
     target: ["esnext"],
     define: {
         IS_WEB: "true",
         IS_STANDALONE: "true",
-        IS_DEV: JSON.stringify(watch),
+        IS_DEV: JSON.stringify(watch)
-        IS_DISCORD_DESKTOP: "false",
-        IS_VENCORD_DESKTOP: "false"
     }
 };
 

scripts/build/common.mjs

@@ -33,8 +33,6 @@ export const banner = {
 `.trim()
 };
 
-const isWeb = process.argv.slice(0, 2).some(f => f.endsWith("buildWeb.mjs"));
-
 // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
 /**
  * @type {import("esbuild").Plugin}
@@ -48,9 +46,9 @@ export const makeAllPackagesExternalPlugin = {
 };
 
 /**
- * @type {(kind: "web" | "discordDesktop" | "vencordDesktop") => import("esbuild").Plugin}
+ * @type {import("esbuild").Plugin}
  */
-export const globPlugins = kind => ({
+export const globPlugins = {
     name: "glob-plugins",
     setup: build => {
         const filter = /^~plugins$/;
@@ -71,17 +69,9 @@ export const globPlugins = kind => ({
                 const files = await readdir(`./src/${dir}`);
                 for (const file of files) {
                     if (file.startsWith(".")) continue;
-                    if (file === "index.ts") continue;
+                    if (file === "index.ts") {
-                    const fileBits = file.split(".");
+                        continue;
-                    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}`;
                     code += `import ${mod} from "./${dir}/${file.replace(/\.tsx?$/, "")}";\n`;
                     plugins += `[${mod}.name]:${mod},\n`;
@@ -95,7 +85,7 @@ export const globPlugins = kind => ({
             };
         });
     }
-});
+};
 
 /**
  * @type {import("esbuild").Plugin}
@@ -195,7 +185,7 @@ export const commonOpts = {
     legalComments: "linked",
     banner,
     plugins: [fileIncludePlugin, gitHashPlugin, gitRemotePlugin, stylePlugin],
-    external: ["~plugins", "~git-hash", "~git-remote", "/assets/*"],
+    external: ["~plugins", "~git-hash", "~git-remote"],
     inject: ["./scripts/build/inject/react.mjs"],
     jsxFactory: "VencordCreateElement",
     jsxFragment: "VencordFragment",

scripts/generatePluginList.ts

@@ -1,191 +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 { Dirent, readdirSync, readFileSync, writeFileSync } from "fs";
-import { access, readFile } from "fs/promises";
-import { join } from "path";
-import { BigIntLiteral, createSourceFile, Identifier, isArrayLiteralExpression, isCallExpression, isExportAssignment, isIdentifier, isObjectLiteralExpression, isPropertyAccessExpression, isPropertyAssignment, isStringLiteral, isVariableStatement, NamedDeclaration, NodeArray, ObjectLiteralExpression, ScriptTarget, StringLiteral, SyntaxKind } from "typescript";
-
-interface Dev {
-    name: string;
-    id: string;
-}
-
-interface PluginData {
-    name: string;
-    description: string;
-    authors: Dev[];
-    dependencies: string[];
-    hasPatches: boolean;
-    hasCommands: boolean;
-    required: boolean;
-    enabledByDefault: boolean;
-    target: "discordDesktop" | "vencordDesktop" | "web" | "dev";
-}
-
-const devs = {} as Record<string, Dev>;
-
-function getName(node: NamedDeclaration) {
-    return node.name && isIdentifier(node.name) ? node.name.text : undefined;
-}
-
-function hasName(node: NamedDeclaration, name: string) {
-    return getName(node) === name;
-}
-
-function getObjectProp(node: ObjectLiteralExpression, name: string) {
-    const prop = node.properties.find(p => hasName(p, name));
-    if (prop && isPropertyAssignment(prop)) return prop.initializer;
-    return prop;
-}
-
-function parseDevs() {
-    const file = createSourceFile("constants.ts", readFileSync("src/utils/constants.ts", "utf8"), ScriptTarget.Latest);
-
-    for (const child of file.getChildAt(0).getChildren()) {
-        if (!isVariableStatement(child)) continue;
-
-        const devsDeclaration = child.declarationList.declarations.find(d => hasName(d, "Devs"));
-        if (!devsDeclaration?.initializer || !isCallExpression(devsDeclaration.initializer)) continue;
-
-        const value = devsDeclaration.initializer.arguments[0];
-
-        if (!isObjectLiteralExpression(value)) return;
-
-        for (const prop of value.properties) {
-            const name = (prop.name as Identifier).text;
-            const value = isPropertyAssignment(prop) ? prop.initializer : prop;
-
-            if (!isObjectLiteralExpression(value)) throw new Error(`Failed to parse devs: ${name} is not an object literal`);
-
-            devs[name] = {
-                name: (getObjectProp(value, "name") as StringLiteral).text,
-                id: (getObjectProp(value, "id") as BigIntLiteral).text.slice(0, -1)
-            };
-        }
-
-        return;
-    }
-
-    throw new Error("Could not find Devs constant");
-}
-
-async function parseFile(fileName: string) {
-    const file = createSourceFile(fileName, await readFile(fileName, "utf8"), ScriptTarget.Latest);
-
-    const fail = (reason: string) => {
-        return new Error(`Invalid plugin ${fileName}, because ${reason}`);
-    };
-
-    for (const node of file.getChildAt(0).getChildren()) {
-        if (!isExportAssignment(node) || !isCallExpression(node.expression)) continue;
-
-        const call = node.expression;
-        if (!isIdentifier(call.expression) || call.expression.text !== "definePlugin") continue;
-
-        const pluginObj = node.expression.arguments[0];
-        if (!isObjectLiteralExpression(pluginObj)) throw fail("no object literal passed to definePlugin");
-
-        const data = {
-            hasPatches: false,
-            hasCommands: false,
-            enabledByDefault: false,
-            required: false,
-        } as PluginData;
-
-        for (const prop of pluginObj.properties) {
-            const key = getName(prop);
-            const value = isPropertyAssignment(prop) ? prop.initializer : prop;
-
-            switch (key) {
-                case "name":
-                case "description":
-                    if (!isStringLiteral(value)) throw fail(`${key} is not a string literal`);
-                    data[key] = value.text;
-                    break;
-                case "patches":
-                    data.hasPatches = true;
-                    break;
-                case "commands":
-                    data.hasCommands = true;
-                    break;
-                case "authors":
-                    if (!isArrayLiteralExpression(value)) throw fail("authors is not an array literal");
-                    data.authors = value.elements.map(e => {
-                        if (!isPropertyAccessExpression(e)) throw fail("authors array contains non-property access expressions");
-                        return devs[getName(e)!];
-                    });
-                    break;
-                case "dependencies":
-                    if (!isArrayLiteralExpression(value)) throw fail("dependencies is not an array literal");
-                    const { elements } = value;
-                    if (elements.some(e => !isStringLiteral(e))) throw fail("dependencies array contains non-string elements");
-                    data.dependencies = (elements as NodeArray<StringLiteral>).map(e => e.text);
-                    break;
-                case "required":
-                case "enabledByDefault":
-                    data[key] = value.kind === SyntaxKind.TrueKeyword;
-                    if (!data[key] && value.kind !== SyntaxKind.FalseKeyword) throw fail(`${key} is not a boolean literal`);
-                    break;
-            }
-        }
-
-        if (!data.name || !data.description || !data.authors) throw fail("name, description or authors are missing");
-
-        const 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;
-        }
-
-        return data;
-    }
-
-    throw fail("no default export called 'definePlugin' found");
-}
-
-async function getEntryPoint(dirent: Dirent) {
-    const base = join("./src/plugins", dirent.name);
-    if (!dirent.isDirectory()) return base;
-
-    for (const name of ["index.ts", "index.tsx"]) {
-        const full = join(base, name);
-        try {
-            await access(full);
-            return full;
-        } catch { }
-    }
-
-    throw new Error(`${dirent.name}: Couldn't find entry point`);
-}
-
-(async () => {
-    parseDevs();
-    const plugins = readdirSync("./src/plugins", { withFileTypes: true }).filter(d => d.name !== "index.ts");
-
-    const promises = plugins.map(async dirent => parseFile(await getEntryPoint(dirent)));
-
-    const data = JSON.stringify(await Promise.all(promises));
-
-    if (process.argv.length > 2) {
-        writeFileSync(process.argv[2], data);
-    } else {
-        console.log(data);
-    }
-})();

src/Vencord.ts

@@ -27,47 +27,20 @@ export { PlainSettings, Settings };
 import "./utils/quickCss";
 import "./webpack/patchWebpack";
 
-import { showNotification } from "./api/Notifications";
+import { popNotice, showNotice } from "./api/Notices";
 import { PlainSettings, Settings } from "./api/settings";
 import { patches, PMLogger, startAllPlugins } from "./plugins";
-import { localStorage } from "./utils/localStorage";
-import { getCloudSettings, putCloudSettings } from "./utils/settingsSync";
 import { checkForUpdates, rebuild, update, UpdateLogger } from "./utils/updater";
 import { onceReady } from "./webpack";
 import { SettingsRouter } from "./webpack/common";
 
 export let Components: any;
 
-async function syncSettings() {
-    if (
-        Settings.cloud.settingsSync && // if it's enabled
-        Settings.cloud.authenticated // if cloud integrations are enabled
-    ) {
-        if (localStorage.Vencord_settingsDirty) {
-            await putCloudSettings();
-            delete localStorage.Vencord_settingsDirty;
-        } else if (await getCloudSettings(false)) { // if we synchronized something (false means no sync)
-            // we show a notification here instead of allowing getCloudSettings() to show one to declutter the amount of
-            // potential notifications that might occur. getCloudSettings() will always send a notification regardless if
-            // there was an error to notify the user, but besides that we only want to show one notification instead of all
-            // of the possible ones it has (such as when your settings are newer).
-            showNotification({
-                title: "Cloud Settings",
-                body: "Your settings have been updated! Click here to restart to fully apply changes!",
-                color: "var(--green-360)",
-                onClick: () => window.DiscordNative.app.relaunch()
-            });
-        }
-    }
-}
-
 async function init() {
     await onceReady;
     startAllPlugins();
     Components = await import("./components");
 
-    syncSettings();
-
     if (!IS_WEB) {
         try {
             const isOutdated = await checkForUpdates();
@@ -76,36 +49,32 @@ async function init() {
             if (Settings.autoUpdate) {
                 await update();
                 const needsFullRestart = await rebuild();
-                if (Settings.autoUpdateNotification)
+                setTimeout(() => {
-                    setTimeout(() => showNotification({
+                    showNotice(
-                        title: "Vencord has been updated!",
+                        "Vencord has been updated!",
-                        body: "Click here to restart",
+                        "Restart",
-                        permanent: true,
+                        () => {
-                        noPersist: true,
+                            if (needsFullRestart)
-                        onClick() {
+                                window.DiscordNative.app.relaunch();
-                            if (needsFullRestart) {
-                                if (IS_DISCORD_DESKTOP)
-                                    window.DiscordNative.app.relaunch();
-                                else
-                                    window.VencordDesktop.app.relaunch();
-                            }
                             else
                                 location.reload();
                         }
-                    }), 10_000);
+                    );
+                }, 10_000);
                 return;
             }
 
             if (Settings.notifyAboutUpdates)
-                setTimeout(() => showNotification({
+                setTimeout(() => {
-                    title: "A Vencord update is available!",
+                    showNotice(
-                    body: "Click here to view the update",
+                        "A Vencord update is available!",
-                    permanent: true,
+                        "View Update",
-                    noPersist: true,
+                        () => {
-                    onClick() {
+                            popNotice();
-                        SettingsRouter.open("VencordUpdater");
+                            SettingsRouter.open("VencordUpdater");
-                    }
+                        }
-                }), 10_000);
+                    );
+                }, 10_000);
         } catch (err) {
             UpdateLogger.error("Failed to check for updates", err);
         }
@@ -126,12 +95,3 @@ async function init() {
 }
 
 init();
-
-if (IS_DISCORD_DESKTOP && Settings.winNativeTitleBar && navigator.platform.toLowerCase().startsWith("win")) {
-    document.addEventListener("DOMContentLoaded", () => {
-        document.head.append(Object.assign(document.createElement("style"), {
-            id: "vencord-native-titlebar-style",
-            textContent: "[class*=titleBar-]{display: none!important}"
-        }));
-    }, { once: true });
-}

src/api/ContextMenu.ts

@@ -1,144 +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 Logger from "@utils/Logger";
-import type { ReactElement } from "react";
-
-/**
- * @param children The rendered context menu elements
- * @param args Any arguments passed into making the context menu, like the guild, channel, user or message for example
- */
-export type NavContextMenuPatchCallback = (children: Array<React.ReactElement>, ...args: Array<any>) => void;
-/**
- * @param The navId of the context menu being patched
- * @param children The rendered context menu elements
- * @param args Any arguments passed into making the context menu, like the guild, channel, user or message for example
- */
-export type GlobalContextMenuPatchCallback = (navId: string, children: Array<React.ReactElement>, ...args: Array<any>) => void;
-
-const ContextMenuLogger = new Logger("ContextMenu");
-
-export const navPatches = new Map<string, Set<NavContextMenuPatchCallback>>();
-export const globalPatches = new Set<GlobalContextMenuPatchCallback>();
-
-/**
- * Add a context menu patch
- * @param navId The navId(s) for the context menu(s) to patch
- * @param patch The patch to be applied
- */
-export function addContextMenuPatch(navId: string | Array<string>, patch: NavContextMenuPatchCallback) {
-    if (!Array.isArray(navId)) navId = [navId];
-    for (const id of navId) {
-        let contextMenuPatches = navPatches.get(id);
-        if (!contextMenuPatches) {
-            contextMenuPatches = new Set();
-            navPatches.set(id, contextMenuPatches);
-        }
-
-        contextMenuPatches.add(patch);
-    }
-}
-
-/**
- * Add a global context menu patch that fires the patch for all context menus
- * @param patch The patch to be applied
- */
-export function addGlobalContextMenuPatch(patch: GlobalContextMenuPatchCallback) {
-    globalPatches.add(patch);
-}
-
-/**
- * Remove a context menu patch
- * @param navId The navId(s) for the context menu(s) to remove the patch
- * @param patch The patch to be removed
- * @returns Wheter the patch was sucessfully removed from the context menu(s)
- */
-export function removeContextMenuPatch<T extends string | Array<string>>(navId: T, patch: NavContextMenuPatchCallback): T extends string ? boolean : Array<boolean> {
-    const navIds = Array.isArray(navId) ? navId : [navId as string];
-
-    const results = navIds.map(id => navPatches.get(id)?.delete(patch) ?? false);
-
-    return (Array.isArray(navId) ? results : results[0]) as T extends string ? boolean : Array<boolean>;
-}
-
-/**
- * Remove a global context menu patch
- * @returns Wheter the patch was sucessfully removed
- */
-export function removeGlobalContextMenuPatch(patch: GlobalContextMenuPatchCallback): boolean {
-    return globalPatches.delete(patch);
-}
-
-/**
- * A helper function for finding the children array of a group nested inside a context menu based on the id of one of its childs
- * @param id The id of the child
- */
-export function findGroupChildrenByChildId(id: string, children: Array<React.ReactElement>, itemsArray?: Array<React.ReactElement>): Array<React.ReactElement> | null {
-    for (const child of children) {
-        if (child == null) continue;
-
-        if (child.props?.id === id) return itemsArray ?? null;
-
-        let nextChildren = child.props?.children;
-        if (nextChildren) {
-            if (!Array.isArray(nextChildren)) {
-                nextChildren = [nextChildren];
-                child.props.children = nextChildren;
-            }
-
-            const found = findGroupChildrenByChildId(id, nextChildren, nextChildren);
-            if (found !== null) return found;
-        }
-    }
-
-    return null;
-}
-
-interface ContextMenuProps {
-    contextMenuApiArguments?: Array<any>;
-    navId: string;
-    children: Array<ReactElement>;
-    "aria-label": string;
-    onSelect: (() => void) | undefined;
-    onClose: (callback: (...args: Array<any>) => any) => void;
-}
-
-export function _patchContextMenu(props: ContextMenuProps) {
-    props.contextMenuApiArguments ??= [];
-    const contextMenuPatches = navPatches.get(props.navId);
-
-    if (!Array.isArray(props.children)) props.children = [props.children];
-
-    if (contextMenuPatches) {
-        for (const patch of contextMenuPatches) {
-            try {
-                patch(props.children, ...props.contextMenuApiArguments);
-            } catch (err) {
-                ContextMenuLogger.error(`Patch for ${props.navId} errored,`, err);
-            }
-        }
-    }
-
-    for (const patch of globalPatches) {
-        try {
-            patch(props.navId, props.children, ...props.contextMenuApiArguments);
-        } catch (err) {
-            ContextMenuLogger.error("Global patch errored,", err);
-        }
-    }
-}

src/api/MessageEvents.ts

@@ -19,7 +19,6 @@
 import Logger from "@utils/Logger";
 import { MessageStore } from "@webpack/common";
 import type { Channel, Message } from "discord-types/general";
-import type { Promisable } from "type-fest";
 
 const MessageEventsLogger = new Logger("MessageEvents", "#e5c890");
 
@@ -42,16 +41,16 @@ export interface MessageExtra {
     stickerIds?: string[];
 }
 
-export type SendListener = (channelId: string, messageObj: MessageObject, extra: MessageExtra) => Promisable<void | { cancel: boolean; }>;
+export type SendListener = (channelId: string, messageObj: MessageObject, extra: MessageExtra) => void | { cancel: boolean; };
-export type EditListener = (channelId: string, messageId: string, messageObj: MessageObject) => Promisable<void>;
+export type EditListener = (channelId: string, messageId: string, messageObj: MessageObject) => void;
 
 const sendListeners = new Set<SendListener>();
 const editListeners = new Set<EditListener>();
 
-export async function _handlePreSend(channelId: string, messageObj: MessageObject, extra: MessageExtra) {
+export function _handlePreSend(channelId: string, messageObj: MessageObject, extra: MessageExtra) {
     for (const listener of sendListeners) {
         try {
-            const result = await listener(channelId, messageObj, extra);
+            const result = listener(channelId, messageObj, extra);
             if (result && result.cancel === true) {
                 return true;
             }
@@ -62,10 +61,10 @@ export async function _handlePreSend(channelId: string, messageObj: MessageObjec
     return false;
 }
 
-export async function _handlePreEdit(channelId: string, messageId: string, messageObj: MessageObject) {
+export function _handlePreEdit(channelId: string, messageId: string, messageObj: MessageObject) {
     for (const listener of editListeners) {
         try {
-            await listener(channelId, messageId, messageObj);
+            listener(channelId, messageId, messageObj);
         } catch (e) {
             MessageEventsLogger.error("MessageEditHandler: Listener encountered an unknown error\n", e);
         }

src/api/Notifications/NotificationComponent.tsx

@@ -20,8 +20,7 @@ import "./styles.css";
 
 import { useSettings } from "@api/settings";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { classes } from "@utils/misc";
+import { Forms, React, useEffect, useMemo, useState, useStateFromStores, WindowStore } from "@webpack/common";
-import { React, useEffect, useMemo, useState, useStateFromStores, WindowStore } from "@webpack/common";
 
 import { NotificationData } from "./Notifications";
 
@@ -33,11 +32,8 @@ export default ErrorBoundary.wrap(function NotificationComponent({
     icon,
     onClick,
     onClose,
-    image,
+    image
-    permanent,
+}: NotificationData) {
-    className,
-    dismissOnClick
-}: NotificationData & { className?: string; }) {
     const { timeout, position } = useSettings(["notifications.timeout", "notifications.position"]).notifications;
     const hasFocus = useStateFromStores([WindowStore], () => WindowStore.isFocused());
 
@@ -47,7 +43,7 @@ export default ErrorBoundary.wrap(function NotificationComponent({
     const start = useMemo(() => Date.now(), [timeout, isHover, hasFocus]);
 
     useEffect(() => {
-        if (isHover || !hasFocus || timeout === 0 || permanent) return void setElapsed(0);
+        if (isHover || !hasFocus || timeout === 0) return void setElapsed(0);
 
         const intervalId = setInterval(() => {
             const elapsed = Date.now() - start;
@@ -64,13 +60,9 @@ export default ErrorBoundary.wrap(function NotificationComponent({
 
     return (
         <button
-            className={classes("vc-notification-root", className)}
+            className="vc-notification-root"
             style={position === "bottom-right" ? { bottom: "1rem" } : { top: "3rem" }}
-            onClick={() => {
+            onClick={onClick}
-                onClick?.();
-                if (dismissOnClick !== false)
-                    onClose!();
-            }}
             onContextMenu={e => {
                 e.preventDefault();
                 e.stopPropagation();
@@ -82,35 +74,14 @@ export default ErrorBoundary.wrap(function NotificationComponent({
             <div className="vc-notification">
                 {icon && <img className="vc-notification-icon" src={icon} alt="" />}
                 <div className="vc-notification-content">
-                    <div className="vc-notification-header">
+                    <Forms.FormTitle tag="h2">{title}</Forms.FormTitle>
-                        <h2 className="vc-notification-title">{title}</h2>
-                        <button
-                            className="vc-notification-close-btn"
-                            onClick={e => {
-                                e.preventDefault();
-                                e.stopPropagation();
-                                onClose!();
-                            }}
-                        >
-                            <svg
-                                width="24"
-                                height="24"
-                                viewBox="0 0 24 24"
-                                role="img"
-                                aria-labelledby="vc-notification-dismiss-title"
-                            >
-                                <title id="vc-notification-dismiss-title">Dismiss Notification</title>
-                                <path fill="currentColor" d="M18.4 4L12 10.4L5.6 4L4 5.6L10.4 12L4 18.4L5.6 20L12 13.6L18.4 20L20 18.4L13.6 12L20 5.6L18.4 4Z" />
-                            </svg>
-                        </button>
-                    </div>
                     <div>
                         {richBody ?? <p className="vc-notification-p">{body}</p>}
                     </div>
                 </div>
             </div>
             {image && <img className="vc-notification-img" src={image} alt="" />}
-            {timeout !== 0 && !permanent && (
+            {timeout !== 0 && (
                 <div
                     className="vc-notification-progressbar"
                     style={{ width: `${(1 - timeoutProgress) * 100}%`, backgroundColor: color || "var(--brand-experiment)" }}
@@ -118,6 +89,4 @@ export default ErrorBoundary.wrap(function NotificationComponent({
             )}
         </button>
     );
-}, {
-    onError: ({ props }) => props.onClose!()
 });

src/api/Notifications/Notifications.tsx

@@ -23,7 +23,6 @@ import type { ReactNode } from "react";
 import type { Root } from "react-dom/client";
 
 import NotificationComponent from "./NotificationComponent";
-import { persistNotification } from "./notificationLog";
 
 const NotificationQueue = new Queue();
 
@@ -55,12 +54,6 @@ export interface NotificationData {
     onClick?(): void;
     onClose?(): void;
     color?: string;
-    /** Whether this notification should not have a timeout */
-    permanent?: boolean;
-    /** Whether this notification should not be persisted in the Notification Log */
-    noPersist?: boolean;
-    /** Whether this notification should be dismissed when clicked (defaults to true) */
-    dismissOnClick?: boolean;
 }
 
 function _showNotification(notification: NotificationData, id: number) {
@@ -91,8 +84,6 @@ export async function requestPermission() {
 }
 
 export async function showNotification(data: NotificationData) {
-    persistNotification(data);
-
     if (shouldBeNative() && await requestPermission()) {
         const { title, body, icon, image, onClick = null, onClose = null } = data;
         const n = new Notification(title, {

src/api/Notifications/notificationLog.tsx

@@ -1,203 +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 * as DataStore from "@api/DataStore";
-import { Settings } from "@api/settings";
-import { classNameFactory } from "@api/Styles";
-import { useAwaiter } from "@utils/misc";
-import { closeModal, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { Alerts, Button, Forms, moment, React, Text, Timestamp, useEffect, useReducer, useState } from "@webpack/common";
-import { nanoid } from "nanoid";
-import type { DispatchWithoutAction } from "react";
-
-import NotificationComponent from "./NotificationComponent";
-import type { NotificationData } from "./Notifications";
-
-interface PersistentNotificationData extends Pick<NotificationData, "title" | "body" | "image" | "icon" | "color"> {
-    timestamp: number;
-    id: string;
-}
-
-const KEY = "notification-log";
-
-const getLog = async () => {
-    const log = await DataStore.get(KEY) as PersistentNotificationData[] | undefined;
-    return log ?? [];
-};
-
-const cl = classNameFactory("vc-notification-log-");
-const signals = new Set<DispatchWithoutAction>();
-
-export async function persistNotification(notification: NotificationData) {
-    if (notification.noPersist) return;
-
-    const limit = Settings.notifications.logLimit;
-    if (limit === 0) return;
-
-    await DataStore.update(KEY, (old: PersistentNotificationData[] | undefined) => {
-        const log = old ?? [];
-
-        // Omit stuff we don't need
-        const {
-            onClick, onClose, richBody, permanent, noPersist, dismissOnClick,
-            ...pureNotification
-        } = notification;
-
-        log.unshift({
-            ...pureNotification,
-            timestamp: Date.now(),
-            id: nanoid()
-        });
-
-        if (log.length > limit && limit !== 200)
-            log.length = limit;
-
-        return log;
-    });
-
-    signals.forEach(x => x());
-}
-
-export async function deleteNotification(timestamp: number) {
-    const log = await getLog();
-    const index = log.findIndex(x => x.timestamp === timestamp);
-    if (index === -1) return;
-
-    log.splice(index, 1);
-    await DataStore.set(KEY, log);
-    signals.forEach(x => x());
-}
-
-export function useLogs() {
-    const [signal, setSignal] = useReducer(x => x + 1, 0);
-
-    useEffect(() => {
-        signals.add(setSignal);
-        return () => void signals.delete(setSignal);
-    }, []);
-
-    const [log, _, pending] = useAwaiter(getLog, {
-        fallbackValue: [],
-        deps: [signal]
-    });
-
-    return [log, pending] as const;
-}
-
-function NotificationEntry({ data }: { data: PersistentNotificationData; }) {
-    const [removing, setRemoving] = useState(false);
-    const ref = React.useRef<HTMLDivElement>(null);
-
-    useEffect(() => {
-        const div = ref.current!;
-
-        const setHeight = () => {
-            if (div.clientHeight === 0) return requestAnimationFrame(setHeight);
-            div.style.height = `${div.clientHeight}px`;
-        };
-
-        setHeight();
-    }, []);
-
-    return (
-        <div className={cl("wrapper", { removing })} ref={ref}>
-            <NotificationComponent
-                {...data}
-                permanent={true}
-                dismissOnClick={false}
-                onClose={() => {
-                    if (removing) return;
-                    setRemoving(true);
-
-                    setTimeout(() => deleteNotification(data.timestamp), 200);
-                }}
-                richBody={
-                    <div className={cl("body")}>
-                        {data.body}
-                        <Timestamp timestamp={moment(data.timestamp)} className={cl("timestamp")} />
-                    </div>
-                }
-            />
-        </div>
-    );
-}
-
-export function NotificationLog({ log, pending }: { log: PersistentNotificationData[], pending: boolean; }) {
-    if (!log.length && !pending)
-        return (
-            <div className={cl("container")}>
-                <div className={cl("empty")} />
-                <Forms.FormText style={{ textAlign: "center" }}>
-                    No notifications yet
-                </Forms.FormText>
-            </div>
-        );
-
-    return (
-        <div className={cl("container")}>
-            {log.map(n => <NotificationEntry data={n} key={n.id} />)}
-        </div>
-    );
-}
-
-function LogModal({ modalProps, close }: { modalProps: ModalProps; close(): void; }) {
-    const [log, pending] = useLogs();
-
-    return (
-        <ModalRoot {...modalProps} size={ModalSize.LARGE}>
-            <ModalHeader>
-                <Text variant="heading-lg/semibold" style={{ flexGrow: 1 }}>Notification Log</Text>
-                <ModalCloseButton onClick={close} />
-            </ModalHeader>
-
-            <ModalContent>
-                <NotificationLog log={log} pending={pending} />
-            </ModalContent>
-
-            <ModalFooter>
-                <Button
-                    disabled={log.length === 0}
-                    onClick={() => {
-                        Alerts.show({
-                            title: "Are you sure?",
-                            body: `This will permanently remove ${log.length} notification${log.length === 1 ? "" : "s"}. This action cannot be undone.`,
-                            async onConfirm() {
-                                await DataStore.set(KEY, []);
-                                signals.forEach(x => x());
-                            },
-                            confirmText: "Do it!",
-                            confirmColor: "vc-notification-log-danger-btn",
-                            cancelText: "Nevermind"
-                        });
-                    }}
-                >
-                    Clear Notification Log
-                </Button>
-            </ModalFooter>
-        </ModalRoot>
-    );
-}
-
-export function openNotificationLogModal() {
-    const key = openModal(modalProps => (
-        <LogModal
-            modalProps={modalProps}
-            close={() => closeModal(key)}
-        />
-    ));
-}

src/api/Notifications/styles.css

@@ -3,20 +3,16 @@
     all: unset;
     display: flex;
     flex-direction: column;
+    width: 25vw;
+    min-height: 10vh;
     color: var(--text-normal);
     background-color: var(--background-secondary-alt);
-    border-radius: 6px;
-    overflow: hidden;
-    cursor: pointer;
-    width: 100%;
-}
-
-.vc-notification-root:not(.vc-notification-log-wrapper > .vc-notification-root) {
     position: absolute;
     z-index: 2147483647;
     right: 1rem;
-    width: 25vw;
+    border-radius: 6px;
-    min-height: 10vh;
+    overflow: hidden;
+    cursor: pointer;
 }
 
 .vc-notification {
@@ -26,42 +22,17 @@
     gap: 1.25rem;
 }
 
-.vc-notification-content {
-    width: 100%;
-}
-
-.vc-notification-header {
-    display: flex;
-    justify-content: space-between;
-}
-
-.vc-notification-title {
-    color: var(--header-primary);
-    font-size: 1rem;
-    font-weight: 600;
-    line-height: 1.25rem;
-    text-transform: uppercase;
-}
-
-.vc-notification-close-btn {
-    all: unset;
-    cursor: pointer;
-    color: var(--interactive-normal);
-    opacity: 0.5;
-    transition: opacity 0.2s ease-in-out, color 0.2s ease-in-out;
-}
-
-.vc-notification-close-btn:hover {
-    color: var(--interactive-hover);
-    opacity: 1;
-}
-
 .vc-notification-icon {
     height: 4rem;
     width: 4rem;
     border-radius: 6px;
 }
 
+/* Discord adding 3km margin to generic tags */
+.vc-notification h2 {
+    margin: unset;
+}
+
 .vc-notification-progressbar {
     height: 0.25rem;
     border-radius: 5px;
@@ -76,47 +47,3 @@
 .vc-notification-img {
     width: 100%;
 }
-
-.vc-notification-log-empty {
-    height: 218px;
-    background: url("/assets/b36de980b174d7b798c89f35c116e5c6.svg") center no-repeat;
-    margin-bottom: 40px;
-}
-
-.vc-notification-log-container {
-    display: flex;
-    flex-direction: column;
-    padding: 1em;
-    overflow: hidden;
-}
-
-.vc-notification-log-wrapper {
-    transition: 200ms ease;
-    transition-property: height, opacity;
-}
-
-.vc-notification-log-wrapper:not(:last-child) {
-    margin-bottom: 1em;
-}
-
-.vc-notification-log-removing {
-    height: 0 !important;
-    opacity: 0;
-    margin-bottom: 1em;
-}
-
-.vc-notification-log-body {
-    display: flex;
-    flex-direction: column;
-}
-
-.vc-notification-log-timestamp {
-    margin-left: auto;
-    font-size: 0.8em;
-    font-weight: lighter;
-}
-
-.vc-notification-log-danger-btn {
-    color: var(--white-500);
-    background-color: var(--button-danger-background);
-}

src/api/SettingsStore.ts

@@ -1,69 +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 Logger from "@utils/Logger";
-import { proxyLazy } from "@utils/proxyLazy";
-import { findModuleId, wreq } from "@webpack";
-
-import { Settings } from "./settings";
-
-interface Setting<T> {
-    /**
-     * Get the setting value
-     */
-    getSetting(): T;
-    /**
-     * Update the setting value
-     * @param value The new value
-     */
-    updateSetting(value: T | ((old: T) => T)): Promise<void>;
-    /**
-     * React hook for automatically updating components when the setting is updated
-     */
-    useSetting(): T;
-    settingsStoreApiGroup: string;
-    settingsStoreApiName: string;
-}
-
-const SettingsStores: Array<Setting<any>> | undefined = proxyLazy(() => {
-    const modId = findModuleId('"textAndImages","renderSpoilers"');
-    if (modId == null) return new Logger("SettingsStoreAPI").error("Didn't find stores module.");
-
-    const mod = wreq(modId);
-    if (mod == null) return;
-
-    return Object.values(mod).filter((s: any) => s?.settingsStoreApiGroup) as any;
-});
-
-/**
- * Get the store for a setting
- * @param group The setting group
- * @param name The name of the setting
- */
-export function getSettingStore<T = any>(group: string, name: string): Setting<T> | undefined {
-    if (!Settings.plugins.SettingsStoreAPI.enabled) throw new Error("Cannot use SettingsStoreAPI without setting as dependency.");
-
-    return SettingsStores?.find(s => s?.settingsStoreApiGroup === group && s?.settingsStoreApiName === name);
-}
-
-/**
- * getSettingStore but lazy
- */
-export function getSettingStoreLazy<T = any>(group: string, name: string) {
-    return proxyLazy(() => getSettingStore<T>(group, name));
-}

src/api/index.ts

@@ -18,7 +18,6 @@
 
 import * as $Badges from "./Badges";
 import * as $Commands from "./Commands";
-import * as $ContextMenu from "./ContextMenu";
 import * as $DataStore from "./DataStore";
 import * as $MemberListDecorators from "./MemberListDecorators";
 import * as $MessageAccessories from "./MessageAccessories";
@@ -28,7 +27,6 @@ import * as $MessagePopover from "./MessagePopover";
 import * as $Notices from "./Notices";
 import * as $Notifications from "./Notifications";
 import * as $ServerList from "./ServerList";
-import * as $SettingsStore from "./SettingsStore";
 import * as $Styles from "./Styles";
 
 /**
@@ -86,10 +84,6 @@ export const MessageDecorations = $MessageDecorations;
  * An API allowing you to add components to member list users, in both DM's and servers
  */
 export const MemberListDecorators = $MemberListDecorators;
-/**
- * An API allowing you to read, manipulate and automatically update components based on Discord settings
- */
-export const SettingsStore = $SettingsStore;
 /**
  * An API allowing you to dynamically load styles
  * a
@@ -99,8 +93,3 @@ export const Styles = $Styles;
  * An API allowing you to display notifications
  */
 export const Notifications = $Notifications;
-
-/**
- * An api allowing you to patch and add/remove items to/from context menus
- */
-export const ContextMenu = $ContextMenu;

src/api/settings.ts

@@ -16,12 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { debounce } from "@utils/debounce";
 import IpcEvents from "@utils/IpcEvents";
-import { localStorage } from "@utils/localStorage";
 import Logger from "@utils/Logger";
 import { mergeDefaults } from "@utils/misc";
-import { putCloudSettings } from "@utils/settingsSync";
 import { DefinedSettings, OptionType, SettingsChecks, SettingsDefinition } from "@utils/types";
 import { React } from "@webpack/common";
 
@@ -31,14 +28,12 @@ const logger = new Logger("Settings");
 export interface Settings {
     notifyAboutUpdates: boolean;
     autoUpdate: boolean;
-    autoUpdateNotification: boolean,
     useQuickCss: boolean;
     enableReactDevtools: boolean;
     themeLinks: string[];
     frameless: boolean;
     transparent: boolean;
     winCtrlQ: boolean;
-    winNativeTitleBar: boolean;
     plugins: {
         [plugin: string]: {
             enabled: boolean;
@@ -50,42 +45,24 @@ export interface Settings {
         timeout: number;
         position: "top-right" | "bottom-right";
         useNative: "always" | "never" | "not-focused";
-        logLimit: number;
-    };
-
-    cloud: {
-        authenticated: boolean;
-        url: string;
-        settingsSync: boolean;
-        settingsSyncVersion: number;
     };
 }
 
 const DefaultSettings: Settings = {
     notifyAboutUpdates: true,
     autoUpdate: false,
-    autoUpdateNotification: true,
     useQuickCss: true,
     themeLinks: [],
     enableReactDevtools: false,
     frameless: false,
     transparent: false,
     winCtrlQ: false,
-    winNativeTitleBar: false,
     plugins: {},
 
     notifications: {
         timeout: 5000,
         position: "bottom-right",
-        useNative: "not-focused",
+        useNative: "not-focused"
-        logLimit: 50
-    },
-
-    cloud: {
-        authenticated: false,
-        url: "https://api.vencord.dev/",
-        settingsSync: false,
-        settingsSyncVersion: 0
     }
 };
 
@@ -97,13 +74,6 @@ try {
     logger.error("An error occurred while loading the settings. Corrupt settings file?\n", err);
 }
 
-const saveSettingsOnFrequentAction = debounce(async () => {
-    if (Settings.cloud.settingsSync && Settings.cloud.authenticated) {
-        await putCloudSettings();
-        delete localStorage.Vencord_settingsDirty;
-    }
-}, 60_000);
-
 type SubscriptionCallback = ((newValue: any, path: string) => void) & { _path?: string; };
 const subscriptions = new Set<SubscriptionCallback>();
 
@@ -120,7 +90,7 @@ function makeProxy(settings: any, root = settings, path = ""): Settings {
                 // Return empty for plugins with no settings
                 if (path === "plugins" && p in plugins)
                     return target[p] = makeProxy({
-                        enabled: plugins[p].required ?? plugins[p].enabledByDefault ?? false
+                        enabled: plugins[p].required ?? false
                     }, root, `plugins.${p}`);
 
                 // Since the property is not set, check if this is a plugin's setting and if so, try to resolve
@@ -159,16 +129,12 @@ function makeProxy(settings: any, root = settings, path = ""): Settings {
             target[p] = v;
             // Call any listeners that are listening to a setting of this path
             const setPath = `${path}${path && "."}${p}`;
-            delete proxyCache[setPath];
             for (const subscription of subscriptions) {
                 if (!subscription._path || subscription._path === setPath) {
                     subscription(v, setPath);
                 }
             }
             // And don't forget to persist the settings!
-            PlainSettings.cloud.settingsSyncVersion = Date.now();
-            localStorage.Vencord_settingsDirty = true;
-            saveSettingsOnFrequentAction();
             VencordNative.ipc.invoke(IpcEvents.SET_SETTINGS, JSON.stringify(root, null, 4));
             return true;
         }
@@ -199,11 +165,11 @@ export const Settings = makeProxy(settings);
  * @returns Settings
  */
 // TODO: Representing paths as essentially "string[].join('.')" wont allow dots in paths, change to "paths?: string[][]" later
-export function useSettings(paths?: UseSettings<Settings>[]) {
+export function useSettings(paths?: string[]) {
     const [, forceUpdate] = React.useReducer(() => ({}), {});
 
     const onUpdate: SubscriptionCallback = paths
-        ? (value, path) => paths.includes(path as UseSettings<Settings>) && forceUpdate()
+        ? (value, path) => paths.includes(path) && forceUpdate()
         : forceUpdate;
 
     React.useEffect(() => {
@@ -261,7 +227,7 @@ export function definePluginSettings<D extends SettingsDefinition, C extends Set
             return Settings.plugins[definedSettings.pluginName] as any;
         },
         use: settings => useSettings(
-            settings?.map(name => `plugins.${definedSettings.pluginName}.${name}`) as UseSettings<Settings>[]
+            settings?.map(name => `plugins.${definedSettings.pluginName}.${name}`)
         ).plugins[definedSettings.pluginName] as any,
         def,
         checks: checks ?? {},
@@ -269,15 +235,3 @@ export function definePluginSettings<D extends SettingsDefinition, C extends Set
     };
     return definedSettings;
 }
-
-type UseSettings<T extends object> = ResolveUseSettings<T>[keyof T];
-
-type ResolveUseSettings<T extends object> = {
-    [Key in keyof T]:
-    Key extends string
-    ? T[Key] extends Record<string, unknown>
-    // @ts-ignore "Type instantiation is excessively deep and possibly infinite"
-    ? UseSettings<T[Key]> extends string ? `${Key}.${UseSettings<T[Key]>}` : never
-    : Key
-    : never;
-};

src/components/ErrorBoundary.tsx

@@ -17,24 +17,20 @@
 */
 
 import Logger from "@utils/Logger";
-import { Margins } from "@utils/margins";
 import { LazyComponent } from "@utils/misc";
-import { React } from "@webpack/common";
+import { Margins, React } from "@webpack/common";
 
 import { ErrorCard } from "./ErrorCard";
 
-interface Props<T = any> {
+interface Props {
     /** Render nothing if an error occurs */
     noop?: boolean;
     /** Fallback component to render if an error occurs */
     fallback?: React.ComponentType<React.PropsWithChildren<{ error: any; message: string; stack: string; }>>;
-    /** called when an error occurs. The props property is only available if using .wrap */
+    /** called when an error occurs */
-    onError?(data: { error: Error, errorInfo: React.ErrorInfo, props: T; }): void;
+    onError?(error: Error, errorInfo: React.ErrorInfo): void;
     /** Custom error message */
     message?: string;
-
-    /** The props passed to the wrapped component. Only used by wrap */
-    wrappedProps?: T;
 }
 
 const color = "#e78284";
@@ -69,7 +65,7 @@ const ErrorBoundary = LazyComponent(() => {
         }
 
         componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
-            this.props.onError?.({ error, errorInfo, props: this.props.wrappedProps });
+            this.props.onError?.(error, errorInfo);
             logger.error("A component threw an Error\n", error);
             logger.error("Component Stack", errorInfo.componentStack);
         }
@@ -88,13 +84,15 @@ const ErrorBoundary = LazyComponent(() => {
             const msg = this.props.message || "An error occurred while rendering this Component. More info can be found below and in your console.";
 
             return (
-                <ErrorCard style={{ overflow: "hidden" }}>
+                <ErrorCard style={{
+                    overflow: "hidden",
+                }}>
                     <h1>Oh no!</h1>
                     <p>{msg}</p>
                     <code>
                         {this.state.message}
                         {!!this.state.stack && (
-                            <pre className={Margins.top8}>
+                            <pre className={Margins.marginTop8}>
                                 {this.state.stack}
                             </pre>
                         )}
@@ -105,11 +103,11 @@ const ErrorBoundary = LazyComponent(() => {
     };
 }) as
     React.ComponentType<React.PropsWithChildren<Props>> & {
-        wrap<T extends object = any>(Component: React.ComponentType<T>, errorBoundaryProps?: Omit<Props<T>, "wrappedProps">): React.FunctionComponent<T>;
+        wrap<T extends object = any>(Component: React.ComponentType<T>, errorBoundaryProps?: Props): React.ComponentType<T>;
     };
 
 ErrorBoundary.wrap = (Component, errorBoundaryProps) => props => (
-    <ErrorBoundary {...errorBoundaryProps} wrappedProps={props}>
+    <ErrorBoundary {...errorBoundaryProps}>
         <Component {...props} />
     </ErrorBoundary>
 );

src/components/ErrorCard.css

@@ -1,7 +0,0 @@
-.vc-error-card {
-    padding: 2em;
-    background-color: #e7828430;
-    border: 1px solid #e78284;
-    border-radius: 5px;
-    color: var(--text-normal, white);
-}

src/components/ErrorCard.tsx

@@ -16,15 +16,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import "./ErrorCard.css";
+import { Card } from "@webpack/common";
 
-import { classes } from "@utils/misc";
+interface Props {
-import type { HTMLProps } from "react";
+    style?: React.CSSProperties;
-
+    className?: string;
-export function ErrorCard(props: React.PropsWithChildren<HTMLProps<HTMLDivElement>>) {
+}
+export function ErrorCard(props: React.PropsWithChildren<Props>) {
     return (
-        <div {...props} className={classes(props.className, "vc-error-card")}>
+        <Card className={props.className} style={
+            {
+                padding: "2em",
+                backgroundColor: "#e7828430",
+                borderColor: "#e78284",
+                color: "var(--text-normal)",
+                ...props.style
+            }
+        }>
             {props.children}
-        </div>
+        </Card>
     );
 }

src/components/PatchHelper.tsx

@@ -17,12 +17,10 @@
 */
 
 import { debounce } from "@utils/debounce";
-import { Margins } from "@utils/margins";
 import { makeCodeblock } from "@utils/misc";
-import { canonicalizeMatch, canonicalizeReplace } from "@utils/patches";
+import { canonicalizeMatch, canonicalizeReplace, ReplaceFn } from "@utils/patches";
-import { ReplaceFn } from "@utils/types";
 import { search } from "@webpack";
-import { Button, Clipboard, Forms, Parser, React, Switch, Text, TextInput } from "@webpack/common";
+import { Button, Clipboard, Forms, Margins, Parser, React, Switch, Text, TextInput } from "@webpack/common";
 
 import { CheckedTextInput } from "./CheckedTextInput";
 import ErrorBoundary from "./ErrorBoundary";
@@ -130,7 +128,7 @@ function ReplacementComponent({ module, match, replacement, setReplacementError
             )}
 
             {!!diff?.length && (
-                <Button className={Margins.top20} onClick={() => {
+                <Button className={Margins.marginTop20} onClick={() => {
                     try {
                         Function(patchedCode.replace(/^function\(/, "function patchedModule("));
                         setCompileResult([true, "Compiled successfully"]);
@@ -204,7 +202,7 @@ function ReplacementInput({ replacement, setReplacement, replacementError }) {
             )}
 
             <Switch
-                className={Margins.top8}
+                className={Margins.marginTop8}
                 value={isFunc}
                 onChange={setIsFunc}
                 note="'replacement' will be evaled if this is toggled"
@@ -258,7 +256,7 @@ function PatchHelper() {
 
     return (
         <Forms.FormSection>
-            <Text variant="heading-md/normal" tag="h2" className={Margins.bottom8}>Patch Helper</Text>
+            <Text variant="heading-md/normal" tag="h2" className={Margins.marginBottom8}>Patch Helper</Text>
             <Forms.FormTitle>find</Forms.FormTitle>
             <TextInput
                 type="text"
@@ -298,7 +296,7 @@ function PatchHelper() {
 
             {!!(find && match && replacement) && (
                 <>
-                    <Forms.FormTitle className={Margins.top20}>Code</Forms.FormTitle>
+                    <Forms.FormTitle className={Margins.marginTop20}>Code</Forms.FormTitle>
                     <div style={{ userSelect: "text" }}>{Parser.parse(makeCodeblock(code, "ts"))}</div>
                     <Button onClick={() => Clipboard.copy(code)}>Copy to Clipboard</Button>
                 </>

src/components/PluginSettings/components/SettingNumericComponent.tsx

@@ -38,12 +38,9 @@ export function SettingNumericComponent({ option, pluginSettings, definedSetting
 
     function handleChange(newValue) {
         const isValid = option.isValid?.call(definedSettings, newValue) ?? true;
-
-        setError(null);
         if (typeof isValid === "string") setError(isValid);
         else if (!isValid) setError("Invalid input provided.");
-
+        else if (option.type === OptionType.NUMBER && BigInt(newValue) >= MAX_SAFE_NUMBER) {
-        if (option.type === OptionType.NUMBER && BigInt(newValue) >= MAX_SAFE_NUMBER) {
             setState(`${Number.MAX_SAFE_INTEGER}`);
             onChange(serialize(newValue));
         } else {

src/components/PluginSettings/components/SettingSelectComponent.tsx

@@ -36,7 +36,6 @@ export function SettingSelectComponent({ option, pluginSettings, definedSettings
         if (typeof isValid === "string") setError(isValid);
         else if (!isValid) setError("Invalid input provided.");
         else {
-            setError(null);
             setState(newValue);
             onChange(newValue);
         }

src/components/PluginSettings/components/SettingTextComponent.tsx

@@ -34,7 +34,6 @@ export function SettingTextComponent({ option, pluginSettings, definedSettings,
         if (typeof isValid === "string") setError(isValid);
         else if (!isValid) setError("Invalid input provided.");
         else {
-            setError(null);
             setState(newValue);
             onChange(newValue);
         }

src/components/PluginSettings/index.tsx

@@ -30,12 +30,11 @@ import PluginModal from "@components/PluginSettings/PluginModal";
 import { Switch } from "@components/Switch";
 import { ChangeList } from "@utils/ChangeList";
 import Logger from "@utils/Logger";
-import { Margins } from "@utils/margins";
 import { classes, LazyComponent, useAwaiter } from "@utils/misc";
 import { openModalLazy } from "@utils/modal";
 import { Plugin } from "@utils/types";
 import { findByCode, findByPropsLazy } from "@webpack";
-import { Alerts, Button, Card, Forms, Parser, React, Select, Text, TextInput, Toasts, Tooltip } from "@webpack/common";
+import { Alerts, Button, Card, Forms, Margins, Parser, React, Select, Text, TextInput, Toasts, Tooltip } from "@webpack/common";
 
 import Plugins from "~plugins";
 
@@ -46,7 +45,6 @@ const cl = classNameFactory("vc-plugins-");
 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"));
@@ -94,7 +92,7 @@ interface PluginCardProps extends React.HTMLProps<HTMLDivElement> {
 }
 
 function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, onMouseLeave, isNew }: PluginCardProps) {
-    const settings = useSettings([`plugins.${plugin.name}.enabled`]).plugins[plugin.name];
+    const settings = useSettings([`plugins.${plugin.name}`]).plugins[plugin.name];
 
     const isEnabled = () => settings.enabled ?? false;
 
@@ -155,7 +153,7 @@ function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, onMouseLe
                 <Text variant="text-md/bold" className={cl("name")}>
                     {plugin.name}{isNew && <Badge text="NEW" color="#ED4245" />}
                 </Text>
-                <button role="switch" onClick={() => openModal()} className={classes(ButtonClasses.button, cl("info-button"))}>
+                <button role="switch" onClick={() => openModal()} className={classes("button-12Fmur", cl("info-button"))}>
                     {plugin.options
                         ? <CogWheel />
                         : <InfoIcon width="24" height="24" />}
@@ -298,15 +296,15 @@ export default ErrorBoundary.wrap(function PluginSettings() {
     }
 
     return (
-        <Forms.FormSection className={Margins.top16}>
+        <Forms.FormSection className={Margins.marginTop16}>
             <ReloadRequiredCard required={changes.hasChanges} />
 
-            <Forms.FormTitle tag="h5" className={classes(Margins.top20, Margins.bottom8)}>
+            <Forms.FormTitle tag="h5" className={classes(Margins.marginTop20, Margins.marginBottom8)}>
                 Filters
             </Forms.FormTitle>
 
             <div className={cl("filter-controls")}>
-                <TextInput autoFocus value={searchValue.value} placeholder="Search for a plugin..." onChange={onSearch} className={Margins.bottom20} />
+                <TextInput autoFocus value={searchValue.value} placeholder="Search for a plugin..." onChange={onSearch} className={Margins.marginBottom20} />
                 <div className={InputStyles.inputWrapper}>
                     <Select
                         className={InputStyles.inputDefault}
@@ -323,15 +321,15 @@ export default ErrorBoundary.wrap(function PluginSettings() {
                 </div>
             </div>
 
-            <Forms.FormTitle className={Margins.top20}>Plugins</Forms.FormTitle>
+            <Forms.FormTitle className={Margins.marginTop20}>Plugins</Forms.FormTitle>
 
             <div className={cl("grid")}>
                 {plugins}
             </div>
 
-            <Forms.FormDivider className={Margins.top20} />
+            <Forms.FormDivider className={Margins.marginTop20} />
 
-            <Forms.FormTitle tag="h5" className={classes(Margins.top20, Margins.bottom8)}>
+            <Forms.FormTitle tag="h5" className={classes(Margins.marginTop20, Margins.marginBottom8)}>
                 Required Plugins
             </Forms.FormTitle>
             <div className={cl("grid")}>

src/components/Switch.tsx

@@ -18,7 +18,6 @@
 
 import "./Switch.css";
 
-import { classes } from "@utils/misc";
 import { findByPropsLazy } from "@webpack";
 
 interface SwitchProps {
@@ -34,7 +33,7 @@ const SwitchClasses = findByPropsLazy("slider", "input", "container");
 export function Switch({ checked, onChange, disabled }: SwitchProps) {
     return (
         <div>
-            <div className={classes(SwitchClasses.container, "default-colors", checked ? SwitchClasses.checked : void 0)} style={{
+            <div className={`${SwitchClasses.container} default-colors`} style={{
                 backgroundColor: checked ? SWITCH_ON : SWITCH_OFF,
                 opacity: disabled ? 0.3 : 1
             }}>

src/components/VencordSettings/BackupRestoreTab.tsx

@@ -18,26 +18,25 @@
 
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
-import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
 import { downloadSettingsBackup, uploadSettingsBackup } from "@utils/settingsSync";
-import { Button, Card, Forms, Text } from "@webpack/common";
+import { Button, Card, Forms, Margins, Text } from "@webpack/common";
 
 function BackupRestoreTab() {
     return (
-        <Forms.FormSection title="Settings Sync" className={Margins.top16}>
+        <Forms.FormSection title="Settings Sync" className={Margins.marginTop16}>
             <Card className={classes("vc-settings-card", "vc-backup-restore-card")}>
                 <Flex flexDirection="column">
                     <strong>Warning</strong>
                     <span>Importing a settings file will overwrite your current settings.</span>
                 </Flex>
             </Card>
-            <Text variant="text-md/normal" className={Margins.bottom8}>
+            <Text variant="text-md/normal" className={Margins.marginBottom8}>
                 You can import and export your Vencord settings as a JSON file.
                 This allows you to easily transfer your settings to another device,
                 or recover your settings after reinstalling Vencord or Discord.
             </Text>
-            <Text variant="text-md/normal" className={Margins.bottom8}>
+            <Text variant="text-md/normal" className={Margins.marginBottom8}>
                 Settings Export contains:
                 <ul>
                     <li>&mdash; Custom QuickCSS</li>

src/components/VencordSettings/CloudTab.tsx

@@ -1,164 +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 { showNotification } from "@api/Notifications";
-import { Settings, useSettings } from "@api/settings";
-import { CheckedTextInput } from "@components/CheckedTextInput";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { Link } from "@components/Link";
-import { authorizeCloud, cloudLogger, deauthorizeCloud, getCloudAuth, getCloudUrl } from "@utils/cloud";
-import { Margins } from "@utils/margins";
-import { deleteCloudSettings, getCloudSettings, putCloudSettings } from "@utils/settingsSync";
-import { Alerts, Button, Forms, Switch, Tooltip } from "@webpack/common";
-
-function validateUrl(url: string) {
-    try {
-        new URL(url);
-        return true;
-    } catch {
-        return "Invalid URL";
-    }
-}
-
-async function eraseAllData() {
-    const res = await fetch(new URL("/v1/", getCloudUrl()), {
-        method: "DELETE",
-        headers: new Headers({
-            Authorization: await getCloudAuth()
-        })
-    });
-
-    if (!res.ok) {
-        cloudLogger.error(`Failed to erase data, API returned ${res.status}`);
-        showNotification({
-            title: "Cloud Integrations",
-            body: `Could not erase all data (API returned ${res.status}), please contact support.`,
-            color: "var(--red-360)"
-        });
-        return;
-    }
-
-    Settings.cloud.authenticated = false;
-    await deauthorizeCloud();
-
-    showNotification({
-        title: "Cloud Integrations",
-        body: "Successfully erased all data.",
-        color: "var(--green-360)"
-    });
-}
-
-function SettingsSyncSection() {
-    const { cloud } = useSettings(["cloud.authenticated", "cloud.settingsSync"]);
-    const sectionEnabled = cloud.authenticated && cloud.settingsSync;
-
-    return (
-        <Forms.FormSection title="Settings Sync" className={Margins.top16}>
-            <Forms.FormText variant="text-md/normal" className={Margins.bottom20}>
-                Synchronize your settings to the cloud. This allows easy synchronization across multiple devices with
-                minimal effort.
-            </Forms.FormText>
-            <Switch
-                key="cloud-sync"
-                disabled={!cloud.authenticated}
-                value={cloud.settingsSync}
-                onChange={v => { cloud.settingsSync = v; }}
-            >
-                Settings Sync
-            </Switch>
-            <div className="vc-cloud-settings-sync-grid">
-                <Button
-                    size={Button.Sizes.SMALL}
-                    disabled={!sectionEnabled}
-                    onClick={() => putCloudSettings()}
-                >Sync to Cloud</Button>
-                <Tooltip text="This will overwrite your local settings with the ones on the cloud. Use wisely!">
-                    {({ onMouseLeave, onMouseEnter }) => (
-                        <Button
-                            onMouseLeave={onMouseLeave}
-                            onMouseEnter={onMouseEnter}
-                            size={Button.Sizes.SMALL}
-                            color={Button.Colors.RED}
-                            disabled={!sectionEnabled}
-                            onClick={() => getCloudSettings(true, true)}
-                        >Sync from Cloud</Button>
-                    )}
-                </Tooltip>
-                <Button
-                    size={Button.Sizes.SMALL}
-                    color={Button.Colors.RED}
-                    disabled={!sectionEnabled}
-                    onClick={() => deleteCloudSettings()}
-                >Delete Cloud Settings</Button>
-            </div>
-        </Forms.FormSection>
-    );
-}
-
-function CloudTab() {
-    const settings = useSettings(["cloud.authenticated", "cloud.url"]);
-
-    return (
-        <>
-            <Forms.FormSection title="Cloud Settings" className={Margins.top16}>
-                <Forms.FormText variant="text-md/normal" className={Margins.bottom20}>
-                    Vencord comes with a cloud integration that adds goodies like settings sync across devices.
-                    It <Link href="https://vencord.dev/cloud/privacy">respects your privacy</Link>, and
-                    the <Link href="https://github.com/Vencord/Backend">source code</Link> is AGPL 3.0 licensed so you
-                    can host it yourself.
-                </Forms.FormText>
-                <Switch
-                    key="backend"
-                    value={settings.cloud.authenticated}
-                    onChange={v => { v && authorizeCloud(); if (!v) settings.cloud.authenticated = v; }}
-                    note="This will request authorization if you have not yet set up cloud integrations."
-                >
-                    Enable Cloud Integrations
-                </Switch>
-                <Forms.FormTitle tag="h5">Backend URL</Forms.FormTitle>
-                <Forms.FormText className={Margins.bottom8}>
-                    Which backend to use when using cloud integrations.
-                </Forms.FormText>
-                <CheckedTextInput
-                    key="backendUrl"
-                    value={settings.cloud.url}
-                    onChange={v => { settings.cloud.url = v; settings.cloud.authenticated = false; deauthorizeCloud(); }}
-                    validate={validateUrl}
-                />
-                <Button
-                    className={Margins.top8}
-                    size={Button.Sizes.MEDIUM}
-                    color={Button.Colors.RED}
-                    disabled={!settings.cloud.authenticated}
-                    onClick={() => Alerts.show({
-                        title: "Are you sure?",
-                        body: "Once your data is erased, we cannot recover it. There's no going back!",
-                        onConfirm: eraseAllData,
-                        confirmText: "Erase it!",
-                        confirmColor: "vc-cloud-erase-data-danger-btn",
-                        cancelText: "Nevermind"
-                    })}
-                >Erase All Data</Button>
-                <Forms.FormDivider className={Margins.top16} />
-            </Forms.FormSection >
-            <SettingsSyncSection />
-        </>
-    );
-}
-
-export default ErrorBoundary.wrap(CloudTab);

src/components/VencordSettings/ThemesTab.tsx

@@ -19,10 +19,9 @@
 import { useSettings } from "@api/settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Link } from "@components/Link";
-import { Margins } from "@utils/margins";
 import { useAwaiter } from "@utils/misc";
 import { findLazy } from "@webpack";
-import { Card, Forms, React, TextArea } from "@webpack/common";
+import { Card, Forms, Margins, React, TextArea } from "@webpack/common";
 
 const TextAreaProps = findLazy(m => typeof m.textarea === "string");
 
@@ -52,7 +51,7 @@ function Validators({ themeLinks }: { themeLinks: string[]; }) {
 
     return (
         <>
-            <Forms.FormTitle className={Margins.top20} tag="h5">Validator</Forms.FormTitle>
+            <Forms.FormTitle className={Margins.marginTop20} tag="h5">Validator</Forms.FormTitle>
             <Forms.FormText>This section will tell you whether your themes can successfully be loaded</Forms.FormText>
             <div>
                 {themeLinks.map(link => (
@@ -94,7 +93,7 @@ export default ErrorBoundary.wrap(function () {
                 <Forms.FormTitle tag="h5">Paste links to .css / .theme.css files here</Forms.FormTitle>
                 <Forms.FormText>One link per line</Forms.FormText>
                 <Forms.FormText>Make sure to use the raw links or github.io links!</Forms.FormText>
-                <Forms.FormDivider className={Margins.top8 + " " + Margins.bottom8} />
+                <Forms.FormDivider className={Margins.marginTop8 + " " + Margins.marginBottom8} />
                 <Forms.FormTitle tag="h5">Find Themes:</Forms.FormTitle>
                 <div style={{ marginBottom: ".5em" }}>
                     <Link style={{ marginRight: ".5em" }} href="https://betterdiscord.app/themes">
@@ -116,9 +115,13 @@ export default ErrorBoundary.wrap(function () {
             </Card>
             <Forms.FormTitle tag="h5">Themes</Forms.FormTitle>
             <TextArea
+                style={{
+                    padding: ".5em",
+                    border: "1px solid var(--background-modifier-accent)"
+                }}
                 value={themeText}
-                onChange={setThemeText}
+                onChange={e => setThemeText(e.currentTarget.value)}
-                className={`${TextAreaProps.textarea} vc-settings-theme-links`}
+                className={TextAreaProps.textarea}
                 placeholder="Theme Links"
                 spellCheck={false}
                 onBlur={onBlur}

src/components/VencordSettings/Updater.tsx

@@ -22,11 +22,9 @@ import { ErrorCard } from "@components/ErrorCard";
 import { Flex } from "@components/Flex";
 import { handleComponentFailed } from "@components/handleComponentFailed";
 import { Link } from "@components/Link";
-import { Margins } from "@utils/margins";
 import { classes, useAwaiter } from "@utils/misc";
-import { relaunch } from "@utils/native";
 import { changes, checkForUpdates, getRepo, isNewer, rebuild, update, updateError, UpdateLogger } from "@utils/updater";
-import { Alerts, Button, Card, Forms, Parser, React, Switch, Toasts } from "@webpack/common";
+import { Alerts, Button, Card, Forms, Margins, Parser, React, Switch, Toasts } from "@webpack/common";
 
 import gitHash from "~git-hash";
 
@@ -111,14 +109,14 @@ function Updatable(props: CommonProps) {
                     </ErrorCard>
                 </>
             ) : (
-                <Forms.FormText className={Margins.bottom8}>
+                <Forms.FormText className={Margins.marginBottom8}>
                     {isOutdated ? `There are ${updates.length} Updates` : "Up to Date!"}
                 </Forms.FormText>
             )}
 
             {isOutdated && <Changes updates={updates} {...props} />}
 
-            <Flex className={classes(Margins.bottom8, Margins.top8)}>
+            <Flex className={classes(Margins.marginBottom8, Margins.marginTop8)}>
                 {isOutdated && <Button
                     size={Button.Sizes.SMALL}
                     disabled={isUpdating || isChecking}
@@ -134,7 +132,7 @@ function Updatable(props: CommonProps) {
                                     cancelText: "Not now!",
                                     onConfirm() {
                                         if (needFullRestart)
-                                            relaunch();
+                                            window.DiscordNative.app.relaunch();
                                         else
                                             location.reload();
                                         r();
@@ -177,7 +175,7 @@ function Updatable(props: CommonProps) {
 function Newer(props: CommonProps) {
     return (
         <>
-            <Forms.FormText className={Margins.bottom8}>
+            <Forms.FormText className={Margins.marginBottom8}>
                 Your local copy has more recent commits. Please stash or reset them.
             </Forms.FormText>
             <Changes {...props} updates={changes} />
@@ -186,7 +184,7 @@ function Newer(props: CommonProps) {
 }
 
 function Updater() {
-    const settings = useSettings(["notifyAboutUpdates", "autoUpdate", "autoUpdateNotification"]);
+    const settings = useSettings(["notifyAboutUpdates", "autoUpdate"]);
 
     const [repo, err, repoPending] = useAwaiter(getRepo, { fallbackValue: "Loading..." });
 
@@ -201,12 +199,12 @@ function Updater() {
     };
 
     return (
-        <Forms.FormSection className={Margins.top16}>
+        <Forms.FormSection className={Margins.marginTop16}>
             <Forms.FormTitle tag="h5">Updater Settings</Forms.FormTitle>
             <Switch
                 value={settings.notifyAboutUpdates}
                 onChange={(v: boolean) => settings.notifyAboutUpdates = v}
-                note="Shows a notification on startup"
+                note="Shows a toast on startup"
                 disabled={settings.autoUpdate}
             >
                 Get notified about new updates
@@ -218,14 +216,6 @@ function Updater() {
             >
                 Automatically update
             </Switch>
-            <Switch
-                value={settings.autoUpdateNotification}
-                onChange={(v: boolean) => settings.autoUpdateNotification = v}
-                note="Shows a notification when Vencord automatically updates"
-                disabled={!settings.autoUpdate}
-            >
-                Get notified when an automatic update completes
-            </Switch>
 
             <Forms.FormTitle tag="h5">Repo</Forms.FormTitle>
 
@@ -235,7 +225,7 @@ function Updater() {
                 </Link>
             )} (<HashLink hash={gitHash} repo={repo} disabled={repoPending} />)</Forms.FormText>
 
-            <Forms.FormDivider className={Margins.top8 + " " + Margins.bottom8} />
+            <Forms.FormDivider className={Margins.marginTop8 + " " + Margins.marginBottom8} />
 
             <Forms.FormTitle tag="h5">Updates</Forms.FormTitle>
 

src/components/VencordSettings/VencordTab.tsx

@@ -17,7 +17,6 @@
 */
 
 
-import { openNotificationLogModal } from "@api/Notifications/notificationLog";
 import { useSettings } from "@api/settings";
 import { classNameFactory } from "@api/Styles";
 import DonateButton from "@components/DonateButton";
@@ -26,7 +25,6 @@ import { ErrorCard } from "@components/ErrorCard";
 import IpcEvents from "@utils/IpcEvents";
 import { Margins } from "@utils/margins";
 import { identity, useAwaiter } from "@utils/misc";
-import { relaunch, showItemInFolder } from "@utils/native";
 import { Button, Card, Forms, React, Select, Slider, Switch } from "@webpack/common";
 
 const cl = classNameFactory("vc-settings-");
@@ -65,16 +63,12 @@ function VencordSettings() {
                 title: "Enable React Developer Tools",
                 note: "Requires a full restart"
             },
-            !IS_WEB && (!IS_DISCORD_DESKTOP || !isWindows ? {
+            !IS_WEB && !isWindows && {
                 key: "frameless",
                 title: "Disable the window frame",
                 note: "Requires a full restart"
-            } : {
+            },
-                key: "winNativeTitleBar",
+            !IS_WEB && {
-                title: "Use Windows' native title bar instead of Discord's custom one",
-                note: "Requires a full restart"
-            }),
-            !IS_WEB && false /* This causes electron to freeze / white screen for some people */ && {
                 key: "transparent",
                 title: "Enable window transparency",
                 note: "Requires a full restart"
@@ -101,7 +95,7 @@ function VencordSettings() {
                     ) : (
                         <React.Fragment>
                             <Button
-                                onClick={relaunch}
+                                onClick={() => window.DiscordNative.app.relaunch()}
                                 size={Button.Sizes.SMALL}>
                                 Restart Client
                             </Button>
@@ -112,7 +106,7 @@ function VencordSettings() {
                                 Open QuickCSS File
                             </Button>
                             <Button
-                                onClick={() => showItemInFolder(settingsDir)}
+                                onClick={() => window.DiscordNative.fileManager.showItemInFolder(settingsDir)}
                                 size={Button.Sizes.SMALL}
                                 disabled={settingsDirPending}>
                                 Open Settings Folder
@@ -167,7 +161,7 @@ function VencordSettings() {
                     { label: "Only use Desktop notifications when Discord is not focused", value: "not-focused", default: true },
                     { label: "Always use Desktop notifications", value: "always" },
                     { label: "Always use Vencord notifications", value: "never" },
-                ] satisfies Array<{ value: typeof settings["notifications"]["useNative"]; } & Record<string, any>>}
+                ]satisfies Array<{ value: typeof settings["notifications"]["useNative"]; } & Record<string, any>>}
                 closeOnSelect={true}
                 select={v => notifSettings.useNative = v}
                 isSelected={v => v === notifSettings.useNative}
@@ -181,7 +175,7 @@ function VencordSettings() {
                 options={[
                     { label: "Bottom Right", value: "bottom-right", default: true },
                     { label: "Top Right", value: "top-right" },
-                ] satisfies Array<{ value: typeof settings["notifications"]["position"]; } & Record<string, any>>}
+                ]satisfies Array<{ value: typeof settings["notifications"]["position"]; } & Record<string, any>>}
                 select={v => notifSettings.position = v}
                 isSelected={v => v === notifSettings.position}
                 serialize={identity}
@@ -200,29 +194,6 @@ function VencordSettings() {
                 onMarkerRender={v => (v / 1000) + "s"}
                 stickToMarkers={false}
             />
-
-            <Forms.FormTitle tag="h5" className={Margins.top16 + " " + Margins.bottom8}>Notification Log Limit</Forms.FormTitle>
-            <Forms.FormText className={Margins.bottom16}>
-                The amount of notifications to save in the log until old ones are removed.
-                Set to <code>0</code> to disable Notification log and <code>∞</code> to never automatically remove old Notifications
-            </Forms.FormText>
-            <Slider
-                markers={[0, 25, 50, 75, 100, 200]}
-                minValue={0}
-                maxValue={200}
-                stickToMarkers={true}
-                initialValue={notifSettings.logLimit}
-                onValueChange={v => notifSettings.logLimit = v}
-                onValueRender={v => v === 200 ? "∞" : v}
-                onMarkerRender={v => v === 200 ? "∞" : v}
-            />
-
-            <Button
-                onClick={openNotificationLogModal}
-                disabled={notifSettings.logLimit === 0}
-            >
-                Open Notification Log
-            </Button>
         </React.Fragment>
     );
 }

src/components/VencordSettings/index.tsx

@@ -20,11 +20,10 @@ import "./settingsStyles.css";
 
 import { classNameFactory } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { handleComponentFailed } from "@components/handleComponentFailed";
+import { findByCodeLazy } from "@webpack";
-import { Forms, SettingsRouter, TabBar, Text } from "@webpack/common";
+import { Forms, SettingsRouter, Text } from "@webpack/common";
 
 import BackupRestoreTab from "./BackupRestoreTab";
-import CloudTab from "./CloudTab";
 import PluginsTab from "./PluginsTab";
 import ThemesTab from "./ThemesTab";
 import Updater from "./Updater";
@@ -32,6 +31,8 @@ import VencordSettings from "./VencordTab";
 
 const cl = classNameFactory("vc-settings-");
 
+const TabBar = findByCodeLazy('[role="tab"][aria-disabled="false"]');
+
 interface SettingsProps {
     tab: string;
 }
@@ -46,8 +47,7 @@ const SettingsTabs: Record<string, SettingsTab> = {
     VencordPlugins: { name: "Plugins", component: () => <PluginsTab /> },
     VencordThemes: { name: "Themes", component: () => <ThemesTab /> },
     VencordUpdater: { name: "Updater" }, // Only show updater if IS_WEB is false
-    VencordCloud: { name: "Cloud", component: () => <CloudTab /> },
+    VencordSettingsSync: { name: "Backup & Restore", component: () => <BackupRestoreTab /> },
-    VencordSettingsSync: { name: "Backup & Restore", component: () => <BackupRestoreTab /> }
 };
 
 if (!IS_WEB) SettingsTabs.VencordUpdater.component = () => Updater && <Updater />;
@@ -58,11 +58,11 @@ function Settings(props: SettingsProps) {
     const CurrentTab = SettingsTabs[tab]?.component;
 
     return <Forms.FormSection>
-        <Text variant="heading-lg/semibold" style={{ color: "var(--header-primary)" }} tag="h2">Vencord Settings</Text>
+        <Text variant="heading-md/normal" tag="h2">Vencord Settings</Text>
 
         <TabBar
-            type="top"
+            type={TabBar.Types.TOP}
-            look="brand"
+            look={TabBar.Looks.BRAND}
             className={cl("tab-bar")}
             selectedItem={tab}
             onItemSelect={SettingsRouter.open}
@@ -83,7 +83,7 @@ function Settings(props: SettingsProps) {
 }
 
 export default function (props: SettingsProps) {
-    return <ErrorBoundary onError={handleComponentFailed}>
+    return <ErrorBoundary>
         <Settings tab={props.tab} />
     </ErrorBoundary>;
 }

src/components/VencordSettings/settingsStyles.css

@@ -38,22 +38,3 @@
     color: var(--info-warning-text);
     margin-top: 0;
 }
-
-.vc-settings-theme-links {
-    /* Needed to fix bad themes that hide certain textarea elements for whatever eldritch reason */
-    display: inline-block !important;
-    color: var(--text-normal) !important;
-    padding: 0.5em;
-    border: 1px solid var(--background-modifier-accent);
-}
-
-.vc-cloud-settings-sync-grid {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    grid-gap: 1em;
-}
-
-.vc-cloud-erase-data-danger-btn {
-    color: var(--white-500);
-    background-color: var(--button-danger-background);
-}

src/components/handleComponentFailed.ts

@@ -16,12 +16,29 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { maybePromptToUpdate } from "@utils/updater";
+import { isOutdated, rebuild, update } from "@utils/updater";
 
-export function handleComponentFailed() {
+export async function handleComponentFailed() {
-    maybePromptToUpdate(
+    if (isOutdated) {
-        "Uh Oh! Failed to render this Page." +
+        setImmediate(async () => {
-        " However, there is an update available that might fix it." +
+            const wantsUpdate = confirm(
-        " Would you like to update and restart now?"
+                "Uh Oh! Failed to render this Page." +
-    );
+                " However, there is an update available that might fix it." +
+                " Would you like to update and restart now?"
+            );
+            if (wantsUpdate) {
+                try {
+                    await update();
+                    await rebuild();
+                    if (IS_WEB)
+                        location.reload();
+                    else
+                        DiscordNative.app.relaunch();
+                } catch (e) {
+                    console.error(e);
+                    alert("That also failed :( Try updating or reinstalling with the installer!");
+                }
+            }
+        });
+    }
 }

src/globals.d.ts

@@ -35,8 +35,6 @@ declare global {
     export var IS_WEB: boolean;
     export var IS_DEV: boolean;
     export var IS_STANDALONE: boolean;
-    export var IS_DISCORD_DESKTOP: boolean;
-    export var IS_VENCORD_DESKTOP: boolean;
 
     export var VencordNative: typeof import("./VencordNative").default;
     export var Vencord: typeof import("./Vencord");
@@ -53,10 +51,10 @@ declare global {
      * Only available when running in Electron, undefined on web.
      * Thus, avoid using this or only use it inside an {@link IS_WEB} guard.
      *
-     * If you really must use it, mark your plugin as Desktop App only by naming it Foo.desktop.ts(x)
+     * If you really must use it, mark your plugin as Desktop App only via
+     * `target: "DESKTOP"`
      */
     export var DiscordNative: any;
-    export var VencordDesktop: any;
 
     interface Window {
         webpackChunkdiscord_app: {

src/ipcMain/constants.ts

@@ -33,5 +33,3 @@ export const ALLOWED_PROTOCOLS = [
     "steam:",
     "spotify:"
 ];
-
-export const IS_VANILLA = /* @__PURE__ */ process.argv.includes("--vanilla");

src/ipcMain/index.ts

@@ -28,7 +28,7 @@ import { join } from "path";
 
 import monacoHtml from "~fileContent/../components/monacoWin.html;base64";
 
-import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE } from "./utils/constants";
+import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE } from "./constants";
 
 mkdirSync(SETTINGS_DIR, { recursive: true });
 
@@ -44,14 +44,6 @@ export function readSettings() {
     }
 }
 
-export function getSettings(): typeof import("@api/settings").Settings {
-    try {
-        return JSON.parse(readSettings());
-    } catch {
-        return {} as any;
-    }
-}
-
 ipcMain.handle(IpcEvents.OPEN_QUICKCSS, () => shell.openPath(QUICKCSS_PATH));
 
 ipcMain.handle(IpcEvents.OPEN_EXTERNAL, (_, url) => {

src/ipcMain/updater/common.ts

@@ -24,7 +24,7 @@ export async function calculateHashes() {
     const hashes = {} as Record<string, string>;
 
     await Promise.all(
-        [IS_DISCORD_DESKTOP ? "patcher.js" : "main.js", "preload.js", "renderer.js", "renderer.css"].map(file => new Promise<void>(r => {
+        ["patcher.js", "preload.js", "renderer.js", "renderer.css"].map(file => new Promise<void>(r => {
             const fis = createReadStream(join(__dirname, file));
             const hash = createHash("sha1", { encoding: "hex" });
             fis.once("end", () => {

src/ipcMain/updater/http.ts

@@ -25,7 +25,7 @@ import { join } from "path";
 import gitHash from "~git-hash";
 import gitRemote from "~git-remote";
 
-import { get } from "../utils/simpleGet";
+import { get } from "../simpleGet";
 import { calculateHashes, serializeErrors } from "./common";
 
 const API_BASE = `https://api.github.com/repos/${gitRemote}`;
@@ -57,13 +57,6 @@ async function calculateGitChanges() {
     }));
 }
 
-const FILES_TO_DOWNLOAD = [
-    IS_DISCORD_DESKTOP ? "patcher.js" : "vencordDesktopMain.js",
-    "preload.js",
-    IS_DISCORD_DESKTOP ? "renderer.js" : "vencordDesktopRenderer.js",
-    "renderer.css"
-];
-
 async function fetchUpdates() {
     const release = await githubGet("/releases/latest");
 
@@ -73,7 +66,7 @@ async function fetchUpdates() {
         return false;
 
     data.assets.forEach(({ name, browser_download_url }) => {
-        if (FILES_TO_DOWNLOAD.some(s => name.startsWith(s))) {
+        if (["patcher.js", "preload.js", "renderer.js", "renderer.css"].some(s => name.startsWith(s))) {
             PendingUpdates.push([name, browser_download_url]);
         }
     });
@@ -82,17 +75,8 @@ async function fetchUpdates() {
 
 async function applyUpdates() {
     await Promise.all(PendingUpdates.map(
-        async ([name, data]) => writeFile(
+        async ([name, data]) => writeFile(join(__dirname, name), await get(data)))
-            join(
+    );
-                __dirname,
-                IS_VENCORD_DESKTOP
-                    // vencordDesktopRenderer.js -> renderer.js
-                    ? name.replace(/vencordDesktop(\w)/, (_, c) => c.toLowerCase())
-                    : name
-            ),
-            await get(data)
-        )
-    ));
     PendingUpdates = [];
     return true;
 }

src/main/index.ts

@@ -1,109 +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 { app, protocol, session } from "electron";
-import { join } from "path";
-
-import { getSettings } from "./ipcMain";
-import { IS_VANILLA } from "./utils/constants";
-import { installExt } from "./utils/extensions";
-
-if (IS_VENCORD_DESKTOP || !IS_VANILLA) {
-    app.whenReady().then(() => {
-        // Source Maps! Maybe there's a better way but since the renderer is executed
-        // from a string I don't think any other form of sourcemaps would work
-        protocol.registerFileProtocol("vencord", ({ url: unsafeUrl }, cb) => {
-            let url = unsafeUrl.slice("vencord://".length);
-            if (url.endsWith("/")) url = url.slice(0, -1);
-            switch (url) {
-                case "renderer.js.map":
-                case "preload.js.map":
-                case "patcher.js.map": // doubt
-                case "main.js.map":
-                    cb(join(__dirname, url));
-                    break;
-                default:
-                    cb({ statusCode: 403 });
-            }
-        });
-
-        try {
-            if (getSettings().enableReactDevtools)
-                installExt("fmkadmapgofadopljbjfkapdkoienihi")
-                    .then(() => console.info("[Vencord] Installed React Developer Tools"))
-                    .catch(err => console.error("[Vencord] Failed to install React Developer Tools", err));
-        } catch { }
-
-
-        // Remove CSP
-        type PolicyResult = Record<string, string[]>;
-
-        const parsePolicy = (policy: string): PolicyResult => {
-            const result: PolicyResult = {};
-            policy.split(";").forEach(directive => {
-                const [directiveKey, ...directiveValue] = directive.trim().split(/\s+/g);
-                if (directiveKey && !Object.prototype.hasOwnProperty.call(result, directiveKey)) {
-                    result[directiveKey] = directiveValue;
-                }
-            });
-            return result;
-        };
-        const stringifyPolicy = (policy: PolicyResult): string =>
-            Object.entries(policy)
-                .filter(([, values]) => values?.length)
-                .map(directive => directive.flat().join(" "))
-                .join("; ");
-
-        function patchCsp(headers: Record<string, string[]>, header: string) {
-            if (header in headers) {
-                const csp = parsePolicy(headers[header][0]);
-
-                for (const directive of ["style-src", "connect-src", "img-src", "font-src", "media-src", "worker-src"]) {
-                    csp[directive] = ["*", "blob:", "data:", "'unsafe-inline'"];
-                }
-                // TODO: Restrict this to only imported packages with fixed version.
-                // Perhaps auto generate with esbuild
-                csp["script-src"] ??= [];
-                csp["script-src"].push("'unsafe-eval'", "https://unpkg.com", "https://cdnjs.cloudflare.com");
-                headers[header] = [stringifyPolicy(csp)];
-            }
-        }
-
-        session.defaultSession.webRequest.onHeadersReceived(({ responseHeaders, resourceType }, cb) => {
-            if (responseHeaders) {
-                if (resourceType === "mainFrame")
-                    patchCsp(responseHeaders, "content-security-policy");
-
-                // Fix hosts that don't properly set the css content type, such as
-                // raw.githubusercontent.com
-                if (resourceType === "stylesheet")
-                    responseHeaders["content-type"] = ["text/css"];
-            }
-            cb({ cancel: false, responseHeaders });
-        });
-
-        // assign a noop to onHeadersReceived to prevent other mods from adding their own incompatible ones.
-        // For instance, OpenAsar adds their own that doesn't fix content-type for stylesheets which makes it
-        // impossible to load css from github raw despite our fix above
-        session.defaultSession.webRequest.onHeadersReceived = () => { };
-    });
-}
-
-if (IS_DISCORD_DESKTOP) {
-    require("./patcher");
-}

src/patcher.ts

@@ -20,8 +20,9 @@ import { onceDefined } from "@utils/onceDefined";
 import electron, { app, BrowserWindowConstructorOptions, Menu } from "electron";
 import { dirname, join } from "path";
 
-import { getSettings, initIpc } from "./ipcMain";
+import { initIpc } from "./ipcMain";
-import { IS_VANILLA } from "./utils/constants";
+import { installExt } from "./ipcMain/extensions";
+import { readSettings } from "./ipcMain/index";
 
 console.log("[Vencord] Starting up...");
 
@@ -40,8 +41,11 @@ require.main!.filename = join(asarPath, discordPkg.main);
 // @ts-ignore Untyped method? Dies from cringe
 app.setAppPath(asarPath);
 
-if (!IS_VANILLA) {
+if (!process.argv.includes("--vanilla")) {
-    const settings = getSettings();
+    let settings: typeof import("@api/settings").Settings = {} as any;
+    try {
+        settings = JSON.parse(readSettings());
+    } catch { }
 
     // Repatch after host updates on Windows
     if (process.platform === "win32") {
@@ -75,12 +79,8 @@ if (!IS_VANILLA) {
                 options.webPreferences.sandbox = false;
                 if (settings.frameless) {
                     options.frame = false;
-                } else if (process.platform === "win32" && settings.winNativeTitleBar) {
-                    delete options.frame;
                 }
-
+                if (settings.transparent) {
-                // This causes electron to freeze / white screen for some people
-                if ((settings as any).transparentUNSAFE_USE_AT_OWN_RISK) {
                     options.transparent = true;
                     options.backgroundColor = "#00000000";
                 }
@@ -112,6 +112,79 @@ if (!IS_VANILLA) {
     );
 
     process.env.DATA_DIR = join(app.getPath("userData"), "..", "Vencord");
+
+    electron.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
+        electron.protocol.registerFileProtocol("vencord", ({ url: unsafeUrl }, cb) => {
+            let url = unsafeUrl.slice("vencord://".length);
+            if (url.endsWith("/")) url = url.slice(0, -1);
+            switch (url) {
+                case "renderer.js.map":
+                case "preload.js.map":
+                case "patcher.js.map": // doubt
+                    cb(join(__dirname, url));
+                    break;
+                default:
+                    cb({ statusCode: 403 });
+            }
+        });
+
+        try {
+            if (settings?.enableReactDevtools)
+                installExt("fmkadmapgofadopljbjfkapdkoienihi")
+                    .then(() => console.info("[Vencord] Installed React Developer Tools"))
+                    .catch(err => console.error("[Vencord] Failed to install React Developer Tools", err));
+        } catch { }
+
+
+        // Remove CSP
+        type PolicyResult = Record<string, string[]>;
+
+        const parsePolicy = (policy: string): PolicyResult => {
+            const result: PolicyResult = {};
+            policy.split(";").forEach(directive => {
+                const [directiveKey, ...directiveValue] = directive.trim().split(/\s+/g);
+                if (directiveKey && !Object.prototype.hasOwnProperty.call(result, directiveKey)) {
+                    result[directiveKey] = directiveValue;
+                }
+            });
+            return result;
+        };
+        const stringifyPolicy = (policy: PolicyResult): string =>
+            Object.entries(policy)
+                .filter(([, values]) => values?.length)
+                .map(directive => directive.flat().join(" "))
+                .join("; ");
+
+        function patchCsp(headers: Record<string, string[]>, header: string) {
+            if (header in headers) {
+                const csp = parsePolicy(headers[header][0]);
+
+                for (const directive of ["style-src", "connect-src", "img-src", "font-src", "media-src", "worker-src"]) {
+                    csp[directive] = ["*", "blob:", "data:", "'unsafe-inline'"];
+                }
+                // TODO: Restrict this to only imported packages with fixed version.
+                // Perhaps auto generate with esbuild
+                csp["script-src"] ??= [];
+                csp["script-src"].push("'unsafe-eval'", "https://unpkg.com", "https://cdnjs.cloudflare.com");
+                headers[header] = [stringifyPolicy(csp)];
+            }
+        }
+
+        electron.session.defaultSession.webRequest.onHeadersReceived(({ responseHeaders, resourceType }, cb) => {
+            if (responseHeaders) {
+                if (resourceType === "mainFrame")
+                    patchCsp(responseHeaders, "content-security-policy");
+
+                // Fix hosts that don't properly set the css content type, such as
+                // raw.githubusercontent.com
+                if (resourceType === "stylesheet")
+                    responseHeaders["content-type"] = ["text/css"];
+            }
+            cb({ cancel: false, responseHeaders });
+        });
+    });
 } else {
     console.log("[Vencord] Running in vanilla mode. Not loading Vencord");
 }

src/plugins/alwaysTrust.ts

@@ -32,10 +32,10 @@ export default definePlugin({
             }
         },
         {
-            find: '"7z","ade","adp"',
+            find: "\"github.com\":new RegExp(\"\\\\/releases\\\\S*\\\\/download\"),",
             replacement: {
-                match: /JSON\.parse\('\[.+?'\)/,
+                match: /const o=JSON.parse\('\[.+?'\)/,
-                replace: "[]"
+                replace: "const o=[]"
             }
         }
     ]

src/plugins/apiBadges.tsx

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { BadgePosition, BadgeUserArgs, ProfileBadge } from "@api/Badges";
+import { BadgePosition, ProfileBadge } from "@api/Badges";
 import DonateButton from "@components/DonateButton";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
@@ -24,12 +24,11 @@ import { Heart } from "@components/Heart";
 import { Devs } from "@utils/constants";
 import IpcEvents from "@utils/IpcEvents";
 import Logger from "@utils/Logger";
-import { Margins } from "@utils/margins";
 import { closeModal, Modals, openModal } from "@utils/modal";
 import definePlugin from "@utils/types";
-import { Forms } from "@webpack/common";
+import { Forms, Margins } from "@webpack/common";
 
-const CONTRIBUTOR_BADGE = "https://cdn.discordapp.com/attachments/1033680203433660458/1092089947126780035/favicon.png";
+const CONTRIBUTOR_BADGE = "https://media.discordapp.net/stickers/1026517526106087454.webp";
 
 /** List of vencord contributor IDs */
 const contributorIds: string[] = Object.values(Devs).map(d => d.id.toString());
@@ -53,14 +52,14 @@ const DonorBadges = {} as Record<string, Pick<ProfileBadge, "image" | "tooltip">
 export default definePlugin({
     name: "BadgeAPI",
     description: "API to add badges to users.",
-    authors: [Devs.Megu, Devs.Ven, Devs.TheSun],
+    authors: [Devs.Megu],
     required: true,
     patches: [
         /* Patch the badges array */
         {
-            find: "Messages.PROFILE_USER_BADGES,",
+            find: "PREMIUM_GUILD_SUBSCRIPTION_TOOLTIP.format({date:",
             replacement: {
-                match: /&&((\i)\.push\({tooltip:\i\.\i\.Messages\.PREMIUM_GUILD_SUBSCRIPTION_TOOLTIP\.format.+?;)(?:return\s\i;?})/,
+                match: /&&((\w{1,3})\.push\({tooltip:\w{1,3}\.\w{1,3}\.Messages\.PREMIUM_GUILD_SUBSCRIPTION_TOOLTIP\.format.+?;)(?:return\s\w{1,3};?})/,
                 replace: (_, m, badgeArray) => `&&${m} return Vencord.Api.Badges.inject(${badgeArray}, arguments[0]);}`,
             }
         },
@@ -69,23 +68,21 @@ export default definePlugin({
             find: "Messages.PROFILE_USER_BADGES,role:",
             replacement: [
                 {
-                    match: /src:(\i)\[(\i)\.key\],/g,
+                    match: /src:(\w{1,3})\[(\w{1,3})\.key\],/,
                     // <img src={badge.image ?? imageMap[badge.key]} {...badge.props} />
                     replace: (_, imageMap, badge) => `src: ${badge}.image ?? ${imageMap}[${badge}.key], ...${badge}.props,`
                 },
                 {
-                    match: /children:function(?<=(\i)\.(?:tooltip|description),spacing:\d.+?)/g,
+                    match: /spacing:(\d{1,2}),children:(.{1,40}(\i)\.jsx.+?(\i)\.onClick.+?\)})},/,
-                    replace: "children:$1.component ? () => $self.renderBadgeComponent($1) : function"
+                    // if the badge provides it's own component, render that instead of an image
+                    // the badge also includes info about the user that has it (type BadgeUserArgs), which is why it's passed as props
+                    replace: (_, s, origBadgeComponent, React, badge) =>
+                        `spacing:${s},children:${badge}.component ? () => (0,${React}.jsx)(${badge}.component, { ...${badge} }) : ${origBadgeComponent}},`
                 }
             ]
         }
     ],
 
-    renderBadgeComponent: ErrorBoundary.wrap((badge: ProfileBadge & BadgeUserArgs) => {
-        const Component = badge.component!;
-        return <Component {...badge} />;
-    }, { noop: true }),
-
     async start() {
         Vencord.Api.Badges.addBadge(ContributorBadge);
         const badges = await fetch("https://gist.githubusercontent.com/Vendicated/51a3dd775f6920429ec6e9b735ca7f01/raw/badges.csv").then(r => r.text());
@@ -153,7 +150,7 @@ export default definePlugin({
                                         <Forms.FormText>
                                             This Badge is a special perk for Vencord Donors
                                         </Forms.FormText>
-                                        <Forms.FormText className={Margins.top20}>
+                                        <Forms.FormText className={Margins.marginTop20}>
                                             Please consider supporting the development of Vencord by becoming a donor. It would mean a lot!!
                                         </Forms.FormText>
                                     </div>

src/plugins/apiMenuItemDeobfuscator.ts

@@ -0,0 +1,82 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * 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
+ * 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 { migratePluginSettings } from "@api/settings";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+// duplicate values have multiple branches with different types. Just include all to be safe
+const nameMap = {
+    radio: "MenuRadioItem",
+    separator: "MenuSeparator",
+    checkbox: "MenuCheckboxItem",
+    groupstart: "MenuGroup",
+
+    control: "MenuControlItem",
+    compositecontrol: "MenuControlItem",
+
+    item: "MenuItem",
+    customitem: "MenuItem",
+};
+
+migratePluginSettings("MenuItemDeobfuscatorAPI", "MenuItemDeobfuscatorApi");
+export default definePlugin({
+    name: "MenuItemDeobfuscatorAPI",
+    description: "Deobfuscates Discord's Menu Item module",
+    authors: [Devs.Ven],
+    patches: [
+        {
+            find: '"Menu API',
+            replacement: {
+                match: /function.{0,80}type===(.{1,3})\..{1,3}\).{0,50}navigable:.+?Menu API/s,
+                replace: (m, mod) => {
+                    let nicenNames = "";
+                    const redefines = [] as string[];
+                    // if (t.type === m.MenuItem)
+                    const typeCheckRe = /\(.{1,3}\.type===(.{1,5})\)/g;
+                    // push({type:"item"})
+                    const pushTypeRe = /type:"(\w+)"/g;
+
+                    let typeMatch: RegExpExecArray | null;
+                    // for each if (t.type === ...)
+                    while ((typeMatch = typeCheckRe.exec(m)) !== null) {
+                        // extract the current menu item
+                        const item = typeMatch[1];
+                        // Set the starting index of the second regex to that of the first to start
+                        // matching from after the if
+                        pushTypeRe.lastIndex = typeCheckRe.lastIndex;
+                        // extract the first type: "..."
+                        const type = pushTypeRe.exec(m)?.[1];
+                        if (type && type in nameMap) {
+                            const name = nameMap[type];
+                            nicenNames += `Object.defineProperty(${item},"name",{value:"${name}"});`;
+                            redefines.push(`${name}:${item}`);
+                        }
+                    }
+                    if (redefines.length < 6) {
+                        console.warn("[ApiMenuItemDeobfuscator] Expected to at least remap 6 items, only remapped", redefines.length);
+                    }
+
+                    // Merge all our redefines with the actual module
+                    return `${nicenNames}Object.assign(${mod},{${redefines.join(",")}});${m}`;
+                },
+            },
+        },
+    ],
+});
+

src/plugins/apiMessageEvents.ts

@@ -22,22 +22,22 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "MessageEventsAPI",
     description: "Api required by anything using message events.",
-    authors: [Devs.Arjix, Devs.hunt],
+    authors: [Devs.Arjix],
     patches: [
         {
-            find: '"MessageActionCreators"',
+            find: "sendMessage:function",
             replacement: [{
-                match: /_sendMessage:(function\([^)]+\)){/,
+                match: /(?<=_sendMessage:function\([^)]+\)){/,
-                replace: "_sendMessage:async $1{if(await Vencord.Api.MessageEvents._handlePreSend(...arguments))return;"
+                replace: "{if(Vencord.Api.MessageEvents._handlePreSend(...arguments)){return;};"
             }, {
-                match: /\beditMessage:(function\([^)]+\)){/,
+                match: /(?<=\beditMessage:function\([^)]+\)){/,
-                replace: "editMessage:async $1{await Vencord.Api.MessageEvents._handlePreEdit(...arguments);"
+                replace: "{Vencord.Api.MessageEvents._handlePreEdit(...arguments);"
             }]
         },
         {
             find: '("interactionUsernameProfile',
             replacement: {
-                match: /var \i=(\i)\.id,\i=(\i)\.id;return \i\.useCallback\(\(?function\((\i)\){/,
+                match: /var \w=(\w)\.id,\w=(\w)\.id;return .{1,2}\.useCallback\(\(?function\((.{1,2})\){/,
                 replace: (m, message, channel, event) =>
                     // the message param is shadowed by the event param, so need to alias them
                     `var _msg=${message},_chan=${channel};${m}Vencord.Api.MessageEvents._handleClick(_msg, _chan, ${event});`

src/plugins/apiMessagePopover.ts

@@ -22,16 +22,16 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "MessagePopoverAPI",
     description: "API to add buttons to message popovers.",
-    authors: [Devs.KingFish, Devs.Ven, Devs.Nuckyz],
+    authors: [Devs.KingFish, Devs.Ven],
     patches: [{
         find: "Messages.MESSAGE_UTILITIES_A11Y_LABEL",
         replacement: {
-            // foo && !bar ? createElement(reactionStuffs)... createElement(blah,...makeElement(reply-other))
+            // foo && !bar ? createElement(blah,...makeElement(addReactionData))
-            match: /\i&&!\i\?\(0,\i\.jsxs?\)\(.{0,200}renderEmojiPicker:.{0,500}\?(\i)\(\{key:"reply-other"/,
+            match: /(\i&&!\i)\?\(0,\i\.jsxs?\)\(.{0,20}renderPopout:.{0,300}?(\i)\(.{3,20}\{key:"add-reaction".+?\}/,
-            replace: (m, makeElement) => {
+            replace: (m, bools, makeElement) => {
                 const msg = m.match(/message:(.{1,3}),/)?.[1];
                 if (!msg) throw new Error("Could not find message variable");
-                return `...Vencord.Api.MessagePopover._buildPopoverElements(${msg},${makeElement}),${m}`;
+                return `...(${bools}?Vencord.Api.MessagePopover._buildPopoverElements(${msg},${makeElement}):[]),${m}`;
             }
         }
     }],

src/plugins/apiNotices.ts

@@ -29,12 +29,13 @@ export default definePlugin({
             find: 'displayName="NoticeStore"',
             replacement: [
                 {
-                    match: /(?=;\i=null;.{0,70}getPremiumSubscription)/g,
+                    match: /;.{1,2}=null;.{0,70}getPremiumSubscription/g,
-                    replace: ";if(Vencord.Api.Notices.currentNotice)return false"
+                    replace:
+                        ";if(Vencord.Api.Notices.currentNotice)return false$&"
                 },
                 {
                     match: /(?<=,NOTICE_DISMISS:function\(\i\){)(?=if\(null==(\i)\))/,
-                    replace: (_, notice) => `if(${notice}.id=="VencordNotice")return(${notice}=null,Vencord.Api.Notices.nextNotice(),true);`
+                    replace: 'if($1?.id=="VencordNotice")return($1=null,Vencord.Api.Notices.nextNotice(),true);'
                 }
             ]
         }

src/plugins/apiSettingsStore.ts

@@ -1,38 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * 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
- * 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";
-
-export default definePlugin({
-    name: "SettingsStoreAPI",
-    description: "Patches Discord's SettingsStores to expose their group and name",
-    authors: [Devs.Nuckyz],
-
-    patches: [
-        {
-            find: '"textAndImages","renderSpoilers"',
-            replacement: [
-                {
-                    match: /(?<=INFREQUENT_USER_ACTION.{0,20}),useSetting:function/,
-                    replace: ",settingsStoreApiGroup:arguments[0],settingsStoreApiName:arguments[1]$&"
-                }
-            ]
-        }
-    ]
-});

src/plugins/arRPC.tsx

@@ -48,6 +48,7 @@ export default definePlugin({
     name: "WebRichPresence (arRPC)",
     description: "Client plugin for arRPC to enable RPC on Discord Web (experimental)",
     authors: [Devs.Ducko],
+    target: "WEB",
 
     settingsAboutComponent: () => (
         <>
@@ -59,9 +60,6 @@ export default definePlugin({
     ),
 
     async start() {
-        // ArmCord comes with its own arRPC implementation, so this plugin just confuses users
-        if ("armcord" in window) return;
-
         if (ws) ws.close();
         ws = new WebSocket("ws://127.0.0.1:1337"); // try to open WebSocket
 

src/plugins/betterFolders/FolderSideBar.tsx

@@ -1,84 +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 { Settings } from "@api/settings";
-import { classNameFactory } from "@api/Styles";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { findByPropsLazy, findStoreLazy } from "@webpack";
-import { i18n, React, useStateFromStores } from "@webpack/common";
-
-const cl = classNameFactory("vc-bf-");
-const classes = findByPropsLazy("sidebar", "guilds");
-
-const Animations = findByPropsLazy("a", "animated", "useTransition");
-const ChannelRTCStore = findStoreLazy("ChannelRTCStore");
-const ExpandedGuildFolderStore = findStoreLazy("ExpandedGuildFolderStore");
-
-function Guilds(props: {
-    className: string;
-    bfGuildFolders: any[];
-}) {
-    // @ts-expect-error
-    const res = Vencord.Plugins.plugins.BetterFolders.Guilds(props);
-
-    const scrollerProps = res.props.children?.props?.children?.[1]?.props;
-    if (scrollerProps?.children) {
-        const servers = scrollerProps.children.find(c => c?.props?.["aria-label"] === i18n.Messages.SERVERS);
-        if (servers) scrollerProps.children = servers;
-    }
-
-    return res;
-}
-
-export default ErrorBoundary.wrap(() => {
-    const expandedFolders = useStateFromStores([ExpandedGuildFolderStore], () => ExpandedGuildFolderStore.getExpandedFolders());
-    const fullscreen = useStateFromStores([ChannelRTCStore], () => ChannelRTCStore.isFullscreenInContext());
-
-    const guilds = document.querySelector(`.${classes.guilds}`);
-
-    const visible = !!expandedFolders.size;
-    const className = cl("folder-sidebar", { fullscreen });
-
-    const Sidebar = (
-        <Guilds
-            className={classes.guilds}
-            bfGuildFolders={Array.from(expandedFolders)}
-        />
-    );
-
-    if (!guilds || !Settings.plugins.BetterFolders.sidebarAnim)
-        return visible
-            ? <div className={className}>{Sidebar}</div>
-            : null;
-
-    return (
-        <Animations.Transition
-            items={visible}
-            from={{ width: 0 }}
-            enter={{ width: guilds.getBoundingClientRect().width }}
-            leave={{ width: 0 }}
-            config={{ duration: 200 }}
-        >
-            {(style, show) => show && (
-                <Animations.animated.div style={style} className={className}>
-                    {Sidebar}
-                </Animations.animated.div>
-            )}
-        </Animations.Transition>
-    );
-}, { noop: true });

src/plugins/betterFolders/betterFolders.css

@@ -1,17 +0,0 @@
-.vc-bf-folder-sidebar [class*="wrapper-"] > [class*="listItem-"]:first-of-type,
-.vc-bf-folder-sidebar [class*="unreadMentionsIndicator"] {
-    display: none;
-}
-
-.vc-bf-folder-sidebar [class*="expandedFolderBackground-"] {
-    background-color: transparent;
-}
-
-.vc-bf-folder-sidebar {
-    display: flex;
-}
-
-.vc-bf-fullscreen {
-    width: 0 !important;
-    visibility: hidden;
-}

src/plugins/betterFolders/index.ts

@@ -1,177 +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 "./betterFolders.css";
-
-import { definePluginSettings } from "@api/settings";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
-import { FluxDispatcher } from "@webpack/common";
-
-import FolderSideBar from "./FolderSideBar";
-
-const GuildsTree = findLazy(m => m.prototype?.convertToFolder);
-const GuildFolderStore = findStoreLazy("SortedGuildStore");
-const ExpandedFolderStore = findStoreLazy("ExpandedGuildFolderStore");
-const FolderUtils = findByPropsLazy("move", "toggleGuildFolderExpand");
-
-const settings = definePluginSettings({
-    sidebar: {
-        type: OptionType.BOOLEAN,
-        description: "Display servers from folder on dedicated sidebar",
-        default: true,
-    },
-    sidebarAnim: {
-        type: OptionType.BOOLEAN,
-        description: "Animate opening the folder sidebar",
-        default: true,
-    },
-    closeAllFolders: {
-        type: OptionType.BOOLEAN,
-        description: "Close all folders when selecting a server not in a folder",
-        default: false,
-    },
-    closeAllHomeButton: {
-        type: OptionType.BOOLEAN,
-        description: "Close all folders when clicking on the home button",
-        default: false,
-    },
-    closeOthers: {
-        type: OptionType.BOOLEAN,
-        description: "Close other folders when opening a folder",
-        default: false,
-    },
-    forceOpen: {
-        type: OptionType.BOOLEAN,
-        description: "Force a folder to open when switching to a server of that folder",
-        default: false,
-    },
-});
-
-export default definePlugin({
-    name: "BetterFolders",
-    description: "Shows server folders on dedicated sidebar and adds folder related improvements",
-    authors: [Devs.juby, Devs.AutumnVN],
-    patches: [
-        {
-            find: '("guildsnav")',
-            predicate: () => settings.store.sidebar,
-            replacement: [
-                {
-                    match: /(\i)\(\){return \i\(\(0,\i\.jsx\)\("div",{className:\i\(\)\.guildSeparator}\)\)}/,
-                    replace: "$&$self.Separator=$1;"
-                },
-
-                // Folder component patch
-                {
-                    match: /\i\(\(function\(\i,\i,\i\){var \i=\i\.key;return.+\(\i\)},\i\)}\)\)/,
-                    replace: "arguments[0].bfHideServers?null:$&"
-                },
-
-                // BEGIN Guilds component patch
-                {
-                    match: /(\i)\.themeOverride,(.{15,25}\(function\(\){var \i=)(\i\.\i\.getGuildsTree\(\))/,
-                    replace: "$1.themeOverride,bfPatch=$1.bfGuildFolders,$2bfPatch?$self.getGuildsTree(bfPatch,$3):$3"
-                },
-                {
-                    match: /return(\(0,\i\.jsx\))(\(\i,{)(folderNode:\i,setNodeRef:\i\.setNodeRef,draggable:!0,.+},\i\.id\));case/,
-                    replace: "var bfHideServers=typeof bfPatch==='undefined',folder=$1$2bfHideServers,$3;return !bfHideServers&&arguments[1]?[$1($self.Separator,{}),folder]:folder;case"
-                },
-                // END
-
-                {
-                    match: /\("guildsnav"\);return\(0,\i\.jsx\)\(.{1,6},{navigator:\i,children:\(0,\i\.jsx\)\(/,
-                    replace: "$&$self.Guilds="
-                }
-            ]
-        },
-        {
-            find: "APPLICATION_LIBRARY,render",
-            predicate: () => settings.store.sidebar,
-            replacement: {
-                match: /(\(0,\i\.jsx\))\(\i\..,{className:\i\(\)\.guilds,themeOverride:\i}\)/,
-                replace: "$&,$1($self.FolderSideBar,{})"
-            }
-        },
-        {
-            find: '("guildsnav")',
-            predicate: () => settings.store.closeAllHomeButton,
-            replacement: {
-                match: ",onClick:function(){if(!__OVERLAY__){",
-                replace: "$&$self.closeFolders();"
-            }
-        }
-    ],
-
-    settings,
-
-    start() {
-        const getGuildFolder = (id: string) => GuildFolderStore.getGuildFolders().find(f => f.guildIds.includes(id));
-
-        FluxDispatcher.subscribe("CHANNEL_SELECT", this.onSwitch = data => {
-            if (!settings.store.closeAllFolders && !settings.store.forceOpen)
-                return;
-
-            if (this.lastGuildId !== data.guildId) {
-                this.lastGuildId = data.guildId;
-
-                const guildFolder = getGuildFolder(data.guildId);
-                if (guildFolder?.folderId) {
-                    if (settings.store.forceOpen && !ExpandedFolderStore.isFolderExpanded(guildFolder.folderId))
-                        FolderUtils.toggleGuildFolderExpand(guildFolder.folderId);
-                } else if (settings.store.closeAllFolders)
-                    this.closeFolders();
-            }
-        });
-
-        FluxDispatcher.subscribe("TOGGLE_GUILD_FOLDER_EXPAND", this.onToggleFolder = e => {
-            if (settings.store.closeOthers && !this.dispatching)
-                FluxDispatcher.wait(() => {
-                    const expandedFolders = ExpandedFolderStore.getExpandedFolders();
-                    if (expandedFolders.size > 1) {
-                        this.dispatching = true;
-
-                        for (const id of expandedFolders) if (id !== e.folderId)
-                            FolderUtils.toggleGuildFolderExpand(id);
-
-                        this.dispatching = false;
-                    }
-                });
-        });
-    },
-
-    stop() {
-        FluxDispatcher.unsubscribe("CHANNEL_SELECT", this.onSwitch);
-        FluxDispatcher.unsubscribe("TOGGLE_GUILD_FOLDER_EXPAND", this.onToggleFolder);
-    },
-
-    FolderSideBar,
-
-    getGuildsTree(folders, oldTree) {
-        const tree = new GuildsTree();
-        tree.root.children = oldTree.root.children.filter(e => folders.includes(e.id));
-        tree.nodes = folders.map(id => oldTree.nodes[id]);
-        return tree;
-    },
-
-    closeFolders() {
-        for (const id of ExpandedFolderStore.getExpandedFolders())
-            FolderUtils.toggleGuildFolderExpand(id);
-    },
-});

src/plugins/betterRoleDot.ts

@@ -37,14 +37,14 @@ export default definePlugin({
             },
         },
         {
-            find: '"dot"===',
+            find: '"username"===',
             all: true,
             predicate: () => Settings.plugins.BetterRoleDot.bothStyles,
             replacement: {
-                match: /"(?:username|dot)"===\i(?!\.\i)/g,
+                match: /"(?:username|dot)"===\w(?!\.\w)/g,
                 replace: "true",
             },
-        }
+        },
     ],
 
     options: {

src/plugins/colorSighted.ts

@@ -27,16 +27,11 @@ export default definePlugin({
         {
             find: "Masks.STATUS_ONLINE",
             replacement: {
+                // we can use global replacement here - these are specific to the status icons and are used nowhere else,
+                // so it keeps the patch and plugin small and simple
                 match: /Masks\.STATUS_(?:IDLE|DND|STREAMING|OFFLINE)/g,
                 replace: "Masks.STATUS_ONLINE"
             }
-        },
-        {
-            find: ".AVATAR_STATUS_MOBILE_16;",
-            replacement: {
-                match: /(\.fromIsMobile,.+?)\i.status/,
-                replace: (_, rest) => `${rest}"online"`
-            }
         }
     ]
 });

src/plugins/consoleShortcuts.ts

@@ -17,11 +17,7 @@
 */
 
 import { Devs } from "@utils/constants";
-import { relaunch } from "@utils/native";
 import definePlugin from "@utils/types";
-import * as Webpack from "@webpack";
-import { extract, filters, findAll, search } from "@webpack";
-import { React } from "@webpack/common";
 
 const WEB_ONLY = (f: string) => () => {
     throw new Error(`'${f}' is Discord Desktop only.`);
@@ -33,53 +29,23 @@ export default definePlugin({
     authors: [Devs.Ven],
 
     getShortcuts() {
-        function newFindWrapper(filterFactory: (...props: any[]) => Webpack.FilterFn) {
-            const cache = new Map<string, unknown>();
-
-            return function (...filterProps: unknown[]) {
-                const cacheKey = String(filterProps);
-                if (cache.has(cacheKey)) return cache.get(cacheKey);
-
-                const matches = findAll(filterFactory(...filterProps));
-
-                const result = (() => {
-                    switch (matches.length) {
-                        case 0: return null;
-                        case 1: return matches[0];
-                        default:
-                            const uniqueMatches = [...new Set(matches)];
-                            if (uniqueMatches.length > 1)
-                                console.warn(`Warning: This filter matches ${matches.length} modules. Make it more specific!\n`, uniqueMatches);
-
-                            return matches[0];
-                    }
-                })();
-                if (result && cacheKey) cache.set(cacheKey, result);
-                return result;
-            };
-        }
-
         return {
+            toClip: IS_WEB ? WEB_ONLY("toClip") : window.DiscordNative.clipboard.copy,
+            fromClip: IS_WEB ? WEB_ONLY("fromClip") : window.DiscordNative.clipboard.read,
             wp: Vencord.Webpack,
-            wpc: Webpack.wreq.c,
+            wpc: Vencord.Webpack.wreq.c,
-            wreq: Webpack.wreq,
+            wreq: Vencord.Webpack.wreq,
-            wpsearch: search,
+            wpsearch: Vencord.Webpack.search,
-            wpex: extract,
+            wpex: Vencord.Webpack.extract,
             wpexs: (code: string) => Vencord.Webpack.extract(Vencord.Webpack.findModuleId(code)!),
-            find: newFindWrapper(f => f),
+            findByProps: Vencord.Webpack.findByProps,
-            findAll,
+            find: Vencord.Webpack.find,
-            findByProps: newFindWrapper(filters.byProps),
+            Plugins: Vencord.Plugins,
-            findAllByProps: (...props: string[]) => findAll(filters.byProps(...props)),
+            React: Vencord.Webpack.Common.React,
-            findByCode: newFindWrapper(filters.byCode),
-            findAllByCode: (code: string) => findAll(filters.byCode(code)),
-            findStore: newFindWrapper(filters.byStoreName),
-            PluginsApi: Vencord.Plugins,
-            plugins: Vencord.Plugins.plugins,
-            React,
             Settings: Vencord.Settings,
             Api: Vencord.Api,
             reload: () => location.reload(),
-            restart: IS_WEB ? WEB_ONLY("restart") : relaunch
+            restart: IS_WEB ? WEB_ONLY("restart") : window.DiscordNative.app.relaunch
         };
     },
 

src/plugins/corruptMp4s.ts

@@ -0,0 +1,105 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * 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
+ * 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 { ApplicationCommandOptionType, sendBotMessage } from "@api/Commands";
+import { findOption } from "@api/Commands/commandHelpers";
+import { ApplicationCommandInputType } from "@api/Commands/types";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { findByCode, findByProps } from "@webpack";
+
+const DRAFT_TYPE = 0;
+
+export default definePlugin({
+    name: "CorruptMp4s",
+    description: "Create corrupt mp4s with extremely high or negative duration",
+    authors: [Devs.Ven],
+    dependencies: ["CommandsAPI"],
+    commands: [{
+        name: "corrupt",
+        description: "Create a corrupt mp4 with extremely high or negative duration",
+        inputType: ApplicationCommandInputType.BUILT_IN,
+        options: [
+            {
+                name: "mp4",
+                description: "the video to corrupt",
+                type: ApplicationCommandOptionType.ATTACHMENT,
+                required: true
+            },
+            {
+                name: "kind",
+                description: "the kind of corruption",
+                type: ApplicationCommandOptionType.STRING,
+                choices: [
+                    {
+                        name: "infinite",
+                        value: "infinite",
+                        label: "Very high duration"
+                    },
+                    {
+                        name: "negative",
+                        value: "negative",
+                        label: "Negative duration"
+                    }
+                ]
+            }
+        ],
+        execute: async (args, ctx) => {
+            const UploadStore = findByProps("getUploads");
+            const upload = UploadStore.getUploads(ctx.channel.id, DRAFT_TYPE)[0];
+
+            const video = upload?.item?.file as File | undefined;
+
+            if (video?.type !== "video/mp4")
+                return void sendBotMessage(ctx.channel.id, {
+                    content: "Please upload a mp4 file"
+                });
+
+            const corruption = findOption<string>(args, "kind", "infinite");
+
+            const buf = new Uint8Array(await video.arrayBuffer());
+            let found = false;
+
+            // adapted from https://github.com/GeopJr/exorcism/blob/c9a12d77ccbcb49c987b385eafae250906efc297/src/App.svelte#L41-L48
+            for (let i = 0; i < buf.length; i++) {
+                if (buf[i] === 0x6d && buf[i + 1] === 0x76 && buf[i + 2] === 0x68 && buf[i + 3] === 0x64) {
+                    let start = i + 18;
+                    buf[start++] = 0x00;
+                    buf[start++] = 0x01;
+                    buf[start++] = corruption === "negative" ? 0xff : 0x7f;
+                    buf[start++] = 0xff;
+                    buf[start++] = 0xff;
+                    buf[start++] = corruption === "negative" ? 0xf0 : 0xff;
+                    found = true;
+                    break;
+                }
+            }
+
+            if (!found) {
+                return void sendBotMessage(ctx.channel.id, {
+                    content: "Could not find signature. Is this even a mp4?"
+                });
+            }
+
+            const newName = video.name.replace(/\.mp4$/i, ".corrupt.mp4");
+            const promptToUpload = findByCode("UPLOAD_FILE_LIMIT_ERROR");
+            const file = new File([buf], newName, { type: "video/mp4" });
+            setTimeout(() => promptToUpload([file], ctx.channel, DRAFT_TYPE), 10);
+        }
+    }]
+});

src/plugins/crashHandler.ts

@@ -1,165 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * 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
- * 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 { showNotification } from "@api/Notifications";
-import { definePluginSettings } from "@api/settings";
-import { Devs } from "@utils/constants";
-import Logger from "@utils/Logger";
-import { closeAllModals } from "@utils/modal";
-import definePlugin, { OptionType } from "@utils/types";
-import { maybePromptToUpdate } from "@utils/updater";
-import { FluxDispatcher, NavigationRouter } from "@webpack/common";
-import type { ReactElement } from "react";
-
-const CrashHandlerLogger = new Logger("CrashHandler");
-
-const settings = definePluginSettings({
-    attemptToPreventCrashes: {
-        type: OptionType.BOOLEAN,
-        description: "Whether to attempt to prevent Discord crashes.",
-        default: true
-    },
-    attemptToNavigateToHome: {
-        type: OptionType.BOOLEAN,
-        description: "Whether to attempt to navigate to the home when preventing Discord crashes.",
-        default: false
-    }
-});
-
-let crashCount: number = 0;
-let lastCrashTimestamp: number = 0;
-let shouldAttemptNextHandle = false;
-
-export default definePlugin({
-    name: "CrashHandler",
-    description: "Utility plugin for handling and possibly recovering from Crashes without a restart",
-    authors: [Devs.Nuckyz],
-    enabledByDefault: true,
-
-    popAllModals: undefined as (() => void) | undefined,
-
-    settings,
-
-    patches: [
-        {
-            find: ".Messages.ERRORS_UNEXPECTED_CRASH",
-            replacement: {
-                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};`
-            }
-        }
-    ],
-
-    handleCrash(_this: ReactElement & { forceUpdate: () => void; }) {
-        if (Date.now() - lastCrashTimestamp <= 1_000 && !shouldAttemptNextHandle) return true;
-
-        shouldAttemptNextHandle = false;
-
-        if (++crashCount > 5) {
-            try {
-                showNotification({
-                    color: "#eed202",
-                    title: "Discord has crashed!",
-                    body: "Awn :( Discord has crashed more than five times, not attempting to recover.",
-                    noPersist: true,
-                });
-            } catch { }
-
-            lastCrashTimestamp = Date.now();
-            return false;
-        }
-
-        setTimeout(() => crashCount--, 60_000);
-
-        try {
-            if (crashCount === 1) maybePromptToUpdate("Uh oh, Discord has just crashed... but good news, there is a Vencord update available that might fix this issue! Would you like to update now?", true);
-
-            if (settings.store.attemptToPreventCrashes) {
-                this.handlePreventCrash(_this);
-                return true;
-            }
-
-            return false;
-        } catch (err) {
-            CrashHandlerLogger.error("Failed to handle crash", err);
-            return false;
-        } finally {
-            lastCrashTimestamp = Date.now();
-        }
-    },
-
-    handlePreventCrash(_this: ReactElement & { forceUpdate: () => void; }) {
-        if (Date.now() - lastCrashTimestamp >= 1_000) {
-            try {
-                showNotification({
-                    color: "#eed202",
-                    title: "Discord has crashed!",
-                    body: "Attempting to recover...",
-                    noPersist: true,
-                });
-            } catch { }
-        }
-
-        try {
-            FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" });
-        } catch (err) {
-            CrashHandlerLogger.debug("Failed to close open context menu.", err);
-        }
-        try {
-            this.popAllModals?.();
-        } catch (err) {
-            CrashHandlerLogger.debug("Failed to close old modals.", err);
-        }
-        try {
-            closeAllModals();
-        } catch (err) {
-            CrashHandlerLogger.debug("Failed to close all open modals.", err);
-        }
-        try {
-            FluxDispatcher.dispatch({ type: "USER_PROFILE_MODAL_CLOSE" });
-        } catch (err) {
-            CrashHandlerLogger.debug("Failed to close user popout.", err);
-        }
-        try {
-            FluxDispatcher.dispatch({ type: "LAYER_POP_ALL" });
-        } catch (err) {
-            CrashHandlerLogger.debug("Failed to pop all layers.", err);
-        }
-        if (settings.store.attemptToNavigateToHome) {
-            try {
-                NavigationRouter.transitionTo("/channels/@me");
-            } catch (err) {
-                CrashHandlerLogger.debug("Failed to navigate to home", err);
-            }
-        }
-
-        try {
-            shouldAttemptNextHandle = true;
-            _this.forceUpdate();
-        } catch (err) {
-            CrashHandlerLogger.debug("Failed to update crash handler component.", err);
-        }
-    }
-});

src/plugins/customRPC.tsx

@@ -19,7 +19,6 @@
 import { definePluginSettings } from "@api/settings";
 import { Link } from "@components/Link";
 import { Devs } from "@utils/constants";
-import { isTruthy } from "@utils/guards";
 import { useAwaiter } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
 import { filters, findByCodeLazy, findByPropsLazy, mapMangledModuleLazy } from "@webpack";
@@ -57,11 +56,11 @@ interface ActivityAssets {
 }
 
 interface Activity {
-    state?: string;
+    state: string;
     details?: string;
     timestamps?: {
-        start?: number;
+        start?: Number;
-        end?: number;
+        end?: Number;
     };
     assets?: ActivityAssets;
     buttons?: Array<string>;
@@ -71,7 +70,7 @@ interface Activity {
         button_urls?: Array<string>;
     };
     type: ActivityType;
-    flags: number;
+    flags: Number;
 }
 
 enum ActivityType {
@@ -94,13 +93,13 @@ const numOpt = (description: string) => ({
     onChange: setRpc
 }) as const;
 
-const choice = (label: string, value: any, _default?: boolean) => ({
+const choice = (label: string, value: any, _default?: Boolean) => ({
     label,
     value,
     default: _default
 }) as const;
 
-const choiceOpt = <T,>(description: string, options: T) => ({
+const choiceOpt = (description: string, options) => ({
     type: OptionType.SELECT,
     description,
     onChange: setRpc,
@@ -174,13 +173,13 @@ async function createActivity(): Promise<Activity | undefined> {
         activity.buttons = [
             buttonOneText,
             buttonTwoText
-        ].filter(isTruthy);
+        ].filter(Boolean);
 
         activity.metadata = {
             button_urls: [
                 buttonOneURL,
                 buttonTwoURL
-            ].filter(isTruthy)
+            ].filter(Boolean)
         };
     }
 
@@ -207,16 +206,17 @@ async function createActivity(): Promise<Activity | undefined> {
             delete activity[k];
     }
 
+    // WHAT DO YOU WANT FROM ME
+    // eslint-disable-next-line consistent-return
     return activity;
 }
 
-async function setRpc(disable?: boolean) {
+async function setRpc(disable?: Boolean) {
     const activity: Activity | undefined = await createActivity();
 
     FluxDispatcher.dispatch({
         type: "LOCAL_ACTIVITY_UPDATE",
-        activity: !disable ? activity : null,
+        activity: !disable ? activity : {}
-        socketId: "CustomRPC",
     });
 }
 

src/plugins/devCompanion.dev.tsx

@@ -1,272 +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 { showNotification } from "@api/Notifications";
-import { definePluginSettings } from "@api/settings";
-import { Devs } from "@utils/constants";
-import Logger from "@utils/Logger";
-import { canonicalizeMatch, canonicalizeReplace } from "@utils/patches";
-import definePlugin, { OptionType } from "@utils/types";
-import { filters, findAll, search } from "@webpack";
-import { Menu } from "@webpack/common";
-
-const PORT = 8485;
-const NAV_ID = "dev-companion-reconnect";
-
-const logger = new Logger("DevCompanion");
-
-let socket: WebSocket | undefined;
-
-type Node = StringNode | RegexNode | FunctionNode;
-
-interface StringNode {
-    type: "string";
-    value: string;
-}
-
-interface RegexNode {
-    type: "regex";
-    value: {
-        pattern: string;
-        flags: string;
-    };
-}
-
-interface FunctionNode {
-    type: "function";
-    value: string;
-}
-
-interface PatchData {
-    find: string;
-    replacement: {
-        match: StringNode | RegexNode;
-        replace: StringNode | FunctionNode;
-    }[];
-}
-
-interface FindData {
-    type: string;
-    args: Array<StringNode | FunctionNode>;
-}
-
-const settings = definePluginSettings({
-    notifyOnAutoConnect: {
-        description: "Whether to notify when Dev Companion has automatically connected.",
-        type: OptionType.BOOLEAN,
-        default: true
-    }
-});
-
-function parseNode(node: Node) {
-    switch (node.type) {
-        case "string":
-            return node.value;
-        case "regex":
-            return new RegExp(node.value.pattern, node.value.flags);
-        case "function":
-            // We LOVE remote code execution
-            // Safety: This comes from localhost only, which actually means we have less permissions than the source,
-            // since we're running in the browser sandbox, whereas the sender has host access
-            return (0, eval)(node.value);
-        default:
-            throw new Error("Unknown Node Type " + (node as any).type);
-    }
-}
-
-function initWs(isManual = false) {
-    let wasConnected = isManual;
-    let hasErrored = false;
-    const ws = socket = new WebSocket(`ws://localhost:${PORT}`);
-
-    ws.addEventListener("open", () => {
-        wasConnected = true;
-
-        logger.info("Connected to WebSocket");
-
-        (settings.store.notifyOnAutoConnect || isManual) && showNotification({
-            title: "Dev Companion Connected",
-            body: "Connected to WebSocket"
-        });
-    });
-
-    ws.addEventListener("error", e => {
-        if (!wasConnected) return;
-
-        hasErrored = true;
-
-        logger.error("Dev Companion Error:", e);
-
-        showNotification({
-            title: "Dev Companion Error",
-            body: (e as ErrorEvent).message || "No Error Message",
-            color: "var(--status-danger, red)",
-            noPersist: true,
-        });
-    });
-
-    ws.addEventListener("close", e => {
-        if (!wasConnected || hasErrored) return;
-
-        logger.info("Dev Companion Disconnected:", e.code, e.reason);
-
-        showNotification({
-            title: "Dev Companion Disconnected",
-            body: e.reason || "No Reason provided",
-            color: "var(--status-danger, red)",
-            noPersist: true,
-        });
-    });
-
-    ws.addEventListener("message", e => {
-        try {
-            var { nonce, type, data } = JSON.parse(e.data);
-        } catch (err) {
-            logger.error("Invalid JSON:", err, "\n" + e.data);
-            return;
-        }
-
-        function reply(error?: string) {
-            const data = { nonce, ok: !error } as Record<string, unknown>;
-            if (error) data.error = error;
-
-            ws.send(JSON.stringify(data));
-        }
-
-        logger.info("Received Message:", type, "\n", data);
-
-        switch (type) {
-            case "testPatch": {
-                const { find, replacement } = data as PatchData;
-
-                const candidates = search(find);
-                const keys = Object.keys(candidates);
-                if (keys.length !== 1)
-                    return reply("Expected exactly one 'find' matches, found " + keys.length);
-
-                const mod = candidates[keys[0]];
-                let src = String(mod.original ?? mod).replaceAll("\n", "");
-
-                if (src.startsWith("function(")) {
-                    src = "0," + src;
-                }
-
-                let i = 0;
-
-                for (const { match, replace } of replacement) {
-                    i++;
-
-                    try {
-                        const matcher = canonicalizeMatch(parseNode(match));
-                        const replacement = canonicalizeReplace(parseNode(replace), "PlaceHolderPluginName");
-
-                        const newSource = src.replace(matcher, replacement as string);
-
-                        if (src === newSource) throw "Had no effect";
-                        Function(newSource);
-
-                        src = newSource;
-                    } catch (err) {
-                        return reply(`Replacement ${i} failed: ${err}`);
-                    }
-                }
-
-                reply();
-                break;
-            }
-            case "testFind": {
-                const { type, args } = data as FindData;
-                try {
-                    var parsedArgs = args.map(parseNode);
-                } catch (err) {
-                    return reply("Failed to parse args: " + err);
-                }
-
-                try {
-                    let results: any[];
-                    switch (type.replace("find", "").replace("Lazy", "")) {
-                        case "":
-                            results = findAll(parsedArgs[0]);
-                            break;
-                        case "ByProps":
-                            results = findAll(filters.byProps(...parsedArgs));
-                            break;
-                        case "Store":
-                            results = findAll(filters.byStoreName(parsedArgs[0]));
-                            break;
-                        case "ByCode":
-                            results = findAll(filters.byCode(...parsedArgs));
-                            break;
-                        case "ModuleId":
-                            results = Object.keys(search(parsedArgs[0]));
-                            break;
-                        default:
-                            return reply("Unknown Find Type " + type);
-                    }
-
-                    const uniqueResultsCount = new Set(results).size;
-                    if (uniqueResultsCount === 0) throw "No results";
-                    if (uniqueResultsCount > 1) throw "Found more than one result! Make this filter more specific";
-                } catch (err) {
-                    return reply("Failed to find: " + err);
-                }
-
-                reply();
-                break;
-            }
-            default:
-                reply("Unknown Type " + type);
-                break;
-        }
-    });
-}
-
-const contextMenuPatch: NavContextMenuPatchCallback = kids => {
-    if (kids.some(k => k?.props?.id === NAV_ID)) return;
-
-    kids.unshift(
-        <Menu.MenuItem
-            id={NAV_ID}
-            label="Reconnect Dev Companion"
-            action={() => {
-                socket?.close(1000, "Reconnecting");
-                initWs(true);
-            }}
-        />
-    );
-};
-
-export default definePlugin({
-    name: "DevCompanion",
-    description: "Dev Companion Plugin",
-    authors: [Devs.Ven],
-    dependencies: ["ContextMenuAPI"],
-    settings,
-
-    start() {
-        initWs();
-        addContextMenuPatch("user-settings-cog", contextMenuPatch);
-    },
-
-    stop() {
-        socket?.close(1000, "Plugin Stopped");
-        socket = void 0;
-        removeContextMenuPatch("user-settings-cog", contextMenuPatch);
-    }
-});

src/plugins/disableDMCallIdle.ts

@@ -27,9 +27,9 @@ export default definePlugin({
         {
             find: ".Messages.BOT_CALL_IDLE_DISCONNECT",
             replacement: {
-                match: /(?<=function \i\(\){)(?=.{1,100}\.Messages\.BOT_CALL_IDLE_DISCONNECT)/,
+                match: /function (?<functionName>.{1,3})\(\){.{1,100}\.Messages\.BOT_CALL_IDLE_DISCONNECT.+?}}/,
-                replace: "return;"
+                replace: "function $<functionName>(){}",
-            }
+            },
-        }
+        },
-    ]
+    ],
 });

src/plugins/emoteCloner.tsx

@@ -16,15 +16,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { migratePluginSettings, Settings } from "@api/settings";
 import { CheckedTextInput } from "@components/CheckedTextInput";
 import { Devs } from "@utils/constants";
 import Logger from "@utils/Logger";
-import { Margins } from "@utils/margins";
+import { makeLazy } from "@utils/misc";
 import { ModalContent, ModalHeader, ModalRoot, openModal } from "@utils/modal";
 import definePlugin from "@utils/types";
 import { findByCodeLazy, findByPropsLazy } from "@webpack";
-import { Forms, GuildStore, Menu, PermissionStore, React, Toasts, Tooltip, UserStore } from "@webpack/common";
+import { Forms, GuildStore, Margins, Menu, PermissionStore, React, Toasts, Tooltip, UserStore } from "@webpack/common";
 
 const MANAGE_EMOJIS_AND_STICKERS = 1n << 30n;
 
@@ -96,7 +96,7 @@ function CloneModal({ id, name: emojiName, isAnimated }: { id: string; name: str
 
     return (
         <>
-            <Forms.FormTitle className={Margins.top20}>Custom Name</Forms.FormTitle>
+            <Forms.FormTitle className={Margins.marginTop20}>Custom Name</Forms.FormTitle>
             <CheckedTextInput
                 value={name}
                 onChange={setName}
@@ -175,12 +175,50 @@ function CloneModal({ id, name: emojiName, isAnimated }: { id: string; name: str
     );
 }
 
-function buildMenuItem(id: string, name: string, isAnimated: boolean) {
+migratePluginSettings("EmoteCloner", "EmoteYoink");
-    return (
+export default definePlugin({
-        <Menu.MenuItem
+    name: "EmoteCloner",
+    description: "Adds a Clone context menu item to emotes to clone them your own server",
+    authors: [Devs.Ven],
+    dependencies: ["MenuItemDeobfuscatorAPI"],
+
+    patches: [{
+        // Literally copy pasted from ReverseImageSearch lol
+        find: "open-native-link",
+        replacement: {
+            match: /id:"open-native-link".{0,200}\(\{href:(.{0,3}),.{0,200}\},"open-native-link"\)/,
+            replace: "$&,$self.makeMenu(arguments[2])"
+        },
+
+    },
+    // Also copy pasted from Reverse Image Search
+    {
+        // pass the target to the open link menu so we can grab its data
+        find: "REMOVE_ALL_REACTIONS_CONFIRM_BODY,",
+        predicate: makeLazy(() => !Settings.plugins.ReverseImageSearch.enabled),
+        noWarn: true,
+        replacement: {
+            match: /(?<props>.).onHeightUpdate.{0,200}(.)=(.)=.\.url;.+?\(null!=\3\?\3:\2[^)]+/,
+            replace: "$&,$<props>.target"
+        }
+    }],
+
+    makeMenu(htmlElement: HTMLImageElement) {
+        if (htmlElement?.dataset.type !== "emoji")
+            return null;
+
+        const { id } = htmlElement.dataset;
+        const name = htmlElement.alt.match(/:(.*)(?:~\d+)?:/)?.[1];
+
+        if (!name || !id)
+            return null;
+
+        const isAnimated = new URL(htmlElement.src).pathname.endsWith(".gif");
+
+        return <Menu.MenuItem
             id="emote-cloner"
             key="emote-cloner"
-            label="Clone Emote"
+            label="Clone"
             action={() =>
                 openModal(modalProps => (
                     <ModalRoot {...modalProps}>
@@ -202,51 +240,7 @@ function buildMenuItem(id: string, name: string, isAnimated: boolean) {
                     </ModalRoot>
                 ))
             }
-        />
+        >
-    );
+        </Menu.MenuItem>;
-}
-
-function isGifUrl(url: string) {
-    return new URL(url).pathname.endsWith(".gif");
-}
-
-const messageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => {
-    const { favoriteableId, itemHref, itemSrc, favoriteableType } = props ?? {};
-
-    if (!favoriteableId || favoriteableType !== "emoji") return;
-
-    const match = props.message.content.match(RegExp(`<a?:(\\w+)(?:~\\d+)?:${favoriteableId}>|https://cdn\\.discordapp\\.com/emojis/${favoriteableId}\\.`));
-    if (!match) return;
-    const name = match[1] ?? "FakeNitroEmoji";
-
-    const group = findGroupChildrenByChildId("copy-link", children);
-    if (group && !group.some(child => child?.props?.id === "emote-cloner"))
-        group.push(buildMenuItem(favoriteableId, name, isGifUrl(itemHref ?? itemSrc)));
-};
-
-const expressionPickerPatch: NavContextMenuPatchCallback = (children, props: { target: HTMLElement; }) => {
-    const { id, name, type } = props?.target?.dataset ?? {};
-    if (!id || !name || type !== "emoji") return;
-
-    const firstChild = props.target.firstChild as HTMLImageElement;
-
-    if (!children.some(c => c?.props?.id === "emote-cloner"))
-        children.push(buildMenuItem(id, name, firstChild && isGifUrl(firstChild.src)));
-};
-
-export default definePlugin({
-    name: "EmoteCloner",
-    description: "Adds a Clone context menu item to emotes to clone them your own server",
-    authors: [Devs.Ven, Devs.Nuckyz],
-    dependencies: ["ContextMenuAPI"],
-
-    start() {
-        addContextMenuPatch("message", messageContextMenuPatch);
-        addContextMenuPatch("expression-picker", expressionPickerPatch);
     },
-
-    stop() {
-        removeContextMenuPatch("message", messageContextMenuPatch);
-        removeContextMenuPatch("expression-picker", expressionPickerPatch);
-    }
 });

src/plugins/experiments.tsx

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { definePluginSettings } from "@api/settings";
+import { Settings } from "@api/settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
@@ -24,71 +24,49 @@ import { Forms, React } from "@webpack/common";
 
 const KbdStyles = findByPropsLazy("key", "removeBuildOverride");
 
-const settings = definePluginSettings({
-    enableIsStaff: {
-        description: "Enable isStaff",
-        type: OptionType.BOOLEAN,
-        default: false,
-        restartNeeded: true
-    },
-    forceStagingBanner: {
-        description: "Whether to force Staging banner under user area.",
-        type: OptionType.BOOLEAN,
-        default: false,
-        restartNeeded: true
-    }
-});
-
 export default definePlugin({
     name: "Experiments",
-    description: "Enable Access to Experiments in Discord!",
     authors: [
         Devs.Megu,
         Devs.Ven,
         Devs.Nickyux,
-        Devs.BanTheNons,
+        Devs.BanTheNons
-        Devs.Nuckyz
     ],
-    settings,
+    description: "Enable Access to Experiments in Discord!",
-
+    patches: [{
-    patches: [
+        find: "Object.defineProperties(this,{isDeveloper",
-        {
+        replacement: {
-            find: "Object.defineProperties(this,{isDeveloper",
+            match: /(?<={isDeveloper:\{[^}]+,get:function\(\)\{return )\w/,
-            replacement: {
+            replace: "true"
-                match: /(?<={isDeveloper:\{[^}]+?,get:function\(\)\{return )\w/,
-                replace: "true"
-            }
         },
-        {
+    }, {
-            find: 'type:"user",revision',
+        find: 'type:"user",revision',
-            replacement: {
+        replacement: {
-                match: /!(\i)&&"CONNECTION_OPEN".+?;/g,
+            match: /!(\w{1,3})&&"CONNECTION_OPEN".+?;/g,
-                replace: "$1=!0;"
+            replace: "$1=!0;"
-            }
         },
-        {
+    }, {
-            find: ".isStaff=function(){",
+        find: ".isStaff=function(){",
-            predicate: () => settings.store.enableIsStaff,
+        predicate: () => Settings.plugins.Experiments.enableIsStaff === true,
-            replacement: [
+        replacement: [
-                {
+            {
-                    match: /return\s*?(\i)\.hasFlag\((\i\.\i)\.STAFF\)}/,
+                match: /return\s*(\w+)\.hasFlag\((.+?)\.STAFF\)}/,
-                    replace: (_, user, flags) => `return Vencord.Webpack.Common.UserStore.getCurrentUser().id===${user}.id||${user}.hasFlag(${flags}.STAFF)}`
+                replace: "return Vencord.Webpack.Common.UserStore.getCurrentUser().id===$1.id||$1.hasFlag($2.STAFF)}"
-                },
+            },
-                {
+            {
-                    match: /hasFreePremium=function\(\){return this.isStaff\(\)\s*?\|\|/,
+                match: /hasFreePremium=function\(\){return this.isStaff\(\)\s*\|\|/,
-                    replace: "hasFreePremium=function(){return ",
+                replace: "hasFreePremium=function(){return ",
-                }
+            },
-            ]
+        ],
-        },
+    }],
-        {
+    options: {
-            find: ".Messages.DEV_NOTICE_STAGING",
+        enableIsStaff: {
-            predicate: () => settings.store.forceStagingBanner,
+            description: "Enable isStaff (requires restart)",
-            replacement: {
+            type: OptionType.BOOLEAN,
-                match: /"staging"===window\.GLOBAL_ENV\.RELEASE_CHANNEL/,
+            default: false,
-                replace: "true"
+            restartNeeded: true,
-            }
         }
-    ],
+    },
 
     settingsAboutComponent: () => {
         const isMacOS = navigator.platform.includes("Mac");

src/plugins/f8break.ts

@@ -1,42 +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 { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-
-export default definePlugin({
-    name: "F8Break",
-    description: "Pause the client when you press F8 with DevTools (+ breakpoints) open.",
-    authors: [Devs.lewisakura],
-
-    start() {
-        window.addEventListener("keydown", this.event);
-    },
-
-    stop() {
-        window.removeEventListener("keydown", this.event);
-    },
-
-    event(e: KeyboardEvent) {
-        if (e.code === "F8") {
-            // Hi! You've just paused the client. Pressing F8 in DevTools or in the main window will unpause it again.
-            // It's up to you on what to do, friend. Happy travels!
-            debugger;
-        }
-    }
-});

src/plugins/fakeNitro.ts

@@ -0,0 +1,359 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * 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
+ * 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 { addPreEditListener, addPreSendListener, removePreEditListener, removePreSendListener } from "@api/MessageEvents";
+import { migratePluginSettings, Settings } from "@api/settings";
+import { Devs } from "@utils/constants";
+import { ApngDisposeOp, getGifEncoder, importApngJs } from "@utils/dependencies";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { ChannelStore, PermissionStore, UserStore } from "@webpack/common";
+
+const DRAFT_TYPE = 0;
+const promptToUpload = findByCodeLazy("UPLOAD_FILE_LIMIT_ERROR");
+
+const USE_EXTERNAL_EMOJIS = 1n << 18n;
+const USE_EXTERNAL_STICKERS = 1n << 37n;
+
+enum EmojiIntentions {
+    REACTION = 0,
+    STATUS = 1,
+    COMMUNITY_CONTENT = 2,
+    CHAT = 3,
+    GUILD_STICKER_RELATED_EMOJI = 4,
+    GUILD_ROLE_BENEFIT_EMOJI = 5,
+    COMMUNITY_CONTENT_ONLY = 6,
+    SOUNDBOARD = 7
+}
+
+interface BaseSticker {
+    available: boolean;
+    description: string;
+    format_type: number;
+    id: string;
+    name: string;
+    tags: string;
+    type: number;
+}
+interface GuildSticker extends BaseSticker {
+    guild_id: string;
+}
+interface DiscordSticker extends BaseSticker {
+    pack_id: string;
+}
+type Sticker = GuildSticker | DiscordSticker;
+
+interface StickerPack {
+    id: string;
+    name: string;
+    sku_id: string;
+    description: string;
+    cover_sticker_id: string;
+    banner_asset_id: string;
+    stickers: Sticker[];
+}
+
+migratePluginSettings("FakeNitro", "NitroBypass");
+
+export default definePlugin({
+    name: "FakeNitro",
+    authors: [Devs.Arjix, Devs.D3SOX, Devs.Ven, Devs.obscurity, Devs.captain],
+    description: "Allows you to stream in nitro quality, send fake emojis/stickers and use client themes.",
+    dependencies: ["MessageEventsAPI"],
+
+    patches: [
+        {
+            find: ".PREMIUM_LOCKED;",
+            predicate: () => Settings.plugins.FakeNitro.enableEmojiBypass === true,
+            replacement: [
+                {
+                    match: /(?<=(?<intention>\i)=\i\.intention)/,
+                    replace: ",fakeNitroIntention=$<intention>"
+                },
+                {
+                    match: /(?<=\.(?:canUseEmojisEverywhere|canUseAnimatedEmojis)\(\i)(?=\))/g,
+                    replace: ",fakeNitroIntention"
+                },
+                {
+                    match: /(?<=&&!\i&&)!(?<canUseExternal>\i)(?=\)return \i\.\i\.DISALLOW_EXTERNAL;)/,
+                    replace: `(!$<canUseExternal>&&![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention))`
+                }
+            ]
+        },
+        {
+            find: "canUseAnimatedEmojis:function",
+            predicate: () => Settings.plugins.FakeNitro.enableEmojiBypass === true,
+            replacement: {
+                match: /(?<=(?:canUseEmojisEverywhere|canUseAnimatedEmojis):function\((?<user>\i))\){(?<premiumCheck>.+?\))/g,
+                replace: `,fakeNitroIntention){$<premiumCheck>||fakeNitroIntention===undefined||[${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)`
+            }
+        },
+        {
+            find: "canUseStickersEverywhere:function",
+            predicate: () => Settings.plugins.FakeNitro.enableStickerBypass === true,
+            replacement: {
+                match: /canUseStickersEverywhere:function\(.+?\{/,
+                replace: "$&return true;"
+            },
+        },
+        {
+            find: "\"SENDABLE\"",
+            predicate: () => Settings.plugins.FakeNitro.enableStickerBypass === true,
+            replacement: {
+                match: /(\w+)\.available\?/,
+                replace: "true?"
+            }
+        },
+        {
+            find: "canStreamHighQuality:function",
+            predicate: () => Settings.plugins.FakeNitro.enableStreamQualityBypass === true,
+            replacement: [
+                "canUseHighVideoUploadQuality",
+                "canStreamHighQuality",
+                "canStreamMidQuality"
+            ].map(func => {
+                return {
+                    match: new RegExp(`${func}:function\\(.+?\\{`),
+                    replace: "$&return true;"
+                };
+            })
+        },
+        {
+            find: "STREAM_FPS_OPTION.format",
+            predicate: () => Settings.plugins.FakeNitro.enableStreamQualityBypass === true,
+            replacement: {
+                match: /(userPremiumType|guildPremiumTier):.{0,10}TIER_\d,?/g,
+                replace: ""
+            }
+        },
+        {
+            find: "canUseClientThemes:function",
+            replacement: {
+                match: /(?<=canUseClientThemes:function\(\i\){)/,
+                replace: "return true;"
+            }
+        }
+    ],
+
+    options: {
+        enableEmojiBypass: {
+            description: "Allow sending fake emojis",
+            type: OptionType.BOOLEAN,
+            default: true,
+            restartNeeded: true,
+        },
+        emojiSize: {
+            description: "Size of the emojis when sending",
+            type: OptionType.SLIDER,
+            default: 48,
+            markers: [32, 48, 64, 128, 160, 256, 512],
+        },
+        enableStickerBypass: {
+            description: "Allow sending fake stickers",
+            type: OptionType.BOOLEAN,
+            default: true,
+            restartNeeded: true,
+        },
+        stickerSize: {
+            description: "Size of the stickers when sending",
+            type: OptionType.SLIDER,
+            default: 160,
+            markers: [32, 64, 128, 160, 256, 512],
+        },
+        enableStreamQualityBypass: {
+            description: "Allow streaming in nitro quality",
+            type: OptionType.BOOLEAN,
+            default: true,
+            restartNeeded: true,
+        }
+    },
+
+    get guildId() {
+        return window.location.href.split("channels/")[1].split("/")[0];
+    },
+
+    get canUseEmotes() {
+        return (UserStore.getCurrentUser().premiumType ?? 0) > 0;
+    },
+
+    get canUseStickers() {
+        return (UserStore.getCurrentUser().premiumType ?? 0) > 1;
+    },
+
+    hasPermissionToUseExternalEmojis(channelId: string) {
+        const channel = ChannelStore.getChannel(channelId);
+
+        if (!channel || channel.isDM() || channel.isGroupDM() || channel.isMultiUserDM()) return true;
+
+        return PermissionStore.can(USE_EXTERNAL_EMOJIS, channel);
+    },
+
+    hasPermissionToUseExternalStickers(channelId: string) {
+        const channel = ChannelStore.getChannel(channelId);
+
+        if (!channel || channel.isDM() || channel.isGroupDM() || channel.isMultiUserDM()) return true;
+
+        return PermissionStore.can(USE_EXTERNAL_STICKERS, channel);
+    },
+
+    getStickerLink(stickerId: string) {
+        return `https://media.discordapp.net/stickers/${stickerId}.png?size=${Settings.plugins.FakeNitro.stickerSize}`;
+    },
+
+    async sendAnimatedSticker(stickerLink: string, stickerId: string, channelId: string) {
+        const [{ parseURL }, {
+            GIFEncoder,
+            quantize,
+            applyPalette
+        }] = await Promise.all([importApngJs(), getGifEncoder()]);
+
+        const { frames, width, height } = await parseURL(stickerLink);
+
+        const gif = new GIFEncoder();
+        const resolution = Settings.plugins.FakeNitro.stickerSize;
+
+        const canvas = document.createElement("canvas");
+        canvas.width = resolution;
+        canvas.height = resolution;
+
+        const ctx = canvas.getContext("2d", {
+            willReadFrequently: true
+        })!;
+
+        const scale = resolution / Math.max(width, height);
+        ctx.scale(scale, scale);
+
+        let lastImg: HTMLImageElement | null = null;
+        for (const { left, top, width, height, disposeOp, img, delay } of frames) {
+            ctx.drawImage(img, left, top, width, height);
+
+            const { data } = ctx.getImageData(0, 0, resolution, resolution);
+
+            const palette = quantize(data, 256);
+            const index = applyPalette(data, palette);
+
+            gif.writeFrame(index, resolution, resolution, {
+                transparent: true,
+                palette,
+                delay,
+            });
+
+            if (disposeOp === ApngDisposeOp.BACKGROUND) {
+                ctx.clearRect(left, top, width, height);
+            } else if (disposeOp === ApngDisposeOp.PREVIOUS && lastImg) {
+                ctx.drawImage(lastImg, left, top, width, height);
+            }
+
+            lastImg = img;
+        }
+
+        gif.finish();
+        const file = new File([gif.bytesView()], `${stickerId}.gif`, { type: "image/gif" });
+        promptToUpload([file], ChannelStore.getChannel(channelId), DRAFT_TYPE);
+    },
+
+    start() {
+        const settings = Settings.plugins.FakeNitro;
+        if (!settings.enableEmojiBypass && !settings.enableStickerBypass) {
+            return;
+        }
+
+        const EmojiStore = findByPropsLazy("getCustomEmojiById");
+        const StickerStore = findByPropsLazy("getAllGuildStickers") as {
+            getPremiumPacks(): StickerPack[];
+            getAllGuildStickers(): Map<string, Sticker[]>;
+            getStickerById(id: string): Sticker | undefined;
+        };
+
+        function getWordBoundary(origStr: string, offset: number) {
+            return (!origStr[offset] || /\s/.test(origStr[offset])) ? "" : " ";
+        }
+
+        this.preSend = addPreSendListener((channelId, messageObj, extra) => {
+            const { guildId } = this;
+
+            stickerBypass: {
+                if (!settings.enableStickerBypass)
+                    break stickerBypass;
+
+                const sticker = StickerStore.getStickerById(extra?.stickerIds?.[0]!);
+                if (!sticker)
+                    break stickerBypass;
+
+                if (sticker.available !== false && ((this.canUseStickers && this.hasPermissionToUseExternalStickers(channelId)) || (sticker as GuildSticker)?.guild_id === guildId))
+                    break stickerBypass;
+
+                let link = this.getStickerLink(sticker.id);
+                if (sticker.format_type === 2) {
+                    this.sendAnimatedSticker(this.getStickerLink(sticker.id), sticker.id, channelId);
+                    return { cancel: true };
+                } else {
+                    if ("pack_id" in sticker) {
+                        const packId = sticker.pack_id === "847199849233514549"
+                            // Discord moved these stickers into a different pack at some point, but
+                            // Distok still uses the old id
+                            ? "749043879713701898"
+                            : sticker.pack_id;
+
+                        link = `https://distok.top/stickers/${packId}/${sticker.id}.gif`;
+                    }
+
+                    delete extra.stickerIds;
+                    messageObj.content += " " + link;
+                }
+            }
+
+            if ((!this.canUseEmotes || !this.hasPermissionToUseExternalEmojis(channelId)) && settings.enableEmojiBypass) {
+                for (const emoji of messageObj.validNonShortcutEmojis) {
+                    if (!emoji.require_colons) continue;
+                    if (emoji.guildId === guildId && !emoji.animated) continue;
+
+                    const emojiString = `<${emoji.animated ? "a" : ""}:${emoji.originalName || emoji.name}:${emoji.id}>`;
+                    const url = emoji.url.replace(/\?size=\d+/, `?size=${Settings.plugins.FakeNitro.emojiSize}`);
+                    messageObj.content = messageObj.content.replace(emojiString, (match, offset, origStr) => {
+                        return `${getWordBoundary(origStr, offset - 1)}${url}${getWordBoundary(origStr, offset + match.length)}`;
+                    });
+                }
+            }
+
+            return { cancel: false };
+        });
+
+        this.preEdit = addPreEditListener((channelId, __, messageObj) => {
+            if (this.canUseEmotes && this.hasPermissionToUseExternalEmojis(channelId)) return;
+
+            const { guildId } = this;
+
+            for (const [emojiStr, _, emojiId] of messageObj.content.matchAll(/(?<!\\)<a?:(\w+):(\d+)>/ig)) {
+                const emoji = EmojiStore.getCustomEmojiById(emojiId);
+                if (emoji == null || (emoji.guildId === guildId && !emoji.animated)) continue;
+                if (!emoji.require_colons) continue;
+
+                const url = emoji.url.replace(/\?size=\d+/, `?size=${Settings.plugins.FakeNitro.emojiSize}`);
+                messageObj.content = messageObj.content.replace(emojiStr, (match, offset, origStr) => {
+                    return `${getWordBoundary(origStr, offset - 1)}${url}${getWordBoundary(origStr, offset + match.length)}`;
+                });
+            }
+        });
+    },
+
+    stop() {
+        removePreSendListener(this.preSend);
+        removePreEditListener(this.preEdit);
+    }
+});

src/plugins/fakeNitro.tsx

@@ -1,730 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * 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
- * 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 { addPreEditListener, addPreSendListener, removePreEditListener, removePreSendListener } from "@api/MessageEvents";
-import { definePluginSettings, migratePluginSettings, Settings } from "@api/settings";
-import { Devs } from "@utils/constants";
-import { ApngBlendOp, ApngDisposeOp, getGifEncoder, importApngJs } from "@utils/dependencies";
-import { getCurrentGuild } from "@utils/discord";
-import { proxyLazy } from "@utils/proxyLazy";
-import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy, findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, FluxDispatcher, Parser, PermissionStore, UserStore } from "@webpack/common";
-import type { Message } from "discord-types/general";
-
-const DRAFT_TYPE = 0;
-const promptToUpload = findByCodeLazy("UPLOAD_FILE_LIMIT_ERROR");
-const UserSettingsProtoStore = findStoreLazy("UserSettingsProtoStore");
-const PreloadedUserSettingsProtoHandler = findLazy(m => m.ProtoClass?.typeName === "discord_protos.discord_users.v1.PreloadedUserSettings");
-const ReaderFactory = findByPropsLazy("readerFactory");
-const StickerStore = findStoreLazy("StickersStore") as {
-    getPremiumPacks(): StickerPack[];
-    getAllGuildStickers(): Map<string, Sticker[]>;
-    getStickerById(id: string): Sticker | undefined;
-};
-const EmojiStore = findStoreLazy("EmojiStore");
-
-
-function searchProtoClass(localName: string, parentProtoClass: any) {
-    if (!parentProtoClass) return;
-
-    const field = parentProtoClass.fields.find(field => field.localName === localName);
-    if (!field) return;
-
-    const getter: any = Object.values(field).find(value => typeof value === "function");
-    return getter?.();
-}
-
-const AppearanceSettingsProto = proxyLazy(() => searchProtoClass("appearance", PreloadedUserSettingsProtoHandler.ProtoClass));
-const ClientThemeSettingsProto = proxyLazy(() => searchProtoClass("clientThemeSettings", AppearanceSettingsProto));
-
-const USE_EXTERNAL_EMOJIS = 1n << 18n;
-const USE_EXTERNAL_STICKERS = 1n << 37n;
-
-enum EmojiIntentions {
-    REACTION = 0,
-    STATUS = 1,
-    COMMUNITY_CONTENT = 2,
-    CHAT = 3,
-    GUILD_STICKER_RELATED_EMOJI = 4,
-    GUILD_ROLE_BENEFIT_EMOJI = 5,
-    COMMUNITY_CONTENT_ONLY = 6,
-    SOUNDBOARD = 7
-}
-
-interface BaseSticker {
-    available: boolean;
-    description: string;
-    format_type: number;
-    id: string;
-    name: string;
-    tags: string;
-    type: number;
-}
-interface GuildSticker extends BaseSticker {
-    guild_id: string;
-}
-interface DiscordSticker extends BaseSticker {
-    pack_id: string;
-}
-type Sticker = GuildSticker | DiscordSticker;
-
-interface StickerPack {
-    id: string;
-    name: string;
-    sku_id: string;
-    description: string;
-    cover_sticker_id: string;
-    banner_asset_id: string;
-    stickers: Sticker[];
-}
-
-const fakeNitroEmojiRegex = /\/emojis\/(\d+?)\.(png|webp|gif)/;
-const fakeNitroStickerRegex = /\/stickers\/(\d+?)\./;
-const fakeNitroGifStickerRegex = /\/attachments\/\d+?\/\d+?\/(\d+?)\.gif/;
-
-const settings = definePluginSettings({
-    enableEmojiBypass: {
-        description: "Allow sending fake emojis",
-        type: OptionType.BOOLEAN,
-        default: true,
-        restartNeeded: true
-    },
-    emojiSize: {
-        description: "Size of the emojis when sending",
-        type: OptionType.SLIDER,
-        default: 48,
-        markers: [32, 48, 64, 128, 160, 256, 512]
-    },
-    transformEmojis: {
-        description: "Whether to transform fake emojis into real ones",
-        type: OptionType.BOOLEAN,
-        default: true,
-        restartNeeded: true
-    },
-    enableStickerBypass: {
-        description: "Allow sending fake stickers",
-        type: OptionType.BOOLEAN,
-        default: true,
-        restartNeeded: true
-    },
-    stickerSize: {
-        description: "Size of the stickers when sending",
-        type: OptionType.SLIDER,
-        default: 160,
-        markers: [32, 64, 128, 160, 256, 512]
-    },
-    transformStickers: {
-        description: "Whether to transform fake stickers into real ones",
-        type: OptionType.BOOLEAN,
-        default: true,
-        restartNeeded: true
-    },
-    enableStreamQualityBypass: {
-        description: "Allow streaming in nitro quality",
-        type: OptionType.BOOLEAN,
-        default: true,
-        restartNeeded: true
-    }
-});
-
-migratePluginSettings("FakeNitro", "NitroBypass");
-
-export default definePlugin({
-    name: "FakeNitro",
-    authors: [Devs.Arjix, Devs.D3SOX, Devs.Ven, Devs.obscurity, Devs.captain, Devs.Nuckyz, Devs.AutumnVN],
-    description: "Allows you to stream in nitro quality, send fake emojis/stickers and use client themes.",
-    dependencies: ["MessageEventsAPI"],
-
-    settings,
-
-    patches: [
-        {
-            find: ".PREMIUM_LOCKED;",
-            predicate: () => settings.store.enableEmojiBypass,
-            replacement: [
-                {
-                    match: /(?<=(\i)=\i\.intention)/,
-                    replace: (_, intention) => `,fakeNitroIntention=${intention}`
-                },
-                {
-                    match: /\.(?:canUseEmojisEverywhere|canUseAnimatedEmojis)\(\i(?=\))/g,
-                    replace: '$&,typeof fakeNitroIntention!=="undefined"?fakeNitroIntention:void 0'
-                },
-                {
-                    match: /(&&!\i&&)!(\i)(?=\)return \i\.\i\.DISALLOW_EXTERNAL;)/,
-                    replace: (_, rest, canUseExternal) => `${rest}(!${canUseExternal}&&(typeof fakeNitroIntention==="undefined"||![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)))`
-                }
-            ]
-        },
-        {
-            find: "canUseAnimatedEmojis:function",
-            predicate: () => settings.store.enableEmojiBypass,
-            replacement: {
-                match: /((?:canUseEmojisEverywhere|canUseAnimatedEmojis):function\(\i)\){(.+?\))/g,
-                replace: (_, rest, premiumCheck) => `${rest},fakeNitroIntention){${premiumCheck}||fakeNitroIntention==null||[${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)`
-            }
-        },
-        {
-            find: "canUseStickersEverywhere:function",
-            predicate: () => settings.store.enableStickerBypass,
-            replacement: {
-                match: /canUseStickersEverywhere:function\(\i\){/,
-                replace: "$&return true;"
-            },
-        },
-        {
-            find: "\"SENDABLE\"",
-            predicate: () => settings.store.enableStickerBypass,
-            replacement: {
-                match: /(\w+)\.available\?/,
-                replace: "true?"
-            }
-        },
-        {
-            find: "canStreamHighQuality:function",
-            predicate: () => settings.store.enableStreamQualityBypass,
-            replacement: [
-                "canUseHighVideoUploadQuality",
-                "canStreamHighQuality",
-                "canStreamMidQuality"
-            ].map(func => {
-                return {
-                    match: new RegExp(`${func}:function\\(\\i\\){`),
-                    replace: "$&return true;"
-                };
-            })
-        },
-        {
-            find: "STREAM_FPS_OPTION.format",
-            predicate: () => settings.store.enableStreamQualityBypass,
-            replacement: {
-                match: /(userPremiumType|guildPremiumTier):.{0,10}TIER_\d,?/g,
-                replace: ""
-            }
-        },
-        {
-            find: "canUseClientThemes:function",
-            replacement: {
-                match: /canUseClientThemes:function\(\i\){/,
-                replace: "$&return true;"
-            }
-        },
-        {
-            find: '.displayName="UserSettingsProtoStore"',
-            replacement: [
-                {
-                    match: /CONNECTION_OPEN:function\((\i)\){/,
-                    replace: (m, props) => `${m}$self.handleProtoChange(${props}.userSettingsProto,${props}.user);`
-                },
-                {
-                    match: /=(\i)\.local;/,
-                    replace: (m, props) => `${m}${props}.local||$self.handleProtoChange(${props}.settings.proto);`
-                }
-            ]
-        },
-        {
-            find: "updateTheme:function",
-            replacement: {
-                match: /(function \i\(\i\){var (\i)=\i\.backgroundGradientPresetId.+?)(\i\.\i\.updateAsync.+?theme=(.+?);.+?\),\i\))/,
-                replace: (_, rest, backgroundGradientPresetId, originalCall, theme) => `${rest}$self.handleGradientThemeSelect(${backgroundGradientPresetId},${theme},()=>${originalCall});`
-            }
-        },
-        {
-            find: '["strong","em","u","text","inlineCode","s","spoiler"]',
-            replacement: [
-                {
-                    predicate: () => settings.store.transformEmojis,
-                    match: /1!==(\i)\.length\|\|1!==\i\.length/,
-                    replace: (m, content) => `${m}||$self.shouldKeepEmojiLink(${content}[0])`
-                },
-                {
-                    predicate: () => settings.store.transformEmojis || settings.store.transformStickers,
-                    match: /(?=return{hasSpoilerEmbeds:\i,content:(\i)})/,
-                    replace: (_, content) => `${content}=$self.patchFakeNitroEmojisOrRemoveStickersLinks(${content},arguments[2]?.formatInline);`
-                }
-            ]
-        },
-        {
-            find: "renderEmbeds=function",
-            replacement: [
-                {
-                    predicate: () => settings.store.transformEmojis || settings.store.transformStickers,
-                    match: /(renderEmbeds=function\((\i)\){)(.+?embeds\.map\(\(function\((\i)\){)/,
-                    replace: (_, rest1, message, rest2, embed) => `${rest1}const fakeNitroMessage=${message};${rest2}if($self.shouldIgnoreEmbed(${embed},fakeNitroMessage))return null;`
-                },
-                {
-                    predicate: () => settings.store.transformStickers,
-                    match: /renderStickersAccessories=function\((\i)\){var (\i)=\(0,\i\.\i\)\(\i\),/,
-                    replace: (m, message, stickers) => `${m}${stickers}=$self.patchFakeNitroStickers(${stickers},${message}),`
-                },
-                {
-                    predicate: () => settings.store.transformStickers,
-                    match: /renderAttachments=function\(\i\){var (\i)=\i.attachments.+?;/,
-                    replace: (m, attachments) => `${m}${attachments}=$self.filterAttachments(${attachments});`
-                }
-            ]
-        },
-        {
-            find: ".STICKER_IN_MESSAGE_HOVER,",
-            predicate: () => settings.store.transformStickers,
-            replacement: [
-                {
-                    match: /var (\i)=\i\.renderableSticker,.{0,50}closePopout.+?channel:\i,closePopout:\i,/,
-                    replace: (m, renderableSticker) => `${m}renderableSticker:${renderableSticker},`
-                },
-                {
-                    match: /emojiSection.{0,50}description:\i(?<=(\i)\.sticker,.+?)(?=,)/,
-                    replace: (m, props) => `${m}+(${props}.renderableSticker?.fake?" This is a Fake Nitro sticker. Only you can see it rendered like a real one, for non Vencord users it will show as a link.":"")`
-                }
-            ]
-        },
-        {
-            find: ".Messages.EMOJI_POPOUT_PREMIUM_JOINED_GUILD_DESCRIPTION",
-            predicate: () => settings.store.transformEmojis,
-            replacement: {
-                match: /((\i)=\i\.node,\i=\i\.emojiSourceDiscoverableGuild)(.+?return) (.{0,450}Messages\.EMOJI_POPOUT_PREMIUM_JOINED_GUILD_DESCRIPTION.+?}\))/,
-                replace: (_, rest1, node, rest2, messages) => `${rest1},fakeNitroNode=${node}${rest2}(${messages})+(fakeNitroNode.fake?" This is a Fake Nitro emoji. Only you can see it rendered like a real one, for non Vencord users it will show as a link.":"")`
-            }
-        }
-    ],
-
-    options: {
-        enableEmojiBypass: {
-            description: "Allow sending fake emojis",
-            type: OptionType.BOOLEAN,
-            default: true,
-            restartNeeded: true,
-        },
-        emojiSize: {
-            description: "Size of the emojis when sending",
-            type: OptionType.SLIDER,
-            default: 48,
-            markers: [32, 48, 64, 128, 160, 256, 512],
-        },
-        transformEmojis: {
-            description: "Whether to transform fake emojis into real ones",
-            type: OptionType.BOOLEAN,
-            default: true,
-            restartNeeded: true,
-        },
-        enableStickerBypass: {
-            description: "Allow sending fake stickers",
-            type: OptionType.BOOLEAN,
-            default: true,
-            restartNeeded: true,
-        },
-        stickerSize: {
-            description: "Size of the stickers when sending",
-            type: OptionType.SLIDER,
-            default: 160,
-            markers: [32, 64, 128, 160, 256, 512],
-        },
-        enableStreamQualityBypass: {
-            description: "Allow streaming in nitro quality",
-            type: OptionType.BOOLEAN,
-            default: true,
-            restartNeeded: true,
-        }
-    },
-
-    get guildId() {
-        return getCurrentGuild()?.id;
-    },
-
-    get canUseEmotes() {
-        return (UserStore.getCurrentUser().premiumType ?? 0) > 0;
-    },
-
-    get canUseStickers() {
-        return (UserStore.getCurrentUser().premiumType ?? 0) > 1;
-    },
-
-    handleProtoChange(proto: any, user: any) {
-        if ((!proto.appearance && !AppearanceSettingsProto) || !UserSettingsProtoStore) return;
-
-        const premiumType: number = user?.premium_type ?? UserStore?.getCurrentUser()?.premiumType ?? 0;
-
-        if (premiumType !== 2) {
-            proto.appearance ??= AppearanceSettingsProto.create();
-
-            if (UserSettingsProtoStore.settings.appearance?.theme != null) {
-                proto.appearance.theme = UserSettingsProtoStore.settings.appearance.theme;
-            }
-
-            if (UserSettingsProtoStore.settings.appearance?.clientThemeSettings?.backgroundGradientPresetId?.value != null && ClientThemeSettingsProto) {
-                const clientThemeSettingsDummyProto = ClientThemeSettingsProto.create({
-                    backgroundGradientPresetId: {
-                        value: UserSettingsProtoStore.settings.appearance.clientThemeSettings.backgroundGradientPresetId.value
-                    }
-                });
-
-                proto.appearance.clientThemeSettings ??= clientThemeSettingsDummyProto;
-                proto.appearance.clientThemeSettings.backgroundGradientPresetId = clientThemeSettingsDummyProto.backgroundGradientPresetId;
-            }
-        }
-    },
-
-    handleGradientThemeSelect(backgroundGradientPresetId: number | undefined, theme: number, original: () => void) {
-        const premiumType = UserStore?.getCurrentUser()?.premiumType ?? 0;
-        if (premiumType === 2 || backgroundGradientPresetId == null) return original();
-
-        if (!AppearanceSettingsProto || !ClientThemeSettingsProto || !ReaderFactory) return;
-
-        const currentAppearanceProto = PreloadedUserSettingsProtoHandler.getCurrentValue().appearance;
-
-        const newAppearanceProto = currentAppearanceProto != null
-            ? AppearanceSettingsProto.fromBinary(AppearanceSettingsProto.toBinary(currentAppearanceProto), ReaderFactory)
-            : AppearanceSettingsProto.create();
-
-        newAppearanceProto.theme = theme;
-
-        const clientThemeSettingsDummyProto = ClientThemeSettingsProto.create({
-            backgroundGradientPresetId: {
-                value: backgroundGradientPresetId
-            }
-        });
-
-        newAppearanceProto.clientThemeSettings ??= clientThemeSettingsDummyProto;
-        newAppearanceProto.clientThemeSettings.backgroundGradientPresetId = clientThemeSettingsDummyProto.backgroundGradientPresetId;
-
-        const proto = PreloadedUserSettingsProtoHandler.ProtoClass.create();
-        proto.appearance = newAppearanceProto;
-
-        FluxDispatcher.dispatch({
-            type: "USER_SETTINGS_PROTO_UPDATE",
-            local: true,
-            partial: true,
-            settings: {
-                type: 1,
-                proto
-            }
-        });
-    },
-
-    patchFakeNitroEmojisOrRemoveStickersLinks(content: Array<any>, inline: boolean) {
-        if (content.length > 1) return content;
-
-        const newContent: Array<any> = [];
-
-        let nextIndex = content.length;
-
-        for (const element of content) {
-            if (element.props?.trusted == null) {
-                newContent.push(element);
-                continue;
-            }
-
-            if (settings.store.transformEmojis) {
-                const fakeNitroMatch = element.props.href.match(fakeNitroEmojiRegex);
-                if (fakeNitroMatch) {
-                    let url: URL | null = null;
-                    try {
-                        url = new URL(element.props.href);
-                    } catch { }
-
-                    const emojiName = EmojiStore.getCustomEmojiById(fakeNitroMatch[1])?.name ?? url?.searchParams.get("name") ?? "FakeNitroEmoji";
-
-                    newContent.push(Parser.defaultRules.customEmoji.react({
-                        jumboable: !inline,
-                        animated: fakeNitroMatch[2] === "gif",
-                        emojiId: fakeNitroMatch[1],
-                        name: emojiName,
-                        fake: true
-                    }, void 0, { key: String(nextIndex++) }));
-
-                    continue;
-                }
-            }
-
-            if (settings.store.transformStickers) {
-                if (fakeNitroStickerRegex.test(element.props.href)) continue;
-
-                const gifMatch = element.props.href.match(fakeNitroGifStickerRegex);
-                if (gifMatch) {
-                    // There is no way to differentiate a regular gif attachment from a fake nitro animated sticker, so we check if the StickerStore contains the id of the fake sticker
-                    if (StickerStore.getStickerById(gifMatch[1])) continue;
-                }
-            }
-
-            newContent.push(element);
-        }
-
-        const firstTextElementIdx = newContent.findIndex(element => typeof element === "string");
-        if (firstTextElementIdx !== -1) newContent[firstTextElementIdx] = newContent[firstTextElementIdx].trimStart();
-
-        return newContent;
-    },
-
-    patchFakeNitroStickers(stickers: Array<any>, message: Message) {
-        const itemsToMaybePush: Array<string> = [];
-
-        const contentItems = message.content.split(/\s/);
-        if (contentItems.length === 1) itemsToMaybePush.push(contentItems[0]);
-
-        itemsToMaybePush.push(...message.attachments.filter(attachment => attachment.content_type === "image/gif").map(attachment => attachment.url));
-
-        for (const item of itemsToMaybePush) {
-            const imgMatch = item.match(fakeNitroStickerRegex);
-            if (imgMatch) {
-                let url: URL | null = null;
-                try {
-                    url = new URL(item);
-                } catch { }
-
-                const stickerName = StickerStore.getStickerById(imgMatch[1])?.name ?? url?.searchParams.get("name") ?? "FakeNitroSticker";
-                stickers.push({
-                    format_type: 1,
-                    id: imgMatch[1],
-                    name: stickerName,
-                    fake: true
-                });
-
-                continue;
-            }
-
-            const gifMatch = item.match(fakeNitroGifStickerRegex);
-            if (gifMatch) {
-                if (!StickerStore.getStickerById(gifMatch[1])) continue;
-
-                const stickerName = StickerStore.getStickerById(gifMatch[1])?.name ?? "FakeNitroSticker";
-                stickers.push({
-                    format_type: 2,
-                    id: gifMatch[1],
-                    name: stickerName,
-                    fake: true
-                });
-            }
-        }
-
-        return stickers;
-    },
-
-    shouldIgnoreEmbed(embed: Message["embeds"][number], message: Message) {
-        if (message.content.split(/\s/).length > 1) return false;
-
-        switch (embed.type) {
-            case "image": {
-                if (settings.store.transformEmojis) {
-                    if (fakeNitroEmojiRegex.test(embed.url!)) return true;
-                }
-
-                if (settings.store.transformStickers) {
-                    if (fakeNitroStickerRegex.test(embed.url!)) return true;
-
-                    const gifMatch = embed.url!.match(fakeNitroGifStickerRegex);
-                    if (gifMatch) {
-                        // There is no way to differentiate a regular gif attachment from a fake nitro animated sticker, so we check if the StickerStore contains the id of the fake sticker
-                        if (StickerStore.getStickerById(gifMatch[1])) return true;
-                    }
-                }
-
-                break;
-            }
-        }
-
-        return false;
-    },
-
-    filterAttachments(attachments: Message["attachments"]) {
-        return attachments.filter(attachment => {
-            if (attachment.content_type !== "image/gif") return true;
-
-            const match = attachment.url.match(fakeNitroGifStickerRegex);
-            if (match) {
-                // There is no way to differentiate a regular gif attachment from a fake nitro animated sticker, so we check if the StickerStore contains the id of the fake sticker
-                if (StickerStore.getStickerById(match[1])) return false;
-            }
-
-            return true;
-        });
-    },
-
-    shouldKeepEmojiLink(link: any) {
-        return link.target && fakeNitroEmojiRegex.test(link.target);
-    },
-
-    hasPermissionToUseExternalEmojis(channelId: string) {
-        const channel = ChannelStore.getChannel(channelId);
-
-        if (!channel || channel.isDM() || channel.isGroupDM() || channel.isMultiUserDM()) return true;
-
-        return PermissionStore.can(USE_EXTERNAL_EMOJIS, channel);
-    },
-
-    hasPermissionToUseExternalStickers(channelId: string) {
-        const channel = ChannelStore.getChannel(channelId);
-
-        if (!channel || channel.isDM() || channel.isGroupDM() || channel.isMultiUserDM()) return true;
-
-        return PermissionStore.can(USE_EXTERNAL_STICKERS, channel);
-    },
-
-    getStickerLink(stickerId: string) {
-        return `https://media.discordapp.net/stickers/${stickerId}.png?size=${Settings.plugins.FakeNitro.stickerSize}`;
-    },
-
-    async sendAnimatedSticker(stickerLink: string, stickerId: string, channelId: string) {
-        const [{ parseURL }, {
-            GIFEncoder,
-            quantize,
-            applyPalette
-        }] = await Promise.all([importApngJs(), getGifEncoder()]);
-
-        const { frames, width, height } = await parseURL(stickerLink);
-
-        const gif = new GIFEncoder();
-        const resolution = Settings.plugins.FakeNitro.stickerSize;
-
-        const canvas = document.createElement("canvas");
-        canvas.width = resolution;
-        canvas.height = resolution;
-
-        const ctx = canvas.getContext("2d", {
-            willReadFrequently: true
-        })!;
-
-        const scale = resolution / Math.max(width, height);
-        ctx.scale(scale, scale);
-
-        let previousFrameData: ImageData;
-
-        for (const frame of frames) {
-            const { left, top, width, height, img, delay, blendOp, disposeOp } = frame;
-
-            previousFrameData = ctx.getImageData(left, top, width, height);
-
-            if (blendOp === ApngBlendOp.SOURCE) {
-                ctx.clearRect(left, top, width, height);
-            }
-
-            ctx.drawImage(img, left, top, width, height);
-
-            const { data } = ctx.getImageData(0, 0, resolution, resolution);
-
-            const palette = quantize(data, 256);
-            const index = applyPalette(data, palette);
-
-            gif.writeFrame(index, resolution, resolution, {
-                transparent: true,
-                palette,
-                delay
-            });
-
-            if (disposeOp === ApngDisposeOp.BACKGROUND) {
-                ctx.clearRect(left, top, width, height);
-            } else if (disposeOp === ApngDisposeOp.PREVIOUS) {
-                ctx.putImageData(previousFrameData, left, top);
-            }
-        }
-
-        gif.finish();
-
-        const file = new File([gif.bytesView()], `${stickerId}.gif`, { type: "image/gif" });
-        promptToUpload([file], ChannelStore.getChannel(channelId), DRAFT_TYPE);
-    },
-
-    start() {
-        const settings = Settings.plugins.FakeNitro;
-        if (!settings.enableEmojiBypass && !settings.enableStickerBypass) {
-            return;
-        }
-
-        function getWordBoundary(origStr: string, offset: number) {
-            return (!origStr[offset] || /\s/.test(origStr[offset])) ? "" : " ";
-        }
-
-        this.preSend = addPreSendListener((channelId, messageObj, extra) => {
-            const { guildId } = this;
-
-            stickerBypass: {
-                if (!settings.enableStickerBypass)
-                    break stickerBypass;
-
-                const sticker = StickerStore.getStickerById(extra?.stickerIds?.[0]!);
-                if (!sticker)
-                    break stickerBypass;
-
-                if (sticker.available !== false && ((this.canUseStickers && this.hasPermissionToUseExternalStickers(channelId)) || (sticker as GuildSticker)?.guild_id === guildId))
-                    break stickerBypass;
-
-                let link = this.getStickerLink(sticker.id);
-                if (sticker.format_type === 2) {
-                    this.sendAnimatedSticker(link, sticker.id, channelId);
-                    return { cancel: true };
-                } else {
-                    if ("pack_id" in sticker) {
-                        const packId = sticker.pack_id === "847199849233514549"
-                            // Discord moved these stickers into a different pack at some point, but
-                            // Distok still uses the old id
-                            ? "749043879713701898"
-                            : sticker.pack_id;
-
-                        link = `https://distok.top/stickers/${packId}/${sticker.id}.gif`;
-                    }
-
-                    delete extra.stickerIds;
-                    messageObj.content += " " + link + `&name=${encodeURIComponent(sticker.name)}`;
-                }
-            }
-
-            if ((!this.canUseEmotes || !this.hasPermissionToUseExternalEmojis(channelId)) && settings.enableEmojiBypass) {
-                for (const emoji of messageObj.validNonShortcutEmojis) {
-                    if (!emoji.require_colons) continue;
-                    if (emoji.guildId === guildId && !emoji.animated) continue;
-
-                    const emojiString = `<${emoji.animated ? "a" : ""}:${emoji.originalName || emoji.name}:${emoji.id}>`;
-                    const url = emoji.url.replace(/\?size=\d+/, "?" + new URLSearchParams({
-                        size: Settings.plugins.FakeNitro.emojiSize,
-                        name: encodeURIComponent(emoji.name)
-                    }));
-                    messageObj.content = messageObj.content.replace(emojiString, (match, offset, origStr) => {
-                        return `${getWordBoundary(origStr, offset - 1)}${url}${getWordBoundary(origStr, offset + match.length)}`;
-                    });
-                }
-            }
-
-            return { cancel: false };
-        });
-
-        this.preEdit = addPreEditListener((channelId, __, messageObj) => {
-            if (this.canUseEmotes && this.hasPermissionToUseExternalEmojis(channelId)) return;
-
-            const { guildId } = this;
-
-            for (const [emojiStr, _, emojiId] of messageObj.content.matchAll(/(?<!\\)<a?:(\w+):(\d+)>/ig)) {
-                const emoji = EmojiStore.getCustomEmojiById(emojiId);
-                if (emoji == null || (emoji.guildId === guildId && !emoji.animated)) continue;
-                if (!emoji.require_colons) continue;
-
-                const url = emoji.url.replace(/\?size=\d+/, "?" + new URLSearchParams({
-                    size: Settings.plugins.FakeNitro.emojiSize,
-                    name: encodeURIComponent(emoji.name)
-                }));
-                messageObj.content = messageObj.content.replace(emojiStr, (match, offset, origStr) => {
-                    return `${getWordBoundary(origStr, offset - 1)}${url}${getWordBoundary(origStr, offset + match.length)}`;
-                });
-            }
-        });
-    },
-
-    stop() {
-        removePreSendListener(this.preSend);
-        removePreEditListener(this.preEdit);
-    }
-});

src/plugins/fakeProfileThemes.tsx

@@ -1,145 +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/>.
-*/
-
-// This plugin is a port from Alyxia's Vendetta plugin
-import { definePluginSettings } from "@api/settings";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { Devs } from "@utils/constants";
-import { Margins } from "@utils/margins";
-import { copyWithToast } from "@utils/misc";
-import definePlugin, { OptionType } from "@utils/types";
-import { Button, Forms } from "@webpack/common";
-import { User } from "discord-types/general";
-import virtualMerge from "virtual-merge";
-
-interface UserProfile extends User {
-    themeColors?: Array<number>;
-}
-
-interface Colors {
-    primary: number;
-    accent: number;
-}
-
-function encode(primary: number, accent: number): string {
-    const message = `[#${primary.toString(16).padStart(6, "0")},#${accent.toString(16).padStart(6, "0")}]`;
-    const padding = "";
-    const encoded = Array.from(message)
-        .map(x => x.codePointAt(0))
-        .filter(x => x! >= 0x20 && x! <= 0x7f)
-        .map(x => String.fromCodePoint(x! + 0xe0000))
-        .join("");
-
-    return (padding || "") + " " + encoded;
-}
-
-// Courtesy of Cynthia.
-function decode(bio: string): Array<number> | null {
-    if (bio == null) return null;
-
-    const colorString = bio.match(
-        /\u{e005b}\u{e0023}([\u{e0061}-\u{e0066}\u{e0041}-\u{e0046}\u{e0030}-\u{e0039}]+?)\u{e002c}\u{e0023}([\u{e0061}-\u{e0066}\u{e0041}-\u{e0046}\u{e0030}-\u{e0039}]+?)\u{e005d}/u,
-    );
-    if (colorString != null) {
-        const parsed = [...colorString[0]]
-            .map(x => String.fromCodePoint(x.codePointAt(0)! - 0xe0000))
-            .join("");
-        const colors = parsed
-            .substring(1, parsed.length - 1)
-            .split(",")
-            .map(x => parseInt(x.replace("#", "0x"), 16));
-
-        return colors;
-    } else {
-        return null;
-    }
-}
-
-const settings = definePluginSettings({
-    nitroFirst: {
-        description: "Default color source if both are present",
-        type: OptionType.SELECT,
-        options: [
-            { label: "Nitro colors", value: true, default: true },
-            { label: "Fake colors", value: false },
-        ]
-    }
-});
-
-export default definePlugin({
-    name: "FakeProfileThemes",
-    description: "Allows profile theming by hiding the colors in your bio thanks to invisible 3y3 encoding.",
-    authors: [Devs.Alyxia, Devs.Remty],
-    patches: [
-        {
-            find: "getUserProfile=",
-            replacement: {
-                match: /(?<=getUserProfile=function\(\i\){return )(\i\[\i\])/,
-                replace: "$self.colorDecodeHook($1)"
-            }
-        }, {
-            find: ".USER_SETTINGS_PROFILE_THEME_ACCENT",
-            replacement: {
-                match: /RESET_PROFILE_THEME}\)(?<=},color:(\i).+?},color:(\i).+?)/,
-                replace: "$&,$self.addCopy3y3Button({primary:$1,accent:$2})"
-            }
-        }
-    ],
-    settingsAboutComponent: () => (
-        <Forms.FormSection>
-            <Forms.FormTitle tag="h3">Usage</Forms.FormTitle>
-            <Forms.FormText>
-                After enabling this plugin, you will see custom colors in the profiles of other people using compatible plugins. <br />
-                To set your own colors:
-                <ul>
-                    <li>• go to your profile settings</li>
-                    <li>• choose your own colors in the Nitro preview</li>
-                    <li>• click the "Copy 3y3" button</li>
-                    <li>• paste the invisible text anywhere in your bio</li>
-                </ul><br />
-                <b>Please note:</b> if you are using a theme which hides nitro upsells, you should disable it temporarily to set colors.
-            </Forms.FormText>
-        </Forms.FormSection>),
-    settings,
-    colorDecodeHook(user: UserProfile) {
-        if (user) {
-            // don't replace colors if already set with nitro
-            if (settings.store.nitroFirst && user.themeColors) return user;
-            const colors = decode(user.bio);
-            if (colors) {
-                return virtualMerge(user, {
-                    premiumType: 2,
-                    themeColors: colors
-                });
-            }
-        }
-        return user;
-    },
-    addCopy3y3Button: ErrorBoundary.wrap(function ({ primary, accent }: Colors) {
-        return <Button
-            onClick={() => {
-                const colorString = encode(primary, accent);
-                copyWithToast(colorString);
-            }}
-            color={Button.Colors.PRIMARY}
-            size={Button.Sizes.XLARGE}
-            className={Margins.left16}
-        >Copy 3y3
-        </Button >;
-    }, { noop: true }),
-});

src/plugins/fixInbox.tsx

@@ -1,56 +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 { 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/friendInvites.ts

@@ -19,16 +19,12 @@
 import { ApplicationCommandInputType, sendBotMessage } from "@api/Commands";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { findByProps } from "@webpack";
-import { RestAPI, UserStore } from "@webpack/common";
-
-const FriendInvites = findByPropsLazy("createFriendInvite");
-const uuid = findByPropsLazy("v4", "v1");
 
 export default definePlugin({
     name: "FriendInvites",
-    description: "Create and manage friend invite links via slash commands (/create friend invite, /view friend invites, /revoke friend invites).",
+    description: "Generate and manage friend invite links.",
-    authors: [Devs.afn, Devs.Dziurwa],
+    authors: [Devs.afn],
     dependencies: ["CommandsAPI"],
     commands: [
         {
@@ -36,31 +32,14 @@ export default definePlugin({
             description: "Generates a friend invite link.",
             inputType: ApplicationCommandInputType.BOT,
             execute: async (_, ctx) => {
-                if (!UserStore.getCurrentUser().phone)
+                const friendInvites = findByProps("createFriendInvite");
-                    return sendBotMessage(ctx.channel.id, {
+                const createInvite = await friendInvites.createFriendInvite();
-                        content: "You need to have a phone number connected to your account to create a friend invite!"
-                    });
 
-                const random = uuid.v4();
+                return void sendBotMessage(ctx.channel.id, {
-                const invite = await RestAPI.post({
-                    url: "/friend-finder/find-friends",
-                    body: {
-                        modified_contacts: {
-                            [random]: [1, "", ""]
-                        }
-                    }
-                }).then(res =>
-                    FriendInvites.createFriendInvite({
-                        code: res.body.invite_suggestions[0][3],
-                        recipient_phone_number_or_email: random
-                    })
-                );
-
-                sendBotMessage(ctx.channel.id, {
                     content: `
-                        discord.gg/${invite.code} ·
+                        discord.gg/${createInvite.code}
-                        Expires: <t:${new Date(invite.expires_at).getTime() / 1000}:R> ·
+                        Expires: <t:${new Date(createInvite.expires_at).getTime() / 1000}:R>
-                        Max uses: \`${invite.max_uses}\`
+                        Max uses: \`${createInvite.max_uses}\`
                     `.trim().replace(/\s+/g, " ")
                 });
             },
@@ -70,29 +49,28 @@ export default definePlugin({
             description: "View a list of all generated friend invites.",
             inputType: ApplicationCommandInputType.BOT,
             execute: async (_, ctx) => {
-                const invites = await FriendInvites.getAllFriendInvites();
+                const friendInvites = findByProps("createFriendInvite");
+                const invites = await friendInvites.getAllFriendInvites();
                 const friendInviteList = invites.map(i =>
-                    `
+                    `_discord.gg/${i.code}_
-                    _discord.gg/${i.code}_ ·
+                    Expires: <t:${new Date(i.expires_at).getTime() / 1000}:R>
-                    Expires: <t:${new Date(i.expires_at).getTime() / 1000}:R> ·
+                    Times used: \`${i.uses}/${i.max_uses}\``.trim().replace(/\s+/g, " ")
-                    Times used: \`${i.uses}/${i.max_uses}\`
-                    `.trim().replace(/\s+/g, " ")
                 );
 
-                sendBotMessage(ctx.channel.id, {
+                return void sendBotMessage(ctx.channel.id, {
-                    content: friendInviteList.join("\n") || "You have no active friend invites!"
+                    content: friendInviteList.join("\n\n") || "You have no active friend invites!"
                 });
             },
         },
         {
             name: "revoke friend invites",
-            description: "Revokes all generated friend invites.",
+            description: "Revokes ALL generated friend invite links.",
             inputType: ApplicationCommandInputType.BOT,
             execute: async (_, ctx) => {
-                await FriendInvites.revokeFriendInvites();
+                await findByProps("createFriendInvite").revokeFriendInvites();
 
                 return void sendBotMessage(ctx.channel.id, {
-                    content: "All friend invites have been revoked."
+                    content: "All friend links have been revoked."
                 });
             },
         },

src/plugins/gameActivityToggle/index.tsx

@@ -1,85 +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 { getSettingStoreLazy } from "@api/SettingsStore";
-import { disableStyle, enableStyle } from "@api/Styles";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-import { findByCodeLazy } from "@webpack";
-
-import style from "./style.css?managed";
-
-const ShowCurrentGame = getSettingStoreLazy<boolean>("status", "showCurrentGame");
-const Button = findByCodeLazy("Button.Sizes.NONE,disabled:");
-
-function makeIcon(showCurrentGame?: boolean) {
-    return function () {
-        return (
-            <svg
-                width="24"
-                height="24"
-                viewBox="0 96 960 960"
-            >
-                <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>
-        );
-    };
-}
-
-function GameActivityToggleButton() {
-    const showCurrentGame = ShowCurrentGame?.useSetting();
-
-    return (
-        <Button
-            tooltipText="Toggle Game Activity"
-            icon={makeIcon(showCurrentGame)}
-            role="switch"
-            aria-checked={!showCurrentGame}
-            onClick={() => ShowCurrentGame?.updateSetting(old => !old)}
-        />
-    );
-}
-
-export default definePlugin({
-    name: "GameActivityToggle",
-    description: "Adds a button next to the mic and deafen button to toggle game activity.",
-    authors: [Devs.Nuckyz],
-    dependencies: ["SettingsStoreAPI"],
-
-    patches: [
-        {
-            find: ".Messages.ACCOUNT_SPEAKING_WHILE_MUTED",
-            replacement: {
-                match: /this\.renderNameZone\(\).+?children:\[/,
-                replace: "$&$self.GameActivityToggleButton(),"
-            }
-        }
-    ],
-
-    GameActivityToggleButton: ErrorBoundary.wrap(GameActivityToggleButton, { noop: true }),
-
-    start() {
-        enableStyle(style);
-    },
-
-    stop() {
-        disableStyle(style);
-    }
-});

src/plugins/gameActivityToggle/style.css

@@ -1,3 +0,0 @@
-[class*="withTagAsButton"] {
-    min-width: 88px;
-}

src/plugins/gifPaste.ts

@@ -1,47 +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 { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-import { filters, findLazy, mapMangledModuleLazy } from "@webpack";
-
-const ExpressionPickerState = mapMangledModuleLazy('name:"expression-picker-last-active-view"', {
-    close: filters.byCode("activeView:null", "setState")
-});
-const ComponentDispatch = findLazy(m => m.emitter?._events?.INSERT_TEXT);
-
-export default definePlugin({
-    name: "GifPaste",
-    description: "Makes picking a gif in the gif picker insert a link into the chatbox instead of instantly sending it",
-    authors: [Devs.Ven],
-
-    patches: [{
-        find: ".handleSelectGIF=",
-        replacement: {
-            match: /\.handleSelectGIF=function.+?\{/,
-            replace: ".handleSelectGIF=function(gif){return $self.handleSelect(gif);"
-        }
-    }],
-
-    handleSelect(gif?: { url: string; }) {
-        if (gif) {
-            ComponentDispatch.dispatchToLastSubscribed("INSERT_TEXT", { rawText: gif.url + " " });
-            ExpressionPickerState.close();
-        }
-    }
-});

src/plugins/ignoreActivities.tsx

@@ -21,7 +21,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { useForceUpdater } from "@utils/misc";
 import definePlugin from "@utils/types";
-import { findByPropsLazy, findStoreLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { Tooltip } from "webpack/common";
 
 enum ActivitiesTypes {
@@ -37,7 +37,7 @@ interface IgnoredActivity {
 const RegisteredGamesClasses = findByPropsLazy("overlayToggleIconOff", "overlayToggleIconOn");
 const TryItOutClasses = findByPropsLazy("tryItOutBadge", "tryItOutBadgeIcon");
 const BaseShapeRoundClasses = findByPropsLazy("baseShapeRound", "baseShapeRoundLeft", "baseShapeRoundRight");
-const RunningGameStore = findStoreLazy("RunningGameStore");
+const RunningGameStore = findByPropsLazy("getRunningGames", "getGamesSeen");
 
 function ToggleIconOff() {
     return (
@@ -71,7 +71,7 @@ function ToggleIconOff() {
     );
 }
 
-function ToggleIconOn({ forceWhite }: { forceWhite?: boolean; }) {
+function ToggleIconOn() {
     return (
         <svg
             className={RegisteredGamesClasses.overlayToggleIconOn}
@@ -80,15 +80,14 @@ function ToggleIconOn({ forceWhite }: { forceWhite?: boolean; }) {
             viewBox="0 0 32 26"
         >
             <path
-                className={forceWhite ? "" : RegisteredGamesClasses.fill}
+                className={RegisteredGamesClasses.fill}
-                fill={forceWhite ? "var(--white-500)" : ""}
                 d="M 16 8 C 7.664063 8 1.25 15.34375 1.25 15.34375 L 0.65625 16 L 1.25 16.65625 C 1.25 16.65625 7.097656 23.324219 14.875 23.9375 C 15.246094 23.984375 15.617188 24 16 24 C 16.382813 24 16.753906 23.984375 17.125 23.9375 C 24.902344 23.324219 30.75 16.65625 30.75 16.65625 L 31.34375 16 L 30.75 15.34375 C 30.75 15.34375 24.335938 8 16 8 Z M 16 10 C 18.203125 10 20.234375 10.601563 22 11.40625 C 22.636719 12.460938 23 13.675781 23 15 C 23 18.613281 20.289063 21.582031 16.78125 21.96875 C 16.761719 21.972656 16.738281 21.964844 16.71875 21.96875 C 16.480469 21.980469 16.242188 22 16 22 C 15.734375 22 15.476563 21.984375 15.21875 21.96875 C 11.710938 21.582031 9 18.613281 9 15 C 9 13.695313 9.351563 12.480469 9.96875 11.4375 L 9.9375 11.4375 C 11.71875 10.617188 13.773438 10 16 10 Z M 16 12 C 14.34375 12 13 13.34375 13 15 C 13 16.65625 14.34375 18 16 18 C 17.65625 18 19 16.65625 19 15 C 19 13.34375 17.65625 12 16 12 Z M 7.25 12.9375 C 7.09375 13.609375 7 14.285156 7 15 C 7 16.753906 7.5 18.394531 8.375 19.78125 C 5.855469 18.324219 4.105469 16.585938 3.53125 16 C 4.011719 15.507813 5.351563 14.203125 7.25 12.9375 Z M 24.75 12.9375 C 26.648438 14.203125 27.988281 15.507813 28.46875 16 C 27.894531 16.585938 26.144531 18.324219 23.625 19.78125 C 24.5 18.394531 25 16.753906 25 15 C 25 14.285156 24.90625 13.601563 24.75 12.9375 Z"
             />
         </svg>
     );
 }
 
-function ToggleActivityComponent({ activity, forceWhite }: { activity: IgnoredActivity; forceWhite?: boolean; }) {
+function ToggleActivityComponent({ activity }: { activity: IgnoredActivity; }) {
     const forceUpdate = useForceUpdater();
 
     return (
@@ -106,7 +105,7 @@ function ToggleActivityComponent({ activity, forceWhite }: { activity: IgnoredAc
                     {
                         ignoredActivitiesCache.has(activity.id)
                             ? <ToggleIconOff />
-                            : <ToggleIconOn forceWhite={forceWhite} />
+                            : <ToggleIconOn />
                     }
                 </div>
             )}
@@ -118,9 +117,9 @@ function ToggleActivityComponentWithBackground({ activity }: { activity: Ignored
     return (
         <div
             className={`${TryItOutClasses.tryItOutBadge} ${BaseShapeRoundClasses.baseShapeRound}`}
-            style={{ padding: "0px 2px" }}
+            style={{ padding: "0 2px" }}
         >
-            <ToggleActivityComponent activity={activity} forceWhite={true} />
+            <ToggleActivityComponent activity={activity} />
         </div>
     );
 }
@@ -143,32 +142,25 @@ export default definePlugin({
     name: "IgnoreActivities",
     authors: [Devs.Nuckyz],
     description: "Ignore certain activities (like games and actual activities) from showing up on your status. You can configure which ones are ignored from the Registered Games and Activities tabs.",
-    patches: [
+    patches: [{
-        {
+        find: ".Messages.SETTINGS_GAMES_TOGGLE_OVERLAY",
-            find: ".Messages.SETTINGS_GAMES_TOGGLE_OVERLAY",
+        replacement: {
-            replacement: {
+            match: /var .=(?<props>.)\.overlay.+?"aria-label":.\..\.Messages\.SETTINGS_GAMES_TOGGLE_OVERLAY.+?}}\)/,
-                match: /!(\i)(\)return null;var \i=(\i)\.overlay.+?children:)(\[.{0,70}overlayStatusText.+?\])(?=}\)}\(\))/,
+            replace: "$&,$self.renderToggleGameActivityButton($<props>)"
-                replace: (_, platformCheck, restWithoutPlatformCheck, props, children) => "false"
-                    + `${restWithoutPlatformCheck}`
-                    + `(${platformCheck}?${children}:[])`
-                    + `.concat(Vencord.Plugins.plugins.IgnoreActivities.renderToggleGameActivityButton(${props}))`
-            }
-        },
-        {
-            find: ".overlayBadge",
-            replacement: {
-                match: /(?<=\(\)\.badgeContainer.+?(\i)\.name}\):null)/,
-                replace: (_, props) => `,$self.renderToggleActivityButton(${props})`
-            }
-        },
-        {
-            find: '.displayName="LocalActivityStore"',
-            replacement: {
-                match: /LISTENING.+?\)\);(?<=(\i)\.push.+?)/,
-                replace: (m, activities) => `${m}${activities}=${activities}.filter($self.isActivityNotIgnored);`
-            }
         }
-    ],
+    }, {
+        find: ".overlayBadge",
+        replacement: {
+            match: /.badgeContainer.+?.\?\(0,.\.jsx\)\(.{1,2},{name:(?<props>.)\.name}\):null/,
+            replace: "$&,$self.renderToggleActivityButton($<props>)"
+        }
+    }, {
+        find: '.displayName="LocalActivityStore"',
+        replacement: {
+            match: /(?<activities>.)\.push\(.\({type:.\..{1,3}\.LISTENING.+?\)\)/,
+            replace: "$&;$<activities>=$<activities>.filter($self.isActivityNotIgnored);"
+        }
+    }],
 
     async start() {
         const ignoredActivitiesData = await DataStore.get<string[] | Map<IgnoredActivity["id"], IgnoredActivity>>("IgnoreActivities_ignoredActivities") ?? new Map<IgnoredActivity["id"], IgnoredActivity>();
@@ -222,5 +214,5 @@ export default definePlugin({
             }
         }
         return true;
-    }
+    },
 });

src/plugins/imageZoom/components/Magnifier.tsx

@@ -1,198 +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 { FluxDispatcher, React, useRef, useState } from "@webpack/common";
-
-import { ELEMENT_ID } from "../constants";
-import { settings } from "../index";
-import { waitFor } from "../utils/waitFor";
-
-interface Vec2 {
-    x: number,
-    y: number;
-}
-
-export interface MagnifierProps {
-    zoom: number;
-    size: number,
-    instance: any;
-}
-
-export const Magnifier: React.FC<MagnifierProps> = ({ instance, size: initialSize, zoom: initalZoom }) => {
-    const [ready, setReady] = useState(false);
-
-
-    const [lensPosition, setLensPosition] = useState<Vec2>({ x: 0, y: 0 });
-    const [imagePosition, setImagePosition] = useState<Vec2>({ x: 0, y: 0 });
-    const [opacity, setOpacity] = useState(0);
-
-    const isShiftDown = useRef(false);
-
-    const zoom = useRef(initalZoom);
-    const size = useRef(initialSize);
-
-    const element = useRef<HTMLDivElement | null>(null);
-    const currentVideoElementRef = useRef<HTMLVideoElement | null>(null);
-    const originalVideoElementRef = useRef<HTMLVideoElement | null>(null);
-    const imageRef = useRef<HTMLImageElement | null>(null);
-
-    // since we accessing document im gonna use useLayoutEffect
-    React.useLayoutEffect(() => {
-        const onKeyDown = (e: KeyboardEvent) => {
-            if (e.key === "Shift") {
-                isShiftDown.current = true;
-            }
-        };
-        const onKeyUp = (e: KeyboardEvent) => {
-            if (e.key === "Shift") {
-                isShiftDown.current = false;
-            }
-        };
-        const syncVideos = () => {
-            currentVideoElementRef.current!.currentTime = originalVideoElementRef.current!.currentTime;
-        };
-
-        const updateMousePosition = (e: MouseEvent) => {
-            if (instance.state.mouseOver && instance.state.mouseDown) {
-                const offset = size.current / 2;
-                const pos = { x: e.pageX, y: e.pageY };
-                const x = -((pos.x - element.current!.getBoundingClientRect().left) * zoom.current - offset);
-                const y = -((pos.y - element.current!.getBoundingClientRect().top) * zoom.current - offset);
-                setLensPosition({ x: e.x - offset, y: e.y - offset });
-                setImagePosition({ x, y });
-                setOpacity(1);
-            } else {
-                setOpacity(0);
-            }
-
-        };
-
-        const onMouseDown = (e: MouseEvent) => {
-            if (instance.state.mouseOver && e.button === 0 /* left click */) {
-                zoom.current = settings.store.zoom;
-                size.current = settings.store.size;
-
-                // close context menu if open
-                if (document.getElementById("image-context")) {
-                    FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" });
-                }
-
-                updateMousePosition(e);
-                setOpacity(1);
-            }
-        };
-
-        const onMouseUp = () => {
-            setOpacity(0);
-            if (settings.store.saveZoomValues) {
-                settings.store.zoom = zoom.current;
-                settings.store.size = size.current;
-            }
-        };
-
-        const onWheel = async (e: WheelEvent) => {
-            if (instance.state.mouseOver && instance.state.mouseDown && !isShiftDown.current) {
-                const val = zoom.current + ((e.deltaY / 100) * (settings.store.invertScroll ? -1 : 1)) * settings.store.zoomSpeed;
-                zoom.current = val <= 1 ? 1 : val;
-                updateMousePosition(e);
-            }
-            if (instance.state.mouseOver && instance.state.mouseDown && isShiftDown.current) {
-                const val = size.current + (e.deltaY * (settings.store.invertScroll ? -1 : 1)) * settings.store.zoomSpeed;
-                size.current = val <= 50 ? 50 : val;
-                updateMousePosition(e);
-            }
-        };
-
-        waitFor(() => instance.state.readyState === "READY", () => {
-            const elem = document.getElementById(ELEMENT_ID) as HTMLDivElement;
-            element.current = elem;
-            elem.firstElementChild!.setAttribute("draggable", "false");
-            if (instance.props.animated) {
-                originalVideoElementRef.current = elem!.querySelector("video")!;
-                originalVideoElementRef.current.addEventListener("timeupdate", syncVideos);
-                setReady(true);
-            } else {
-                setReady(true);
-            }
-        });
-        document.addEventListener("keydown", onKeyDown);
-        document.addEventListener("keyup", onKeyUp);
-        document.addEventListener("mousemove", updateMousePosition);
-        document.addEventListener("mousedown", onMouseDown);
-        document.addEventListener("mouseup", onMouseUp);
-        document.addEventListener("wheel", onWheel);
-        return () => {
-            document.removeEventListener("keydown", onKeyDown);
-            document.removeEventListener("keyup", onKeyUp);
-            document.removeEventListener("mousemove", updateMousePosition);
-            document.removeEventListener("mousedown", onMouseDown);
-            document.removeEventListener("mouseup", onMouseUp);
-            document.removeEventListener("wheel", onWheel);
-
-            if (settings.store.saveZoomValues) {
-                settings.store.zoom = zoom.current;
-                settings.store.size = size.current;
-            }
-        };
-    }, []);
-
-    if (!ready) return null;
-
-    const box = element.current!.getBoundingClientRect();
-
-    return (
-        <div
-            className="lens"
-            style={{
-                opacity,
-                width: size.current + "px",
-                height: size.current + "px",
-                transform: `translate(${lensPosition.x}px, ${lensPosition.y}px)`,
-            }}
-        >
-            {instance.props.animated ?
-                (
-                    <video
-                        ref={currentVideoElementRef}
-                        style={{
-                            position: "absolute",
-                            left: `${imagePosition.x}px`,
-                            top: `${imagePosition.y}px`
-                        }}
-                        width={`${box.width * zoom.current}px`}
-                        height={`${box.height * zoom.current}px`}
-                        poster={instance.props.src}
-                        src={originalVideoElementRef.current?.src ?? instance.props.src}
-                        autoPlay
-                        loop
-                    />
-                ) : (
-                    <img
-                        ref={imageRef}
-                        style={{
-                            position: "absolute",
-                            transform: `translate(${imagePosition.x}px, ${imagePosition.y}px)`
-                        }}
-                        width={`${box.width * zoom.current}px`}
-                        height={`${box.height * zoom.current}px`}
-                        src={instance.props.src} alt=""
-                    />
-                )}
-        </div>
-    );
-};

src/plugins/imageZoom/constants.ts

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

src/plugins/imageZoom/index.tsx

@@ -1,234 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import "./styles.css";
-
-import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
-import { definePluginSettings } from "@api/settings";
-import { makeRange } from "@components/PluginSettings/components";
-import { Devs } from "@utils/constants";
-import { debounce } from "@utils/debounce";
-import definePlugin, { OptionType } from "@utils/types";
-import { Menu, React, ReactDOM } from "@webpack/common";
-import type { Root } from "react-dom/client";
-
-import { Magnifier, MagnifierProps } from "./components/Magnifier";
-import { ELEMENT_ID } from "./constants";
-
-export const settings = definePluginSettings({
-    saveZoomValues: {
-        type: OptionType.BOOLEAN,
-        description: "Whether to save zoom and lens size values",
-        default: true,
-    },
-
-    preventCarouselFromClosingOnClick: {
-        type: OptionType.BOOLEAN,
-        // Thanks chat gpt
-        description: "Allow the image modal in the image slideshow thing / carousel to remain open when clicking on the image",
-        default: true,
-    },
-
-    invertScroll: {
-        type: OptionType.BOOLEAN,
-        description: "Invert scroll",
-        default: true,
-    },
-
-    zoom: {
-        description: "Zoom of the lens",
-        type: OptionType.SLIDER,
-        markers: makeRange(1, 50, 4),
-        default: 2,
-        stickToMarkers: false,
-    },
-    size: {
-        description: "Radius / Size of the lens",
-        type: OptionType.SLIDER,
-        markers: makeRange(50, 1000, 50),
-        default: 100,
-        stickToMarkers: false,
-    },
-
-    zoomSpeed: {
-        description: "How fast the zoom / lens size changes",
-        type: OptionType.SLIDER,
-        markers: makeRange(0.1, 5, 0.2),
-        default: 0.5,
-        stickToMarkers: false,
-    },
-});
-
-
-const imageContextMenuPatch: NavContextMenuPatchCallback = (children, _) => {
-    if (!children.some(child => child?.props?.id === "image-zoom")) {
-        children.push(
-            <Menu.MenuGroup id="image-zoom">
-                {/* thanks SpotifyControls */}
-                <Menu.MenuControlItem
-                    id="zoom"
-                    label="Zoom"
-                    control={(props, ref) => (
-                        <Menu.MenuSliderControl
-                            ref={ref}
-                            {...props}
-                            minValue={1}
-                            maxValue={50}
-                            value={settings.store.zoom}
-                            onChange={debounce((value: number) => settings.store.zoom = value, 100)}
-                        />
-                    )}
-                />
-                <Menu.MenuControlItem
-                    id="size"
-                    label="Lens Size"
-                    control={(props, ref) => (
-                        <Menu.MenuSliderControl
-                            ref={ref}
-                            {...props}
-                            minValue={50}
-                            maxValue={1000}
-                            value={settings.store.size}
-                            onChange={debounce((value: number) => settings.store.size = value, 100)}
-                        />
-                    )}
-                />
-                <Menu.MenuControlItem
-                    id="zoom-speed"
-                    label="Zoom Speed"
-                    control={(props, ref) => (
-                        <Menu.MenuSliderControl
-                            ref={ref}
-                            {...props}
-                            minValue={0.1}
-                            maxValue={5}
-                            value={settings.store.zoomSpeed}
-                            onChange={debounce((value: number) => settings.store.zoomSpeed = value, 100)}
-                            renderValue={(value: number) => `${value.toFixed(3)}x`}
-                        />
-                    )}
-                />
-            </Menu.MenuGroup>
-        );
-    }
-};
-
-export default definePlugin({
-    name: "ImageZoom",
-    description: "Lets you zoom in to images and gifs. Use scroll wheel to zoom in and shift + scroll wheel to increase lens radius / size",
-    authors: [Devs.Aria],
-    patches: [
-        {
-            find: '"renderLinkComponent","maxWidth"',
-            replacement: {
-                match: /(return\(.{1,100}\(\)\.wrapper.{1,100})(src)/,
-                replace: `$1id: '${ELEMENT_ID}',$2`
-            }
-        },
-
-        {
-            find: "handleImageLoad=",
-            replacement: [
-                {
-                    match: /(render=function\(\){.{1,500}limitResponsiveWidth.{1,600})onMouseEnter:/,
-                    replace: "$1...$self.makeProps(this),onMouseEnter:"
-                },
-
-                {
-                    match: /componentDidMount=function\(\){/,
-                    replace: "$&$self.renderMagnifier(this);",
-                },
-
-                {
-                    match: /componentWillUnmount=function\(\){/,
-                    replace: "$&$self.unMountMagnifier();"
-                }
-            ]
-        },
-
-        {
-            find: ".carouselModal,",
-            replacement: {
-                match: /onClick:(\i),/,
-                replace: "onClick:$self.settings.store.preventCarouselFromClosingOnClick ? () => {} : $1,"
-            }
-        }
-    ],
-
-    settings,
-
-    // to stop from rendering twice /shrug
-    currentMagnifierElement: null as React.FunctionComponentElement<MagnifierProps & JSX.IntrinsicAttributes> | null,
-    element: null as HTMLDivElement | null,
-
-    Magnifier,
-    root: null as Root | null,
-    makeProps(instance) {
-        return {
-            onMouseOver: () => this.onMouseOver(instance),
-            onMouseOut: () => this.onMouseOut(instance),
-            onMouseDown: (e: React.MouseEvent) => this.onMouseDown(e, instance),
-            onMouseUp: () => this.onMouseUp(instance),
-            id: instance.props.id,
-        };
-    },
-
-    renderMagnifier(instance) {
-        if (instance.props.id === ELEMENT_ID) {
-            if (!this.currentMagnifierElement) {
-                this.currentMagnifierElement = <Magnifier size={settings.store.size} zoom={settings.store.zoom} instance={instance} />;
-                this.root = ReactDOM.createRoot(this.element!);
-                this.root.render(this.currentMagnifierElement);
-            }
-        }
-    },
-
-    unMountMagnifier() {
-        this.root?.unmount();
-        this.currentMagnifierElement = null;
-        this.root = null;
-    },
-
-    onMouseOver(instance) {
-        instance.setState((state: any) => ({ ...state, mouseOver: true }));
-    },
-    onMouseOut(instance) {
-        instance.setState((state: any) => ({ ...state, mouseOver: false }));
-    },
-    onMouseDown(e: React.MouseEvent, instance) {
-        if (e.button === 0 /* left */)
-            instance.setState((state: any) => ({ ...state, mouseDown: true }));
-    },
-    onMouseUp(instance) {
-        instance.setState((state: any) => ({ ...state, mouseDown: false }));
-    },
-
-    start() {
-        addContextMenuPatch("image-context", imageContextMenuPatch);
-        this.element = document.createElement("div");
-        this.element.classList.add("MagnifierContainer");
-        document.body.appendChild(this.element);
-    },
-
-    stop() {
-        // so componenetWillUnMount gets called if Magnifier component is still alive
-        this.root && this.root.unmount();
-        this.element?.remove();
-        removeContextMenuPatch("image-context", imageContextMenuPatch);
-    }
-});

src/plugins/imageZoom/styles.css

@@ -1,31 +0,0 @@
-.lens {
-    position: absolute;
-    inset: 0;
-    z-index: 9999;
-    border: 2px solid grey;
-    border-radius: 50%;
-    overflow: hidden;
-    cursor: none;
-    box-shadow: inset 0 0 10px 2px grey;
-    filter: drop-shadow(0 0 2px grey);
-    pointer-events: none;
-}
-
-.zoom img {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-}
-
-/* make the carousel take up less space so we can click the backdrop and exit out of it */
-[class^="focusLock"] > [class^="carouselModal"] {
-    height: fit-content;
-    box-shadow: none;
-}
-
-[class^="focusLock"] > [class^="carouselModal"] > div {
-    height: fit-content;
-    top: 50%;
-    transform: translateY(-50%);
-}

src/plugins/index.ts

@@ -43,11 +43,8 @@ export function isPluginEnabled(p: string) {
 
 const pluginsValues = Object.values(Plugins);
 
-// First roundtrip to mark and force enable dependencies (only for enabled plugins)
+// First roundtrip to mark and force enable dependencies
-//
+for (const p of pluginsValues) {
-// FIXME: might need to revisit this if there's ever nested (dependencies of dependencies) dependencies since this only
-// goes for the top level and their children, but for now this works okay with the current API plugins
-for (const p of pluginsValues) if (settings[p.name]?.enabled) {
     p.dependencies?.forEach(d => {
         const dep = Plugins[d];
         if (dep) {

src/plugins/invisibleChat/index.tsx

@@ -91,8 +91,8 @@ function ChatBarIcon() {
                             <svg
                                 aria-hidden
                                 role="img"
-                                width="32"
+                                width="24"
-                                height="32"
+                                height="24"
                                 viewBox={"0 0 64 64"}
                                 style={{ scale: "1.1" }}
                             >
@@ -119,7 +119,6 @@ export default definePlugin({
     name: "InvisibleChat",
     description: "Encrypt your Messages in a non-suspicious way! This plugin makes requests to >>https://embed.sammcheese.net<< to provide embeds to decrypted links!",
     authors: [Devs.SammCheese],
-    dependencies: ["MessagePopoverAPI"],
     patches: [
         {
             // Indicator
@@ -132,8 +131,8 @@ export default definePlugin({
         {
             find: ".activeCommandOption",
             replacement: {
-                match: /(.)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
+                match: /.=.\.activeCommand,.=.\.activeCommandOption,.{1,133}(.)=\[\];/,
-                replace: "$&;try{$2||$1.push($self.chatBarIcon())}catch{}",
+                replace: "$&;$1.push($self.chatBarIcon());",
             }
         },
     ],

src/plugins/lastfm.tsx

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { definePluginSettings } from "@api/settings";
+import { Settings } from "@api/settings";
 import { Link } from "@components/Link";
 import { Devs } from "@utils/constants";
-import Logger from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { filters, findByPropsLazy, mapMangledModuleLazy } from "@webpack";
 import { FluxDispatcher, Forms } from "@webpack/common";
@@ -31,17 +30,11 @@ interface ActivityAssets {
     small_text?: string;
 }
 
-
-interface ActivityButton {
-    label: string;
-    url: string;
-}
-
 interface Activity {
     state: string;
     details?: string;
     timestamps?: {
-        start?: number;
+        start?: Number;
     };
     assets?: ActivityAssets;
     buttons?: Array<string>;
@@ -50,8 +43,8 @@ interface Activity {
     metadata?: {
         button_urls?: Array<string>;
     };
-    type: number;
+    type: Number;
-    flags: number;
+    flags: Number;
 }
 
 interface TrackData {
@@ -73,9 +66,6 @@ enum ActivityFlag {
 }
 
 const applicationId = "1043533871037284423";
-const placeholderId = "2a96cbd8b46e442fc41c2b86b821562f";
-
-const logger = new Logger("LastFMRichPresence");
 
 const presenceStore = findByPropsLazy("getLocalPresence");
 const assetManager = mapMangledModuleLazy(
@@ -89,64 +79,14 @@ async function getApplicationAsset(key: string): Promise<string> {
     return (await assetManager.getAsset(applicationId, [key, undefined]))[0];
 }
 
-function setActivity(activity: Activity | null) {
+function setActivity(activity?: Activity) {
-    FluxDispatcher.dispatch({
+    FluxDispatcher.dispatch({ type: "LOCAL_ACTIVITY_UPDATE", activity: activity });
-        type: "LOCAL_ACTIVITY_UPDATE",
-        activity,
-        socketId: "LastFM",
-    });
 }
 
-const settings = definePluginSettings({
-    username: {
-        description: "last.fm username",
-        type: OptionType.STRING,
-    },
-    apiKey: {
-        description: "last.fm api key",
-        type: OptionType.STRING,
-    },
-    shareUsername: {
-        description: "show link to last.fm profile",
-        type: OptionType.BOOLEAN,
-        default: false,
-    },
-    hideWithSpotify: {
-        description: "hide last.fm presence if spotify is running",
-        type: OptionType.BOOLEAN,
-        default: true,
-    },
-    statusName: {
-        description: "text shown in status",
-        type: OptionType.STRING,
-        default: "some music",
-    },
-    useListeningStatus: {
-        description: 'show "Listening to" status instead of "Playing"',
-        type: OptionType.BOOLEAN,
-        default: false,
-    },
-    missingArt: {
-        description: "When album or album art is missing",
-        type: OptionType.SELECT,
-        options: [
-            {
-                label: "Use large Last.fm logo",
-                value: "lastfmLogo",
-                default: true
-            },
-            {
-                label: "Use generic placeholder",
-                value: "placeholder"
-            }
-        ],
-    }
-});
-
 export default definePlugin({
     name: "LastFMRichPresence",
     description: "Little plugin for Last.fm rich presence",
-    authors: [Devs.dzshn, Devs.RuiNtD],
+    authors: [Devs.dzshn],
 
     settingsAboutComponent: () => (
         <>
@@ -164,9 +104,30 @@ export default definePlugin({
         </>
     ),
 
-    settings,
+    options: {
+        username: {
+            description: "last.fm username",
+            type: OptionType.STRING,
+        },
+        apiKey: {
+            description: "last.fm api key",
+            type: OptionType.STRING,
+        },
+        hideWithSpotify: {
+            description: "hide last.fm presence if spotify is running",
+            type: OptionType.BOOLEAN,
+            default: true,
+        },
+        useListeningStatus: {
+            description: 'show "Listening to" status instead of "Playing"',
+            type: OptionType.BOOLEAN,
+            default: false,
+        }
+    },
 
     start() {
+        this.settings = Settings.plugins.LastFMRichPresence;
+
         this.updateInterval = setInterval(() => { this.updatePresence(); }, 16000);
     },
 
@@ -175,112 +136,73 @@ export default definePlugin({
     },
 
     async fetchTrackData(): Promise<TrackData | null> {
-        if (!settings.store.username || !settings.store.apiKey)
+        if (!this.settings.username || !this.settings.apiKey) return null;
-            return null;
 
-        try {
+        const response = await fetch(`https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&api_key=${this.settings.apiKey}&user=${this.settings.username}&limit=1&format=json`);
-            const params = new URLSearchParams({
+        const trackData = (await response.json()).recenttracks.track[0];
-                method: "user.getrecenttracks",
-                api_key: settings.store.apiKey,
-                user: settings.store.username,
-                limit: "1",
-                format: "json"
-            });
 
-            const res = await fetch(`https://ws.audioscrobbler.com/2.0/?${params}`);
+        if (!trackData["@attr"]?.nowplaying) return null;
-            if (!res.ok) throw `${res.status} ${res.statusText}`;
 
-            const json = await res.json();
+        // why does the json api have xml structure
-            if (json.error) {
+        return {
-                logger.error("Error from Last.fm API", `${json.error}: ${json.message}`);
+            name: trackData.name || "Unknown",
-                return null;
+            album: trackData.album["#text"],
-            }
+            artist: trackData.artist["#text"] || "Unknown",
-
+            url: trackData.url,
-            const trackData = json.recenttracks?.track[0];
+            imageUrl: (trackData.image || []).filter(x => x.size === "large")[0]?.["#text"]
-
+        };
-            if (!trackData || !trackData["@attr"]?.nowplaying)
-                return null;
-
-            // why does the json api have xml structure
-            return {
-                name: trackData.name || "Unknown",
-                album: trackData.album["#text"],
-                artist: trackData.artist["#text"] || "Unknown",
-                url: trackData.url,
-                imageUrl: trackData.image?.find((x: any) => x.size === "large")?.["#text"]
-            };
-        } catch (e) {
-            logger.error("Failed to query Last.fm API", e);
-            // will clear the rich presence if API fails
-            return null;
-        }
     },
 
     async updatePresence() {
-        setActivity(await this.getActivity());
+        if (this.settings.hideWithSpotify) {
-    },
-
-    getLargeImage(track: TrackData): string | undefined {
-        if (track.imageUrl && !track.imageUrl.includes(placeholderId))
-            return track.imageUrl;
-
-        if (settings.store.missingArt === "placeholder")
-            return "placeholder";
-    },
-
-    async getActivity(): Promise<Activity | null> {
-        if (settings.store.hideWithSpotify) {
             for (const activity of presenceStore.getActivities()) {
                 if (activity.type === ActivityType.LISTENING && activity.application_id !== applicationId) {
-                    // there is already music status because of Spotify or richerCider (probably more)
+                    // there is already music status (probably only spotify can do this currently)
-                    return null;
+                    setActivity();
+                    return;
                 }
             }
         }
 
         const trackData = await this.fetchTrackData();
-        if (!trackData) return null;
 
-        const largeImage = this.getLargeImage(trackData);
+        if (!trackData) {
-        const assets: ActivityAssets = largeImage ?
+            setActivity();
-            {
+            return;
-                large_image: await getApplicationAsset(largeImage),
+        }
-                large_text: trackData.album || undefined,
+
+        const hideAlbumName = !trackData.album || trackData.album === trackData.name;
+
+        let assets: ActivityAssets;
+        if (trackData.imageUrl) {
+            assets = {
+                large_image: await getApplicationAsset(trackData.imageUrl),
+                large_text: trackData.name,
                 small_image: await getApplicationAsset("lastfm-small"),
                 small_text: "Last.fm",
-            } : {
-                large_image: await getApplicationAsset("lastfm-large"),
-                large_text: trackData.album || undefined,
             };
+        } else {
+            assets = {
+                large_image: await getApplicationAsset("lastfm-large"),
+                large_text: "Last.fm",
+            };
+        }
 
-        const buttons: ActivityButton[] = [
+        setActivity({
-            {
-                label: "View Song",
-                url: trackData.url,
-            },
-        ];
-
-        if (settings.store.shareUsername)
-            buttons.push({
-                label: "Last.fm Profile",
-                url: `https://www.last.fm/user/${settings.store.username}`,
-            });
-
-        return {
             application_id: applicationId,
-            name: settings.store.statusName,
+            name: "some music",
 
             details: trackData.name,
-            state: trackData.artist,
+            state: hideAlbumName ? trackData.artist : `${trackData.artist} - ${trackData.album}`,
             assets,
 
-            buttons: buttons.map(v => v.label),
+            buttons: ["Open in Last.fm"],
             metadata: {
-                button_urls: buttons.map(v => v.url),
+                button_urls: [trackData.url]
             },
 
-            type: settings.store.useListeningStatus ? ActivityType.LISTENING : ActivityType.PLAYING,
+            type: this.settings.useListeningStatus ? ActivityType.LISTENING : ActivityType.PLAYING,
             flags: ActivityFlag.INSTANCE,
-        };
+        });
     }
 });

src/plugins/messageActions.ts

@@ -20,20 +20,18 @@ import { addClickListener, removeClickListener } from "@api/MessageEvents";
 import { migratePluginSettings } from "@api/settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { findByPropsLazy, findLazy } from "@webpack";
-import { PermissionStore, UserStore } from "@webpack/common";
+import { UserStore } from "@webpack/common";
 
 let isDeletePressed = false;
 const keydown = (e: KeyboardEvent) => e.key === "Backspace" && (isDeletePressed = true);
 const keyup = (e: KeyboardEvent) => e.key === "Backspace" && (isDeletePressed = false);
 
-const MANAGE_CHANNELS = 1n << 4n;
-
 migratePluginSettings("MessageClickActions", "MessageQuickActions");
 
 export default definePlugin({
     name: "MessageClickActions",
-    description: "Hold Backspace and click to delete, double click to edit",
+    description: "Hold Delete and click to delete, double click to edit",
     authors: [Devs.Ven],
     dependencies: ["MessageEventsAPI"],
 
@@ -52,6 +50,8 @@ export default definePlugin({
 
     start() {
         const MessageActions = findByPropsLazy("deleteMessage", "startEditMessage");
+        const PermissionStore = findByPropsLazy("can", "initialize");
+        const Permissions = findLazy(m => typeof m.MANAGE_MESSAGES === "bigint");
         const EditStore = findByPropsLazy("isEditing", "isEditingAny");
 
         document.addEventListener("keydown", keydown);
@@ -64,7 +64,7 @@ export default definePlugin({
                     MessageActions.startEditMessage(chan.id, msg.id, msg.content);
                     event.preventDefault();
                 }
-            } else if (Vencord.Settings.plugins.MessageClickActions.enableDeleteOnClick && (isMe || PermissionStore.can(MANAGE_CHANNELS, chan))) {
+            } else if (Vencord.Settings.plugins.MessageClickActions.enableDeleteOnClick && (isMe || PermissionStore.can(Permissions.MANAGE_MESSAGES, chan))) {
                 MessageActions.deleteMessage(chan.id, msg.id);
                 event.preventDefault();
             }

src/plugins/messageLinkEmbeds.tsx

@@ -17,13 +17,11 @@
 */
 
 import { addAccessory } from "@api/MessageAccessories";
-import { definePluginSettings } from "@api/settings";
+import { Settings } from "@api/settings";
-import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants.js";
-import { classes, LazyComponent } from "@utils/misc";
 import { Queue } from "@utils/Queue";
 import definePlugin, { OptionType } from "@utils/types";
-import { find, findByCode, findByPropsLazy } from "@webpack";
+import { filters, findByPropsLazy, waitFor } from "@webpack";
 import {
     Button,
     ChannelStore,
@@ -38,20 +36,41 @@ import {
 } from "@webpack/common";
 import { Channel, Guild, Message } from "discord-types/general";
 
-const messageCache = new Map<string, {
+let messageCache: { [id: string]: { message?: Message, fetched: boolean; }; } = {};
-    message?: Message;
-    fetched: boolean;
-}>();
 
-const Embed = LazyComponent(() => findByCode(".inlineMediaEmbed"));
+let AutomodEmbed: React.ComponentType<any>,
-const ChannelMessage = LazyComponent(() => find(m => m.type?.toString()?.includes('["message","compact","className",')));
+    Embed: React.ComponentType<any>,
+    ChannelMessage: React.ComponentType<any>,
+    Endpoints: Record<string, any>;
 
+waitFor(["mle_AutomodEmbed"], m => (AutomodEmbed = m.mle_AutomodEmbed));
+waitFor(filters.byCode(".inlineMediaEmbed"), m => Embed = m);
+waitFor(m => m.type?.toString()?.includes('["message","compact","className",'), m => ChannelMessage = m);
+waitFor(["MESSAGE_CREATE_ATTACHMENT_UPLOAD"], _ => Endpoints = _);
 const SearchResultClasses = findByPropsLazy("message", "searchResult");
 
-let AutoModEmbed: React.ComponentType<any> = () => null;
+const messageFetchQueue = new Queue();
+async function fetchMessage(channelID: string, messageID: string): Promise<Message | void> {
+    if (messageID in messageCache && !messageCache[messageID].fetched) return Promise.resolve();
+    if (messageCache[messageID]?.fetched) return Promise.resolve(messageCache[messageID].message);
 
-const messageLinkRegex = /(?<!<)https?:\/\/(?:\w+\.)?discord(?:app)?\.com\/channels\/(\d{17,20}|@me)\/(\d{17,20})\/(\d{17,20})/g;
+    messageCache[messageID] = { fetched: false };
-const tenorRegex = /https:\/\/(?:www.)?tenor\.com/;
+    const res = await RestAPI.get({
+        url: Endpoints.MESSAGES(channelID),
+        query: {
+            limit: 1,
+            around: messageID
+        },
+        retries: 2
+    }).catch(() => { });
+    const apiMessage = res.body?.[0];
+    const message: Message = MessageStore.getMessages(apiMessage.channel_id).receiveMessage(apiMessage).get(apiMessage.id);
+    messageCache[message.id] = {
+        message: message,
+        fetched: true
+    };
+    return Promise.resolve(message);
+}
 
 interface Attachment {
     height: number;
@@ -60,131 +79,64 @@ interface Attachment {
     proxyURL?: string;
 }
 
-interface MessageEmbedProps {
+const isTenorGif = /https:\/\/(?:www.)?tenor\.com/;
-    message: Message;
-    channel: Channel;
-    guildID: string;
-}
-
-const messageFetchQueue = new Queue();
-
-const settings = definePluginSettings({
-    messageBackgroundColor: {
-        description: "Background color for messages in rich embeds",
-        type: OptionType.BOOLEAN
-    },
-    automodEmbeds: {
-        description: "Use automod embeds instead of rich embeds (smaller but less info)",
-        type: OptionType.SELECT,
-        options: [
-            {
-                label: "Always use automod embeds",
-                value: "always"
-            },
-            {
-                label: "Prefer automod embeds, but use rich embeds if some content can't be shown",
-                value: "prefer"
-            },
-            {
-                label: "Never use automod embeds",
-                value: "never",
-                default: true
-            }
-        ]
-    },
-    clearMessageCache: {
-        type: OptionType.COMPONENT,
-        description: "Clear the linked message cache",
-        component: () =>
-            <Button onClick={() => messageCache.clear()}>
-                Clear the linked message cache
-            </Button>
-    }
-});
-
-
-async function fetchMessage(channelID: string, messageID: string) {
-    const cached = messageCache.get(messageID);
-    if (cached) return cached.message;
-
-    messageCache.set(messageID, { fetched: false });
-
-    const res = await RestAPI.get({
-        url: `/channels/${channelID}/messages`,
-        query: {
-            limit: 1,
-            around: messageID
-        },
-        retries: 2
-    }).catch(() => null);
-
-    const msg = res?.body?.[0];
-    if (!msg) return;
-
-    const message: Message = MessageStore.getMessages(msg.channel_id).receiveMessage(msg).get(msg.id);
-
-    messageCache.set(message.id, {
-        message,
-        fetched: true
-    });
-
-    return message;
-}
-
-
 function getImages(message: Message): Attachment[] {
     const attachments: Attachment[] = [];
-
+    message.attachments?.forEach(a => {
-    for (const { content_type, height, width, url, proxy_url } of message.attachments ?? []) {
+        if (a.content_type!.startsWith("image/")) attachments.push({
-        if (content_type?.startsWith("image/"))
+            height: a.height!,
+            width: a.width!,
+            url: a.url,
+            proxyURL: a.proxy_url!
+        });
+    });
+    message.embeds?.forEach(e => {
+        if (e.type === "image") attachments.push(
+            e.image ? { ...e.image } : { ...e.thumbnail! }
+        );
+        if (e.type === "gifv" && !isTenorGif.test(e.url!)) {
             attachments.push({
-                height: height!,
+                height: e.thumbnail!.height,
-                width: width!,
+                width: e.thumbnail!.width,
-                url: url,
+                url: e.url!
-                proxyURL: proxy_url!
             });
-    }
+        }
-
+    });
-    for (const { type, image, thumbnail, url } of message.embeds ?? []) {
-        if (type === "image")
-            attachments.push({ ...(image ?? thumbnail!) });
-        else if (url && type === "gifv" && !tenorRegex.test(url))
-            attachments.push({
-                height: thumbnail!.height,
-                width: thumbnail!.width,
-                url
-            });
-    }
-
     return attachments;
 }
 
-function noContent(attachments: number, embeds: number) {
+const noContent = (attachments: number, embeds: number): string => {
     if (!attachments && !embeds) return "";
     if (!attachments) return `[no content, ${embeds} embed${embeds !== 1 ? "s" : ""}]`;
     if (!embeds) return `[no content, ${attachments} attachment${attachments !== 1 ? "s" : ""}]`;
     return `[no content, ${attachments} attachment${attachments !== 1 ? "s" : ""} and ${embeds} embed${embeds !== 1 ? "s" : ""}]`;
-}
+};
 
 function requiresRichEmbed(message: Message) {
-    if (message.components.length) return true;
+    if (message.attachments.every(a => a.content_type?.startsWith("image/"))
-    if (message.attachments.some(a => !a.content_type?.startsWith("image/"))) return true;
+        && message.embeds.every(e => e.type === "image" || (e.type === "gifv" && !isTenorGif.test(e.url!)))
-    if (message.embeds.some(e => e.type !== "image" && (e.type !== "gifv" || tenorRegex.test(e.url!)))) return true;
+        && !message.components.length
-
+    ) return false;
-    return false;
+    return true;
 }
 
-function computeWidthAndHeight(width: number, height: number) {
+const computeWidthAndHeight = (width: number, height: number) => {
-    const maxWidth = 400;
+    const maxWidth = 400, maxHeight = 300;
-    const maxHeight = 300;
+    let newWidth: number, newHeight: number;
-
     if (width > height) {
-        const adjustedWidth = Math.min(width, maxWidth);
+        newWidth = Math.min(width, maxWidth);
-        return { width: adjustedWidth, height: Math.round(height / (width / adjustedWidth)) };
+        newHeight = Math.round(height / (width / newWidth));
+    } else {
+        newHeight = Math.min(height, maxHeight);
+        newWidth = Math.round(width / (height / newHeight));
     }
+    return { width: newWidth, height: newHeight };
+};
 
-    const adjustedHeight = Math.min(height, maxHeight);
+interface MessageEmbedProps {
-    return { width: Math.round(width / (height / adjustedHeight)), height: adjustedHeight };
+    message: Message;
+    channel: Channel;
+    guildID: string;
 }
 
 function withEmbeddedBy(message: Message, embeddedBy: string[]) {
@@ -197,172 +149,181 @@ function withEmbeddedBy(message: Message, embeddedBy: string[]) {
     });
 }
 
-
-function MessageEmbedAccessory({ message }: { message: Message; }) {
-    // @ts-ignore
-    const embeddedBy: string[] = message.vencordEmbeddedBy ?? [];
-
-    const accessories = [] as (JSX.Element | null)[];
-
-    let match = null as RegExpMatchArray | null;
-    while ((match = messageLinkRegex.exec(message.content!)) !== null) {
-        const [_, guildID, channelID, messageID] = match;
-        if (embeddedBy.includes(messageID)) {
-            continue;
-        }
-
-        const linkedChannel = ChannelStore.getChannel(channelID);
-        if (!linkedChannel || (guildID !== "@me" && !PermissionStore.can(1024n /* view channel */, linkedChannel))) {
-            continue;
-        }
-
-        let linkedMessage = messageCache.get(messageID)?.message;
-        if (!linkedMessage) {
-            linkedMessage ??= MessageStore.getMessage(channelID, messageID);
-            if (linkedMessage) {
-                messageCache.set(messageID, { message: linkedMessage, fetched: true });
-            } else {
-                const msg = { ...message } as any;
-                delete msg.embeds;
-                messageFetchQueue.push(() => fetchMessage(channelID, messageID)
-                    .then(m => m && FluxDispatcher.dispatch({
-                        type: "MESSAGE_UPDATE",
-                        message: msg
-                    }))
-                );
-                continue;
-            }
-        }
-
-        const messageProps: MessageEmbedProps = {
-            message: withEmbeddedBy(linkedMessage, [...embeddedBy, message.id]),
-            channel: linkedChannel,
-            guildID
-        };
-
-        const type = settings.store.automodEmbeds;
-        accessories.push(
-            type === "always" || (type === "prefer" && !requiresRichEmbed(linkedMessage))
-                ? <AutomodEmbedAccessory {...messageProps} />
-                : <ChannelMessageEmbedAccessory {...messageProps} />
-        );
-    }
-
-    return accessories.length ? <>{accessories}</> : null;
-}
-
-function ChannelMessageEmbedAccessory({ message, channel, guildID }: MessageEmbedProps): JSX.Element | null {
-    const isDM = guildID === "@me";
-
-    const guild = !isDM && GuildStore.getGuild(channel.guild_id);
-    const dmReceiver = UserStore.getUser(ChannelStore.getChannel(channel.id).recipients?.[0]);
-
-
-    return <Embed
-        embed={{
-            rawDescription: "",
-            color: "var(--background-secondary)",
-            author: {
-                name: <Text variant="text-xs/medium" tag="span">
-                    <span>{isDM ? "Direct Message - " : (guild as Guild).name + " - "}</span>
-                    {isDM
-                        ? Parser.parse(`<@${dmReceiver.id}>`)
-                        : Parser.parse(`<#${channel.id}>`)
-                    }
-                </Text>,
-                iconProxyURL: guild
-                    ? `https://${window.GLOBAL_ENV.CDN_HOST}/icons/${guild.id}/${guild.icon}.png`
-                    : `https://${window.GLOBAL_ENV.CDN_HOST}/avatars/${dmReceiver.id}/${dmReceiver.avatar}`
-            }
-        }}
-        renderDescription={() => (
-            <div key={message.id} className={classes(SearchResultClasses.message, settings.store.messageBackgroundColor && SearchResultClasses.searchResult)}>
-                <ChannelMessage
-                    id={`message-link-embeds-${message.id}`}
-                    message={message}
-                    channel={channel}
-                    subscribeToComponentDispatch={false}
-                />
-            </div>
-        )}
-    />;
-}
-
-function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
-    const { message, channel, guildID } = props;
-
-    const isDM = guildID === "@me";
-    const images = getImages(message);
-    const { parse } = Parser;
-
-    return <AutoModEmbed
-        channel={channel}
-        childrenAccessories={
-            <Text color="text-muted" variant="text-xs/medium" tag="span">
-                {isDM
-                    ? parse(`<@${ChannelStore.getChannel(channel.id).recipients[0]}>`)
-                    : parse(`<#${channel.id}>`)
-                }
-                <span>{isDM ? " - Direct Message" : " - " + GuildStore.getGuild(channel.guild_id)?.name}</span>
-            </Text>
-        }
-        compact={false}
-        content={
-            <>
-                {message.content || message.attachments.length <= images.length
-                    ? parse(message.content)
-                    : [noContent(message.attachments.length, message.embeds.length)]
-                }
-                {images.map(a => {
-                    const { width, height } = computeWidthAndHeight(a.width, a.height);
-                    return (
-                        <div>
-                            <img src={a.url} width={width} height={height} />
-                        </div>
-                    );
-                })}
-            </>
-        }
-        hideTimestamp={false}
-        message={message}
-        _messageEmbed="automod"
-    />;
-}
-
 export default definePlugin({
     name: "MessageLinkEmbeds",
     description: "Adds a preview to messages that link another message",
-    authors: [Devs.TheSun, Devs.Ven],
+    authors: [Devs.TheSun],
     dependencies: ["MessageAccessoriesAPI"],
     patches: [
         {
             find: ".embedCard",
             replacement: [{
-                match: /function (\i)\(\i\){var \i=\i\.message,\i=\i\.channel.{0,200}\.hideTimestamp/,
+                match: /{"use strict";(.{0,10})\(\)=>(.{1,2})}\);/,
-                replace: "$self.AutoModEmbed=$1;$&"
+                replace: '{"use strict";$1()=>$2,me:()=>messageEmbed});'
+            }, {
+                match: /function (.{1,2})\(.{1,2}\){var .{1,2}=.{1,2}\.message,.{1,2}=.{1,2}\.channel.{0,300}\.embedCard.{0,500}}\)}/,
+                replace: "$&;var messageEmbed={mle_AutomodEmbed:$1};"
             }]
         }
     ],
-
+    options: {
-    set AutoModEmbed(e: any) {
+        messageBackgroundColor: {
-        AutoModEmbed = e;
+            description: "Background color for messages in rich embeds",
+            type: OptionType.BOOLEAN
+        },
+        automodEmbeds: {
+            description: "Use automod embeds instead of rich embeds (smaller but less info)",
+            type: OptionType.SELECT,
+            options: [{
+                label: "Always use automod embeds",
+                value: "always"
+            }, {
+                label: "Prefer automod embeds, but use rich embeds if some content can't be shown",
+                value: "prefer"
+            }, {
+                label: "Never use automod embeds",
+                value: "never",
+                default: true
+            }]
+        },
+        clearMessageCache: {
+            type: OptionType.COMPONENT,
+            description: "Clear the linked message cache",
+            component: () =>
+                <Button onClick={() => messageCache = {}}>
+                    Clear the linked message cache
+                </Button>
+        }
     },
 
-    settings,
-
     start() {
-        addAccessory("messageLinkEmbed", props => {
+        addAccessory("messageLinkEmbed", props => this.messageEmbedAccessory(props), 4 /* just above rich embeds*/);
-            if (!messageLinkRegex.test(props.message.content))
+    },
-                return null;
 
-            // need to reset the regex because it's global
+    messageLinkRegex: /(?<!<)https?:\/\/(?:\w+\.)?discord(?:app)?\.com\/channels\/(\d{17,19}|@me)\/(\d{17,19})\/(\d{17,19})/g,
-            messageLinkRegex.lastIndex = 0;
 
-            return (
+    messageEmbedAccessory(props) {
-                <ErrorBoundary>
+        const { message }: { message: Message; } = props;
-                    <MessageEmbedAccessory message={props.message} />
+        // @ts-ignore
-                </ErrorBoundary>
+        const embeddedBy: string[] = message.vencordEmbeddedBy ?? [];
+
+        const accessories = [] as (JSX.Element | null)[];
+
+        let match = null as RegExpMatchArray | null;
+        while ((match = this.messageLinkRegex.exec(message.content!)) !== null) {
+            const [_, guildID, channelID, messageID] = match;
+            if (embeddedBy.includes(messageID)) {
+                continue;
+            }
+
+            const linkedChannel = ChannelStore.getChannel(channelID);
+            if (!linkedChannel || (guildID !== "@me" && !PermissionStore.can(1024n /* view channel */, linkedChannel))) {
+                continue;
+            }
+
+            let linkedMessage = messageCache[messageID]?.message;
+            if (!linkedMessage) {
+                linkedMessage ??= MessageStore.getMessage(channelID, messageID);
+                if (linkedMessage) messageCache[messageID] = { message: linkedMessage, fetched: true };
+                else {
+                    const msg = { ...message } as any;
+                    delete msg.embeds;
+                    messageFetchQueue.push(() => fetchMessage(channelID, messageID)
+                        .then(m => m && FluxDispatcher.dispatch({
+                            type: "MESSAGE_UPDATE",
+                            message: msg
+                        }))
+                    );
+                    continue;
+                }
+            }
+            const messageProps: MessageEmbedProps = {
+                message: withEmbeddedBy(linkedMessage, [...embeddedBy, message.id]),
+                channel: linkedChannel,
+                guildID
+            };
+
+            const type = Settings.plugins[this.name].automodEmbeds;
+            accessories.push(
+                type === "always" || (type === "prefer" && !requiresRichEmbed(linkedMessage))
+                    ? this.automodEmbedAccessory(messageProps)
+                    : this.channelMessageEmbedAccessory(messageProps)
             );
-        }, 4 /* just above rich embeds */);
+        }
+        return accessories;
+    },
+
+    channelMessageEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
+        const { message, channel, guildID } = props;
+
+        const isDM = guildID === "@me";
+        const guild = !isDM && GuildStore.getGuild(channel.guild_id);
+        const dmReceiver = UserStore.getUser(ChannelStore.getChannel(channel.id).recipients?.[0]);
+        const classNames = [SearchResultClasses.message];
+        if (Settings.plugins[this.name].messageBackgroundColor) classNames.push(SearchResultClasses.searchResult);
+
+        return <Embed
+            embed={{
+                rawDescription: "",
+                color: "var(--background-secondary)",
+                author: {
+                    name: <Text variant="text-xs/medium" tag="span">
+                        {[
+                            <span>{isDM ? "Direct Message - " : (guild as Guild).name + " - "}</span>,
+                            ...(isDM
+                                ? Parser.parse(`<@${dmReceiver.id}>`)
+                                : Parser.parse(`<#${channel.id}>`)
+                            )
+                        ]}
+                    </Text>,
+                    iconProxyURL: guild
+                        ? `https://${window.GLOBAL_ENV.CDN_HOST}/icons/${guild.id}/${guild.icon}.png`
+                        : `https://${window.GLOBAL_ENV.CDN_HOST}/avatars/${dmReceiver.id}/${dmReceiver.avatar}`
+                }
+            }}
+            renderDescription={() => {
+                return <div key={message.id} className={classNames.join(" ")}>
+                    <ChannelMessage
+                        id={`message-link-embeds-${message.id}`}
+                        message={message}
+                        channel={channel}
+                        subscribeToComponentDispatch={false}
+                    />
+                </div >;
+            }}
+        />;
+    },
+
+    automodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
+        const { message, channel, guildID } = props;
+
+        const isDM = guildID === "@me";
+        const images = getImages(message);
+        const { parse } = Parser;
+
+        return <AutomodEmbed
+            channel={channel}
+            childrenAccessories={<Text color="text-muted" variant="text-xs/medium" tag="span">
+                {[
+                    ...(isDM ? parse(`<@${ChannelStore.getChannel(channel.id).recipients[0]}>`) : parse(`<#${channel.id}>`)),
+                    <span>{isDM ? " - Direct Message" : " - " + GuildStore.getGuild(channel.guild_id)?.name}</span>
+                ]}
+            </Text>}
+            compact={false}
+            content={[
+                ...(message.content || !(message.attachments.length > images.length)
+                    ? parse(message.content)
+                    : [noContent(message.attachments.length, message.embeds.length)]
+                ),
+                ...(images.map<JSX.Element>(a => {
+                    const { width, height } = computeWidthAndHeight(a.width, a.height);
+                    return <div><img src={a.url} width={width} height={height} /></div>;
+                }
+                ))
+            ]}
+            hideTimestamp={false}
+            message={message}
+            _messageEmbed="automod"
+        />;
     },
 });

src/plugins/messageLogger/deleteStyleText.css

@@ -1,8 +1,3 @@
 .messagelogger-deleted div {
     color: #f04747;
 }
-
-.messagelogger-deleted a {
-    color: #be3535;
-    text-decoration: underline;
-}

src/plugins/messageLogger/index.tsx

@@ -18,21 +18,17 @@
 
 import "./messageLogger.css";
 
-import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
 import { Settings } from "@api/settings";
 import { disableStyle, enableStyle } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import Logger from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { moment, Parser, Timestamp, UserStore } from "@webpack/common";
-import { FluxDispatcher, i18n, Menu, moment, Parser, Timestamp, UserStore } from "@webpack/common";
 
 import overlayStyle from "./deleteStyleOverlay.css?managed";
 import textStyle from "./deleteStyleText.css?managed";
 
-const styles = findByPropsLazy("edited", "communicationDisabled", "isSystemMessage");
-
 function addDeleteStyle() {
     if (Settings.plugins.MessageLogger.deleteStyle === "text") {
         enableStyle(textStyle);
@@ -43,48 +39,20 @@ function addDeleteStyle() {
     }
 }
 
-const MENU_ITEM_ID = "message-logger-remove-history";
-const patchMessageContextMenu: NavContextMenuPatchCallback = (children, props) => {
-    const { message } = props;
-    const { deleted, editHistory, id, channel_id } = message;
-
-    if (!deleted && !editHistory?.length) return;
-    if (children.some(c => c?.props?.id === MENU_ITEM_ID)) return;
-
-    children.push((
-        <Menu.MenuItem
-            id={MENU_ITEM_ID}
-            key={MENU_ITEM_ID}
-            label="Remove Message History"
-            action={() => {
-                if (message.deleted) {
-                    FluxDispatcher.dispatch({
-                        type: "MESSAGE_DELETE",
-                        channelId: channel_id,
-                        id,
-                        mlDeleted: true
-                    });
-                } else {
-                    message.editHistory = [];
-                }
-            }}
-        />
-    ));
-};
-
 export default definePlugin({
     name: "MessageLogger",
     description: "Temporarily logs deleted and edited messages.",
     authors: [Devs.rushii, Devs.Ven],
-    dependencies: ["ContextMenuAPI"],
 
     start() {
         addDeleteStyle();
-        addContextMenuPatch("message", patchMessageContextMenu);
     },
 
     stop() {
-        removeContextMenuPatch("message", patchMessageContextMenu);
+        document.querySelectorAll(".messagelogger-deleted").forEach(e => e.remove());
+        document.querySelectorAll(".messagelogger-edited").forEach(e => e.remove());
+        document.body.classList.remove("messagelogger-red-overlay");
+        document.body.classList.remove("messagelogger-red-text");
     },
 
     renderEdit(edit: { timestamp: any, content: string; }) {
@@ -97,7 +65,7 @@ export default definePlugin({
                         isEdited={true}
                         isInline={false}
                     >
-                        <span className={styles.edited}>{" "}({i18n.Messages.MESSAGE_EDITED})</span>
+                        <span>{" "}(edited)</span>
                     </Timestamp>
                 </div>
             </ErrorBoundary>
@@ -134,7 +102,7 @@ export default definePlugin({
         }
     },
 
-    handleDelete(cache: any, data: { ids: string[], id: string; mlDeleted?: boolean; }, isBulk: boolean) {
+    handleDelete(cache: any, data: { ids: string[], id: string; }, isBulk: boolean) {
         try {
             if (cache == null || (!isBulk && !cache.has(data.id))) return cache;
 
@@ -146,8 +114,7 @@ export default definePlugin({
                 if (!msg) return;
 
                 const EPHEMERAL = 64;
-                const shouldIgnore = data.mlDeleted ||
+                const shouldIgnore = (msg.flags & EPHEMERAL) === EPHEMERAL ||
-                    (msg.flags & EPHEMERAL) === EPHEMERAL ||
                     ignoreBots && msg.author?.bot ||
                     ignoreSelf && msg.author?.id === myId;
 
@@ -203,17 +170,11 @@ export default definePlugin({
                     match: /(MESSAGE_UPDATE:function\((\w)\).+?)\.update\((\w)/,
                     replace: "$1" +
                         ".update($3,m =>" +
-                        "   (($2.message.flags & 64) === 64 || (Vencord.Settings.plugins.MessageLogger.ignoreBots && $2.message.author?.bot) || (Vencord.Settings.plugins.MessageLogger.ignoreSelf && $2.message.author?.id === Vencord.Webpack.Common.UserStore.getCurrentUser().id)) ? m :" +
                         "   $2.message.content !== m.editHistory?.[0]?.content && $2.message.content !== m.content ?" +
                         "       m.set('editHistory',[...(m.editHistory || []), $self.makeEdit($2.message, m)]) :" +
                         "       m" +
                         ")" +
                         ".update($3"
-                },
-                {
-                    // fix up key (edit last message) attempting to edit a deleted message
-                    match: /(?<=getLastEditableMessage=.{0,200}\.find\(\(function\((\i)\)\{)return/,
-                    replace: "return !$1.deleted &&"
                 }
             ]
         },
@@ -305,10 +266,15 @@ export default definePlugin({
             // Module 748241
             find: "Message must not be a thread starter message",
             replacement: [
+                {
+                    // Write message.deleted to deleted var
+                    match: /var (\w)=(\w).id,(?=\w=\w.message)/,
+                    replace: "var $1=$2.id,deleted=$2.message.deleted,"
+                },
                 {
                     // Append messagelogger-deleted to classNames if deleted
                     match: /\)\("li",\{(.+?),className:/,
-                    replace: ")(\"li\",{$1,className:(arguments[0].message.deleted ? \"messagelogger-deleted \" : \"\")+"
+                    replace: ")(\"li\",{$1,className:(deleted ? \"messagelogger-deleted \" : \"\")+"
                 }
             ]
         },

src/plugins/messageLogger/messageLogger.css

@@ -2,15 +2,13 @@
     display: none;
 }
 
-.messagelogger-deleted-attachment,
+.messagelogger-deleted-attachment {
-.messagelogger-deleted div iframe {
     filter: grayscale(1);
-    transition: 150ms filter ease-in-out;
 }
 
-.messagelogger-deleted-attachment:hover,
+.messagelogger-deleted-attachment:hover {
-.messagelogger-deleted div iframe:hover {
     filter: grayscale(0);
+    transition: 250ms filter linear;
 }
 
 .theme-dark .messagelogger-edited {

src/plugins/moreUserTags.ts

@@ -1,280 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { definePluginSettings } from "@api/settings";
-import { Devs } from "@utils/constants";
-import { proxyLazy } from "@utils/proxyLazy.js";
-import definePlugin, { OptionType } from "@utils/types";
-import { find, findByPropsLazy } from "@webpack";
-import { ChannelStore, GuildStore } from "@webpack/common";
-import { Channel, Message, User } from "discord-types/general";
-
-type PermissionName = "CREATE_INSTANT_INVITE" | "KICK_MEMBERS" | "BAN_MEMBERS" | "ADMINISTRATOR" | "MANAGE_CHANNELS" | "MANAGE_GUILD" | "CHANGE_NICKNAME" | "MANAGE_NICKNAMES" | "MANAGE_ROLES" | "MANAGE_WEBHOOKS" | "MANAGE_GUILD_EXPRESSIONS" | "CREATE_GUILD_EXPRESSIONS" | "VIEW_AUDIT_LOG" | "VIEW_CHANNEL" | "VIEW_GUILD_ANALYTICS" | "VIEW_CREATOR_MONETIZATION_ANALYTICS" | "MODERATE_MEMBERS" | "SEND_MESSAGES" | "SEND_TTS_MESSAGES" | "MANAGE_MESSAGES" | "EMBED_LINKS" | "ATTACH_FILES" | "READ_MESSAGE_HISTORY" | "MENTION_EVERYONE" | "USE_EXTERNAL_EMOJIS" | "ADD_REACTIONS" | "USE_APPLICATION_COMMANDS" | "MANAGE_THREADS" | "CREATE_PUBLIC_THREADS" | "CREATE_PRIVATE_THREADS" | "USE_EXTERNAL_STICKERS" | "SEND_MESSAGES_IN_THREADS" | "CONNECT" | "SPEAK" | "MUTE_MEMBERS" | "DEAFEN_MEMBERS" | "MOVE_MEMBERS" | "USE_VAD" | "PRIORITY_SPEAKER" | "STREAM" | "USE_EMBEDDED_ACTIVITIES" | "USE_SOUNDBOARD" | "USE_EXTERNAL_SOUNDS" | "REQUEST_TO_SPEAK" | "MANAGE_EVENTS" | "CREATE_EVENTS";
-
-interface Tag {
-    // name used for identifying, must be alphanumeric + underscores
-    name: string;
-    // name shown on the tag itself, can be anything probably; automatically uppercase'd
-    displayName: string;
-    description: string;
-    permissions?: PermissionName[];
-    condition?(message: Message | null, user: User, channel: Channel): boolean;
-}
-
-const CLYDE_ID = "1081004946872352958";
-
-// PermissionStore.computePermissions is not the same function and doesn't work here
-const PermissionUtil = findByPropsLazy("computePermissions", "canEveryoneRole") as {
-    computePermissions({ ...args }): bigint;
-};
-
-const Permissions = findByPropsLazy("SEND_MESSAGES", "VIEW_CREATOR_MONETIZATION_ANALYTICS") as Record<PermissionName, bigint>;
-const Tags = proxyLazy(() => find(m => m.Types?.[0] === "BOT").Types) as Record<string, number>;
-
-const isWebhook = (message: Message, user: User) => !!message?.webhookId && user.isNonUserBot();
-
-const tags: Tag[] = [
-    {
-        name: "WEBHOOK",
-        displayName: "Webhook",
-        description: "Messages sent by webhooks",
-        condition: isWebhook
-    }, {
-        name: "OWNER",
-        displayName: "Owner",
-        description: "Owns the server",
-        condition: (_, user, channel) => GuildStore.getGuild(channel?.guild_id)?.ownerId === user.id
-    }, {
-        name: "ADMINISTRATOR",
-        displayName: "Admin",
-        description: "Has the administrator permission",
-        permissions: ["ADMINISTRATOR"]
-    }, {
-        name: "MODERATOR_STAFF",
-        displayName: "Staff",
-        description: "Can manage the server, channels or roles",
-        permissions: ["MANAGE_GUILD", "MANAGE_CHANNELS", "MANAGE_ROLES"]
-    }, {
-        name: "MODERATOR",
-        displayName: "Mod",
-        description: "Can manage messages or kick/ban people",
-        permissions: ["MANAGE_MESSAGES", "KICK_MEMBERS", "BAN_MEMBERS"]
-    }, {
-        name: "VOICE_MODERATOR",
-        displayName: "VC Mod",
-        description: "Can manage voice chats",
-        permissions: ["MOVE_MEMBERS", "MUTE_MEMBERS", "DEAFEN_MEMBERS"]
-    }
-];
-
-const settings = definePluginSettings({
-    dontShowForBots: {
-        description: "Don't show tags (not including the webhook tag) for bots",
-        type: OptionType.BOOLEAN
-    },
-    dontShowBotTag: {
-        description: "Don't show [BOT] text for bots with other tags (verified bots will still have checkmark)",
-        type: OptionType.BOOLEAN
-    },
-    ...Object.fromEntries(tags.map(({ name, displayName, description }) => [
-        `visibility_${name}`, {
-            description: `Show ${displayName} tags (${description})`,
-            type: OptionType.SELECT,
-            options: [
-                {
-                    label: "Always",
-                    value: "always",
-                    default: true
-                }, {
-                    label: "Only in chat",
-                    value: "chat"
-                }, {
-                    label: "Only in member list and profiles",
-                    value: "not-chat"
-                }, {
-                    label: "Never",
-                    value: "never"
-                }
-            ]
-        }
-    ]))
-});
-
-export default definePlugin({
-    name: "MoreUserTags",
-    description: "Adds tags for webhooks and moderative roles (owner, admin, etc.)",
-    authors: [Devs.Cyn, Devs.TheSun],
-    settings,
-    patches: [
-        // add tags to the tag list
-        {
-            find: '.BOT=0]="BOT"',
-            replacement: [
-                // add tags to the exported tags list (the Tags variable here)
-                {
-                    match: /(\i)\[.\.BOT=0\]="BOT";/,
-                    replace: "$&$1=$self.addTagVariants($1);"
-                },
-                // make the tag show the right text
-                {
-                    match: /(switch\((\i)\){.+?)case (\i)\.BOT:default:(\i)=(\i\.\i\.Messages)\.BOT_TAG_BOT/,
-                    replace: (_, origSwitch, variant, tags, displayedText, strings) =>
-                        `${origSwitch}default:{${displayedText} = $self.getTagText(${tags}[${variant}], ${strings})}`
-                },
-                // show OP tags correctly
-                {
-                    match: /(\i)=(\i)===\i\.ORIGINAL_POSTER/,
-                    replace: "$1=$self.isOPTag($2)"
-                }
-            ],
-        },
-        // in messages
-        {
-            find: ".Types.ORIGINAL_POSTER",
-            replacement: {
-                match: /return null==(\i)\?null:\(0,/,
-                replace: "$1=$self.getTag({...arguments[0],origType:$1,location:'chat'});$&"
-            }
-        },
-        // in the member list
-        {
-            find: ".renderBot=function(){",
-            replacement: {
-                match: /this.props.user;return null!=(\i)&&.{0,10}\?(.{0,50})\.botTag/,
-                replace: "this.props.user;var type=$self.getTag({...this.props,origType:$1.bot?0:null,location:'not-chat'});\
-return type!==null?$2.botTag,type"
-            }
-        },
-        // pass channel id down props to be used in profiles
-        {
-            find: ".hasAvatarForGuild(null==",
-            replacement: {
-                match: /\.usernameSection,user/,
-                replace: ".usernameSection,moreTags_channelId:arguments[0].channelId,user"
-            }
-        },
-        {
-            find: 'copyMetaData:"User Tag"',
-            replacement: {
-                match: /discriminatorClass:(.{1,100}),botClass:/,
-                replace: "discriminatorClass:$1,moreTags_channelId:arguments[0].moreTags_channelId,botClass:"
-            }
-        },
-        // in profiles
-        {
-            find: ",botType:",
-            replacement: {
-                match: /,botType:(\i\((\i)\)),/g,
-                replace: ",botType:$self.getTag({user:$2,channelId:arguments[0].moreTags_channelId,origType:$1,location:'not-chat'}),"
-            }
-        },
-    ],
-
-    getPermissions(user: User, channel: Channel): string[] {
-        const guild = GuildStore.getGuild(channel?.guild_id);
-        if (!guild) return [];
-
-        const permissions = PermissionUtil.computePermissions({ user, context: guild, overwrites: channel.permissionOverwrites });
-        return Object.entries(Permissions)
-            .map(([perm, permInt]) =>
-                permissions & permInt ? perm : ""
-            )
-            .filter(Boolean);
-    },
-
-    addTagVariants(val: any /* i cant think of a good name */) {
-        let i = 100;
-        tags.forEach(({ name }) => {
-            val[name] = ++i;
-            val[i] = name;
-            val[`${name}-BOT`] = ++i;
-            val[i] = `${name}-BOT`;
-            val[`${name}-OP`] = ++i;
-            val[i] = `${name}-OP`;
-        });
-        return val;
-    },
-
-    isOPTag: (tag: number) => tag === Tags.ORIGINAL_POSTER || tags.some(t => tag === Tags[`${t.name}-OP`]),
-
-    getTagText(passedTagName: string, strings: Record<string, string>) {
-        if (!passedTagName) return "BOT";
-        const [tagName, variant] = passedTagName.split("-");
-        const tag = tags.find(({ name }) => tagName === name);
-        if (!tag) return "BOT";
-        if (variant === "BOT" && tagName !== "WEBHOOK" && this.settings.store.dontShowForBots) return strings.BOT_TAG_BOT;
-
-        switch (variant) {
-            case "OP":
-                return `${strings.BOT_TAG_FORUM_ORIGINAL_POSTER} • ${tag.displayName}`;
-            case "BOT":
-                return `${strings.BOT_TAG_BOT} • ${tag.displayName}`;
-            default:
-                return tag.displayName;
-        }
-    },
-
-    getTag({
-        message, user, channelId, origType, location, channel
-    }: {
-        message?: Message,
-        user: User,
-        channel?: Channel & { isForumPost(): boolean; },
-        channelId?: string;
-        origType?: number;
-        location: string;
-    }): number | null {
-        if (location === "chat" && user.id === "1")
-            return Tags.OFFICIAL;
-        if (user.id === CLYDE_ID)
-            return Tags.AI;
-
-        let type = typeof origType === "number" ? origType : null;
-
-        channel ??= ChannelStore.getChannel(channelId!) as any;
-        if (!channel) return type;
-
-        const settings = this.settings.store;
-        const perms = this.getPermissions(user, channel);
-
-        for (const tag of tags) {
-            switch (settings[`visibility_${tag.name}`]) {
-                case "always":
-                case location:
-                    break;
-                default:
-                    continue;
-            }
-
-            if (
-                tag.permissions?.some(perm => perms.includes(perm)) ||
-                (tag.condition?.(message!, user, channel))
-            ) {
-                if (channel.isForumPost() && channel.ownerId === user.id)
-                    type = Tags[`${tag.name}-OP`];
-                else if (user.bot && !isWebhook(message!, user) && !settings.dontShowBotTag)
-                    type = Tags[`${tag.name}-BOT`];
-                else
-                    type = Tags[tag.name];
-                break;
-            }
-        }
-
-        return type;
-    }
-});

src/plugins/moyai.ts

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { definePluginSettings } from "@api/settings";
+import { Settings } from "@api/settings";
 import { makeRange } from "@components/PluginSettings/components/SettingSliderComponent";
 import { Devs } from "@utils/constants";
 import { sleep } from "@utils/misc";
@@ -54,36 +54,15 @@ const MOYAI = "🗿";
 const MOYAI_URL =
     "https://raw.githubusercontent.com/MeguminSama/VencordPlugins/main/plugins/moyai/moyai.mp3";
 
-const settings = definePluginSettings({
-    volume: {
-        description: "Volume of the 🗿🗿🗿",
-        type: OptionType.SLIDER,
-        markers: makeRange(0, 1, 0.1),
-        default: 0.5,
-        stickToMarkers: false
-    },
-    triggerWhenUnfocused: {
-        description: "Trigger the 🗿 even when the window is unfocused",
-        type: OptionType.BOOLEAN,
-        default: true
-    },
-    ignoreBots: {
-        description: "Ignore bots",
-        type: OptionType.BOOLEAN,
-        default: true
-    }
-});
-
 export default definePlugin({
     name: "Moyai",
     authors: [Devs.Megu, Devs.Nuckyz],
     description: "🗿🗿🗿🗿🗿🗿🗿🗿",
-    settings,
 
     async onMessage(e: IMessageCreate) {
         if (e.optimistic || e.type !== "MESSAGE_CREATE") return;
         if (e.message.state === "SENDING") return;
-        if (settings.store.ignoreBots && e.message.author?.bot) return;
+        if (Settings.plugins.Moyai.ignoreBots && e.message.author?.bot) return;
         if (!e.message.content) return;
         if (e.channelId !== SelectedChannelStore.getChannelId()) return;
 
@@ -97,7 +76,7 @@ export default definePlugin({
 
     onReaction(e: IReactionAdd) {
         if (e.optimistic || e.type !== "MESSAGE_REACTION_ADD") return;
-        if (settings.store.ignoreBots && UserStore.getUser(e.userId)?.bot) return;
+        if (Settings.plugins.Moyai.ignoreBots && UserStore.getUser(e.userId)?.bot) return;
         if (e.channelId !== SelectedChannelStore.getChannelId()) return;
 
         const name = e.emoji.name.toLowerCase();
@@ -124,6 +103,28 @@ export default definePlugin({
         FluxDispatcher.unsubscribe("MESSAGE_CREATE", this.onMessage);
         FluxDispatcher.unsubscribe("MESSAGE_REACTION_ADD", this.onReaction);
         FluxDispatcher.unsubscribe("VOICE_CHANNEL_EFFECT_SEND", this.onVoiceChannelEffect);
+    },
+
+    options: {
+        volume: {
+            description: "Volume of the 🗿🗿🗿",
+            type: OptionType.SLIDER,
+            markers: makeRange(0, 1, 0.1),
+            default: 0.5,
+            stickToMarkers: false,
+        },
+        triggerWhenUnfocused: {
+            description: "Trigger the 🗿 even when the window is unfocused",
+            type: OptionType.BOOLEAN,
+            default: true,
+            restartNeeded: false,
+        },
+        ignoreBots: {
+            description: "Ignore bots",
+            type: OptionType.BOOLEAN,
+            default: true,
+            restartNeeded: false,
+        }
     }
 });
 
@@ -157,9 +158,9 @@ function getMoyaiCount(message: string) {
 }
 
 function boom() {
-    if (!settings.store.triggerWhenUnfocused && !document.hasFocus()) return;
+    if (!Settings.plugins.Moyai.triggerWhenUnfocused && !document.hasFocus()) return;
     const audioElement = document.createElement("audio");
     audioElement.src = MOYAI_URL;
-    audioElement.volume = settings.store.volume;
+    audioElement.volume = Settings.plugins.Moyai.volume;
     audioElement.play();
 }