Merge branch 'dev' into edit-users

BetterNotes: fix crashing
fix overriding avatars in guilds
2024-07-06 19:05:58 +02:00 · 2024-07-03 21:38:21 +02:00 · 2024-07-03 18:07:11 +02:00 · 2024-07-03 17:24:29 +02:00 · 2024-07-03 16:49:17 +02:00 · 2024-07-02 22:10:35 +02:00
260 changed files with 4064 additions and 5357 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -0,0 +1,98 @@
+{
+    "root": true,
+    "parser": "@typescript-eslint/parser",
+    "ignorePatterns": ["dist", "browser", "packages/vencord-types"],
+    "plugins": [
+        "@typescript-eslint",
+        "simple-header",
+        "simple-import-sort",
+        "unused-imports",
+        "path-alias"
+    ],
+    "settings": {
+        "import/resolver": {
+            "alias": {
+                "map": [
+                    ["@webpack", "./src/webpack"],
+                    ["@webpack/common", "./src/webpack/common"],
+                    ["@utils", "./src/utils"],
+                    ["@api", "./src/api"],
+                    ["@components", "./src/components"]
+                ]
+            }
+        }
+    },
+    "rules": {
+        // Since it's only been a month and Vencord has already been stolen
+        // by random skids who rebranded it to "AlphaCord" and erased all license
+        // information
+        "simple-header/header": [
+            "error",
+            {
+                "files": ["scripts/header-new.txt", "scripts/header-old.txt"],
+                "templates": { "author": [".*", "Vendicated and contributors"] }
+            }
+        ],
+        "quotes": ["error", "double", { "avoidEscape": true }],
+        "jsx-quotes": ["error", "prefer-double"],
+        "no-mixed-spaces-and-tabs": "error",
+        "indent": ["error", 4, { "SwitchCase": 1 }],
+        "arrow-parens": ["error", "as-needed"],
+        "eol-last": ["error", "always"],
+        "@typescript-eslint/func-call-spacing": ["error", "never"],
+        "no-multi-spaces": "error",
+        "no-trailing-spaces": "error",
+        "no-whitespace-before-property": "error",
+        "semi": ["error", "always"],
+        "semi-style": ["error", "last"],
+        "space-in-parens": ["error", "never"],
+        "block-spacing": ["error", "always"],
+        "object-curly-spacing": ["error", "always"],
+        "eqeqeq": ["error", "always", { "null": "ignore" }],
+        "spaced-comment": ["error", "always", { "markers": ["!"] }],
+        "yoda": "error",
+        "prefer-destructuring": ["error", {
+                "VariableDeclarator": { "array": false, "object": true },
+                "AssignmentExpression": { "array": false, "object": false }
+        }],
+        "operator-assignment": ["error", "always"],
+        "no-useless-computed-key": "error",
+        "no-unneeded-ternary": ["error", { "defaultAssignment": false }],
+        "no-invalid-regexp": "error",
+        "no-constant-condition": ["error", { "checkLoops": false }],
+        "no-duplicate-imports": "error",
+        "no-extra-semi": "error",
+        "dot-notation": "error",
+        "no-useless-escape": [
+            "error",
+            {
+                "extra": "i"
+            }
+        ],
+        "no-fallthrough": "error",
+        "for-direction": "error",
+        "no-async-promise-executor": "error",
+        "no-cond-assign": "error",
+        "no-dupe-else-if": "error",
+        "no-duplicate-case": "error",
+        "no-irregular-whitespace": "error",
+        "no-loss-of-precision": "error",
+        "no-misleading-character-class": "error",
+        "no-prototype-builtins": "error",
+        "no-regex-spaces": "error",
+        "no-shadow-restricted-names": "error",
+        "no-unexpected-multiline": "error",
+        "no-unsafe-optional-chaining": "error",
+        "no-useless-backreference": "error",
+        "use-isnan": "error",
+        "prefer-const": "error",
+        "prefer-spread": "error",
+
+        "simple-import-sort/imports": "error",
+        "simple-import-sort/exports": "error",
+
+        "unused-imports/no-unused-imports": "error",
+
+        "path-alias/no-relative": "error"
+    }
+}
--- a/.gitignore
+++ b/.gitignore
@ -18,5 +18,7 @@ lerna-debug.log*
 .pnpm-debug.log*
 *.tsbuildinfo

+src/userplugins
+
 ExtensionCache/
 settings/
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +0,0 @@
-[submodule "src/userplugins/vc-message-logger-enhanced"]
-	path = src/userplugins/vc-message-logger-enhanced
-	url = https://github.com/Syncxv/vc-message-logger-enhanced.git
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@ -1,6 +1,7 @@
 {
    "extends": "stylelint-config-standard",
    "rules": {
+        "indentation": 4,
        "selector-class-pattern": [
            "^[a-z][a-zA-Z0-9]*(-[a-z0-9][a-zA-Z0-9]*)*$",
            {
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -14,6 +14,8 @@
    "typescript.preferences.quoteStyle": "double",
    "javascript.preferences.quoteStyle": "double",

+    "eslint.experimental.useFlatConfig": false,
+
    "gitlens.remotes": [
        {
            "domain": "codeberg.org",
--- a/browser/userscript.meta.js
+++ b/browser/userscript.meta.js
@ -5,7 +5,6 @@
 // @author          Vendicated (https://github.com/Vendicated)
 // @namespace       https://github.com/Vendicated/Vencord
 // @supportURL      https://github.com/Vendicated/Vencord
-// @icon            https://raw.githubusercontent.com/Vendicated/Vencord/refs/heads/main/browser/icon.png
 // @license         GPL-3.0
 // @match           *://*.discord.com/*
 // @grant           GM_xmlhttpRequest
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@ -1,126 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-// @ts-check
-
-import stylistic from "@stylistic/eslint-plugin";
-import pathAlias from "eslint-plugin-path-alias";
-import header from "eslint-plugin-simple-header";
-import simpleImportSort from "eslint-plugin-simple-import-sort";
-import unusedImports from "eslint-plugin-unused-imports";
-import tseslint from "typescript-eslint";
-
-export default tseslint.config(
-    { ignores: ["dist", "browser", "packages/vencord-types"] },
-    {
-        files: ["src/**/*.{tsx,ts,mts,mjs,js,jsx}", "eslint.config.mjs"],
-        plugins: {
-            "simple-header": header,
-            "@stylistic": stylistic,
-            "@typescript-eslint": tseslint.plugin,
-            "simple-import-sort": simpleImportSort,
-            "unused-imports": unusedImports,
-            "path-alias": pathAlias,
-        },
-        settings: {
-            "import/resolver": {
-                map: [
-                    ["@webpack", "./src/webpack"],
-                    ["@webpack/common", "./src/webpack/common"],
-                    ["@utils", "./src/utils"],
-                    ["@api", "./src/api"],
-                    ["@components", "./src/components"]
-                ]
-            }
-        },
-        languageOptions: {
-            parser: tseslint.parser,
-            parserOptions: {
-                project: ["./tsconfig.json"],
-                tsconfigRootDir: import.meta.dirname
-            }
-        },
-        rules: {
-            /*
-             * Since it's only been a month and Vencord has already been stolen
-             * by random skids who rebranded it to "AlphaCord" and erased all license
-             * information
-             */
-            "simple-header/header": [
-                "error",
-                {
-                    "files": ["scripts/header-new.txt", "scripts/header-old.txt"],
-                    "templates": { "author": [".*", "Vendicated and contributors"] }
-                }
-            ],
-
-            // Style Rules
-            "@stylistic/jsx-quotes": ["error", "prefer-double"],
-            "@stylistic/quotes": ["error", "double", { "avoidEscape": true }],
-            "@stylistic/no-mixed-spaces-and-tabs": "error",
-            "@stylistic/arrow-parens": ["error", "as-needed"],
-            "@stylistic/eol-last": ["error", "always"],
-            "@stylistic/no-multi-spaces": "error",
-            "@stylistic/no-trailing-spaces": "error",
-            "@stylistic/no-whitespace-before-property": "error",
-            "@stylistic/semi": ["error", "always"],
-            "@stylistic/semi-style": ["error", "last"],
-            "@stylistic/space-in-parens": ["error", "never"],
-            "@stylistic/block-spacing": ["error", "always"],
-            "@stylistic/object-curly-spacing": ["error", "always"],
-            "@stylistic/spaced-comment": ["error", "always", { "markers": ["!"] }],
-            "@stylistic/no-extra-semi": "error",
-
-            // TS Rules
-            "@stylistic/func-call-spacing": ["error", "never"],
-
-            // ESLint Rules
-            "yoda": "error",
-            "eqeqeq": ["error", "always", { "null": "ignore" }],
-            "prefer-destructuring": ["error", {
-                "VariableDeclarator": { "array": false, "object": true },
-                "AssignmentExpression": { "array": false, "object": false }
-            }],
-            "operator-assignment": ["error", "always"],
-            "no-useless-computed-key": "error",
-            "no-unneeded-ternary": ["error", { "defaultAssignment": false }],
-            "no-invalid-regexp": "error",
-            "no-constant-condition": ["error", { "checkLoops": false }],
-            "no-duplicate-imports": "error",
-            "dot-notation": "error",
-            "no-useless-escape": [
-                "error",
-                {
-                    "extra": "i"
-                }
-            ],
-            "no-fallthrough": "error",
-            "for-direction": "error",
-            "no-async-promise-executor": "error",
-            "no-cond-assign": "error",
-            "no-dupe-else-if": "error",
-            "no-duplicate-case": "error",
-            "no-irregular-whitespace": "error",
-            "no-loss-of-precision": "error",
-            "no-misleading-character-class": "error",
-            "no-prototype-builtins": "error",
-            "no-regex-spaces": "error",
-            "no-shadow-restricted-names": "error",
-            "no-unexpected-multiline": "error",
-            "no-unsafe-optional-chaining": "error",
-            "no-useless-backreference": "error",
-            "use-isnan": "error",
-            "prefer-const": "error",
-            "prefer-spread": "error",
-
-            // Plugin Rules
-            "simple-import-sort/imports": "error",
-            "simple-import-sort/exports": "error",
-            "unused-imports/no-unused-imports": "error",
-            "path-alias/no-relative": "error"
-        }
-    }
-);
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
    "name": "vencord",
    "private": "true",
-    "version": "1.10.6",
+    "version": "1.9.4",
    "description": "The cutest Discord client mod",
    "homepage": "https://github.com/Vendicated/Vencord#readme",
    "bugs": {
@ -21,13 +21,12 @@
        "buildReporter": "pnpm buildWebStandalone --reporter --skip-extension",
        "buildReporterDesktop": "pnpm build --reporter",
        "watch": "pnpm build --watch",
-        "dev": "pnpm watch",
        "watchWeb": "pnpm buildWeb --watch",
        "generatePluginJson": "tsx scripts/generatePluginList.ts",
        "generateTypes": "tspc --emitDeclarationOnly --declaration --outDir packages/vencord-types",
        "inject": "node scripts/runInstaller.mjs",
        "uninject": "node scripts/runInstaller.mjs",
-        "lint": "eslint",
+        "lint": "eslint . --ext .js,.jsx,.ts,.tsx --ignore-pattern src/userplugins",
        "lint-styles": "stylelint \"src/**/*.css\" --ignore-pattern src/userplugins",
        "lint:fix": "pnpm lint --fix",
        "test": "pnpm buildStandalone && pnpm lint && pnpm lint-styles && pnpm testTsc && pnpm generatePluginJson",
@ -35,55 +34,53 @@
        "testTsc": "tsc --noEmit"
    },
    "dependencies": {
-        "@intrnl/xxhash64": "^0.1.2",
-        "@sapphi-red/web-noise-suppressor": "0.3.5",
+        "@sapphi-red/web-noise-suppressor": "0.3.3",
        "@vap/core": "0.0.12",
        "@vap/shiki": "0.10.5",
-        "fflate": "^0.8.2",
+        "eslint-plugin-simple-header": "^1.0.2",
+        "fflate": "^0.7.4",
        "gifenc": "github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3",
        "monaco-editor": "^0.50.0",
-        "nanoid": "^5.0.7",
+        "nanoid": "^4.0.2",
        "virtual-merge": "^1.0.1"
    },
    "devDependencies": {
-        "@stylistic/eslint-plugin": "^2.6.1",
-        "@types/chrome": "^0.0.269",
-        "@types/diff": "^5.2.1",
-        "@types/lodash": "^4.17.7",
-        "@types/node": "^22.0.3",
-        "@types/react": "^18.3.3",
-        "@types/react-dom": "^18.3.0",
-        "@types/yazl": "^2.4.5",
-        "diff": "^5.2.0",
+        "@types/chrome": "^0.0.246",
+        "@types/diff": "^5.0.3",
+        "@types/lodash": "^4.14.194",
+        "@types/node": "^18.16.3",
+        "@types/react": "^18.2.0",
+        "@types/react-dom": "^18.2.1",
+        "@types/yazl": "^2.4.2",
+        "@typescript-eslint/eslint-plugin": "^5.59.1",
+        "@typescript-eslint/parser": "^5.59.1",
+        "diff": "^5.1.0",
        "discord-types": "^1.3.26",
        "esbuild": "^0.15.18",
-        "eslint": "^9.8.0",
+        "eslint": "^8.46.0",
        "eslint-import-resolver-alias": "^1.1.2",
-        "eslint-plugin-path-alias": "2.1.0",
-        "eslint-plugin-simple-header": "^1.1.1",
-        "eslint-plugin-simple-import-sort": "^12.1.1",
-        "eslint-plugin-unused-imports": "^4.0.1",
-        "highlight.js": "10.7.3",
+        "eslint-plugin-path-alias": "^1.0.0",
+        "eslint-plugin-simple-import-sort": "^10.0.0",
+        "eslint-plugin-unused-imports": "^2.0.0",
+        "highlight.js": "10.6.0",
        "html-minifier-terser": "^7.2.0",
-        "moment": "^2.30.1",
-        "puppeteer-core": "^22.15.0",
+        "moment": "^2.29.4",
+        "puppeteer-core": "^19.11.1",
        "standalone-electron-types": "^1.0.0",
-        "stylelint": "^16.8.1",
-        "stylelint-config-standard": "^36.0.1",
-        "ts-patch": "^3.2.1",
-        "ts-pattern": "^5.3.1",
-        "tsx": "^4.16.5",
-        "type-fest": "^4.23.0",
-        "typescript": "^5.5.4",
-        "typescript-eslint": "^8.0.0",
+        "stylelint": "^15.6.0",
+        "stylelint-config-standard": "^33.0.0",
+        "ts-patch": "^3.1.2",
+        "tsx": "^3.12.7",
+        "type-fest": "^3.9.0",
+        "typescript": "^5.4.5",
        "typescript-transform-paths": "^3.4.7",
        "zip-local": "^0.3.5"
    },
    "packageManager": "pnpm@9.1.0",
    "pnpm": {
        "patchedDependencies": {
-            "eslint@9.8.0": "patches/eslint@9.8.0.patch",
-            "eslint-plugin-path-alias@2.1.0": "patches/eslint-plugin-path-alias@2.1.0.patch"
+            "eslint-plugin-path-alias@1.0.0": "patches/eslint-plugin-path-alias@1.0.0.patch",
+            "eslint@8.46.0": "patches/eslint@8.46.0.patch"
        },
        "peerDependencyRules": {
            "ignoreMissing": [
--- a/patches/eslint-plugin-path-alias@1.0.0.patch
+++ b/patches/eslint-plugin-path-alias@1.0.0.patch
@ -0,0 +1,13 @@
+diff --git a/lib/rules/no-relative.js b/lib/rules/no-relative.js
+index 71594c83f1f4f733ffcc6047d7f7084348335dbe..d8623d87c89499c442171db3272cba07c9efabbe 100644
+--- a/lib/rules/no-relative.js
+++ b/lib/rules/no-relative.js
+@@ -41,7 +41,7 @@ module.exports = {
+ 			ImportDeclaration(node) {
+ 				const importPath = node.source.value;
+ 
+-				if (!/^(\.?\.\/)/.test(importPath)) {
+				if (!/^(\.\.\/)/.test(importPath)) {
+ 					return;
+ 				}
+ 
--- a/patches/eslint-plugin-path-alias@2.1.0.patch
+++ b/patches/eslint-plugin-path-alias@2.1.0.patch
@ -1,14 +0,0 @@
-diff --git a/dist/index.js b/dist/index.js
-index 67de6fb139070fd0e49beca65e3b63c531202e16..aa2883c8126e4952a42872ee920f59547a066430 100644
--- a/dist/index.js
-+++ b/dist/index.js
-@@ -1 +1 @@
-var C=Object.create;var f=Object.defineProperty;var I=Object.getOwnPropertyDescriptor;var U=Object.getOwnPropertyNames;var S=Object.getPrototypeOf,F=Object.prototype.hasOwnProperty;var $=(e,t)=>{for(var r in t)f(e,r,{get:t[r],enumerable:!0})},y=(e,t,r,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of U(t))!F.call(e,s)&&s!==r&&f(e,s,{get:()=>t[s],enumerable:!(i=I(t,s))||i.enumerable});return e};var b=(e,t,r)=>(r=e!=null?C(S(e)):{},y(t||!e||!e.__esModule?f(r,"default",{value:e,enumerable:!0}):r,e)),D=e=>y(f({},"__esModule",{value:!0}),e);var N={};$(N,{default:()=>J});module.exports=D(N);var h="eslint-plugin-path-alias",v="2.0.0";var l=require("path"),M=b(require("nanomatch"));function j(e){return`https://github/com/msfragala/eslint-plugin-path-alias/blob/master/docs/rules/${e}.md`}var R=require("get-tsconfig"),a=require("path"),w=b(require("find-pkg")),O=require("fs");function P(e){if(e.options[0]?.paths)return z(e);let t=e.getFilename?.()??e.filename,r=(0,R.getTsconfig)(t);if(r?.config?.compilerOptions?.paths)return q(r);let i=w.default.sync((0,a.dirname)(t));if(!i)return;let s=JSON.parse((0,O.readFileSync)(i).toString());if(s?.imports)return L(s,i)}function L(e,t){let r=new Map,i=e.imports??{},s=(0,a.dirname)(t);return Object.entries(i).forEach(([o,n])=>{if(!n||typeof n!="string")return;let p=(0,a.resolve)(s,n);r.set(o,[p])}),r}function q(e){let t=new Map,r=e?.config?.compilerOptions?.paths??{},i=(0,a.dirname)(e.path);return e.config.compilerOptions?.baseUrl&&(i=(0,a.resolve)((0,a.dirname)(e.path),e.config.compilerOptions.baseUrl)),Object.entries(r).forEach(([s,o])=>{s=s.replace(/\/\*$/,""),o=o.map(n=>(0,a.resolve)(i,n.replace(/\/\*$/,""))),t.set(s,o)}),t}function z(e){let t=new Map,r=e.options[0]?.paths??{};return Object.entries(r).forEach(([i,s])=>{if(!s||typeof s!="string")return;if(s.startsWith("/")){t.set(i,[s]);return}let o=e.getCwd?.()??e.cwd,n=(0,a.resolve)(o,s);t.set(i,[n])}),t}var T={meta:{type:"suggestion",docs:{description:"Ensure imports use path aliases whenever possible vs. relative paths",url:j("no-relative")},fixable:"code",schema:[{type:"object",properties:{exceptions:{type:"array",items:{type:"string"}},paths:{type:"object"}},additionalProperties:!1}],messages:{shouldUseAlias:"Import should use path alias instead of relative path"}},create(e){let t=e.options[0]?.exceptions,r=e.getFilename?.()??e.filename,i=P(e);return i?.size?{ImportExpression(s){if(s.source.type!=="Literal"||typeof s.source.value!="string")return;let o=s.source.raw,n=s.source.value;if(!/^(\.?\.\/)/.test(n))return;let p=(0,l.resolve)((0,l.dirname)(r),n);if(A(p,t))return;let c=k(p,i);c&&e.report({node:s,messageId:"shouldUseAlias",data:{alias:c},fix(m){let g=E(p,c,i.get(c)),d=o.replace(n,g);return m.replaceText(s.source,d)}})},ImportDeclaration(s){if(typeof s.source.value!="string")return;let o=s.source.value;if(!/^(\.?\.\/)/.test(o))return;let n=(0,l.resolve)((0,l.dirname)(r),o),p=A(n,t),u=k(n,i);p||u&&e.report({node:s,messageId:"shouldUseAlias",data:{alias:u},fix(c){let m=s.source.raw,g=E(n,u,i.get(u)),d=m.replace(o,g);return c.replaceText(s.source,d)}})}}:{}}};function k(e,t){return Array.from(t.keys()).find(r=>t.get(r).some(s=>e.indexOf(s)===0))}function A(e,t){if(!t)return!1;let r=(0,l.basename)(e);return(0,M.default)(r,t).includes(r)}function E(e,t,r){for(let i of r)if(e.indexOf(i)===0)return e.replace(i,t)}var J={name:h,version:v,meta:{name:h,version:v},rules:{"no-relative":T}};
-+var C=Object.create;var f=Object.defineProperty;var I=Object.getOwnPropertyDescriptor;var U=Object.getOwnPropertyNames;var S=Object.getPrototypeOf,F=Object.prototype.hasOwnProperty;var $=(e,t)=>{for(var r in t)f(e,r,{get:t[r],enumerable:!0})},y=(e,t,r,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let s of U(t))!F.call(e,s)&&s!==r&&f(e,s,{get:()=>t[s],enumerable:!(i=I(t,s))||i.enumerable});return e};var b=(e,t,r)=>(r=e!=null?C(S(e)):{},y(t||!e||!e.__esModule?f(r,"default",{value:e,enumerable:!0}):r,e)),D=e=>y(f({},"__esModule",{value:!0}),e);var N={};$(N,{default:()=>J});module.exports=D(N);var h="eslint-plugin-path-alias",v="2.0.0";var l=require("path"),M=b(require("nanomatch"));function j(e){return`https://github/com/msfragala/eslint-plugin-path-alias/blob/master/docs/rules/${e}.md`}var R=require("get-tsconfig"),a=require("path"),w=b(require("find-pkg")),O=require("fs");function P(e){if(e.options[0]?.paths)return z(e);let t=e.getFilename?.()??e.filename,r=(0,R.getTsconfig)(t);if(r?.config?.compilerOptions?.paths)return q(r);let i=w.default.sync((0,a.dirname)(t));if(!i)return;let s=JSON.parse((0,O.readFileSync)(i).toString());if(s?.imports)return L(s,i)}function L(e,t){let r=new Map,i=e.imports??{},s=(0,a.dirname)(t);return Object.entries(i).forEach(([o,n])=>{if(!n||typeof n!="string")return;let p=(0,a.resolve)(s,n);r.set(o,[p])}),r}function q(e){let t=new Map,r=e?.config?.compilerOptions?.paths??{},i=(0,a.dirname)(e.path);return e.config.compilerOptions?.baseUrl&&(i=(0,a.resolve)((0,a.dirname)(e.path),e.config.compilerOptions.baseUrl)),Object.entries(r).forEach(([s,o])=>{s=s.replace(/\/\*$/,""),o=o.map(n=>(0,a.resolve)(i,n.replace(/\/\*$/,""))),t.set(s,o)}),t}function z(e){let t=new Map,r=e.options[0]?.paths??{};return Object.entries(r).forEach(([i,s])=>{if(!s||typeof s!="string")return;if(s.startsWith("/")){t.set(i,[s]);return}let o=e.getCwd?.()??e.cwd,n=(0,a.resolve)(o,s);t.set(i,[n])}),t}var T={meta:{type:"suggestion",docs:{description:"Ensure imports use path aliases whenever possible vs. relative paths",url:j("no-relative")},fixable:"code",schema:[{type:"object",properties:{exceptions:{type:"array",items:{type:"string"}},paths:{type:"object"}},additionalProperties:!1}],messages:{shouldUseAlias:"Import should use path alias instead of relative path"}},create(e){let t=e.options[0]?.exceptions,r=e.getFilename?.()??e.filename,i=P(e);return i?.size?{ImportExpression(s){if(s.source.type!=="Literal"||typeof s.source.value!="string")return;let o=s.source.raw,n=s.source.value;if(!/^(\.\.\/)/.test(n))return;let p=(0,l.resolve)((0,l.dirname)(r),n);if(A(p,t))return;let c=k(p,i);c&&e.report({node:s,messageId:"shouldUseAlias",data:{alias:c},fix(m){let g=E(p,c,i.get(c)),d=o.replace(n,g);return m.replaceText(s.source,d)}})},ImportDeclaration(s){if(typeof s.source.value!="string")return;let o=s.source.value;if(!/^(\.\.\/)/.test(o))return;let n=(0,l.resolve)((0,l.dirname)(r),o),p=A(n,t),u=k(n,i);p||u&&e.report({node:s,messageId:"shouldUseAlias",data:{alias:u},fix(c){let m=s.source.raw,g=E(n,u,i.get(u)),d=m.replace(o,g);return c.replaceText(s.source,d)}})}}:{}}};function k(e,t){return Array.from(t.keys()).find(r=>t.get(r).some(s=>e.indexOf(s)===0))}function A(e,t){if(!t)return!1;let r=(0,l.basename)(e);return(0,M.default)(r,t).includes(r)}function E(e,t,r){for(let i of r)if(e.indexOf(i)===0)return e.replace(i,t)}var J={name:h,version:v,meta:{name:h,version:v},rules:{"no-relative":T}};
-diff --git a/dist/index.mjs b/dist/index.mjs
-index 96de18e06d4cc413e11af038cd760e4804c32e59..27e8c4e3e2c942400cc3982e52159904ca6eedfa 100644
--- a/dist/index.mjs
-+++ b/dist/index.mjs
-@@ -1 +1 @@
-var d="eslint-plugin-path-alias",h="2.0.0";import{dirname as x,resolve as j,basename as I}from"path";import U from"nanomatch";function y(e){return`https://github/com/msfragala/eslint-plugin-path-alias/blob/master/docs/rules/${e}.md`}import{getTsconfig as k}from"get-tsconfig";import{resolve as c,dirname as u}from"path";import A from"find-pkg";import{readFileSync as E}from"fs";function b(e){if(e.options[0]?.paths)return C(e);let s=e.getFilename?.()??e.filename,i=k(s);if(i?.config?.compilerOptions?.paths)return T(i);let r=A.sync(u(s));if(!r)return;let t=JSON.parse(E(r).toString());if(t?.imports)return M(t,r)}function M(e,s){let i=new Map,r=e.imports??{},t=u(s);return Object.entries(r).forEach(([o,n])=>{if(!n||typeof n!="string")return;let a=c(t,n);i.set(o,[a])}),i}function T(e){let s=new Map,i=e?.config?.compilerOptions?.paths??{},r=u(e.path);return e.config.compilerOptions?.baseUrl&&(r=c(u(e.path),e.config.compilerOptions.baseUrl)),Object.entries(i).forEach(([t,o])=>{t=t.replace(/\/\*$/,""),o=o.map(n=>c(r,n.replace(/\/\*$/,""))),s.set(t,o)}),s}function C(e){let s=new Map,i=e.options[0]?.paths??{};return Object.entries(i).forEach(([r,t])=>{if(!t||typeof t!="string")return;if(t.startsWith("/")){s.set(r,[t]);return}let o=e.getCwd?.()??e.cwd,n=c(o,t);s.set(r,[n])}),s}var P={meta:{type:"suggestion",docs:{description:"Ensure imports use path aliases whenever possible vs. relative paths",url:y("no-relative")},fixable:"code",schema:[{type:"object",properties:{exceptions:{type:"array",items:{type:"string"}},paths:{type:"object"}},additionalProperties:!1}],messages:{shouldUseAlias:"Import should use path alias instead of relative path"}},create(e){let s=e.options[0]?.exceptions,i=e.getFilename?.()??e.filename,r=b(e);return r?.size?{ImportExpression(t){if(t.source.type!=="Literal"||typeof t.source.value!="string")return;let o=t.source.raw,n=t.source.value;if(!/^(\.?\.\/)/.test(n))return;let a=j(x(i),n);if(w(a,s))return;let l=R(a,r);l&&e.report({node:t,messageId:"shouldUseAlias",data:{alias:l},fix(f){let m=O(a,l,r.get(l)),g=o.replace(n,m);return f.replaceText(t.source,g)}})},ImportDeclaration(t){if(typeof t.source.value!="string")return;let o=t.source.value;if(!/^(\.?\.\/)/.test(o))return;let n=j(x(i),o),a=w(n,s),p=R(n,r);a||p&&e.report({node:t,messageId:"shouldUseAlias",data:{alias:p},fix(l){let f=t.source.raw,m=O(n,p,r.get(p)),g=f.replace(o,m);return l.replaceText(t.source,g)}})}}:{}}};function R(e,s){return Array.from(s.keys()).find(i=>s.get(i).some(t=>e.indexOf(t)===0))}function w(e,s){if(!s)return!1;let i=I(e);return U(i,s).includes(i)}function O(e,s,i){for(let r of i)if(e.indexOf(r)===0)return e.replace(r,s)}var Q={name:d,version:h,meta:{name:d,version:h},rules:{"no-relative":P}};export{Q as default};
-+var d="eslint-plugin-path-alias",h="2.0.0";import{dirname as x,resolve as j,basename as I}from"path";import U from"nanomatch";function y(e){return`https://github/com/msfragala/eslint-plugin-path-alias/blob/master/docs/rules/${e}.md`}import{getTsconfig as k}from"get-tsconfig";import{resolve as c,dirname as u}from"path";import A from"find-pkg";import{readFileSync as E}from"fs";function b(e){if(e.options[0]?.paths)return C(e);let s=e.getFilename?.()??e.filename,i=k(s);if(i?.config?.compilerOptions?.paths)return T(i);let r=A.sync(u(s));if(!r)return;let t=JSON.parse(E(r).toString());if(t?.imports)return M(t,r)}function M(e,s){let i=new Map,r=e.imports??{},t=u(s);return Object.entries(r).forEach(([o,n])=>{if(!n||typeof n!="string")return;let a=c(t,n);i.set(o,[a])}),i}function T(e){let s=new Map,i=e?.config?.compilerOptions?.paths??{},r=u(e.path);return e.config.compilerOptions?.baseUrl&&(r=c(u(e.path),e.config.compilerOptions.baseUrl)),Object.entries(i).forEach(([t,o])=>{t=t.replace(/\/\*$/,""),o=o.map(n=>c(r,n.replace(/\/\*$/,""))),s.set(t,o)}),s}function C(e){let s=new Map,i=e.options[0]?.paths??{};return Object.entries(i).forEach(([r,t])=>{if(!t||typeof t!="string")return;if(t.startsWith("/")){s.set(r,[t]);return}let o=e.getCwd?.()??e.cwd,n=c(o,t);s.set(r,[n])}),s}var P={meta:{type:"suggestion",docs:{description:"Ensure imports use path aliases whenever possible vs. relative paths",url:y("no-relative")},fixable:"code",schema:[{type:"object",properties:{exceptions:{type:"array",items:{type:"string"}},paths:{type:"object"}},additionalProperties:!1}],messages:{shouldUseAlias:"Import should use path alias instead of relative path"}},create(e){let s=e.options[0]?.exceptions,i=e.getFilename?.()??e.filename,r=b(e);return r?.size?{ImportExpression(t){if(t.source.type!=="Literal"||typeof t.source.value!="string")return;let o=t.source.raw,n=t.source.value;if(!/^(\.\.\/)/.test(n))return;let a=j(x(i),n);if(w(a,s))return;let l=R(a,r);l&&e.report({node:t,messageId:"shouldUseAlias",data:{alias:l},fix(f){let m=O(a,l,r.get(l)),g=o.replace(n,m);return f.replaceText(t.source,g)}})},ImportDeclaration(t){if(typeof t.source.value!="string")return;let o=t.source.value;if(!/^(\.\.\/)/.test(o))return;let n=j(x(i),o),a=w(n,s),p=R(n,r);a||p&&e.report({node:t,messageId:"shouldUseAlias",data:{alias:p},fix(l){let f=t.source.raw,m=O(n,p,r.get(p)),g=f.replace(o,m);return l.replaceText(t.source,g)}})}}:{}}};function R(e,s){return Array.from(s.keys()).find(i=>s.get(i).some(t=>e.indexOf(t)===0))}function w(e,s){if(!s)return!1;let i=I(e);return U(i,s).includes(i)}function O(e,s,i){for(let r of i)if(e.indexOf(r)===0)return e.replace(r,s)}var Q={name:d,version:h,meta:{name:d,version:h},rules:{"no-relative":P}};export{Q as default};
--- a/patches/eslint@8.46.0.patch
+++ b/patches/eslint@8.46.0.patch
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/scripts/build/build.mjs
+++ b/scripts/build/build.mjs
@ -21,7 +21,7 @@ import esbuild from "esbuild";
 import { readdir } from "fs/promises";
 import { join } from "path";

-import { BUILD_TIMESTAMP, commonOpts, exists, globPlugins, IS_DEV, IS_REPORTER, IS_STANDALONE, IS_UPDATER_DISABLED, resolvePluginName, VERSION, commonRendererPlugins, watch } from "./common.mjs";
+import { BUILD_TIMESTAMP, commonOpts, exists, globPlugins, IS_DEV, IS_REPORTER, IS_STANDALONE, IS_UPDATER_DISABLED, resolvePluginName, VERSION, watch } from "./common.mjs";

 const defines = {
    IS_STANDALONE,
@ -131,7 +131,7 @@ await Promise.all([
        sourcemap,
        plugins: [
            globPlugins("discordDesktop"),
-            ...commonRendererPlugins
+            ...commonOpts.plugins
        ],
        define: {
            ...defines,
@ -180,7 +180,7 @@ await Promise.all([
        sourcemap,
        plugins: [
            globPlugins("vencordDesktop"),
-            ...commonRendererPlugins
+            ...commonOpts.plugins
        ],
        define: {
            ...defines,
--- a/scripts/build/buildWeb.mjs
+++ b/scripts/build/buildWeb.mjs
@ -23,7 +23,7 @@ import { appendFile, mkdir, readdir, readFile, rm, writeFile } from "fs/promises
 import { join } from "path";
 import Zip from "zip-local";

-import { BUILD_TIMESTAMP, commonOpts, globPlugins, IS_DEV, IS_REPORTER, VERSION, commonRendererPlugins } from "./common.mjs";
+import { BUILD_TIMESTAMP, commonOpts, globPlugins, IS_DEV, IS_REPORTER, VERSION } from "./common.mjs";

 /**
 * @type {esbuild.BuildOptions}
@ -36,7 +36,7 @@ const commonOptions = {
    external: ["~plugins", "~git-hash", "/assets/*"],
    plugins: [
        globPlugins("web"),
-        ...commonRendererPlugins
+        ...commonOpts.plugins,
    ],
    target: ["esnext"],
    define: {
@ -116,12 +116,7 @@ await Promise.all(
            }
        })
    ]
-).catch(err => {
-    console.error("Build failed");
-    console.error(err.message);
-    if (!commonOpts.watch)
-        process.exit(1);
-});;
+);

 /**
 * @type {(dir: string) => Promise<string[]>}
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@ -28,7 +28,6 @@ import { join, relative } from "path";
 import { promisify } from "util";

 import { getPluginTarget } from "../utils.mjs";
-import { builtinModules } from "module";

 /** @type {import("../../package.json")} */
 const PackageJSON = JSON.parse(readFileSync("package.json"));
@ -293,18 +292,6 @@ export const stylePlugin = {
    }
 };

-/**
- * @type {(filter: RegExp, message: string) => import("esbuild").Plugin}
- */
-export const banImportPlugin = (filter, message) => ({
-    name: "ban-imports",
-    setup: build => {
-        build.onResolve({ filter }, () => {
-            return { errors: [{ text: message }] };
-        });
-    }
-});
-
 /**
 * @type {import("esbuild").BuildOptions}
 */
@ -324,16 +311,3 @@ export const commonOpts = {
    // Work around https://github.com/evanw/esbuild/issues/2460
    tsconfig: "./scripts/build/tsconfig.esbuild.json"
 };
-
-const escapedBuiltinModules = builtinModules
-    .map(m => m.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&"))
-    .join("|");
-const builtinModuleRegex = new RegExp(`^(node:)?(${escapedBuiltinModules})$`);
-
-export const commonRendererPlugins = [
-    banImportPlugin(builtinModuleRegex, "Cannot import node inbuilt modules in browser code. You need to use a native.ts file"),
-    banImportPlugin(/^react$/, "Cannot import from react. React and hooks should be imported from @webpack/common"),
-    banImportPlugin(/^electron(\/.*)?$/, "Cannot import electron in browser code. You need to use a native.ts file"),
-    banImportPlugin(/^ts-pattern$/, "Cannot import from ts-pattern. match and P should be imported from @webpack/common"),
-    ...commonOpts.plugins
-];
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@ -36,7 +36,7 @@ for (const variable of ["DISCORD_TOKEN", "CHROMIUM_BIN"]) {
 const CANARY = process.env.USE_CANARY === "true";

 const browser = await pup.launch({
-    headless: true,
+    headless: "new",
    executablePath: process.env.CHROMIUM_BIN
 });

--- a/setup-origins.sh
+++ b/setup-origins.sh
@ -1,2 +0,0 @@
-git remote add upstream https://github.com/Vendicated/Vencord.git
-git remote set-url --pull upstream DISABLED
--- a/src/api/Commands/index.ts
+++ b/src/api/Commands/index.ts
@ -16,7 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import { Logger } from "@utils/Logger";
 import { makeCodeblock } from "@utils/text";

 import { sendBotMessage } from "./commandHelpers";
@ -47,10 +46,10 @@ export let RequiredMessageOption: Option = ReqPlaceholder;
 export const _init = function (cmds: Command[]) {
    try {
        BUILT_IN = cmds;
-        OptionalMessageOption = cmds.find(c => (c.untranslatedName || c.displayName) === "shrug")!.options![0];
-        RequiredMessageOption = cmds.find(c => (c.untranslatedName || c.displayName) === "me")!.options![0];
+        OptionalMessageOption = cmds.find(c => c.name === "shrug")!.options![0];
+        RequiredMessageOption = cmds.find(c => c.name === "me")!.options![0];
    } catch (e) {
-        new Logger("CommandsAPI").error("Failed to load CommandsApi", e, " - cmds is", cmds);
+        console.error("Failed to load CommandsApi");
    }
    return cmds;
 } as never;
@ -139,8 +138,6 @@ export function registerCommand<C extends Command>(command: C, plugin: string) {
        throw new Error(`Command '${command.name}' already exists.`);

    command.isVencordCommand = true;
-    command.untranslatedName ??= command.name;
-    command.untranslatedDescription ??= command.description;
    command.id ??= `-${BUILT_IN.length + 1}`;
    command.applicationId ??= "-1"; // BUILT_IN;
    command.type ??= ApplicationCommandType.CHAT_INPUT;
--- a/src/api/Commands/types.ts
+++ b/src/api/Commands/types.ts
@ -93,10 +93,8 @@ export interface Command {
    isVencordCommand?: boolean;

    name: string;
-    untranslatedName?: string;
    displayName?: string;
    description: string;
-    untranslatedDescription?: string;
    displayDescription?: string;

    options?: Option[];
--- a/src/api/ContextMenu.ts
+++ b/src/api/ContextMenu.ts
@ -90,20 +90,19 @@ export function removeGlobalContextMenuPatch(patch: GlobalContextMenuPatchCallba
 * A helper function for finding the children array of a group nested inside a context menu based on the id(s) of its children
 * @param id The id of the child. If an array is specified, all ids will be tried
 * @param children The context menu children
- * @param matchSubstring Whether to check if the id is a substring of the child id
 */
-export function findGroupChildrenByChildId(id: string | string[], children: Array<ReactElement | null | undefined>, matchSubstring = false): Array<ReactElement | null | undefined> | null {
+export function findGroupChildrenByChildId(id: string | string[], children: Array<ReactElement | null>): Array<ReactElement | null> | null {
    for (const child of children) {
        if (child == null) continue;

        if (Array.isArray(child)) {
-            const found = findGroupChildrenByChildId(id, child, matchSubstring);
+            const found = findGroupChildrenByChildId(id, child);
            if (found !== null) return found;
        }

        if (
-            (Array.isArray(id) && id.some(id => matchSubstring ? child.props?.id?.includes(id) : child.props?.id === id))
-            || (matchSubstring ? child.props?.id?.includes(id) : child.props?.id === id)
+            (Array.isArray(id) && id.some(id => child.props?.id === id))
+            || child.props?.id === id
        ) return children;

        let nextChildren = child.props?.children;
@ -113,7 +112,7 @@ export function findGroupChildrenByChildId(id: string | string[], children: Arra
                child.props.children = nextChildren;
            }

-            const found = findGroupChildrenByChildId(id, nextChildren, matchSubstring);
+            const found = findGroupChildrenByChildId(id, nextChildren);
            if (found !== null) return found;
        }
    }
--- a/src/api/MessagePopover.tsx
+++ b/src/api/MessagePopover.tsx
@ -16,17 +16,16 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import ErrorBoundary from "@components/ErrorBoundary";
 import { Logger } from "@utils/Logger";
 import { Channel, Message } from "discord-types/general";
-import type { ComponentType, MouseEventHandler } from "react";
+import type { MouseEventHandler } from "react";

 const logger = new Logger("MessagePopover");

 export interface ButtonItem {
    key?: string,
    label: string,
-    icon: ComponentType<any>,
+    icon: React.ComponentType<any>,
    message: Message,
    channel: Channel,
    onClick?: MouseEventHandler<HTMLButtonElement>,
@ -49,26 +48,22 @@ export function removeButton(identifier: string) {
 }

 export function _buildPopoverElements(
-    Component: React.ComponentType<ButtonItem>,
-    message: Message
+    msg: Message,
+    makeButton: (item: ButtonItem) => React.ComponentType
 ) {
-    const items: React.ReactNode[] = [];
+    const items = [] as React.ComponentType[];

    for (const [identifier, getItem] of buttons.entries()) {
        try {
-            const item = getItem(message);
+            const item = getItem(msg);
            if (item) {
                item.key ??= identifier;
-                items.push(
-                    <ErrorBoundary noop>
-                        <Component {...item} />
-                    </ErrorBoundary>
-                );
+                items.push(makeButton(item));
            }
        } catch (err) {
            logger.error(`[${identifier}]`, err);
        }
    }

-    return <>{items}</>;
+    return items;
 }
--- a/src/api/Settings.ts
+++ b/src/api/Settings.ts
@ -230,10 +230,6 @@ export function definePluginSettings<
            if (!definedSettings.pluginName) throw new Error("Cannot access settings before plugin is initialized");
            return Settings.plugins[definedSettings.pluginName] as any;
        },
-        get plain() {
-            if (!definedSettings.pluginName) throw new Error("Cannot access settings before plugin is initialized");
-            return PlainSettings.plugins[definedSettings.pluginName] as any;
-        },
        use: settings => useSettings(
            settings?.map(name => `plugins.${definedSettings.pluginName}.${name}`) as UseSettings<Settings>[]
        ).plugins[definedSettings.pluginName] as any,
--- a/src/components/ExpandableHeader.css
+++ b/src/components/ExpandableHeader.css
@ -1,6 +1,7 @@
 .vc-expandableheader-center-flex {
    display: flex;
-    place-items: center;
+    justify-items: center;
+    align-items: center;
 }

 .vc-expandableheader-btn {
--- a/src/components/Icons.tsx
+++ b/src/components/Icons.tsx
@ -18,8 +18,9 @@

 import "./iconStyles.css";

-import { getIntlMessage, getTheme, Theme } from "@utils/discord";
+import { getTheme, Theme } from "@utils/discord";
 import { classes } from "@utils/misc";
+import { i18n } from "@webpack/common";
 import type { PropsWithChildren } from "react";

 interface BaseIconProps extends IconProps {
@ -64,7 +65,8 @@ export function LinkIcon({ height = 24, width = 24, className }: IconProps) {
 }

 /**
- * Discord's copy icon, as seen in the user panel popout on the right of the username and in large code blocks
+ * Discord's copy icon, as seen in the user popout right of the username when clicking
+ * your own username in the bottom left user panel
 */
 export function CopyIcon(props: IconProps) {
    return (
@ -74,9 +76,8 @@ export function CopyIcon(props: IconProps) {
            viewBox="0 0 24 24"
        >
            <g fill="currentColor">
-                <path d="M3 16a1 1 0 0 1-1-1v-5a8 8 0 0 1 8-8h5a1 1 0 0 1 1 1v.5a.5.5 0 0 1-.5.5H10a6 6 0 0 0-6 6v5.5a.5.5 0 0 1-.5.5H3Z" />
-                <path d="M6 18a4 4 0 0 0 4 4h8a4 4 0 0 0 4-4v-4h-3a5 5 0 0 1-5-5V6h-4a4 4 0 0 0-4 4v8Z" />
-                <path d="M21.73 12a3 3 0 0 0-.6-.88l-4.25-4.24a3 3 0 0 0-.88-.61V9a3 3 0 0 0 3 3h2.73Z" />
+                <path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1z" />
+                <path d="M15 5H8c-1.1 0-1.99.9-1.99 2L6 21c0 1.1.89 2 1.99 2H19c1.1 0 2-.9 2-2V11l-6-6zM8 21V7h6v5h5v9H8z" />
            </g>
        </Icon>
    );
@ -132,7 +133,7 @@ export function InfoIcon(props: IconProps) {
 export function OwnerCrownIcon(props: IconProps) {
    return (
        <Icon
-            aria-label={getIntlMessage("GUILD_OWNER")}
+            aria-label={i18n.Messages.GUILD_OWNER}
            {...props}
            className={classes(props.className, "vc-owner-crown-icon")}
            role="img"
--- a/src/components/PluginSettings/components/SettingNumericComponent.tsx
+++ b/src/components/PluginSettings/components/SettingNumericComponent.tsx
@ -16,8 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import { Margins } from "@utils/margins";
-import { wordsFromCamel, wordsToTitle } from "@utils/text";
 import { OptionType, PluginOptionNumber } from "@utils/types";
 import { Forms, React, TextInput } from "@webpack/common";

@ -56,8 +54,7 @@ export function SettingNumericComponent({ option, pluginSettings, definedSetting

    return (
        <Forms.FormSection>
-            <Forms.FormTitle>{wordsToTitle(wordsFromCamel(id))}</Forms.FormTitle>
-            <Forms.FormText className={Margins.bottom20} type="description">{option.description}</Forms.FormText>
+            <Forms.FormTitle>{option.description}</Forms.FormTitle>
            <TextInput
                type="number"
                pattern="-?[0-9]+"
--- a/src/components/PluginSettings/components/SettingSelectComponent.tsx
+++ b/src/components/PluginSettings/components/SettingSelectComponent.tsx
@ -16,8 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import { Margins } from "@utils/margins";
-import { wordsFromCamel, wordsToTitle } from "@utils/text";
 import { PluginOptionSelect } from "@utils/types";
 import { Forms, React, Select } from "@webpack/common";

@ -46,8 +44,7 @@ export function SettingSelectComponent({ option, pluginSettings, definedSettings

    return (
        <Forms.FormSection>
-            <Forms.FormTitle>{wordsToTitle(wordsFromCamel(id))}</Forms.FormTitle>
-            <Forms.FormText className={Margins.bottom16} type="description">{option.description}</Forms.FormText>
+            <Forms.FormTitle>{option.description}</Forms.FormTitle>
            <Select
                isDisabled={option.disabled?.call(definedSettings) ?? false}
                options={option.options}
--- a/src/components/PluginSettings/components/SettingSliderComponent.tsx
+++ b/src/components/PluginSettings/components/SettingSliderComponent.tsx
@ -16,8 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import { Margins } from "@utils/margins";
-import { wordsFromCamel, wordsToTitle } from "@utils/text";
 import { PluginOptionSlider } from "@utils/types";
 import { Forms, React, Slider } from "@webpack/common";

@ -52,8 +50,7 @@ export function SettingSliderComponent({ option, pluginSettings, definedSettings

    return (
        <Forms.FormSection>
-            <Forms.FormTitle>{wordsToTitle(wordsFromCamel(id))}</Forms.FormTitle>
-            <Forms.FormText className={Margins.bottom20} type="description">{option.description}</Forms.FormText>
+            <Forms.FormTitle>{option.description}</Forms.FormTitle>
            <Slider
                disabled={option.disabled?.call(definedSettings) ?? false}
                markers={option.markers}
--- a/src/components/PluginSettings/components/SettingTextComponent.tsx
+++ b/src/components/PluginSettings/components/SettingTextComponent.tsx
@ -16,8 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import { Margins } from "@utils/margins";
-import { wordsFromCamel, wordsToTitle } from "@utils/text";
 import { PluginOptionString } from "@utils/types";
 import { Forms, React, TextInput } from "@webpack/common";

@ -43,8 +41,7 @@ export function SettingTextComponent({ option, pluginSettings, definedSettings,

    return (
        <Forms.FormSection>
-            <Forms.FormTitle>{wordsToTitle(wordsFromCamel(id))}</Forms.FormTitle>
-            <Forms.FormText className={Margins.bottom20} type="description">{option.description}</Forms.FormText>
+            <Forms.FormTitle>{option.description}</Forms.FormTitle>
            <TextInput
                type="text"
                value={state}
--- a/src/components/PluginSettings/index.tsx
+++ b/src/components/PluginSettings/index.tsx
@ -93,7 +93,7 @@ interface PluginCardProps extends React.HTMLProps<HTMLDivElement> {
 export function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, onMouseLeave, isNew }: PluginCardProps) {
    const settings = Settings.plugins[plugin.name];

-    const isEnabled = () => Vencord.Plugins.isPluginEnabled(plugin.name);
+    const isEnabled = () => settings.enabled ?? false;

    function toggleEnabled() {
        const wasEnabled = isEnabled();
@ -292,10 +292,10 @@ export default function PluginSettings() {

        if (!pluginFilter(p)) continue;

-        const isRequired = p.required || p.isDependency || depMap[p.name]?.some(d => settings.plugins[d].enabled);
+        const isRequired = p.required || depMap[p.name]?.some(d => settings.plugins[d].enabled);

        if (isRequired) {
-            const tooltipText = p.required || !depMap[p.name]
+            const tooltipText = p.required
                ? "This plugin is required for Vencord to function."
                : makeDependencyList(depMap[p.name]?.filter(d => settings.plugins[d].enabled));

--- a/src/components/VencordSettings/PatchHelperTab.tsx
+++ b/src/components/VencordSettings/PatchHelperTab.tsx
@ -382,7 +382,6 @@ function PatchHelper() {
                    <Forms.FormTitle className={Margins.top20}>Code</Forms.FormTitle>
                    <CodeBlock lang="js" content={code} />
                    <Button onClick={() => Clipboard.copy(code)}>Copy to Clipboard</Button>
-                    <Button className={Margins.top8} onClick={() => Clipboard.copy("```ts\n" + code + "\n```")}>Copy as Codeblock</Button>
                </>
            )}
        </SettingsTab>
--- a/src/components/VencordSettings/ThemesTab.tsx
+++ b/src/components/VencordSettings/ThemesTab.tsx
@ -25,9 +25,10 @@ import { openPluginModal } from "@components/PluginSettings/PluginModal";
 import type { UserThemeHeader } from "@main/themes";
 import { openInviteModal } from "@utils/discord";
 import { Margins } from "@utils/margins";
+import { classes } from "@utils/misc";
 import { showItemInFolder } from "@utils/native";
 import { useAwaiter } from "@utils/react";
-import { findLazy } from "@webpack";
+import { findByPropsLazy, findLazy } from "@webpack";
 import { Card, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
 import type { ComponentType, Ref, SyntheticEvent } from "react";

@ -44,7 +45,9 @@ type FileInput = ComponentType<{
    filters?: { name?: string; extensions: string[]; }[];
 }>;

+const InviteActions = findByPropsLazy("resolveInvite");
 const FileInput: FileInput = findLazy(m => m.prototype?.activateUploadDialogue && m.prototype.setRef);
+const TextAreaProps = findLazy(m => typeof m.textarea === "string");

 const cl = classNameFactory("vc-settings-theme-");

@ -77,16 +80,8 @@ function Validators({ themeLinks }: { themeLinks: string[]; }) {
            <Forms.FormTitle className={Margins.top20} tag="h5">Validator</Forms.FormTitle>
            <Forms.FormText>This section will tell you whether your themes can successfully be loaded</Forms.FormText>
            <div>
-                {themeLinks.map(rawLink => {
-                    const { label, link } = (() => {
-                        const match = /^@(light|dark) (.*)/.exec(rawLink);
-                        if (!match) return { label: rawLink, link: rawLink };
-
-                        const [, mode, link] = match;
-                        return { label: `[${mode} mode only] ${link}`, link };
-                    })();
-
-                    return <Card style={{
+                {themeLinks.map(link => (
+                    <Card style={{
                        padding: ".5em",
                        marginBottom: ".5em",
                        marginTop: ".5em"
@ -94,11 +89,11 @@ function Validators({ themeLinks }: { themeLinks: string[]; }) {
                        <Forms.FormTitle tag="h5" style={{
                            overflowWrap: "break-word"
                        }}>
-                            {label}
+                            {link}
                        </Forms.FormTitle>
                        <Validator link={link} />
-                    </Card>;
-                })}
+                    </Card>
+                ))}
            </div>
        </>
    );
@ -304,7 +299,6 @@ function ThemesTab() {
                <Card className="vc-settings-card vc-text-selectable">
                    <Forms.FormTitle tag="h5">Paste links to css files here</Forms.FormTitle>
                    <Forms.FormText>One link per line</Forms.FormText>
-                    <Forms.FormText>You can prefix lines with @light or @dark to toggle them based on your Discord theme</Forms.FormText>
                    <Forms.FormText>Make sure to use direct links to files (raw or github.io)!</Forms.FormText>
                </Card>

@ -312,7 +306,7 @@ function ThemesTab() {
                    <TextArea
                        value={themeText}
                        onChange={setThemeText}
-                        className={"vc-settings-theme-links"}
+                        className={classes(TextAreaProps.textarea, "vc-settings-theme-links")}
                        placeholder="Theme Links"
                        spellCheck={false}
                        onBlur={onBlur}
--- a/src/components/VencordSettings/settingsStyles.css
+++ b/src/components/VencordSettings/settingsStyles.css
@ -33,20 +33,6 @@
    padding: 0.5em;
    border: 1px solid var(--background-modifier-accent);
    max-height: unset;
-    background-color: transparent;
-    box-sizing: border-box;
-    font-size: 12px;
-    line-height: 14px;
-    resize: none;
-    width: 100%;
-}
-
-.vc-settings-theme-links::placeholder {
-    color: var(--header-secondary);
-}
-
-.vc-settings-theme-links:focus {
-    background-color: var(--background-tertiary);
 }

 .vc-cloud-settings-sync-grid {
--- a/src/debug/loadLazyChunks.ts
+++ b/src/debug/loadLazyChunks.ts
@ -15,9 +15,9 @@ export async function loadLazyChunks() {
    try {
        LazyChunkLoaderLogger.log("Loading all chunks...");

-        const validChunks = new Set<number>();
-        const invalidChunks = new Set<number>();
-        const deferredRequires = new Set<number>();
+        const validChunks = new Set<string>();
+        const invalidChunks = new Set<string>();
+        const deferredRequires = new Set<string>();

        let chunksSearchingResolve: (value: void | PromiseLike<void>) => void;
        const chunksSearchingDone = new Promise<void>(r => chunksSearchingResolve = r);
@ -29,12 +29,14 @@ export async function loadLazyChunks() {

        async function searchAndLoadLazyChunks(factoryCode: string) {
            const lazyChunks = factoryCode.matchAll(LazyChunkRegex);
-            const validChunkGroups = new Set<[chunkIds: number[], entryPoint: number]>();
+            const validChunkGroups = new Set<[chunkIds: string[], entryPoint: string]>();

-            const shouldForceDefer = false;
+            // Workaround for a chunk that depends on the ChannelMessage component but may be be force loaded before
+            // the chunk containing the component
+            const shouldForceDefer = factoryCode.includes(".Messages.GUILD_FEED_UNFEATURE_BUTTON_TEXT");

            await Promise.all(Array.from(lazyChunks).map(async ([, rawChunkIds, entryPoint]) => {
-                const chunkIds = rawChunkIds ? Array.from(rawChunkIds.matchAll(Webpack.ChunkIdsRegex)).map(m => Number(m[1])) : [];
+                const chunkIds = rawChunkIds ? Array.from(rawChunkIds.matchAll(Webpack.ChunkIdsRegex)).map(m => m[1]) : [];

                if (chunkIds.length === 0) {
                    return;
@ -59,7 +61,7 @@ export async function loadLazyChunks() {
                }

                if (!invalidChunkGroup) {
-                    validChunkGroups.add([chunkIds, Number(entryPoint)]);
+                    validChunkGroups.add([chunkIds, entryPoint]);
                }
            }));

@ -129,14 +131,14 @@ export async function loadLazyChunks() {
        }

        // All chunks Discord has mapped to asset files, even if they are not used anymore
-        const allChunks = [] as number[];
+        const allChunks = [] as string[];

        // Matches "id" or id:
-        for (const currentMatch of wreq!.u.toString().matchAll(/(?:"([\deE]+?)"(?![,}]))|(?:([\deE]+?):)/g)) {
+        for (const currentMatch of wreq!.u.toString().matchAll(/(?:"(\d+?)")|(?:(\d+?):)/g)) {
            const id = currentMatch[1] ?? currentMatch[2];
            if (id == null) continue;

-            allChunks.push(Number(id));
+            allChunks.push(id);
        }

        if (allChunks.length === 0) throw new Error("Failed to get all chunks");
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@ -17,7 +17,7 @@
 */

 import { onceDefined } from "@shared/onceDefined";
-import electron, { app, BrowserWindowConstructorOptions, Menu, nativeTheme } from "electron";
+import electron, { app, BrowserWindowConstructorOptions, Menu } from "electron";
 import { dirname, join } from "path";

 import { initIpc } from "./ipcMain";
@ -100,19 +100,6 @@ if (!IS_VANILLA) {

                super(options);
                initIpc(this);
-
-                // Workaround for https://github.com/electron/electron/issues/43367. Vesktop also has its own workaround
-                // @TODO: Remove this when the issue is fixed
-                if (IS_DISCORD_DESKTOP) {
-                    this.webContents.on("devtools-opened", () => {
-                        if (!nativeTheme.shouldUseDarkColors) return;
-
-                        nativeTheme.themeSource = "light";
-                        setTimeout(() => {
-                            nativeTheme.themeSource = "dark";
-                        }, 100);
-                    });
-                }
            } else super(options);
        }
    }
--- a/src/main/updater/http.ts
+++ b/src/main/updater/http.ts
@ -16,7 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import { get } from "@main/utils/simpleGet";
 import { IpcEvents } from "@shared/IpcEvents";
 import { VENCORD_USER_AGENT } from "@shared/vencordUserAgent";
 import { ipcMain } from "electron";
@ -26,6 +25,7 @@ import { join } from "path";
 import gitHash from "~git-hash";
 import gitRemote from "~git-remote";

+import { get } from "../utils/simpleGet";
 import { serializeErrors, VENCORD_FILES } from "./common";

 const API_BASE = `https://api.github.com/repos/${gitRemote}`;
--- a/src/main/utils/constants.ts
+++ b/src/main/utils/constants.ts
@ -35,8 +35,7 @@ export const ALLOWED_PROTOCOLS = [
    "steam:",
    "spotify:",
    "com.epicgames.launcher:",
-    "tidal:",
-    "itunes:",
+    "tidal:"
 ];

 export const IS_VANILLA = /* @__PURE__ */ process.argv.includes("--vanilla");
--- a/src/modules.d.ts
+++ b/src/modules.d.ts
@ -16,6 +16,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

+// eslint-disable-next-line spaced-comment
 /// <reference types="standalone-electron-types"/>

 declare module "~plugins" {
--- a/src/plugins/_api/badges/fixBadgeOverflow.css
+++ b/src/plugins/_api/badges/fixBadgeOverflow.css
@ -0,0 +1,3 @@
+[class*="profileBadges"] {
+    flex: none;
+}
--- a/src/plugins/_api/badges/index.tsx
+++ b/src/plugins/_api/badges/index.tsx
@ -16,6 +16,8 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

+import "./fixBadgeOverflow.css";
+
 import { _getBadges, BadgePosition, BadgeUserArgs, ProfileBadge } from "@api/Badges";
 import DonateButton from "@components/DonateButton";
 import ErrorBoundary from "@components/ErrorBoundary";
@ -60,8 +62,36 @@ export default definePlugin({
    authors: [Devs.Megu, Devs.Ven, Devs.TheSun],
    required: true,
    patches: [
+        /* Patch the badge list component on user profiles */
        {
-            find: ".FULL_SIZE]:26",
+            find: 'id:"premium",',
+            replacement: [
+                {
+                    match: /&&(\i)\.push\(\{id:"premium".+?\}\);/,
+                    replace: "$&$1.unshift(...$self.getBadges(arguments[0]));",
+                },
+                {
+                    // alt: "", aria-hidden: false, src: originalSrc
+                    match: /alt:" ","aria-hidden":!0,src:(?=(\i)\.src)/,
+                    // ...badge.props, ..., src: badge.image ?? ...
+                    replace: "...$1.props,$& $1.image??"
+                },
+                // replace their component with ours if applicable
+                {
+                    match: /(?<=text:(\i)\.description,spacing:12,.{0,50})children:/,
+                    replace: "children:$1.component ? () => $self.renderBadgeComponent($1) :"
+                },
+                // conditionally override their onClick with badge.onClick if it exists
+                {
+                    match: /href:(\i)\.link/,
+                    replace: "...($1.onClick && { onClick: vcE => $1.onClick(vcE, $1) }),$&"
+                }
+            ]
+        },
+
+        /* new profiles */
+        {
+            find: ".PANEL]:14",
            replacement: {
                match: /(?<=(\i)=\(0,\i\.\i\)\(\i\);)return 0===\i.length\?/,
                replace: "$1.unshift(...$self.getBadges(arguments[0].displayProfile));$&"
@ -77,7 +107,7 @@ export default definePlugin({
                    replace: "...$1.props,$& $1.image??"
                },
                {
-                    match: /(?<=text:(\i)\.description,.{0,200})children:/,
+                    match: /(?<=text:(\i)\.description,.{0,50})children:/,
                    replace: "children:$1.component ? $self.renderBadgeComponent({ ...$1 }) :"
                },
                // conditionally override their onClick with badge.onClick if it exists
--- a/src/plugins/_api/dynamicImageModalApi.ts
+++ b/src/plugins/_api/dynamicImageModalApi.ts
@ -1,24 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-
-
-export default definePlugin({
-    name: "DynamicImageModalAPI",
-    authors: [Devs.sadan, Devs.Nuckyz],
-    description: "Allows you to omit either width or height when opening an image modal",
-    patches: [
-        {
-            find: "SCALE_DOWN:",
-            replacement: {
-                match: /!\(null==(\i)\|\|0===\i\|\|null==(\i)\|\|0===\i\)/,
-                replace: (_, width, height) => `!((null == ${width} || 0 === ${width}) && (null == ${height} || 0 === ${height}))`
-            }
-        }
-    ]
-});
--- a/src/plugins/_api/memberListDecorators.ts
+++ b/src/plugins/_api/memberListDecorators.ts
@ -31,7 +31,7 @@ export default definePlugin({
                    match: /let\{[^}]*lostPermissionTooltipText:\i[^}]*\}=(\i),/,
                    replace: "$&vencordProps=$1,"
                }, {
-                    match: /#{intl::GUILD_OWNER}(?=.+?decorators:(\i)\(\)).+?\1=?\(\)=>.+?children:\[/,
+                    match: /\.Messages\.GUILD_OWNER(?=.+?decorators:(\i)\(\)).+?\1=?\(\)=>.+?children:\[/,
                    replace: "$&...(typeof vencordProps=='undefined'?[]:Vencord.Api.MemberListDecorators.__getDecorators(vencordProps)),"
                }
            ]
--- a/src/plugins/_api/messageAccessories.ts
+++ b/src/plugins/_api/messageAccessories.ts
@ -25,7 +25,7 @@ export default definePlugin({
    authors: [Devs.Cyn],
    patches: [
        {
-            find: "#{intl::REMOVE_ATTACHMENT_BODY}",
+            find: ".Messages.REMOVE_ATTACHMENT_BODY",
            replacement: {
                match: /(?<=.container\)?,children:)(\[.+?\])/,
                replace: "Vencord.Api.MessageAccessories._modifyAccessories($1,this.props)",
--- a/src/plugins/_api/messageDecorations.ts
+++ b/src/plugins/_api/messageDecorations.ts
@ -27,7 +27,7 @@ export default definePlugin({
        {
            find: '"Message Username"',
            replacement: {
-                match: /#{intl::GUILD_COMMUNICATION_DISABLED_BOTTOM_SHEET_TITLE}.+?}\),\i(?=\])/,
+                match: /\.Messages\.GUILD_COMMUNICATION_DISABLED_BOTTOM_SHEET_TITLE.+?}\),\i(?=\])/,
                replace: "$&,...Vencord.Api.MessageDecorations.__addDecorationsToMessage(arguments[0])"
            }
        }
--- a/src/plugins/_api/messageEvents.ts
+++ b/src/plugins/_api/messageEvents.ts
@ -25,7 +25,7 @@ export default definePlugin({
    authors: [Devs.Arjix, Devs.hunt, Devs.Ven],
    patches: [
        {
-            find: "#{intl::EDIT_TEXTAREA_HELP}",
+            find: ".Messages.EDIT_TEXTAREA_HELP",
            replacement: {
                match: /(?<=,channel:\i\}\)\.then\().+?(?=return \i\.content!==this\.props\.message\.content&&\i\((.+?)\))/,
                replace: (match, args) => "" +
--- a/src/plugins/_api/messagePopover.ts
+++ b/src/plugins/_api/messagePopover.ts
@ -24,10 +24,15 @@ export default definePlugin({
    description: "API to add buttons to message popovers.",
    authors: [Devs.KingFish, Devs.Ven, Devs.Nuckyz],
    patches: [{
-        find: "#{intl::MESSAGE_UTILITIES_A11Y_LABEL}",
+        find: "Messages.MESSAGE_UTILITIES_A11Y_LABEL",
        replacement: {
-            match: /\.jsx\)\((\i\.\i),\{label:\i\.\i\.string\(\i\.\i#{intl::MESSAGE_ACTION_REPLY}.{0,200}?"reply-self".{0,50}?\}\):null(?=,.+?message:(\i))/,
-            replace: "$&,Vencord.Api.MessagePopover._buildPopoverElements($1,$2)"
+            // foo && !bar ? createElement(reactionStuffs)... createElement(blah,...makeElement(reply-other))
+            match: /\i&&!\i\?\(0,\i\.jsxs?\)\(.{0,200}renderEmojiPicker:.{0,500}\?(\i)\(\{key:"reply-other"/,
+            replace: (m, 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}`;
+            }
        }
    }],
 });
--- a/src/plugins/_api/serverList.ts
+++ b/src/plugins/_api/serverList.ts
@ -25,16 +25,16 @@ export default definePlugin({
    description: "Api required for plugins that modify the server list",
    patches: [
        {
-            find: "#{intl::DISCODO_DISABLED}",
+            find: "Messages.DISCODO_DISABLED",
            replacement: {
-                match: /(?<=#{intl::DISCODO_DISABLED}.+?return)(\(.{0,75}?tutorialContainer.+?}\))(?=}function)/,
+                match: /(?<=Messages\.DISCODO_DISABLED.+?return)(\(.{0,75}?tutorialContainer.+?}\))(?=}function)/,
                replace: "[$1].concat(Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.Above))"
            }
        },
        {
-            find: "#{intl::SERVERS}),children",
+            find: "Messages.SERVERS,children",
            replacement: {
-                match: /(?<=#{intl::SERVERS}\),children:)\i\.map\(\i\)/,
+                match: /(?<=Messages\.SERVERS,children:).+?default:return null\}\}\)/,
                replace: "Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.In).concat($&)"
            }
        }
--- a/src/plugins/_core/noTrack.ts
+++ b/src/plugins/_core/noTrack.ts
@ -48,7 +48,7 @@ export default definePlugin({
            },
        },
        {
-            find: ".METRICS",
+            find: ".METRICS,",
            replacement: [
                {
                    match: /this\._intervalId=/,
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@ -25,9 +25,8 @@ import ThemesTab from "@components/VencordSettings/ThemesTab";
 import UpdaterTab from "@components/VencordSettings/UpdaterTab";
 import VencordTab from "@components/VencordSettings/VencordTab";
 import { Devs } from "@utils/constants";
-import { getIntlMessage } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
-import { React } from "@webpack/common";
+import { i18n, React } from "@webpack/common";

 import gitHash from "~git-hash";

@ -58,20 +57,20 @@ export default definePlugin({
            ]
        },
        {
-            find: ".SEARCH_NO_RESULTS&&0===",
+            find: "Messages.ACTIVITY_SETTINGS",
            replacement: [
                {
                    match: /(?<=section:(.{0,50})\.DIVIDER\}\))([,;])(?=.{0,200}(\i)\.push.{0,100}label:(\i)\.header)/,
                    replace: (_, sectionTypes, commaOrSemi, elements, element) => `${commaOrSemi} $self.addSettings(${elements}, ${element}, ${sectionTypes}) ${commaOrSemi}`
                },
                {
-                    match: /({(?=.+?function (\i).{0,120}(\i)=\i\.useMemo.{0,60}return \i\.useMemo\(\(\)=>\i\(\3).+?function\(\){return )\2(?=})/,
+                    match: /({(?=.+?function (\i).{0,120}(\i)=\i\.useMemo.{0,30}return \i\.useMemo\(\(\)=>\i\(\3).+?function\(\){return )\2(?=})/,
                    replace: (_, rest, settingsHook) => `${rest}$self.wrapSettingsHook(${settingsHook})`
                }
            ]
        },
        {
-            find: "#{intl::USER_SETTINGS_ACTIONS_MENU_LABEL}",
+            find: "Messages.USER_SETTINGS_ACTIONS_MENU_LABEL",
            replacement: {
                match: /(?<=function\((\i),\i\)\{)(?=let \i=Object.values\(\i.\i\).*?(\i\.\i)\.open\()/,
                replace: "$2.open($1);return;"
@ -149,18 +148,13 @@ export default definePlugin({

        if (!header) return;

-        try {
        const names = {
-                top: getIntlMessage("USER_SETTINGS"),
-                aboveNitro: getIntlMessage("BILLING_SETTINGS"),
-                belowNitro: getIntlMessage("APP_SETTINGS"),
-                aboveActivity: getIntlMessage("ACTIVITY_SETTINGS")
+            top: i18n.Messages.USER_SETTINGS,
+            aboveNitro: i18n.Messages.BILLING_SETTINGS,
+            belowNitro: i18n.Messages.APP_SETTINGS,
+            aboveActivity: i18n.Messages.ACTIVITY_SETTINGS
        };
-
        return header === names[settingsLocation];
-        } catch {
-            return firstChild === "PREMIUM";
-        }
    },

    patchedSettings: new WeakSet(),
@ -203,7 +197,7 @@ export default definePlugin({
    },

    get electronVersion() {
-        return VencordNative.native.getVersions().electron || window.legcord?.electron || null;
+        return VencordNative.native.getVersions().electron || window.armcord?.electron || null;
    },

    get chromiumVersion() {
--- a/src/plugins/_core/supportHelper.tsx
+++ b/src/plugins/_core/supportHelper.tsx
@ -77,7 +77,7 @@ async function generateDebugInfoMessage() {
    const client = (() => {
        if (IS_DISCORD_DESKTOP) return `Discord Desktop v${DiscordNative.app.getVersion()}`;
        if (IS_VESKTOP) return `Vesktop v${VesktopNative.app.getVersion()}`;
-        if ("legcord" in window) return `Legcord v${window.legcord.version}`;
+        if ("armcord" in window) return `ArmCord v${window.armcord.version}`;

        // @ts-expect-error
        const name = typeof unsafeWindow !== "undefined" ? "UserScript" : "Web";
@ -142,15 +142,15 @@ export default definePlugin({
    required: true,
    description: "Helps us provide support to you",
    authors: [Devs.Ven],
-    dependencies: ["UserSettingsAPI", "MessageAccessoriesAPI"],
+    dependencies: ["CommandsAPI", "UserSettingsAPI", "MessageAccessoriesAPI"],

    settings,

    patches: [{
-        find: "#{intl::BEGINNING_DM}",
+        find: ".BEGINNING_DM.format",
        replacement: {
-            match: /#{intl::BEGINNING_DM},{.+?}\),(?=.{0,300}(\i)\.isMultiUserDM)/,
-            replace: "$& $self.renderContributorDmWarningCard({ channel: $1 }),"
+            match: /BEGINNING_DM\.format\(\{.+?\}\),(?=.{0,100}userId:(\i\.getRecipientId\(\)))/,
+            replace: "$& $self.ContributorDmWarningCard({ userId: $1 }),"
        }
    }],

@ -235,8 +235,7 @@ export default definePlugin({
        }
    },

-    renderContributorDmWarningCard: ErrorBoundary.wrap(({ channel }) => {
-        const userId = channel.getRecipientId();
+    ContributorDmWarningCard: ErrorBoundary.wrap(({ userId }) => {
        if (!isPluginDev(userId)) return null;
        if (RelationshipStore.isFriend(userId) || isPluginDev(UserStore.getCurrentUser()?.id)) return null;

--- a/src/plugins/accountPanelServerProfile/README.md
+++ b/src/plugins/accountPanelServerProfile/README.md
@ -1,7 +0,0 @@
-# AccountPanelServerProfile
-
-Right click your account panel in the bottom left to view your profile in the current server
-
-![](https://github.com/user-attachments/assets/3228497d-488f-479c-93d2-a32ccdb08f0f)
-
-![](https://github.com/user-attachments/assets/6fc45363-d95f-4810-812f-2f9fb28b41b5)
--- a/src/plugins/accountPanelServerProfile/index.tsx
+++ b/src/plugins/accountPanelServerProfile/index.tsx
@ -1,134 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { definePluginSettings } from "@api/Settings";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { Devs } from "@utils/constants";
-import { getCurrentChannel } from "@utils/discord";
-import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
-import { ContextMenuApi, Menu, useEffect, useRef } from "@webpack/common";
-import { User } from "discord-types/general";
-
-interface UserProfileProps {
-    popoutProps: Record<string, any>;
-    currentUser: User;
-    originalPopout: () => React.ReactNode;
-}
-
-const UserProfile = findComponentByCodeLazy("UserProfilePopoutWrapper: user cannot be undefined");
-const styles = findByPropsLazy("accountProfilePopoutWrapper");
-
-let openAlternatePopout = false;
-let accountPanelRef: React.MutableRefObject<Record<PropertyKey, any> | null> = { current: null };
-
-const AccountPanelContextMenu = ErrorBoundary.wrap(() => {
-    const { prioritizeServerProfile } = settings.use(["prioritizeServerProfile"]);
-
-    return (
-        <Menu.Menu
-            navId="vc-ap-server-profile"
-            onClose={ContextMenuApi.closeContextMenu}
-        >
-            <Menu.MenuItem
-                id="vc-ap-view-alternate-popout"
-                label={prioritizeServerProfile ? "View Account Profile" : "View Server Profile"}
-                disabled={getCurrentChannel()?.getGuildId() == null}
-                action={e => {
-                    openAlternatePopout = true;
-                    accountPanelRef.current?.props.onMouseDown();
-                    accountPanelRef.current?.props.onClick(e);
-                }}
-            />
-            <Menu.MenuCheckboxItem
-                id="vc-ap-prioritize-server-profile"
-                label="Prioritize Server Profile"
-                checked={prioritizeServerProfile}
-                action={() => settings.store.prioritizeServerProfile = !prioritizeServerProfile}
-            />
-        </Menu.Menu>
-    );
-}, { noop: true });
-
-const settings = definePluginSettings({
-    prioritizeServerProfile: {
-        type: OptionType.BOOLEAN,
-        description: "Prioritize Server Profile when left clicking your account panel",
-        default: false
-    }
-});
-
-export default definePlugin({
-    name: "AccountPanelServerProfile",
-    description: "Right click your account panel in the bottom left to view your profile in the current server",
-    authors: [Devs.Nuckyz, Devs.relitrix],
-    settings,
-
-    patches: [
-        {
-            find: "#{intl::ACCOUNT_SPEAKING_WHILE_MUTED}",
-            group: true,
-            replacement: [
-                {
-                    match: /(?<=\.SIZE_32\)}\);)/,
-                    replace: "$self.useAccountPanelRef();"
-                },
-                {
-                    match: /(\.AVATAR,children:.+?renderPopout:(\i)=>){(.+?)}(?=,position)(?<=currentUser:(\i).+?)/,
-                    replace: (_, rest, popoutProps, originalPopout, currentUser) => `${rest}$self.UserProfile({popoutProps:${popoutProps},currentUser:${currentUser},originalPopout:()=>{${originalPopout}}})`
-                },
-                {
-                    match: /\.AVATAR,children:.+?(?=renderPopout:)/,
-                    replace: "$&onRequestClose:$self.onPopoutClose,"
-                },
-                {
-                    match: /(?<=.avatarWrapper,)/,
-                    replace: "ref:$self.accountPanelRef,onContextMenu:$self.openAccountPanelContextMenu,"
-                }
-            ]
-        }
-    ],
-
-    get accountPanelRef() {
-        return accountPanelRef;
-    },
-
-    useAccountPanelRef() {
-        useEffect(() => () => {
-            accountPanelRef.current = null;
-        }, []);
-
-        return (accountPanelRef = useRef(null));
-    },
-
-    openAccountPanelContextMenu(event: React.UIEvent) {
-        ContextMenuApi.openContextMenu(event, AccountPanelContextMenu);
-    },
-
-    onPopoutClose() {
-        openAlternatePopout = false;
-    },
-
-    UserProfile: ErrorBoundary.wrap(({ popoutProps, currentUser, originalPopout }: UserProfileProps) => {
-        if (
-            (settings.store.prioritizeServerProfile && openAlternatePopout) ||
-            (!settings.store.prioritizeServerProfile && !openAlternatePopout)
-        ) {
-            return originalPopout();
-        }
-
-        const currentChannel = getCurrentChannel();
-        if (currentChannel?.getGuildId() == null) {
-            return originalPopout();
-        }
-
-        return (
-            <div className={styles.accountProfilePopoutWrapper}>
-                <UserProfile {...popoutProps} userId={currentUser.id} guildId={currentChannel.getGuildId()} channelId={currentChannel.id} />
-            </div>
-        );
-    }, { noop: true })
-});
--- a/src/plugins/alwaysAnimate/index.ts
+++ b/src/plugins/alwaysAnimate/index.ts
@ -41,7 +41,7 @@ export default definePlugin({
        },
        {
            // Status emojis
-            find: "#{intl::GUILD_OWNER}",
+            find: ".Messages.GUILD_OWNER,",
            replacement: {
                match: /(?<=\.activityEmoji,.+?animate:)\i/,
                replace: "!0"
--- a/src/plugins/alwaysExpandRoles/README.md
+++ b/src/plugins/alwaysExpandRoles/README.md
@ -1,3 +0,0 @@
-# Always Expand Roles
-
-Always expands the role list in profile popouts
--- a/src/plugins/anonymiseFileNames/index.tsx
+++ b/src/plugins/anonymiseFileNames/index.tsx
@ -71,7 +71,7 @@ export default definePlugin({
    description: "Anonymise uploaded file names",
    patches: [
        {
-            find: "instantBatchUpload:",
+            find: "instantBatchUpload:function",
            replacement: {
                match: /uploadFiles:(\i),/,
                replace:
@ -86,9 +86,9 @@ export default definePlugin({
            }
        },
        {
-            find: "#{intl::ATTACHMENT_UTILITIES_SPOILER}",
+            find: ".Messages.ATTACHMENT_UTILITIES_SPOILER",
            replacement: {
-                match: /(?<=children:\[)(?=.{10,80}tooltip:.{0,100}#{intl::ATTACHMENT_UTILITIES_SPOILER})/,
+                match: /(?<=children:\[)(?=.{10,80}tooltip:.{0,100}\i\.\i\.Messages\.ATTACHMENT_UTILITIES_SPOILER)/,
                replace: "arguments[0].canEdit!==false?$self.renderIcon(arguments[0]):null,"
            },
        },
--- a/src/plugins/appleMusic.desktop/index.tsx
+++ b/src/plugins/appleMusic.desktop/index.tsx
@ -24,7 +24,7 @@ interface ActivityButton {
 }

 interface Activity {
-    state?: string;
+    state: string;
    details?: string;
    timestamps?: {
        start?: number;
@ -52,8 +52,8 @@ const enum ActivityFlag {

 export interface TrackData {
    name: string;
-    album?: string;
-    artist?: string;
+    album: string;
+    artist: string;

    appleMusicLink?: string;
    songLink?: string;
@ -61,8 +61,8 @@ export interface TrackData {
    albumArtwork?: string;
    artistArtwork?: string;

-    playerPosition?: number;
-    duration?: number;
+    playerPosition: number;
+    duration: number;
 }

 const enum AssetImageType {
@ -120,7 +120,7 @@ const settings = definePluginSettings({
    stateString: {
        type: OptionType.STRING,
        description: "Activity state format string",
-        default: "{artist} · {album}"
+        default: "{artist}"
    },
    largeImageType: {
        type: OptionType.SELECT,
@ -155,8 +155,8 @@ const settings = definePluginSettings({
 function customFormat(formatStr: string, data: TrackData) {
    return formatStr
        .replaceAll("{name}", data.name)
-        .replaceAll("{album}", data.album ?? "")
-        .replaceAll("{artist}", data.artist ?? "");
+        .replaceAll("{album}", data.album)
+        .replaceAll("{artist}", data.artist);
 }

 function getImageAsset(type: AssetImageType, data: TrackData) {
@ -212,16 +212,14 @@ export default definePlugin({

        const assets: ActivityAssets = {};

-        const isRadio = Number.isNaN(trackData.duration) && (trackData.playerPosition === 0);
-
        if (settings.store.largeImageType !== AssetImageType.Disabled) {
            assets.large_image = largeImageAsset;
-            if (!isRadio) assets.large_text = customFormat(settings.store.largeTextString, trackData);
+            assets.large_text = customFormat(settings.store.largeTextString, trackData);
        }

        if (settings.store.smallImageType !== AssetImageType.Disabled) {
            assets.small_image = smallImageAsset;
-            if (!isRadio) assets.small_text = customFormat(settings.store.smallTextString, trackData);
+            assets.small_text = customFormat(settings.store.smallTextString, trackData);
        }

        const buttons: ActivityButton[] = [];
@ -245,17 +243,17 @@ export default definePlugin({

            name: customFormat(settings.store.nameString, trackData),
            details: customFormat(settings.store.detailsString, trackData),
-            state: isRadio ? undefined : customFormat(settings.store.stateString, trackData),
+            state: customFormat(settings.store.stateString, trackData),

-            timestamps: (trackData.playerPosition && trackData.duration && settings.store.enableTimestamps) ? {
+            timestamps: (settings.store.enableTimestamps ? {
                start: Date.now() - (trackData.playerPosition * 1000),
                end: Date.now() - (trackData.playerPosition * 1000) + (trackData.duration * 1000),
-            } : undefined,
+            } : undefined),

            assets,

-            buttons: !isRadio && buttons.length ? buttons.map(v => v.label) : undefined,
-            metadata: !isRadio && buttons.length ? { button_urls: buttons.map(v => v.url) } : undefined,
+            buttons: buttons.length ? buttons.map(v => v.label) : undefined,
+            metadata: { button_urls: buttons.map(v => v.url) || undefined, },

            type: settings.store.activityType,
            flags: ActivityFlag.INSTANCE,
--- a/src/plugins/appleMusic.desktop/native.ts
+++ b/src/plugins/appleMusic.desktop/native.ts
@ -11,11 +11,37 @@ import type { TrackData } from ".";

 const exec = promisify(execFile);

+// function exec(file: string, args: string[] = []) {
+//     return new Promise<{ code: number | null, stdout: string | null, stderr: string | null; }>((resolve, reject) => {
+//         const process = spawn(file, args, { stdio: [null, "pipe", "pipe"] });
+
+//         let stdout: string | null = null;
+//         process.stdout.on("data", (chunk: string) => { stdout ??= ""; stdout += chunk; });
+//         let stderr: string | null = null;
+//         process.stderr.on("data", (chunk: string) => { stdout ??= ""; stderr += chunk; });
+
+//         process.on("exit", code => { resolve({ code, stdout, stderr }); });
+//         process.on("error", err => reject(err));
+//     });
+// }
+
 async function applescript(cmds: string[]) {
    const { stdout } = await exec("osascript", cmds.map(c => ["-e", c]).flat());
    return stdout;
 }

+function makeSearchUrl(type: string, query: string) {
+    const url = new URL("https://tools.applemediaservices.com/api/apple-media/music/US/search.json");
+    url.searchParams.set("types", type);
+    url.searchParams.set("limit", "1");
+    url.searchParams.set("term", query);
+    return url;
+}
+
+const requestOptions: RequestInit = {
+    headers: { "user-agent": "Mozilla/5.0 (Windows NT 10.0; rv:125.0) Gecko/20100101 Firefox/125.0" },
+};
+
 interface RemoteData {
    appleMusicLink?: string,
    songLink?: string,
@ -25,24 +51,6 @@ interface RemoteData {

 let cachedRemoteData: { id: string, data: RemoteData; } | { id: string, failures: number; } | null = null;

-const APPLE_MUSIC_BUNDLE_REGEX = /<script type="module" crossorigin src="([a-zA-Z0-9.\-/]+)"><\/script>/;
-const APPLE_MUSIC_TOKEN_REGEX = /\w+="([A-Za-z0-9-_]*\.[A-Za-z0-9-_]*\.[A-Za-z0-9-_]*)",\w+="x-apple-jingle-correlation-key"/;
-
-let cachedToken: string | undefined = undefined;
-
-const getToken = async () => {
-    if (cachedToken) return cachedToken;
-
-    const html = await fetch("https://music.apple.com/").then(r => r.text());
-    const bundleUrl = new URL(html.match(APPLE_MUSIC_BUNDLE_REGEX)![1], "https://music.apple.com/");
-
-    const bundle = await fetch(bundleUrl).then(r => r.text());
-    const token = bundle.match(APPLE_MUSIC_TOKEN_REGEX)![1];
-
-    cachedToken = token;
-    return token;
-};
-
 async function fetchRemoteData({ id, name, artist, album }: { id: string, name: string, artist: string, album: string; }) {
    if (id === cachedRemoteData?.id) {
        if ("data" in cachedRemoteData) return cachedRemoteData.data;
@ -50,39 +58,21 @@ async function fetchRemoteData({ id, name, artist, album }: { id: string, name:
    }

    try {
-        const dataUrl = new URL("https://amp-api-edge.music.apple.com/v1/catalog/us/search");
-        dataUrl.searchParams.set("platform", "web");
-        dataUrl.searchParams.set("l", "en-US");
-        dataUrl.searchParams.set("limit", "1");
-        dataUrl.searchParams.set("with", "serverBubbles");
-        dataUrl.searchParams.set("types", "songs");
-        dataUrl.searchParams.set("term", `${name} ${artist} ${album}`);
-        dataUrl.searchParams.set("include[songs]", "artists");
+        const [songData, artistData] = await Promise.all([
+            fetch(makeSearchUrl("songs", artist + " " + album + " " + name), requestOptions).then(r => r.json()),
+            fetch(makeSearchUrl("artists", artist.split(/ *[,&] */)[0]), requestOptions).then(r => r.json())
+        ]);

-        const token = await getToken();
+        const appleMusicLink = songData?.songs?.data[0]?.attributes.url;
+        const songLink = songData?.songs?.data[0]?.id ? `https://song.link/i/${songData?.songs?.data[0]?.id}` : undefined;

-        const songData = await fetch(dataUrl, {
-            headers: {
-                "accept": "*/*",
-                "accept-language": "en-US,en;q=0.9",
-                "authorization": `Bearer ${token}`,
-                "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36",
-                "origin": "https://music.apple.com",
-            },
-        })
-            .then(r => r.json())
-            .then(data => data.results.song.data[0]);
+        const albumArtwork = songData?.songs?.data[0]?.attributes.artwork.url.replace("{w}", "512").replace("{h}", "512");
+        const artistArtwork = artistData?.artists?.data[0]?.attributes.artwork.url.replace("{w}", "512").replace("{h}", "512");

        cachedRemoteData = {
            id,
-            data: {
-                appleMusicLink: songData.attributes.url,
-                songLink: `https://song.link/i/${songData.id}`,
-                albumArtwork: songData.attributes.artwork.url.replace("{w}x{h}", "512x512"),
-                artistArtwork: songData.relationships.artists.data[0].attributes.artwork.url.replace("{w}x{h}", "512x512"),
-            }
+            data: { appleMusicLink, songLink, albumArtwork, artistArtwork }
        };
-
        return cachedRemoteData.data;
    } catch (e) {
        console.error("[AppleMusicRichPresence] Failed to fetch remote data:", e);
--- a/src/plugins/arRPC.web/index.tsx
+++ b/src/plugins/arRPC.web/index.tsx
@ -73,8 +73,8 @@ export default definePlugin({
    },

    async start() {
-        // Legcord comes with its own arRPC implementation, so this plugin just confuses users
-        if ("legcord" in window) return;
+        // 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
--- a/src/plugins/automodContext/README.md
+++ b/src/plugins/automodContext/README.md
@ -0,0 +1,5 @@
+# AutomodContext
+
+Allows you to jump to the messages surrounding an automod hit
+
+![Visualization](https://github.com/Vendicated/Vencord/assets/61953774/d13740c8-2062-4553-b975-82fd3d6cc08b)
--- a/src/plugins/automodContext/index.tsx
+++ b/src/plugins/automodContext/index.tsx
@ -0,0 +1,73 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+import { Button, ChannelStore, Text } from "@webpack/common";
+
+const { selectChannel } = findByPropsLazy("selectChannel", "selectVoiceChannel");
+
+function jumpToMessage(channelId: string, messageId: string) {
+    const guildId = ChannelStore.getChannel(channelId)?.guild_id;
+
+    selectChannel({
+        guildId,
+        channelId,
+        messageId,
+        jumpType: "INSTANT"
+    });
+}
+
+function findChannelId(message: any): string | null {
+    const { embeds: [embed] } = message;
+    const channelField = embed.fields.find(({ rawName }) => rawName === "channel_id");
+
+    if (!channelField) {
+        return null;
+    }
+
+    return channelField.rawValue;
+}
+
+export default definePlugin({
+    name: "AutomodContext",
+    description: "Allows you to jump to the messages surrounding an automod hit.",
+    authors: [Devs.JohnyTheCarrot],
+
+    patches: [
+        {
+            find: ".Messages.GUILD_AUTOMOD_REPORT_ISSUES",
+            replacement: {
+                match: /\.Messages\.ACTIONS.+?}\)(?=,(\(0.{0,40}\.dot.*?}\)),)/,
+                replace: (m, dot) => `${m},${dot},$self.renderJumpButton({message:arguments[0].message})`
+            }
+        }
+    ],
+
+    renderJumpButton: ErrorBoundary.wrap(({ message }: { message: any; }) => {
+        const channelId = findChannelId(message);
+
+        if (!channelId) {
+            return null;
+        }
+
+        return (
+            <Button
+                style={{ padding: "2px 8px" }}
+                look={Button.Looks.LINK}
+                size={Button.Sizes.SMALL}
+                color={Button.Colors.LINK}
+                onClick={() => jumpToMessage(channelId, message.id)}
+            >
+                <Text color="text-link" variant="text-xs/normal">
+                    Jump to Surrounding
+                </Text>
+            </Button>
+        );
+    }, { noop: true })
+});
--- a/src/plugins/banger/index.ts
+++ b/src/plugins/banger/index.ts
@ -36,7 +36,7 @@ export default definePlugin({
    settings,
    patches: [
        {
-            find: "#{intl::BAN_CONFIRM_TITLE}",
+            find: "BAN_CONFIRM_TITLE.",
            replacement: {
                match: /src:\i\("?\d+"?\)/g,
                replace: "src:$self.source"
--- a/src/plugins/betterFolders/README.md
+++ b/src/plugins/betterFolders/README.md
@ -1,11 +0,0 @@
-# Better Folders
-
-Better Folders offers a variety of options to improve your folder experience
-
-Always show the folder icon, regardless of if the folder is open or not
-
-Only have one folder open at a time
-
-Open folders in a sidebar:
-
-![A folder open in a separate sidebar](https://github.com/user-attachments/assets/432d3146-8091-4bae-9c1e-c19046c72947)
--- a/src/plugins/betterFolders/index.tsx
+++ b/src/plugins/betterFolders/index.tsx
@ -18,10 +18,9 @@

 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import { getIntlMessage } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
-import { FluxDispatcher, useMemo } from "@webpack/common";
+import { FluxDispatcher, i18n, useMemo } from "@webpack/common";

 import FolderSideBar from "./FolderSideBar";

@ -31,9 +30,9 @@ enum FolderIconDisplay {
    MoreThanOneFolderExpanded
 }

-export const ExpandedGuildFolderStore = findStoreLazy("ExpandedGuildFolderStore");
-const SortedGuildStore = findStoreLazy("SortedGuildStore");
 const GuildsTree = findLazy(m => m.prototype?.moveNextTo);
+const SortedGuildStore = findStoreLazy("SortedGuildStore");
+export const ExpandedGuildFolderStore = findStoreLazy("ExpandedGuildFolderStore");
 const FolderUtils = findByPropsLazy("move", "toggleGuildFolderExpand");

 let lastGuildId = null as string | null;
@ -119,22 +118,22 @@ export default definePlugin({
                // If we are rendering the Better Folders sidebar, we filter out guilds that are not in folders and unexpanded folders
                {
                    match: /\[(\i)\]=(\(0,\i\.\i\).{0,40}getGuildsTree\(\).+?}\))(?=,)/,
-                    replace: (_, originalTreeVar, rest) => `[betterFoldersOriginalTree]=${rest},${originalTreeVar}=$self.getGuildTree(!!arguments[0]?.isBetterFolders,betterFoldersOriginalTree,arguments[0]?.betterFoldersExpandedIds)`
+                    replace: (_, originalTreeVar, rest) => `[betterFoldersOriginalTree]=${rest},${originalTreeVar}=$self.getGuildTree(!!arguments[0].isBetterFolders,betterFoldersOriginalTree,arguments[0].betterFoldersExpandedIds)`
                },
                // If we are rendering the Better Folders sidebar, we filter out everything but the servers and folders from the GuildsBar Guild List children
                {
                    match: /lastTargetNode:\i\[\i\.length-1\].+?Fragment.+?\]}\)\]/,
-                    replace: "$&.filter($self.makeGuildsBarGuildListFilter(!!arguments[0]?.isBetterFolders))"
+                    replace: "$&.filter($self.makeGuildsBarGuildListFilter(!!arguments[0].isBetterFolders))"
                },
                // If we are rendering the Better Folders sidebar, we filter out everything but the scroller for the guild list from the GuildsBar Tree children
                {
                    match: /unreadMentionsIndicatorBottom,.+?}\)\]/,
-                    replace: "$&.filter($self.makeGuildsBarTreeFilter(!!arguments[0]?.isBetterFolders))"
+                    replace: "$&.filter($self.makeGuildsBarTreeFilter(!!arguments[0].isBetterFolders))"
                },
                // Export the isBetterFolders variable to the folders component
                {
-                    match: /switch\(\i\.type\){case \i\.\i\.FOLDER:.+?folderNode:\i,/,
-                    replace: '$&isBetterFolders:typeof isBetterFolders!=="undefined"?isBetterFolders:false,'
+                    match: /(?<=\.Messages\.SERVERS.+?switch\((\i)\.type\){case \i\.\i\.FOLDER:.+?folderNode:\i,)/,
+                    replace: 'isBetterFolders:typeof isBetterFolders!=="undefined"?isBetterFolders:false,'
                }
            ]
        },
@ -168,31 +167,31 @@ export default definePlugin({
                {
                    predicate: () => settings.store.keepIcons,
                    match: /(?<=let{folderNode:\i,setNodeRef:\i,.+?expanded:(\i),.+?;)(?=let)/,
-                    replace: (_, isExpanded) => `${isExpanded}=!!arguments[0]?.isBetterFolders&&${isExpanded};`
+                    replace: (_, isExpanded) => `${isExpanded}=!!arguments[0].isBetterFolders&&${isExpanded};`
                },
                // Disable expanding and collapsing folders transition in the normal GuildsBar sidebar
                {
                    predicate: () => !settings.store.keepIcons,
-                    match: /(?<=#{intl::SERVER_FOLDER_PLACEHOLDER}.+?useTransition\)\()/,
-                    replace: "$self.shouldShowTransition(arguments[0])&&"
+                    match: /(?<=\.Messages\.SERVER_FOLDER_PLACEHOLDER.+?useTransition\)\()/,
+                    replace: "!!arguments[0].isBetterFolders&&"
                },
                // If we are rendering the normal GuildsBar sidebar, we avoid rendering guilds from folders that are expanded
                {
                    predicate: () => !settings.store.keepIcons,
                    match: /expandedFolderBackground,.+?,(?=\i\(\(\i,\i,\i\)=>{let{key.{0,45}ul)(?<=selected:\i,expanded:(\i),.+?)/,
-                    replace: (m, isExpanded) => `${m}$self.shouldRenderContents(arguments[0],${isExpanded})?null:`
+                    replace: (m, isExpanded) => `${m}!arguments[0].isBetterFolders&&${isExpanded}?null:`
                },
                {
                    // Decide if we should render the expanded folder background if we are rendering the Better Folders sidebar
                    predicate: () => settings.store.showFolderIcon !== FolderIconDisplay.Always,
                    match: /(?<=\.wrapper,children:\[)/,
-                    replace: "$self.shouldShowFolderIconAndBackground(!!arguments[0]?.isBetterFolders,arguments[0]?.betterFoldersExpandedIds)&&"
+                    replace: "$self.shouldShowFolderIconAndBackground(!!arguments[0].isBetterFolders,arguments[0].betterFoldersExpandedIds)&&"
                },
                {
                    // Decide if we should render the expanded folder icon if we are rendering the Better Folders sidebar
                    predicate: () => settings.store.showFolderIcon !== FolderIconDisplay.Always,
                    match: /(?<=\.expandedFolderBackground.+?}\),)(?=\i,)/,
-                    replace: "!$self.shouldShowFolderIconAndBackground(!!arguments[0]?.isBetterFolders,arguments[0]?.betterFoldersExpandedIds)?null:"
+                    replace: "!$self.shouldShowFolderIconAndBackground(!!arguments[0].isBetterFolders,arguments[0].betterFoldersExpandedIds)?null:"
                }
            ]
        },
@ -201,12 +200,12 @@ export default definePlugin({
            predicate: () => settings.store.sidebar,
            replacement: {
                // Render the Better Folders sidebar
-                match: /(container.{0,50}({className:\i\.guilds,themeOverride:\i})\))/,
-                replace: "$1,$self.FolderSideBar({...$2})"
+                match: /(?<=({className:\i\.guilds,themeOverride:\i})\))/,
+                replace: ",$self.FolderSideBar($1)"
            }
        },
        {
-            find: "#{intl::DISCODO_DISABLED}",
+            find: ".Messages.DISCODO_DISABLED",
            predicate: () => settings.store.closeAllHomeButton,
            replacement: {
                // Close all folders when clicking the home button
@ -250,10 +249,6 @@ export default definePlugin({
                    dispatchingFoldersClose = false;
                });
            }
-        },
-
-        LOGOUT() {
-            closeFolders();
        }
    },

@ -275,16 +270,12 @@ export default definePlugin({
    },

    makeGuildsBarGuildListFilter(isBetterFolders: boolean) {
-        try {
        return child => {
            if (isBetterFolders) {
-                    return child?.props?.["aria-label"] === getIntlMessage("SERVERS");
+                return child?.props?.["aria-label"] === i18n.Messages.SERVERS;
            }
            return true;
        };
-        } catch {
-            return true;
-        }
    },

    makeGuildsBarTreeFilter(isBetterFolders: boolean) {
@ -311,20 +302,7 @@ export default definePlugin({
        }
    },

-    shouldShowTransition(props: any) {
-        // Pending guilds
-        if (props?.folderNode?.id === 1) return true;
+    FolderSideBar: guildsBarProps => <FolderSideBar {...guildsBarProps} />,

-        return !!props?.isBetterFolders;
-    },
-
-    shouldRenderContents(props: any, isExpanded: boolean) {
-        // Pending guilds
-        if (props?.folderNode?.id === 1) return false;
-
-        return !props?.isBetterFolders && isExpanded;
-    },
-
-    FolderSideBar,
-    closeFolders,
+    closeFolders
 });
--- a/src/plugins/betterGifAltText/index.ts
+++ b/src/plugins/betterGifAltText/index.ts
@ -34,9 +34,9 @@ export default definePlugin({
            },
        },
        {
-            find: "#{intl::GIF}",
+            find: ".Messages.GIF,",
            replacement: {
-                match: /alt:(\i)=(\i\.\i\.string\(\i\.\i#{intl::GIF}\))(?=,[^}]*\}=(\i))/,
+                match: /alt:(\i)=(\i\.\i\.Messages\.GIF)(?=,[^}]*\}=(\i))/,
                replace:
                    // rename prop so we can always use default value
                    "alt_$$:$1=$self.altify($3)||$2",
--- a/src/plugins/betterNotes/index.tsx
+++ b/src/plugins/betterNotes/index.tsx
@ -17,9 +17,13 @@
 */

 import { definePluginSettings, Settings } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { canonicalizeMatch } from "@utils/patches";
 import definePlugin, { OptionType } from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+
+const UserPopoutSectionCssClasses = findByPropsLazy("section", "lastSection");

 const settings = definePluginSettings({
    hide: {
@ -63,14 +67,28 @@ export default definePlugin({
            }
        },
        {
-            find: "#{intl::NOTE_PLACEHOLDER}",
+            find: "Messages.NOTE_PLACEHOLDER",
            replacement: {
-                match: /#{intl::NOTE_PLACEHOLDER}\),/,
+                match: /\.NOTE_PLACEHOLDER,/,
                replace: "$&spellCheck:!$self.noSpellCheck,"
            }
+        },
+        {
+            find: ".popularApplicationCommandIds,",
+            replacement: {
+                match: /lastSection:(!?\i)}\),/,
+                replace: "$&$self.patchPadding({lastSection:$1}),"
+            }
        }
    ],

+    patchPadding: ErrorBoundary.wrap(({ lastSection }) => {
+        if (!lastSection) return null;
+        return (
+            <div className={UserPopoutSectionCssClasses.lastSection} ></div>
+        );
+    }),
+
    get noSpellCheck() {
        return settings.store.noSpellCheck;
    }
--- a/src/plugins/betterRoleContext/index.tsx
+++ b/src/plugins/betterRoleContext/index.tsx
@ -99,11 +99,7 @@ export default definePlugin({
                        id="vc-view-role-icon"
                        label="View Role Icon"
                        action={() => {
-                            openImageModal({
-                                url: `${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/role-icons/${role.id}/${role.icon}.${settings.store.roleIconFileFormat}`,
-                                height: 128,
-                                width: 128
-                            });
+                            openImageModal(`${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/role-icons/${role.id}/${role.icon}.${settings.store.roleIconFileFormat}`);
                        }}
                        icon={ImageIcon}
                    />
--- a/src/plugins/betterRoleDot/index.ts
+++ b/src/plugins/betterRoleDot/index.ts
@ -47,7 +47,7 @@ export default definePlugin({
        },

        {
-            find: "#{intl::ADD_ROLE_A11Y_LABEL}",
+            find: ".ADD_ROLE_A11Y_LABEL",
            all: true,
            predicate: () => Settings.plugins.BetterRoleDot.copyRoleColorInProfilePopout && !Settings.plugins.BetterRoleDot.bothStyles,
            noWarn: true,
--- a/src/plugins/betterSessions/index.tsx
+++ b/src/plugins/betterSessions/index.tsx
@ -60,7 +60,7 @@ export default definePlugin({

    patches: [
        {
-            find: "#{intl::AUTH_SESSIONS_SESSION_LOG_OUT}",
+            find: "Messages.AUTH_SESSIONS_SESSION_LOG_OUT",
            replacement: [
                // Replace children with a single label with state
                {
--- a/src/plugins/betterSettings/PluginsSubmenu.tsx
+++ b/src/plugins/betterSettings/PluginsSubmenu.tsx
@ -1,69 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { openPluginModal } from "@components/PluginSettings/PluginModal";
-import { getIntlMessage } from "@utils/discord";
-import { isObjectEmpty } from "@utils/misc";
-import { Alerts, Menu, useMemo, useState } from "@webpack/common";
-
-import Plugins from "~plugins";
-
-function onRestartNeeded() {
-    Alerts.show({
-        title: "Restart required",
-        body: <p>You have changed settings that require a restart.</p>,
-        confirmText: "Restart now",
-        cancelText: "Later!",
-        onConfirm: () => location.reload()
-    });
-}
-
-export default function PluginsSubmenu() {
-    const sortedPlugins = useMemo(() => Object.values(Plugins)
-        .sort((a, b) => a.name.localeCompare(b.name)), []);
-    const [query, setQuery] = useState("");
-
-    const search = query.toLowerCase();
-    const include = (p: typeof Plugins[keyof typeof Plugins]) => (
-        Vencord.Plugins.isPluginEnabled(p.name)
-        && p.options && !isObjectEmpty(p.options)
-        && (
-            p.name.toLowerCase().includes(search)
-            || p.description.toLowerCase().includes(search)
-            || p.tags?.some(t => t.toLowerCase().includes(search))
-        )
-    );
-
-    const plugins = sortedPlugins.filter(include);
-
-    return (
-        <>
-            <Menu.MenuControlItem
-                id="vc-plugins-search"
-                control={(props, ref) => (
-                    <Menu.MenuSearchControl
-                        {...props}
-                        query={query}
-                        onChange={setQuery}
-                        ref={ref}
-                        placeholder={getIntlMessage("SEARCH")}
-                    />
-                )}
-            />
-
-            {!!plugins.length && <Menu.MenuSeparator />}
-
-            {plugins.map(p => (
-                <Menu.MenuItem
-                    key={p.name}
-                    id={p.name}
-                    label={p.name}
-                    action={() => openPluginModal(p, onRestartNeeded)}
-                />
-            ))}
-        </>
-    );
-}
--- a/src/plugins/betterSettings/index.tsx
+++ b/src/plugins/betterSettings/index.tsx
@ -7,15 +7,12 @@
 import { definePluginSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import { Devs } from "@utils/constants";
-import { getIntlMessage } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { waitFor } from "@webpack";
-import { ComponentDispatch, FocusLock, Menu, useEffect, useRef } from "@webpack/common";
+import { ComponentDispatch, FocusLock, i18n, Menu, useEffect, useRef } from "@webpack/common";
 import type { HTMLAttributes, ReactElement } from "react";

-import PluginsSubmenu from "./PluginsSubmenu";
-
 type SettingsEntry = { section: string, label: string; };

 const cl = classNameFactory("");
@ -112,7 +109,7 @@ export default definePlugin({
            predicate: () => settings.store.disableFade
        },
        { // Load menu TOC eagerly
-            find: "#{intl::USER_SETTINGS_WITH_BUILD_OVERRIDE}",
+            find: "Messages.USER_SETTINGS_WITH_BUILD_OVERRIDE.format",
            replacement: {
                match: /(\i)\(this,"handleOpenSettingsContextMenu",.{0,100}?null!=\i&&.{0,100}?(await Promise\.all[^};]*?\)\)).*?,(?=\1\(this)/,
                replace: "$&(async ()=>$2)(),"
@ -120,22 +117,14 @@ export default definePlugin({
            predicate: () => settings.store.eagerLoad
        },
        { // Settings cog context menu
-            find: "#{intl::USER_SETTINGS_ACTIONS_MENU_LABEL}",
-            replacement: [
-                {
+            find: "Messages.USER_SETTINGS_ACTIONS_MENU_LABEL",
+            replacement: {
                match: /(EXPERIMENTS:.+?)(\(0,\i.\i\)\(\))(?=\.filter\(\i=>\{let\{section:\i\}=)/,
                replace: "$1$self.wrapMenu($2)"
-                },
-                {
-                    match: /case \i\.\i\.DEVELOPER_OPTIONS:return \i;/,
-                    replace: "$&case 'VencordPlugins':return $self.PluginsSubmenu();"
            }
-            ]
-        },
+        }
    ],

-    PluginsSubmenu,
-
    // This is the very outer layer of the entire ui, so we can't wrap this in an ErrorBoundary
    // without possibly also catching unrelated errors of children.
    //
@ -160,7 +149,7 @@ export default definePlugin({
            if (item.section === "HEADER") {
                items.push({ label: item.label, items: [] });
            } else if (item.section === "DIVIDER") {
-                items.push({ label: getIntlMessage("OTHER_OPTIONS"), items: [] });
+                items.push({ label: i18n.Messages.OTHER_OPTIONS, items: [] });
            } else {
                items.at(-1)!.items.push(item);
            }
--- a/src/plugins/betterUploadButton/index.ts
+++ b/src/plugins/betterUploadButton/index.ts
@ -25,9 +25,11 @@ export default definePlugin({
    description: "Upload with a single click, open menu with right click",
    patches: [
        {
-            find: '"ChannelAttachButton"',
+            find: "Messages.CHAT_ATTACH_UPLOAD_OR_INVITE",
            replacement: {
-                match: /\.attachButtonInner,"aria-label":.{0,50},onDoubleClick:(.+?:void 0),\.\.\.(\i),/,
+                // Discord merges multiple props here with Object.assign()
+                // This patch passes a third object to it with which we override onClick and onContextMenu
+                match: /CHAT_ATTACH_UPLOAD_OR_INVITE,onDoubleClick:(.+?:void 0),\.\.\.(\i),/,
                replace: "$&onClick:$1,onContextMenu:$2.onClick,",
            },
        },
--- a/src/plugins/biggerStreamPreview/index.tsx
+++ b/src/plugins/biggerStreamPreview/index.tsx
@ -57,11 +57,7 @@ export const handleViewPreview = async ({ guildId, channelId, ownerId }: Applica
    const previewUrl = await ApplicationStreamPreviewStore.getPreviewURL(guildId, channelId, ownerId);
    if (!previewUrl) return;

-    openImageModal({
-        url: previewUrl,
-        height: 720,
-        width: 1280
-    });
+    openImageModal(previewUrl);
 };

 export const addViewStreamContext: NavContextMenuPatchCallback = (children, { userId }: { userId: string | bigint; }) => {
--- a/src/plugins/blurNsfw/index.ts
+++ b/src/plugins/blurNsfw/index.ts
@ -45,8 +45,8 @@ export default definePlugin({
        {
            find: ".embedWrapper,embed",
            replacement: [{
-                match: /\.container/,
-                replace: "$&+(this.props.channel.nsfw? ' vc-nsfw-img': '')"
+                match: /\.embedWrapper(?=.+?channel_id:(\i)\.id)/g,
+                replace: "$&+($1.nsfw?' vc-nsfw-img':'')"
            }]
        }
    ],
--- a/src/plugins/clearURLs/defaultRules.ts
+++ b/src/plugins/clearURLs/defaultRules.ts
@ -155,5 +155,4 @@ export const defaultRules = [
    "igshid",
    "igsh",
    "share_id@reddit.com",
-    "si@soundcloud.com",
 ];
--- a/src/plugins/clientTheme/index.tsx
+++ b/src/plugins/clientTheme/index.tsx
@ -12,9 +12,9 @@ import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
 import definePlugin, { OptionType, StartAt } from "@utils/types";
 import { findByCodeLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack";
-import { Button, Forms, ThemeStore, useStateFromStores } from "@webpack/common";
+import { Button, Forms, useStateFromStores } from "@webpack/common";

-const ColorPicker = findComponentByCodeLazy("#{intl::USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR}", ".BACKGROUND_PRIMARY)");
+const ColorPicker = findComponentByCodeLazy(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)");

 const colorPresets = [
    "#1E1514", "#172019", "#13171B", "#1C1C28", "#402D2D",
@ -30,12 +30,13 @@ function onPickColor(color: number) {
    updateColorVars(hexColor);
 }

-const saveClientTheme = findByCodeLazy('type:"UNSYNCED_USER_SETTINGS_UPDATE', '"system"===');
+const saveClientTheme = findByCodeLazy('type:"UNSYNCED_USER_SETTINGS_UPDATE",settings:{useSystemTheme:"system"===');

 function setTheme(theme: string) {
    saveClientTheme({ theme });
 }

+const ThemeStore = findStoreLazy("ThemeStore");
 const NitroThemeStore = findStoreLazy("ClientThemesBackgroundStore");

 function ThemeSettings() {
--- a/src/plugins/consoleJanitor/README.md
+++ b/src/plugins/consoleJanitor/README.md
@ -1,5 +1,5 @@
 # ConsoleJanitor

-Disables annoying console messages/errors. This plugin mainly removes errors/warnings that happen all the time and Discord logger messages.
+Disables annoying console messages/errors. This plugin mainly removes errors/warnings that happen all the time and noisy/spammy logging messages.

-One of the disabled messages is the "Window state not initialized" warning, for example.
+Some of the disabled messages include the "notosans-400-normalitalic" error and MessageActionCreators, Routing/Utils loggers.
--- a/src/plugins/consoleJanitor/index.ts
+++ b/src/plugins/consoleJanitor/index.ts
@ -6,7 +6,7 @@

 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import definePlugin, { OptionType, StartAt } from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";

 const Noop = () => { };
 const NoopLogger = {
@ -22,12 +22,10 @@ const NoopLogger = {
    fileOnly: Noop
 };

-const logAllow = new Set();
-
 const settings = definePluginSettings({
-    disableLoggers: {
+    disableNoisyLoggers: {
        type: OptionType.BOOLEAN,
-        description: "Disables Discords loggers",
+        description: "Disable noisy loggers like the MessageActionCreators",
        default: false,
        restartNeeded: true
    },
@ -36,43 +34,18 @@ const settings = definePluginSettings({
        description: "Disable the Spotify logger, which leaks account information and access token",
        default: true,
        restartNeeded: true
-    },
-    whitelistedLoggers: {
-        type: OptionType.STRING,
-        description: "Semi colon separated list of loggers to allow even if others are hidden",
-        default: "GatewaySocket; Routing/Utils",
-        onChange(newVal: string) {
-            logAllow.clear();
-            newVal.split(";").map(x => x.trim()).forEach(logAllow.add.bind(logAllow));
-        }
    }
 });

 export default definePlugin({
    name: "ConsoleJanitor",
    description: "Disables annoying console messages/errors",
-    authors: [Devs.Nuckyz, Devs.sadan],
+    authors: [Devs.Nuckyz],
    settings,

-    startAt: StartAt.Init,
-    start() {
-        logAllow.clear();
-        this.settings.store.whitelistedLoggers?.split(";").map(x => x.trim()).forEach(logAllow.add.bind(logAllow));
-    },
-
    NoopLogger: () => NoopLogger,
-    shouldLog(logger: string) {
-        return logAllow.has(logger);
-    },

    patches: [
-        {
-            find: 'react-spring: The "interpolate" function',
-            replacement: {
-                match: /,console.warn\('react-spring: The "interpolate" function is deprecated in v10 \(use "to" instead\)'\)/,
-                replace: ""
-            }
-        },
        {
            find: 'console.warn("Window state not initialized"',
            replacement: {
@ -87,6 +60,13 @@ export default definePlugin({
                replace: ""
            }
        },
+        {
+            find: "notosans-400-normalitalic",
+            replacement: {
+                match: /,"notosans-.+?"/g,
+                replace: ""
+            }
+        },
        {
            find: 'console.warn("[DEPRECATED] Please use `subscribeWithSelector` middleware");',
            all: true,
@ -130,13 +110,34 @@ export default definePlugin({
                replace: ""
            }
        },
-        // Patches discords generic logger function
-        {
-            find: "Σ:",
-            predicate: () => settings.store.disableLoggers,
+        ...[
+            '("MessageActionCreators")', '("ChannelMessages")',
+            '("Routing/Utils")', '("RTCControlSocket")',
+            '("ConnectionEventFramerateReducer")', '("RTCLatencyTestManager")',
+            '("OverlayBridgeStore")', '("RPCServer:WSS")'
+        ].map(logger => ({
+            find: logger,
+            predicate: () => settings.store.disableNoisyLoggers,
+            all: true,
            replacement: {
-                match: /(?<=&&)(?=console)/,
-                replace: "$self.shouldLog(arguments[0])&&"
+                match: new RegExp(String.raw`new \i\.\i${logger.replace(/([()])/g, "\\$1")}`),
+                replace: `$self.NoopLogger${logger}`
+            }
+        })),
+        {
+            find: '"Experimental codecs: "',
+            predicate: () => settings.store.disableNoisyLoggers,
+            replacement: {
+                match: /new \i\.\i\("Connection\("\.concat\(\i,"\)"\)\)/,
+                replace: "$self.NoopLogger()"
+            }
+        },
+        {
+            find: '"Handling ping: "',
+            predicate: () => settings.store.disableNoisyLoggers,
+            replacement: {
+                match: /new \i\.\i\("RTCConnection\("\.concat.+?\)\)(?=,)/,
+                replace: "$self.NoopLogger()"
            }
        },
        {
@ -147,5 +148,5 @@ export default definePlugin({
                replace: "$self.NoopLogger()"
            }
        }
-    ],
+    ]
 });
--- a/src/plugins/consoleShortcuts/index.ts
+++ b/src/plugins/consoleShortcuts/index.ts
@ -18,7 +18,6 @@

 import { Devs } from "@utils/constants";
 import { getCurrentChannel, getCurrentGuild } from "@utils/discord";
-import { runtimeHashMessageKey } from "@utils/intlHash";
 import { SYM_LAZY_CACHED, SYM_LAZY_GET } from "@utils/lazy";
 import { relaunch } from "@utils/native";
 import { canonicalizeMatch, canonicalizeReplace, canonicalizeReplacement } from "@utils/patches";
@ -105,7 +104,6 @@ function makeShortcuts() {
        canonicalizeMatch,
        canonicalizeReplace,
        canonicalizeReplacement,
-        runtimeHashMessageKey,
        fakeRender: (component: ComponentType, props: any) => {
            const prevWin = fakeRenderWin?.deref();
            const win = prevWin?.closed === false
--- a/src/plugins/copyFileContents/README.md
+++ b/src/plugins/copyFileContents/README.md
@ -1,5 +0,0 @@
-# CopyFileContents
-
-Adds a button to text file attachments to copy their contents.
-
-![](https://github.com/user-attachments/assets/b1a0f6f4-106f-4953-94d9-4c5ef5810bca)
--- a/src/plugins/copyFileContents/index.tsx
+++ b/src/plugins/copyFileContents/index.tsx
@ -1,60 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import "./style.css";
-
-import ErrorBoundary from "@components/ErrorBoundary";
-import { CopyIcon, NoEntrySignIcon } from "@components/Icons";
-import { Devs } from "@utils/constants";
-import { copyWithToast } from "@utils/misc";
-import definePlugin from "@utils/types";
-import { Tooltip, useState } from "@webpack/common";
-
-const CheckMarkIcon = () => {
-    return <svg width="24" height="24" viewBox="0 0 24 24">
-        <path fill="currentColor" d="M21.7 5.3a1 1 0 0 1 0 1.4l-12 12a1 1 0 0 1-1.4 0l-6-6a1 1 0 1 1 1.4-1.4L9 16.58l11.3-11.3a1 1 0 0 1 1.4 0Z"></path>
-    </svg>;
-};
-
-export default definePlugin({
-    name: "CopyFileContents",
-    description: "Adds a button to text file attachments to copy their contents",
-    authors: [Devs.Obsidian, Devs.Nuckyz],
-    patches: [
-        {
-            find: "#{intl::PREVIEW_BYTES_LEFT}",
-            replacement: {
-                match: /\.footerGap.+?url:\i,fileName:\i,fileSize:\i}\),(?<=fileContents:(\i),bytesLeft:(\i).+?)/g,
-                replace: "$&$self.addCopyButton({fileContents:$1,bytesLeft:$2}),"
-            }
-        }
-    ],
-
-    addCopyButton: ErrorBoundary.wrap(({ fileContents, bytesLeft }: { fileContents: string, bytesLeft: number; }) => {
-        const [recentlyCopied, setRecentlyCopied] = useState(false);
-
-        return (
-            <Tooltip text={recentlyCopied ? "Copied!" : bytesLeft > 0 ? "File too large to copy" : "Copy File Contents"}>
-                {tooltipProps => (
-                    <div
-                        {...tooltipProps}
-                        className="vc-cfc-button"
-                        role="button"
-                        onClick={() => {
-                            if (!recentlyCopied && bytesLeft <= 0) {
-                                copyWithToast(fileContents);
-                                setRecentlyCopied(true);
-                                setTimeout(() => setRecentlyCopied(false), 2000);
-                            }
-                        }}
-                    >
-                        {recentlyCopied ? <CheckMarkIcon /> : bytesLeft > 0 ? <NoEntrySignIcon color="var(--channel-icon)" /> : <CopyIcon />}
-                    </div>
-                )}
-            </Tooltip>
-        );
-    }, { noop: true }),
-});
--- a/src/plugins/copyFileContents/style.css
+++ b/src/plugins/copyFileContents/style.css
@ -1,9 +0,0 @@
-.vc-cfc-button {
-    color: var(--interactive-normal);
-    cursor: pointer;
-    padding-left: 4px;
-}
-
-.vc-cfc-button:hover {
-    color: var(--interactive-hover);
-}
--- a/src/plugins/crashHandler/index.ts
+++ b/src/plugins/crashHandler/index.ts
@ -67,7 +67,7 @@ export default definePlugin({

    patches: [
        {
-            find: "#{intl::ERRORS_UNEXPECTED_CRASH}",
+            find: ".Messages.ERRORS_UNEXPECTED_CRASH",
            replacement: {
                match: /this\.setState\((.+?)\)/,
                replace: "$self.handleCrash(this,$1);"
@ -175,7 +175,7 @@ export default definePlugin({
        }
        if (settings.store.attemptToNavigateToHome) {
            try {
-                NavigationRouter.transitionToGuild("@me");
+                NavigationRouter.transitionTo("/channels/@me");
            } catch (err) {
                CrashHandlerLogger.debug("Failed to navigate to home", err);
            }
--- a/src/plugins/ctrlEnterSend/index.ts
+++ b/src/plugins/ctrlEnterSend/index.ts
@ -39,15 +39,6 @@ export default definePlugin({
        }
    }),
    patches: [
-        // Only one of the two patches will be at effect; Discord often updates to switch between them.
-        // See: https://discord.com/channels/1015060230222131221/1032770730703716362/1261398512017477673
-        {
-            find: ".ENTER&&(!",
-            replacement: {
-                match: /(?<=(\i)\.which===\i\.\i.ENTER&&).{0,100}(\(0,\i\.\i\)\(\i\)).{0,100}(?=&&\(\i\.preventDefault)/,
-                replace: "$self.shouldSubmit($1, $2)"
-            }
-        },
        {
            find: "!this.hasOpenCodeBlock()",
            replacement: {
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@ -26,11 +26,12 @@ import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
 import { useAwaiter } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy, findComponentByCodeLazy } from "@webpack";
+import { findByCodeLazy, findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import { ApplicationAssetUtils, Button, FluxDispatcher, Forms, GuildStore, React, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common";

 const useProfileThemeStyle = findByCodeLazy("profileThemeStyle:", "--profile-gradient-primary-color");
 const ActivityComponent = findComponentByCodeLazy("onOpenGameProfile");
+const ActivityClassName = findByPropsLazy("activity", "buttonColor");

 const ShowCurrentGame = getUserSettingLazy<boolean>("status", "showCurrentGame")!;

@ -435,8 +436,8 @@ export default definePlugin({

                <Forms.FormDivider className={Margins.top8} />

-                <div style={{ width: "284px", ...profileThemeStyle, padding: 8, marginTop: 8, borderRadius: 8, background: "var(--bg-mod-faint)" }}>
-                    {activity[0] && <ActivityComponent activity={activity[0]} channelId={SelectedChannelStore.getChannelId()}
+                <div style={{ width: "284px", ...profileThemeStyle }}>
+                    {activity[0] && <ActivityComponent activity={activity[0]} className={ActivityClassName.activity} channelId={SelectedChannelStore.getChannelId()}
                        guild={GuildStore.getGuild(SelectedGuildStore.getLastSelectedGuildId())}
                        application={{ id: settings.store.appID }}
                        user={UserStore.getCurrentUser()} />}
--- a/src/plugins/customidle/index.ts
+++ b/src/plugins/customidle/index.ts
@ -37,8 +37,8 @@ export default definePlugin({
            find: 'type:"IDLE",idle:',
            replacement: [
                {
-                    match: /(?<=Date\.now\(\)-\i>)\i\.\i\|\|/,
-                    replace: "$self.getIdleTimeout()||"
+                    match: /(?<=Date\.now\(\)-\i>)\i\.\i/,
+                    replace: "$self.getIdleTimeout()"
                },
                {
                    match: /Math\.min\((\i\.\i\.getSetting\(\)\*\i\.\i\.\i\.SECOND),\i\.\i\)/,
--- a/src/plugins/dearrow/index.tsx
+++ b/src/plugins/dearrow/index.tsx
@ -46,7 +46,7 @@ const embedUrlRe = /https:\/\/www\.youtube\.com\/embed\/([a-zA-Z0-9_-]{11})/;
 async function embedDidMount(this: Component<Props>) {
    try {
        const { embed } = this.props;
-        const { replaceElements, dearrowByDefault } = settings.store;
+        const { replaceElements } = settings.store;

        if (!embed || embed.dearrow || embed.provider?.name !== "YouTube" || !embed.video?.url) return;

@ -63,22 +63,18 @@ async function embedDidMount(this: Component<Props>) {

        if (!hasTitle && !hasThumb) return;

-
        embed.dearrow = {
-            enabled: dearrowByDefault
+            enabled: true
        };

        if (hasTitle && replaceElements !== ReplaceElements.ReplaceThumbnailsOnly) {
-            const replacementTitle = titles[0].title.replace(/(^|\s)>(\S)/g, "$1$2");
-
-            embed.dearrow.oldTitle = dearrowByDefault ? embed.rawTitle : replacementTitle;
-            if (dearrowByDefault) embed.rawTitle = replacementTitle;
+            embed.dearrow.oldTitle = embed.rawTitle;
+            embed.rawTitle = titles[0].title.replace(/(^|\s)>(\S)/g, "$1$2");
        }
-        if (hasThumb && replaceElements !== ReplaceElements.ReplaceTitlesOnly) {
-            const replacementProxyURL = `https://dearrow-thumb.ajay.app/api/v1/getThumbnail?videoID=${videoId}&time=${thumbnails[0].timestamp}`;

-            embed.dearrow.oldThumb = dearrowByDefault ? embed.thumbnail.proxyURL : replacementProxyURL;
-            if (dearrowByDefault) embed.thumbnail.proxyURL = replacementProxyURL;
+        if (hasThumb && replaceElements !== ReplaceElements.ReplaceTitlesOnly) {
+            embed.dearrow.oldThumb = embed.thumbnail.proxyURL;
+            embed.thumbnail.proxyURL = `https://dearrow-thumb.ajay.app/api/v1/getThumbnail?videoID=${videoId}&time=${thumbnails[0].timestamp}`;
        }

        this.forceUpdate();
@ -100,7 +96,6 @@ function DearrowButton({ component }: { component: Component<Props>; }) {
                    className={"vc-dearrow-toggle-" + (embed.dearrow.enabled ? "on" : "off")}
                    onClick={() => {
                        const { enabled, oldThumb, oldTitle } = embed.dearrow;
-                        settings.store.dearrowByDefault = !enabled;
                        embed.dearrow.enabled = !enabled;
                        if (oldTitle) {
                            embed.dearrow.oldTitle = embed.rawTitle;
@ -158,12 +153,6 @@ const settings = definePluginSettings({
            { label: "Titles", value: ReplaceElements.ReplaceTitlesOnly },
            { label: "Thumbnails", value: ReplaceElements.ReplaceThumbnailsOnly },
        ],
-    },
-    dearrowByDefault: {
-        description: "Dearrow videos automatically",
-        type: OptionType.BOOLEAN,
-        default: true,
-        restartNeeded: false
    }
 });

--- a/src/plugins/decor/index.tsx
+++ b/src/plugins/decor/index.tsx
@ -41,7 +41,7 @@ export default definePlugin({
        {
            find: "DefaultCustomizationSections",
            replacement: {
-                match: /(?<=#{intl::USER_SETTINGS_AVATAR_DECORATION}\)},"decoration"\),)/,
+                match: /(?<=USER_SETTINGS_AVATAR_DECORATION},"decoration"\),)/,
                replace: "$self.DecorSection(),"
            }
        },
@ -54,7 +54,7 @@ export default definePlugin({
                    replace: "$self.DecorationGridItem=$&"
                },
                {
-                    match: /(?<==)\i=>{let{user:\i,avatarDecoration/,
+                    match: /(?<==)\i=>{let{user:\i,avatarDecoration.{300,600}decorationGridItemChurned/,
                    replace: "$self.DecorationGridDecoration=$&"
                },
                // Remove NEW label from decor avatar decorations
@ -91,7 +91,7 @@ export default definePlugin({
            replacement: [
                // Use Decor avatar decoration hook
                {
-                    match: /(?<=\i\)\({avatarDecoration:)(\i)(?=,)(?<=currentUser:(\i).+?)/,
+                    match: /(?<=\i\)\({avatarDecoration:)(\i).avatarDecoration(?=,)/,
                    replace: "$self.useUserDecorAvatarDecoration($1)??$&"
                }
            ]
--- a/src/plugins/decor/ui/components/DecorationGridCreate.tsx
+++ b/src/plugins/decor/ui/components/DecorationGridCreate.tsx
@ -5,8 +5,7 @@
 */

 import { PlusIcon } from "@components/Icons";
-import { getIntlMessage } from "@utils/discord";
-import { Text } from "@webpack/common";
+import { i18n, Text } from "@webpack/common";
 import { HTMLProps } from "react";

 import { DecorationGridItem } from ".";
@ -25,7 +24,7 @@ export default function DecorationGridCreate(props: DecorationGridCreateProps) {
            variant="text-xs/normal"
            color="header-primary"
        >
-            {getIntlMessage("CREATE")}
+            {i18n.Messages.CREATE}
        </Text>
    </DecorationGridItem >;
 }
--- a/src/plugins/decor/ui/components/DecorationGridNone.tsx
+++ b/src/plugins/decor/ui/components/DecorationGridNone.tsx
@ -5,8 +5,7 @@
 */

 import { NoEntrySignIcon } from "@components/Icons";
-import { getIntlMessage } from "@utils/discord";
-import { Text } from "@webpack/common";
+import { i18n, Text } from "@webpack/common";
 import { HTMLProps } from "react";

 import { DecorationGridItem } from ".";
@ -25,7 +24,7 @@ export default function DecorationGridNone(props: DecorationGridNoneProps) {
            variant="text-xs/normal"
            color="header-primary"
        >
-            {getIntlMessage("NONE")}
+            {i18n.Messages.NONE}
        </Text>
    </DecorationGridItem >;
 }
--- a/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx
+++ b/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx
@ -8,7 +8,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { openInviteModal } from "@utils/discord";
 import { Margins } from "@utils/margins";
-import { classes, copyWithToast } from "@utils/misc";
+import { classes } from "@utils/misc";
 import { closeAllModals, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { findComponentByCodeLazy } from "@webpack";
 import { Alerts, Button, FluxDispatcher, Forms, GuildStore, NavigationRouter, Parser, Text, Tooltip, useEffect, UserStore, UserUtils, useState } from "@webpack/common";
@ -45,11 +45,7 @@ interface Section {
    authorIds?: string[];
 }

-interface SectionHeaderProps {
-    section: Section;
-}
-
-function SectionHeader({ section }: SectionHeaderProps) {
+function SectionHeader({ section }: { section: Section; }) {
    const hasSubtitle = typeof section.subtitle !== "undefined";
    const hasAuthorIds = typeof section.authorIds !== "undefined";

@ -66,7 +62,6 @@ function SectionHeader({ section }: SectionHeaderProps) {
        })();
    }, [section.authorIds]);

-
    return <div>
        <Flex>
            <Forms.FormTitle style={{ flexGrow: 1 }}>{section.title}</Forms.FormTitle>
@ -79,7 +74,8 @@ function SectionHeader({ section }: SectionHeaderProps) {
                size={16}
                showUserPopout
                className={Margins.bottom8}
-            />}
+            />
+            }
        </Flex>
        {hasSubtitle &&
            <Forms.FormText type="description" className={Margins.bottom8}>
@ -208,16 +204,7 @@ function ChangeDecorationModal(props: ModalProps) {
                            {activeSelectedDecoration?.alt}
                        </Text>
                    }
-                    {activeDecorationHasAuthor && (
-                        <Text key={`createdBy-${activeSelectedDecoration.authorId}`}>
-                            Created by {Parser.parse(`<@${activeSelectedDecoration.authorId}>`)}
-                        </Text>
-                    )}
-                    {isActiveDecorationPreset && (
-                        <Button onClick={() => copyWithToast(activeDecorationPreset.id)}>
-                            Copy Preset ID
-                        </Button>
-                    )}
+                    {activeDecorationHasAuthor && <Text key={`createdBy-${activeSelectedDecoration.authorId}`}>Created by {Parser.parse(`<@${activeSelectedDecoration.authorId}>`)}</Text>}
                </div>
            </ErrorBoundary>
        </ModalContent>
--- a/src/plugins/disableCallIdle/index.ts
+++ b/src/plugins/disableCallIdle/index.ts
@ -27,7 +27,7 @@ export default definePlugin({
    authors: [Devs.Nuckyz],
    patches: [
        {
-            find: "#{intl::BOT_CALL_IDLE_DISCONNECT_2}",
+            find: ".Messages.BOT_CALL_IDLE_DISCONNECT",
            replacement: {
                match: /,?(?=\i\(this,"idleTimeout",new \i\.\i\))/,
                replace: ";return;"
--- a/src/plugins/editUsers/data.ts
+++ b/src/plugins/editUsers/data.ts
@ -0,0 +1,42 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+
+export const enum OverrideFlags {
+    None = 0,
+    PreferServerNicks = 1 << 0,
+    DisableNicks = 1 << 1,
+    KeepServerAvatar = 1 << 2,
+    DisableServerAvatars = 1 << 3,
+    KeepServerBanner = 1 << 4,
+    DisableServerBanners = 1 << 5,
+}
+
+export interface UserOverride {
+    username: string;
+    avatarUrl: string;
+    bannerUrl: string;
+    pronouns: string;
+    flags: OverrideFlags;
+}
+
+export const emptyOverride: UserOverride = Object.freeze({
+    username: "",
+    avatarUrl: "",
+    bannerUrl: "",
+    pronouns: "",
+    flags: OverrideFlags.None,
+});
+
+export const settings = definePluginSettings({})
+    .withPrivateSettings<{
+        users?: Record<string, UserOverride>;
+    }>();
+
+export const getUserOverride = (userId: string) => settings.store.users?.[userId] ?? emptyOverride;
+
+export const hasFlag = (field: OverrideFlags, flag: OverrideFlags) => (field & flag) === flag;
--- a/src/plugins/editUsers/index.tsx
+++ b/src/plugins/editUsers/index.tsx
@ -0,0 +1,125 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./styles.css";
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { Menu } from "@webpack/common";
+import { User } from "discord-types/general";
+
+import { getUserOverride, hasFlag, OverrideFlags, settings } from "./data";
+import { openUserEditModal } from "./modal";
+
+export default definePlugin({
+    name: "EditUsers",
+    description: "Edit users",
+    authors: [Devs.Ven],
+
+    settings,
+
+    contextMenus: {
+        "user-context"(children, { user }: { user?: User; }) {
+            if (!user) return;
+
+            children.push(
+                <Menu.MenuItem
+                    id="vc-edit-user"
+                    label="Edit User"
+                    action={() => openUserEditModal(user)}
+                />
+            );
+        }
+    },
+
+    patches: [
+        {
+            find: ",getUserTag:",
+            replacement: {
+                match: /if\(\i\((\i)\.global_name\)\)return(?=.{0,100}return"\?\?\?")/,
+                replace: "const vcEuName=$self.getUsername($1);if(vcEuName)return vcEuName;$&"
+            }
+        },
+        {
+            find: "=this.guildMemberAvatars[",
+            replacement: [
+                {
+                    match: /&&null!=this\.guildMemberAvatars\[\i\]/,
+                    replace: "$& && !$self.shouldIgnoreGuildAvatar(this)"
+                },
+                {
+                    match: /(?<=null!=(\i))\?(\i\.\i\.getGuildMemberAvatarURLSimple.+?):(?=\i\.\i\.getUserAvatarURL\(this)/,
+                    replace: "&& this.hasAvatarForGuild?.($1) ? $2 : $self.getAvatarUrl(this)||"
+                }
+            ]
+        },
+        {
+            find: "this.isUsingGuildMemberBanner()",
+            replacement: [
+                {
+                    match: /:\i\.banner\)!=null/,
+                    replace: "$& && !$self.shouldIgnoreGuildBanner(this.userId)"
+                },
+                {
+                    match: /(?<=:).{0,10}\(\{id:this\.userId,banner/,
+                    replace: "$self.getBannerUrl(this.userId)||$&"
+                },
+                {
+                    match: /isUsingGuildMemberPronouns\(\)\{/,
+                    replace:
+                        "set pronouns(v){this._vcPronouns=v}" +
+                        "get pronouns(){return $self.getPronouns(this.userId)||this._vcPronouns}" +
+                        "isUsingGuildMemberPronouns(){"
+                },
+                {
+                    match: /\i\(this,"pronouns",void 0\),/,
+                    replace: ""
+                }
+            ]
+        },
+        {
+            find: '"GuildMemberStore"',
+            replacement: {
+                match: /getNick\(\i,(\i)\)\{/,
+                replace: "$& if ($self.shouldIgnoreNick($1)) return null;"
+            }
+        }
+    ],
+
+    getUsername: (user: User) => getUserOverride(user.id).username,
+    getAvatarUrl: (user: User) => getUserOverride(user.id).avatarUrl,
+    getBannerUrl: (userId: string) => getUserOverride(userId).bannerUrl,
+    getPronouns: (userId: string) => getUserOverride(userId).pronouns,
+
+    shouldIgnoreGuildAvatar(user: User) {
+        const { avatarUrl, flags } = getUserOverride(user.id);
+
+        if (avatarUrl && !hasFlag(flags, OverrideFlags.KeepServerAvatar))
+            return true;
+
+        return hasFlag(flags, OverrideFlags.DisableServerAvatars);
+    },
+
+    shouldIgnoreGuildBanner(userId: string) {
+        const { bannerUrl, flags } = getUserOverride(userId);
+
+        if (bannerUrl && !hasFlag(flags, OverrideFlags.KeepServerBanner))
+            return true;
+
+        return hasFlag(flags, OverrideFlags.DisableServerBanners);
+    },
+
+    shouldIgnoreNick(userId?: string) {
+        if (!userId) return false;
+
+        const { username, flags } = getUserOverride(userId);
+
+        if (username && !hasFlag(flags, OverrideFlags.PreferServerNicks))
+            return true;
+
+        return hasFlag(flags, OverrideFlags.DisableNicks);
+    }
+});
--- a/src/plugins/editUsers/modal.tsx
+++ b/src/plugins/editUsers/modal.tsx
@ -0,0 +1,170 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { classNameFactory } from "@api/Styles";
+import { Flex } from "@components/Flex";
+import { Margins } from "@utils/margins";
+import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { Button, DisplayProfileUtils, showToast, Switch, TabBar, Text, TextInput, Toasts, UsernameUtils, useState } from "@webpack/common";
+import { User } from "discord-types/general";
+import type { Dispatch, SetStateAction } from "react";
+
+import { emptyOverride, hasFlag, OverrideFlags, settings, UserOverride } from "./data";
+
+const cl = classNameFactory("vc-editUsers-");
+
+interface OverrideProps {
+    override: UserOverride;
+    setOverride: Dispatch<SetStateAction<UserOverride>>;
+}
+
+interface SettingsRowProps extends OverrideProps {
+    overrideKey: keyof Omit<UserOverride, "flags">;
+    name: string;
+    flagDisable: OverrideFlags;
+    flagPrefer: OverrideFlags;
+    placeholder: string;
+}
+
+function SettingsRow(props: SettingsRowProps) {
+    const { name, override, setOverride, overrideKey, placeholder, flagDisable, flagPrefer } = props;
+    const namePlural = name + "s";
+    const { flags } = override;
+
+    const toggleFlag = (on: boolean, flag: OverrideFlags) =>
+        on
+            ? flags | flag
+            : flags & ~flag;
+
+    return (
+        <>
+            <TextInput
+                className={Margins.bottom16}
+                value={override[overrideKey]}
+                onChange={v => setOverride(o => ({ ...o, [overrideKey]: v }))}
+                placeholder={placeholder}
+                autoFocus
+            />
+            <Switch
+                value={hasFlag(flags, flagDisable)}
+                onChange={v => setOverride(o => ({ ...o, flags: toggleFlag(v, flagDisable) }))}
+                note={`Will use the user's global ${name} (or your EditUser configured ${name}) over server specific ${namePlural}`}
+            >
+                Disable server specific {namePlural}
+            </Switch>
+            <Switch
+                value={hasFlag(flags, flagPrefer)}
+                onChange={v => setOverride(o => ({ ...o, flags: toggleFlag(v, flagPrefer) }))}
+                note={`Will use server specific ${namePlural} over the EditUser configured ${name}`}
+                hideBorder
+            >
+                Prefer server specific {namePlural}
+            </Switch>
+        </>
+    );
+}
+
+const Tabs = {
+    username: {
+        name: "Username",
+        flagDisable: OverrideFlags.DisableNicks,
+        flagPrefer: OverrideFlags.PreferServerNicks,
+        placeholder: (user: User) => UsernameUtils.getName(user),
+    },
+    avatarUrl: {
+        name: "Avatar",
+        flagDisable: OverrideFlags.DisableServerAvatars,
+        flagPrefer: OverrideFlags.KeepServerAvatar,
+        placeholder: (user: User) => user.getAvatarURL(),
+    },
+    bannerUrl: {
+        name: "Banner",
+        flagDisable: OverrideFlags.DisableServerBanners,
+        flagPrefer: OverrideFlags.KeepServerBanner,
+        placeholder: (user: User) => DisplayProfileUtils.getDisplayProfile(user.id)?.getBannerURL({ canAnimate: true, size: 64 }) ?? "",
+    },
+} as const;
+const TabKeys = Object.keys(Tabs) as (keyof typeof Tabs)[];
+
+function EditTabs({ user, override, setOverride }: { user: User; } & OverrideProps) {
+    const [currentTabName, setCurrentTabName] = useState(TabKeys[0]);
+
+    const currentTab = Tabs[currentTabName];
+
+    return (
+        <>
+            <TabBar
+                type="top"
+                look="brand"
+                className={cl("tabBar")}
+                selectedItem={currentTabName}
+                onItemSelect={setCurrentTabName}
+            >
+                {TabKeys.map(key => (
+                    <TabBar.Item
+                        id={key}
+                        key={key}
+                        className={cl("tab")}
+                    >
+                        {Tabs[key].name}
+                    </TabBar.Item>
+                ))}
+            </TabBar>
+
+            <SettingsRow
+                {...currentTab}
+                override={override}
+                overrideKey={currentTabName}
+                setOverride={setOverride}
+                placeholder={currentTab.placeholder(user)}
+            />
+        </>
+    );
+}
+
+function EditModal({ user, modalProps }: { user: User; modalProps: ModalProps; }) {
+    const [override, setOverride] = useState(() => ({ ...settings.store.users?.[user.id] ?? emptyOverride }));
+
+    return (
+        <ModalRoot {...modalProps} size={ModalSize.MEDIUM}>
+            <ModalHeader>
+                <Text variant="heading-lg/semibold" style={{ flexGrow: 1 }}>Edit User {user.username}</Text>
+                <ModalCloseButton onClick={modalProps.onClose} />
+            </ModalHeader>
+
+            <ModalContent>
+                <div className={cl("modal")}>
+                    <EditTabs user={user} override={override} setOverride={setOverride} />
+                </div>
+            </ModalContent>
+
+            <ModalFooter>
+                <Flex>
+                    <Button
+                        color={Button.Colors.RED}
+                        onClick={() => setOverride({ ...emptyOverride })}
+                    >
+                        Reset All
+                    </Button>
+                    <Button
+                        onClick={() => {
+                            const s = settings.store.users ??= {};
+                            s[user.id] = override;
+                            modalProps.onClose();
+                            showToast("Saved! Switch chats for changes to apply everywhere", Toasts.Type.SUCCESS, { position: Toasts.Position.BOTTOM });
+                        }}
+                    >
+                        Save
+                    </Button>
+                </Flex>
+            </ModalFooter>
+        </ModalRoot>
+    );
+}
+
+export function openUserEditModal(user: User) {
+    openModal(props => <EditModal user={user} modalProps={props} />);
+}
--- a/src/plugins/editUsers/styles.css
+++ b/src/plugins/editUsers/styles.css
@ -0,0 +1,14 @@
+.vc-editUsers-modal {
+    padding: 1em 0;
+}
+
+.vc-editUsers-tabBar {
+    gap: 1em;
+    margin-bottom: 16px;
+    border-bottom: 2px solid var(--background-modifier-accent);
+}
+
+.vc-editUsers-tab {
+    padding-bottom: 8px;
+}
+
--- a/src/plugins/experiments/index.tsx
+++ b/src/plugins/experiments/index.tsx
@ -23,13 +23,12 @@ import { ErrorCard } from "@components/ErrorCard";
 import { Devs } from "@utils/constants";
 import { Margins } from "@utils/margins";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { Forms, React } from "@webpack/common";

 import hideBugReport from "./hideBugReport.css?managed";

 const KbdStyles = findByPropsLazy("key", "combo");
-const BugReporterExperiment = findLazy(m => m?.definition?.id === "2024-09_bug_reporter");

 const settings = definePluginSettings({
    toolbarDevMenu: {
@ -79,8 +78,8 @@ export default definePlugin({
        {
            find: "toolbar:function",
            replacement: {
-                match: /hasBugReporterAccess:(\i)/,
-                replace: "_hasBugReporterAccess:$1=true"
+                match: /\i\.isStaff\(\)/,
+                replace: "true"
            },
            predicate: () => settings.store.toolbarDevMenu
        },
@ -89,21 +88,13 @@ export default definePlugin({
        {
            find: "useCanFavoriteChannel",
            replacement: {
-                match: /\i\.isDM\(\)\|\|\i\.isThread\(\)/,
-                replace: "false",
-            }
-        },
-        // enable option to always record clips even if you are not streaming
-        {
-            find: "isDecoupledGameClippingEnabled(){",
-            replacement: {
-                match: /\i\.isStaff\(\)/,
-                replace: "true"
+                match: /!\(\i\.isDM\(\)\|\|\i\.isThread\(\)\)/,
+                replace: "true",
            }
        }
    ],

-    start: () => !BugReporterExperiment.getCurrentConfig().hasBugReporterAccess && enableStyle(hideBugReport),
+    start: () => enableStyle(hideBugReport),
    stop: () => disableStyle(hideBugReport),

    settingsAboutComponent: () => {
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@ -22,9 +22,9 @@ import { Devs } from "@utils/constants";
 import { ApngBlendOp, ApngDisposeOp, importApngJs } from "@utils/dependencies";
 import { getCurrentGuild } from "@utils/discord";
 import { Logger } from "@utils/Logger";
-import definePlugin, { OptionType, Patch } from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy, findStoreLazy, proxyLazyWebpack } from "@webpack";
-import { Alerts, ChannelStore, DraftType, EmojiStore, FluxDispatcher, Forms, GuildMemberStore, IconUtils, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
+import { Alerts, ChannelStore, DraftType, EmojiStore, FluxDispatcher, Forms, IconUtils, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
 import type { Emoji } from "@webpack/types";
 import type { Message } from "discord-types/general";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
@ -194,26 +194,6 @@ const hasExternalStickerPerms = (channelId: string) => hasPermission(channelId,
 const hasEmbedPerms = (channelId: string) => hasPermission(channelId, PermissionsBits.EMBED_LINKS);
 const hasAttachmentPerms = (channelId: string) => hasPermission(channelId, PermissionsBits.ATTACH_FILES);

-function makeBypassPatches(): Omit<Patch, "plugin"> {
-    const mapping: Array<{ func: string, predicate?: () => boolean; }> = [
-        { func: "canUseCustomStickersEverywhere", predicate: () => settings.store.enableStickerBypass },
-        { func: "canUseHighVideoUploadQuality", predicate: () => settings.store.enableStreamQualityBypass },
-        { func: "canStreamQuality", predicate: () => settings.store.enableStreamQualityBypass },
-        { func: "canUseClientThemes" },
-        { func: "canUseCustomNotificationSounds" },
-        { func: "canUsePremiumAppIcons" }
-    ];
-
-    return {
-        find: "canUseCustomStickersEverywhere:",
-        replacement: mapping.map(({ func, predicate }) => ({
-            match: new RegExp(String.raw`(?<=${func}:function\(\i(?:,\i)?\){)`),
-            replace: "return true;",
-            predicate
-        }))
-    };
-}
-
 export default definePlugin({
    name: "FakeNitro",
    authors: [Devs.Arjix, Devs.D3SOX, Devs.Ven, Devs.fawn, Devs.captain, Devs.Nuckyz, Devs.AutumnVN],
@ -223,17 +203,6 @@ export default definePlugin({
    settings,

    patches: [
-        // General bypass patches
-        makeBypassPatches(),
-        // Patch the emoji picker in voice calls to not be bypassed by fake nitro
-        {
-            find: "emojiItemDisabled]",
-            predicate: () => settings.store.enableEmojiBypass,
-            replacement: {
-                match: /CHAT/,
-                replace: "STATUS"
-            }
-        },
        {
            find: ".PREMIUM_LOCKED;",
            group: true,
@ -274,6 +243,15 @@ export default definePlugin({
                replace: (_, rest1, rest2) => `${rest1},fakeNitroOriginal){if(!fakeNitroOriginal)return false;${rest2}`
            }
        },
+        // Allow stickers to be sent everywhere
+        {
+            find: "canUseCustomStickersEverywhere:function",
+            predicate: () => settings.store.enableStickerBypass,
+            replacement: {
+                match: /canUseCustomStickersEverywhere:function\(\i\){/,
+                replace: "$&return true;"
+            },
+        },
        // Make stickers always available
        {
            find: '"SENDABLE"',
@ -283,15 +261,37 @@ export default definePlugin({
                replace: "true?"
            }
        },
+        // Allow streaming with high quality
+        {
+            find: "canUseHighVideoUploadQuality:function",
+            predicate: () => settings.store.enableStreamQualityBypass,
+            replacement: [
+                "canUseHighVideoUploadQuality",
+                "canStreamQuality",
+            ].map(func => {
+                return {
+                    match: new RegExp(`${func}:function\\(\\i(?:,\\i)?\\){`, "g"),
+                    replace: "$&return true;"
+                };
+            })
+        },
        // Remove boost requirements to stream with high quality
        {
-            find: "#{intl::STREAM_FPS_OPTION}",
+            find: "STREAM_FPS_OPTION.format",
            predicate: () => settings.store.enableStreamQualityBypass,
            replacement: {
                match: /guildPremiumTier:\i\.\i\.TIER_\d,?/g,
                replace: ""
            }
        },
+        // Allow client themes to be changeable
+        {
+            find: "canUseClientThemes:function",
+            replacement: {
+                match: /canUseClientThemes:function\(\i\){/,
+                replace: "$&return true;"
+            }
+        },
        {
            find: '"UserSettingsProtoStore"',
            replacement: [
@ -350,13 +350,13 @@ export default definePlugin({
                {
                    // Filter attachments to remove fake nitro stickers or emojis
                    predicate: () => settings.store.transformStickers,
-                    match: /renderAttachments\(\i\){.+?{attachments:(\i).+?;/,
+                    match: /renderAttachments\(\i\){let{attachments:(\i).+?;/,
                    replace: (m, attachments) => `${m}${attachments}=$self.filterAttachments(${attachments});`
                }
            ]
        },
        {
-            find: "#{intl::STICKER_POPOUT_UNJOINED_PRIVATE_GUILD_DESCRIPTION}",
+            find: ".Messages.STICKER_POPOUT_UNJOINED_PRIVATE_GUILD_DESCRIPTION.format",
            predicate: () => settings.store.transformStickers,
            replacement: [
                {
@ -381,7 +381,7 @@ export default definePlugin({
            }
        },
        {
-            find: "#{intl::EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION}",
+            find: ".Messages.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION",
            predicate: () => settings.store.transformEmojis,
            replacement: {
                // Add the fake nitro emoji notice
@ -389,6 +389,14 @@ export default definePlugin({
                replace: (_, reactNode, props) => `$self.addFakeNotice(${FakeNoticeType.Emoji},${reactNode},!!${props}?.fakeNitroNode?.fake)`
            }
        },
+        // Allow using custom app icons
+        {
+            find: "canUsePremiumAppIcons:function",
+            replacement: {
+                match: /canUsePremiumAppIcons:function\(\i\){/,
+                replace: "$&return true;"
+            }
+        },
        // Separate patch for allowing using custom app icons
        {
            find: /\.getCurrentDesktopIcon.{0,25}\.isPremium/,
@ -404,6 +412,14 @@ export default definePlugin({
                match: /(?<=type:"(?:SOUNDBOARD_SOUNDS_RECEIVED|GUILD_SOUNDBOARD_SOUND_CREATE|GUILD_SOUNDBOARD_SOUND_UPDATE|GUILD_SOUNDBOARD_SOUNDS_UPDATE)".+?available:)\i\.available/g,
                replace: "true"
            }
+        },
+        // Allow using custom notification sounds
+        {
+            find: "canUseCustomNotificationSounds:function",
+            replacement: {
+                match: /canUseCustomNotificationSounds:function\(\i\){/,
+                replace: "$&return true;"
+            }
        }
    ],

@ -802,14 +818,7 @@ export default definePlugin({

        if (isUnusableRoleSubscriptionEmoji(e, this.guildId, true)) return false;

-        let isUsableTwitchSubEmote = false;
-        if (e.managed && e.guildId) {
-            // @ts-ignore outdated type
-            const myRoles = GuildMemberStore.getSelfMember(e.guildId)?.roles ?? [];
-            isUsableTwitchSubEmote = e.roles.some(r => myRoles.includes(r));
-        }
-
-        if (this.canUseEmotes || isUsableTwitchSubEmote)
+        if (this.canUseEmotes)
            return e.guildId === this.guildId || hasExternalEmojiPerms(channelId);
        else
            return !e.animated && e.guildId === this.guildId;
--- a/src/plugins/fakeProfileThemes/index.tsx
+++ b/src/plugins/fakeProfileThemes/index.tsx
@ -57,7 +57,7 @@ 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}]{1,6})\u{e002c}\u{e0023}([\u{e0061}-\u{e0066}\u{e0041}-\u{e0046}\u{e0030}-\u{e0039}]{1,6})\u{e005d}/u,
+        /\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]]
@ -108,10 +108,10 @@ interface ProfileModalProps {
    isTryItOutFlow: boolean;
 }

-const ColorPicker = findComponentByCodeLazy<ColorPickerProps>("#{intl::USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR}", ".BACKGROUND_PRIMARY)");
+const ColorPicker = findComponentByCodeLazy<ColorPickerProps>(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)");
 const ProfileModal = findComponentByCodeLazy<ProfileModalProps>("isTryItOutFlow:", "pendingThemeColors:", "pendingAvatarDecoration:", "EDIT_PROFILE_BANNER");

-const requireColorPicker = extractAndLoadChunksLazy(["#{intl::USER_SETTINGS_PROFILE_COLOR_DEFAULT_BUTTON}"], /createPromise:\(\)=>\i\.\i(\("?.+?"?\)).then\(\i\.bind\(\i,"?(.+?)"?\)\)/);
+const requireColorPicker = extractAndLoadChunksLazy(["USER_SETTINGS_PROFILE_COLOR_DEFAULT_BUTTON.format"], /createPromise:\(\)=>\i\.\i(\("?.+?"?\)).then\(\i\.bind\(\i,"?(.+?)"?\)\)/);

 export default definePlugin({
    name: "FakeProfileThemes",
@ -121,14 +121,14 @@ export default definePlugin({
        {
            find: "UserProfileStore",
            replacement: {
-                match: /(?<=getUserProfile\(\i\){return )(.+?)(?=})/,
+                match: /(?<=getUserProfile\(\i\){return )(\i\[\i\])/,
                replace: "$self.colorDecodeHook($1)"
            }
        },
        {
-            find: "#{intl::USER_SETTINGS_RESET_PROFILE_THEME}",
+            find: ".USER_SETTINGS_RESET_PROFILE_THEME",
            replacement: {
-                match: /#{intl::USER_SETTINGS_RESET_PROFILE_THEME}\)}\)(?<=color:(\i),.{0,500}?color:(\i),.{0,500}?)/,
+                match: /RESET_PROFILE_THEME}\)(?<=color:(\i),.{0,500}?color:(\i),.{0,500}?)/,
                replace: "$&,$self.addCopy3y3Button({primary:$1,accent:$2})"
            }
        }
--- a/src/plugins/fixImagesQuality/README.md
+++ b/src/plugins/fixImagesQuality/README.md
@ -1,3 +0,0 @@
-# Fix Images Quality
-
-Prevents images from being loaded as webp, which can cause quality loss
--- a/src/plugins/forceOwnerCrown/index.ts
+++ b/src/plugins/forceOwnerCrown/index.ts
@ -27,7 +27,7 @@ export default definePlugin({
    authors: [Devs.D3SOX, Devs.Nickyux],
    patches: [
        {
-            find: "#{intl::GUILD_OWNER}",
+            find: ".PREMIUM_GUILD_SUBSCRIPTION_TOOLTIP",
            replacement: {
                match: /,isOwner:(\i),/,
                replace: ",_isOwner:$1=$self.isGuildOwner(e),"
--- a/src/plugins/friendInvites/index.ts
+++ b/src/plugins/friendInvites/index.ts
@ -27,6 +27,7 @@ export default definePlugin({
    name: "FriendInvites",
    description: "Create and manage friend invite links via slash commands (/create friend invite, /view friend invites, /revoke friend invites).",
    authors: [Devs.afn, Devs.Dziurwa],
+    dependencies: ["CommandsAPI"],
    commands: [
        {
            name: "create friend invite",
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
vee	0a51a865d3	Merge branch 'dev' into edit-users	2024-07-06 19:05:58 +02:00
Vendicated	560fb982e6	BetterNotes: fix crashing	2024-07-03 21:38:21 +02:00
Vendicated	f4572d0377	fix overriding avatars in guilds	2024-07-03 18:07:11 +02:00
Vendicated	3a7499644e	add pronouns, add nicks (kinda)	2024-07-03 17:24:29 +02:00
vee	1a2033e137	Merge branch 'dev' into edit-users	2024-07-03 16:49:17 +02:00
Vendicated	1bdde745e2	Merge branch 'dev' into edit-users	2024-07-02 22:10:35 +02:00
Vendicated	b333deb731	improve settings ui (again)	2024-07-02 18:51:51 +02:00
Vendicated	e0bb9bf77d	add ui and stuffs	2024-07-02 17:39:48 +02:00
Vendicated	c73c3fa636	sajidfjiasdjiodjioasjiod	2024-07-02 00:17:40 +02:00