Merge branch 'main' into emoteCloner

.eslintrc.json

@@ -1,98 +0,0 @@
-{
-    "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"
-    }
-}

.stylelintrc.json

@@ -1,7 +1,6 @@
 {
     "extends": "stylelint-config-standard",
     "rules": {
-        "indentation": 4,
         "selector-class-pattern": [
             "^[a-z][a-zA-Z0-9]*(-[a-z0-9][a-zA-Z0-9]*)*$",
             {

.vscode/settings.json

@@ -14,8 +14,6 @@
     "typescript.preferences.quoteStyle": "double",
     "javascript.preferences.quoteStyle": "double",
 
-    "eslint.experimental.useFlatConfig": false,
-
     "gitlens.remotes": [
         {
             "domain": "codeberg.org",

eslint.config.mjs

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

package.json

@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.9.6",
+    "version": "1.9.9",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {
@@ -27,7 +27,7 @@
         "generateTypes": "tspc --emitDeclarationOnly --declaration --outDir packages/vencord-types",
         "inject": "node scripts/runInstaller.mjs",
         "uninject": "node scripts/runInstaller.mjs",
-        "lint": "eslint . --ext .js,.jsx,.ts,.tsx --ignore-pattern src/userplugins",
+        "lint": "eslint",
         "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,53 +35,54 @@
         "testTsc": "tsc --noEmit"
     },
     "dependencies": {
-        "@sapphi-red/web-noise-suppressor": "0.3.3",
+        "@sapphi-red/web-noise-suppressor": "0.3.5",
         "@vap/core": "0.0.12",
         "@vap/shiki": "0.10.5",
-        "eslint-plugin-simple-header": "^1.0.2",
+        "fflate": "^0.8.2",
-        "fflate": "^0.7.4",
         "gifenc": "github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3",
         "monaco-editor": "^0.50.0",
-        "nanoid": "^4.0.2",
+        "nanoid": "^5.0.7",
         "virtual-merge": "^1.0.1"
     },
     "devDependencies": {
-        "@types/chrome": "^0.0.246",
+        "@stylistic/eslint-plugin": "^2.6.1",
-        "@types/diff": "^5.0.3",
+        "@types/chrome": "^0.0.269",
-        "@types/lodash": "^4.14.194",
+        "@types/diff": "^5.2.1",
-        "@types/node": "^18.16.3",
+        "@types/lodash": "^4.17.7",
-        "@types/react": "^18.2.0",
+        "@types/node": "^22.0.3",
-        "@types/react-dom": "^18.2.1",
+        "@types/react": "^18.3.3",
-        "@types/yazl": "^2.4.2",
+        "@types/react-dom": "^18.3.0",
-        "@typescript-eslint/eslint-plugin": "^5.59.1",
+        "@types/yazl": "^2.4.5",
-        "@typescript-eslint/parser": "^5.59.1",
+        "diff": "^5.2.0",
-        "diff": "^5.1.0",
         "discord-types": "^1.3.26",
         "esbuild": "^0.15.18",
-        "eslint": "^8.46.0",
+        "eslint": "^9.8.0",
         "eslint-import-resolver-alias": "^1.1.2",
-        "eslint-plugin-path-alias": "^1.0.0",
+        "eslint-plugin-path-alias": "2.1.0",
-        "eslint-plugin-simple-import-sort": "^10.0.0",
+        "eslint-plugin-simple-header": "^1.1.1",
-        "eslint-plugin-unused-imports": "^2.0.0",
+        "eslint-plugin-simple-import-sort": "^12.1.1",
-        "highlight.js": "10.6.0",
+        "eslint-plugin-unused-imports": "^4.0.1",
+        "highlight.js": "10.7.3",
         "html-minifier-terser": "^7.2.0",
-        "moment": "^2.29.4",
+        "moment": "^2.30.1",
-        "puppeteer-core": "^19.11.1",
+        "puppeteer-core": "^22.15.0",
         "standalone-electron-types": "^1.0.0",
-        "stylelint": "^15.6.0",
+        "stylelint": "^16.8.1",
-        "stylelint-config-standard": "^33.0.0",
+        "stylelint-config-standard": "^36.0.1",
-        "ts-patch": "^3.1.2",
+        "ts-patch": "^3.2.1",
-        "tsx": "^3.12.7",
+        "ts-pattern": "^5.3.1",
-        "type-fest": "^3.9.0",
+        "tsx": "^4.16.5",
-        "typescript": "^5.4.5",
+        "type-fest": "^4.23.0",
+        "typescript": "^5.5.4",
+        "typescript-eslint": "^8.0.0",
         "typescript-transform-paths": "^3.4.7",
         "zip-local": "^0.3.5"
     },
     "packageManager": "pnpm@9.1.0",
     "pnpm": {
         "patchedDependencies": {
-            "eslint-plugin-path-alias@1.0.0": "patches/eslint-plugin-path-alias@1.0.0.patch",
+            "eslint@9.8.0": "patches/eslint@9.8.0.patch",
-            "eslint@8.46.0": "patches/eslint@8.46.0.patch"
+            "eslint-plugin-path-alias@2.1.0": "patches/eslint-plugin-path-alias@2.1.0.patch"
         },
         "peerDependencyRules": {
             "ignoreMissing": [

patches/eslint-plugin-path-alias@1.0.0.patch

@@ -1,13 +0,0 @@
-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;
- 				}
- 

patches/eslint-plugin-path-alias@2.1.0.patch

@@ -0,0 +1,14 @@
+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};

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, watch } from "./common.mjs";
+import { BUILD_TIMESTAMP, commonOpts, exists, globPlugins, IS_DEV, IS_REPORTER, IS_STANDALONE, IS_UPDATER_DISABLED, resolvePluginName, VERSION, commonRendererPlugins, watch } from "./common.mjs";
 
 const defines = {
     IS_STANDALONE,
@@ -131,7 +131,7 @@ await Promise.all([
         sourcemap,
         plugins: [
             globPlugins("discordDesktop"),
-            ...commonOpts.plugins
+            ...commonRendererPlugins
         ],
         define: {
             ...defines,
@@ -180,7 +180,7 @@ await Promise.all([
         sourcemap,
         plugins: [
             globPlugins("vencordDesktop"),
-            ...commonOpts.plugins
+            ...commonRendererPlugins
         ],
         define: {
             ...defines,

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 } from "./common.mjs";
+import { BUILD_TIMESTAMP, commonOpts, globPlugins, IS_DEV, IS_REPORTER, VERSION, commonRendererPlugins } from "./common.mjs";
 
 /**
  * @type {esbuild.BuildOptions}
@@ -36,7 +36,7 @@ const commonOptions = {
     external: ["~plugins", "~git-hash", "/assets/*"],
     plugins: [
         globPlugins("web"),
-        ...commonOpts.plugins,
+        ...commonRendererPlugins
     ],
     target: ["esnext"],
     define: {
@@ -116,7 +116,12 @@ await Promise.all(
             }
         })
     ]
-);
+).catch(err => {
+    console.error("Build failed");
+    console.error(err.message);
+    if (!commonOpts.watch)
+        process.exit(1);
+});;
 
 /**
  * @type {(dir: string) => Promise<string[]>}

scripts/build/common.mjs

@@ -28,6 +28,7 @@ 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"));
@@ -292,6 +293,18 @@ 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}
  */
@@ -311,3 +324,15 @@ 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"),
+    ...commonOpts.plugins
+];

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: "new",
+    headless: true,
     executablePath: process.env.CHROMIUM_BIN
 });
 

src/api/MessagePopover.tsx

@@ -16,16 +16,17 @@
  * 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 { MouseEventHandler } from "react";
+import type { ComponentType, MouseEventHandler } from "react";
 
 const logger = new Logger("MessagePopover");
 
 export interface ButtonItem {
     key?: string,
     label: string,
-    icon: React.ComponentType<any>,
+    icon: ComponentType<any>,
     message: Message,
     channel: Channel,
     onClick?: MouseEventHandler<HTMLButtonElement>,
@@ -48,22 +49,26 @@ export function removeButton(identifier: string) {
 }
 
 export function _buildPopoverElements(
-    msg: Message,
+    Component: React.ComponentType<ButtonItem>,
-    makeButton: (item: ButtonItem) => React.ComponentType
+    message: Message
 ) {
-    const items = [] as React.ComponentType[];
+    const items: React.ReactNode[] = [];
 
     for (const [identifier, getItem] of buttons.entries()) {
         try {
-            const item = getItem(msg);
+            const item = getItem(message);
             if (item) {
                 item.key ??= identifier;
-                items.push(makeButton(item));
+                items.push(
+                    <ErrorBoundary noop>
+                        <Component {...item} />
+                    </ErrorBoundary>
+                );
             }
         } catch (err) {
             logger.error(`[${identifier}]`, err);
         }
     }
 
-    return items;
+    return <>{items}</>;
 }

src/api/Settings.ts

@@ -230,6 +230,10 @@ 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,

src/components/ExpandableHeader.css

@@ -1,7 +1,6 @@
 .vc-expandableheader-center-flex {
     display: flex;
-    justify-items: center;
+    place-items: center;
-    align-items: center;
 }
 
 .vc-expandableheader-btn {

src/components/Icons.tsx

@@ -65,8 +65,7 @@ export function LinkIcon({ height = 24, width = 24, className }: IconProps) {
 }
 
 /**
- * Discord's copy icon, as seen in the user popout right of the username when clicking
+ * Discord's copy icon, as seen in the user panel popout on the right of the username and in large code blocks
- * your own username in the bottom left user panel
  */
 export function CopyIcon(props: IconProps) {
     return (
@@ -76,8 +75,9 @@ export function CopyIcon(props: IconProps) {
             viewBox="0 0 24 24"
         >
             <g fill="currentColor">
-                <path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1z" />
+                <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="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" />
+                <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" />
             </g>
         </Icon>
     );

src/components/VencordSettings/PatchHelperTab.tsx

@@ -382,6 +382,7 @@ 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>

src/components/VencordSettings/ThemesTab.tsx

@@ -25,10 +25,9 @@ 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 { findByPropsLazy, findLazy } from "@webpack";
+import { findLazy } from "@webpack";
 import { Card, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
 import type { ComponentType, Ref, SyntheticEvent } from "react";
 
@@ -45,9 +44,7 @@ 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-");
 
@@ -306,7 +303,7 @@ function ThemesTab() {
                     <TextArea
                         value={themeText}
                         onChange={setThemeText}
-                        className={classes(TextAreaProps.textarea, "vc-settings-theme-links")}
+                        className={"vc-settings-theme-links"}
                         placeholder="Theme Links"
                         spellCheck={false}
                         onBlur={onBlur}

src/components/VencordSettings/settingsStyles.css

@@ -33,6 +33,20 @@
     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 {

src/debug/loadLazyChunks.ts

@@ -134,7 +134,7 @@ export async function loadLazyChunks() {
         const allChunks = [] as number[];
 
         // Matches "id" or id:
-        for (const currentMatch of wreq!.u.toString().matchAll(/(?:"([\deE]+?)")|(?:([\deE]+?):)/g)) {
+        for (const currentMatch of wreq!.u.toString().matchAll(/(?:"([\deE]+?)"(?![,}]))|(?:([\deE]+?):)/g)) {
             const id = currentMatch[1] ?? currentMatch[2];
             if (id == null) continue;
 

src/main/updater/http.ts

@@ -16,6 +16,7 @@
  * 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";
@@ -25,7 +26,6 @@ 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}`;

src/modules.d.ts

@@ -16,7 +16,6 @@
  * 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" {

src/plugins/CopyFileContents/README.md

@@ -0,0 +1,5 @@
+# CopyFileContents
+
+Adds a button to text file attachments to copy their contents.
+
+![](https://github.com/user-attachments/assets/b1a0f6f4-106f-4953-94d9-4c5ef5810bca)

src/plugins/CopyFileContents/index.tsx

@@ -0,0 +1,60 @@
+/*
+ * 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: ".Messages.PREVIEW_BYTES_LEFT.format(",
+            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 }),
+});

src/plugins/CopyFileContents/style.css

@@ -0,0 +1,8 @@
+.vc-cfc-button {
+    color: var(--interactive-normal);
+    cursor: pointer;
+}
+
+.vc-cfc-button:hover {
+    color: var(--interactive-hover);
+}

src/plugins/_api/badges/index.tsx

@@ -62,34 +62,6 @@ export default definePlugin({
     authors: [Devs.Megu, Devs.Ven, Devs.TheSun],
     required: true,
     patches: [
-        /* Patch the badge list component on user profiles */
-        {
-            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: ".FULL_SIZE]:26",
             replacement: {

src/plugins/_api/messagePopover.ts

@@ -26,9 +26,8 @@ export default definePlugin({
     patches: [{
         find: "Messages.MESSAGE_UTILITIES_A11Y_LABEL",
         replacement: {
-            // foo && !bar ? createElement(reactionStuffs)... createElement(blah,...makeElement(reply-other))
+            match: /\.jsx\)\((\i\.\i),\{label:\i\.\i\.Messages\.MESSAGE_ACTION_REPLY.{0,200}?"reply-self".{0,50}?\}\):null(?=,.+?message:(\i))/,
-            match: /\i&&!\i\?\(0,\i\.jsxs?\)\(.{0,200}renderEmojiPicker:.{0,500}\?(\i)\(\{key:"reply-other"(?<=message:(\i).+?)/,
+            replace: "$&,Vencord.Api.MessagePopover._buildPopoverElements($1,$2)"
-            replace: (m, makeElement, msg) => `...Vencord.Api.MessagePopover._buildPopoverElements(${msg},${makeElement}),${m}`
         }
     }],
 });

src/plugins/_core/settings.tsx

@@ -64,7 +64,7 @@ export default definePlugin({
                     replace: (_, sectionTypes, commaOrSemi, elements, element) => `${commaOrSemi} $self.addSettings(${elements}, ${element}, ${sectionTypes}) ${commaOrSemi}`
                 },
                 {
-                    match: /({(?=.+?function (\i).{0,120}(\i)=\i\.useMemo.{0,30}return \i\.useMemo\(\(\)=>\i\(\3).+?function\(\){return )\2(?=})/,
+                    match: /({(?=.+?function (\i).{0,120}(\i)=\i\.useMemo.{0,60}return \i\.useMemo\(\(\)=>\i\(\3).+?function\(\){return )\2(?=})/,
                     replace: (_, rest, settingsHook) => `${rest}$self.wrapSettingsHook(${settingsHook})`
                 }
             ]

src/plugins/alwaysExpandRoles/README.md

@@ -0,0 +1,3 @@
+# Always Expand Roles
+
+Always expands the role list in profile popouts

src/plugins/alwaysExpandRoles/index.ts

@@ -1,6 +1,6 @@
 /*
  * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
+ * Copyright (c) 2023 Vendicated and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,20 +16,22 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { migratePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 
+migratePluginSettings("AlwaysExpandRoles", "ShowAllRoles");
 export default definePlugin({
-    name: "TimeBarAllActivities",
+    name: "AlwaysExpandRoles",
-    description: "Adds the Spotify time bar to all activities if they have start and end timestamps",
+    description: "Always expands the role list in profile popouts",
-    authors: [Devs.fawn],
+    authors: [Devs.surgedevs],
     patches: [
         {
-            find: "}renderTimeBar(",
+            find: 'action:"EXPAND_ROLES"',
             replacement: {
-                match: /renderTimeBar\((.{1,3})\){.{0,50}?let/,
+                match: /(roles:\i(?=.+?(\i)\(!0\)[,;]\i\({action:"EXPAND_ROLES"}\)).+?\[\i,\2\]=\i\.useState\()!1\)/,
-                replace: "renderTimeBar($1){let"
+                replace: (_, rest, setExpandedRoles) => `${rest}!0)`
             }
         }
-    ],
+    ]
 });

src/plugins/automodContext/README.md

@@ -1,5 +0,0 @@
-# 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)

src/plugins/automodContext/index.tsx

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

src/plugins/betterFolders/index.tsx

@@ -249,6 +249,10 @@ export default definePlugin({
                     dispatchingFoldersClose = false;
                 });
             }
+        },
+
+        LOGOUT() {
+            closeFolders();
         }
     },
 

src/plugins/betterNotes/index.tsx

@@ -17,13 +17,9 @@
 */
 
 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: {
@@ -72,23 +68,9 @@ export default definePlugin({
                 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;
     }

src/plugins/consoleJanitor/index.ts

@@ -60,13 +60,6 @@ export default definePlugin({
                 replace: ""
             }
         },
-        {
-            find: "notosans-400-normalitalic",
-            replacement: {
-                match: /,"notosans-.+?"/g,
-                replace: ""
-            }
-        },
         {
             find: 'console.warn("[DEPRECATED] Please use `subscribeWithSelector` middleware");',
             all: true,

src/plugins/decor/index.tsx

@@ -91,7 +91,7 @@ export default definePlugin({
             replacement: [
                 // Use Decor avatar decoration hook
                 {
-                    match: /(?<=\i\)\({avatarDecoration:)(\i).avatarDecoration(?=,)/,
+                    match: /(?<=\i\)\({avatarDecoration:)(\i)(?=,)(?<=currentUser:(\i).+?)/,
                     replace: "$self.useUserDecorAvatarDecoration($1)??$&"
                 }
             ]

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 } from "@utils/misc";
+import { classes, copyWithToast } 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,7 +45,11 @@ interface Section {
     authorIds?: string[];
 }
 
-function SectionHeader({ section }: { section: Section; }) {
+interface SectionHeaderProps {
+    section: Section;
+}
+
+function SectionHeader({ section }: SectionHeaderProps) {
     const hasSubtitle = typeof section.subtitle !== "undefined";
     const hasAuthorIds = typeof section.authorIds !== "undefined";
 
@@ -62,6 +66,7 @@ function SectionHeader({ section }: { section: Section; }) {
         })();
     }, [section.authorIds]);
 
+
     return <div>
         <Flex>
             <Forms.FormTitle style={{ flexGrow: 1 }}>{section.title}</Forms.FormTitle>
@@ -74,8 +79,7 @@ function SectionHeader({ section }: { section: Section; }) {
                 size={16}
                 showUserPopout
                 className={Margins.bottom8}
-            />
+            />}
-            }
         </Flex>
         {hasSubtitle &&
             <Forms.FormText type="description" className={Margins.bottom8}>
@@ -204,7 +208,16 @@ function ChangeDecorationModal(props: ModalProps) {
                             {activeSelectedDecoration?.alt}
                         </Text>
                     }
-                    {activeDecorationHasAuthor && <Text key={`createdBy-${activeSelectedDecoration.authorId}`}>Created by {Parser.parse(`<@${activeSelectedDecoration.authorId}>`)}</Text>}
+                    {activeDecorationHasAuthor && (
+                        <Text key={`createdBy-${activeSelectedDecoration.authorId}`}>
+                            Created by {Parser.parse(`<@${activeSelectedDecoration.authorId}>`)}
+                        </Text>
+                    )}
+                    {isActiveDecorationPreset && (
+                        <Button onClick={() => copyWithToast(activeDecorationPreset.id)}>
+                            Copy Preset ID
+                        </Button>
+                    )}
                 </div>
             </ErrorBoundary>
         </ModalContent>

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}]+?)\u{e002c}\u{e0023}([\u{e0061}-\u{e0066}\u{e0041}-\u{e0046}\u{e0030}-\u{e0039}]+?)\u{e005d}/u,
+        /\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,
     );
     if (colorString != null) {
         const parsed = [...colorString[0]]
@@ -121,7 +121,7 @@ export default definePlugin({
         {
             find: "UserProfileStore",
             replacement: {
-                match: /(?<=getUserProfile\(\i\){return )(\i\[\i\])/,
+                match: /(?<=getUserProfile\(\i\){return )(.+?)(?=})/,
                 replace: "$self.colorDecodeHook($1)"
             }
         },

src/plugins/forceOwnerCrown/index.ts

@@ -27,7 +27,7 @@ export default definePlugin({
     authors: [Devs.D3SOX, Devs.Nickyux],
     patches: [
         {
-            find: ".PREMIUM_GUILD_SUBSCRIPTION_TOOLTIP",
+            find: ".Messages.GUILD_OWNER,",
             replacement: {
                 match: /,isOwner:(\i),/,
                 replace: ",_isOwner:$1=$self.isGuildOwner(e),"

src/plugins/friendsSince/index.tsx

@@ -16,7 +16,6 @@ const containerWrapper = findByPropsLazy("memberSinceWrapper");
 const container = findByPropsLazy("memberSince");
 const getCreatedAtDate = findByCodeLazy('month:"short",day:"numeric"');
 const locale = findByPropsLazy("getLocale");
-const lastSection = findByPropsLazy("lastSection");
 const section = findLazy((m: any) => m.section !== void 0 && m.heading !== void 0 && Object.values(m).length === 2);
 
 export default definePlugin({
@@ -24,31 +23,7 @@ export default definePlugin({
     description: "Shows when you became friends with someone in the user popout",
     authors: [Devs.Elvyra, Devs.Antti],
     patches: [
-        // User popup - old layout
+        // DM User Sidebar
-        {
-            find: ".USER_PROFILE}};return",
-            replacement: {
-                match: /,{userId:(\i.id).{0,30}}\)/,
-                replace: "$&,$self.friendsSinceOld({ userId: $1 })"
-            }
-        },
-        // DM User Sidebar - old layout
-        {
-            find: ".PROFILE_PANEL,",
-            replacement: {
-                match: /,{userId:([^,]+?)}\)/,
-                replace: "$&,$self.friendsSinceOld({ userId: $1 })"
-            }
-        },
-        // User Profile Modal - old layout
-        {
-            find: ".userInfoSectionHeader,",
-            replacement: {
-                match: /(\.Messages\.USER_PROFILE_MEMBER_SINCE.+?userId:(.+?),textClassName:)(\i\.userInfoText)}\)/,
-                replace: (_, rest, userId, textClassName) => `${rest}!$self.getFriendSince(${userId}) ? ${textClassName} : void 0 }), $self.friendsSinceOld({ userId: ${userId}, textClassName: ${textClassName} })`
-            }
-        },
-        // DM User Sidebar - new layout
         {
             find: ".PANEL}),nicknameIcons",
             replacement: {
@@ -56,7 +31,7 @@ export default definePlugin({
                 replace: "$&,$self.friendsSinceNew({userId:$1,isSidebar:true})"
             }
         },
-        // User Profile Modal - new layout
+        // User Profile Modal
         {
             find: "action:\"PRESS_APP_CONNECTION\"",
             replacement: {
@@ -77,39 +52,6 @@ export default definePlugin({
         }
     },
 
-    friendsSinceOld: ErrorBoundary.wrap(({ userId, textClassName }: { userId: string; textClassName?: string; }) => {
-        if (!RelationshipStore.isFriend(userId)) return null;
-
-        const friendsSince = RelationshipStore.getSince(userId);
-        if (!friendsSince) return null;
-
-        return (
-            <div className={lastSection.section}>
-                <Heading variant="eyebrow">
-                    Friends Since
-                </Heading>
-
-                <div className={containerWrapper.memberSinceWrapper}>
-                    {!!getCurrentChannel()?.guild_id && (
-                        <svg
-                            aria-hidden="true"
-                            width="16"
-                            height="16"
-                            viewBox="0 0 24 24"
-                            fill="var(--interactive-normal)"
-                        >
-                            <path d="M13 10a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z" />
-                            <path d="M3 5v-.75C3 3.56 3.56 3 4.25 3s1.24.56 1.33 1.25C6.12 8.65 9.46 12 13 12h1a8 8 0 0 1 8 8 2 2 0 0 1-2 2 .21.21 0 0 1-.2-.15 7.65 7.65 0 0 0-1.32-2.3c-.15-.2-.42-.06-.39.17l.25 2c.02.15-.1.28-.25.28H9a2 2 0 0 1-2-2v-2.22c0-1.57-.67-3.05-1.53-4.37A15.85 15.85 0 0 1 3 5Z" />
-                        </svg>
-                    )}
-                    <Text variant="text-sm/normal" className={textClassName}>
-                        {getCreatedAtDate(friendsSince, locale.getLocale())}
-                    </Text>
-                </div>
-            </div>
-        );
-    }, { noop: true }),
-
     friendsSinceNew: ErrorBoundary.wrap(({ userId, isSidebar }: { userId: string; isSidebar: boolean; }) => {
         if (!RelationshipStore.isFriend(userId)) return null;
 

src/plugins/ignoreActivities/index.tsx

@@ -26,6 +26,11 @@ interface IgnoredActivity {
     type: ActivitiesTypes;
 }
 
+const enum FilterMode {
+    Whitelist,
+    Blacklist
+}
+
 const RunningGameStore = findStoreLazy("RunningGameStore");
 
 const ShowCurrentGame = getUserSettingLazy("status", "showCurrentGame")!;
@@ -70,14 +75,17 @@ function handleActivityToggle(e: React.MouseEvent<HTMLButtonElement, MouseEvent>
     if (ignoredActivityIndex === -1) settings.store.ignoredActivities = getIgnoredActivities().concat(activity);
     else settings.store.ignoredActivities = getIgnoredActivities().filter((_, index) => index !== ignoredActivityIndex);
 
-    // Trigger activities recalculation
+    recalculateActivities();
+}
+
+function recalculateActivities() {
     ShowCurrentGame.updateSetting(old => old);
 }
 
 function ImportCustomRPCComponent() {
     return (
         <Flex flexDirection="column">
-            <Forms.FormText type={Forms.FormText.Types.DESCRIPTION}>Import the application id of the CustomRPC plugin to the allowed list</Forms.FormText>
+            <Forms.FormText type={Forms.FormText.Types.DESCRIPTION}>Import the application id of the CustomRPC plugin to the filter list</Forms.FormText>
             <div>
                 <Button
                     onClick={() => {
@@ -86,7 +94,7 @@ function ImportCustomRPCComponent() {
                             return showToast("CustomRPC application ID is not set.", Toasts.Type.FAILURE);
                         }
 
-                        const isAlreadyAdded = allowedIdsPushID?.(id);
+                        const isAlreadyAdded = idsListPushID?.(id);
                         if (isAlreadyAdded) {
                             showToast("CustomRPC application ID is already added.", Toasts.Type.FAILURE);
                         }
@@ -99,39 +107,39 @@ function ImportCustomRPCComponent() {
     );
 }
 
-let allowedIdsPushID: ((id: string) => boolean) | null = null;
+let idsListPushID: ((id: string) => boolean) | null = null;
 
-function AllowedIdsComponent(props: { setValue: (value: string) => void; }) {
+function IdsListComponent(props: { setValue: (value: string) => void; }) {
-    const [allowedIds, setAllowedIds] = useState<string>(settings.store.allowedIds ?? "");
+    const [idsList, setIdsList] = useState<string>(settings.store.idsList ?? "");
 
-    allowedIdsPushID = (id: string) => {
+    idsListPushID = (id: string) => {
-        const currentIds = new Set(allowedIds.split(",").map(id => id.trim()).filter(Boolean));
+        const currentIds = new Set(idsList.split(",").map(id => id.trim()).filter(Boolean));
 
         const isAlreadyAdded = currentIds.has(id) || (currentIds.add(id), false);
 
         const ids = Array.from(currentIds).join(", ");
-        setAllowedIds(ids);
+        setIdsList(ids);
         props.setValue(ids);
 
         return isAlreadyAdded;
     };
 
     useEffect(() => () => {
-        allowedIdsPushID = null;
+        idsListPushID = null;
     }, []);
 
     function handleChange(newValue: string) {
-        setAllowedIds(newValue);
+        setIdsList(newValue);
         props.setValue(newValue);
     }
 
     return (
         <Forms.FormSection>
-            <Forms.FormTitle tag="h3">Allowed List</Forms.FormTitle>
+            <Forms.FormTitle tag="h3">Filter List</Forms.FormTitle>
-            <Forms.FormText className={Margins.bottom8} type={Forms.FormText.Types.DESCRIPTION}>Comma separated list of activity IDs to allow (Useful for allowing RPC activities and CustomRPC)</Forms.FormText>
+            <Forms.FormText className={Margins.bottom8} type={Forms.FormText.Types.DESCRIPTION}>Comma separated list of activity IDs to filter (Useful for filtering specific RPC activities and CustomRPC</Forms.FormText>
             <TextInput
                 type="text"
-                value={allowedIds}
+                value={idsList}
                 onChange={handleChange}
                 placeholder="235834946571337729, 343383572805058560"
             />
@@ -145,40 +153,62 @@ const settings = definePluginSettings({
         description: "",
         component: () => <ImportCustomRPCComponent />
     },
-    allowedIds: {
+    listMode: {
+        type: OptionType.SELECT,
+        description: "Change the mode of the filter list",
+        options: [
+            {
+                label: "Whitelist",
+                value: FilterMode.Whitelist,
+                default: true
+            },
+            {
+                label: "Blacklist",
+                value: FilterMode.Blacklist,
+            }
+        ],
+        onChange: recalculateActivities
+    },
+    idsList: {
         type: OptionType.COMPONENT,
         description: "",
         default: "",
         onChange(newValue: string) {
             const ids = new Set(newValue.split(",").map(id => id.trim()).filter(Boolean));
-            settings.store.allowedIds = Array.from(ids).join(", ");
+            settings.store.idsList = Array.from(ids).join(", ");
+            recalculateActivities();
         },
-        component: props => <AllowedIdsComponent setValue={props.setValue} />
+        component: props => <IdsListComponent setValue={props.setValue} />
     },
     ignorePlaying: {
         type: OptionType.BOOLEAN,
         description: "Ignore all playing activities (These are usually game and RPC activities)",
-        default: false
+        default: false,
+        onChange: recalculateActivities
     },
     ignoreStreaming: {
         type: OptionType.BOOLEAN,
         description: "Ignore all streaming activities",
-        default: false
+        default: false,
+        onChange: recalculateActivities
     },
     ignoreListening: {
         type: OptionType.BOOLEAN,
         description: "Ignore all listening activities (These are usually spotify activities)",
-        default: false
+        default: false,
+        onChange: recalculateActivities
     },
     ignoreWatching: {
         type: OptionType.BOOLEAN,
         description: "Ignore all watching activities",
-        default: false
+        default: false,
+        onChange: recalculateActivities
     },
     ignoreCompeting: {
         type: OptionType.BOOLEAN,
         description: "Ignore all competing activities (These are normally special game activities)",
-        default: false
+        default: false,
+        onChange: recalculateActivities
     }
 }).withPrivateSettings<{
     ignoredActivities: IgnoredActivity[];
@@ -189,8 +219,8 @@ function getIgnoredActivities() {
 }
 
 function isActivityTypeIgnored(type: number, id?: string) {
-    if (id && settings.store.allowedIds.includes(id)) {
+    if (id && settings.store.idsList.includes(id)) {
-        return false;
+        return settings.store.listMode === FilterMode.Blacklist;
     }
 
     switch (type) {
@@ -206,7 +236,7 @@ function isActivityTypeIgnored(type: number, id?: string) {
 
 export default definePlugin({
     name: "IgnoreActivities",
-    authors: [Devs.Nuckyz],
+    authors: [Devs.Nuckyz, Devs.Kylie],
     description: "Ignore activities from showing up on your status ONLY. You can configure which ones are specifically ignored from the Registered Games and Activities tabs, or use the general settings below.",
     dependencies: ["UserSettingsAPI"],
 
@@ -253,6 +283,12 @@ export default definePlugin({
     ],
 
     async start() {
+        // Migrate allowedIds
+        if (Settings.plugins.IgnoreActivities.allowedIds) {
+            settings.store.idsList = Settings.plugins.IgnoreActivities.allowedIds;
+            delete Settings.plugins.IgnoreActivities.allowedIds; // Remove allowedIds
+        }
+
         const oldIgnoredActivitiesData = await DataStore.get<Map<IgnoredActivity["id"], IgnoredActivity>>("IgnoreActivities_ignoredActivities");
 
         if (oldIgnoredActivitiesData != null) {
@@ -279,7 +315,7 @@ export default definePlugin({
         if (isActivityTypeIgnored(props.type, props.application_id)) return false;
 
         if (props.application_id != null) {
-            return !getIgnoredActivities().some(activity => activity.id === props.application_id) || settings.store.allowedIds.includes(props.application_id);
+            return !getIgnoredActivities().some(activity => activity.id === props.application_id) || (settings.store.listMode === FilterMode.Whitelist && settings.store.idsList.includes(props.application_id));
         } else {
             const exePath = RunningGameStore.getRunningGames().find(game => game.name === props.name)?.exePath;
             if (exePath) {

src/plugins/maskedLinkPaste/README.md

@@ -1,5 +0,0 @@
-# MaskedLinkPaste
-
-Pasting a link while you have text selected will paste your link as a masked link at that location
-
-![](https://github.com/Vendicated/Vencord/assets/78964224/1d3be2c6-7957-44c9-92ec-551069d46c02)

src/plugins/maskedLinkPaste/index.ts

@@ -1,38 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Devs } from "@utils/constants.js";
-import definePlugin from "@utils/types";
-import { findByPropsLazy } from "@webpack";
-
-const linkRegex = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*)/;
-
-const SlateTransforms = findByPropsLazy("insertText", "selectCommandOption");
-
-export default definePlugin({
-    name: "MaskedLinkPaste",
-    authors: [Devs.TheSun],
-    description: "Pasting a link while having text selected will paste a hyperlink",
-    patches: [
-        {
-            find: ".selection,preventEmojiSurrogates:",
-            replacement: {
-                match: /(?<=\i.delete.{0,50})(\i)\.insertText\((\i)\)/,
-                replace: "$self.handlePaste($1, $2, () => $&)"
-            }
-        }
-    ],
-
-    handlePaste(editor, content: string, originalBehavior: () => void) {
-        if (content && linkRegex.test(content) && editor.operations?.[0]?.type === "remove_text") {
-            SlateTransforms.insertText(
-                editor,
-                `[${editor.operations[0].text}](${content})`
-            );
-        }
-        else originalBehavior();
-    }
-});

src/plugins/memberCount/MemberCount.tsx

@@ -5,9 +5,10 @@
  */
 
 import { getCurrentChannel } from "@utils/discord";
+import { isObjectEmpty } from "@utils/misc";
 import { SelectedChannelStore, Tooltip, useEffect, useStateFromStores } from "@webpack/common";
 
-import { ChannelMemberStore, cl, GuildMemberCountStore, numberFormat } from ".";
+import { ChannelMemberStore, cl, GuildMemberCountStore, numberFormat, ThreadMemberListStore } from ".";
 import { OnlineMemberCountStore } from "./OnlineMemberCountStore";
 
 export function MemberCount({ isTooltip, tooltipGuildId }: { isTooltip?: true; tooltipGuildId?: string; }) {
@@ -30,10 +31,19 @@ export function MemberCount({ isTooltip, tooltipGuildId }: { isTooltip?: true; t
         () => ChannelMemberStore.getProps(guildId, currentChannel?.id)
     );
 
+    const threadGroups = useStateFromStores(
+        [ThreadMemberListStore],
+        () => ThreadMemberListStore.getMemberListSections(currentChannel.id)
+    );
+
     if (!isTooltip && (groups.length >= 1 || groups[0].id !== "unknown")) {
         onlineCount = groups.reduce((total, curr) => total + (curr.id === "offline" ? 0 : curr.count), 0);
     }
 
+    if (!isTooltip && threadGroups && !isObjectEmpty(threadGroups)) {
+        onlineCount = Object.values(threadGroups).reduce((total, curr) => total + (curr.sectionId === "offline" ? 0 : curr.userIds.length), 0);
+    }
+
     useEffect(() => {
         OnlineMemberCountStore.ensureCount(guildId);
     }, [guildId]);

src/plugins/memberCount/index.tsx

@@ -32,6 +32,10 @@ export const GuildMemberCountStore = findStoreLazy("GuildMemberCountStore") as F
 export const ChannelMemberStore = findStoreLazy("ChannelMemberStore") as FluxStore & {
     getProps(guildId: string, channelId: string): { groups: { count: number; id: string; }[]; };
 };
+export const ThreadMemberListStore = findStoreLazy("ThreadMemberListStore") as FluxStore & {
+    getMemberListSections(channelId: string): { [sectionId: string]: { sectionId: string; userIds: string[]; }; };
+};
+
 
 const settings = definePluginSettings({
     toolTip: {

src/plugins/mentionAvatars/README.md

@@ -1,5 +1,6 @@
 # MentionAvatars
 
-Shows user avatars inside mentions
+Shows user avatars and role icons inside mentions
 
 ![](https://github.com/user-attachments/assets/fc76ea47-5e19-4063-a592-c57785a75cc7)
+![](https://github.com/user-attachments/assets/76c4c3d9-7cde-42db-ba84-903cbb40c163)

src/plugins/mentionAvatars/index.tsx

@@ -6,16 +6,46 @@
 
 import "./styles.css";
 
+import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
-import { SelectedGuildStore, useState } from "@webpack/common";
+import { GuildStore, SelectedGuildStore, useState } from "@webpack/common";
 import { User } from "discord-types/general";
 
+const settings = definePluginSettings({
+    showAtSymbol: {
+        type: OptionType.BOOLEAN,
+        description: "Whether the the @ symbol should be displayed on user mentions",
+        default: true
+    }
+});
+
+function DefaultRoleIcon() {
+    return (
+        <svg
+            className="vc-mentionAvatars-icon vc-mentionAvatars-role-icon"
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 24 24"
+            fill="currentColor"
+        >
+            <path
+                d="M14 8.00598C14 10.211 12.206 12.006 10 12.006C7.795 12.006 6 10.211 6 8.00598C6 5.80098 7.794 4.00598 10 4.00598C12.206 4.00598 14 5.80098 14 8.00598ZM2 19.006C2 15.473 5.29 13.006 10 13.006C14.711 13.006 18 15.473 18 19.006V20.006H2V19.006Z"
+            />
+            <path
+                d="M20.0001 20.006H22.0001V19.006C22.0001 16.4433 20.2697 14.4415 17.5213 13.5352C19.0621 14.9127 20.0001 16.8059 20.0001 19.006V20.006Z"
+            />
+            <path
+                d="M14.8834 11.9077C16.6657 11.5044 18.0001 9.9077 18.0001 8.00598C18.0001 5.96916 16.4693 4.28218 14.4971 4.0367C15.4322 5.09511 16.0001 6.48524 16.0001 8.00598C16.0001 9.44888 15.4889 10.7742 14.6378 11.8102C14.7203 11.8418 14.8022 11.8743 14.8834 11.9077Z"
+            />
+        </svg>
+    );
+}
+
 export default definePlugin({
     name: "MentionAvatars",
-    description: "Shows user avatars inside mentions",
+    description: "Shows user avatars and role icons inside mentions",
-    authors: [Devs.Ven],
+    authors: [Devs.Ven, Devs.SerStars],
 
     patches: [{
         find: ".USER_MENTION)",
@@ -23,22 +53,57 @@ export default definePlugin({
             match: /children:"@"\.concat\((null!=\i\?\i:\i)\)(?<=\.useName\((\i)\).+?)/,
             replace: "children:$self.renderUsername({username:$1,user:$2})"
         }
+    },
+    {
+        find: ".ROLE_MENTION)",
+        replacement: {
+            match: /children:\[\i&&.{0,50}\.RoleDot.{0,300},\i(?=\])/,
+            replace: "$&,$self.renderRoleIcon(arguments[0])"
+        }
     }],
 
+    settings,
+
     renderUsername: ErrorBoundary.wrap((props: { user: User, username: string; }) => {
         const { user, username } = props;
         const [isHovering, setIsHovering] = useState(false);
 
-        if (!user) return <>@{username}</>;
+        if (!user) return <>{getUsernameString(username)}</>;
 
         return (
             <span
                 onMouseEnter={() => setIsHovering(true)}
                 onMouseLeave={() => setIsHovering(false)}
             >
-                <img src={user.getAvatarURL(SelectedGuildStore.getGuildId(), 16, isHovering)} className="vc-mentionAvatars-avatar" />
+                <img
-                @{username}
+                    src={user.getAvatarURL(SelectedGuildStore.getGuildId(), 16, isHovering)}
+                    className="vc-mentionAvatars-icon"
+                    style={{ borderRadius: "50%" }}
+                />
+                {getUsernameString(username)}
             </span>
         );
-    }, { noop: true })
+    }, { noop: true }),
+
+    renderRoleIcon: ErrorBoundary.wrap(({ roleId, guildId }: { roleId: string, guildId: string; }) => {
+        // Discord uses Role Mentions for uncached users because .... idk
+        if (!roleId) return null;
+
+        const role = GuildStore.getRole(guildId, roleId);
+
+        if (!role?.icon) return <DefaultRoleIcon />;
+
+        return (
+            <img
+                className="vc-mentionAvatars-icon vc-mentionAvatars-role-icon"
+                src={`${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/role-icons/${roleId}/${role.icon}.webp?size=24&quality=lossless`}
+            />
+        );
+    }),
 });
+
+function getUsernameString(username: string) {
+    return settings.store.showAtSymbol
+        ? `@${username}`
+        : username;
+}

src/plugins/mentionAvatars/styles.css

@@ -1,8 +1,11 @@
-.vc-mentionAvatars-avatar {
+.vc-mentionAvatars-icon {
     vertical-align: middle;
     width: 1em !important; /* insane discord sets width: 100% in channel topic */
     height: 1em;
     margin: 0 4px 0.2rem 2px;
-    border-radius: 50%;
     box-sizing: border-box;
 }
+
+.vc-mentionAvatars-role-icon {
+    margin: 0 2px 0.2rem 4px;
+}

src/plugins/messageLogger/index.tsx

@@ -151,6 +151,7 @@ export default definePlugin({
     contextMenus: {
         "message": patchMessageContextMenu,
         "channel-context": patchChannelContextMenu,
+        "thread-context": patchChannelContextMenu,
         "user-context": patchChannelContextMenu,
         "gdm-context": patchChannelContextMenu
     },

src/plugins/moreUserTags/index.tsx

@@ -22,7 +22,7 @@ import { Devs } from "@utils/constants";
 import { Margins } from "@utils/margins";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findLazy } from "@webpack";
-import { Card, ChannelStore, Forms, GuildStore, PermissionsBits, Switch, TextInput, Tooltip, useState } from "@webpack/common";
+import { Card, ChannelStore, Forms, GuildStore, PermissionsBits, Switch, TextInput, Tooltip } from "@webpack/common";
 import type { Permissions, RC } from "@webpack/types";
 import type { Channel, Guild, Message, User } from "discord-types/general";
 
@@ -107,14 +107,8 @@ const defaultSettings = Object.fromEntries(
     tags.map(({ name, displayName }) => [name, { text: displayName, showInChat: true, showInNotChat: true }])
 ) as TagSettings;
 
-function SettingsComponent(props: { setValue(v: any): void; }) {
+function SettingsComponent() {
-    settings.store.tagSettings ??= defaultSettings;
+    const tagSettings = settings.store.tagSettings ??= defaultSettings;
-
-    const [tagSettings, setTagSettings] = useState(settings.store.tagSettings as TagSettings);
-    const setValue = (v: TagSettings) => {
-        setTagSettings(v);
-        props.setValue(v);
-    };
 
     return (
         <Flex flexDirection="column">
@@ -137,19 +131,13 @@ function SettingsComponent(props: { setValue(v: any): void; }) {
                         type="text"
                         value={tagSettings[t.name]?.text ?? t.displayName}
                         placeholder={`Text on tag (default: ${t.displayName})`}
-                        onChange={v => {
+                        onChange={v => tagSettings[t.name].text = v}
-                            tagSettings[t.name].text = v;
-                            setValue(tagSettings);
-                        }}
                         className={Margins.bottom16}
                     />
 
                     <Switch
                         value={tagSettings[t.name]?.showInChat ?? true}
-                        onChange={v => {
+                        onChange={v => tagSettings[t.name].showInChat = v}
-                            tagSettings[t.name].showInChat = v;
-                            setValue(tagSettings);
-                        }}
                         hideBorder
                     >
                         Show in messages
@@ -157,10 +145,7 @@ function SettingsComponent(props: { setValue(v: any): void; }) {
 
                     <Switch
                         value={tagSettings[t.name]?.showInNotChat ?? true}
-                        onChange={v => {
+                        onChange={v => tagSettings[t.name].showInNotChat = v}
-                            tagSettings[t.name].showInNotChat = v;
-                            setValue(tagSettings);
-                        }}
                         hideBorder
                     >
                         Show in member list and profiles
@@ -183,7 +168,7 @@ const settings = definePluginSettings({
     tagSettings: {
         type: OptionType.COMPONENT,
         component: SettingsComponent,
-        description: "fill me",
+        description: "fill me"
     }
 });
 
@@ -247,9 +232,9 @@ export default definePlugin({
             }
         },
         {
-            find: 'copyMetaData:"User Tag"',
+            find: ".Messages.USER_PROFILE_PRONOUNS",
             replacement: {
-                match: /(?=,botClass:)/,
+                match: /(?=,hideBotTag:!0)/,
                 replace: ",moreTags_channelId:arguments[0].moreTags_channelId"
             }
         },

src/plugins/mutualGroupDMs/index.tsx

@@ -21,7 +21,7 @@ import { Devs } from "@utils/constants";
 import { isNonNullish } from "@utils/guards";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { Avatar, ChannelStore, Clickable, IconUtils, RelationshipStore, ScrollerThin, UserStore } from "@webpack/common";
+import { Avatar, ChannelStore, Clickable, IconUtils, RelationshipStore, ScrollerThin, useMemo, UserStore } from "@webpack/common";
 import { Channel, User } from "discord-types/general";
 
 const SelectedChannelActionCreators = findByPropsLazy("selectPrivateChannel");
@@ -39,32 +39,31 @@ function getGroupDMName(channel: Channel) {
             .join(", ");
 }
 
+const getMutualGroupDms = (userId: string) =>
+    ChannelStore.getSortedPrivateChannels()
+        .filter(c => c.isGroupDM() && c.recipients.includes(userId));
+
+const isBotOrSelf = (user: User) => user.bot || user.id === UserStore.getCurrentUser().id;
+
+function getMutualGDMCountText(user: User) {
+    const count = getMutualGroupDms(user.id).length;
+    return `${count === 0 ? "No" : count} Mutual Group${count !== 1 ? "s" : ""}`;
+}
+
+const IS_PATCHED = Symbol("MutualGroupDMs.Patched");
+
 export default definePlugin({
     name: "MutualGroupDMs",
     description: "Shows mutual group dms in profiles",
     authors: [Devs.amia],
 
     patches: [
-        {
-            find: ".Messages.MUTUAL_GUILDS_WITH_END_COUNT", // Note: the module is lazy-loaded
-            replacement: {
-                match: /(?<=\.tabBarItem.{0,50}MUTUAL_GUILDS.+?}\),)(?=.+?(\(0,\i\.jsxs?\)\(.{0,100}id:))/,
-                replace: '$self.isBotOrSelf(arguments[0].user)?null:$1"MUTUAL_GDMS",children:"Mutual Groups"}),'
-            }
-        },
-        {
-            find: ".USER_INFO_CONNECTIONS:case",
-            replacement: {
-                match: /(?<={user:(\i),onClose:(\i)}\);)(?=case \i\.\i\.MUTUAL_FRIENDS)/,
-                replace: "case \"MUTUAL_GDMS\":return $self.renderMutualGDMs({user: $1, onClose: $2});"
-            }
-        },
         {
             find: ".MUTUAL_FRIENDS?(",
             replacement: [
                 {
-                    match: /(?<=onItemSelect:\i,children:)(\i)\.map/,
+                    match: /\i\.useEffect.{0,100}(\i)\[0\]\.section/,
-                    replace: "[...$1, ...($self.isBotOrSelf(arguments[0].user) ? [] : [{section:'MUTUAL_GDMS',text:'Mutual Groups'}])].map"
+                    replace: "$self.pushSection($1, arguments[0].user);$&"
                 },
                 {
                     match: /\(0,\i\.jsx\)\(\i,\{items:\i,section:(\i)/,
@@ -74,10 +73,20 @@ export default definePlugin({
         }
     ],
 
-    isBotOrSelf: (user: User) => user.bot || user.id === UserStore.getCurrentUser().id,
+    pushSection(sections: any[], user: User) {
+        if (isBotOrSelf(user) || sections[IS_PATCHED]) return;
+
+        sections[IS_PATCHED] = true;
+        sections.push({
+            section: "MUTUAL_GDMS",
+            text: getMutualGDMCountText(user)
+        });
+    },
 
     renderMutualGDMs: ErrorBoundary.wrap(({ user, onClose }: { user: User, onClose: () => void; }) => {
-        const entries = ChannelStore.getSortedPrivateChannels().filter(c => c.isGroupDM() && c.recipients.includes(user.id)).map(c => (
+        const mutualDms = useMemo(() => getMutualGroupDms(user.id), [user.id]);
+
+        const entries = mutualDms.map(c => (
             <Clickable
                 className={ProfileListClasses.listRow}
                 onClick={() => {

src/plugins/noMaskedUrlPaste/README.md

@@ -0,0 +1,3 @@
+# NoMaskedUrlPaste
+
+Pasting a link while you have text selected will NOT paste your link as a masked link.

src/plugins/noMaskedUrlPaste/index.ts

@@ -0,0 +1,23 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants.js";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "NoMaskedUrlPaste",
+    authors: [Devs.CatNoir],
+    description: "Pasting a link while having text selected will not paste as masked URL",
+    patches: [
+        {
+            find: ".selection,preventEmojiSurrogates:",
+            replacement: {
+                match: /if\(null!=\i.selection&&\i.\i.isExpanded\(\i.selection\)\)/,
+                replace: "if(false)"
+            }
+        }
+    ],
+});

src/plugins/noProfileThemes/index.ts

@@ -18,36 +18,21 @@
 
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
+import { UserStore } from "@webpack/common";
 
 export default definePlugin({
     name: "NoProfileThemes",
-    description: "Completely removes Nitro profile themes",
+    description: "Completely removes Nitro profile themes from everyone but yourself",
     authors: [Devs.TheKodeToad],
     patches: [
-        {
-            find: ".NITRO_BANNER,",
-            replacement: {
-                // = isPremiumAtLeast(user.premiumType, TIER_2)
-                match: /=(?=\i\.\i\.isPremiumAtLeast\(null==(\i))/,
-                // = user.banner && isPremiumAtLeast(user.premiumType, TIER_2)
-                replace: "=(arguments[0]?.bannerSrc||$1?.banner)&&"
-            }
-        },
-        {
-            find: ".avatarPositionPremiumNoBanner,default:",
-            replacement: {
-                // premiumUserWithoutBanner: foo().avatarPositionPremiumNoBanner, default: foo().avatarPositionNormal
-                match: /\.avatarPositionPremiumNoBanner(?=,default:\i\.(\i))/,
-                // premiumUserWithoutBanner: foo().avatarPositionNormal...
-                replace: ".$1"
-            }
-        },
         {
             find: "hasThemeColors(){",
             replacement: {
                 match: /get canUsePremiumProfileCustomization\(\){return /,
-                replace: "$&false &&"
+                replace: "$&$self.isCurrentUser(this.userId)&&"
             }
-        }
+        },
-    ]
+    ],
+
+    isCurrentUser: (userId: string) => userId === UserStore.getCurrentUser()?.id,
 });

src/plugins/openInApp/index.ts

@@ -33,7 +33,7 @@ interface URLReplacementRule {
 // Do not forget to add protocols to the ALLOWED_PROTOCOLS constant
 const UrlReplacementRules: Record<string, URLReplacementRule> = {
     spotify: {
-        match: /^https:\/\/open\.spotify\.com\/(track|album|artist|playlist|user|episode)\/(.+)(?:\?.+?)?$/,
+        match: /^https:\/\/open\.spotify\.com\/(?:intl-[a-z]{2}\/)?(track|album|artist|playlist|user|episode)\/(.+)(?:\?.+?)?$/,
         replace: (_, type, id) => `spotify://${type}/${id}`,
         description: "Open Spotify links in the Spotify app",
         shortlinkMatch: /^https:\/\/spotify\.link\/.+$/,

src/plugins/pauseInvitesForever/index.tsx

@@ -19,16 +19,11 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { findLazy } from "@webpack";
 import { Constants, GuildStore, i18n, RestAPI } from "@webpack/common";
 
-const InvitesDisabledExperiment = findLazy(m => m.definition?.id === "2022-07_invites_disabled");
-
 function showDisableInvites(guildId: string) {
-    // Once the experiment is removed, this should keep working
-    const { enableInvitesDisabled } = InvitesDisabledExperiment?.getCurrentConfig?.({ guildId }) ?? { enableInvitesDisabled: true };
     // @ts-ignore
-    return enableInvitesDisabled && !GuildStore.getGuild(guildId).hasFeature("INVITES_DISABLED");
+    return !GuildStore.getGuild(guildId).hasFeature("INVITES_DISABLED");
 }
 
 function disableInvites(guildId: string) {

src/plugins/permissionsViewer/components/UserPermissions.tsx

@@ -35,15 +35,17 @@ interface UserPermission {
 
 type UserPermissions = Array<UserPermission>;
 
-const Classes = proxyLazyWebpack(() =>
+const { RoleRootClasses, RoleClasses, RoleBorderClasses } = proxyLazyWebpack(() => {
-    Object.assign({}, ...findBulk(
+    const [RoleRootClasses, RoleClasses, RoleBorderClasses] = findBulk(
-        filters.byProps("roles", "rolePill", "rolePillBorder"),
+        filters.byProps("root", "expandButton", "collapseButton"),
-        filters.byProps("roleCircle", "dotBorderBase", "dotBorderColor"),
+        filters.byProps("role", "roleCircle", "roleName"),
-        filters.byProps("roleNameOverflow", "root", "roleName", "roleRemoveButton")
+        filters.byProps("roleCircle", "dot", "dotBorderColor")
-    ))
+    ) as Record<string, string>[];
-) as Record<"roles" | "rolePill" | "rolePillBorder" | "desaturateUserColors" | "flex" | "alignCenter" | "justifyCenter" | "svg" | "background" | "dot" | "dotBorderColor" | "roleCircle" | "dotBorderBase" | "flex" | "alignCenter" | "justifyCenter" | "wrap" | "root" | "role" | "roleRemoveButton" | "roleDot" | "roleFlowerStar" | "roleRemoveIcon" | "roleRemoveIconFocused" | "roleVerifiedIcon" | "roleName" | "roleNameOverflow" | "actionButton" | "overflowButton" | "addButton" | "addButtonIcon" | "overflowRolesPopout" | "overflowRolesPopoutArrowWrapper" | "overflowRolesPopoutArrow" | "popoutBottom" | "popoutTop" | "overflowRolesPopoutHeader" | "overflowRolesPopoutHeaderIcon" | "overflowRolesPopoutHeaderText" | "roleIcon", string>;
 
-function UserPermissionsComponent({ guild, guildMember, showBorder, forceOpen = false }: { guild: Guild; guildMember: GuildMember; showBorder: boolean; forceOpen?: boolean; }) {
+    return { RoleRootClasses, RoleClasses, RoleBorderClasses };
+});
+
+function UserPermissionsComponent({ guild, guildMember, forceOpen = false }: { guild: Guild; guildMember: GuildMember; forceOpen?: boolean; }) {
     const stns = settings.use(["permissionsSortOrder"]);
 
     const [rolePermissions, userPermissions] = useMemo(() => {
@@ -91,8 +93,6 @@ function UserPermissionsComponent({ guild, guildMember, showBorder, forceOpen =
         return [rolePermissions, userPermissions];
     }, [stns.permissionsSortOrder]);
 
-    const { root, role, roleRemoveButton, roleNameOverflow, roles, rolePill, rolePillBorder, roleCircle, roleName } = Classes;
-
     return (
         <ExpandableHeader
             forceOpen={forceOpen}
@@ -130,18 +130,18 @@ function UserPermissionsComponent({ guild, guildMember, showBorder, forceOpen =
                 </Tooltip>)
             ]}>
             {userPermissions.length > 0 && (
-                <div className={classes(root, roles)}>
+                <div className={classes(RoleRootClasses.root)}>
                     {userPermissions.map(({ permission, roleColor }) => (
-                        <div className={classes(role, rolePill, showBorder ? rolePillBorder : null)}>
+                        <div className={classes(RoleClasses.role)}>
-                            <div className={roleRemoveButton}>
+                            <div className={RoleClasses.roleRemoveButton}>
                                 <span
-                                    className={roleCircle}
+                                    className={classes(RoleBorderClasses.roleCircle, RoleClasses.roleCircle)}
                                     style={{ backgroundColor: roleColor }}
                                 />
                             </div>
-                            <div className={roleName}>
+                            <div className={RoleClasses.roleName}>
                                 <Text
-                                    className={roleNameOverflow}
+                                    className={RoleClasses.roleNameOverflow}
                                     variant="text-xs/medium"
                                 >
                                     {permission}

src/plugins/permissionsViewer/index.tsx

@@ -169,32 +169,22 @@ export default definePlugin({
     settings,
 
     patches: [
-        {
-            find: ".popularApplicationCommandIds,",
-            replacement: {
-                match: /showBorder:(.{0,60})}\),(?<=guild:(\i),guildMember:(\i),.+?)/,
-                replace: (m, showBoder, guild, guildMember) => `${m}$self.UserPermissions(${guild},${guildMember},${showBoder}),`
-            }
-        },
         {
             find: ".VIEW_ALL_ROLES,",
             replacement: {
-                match: /children:"\+"\.concat\(\i\.length-\i\.length\).{0,20}\}\),/,
+                match: /\.collapseButton,.+?}\)}\),/,
                 replace: "$&$self.ViewPermissionsButton(arguments[0]),"
             }
         }
     ],
 
-    UserPermissions: (guild: Guild, guildMember: GuildMember | undefined, showBorder: boolean) =>
-        !!guildMember && <UserPermissions guild={guild} guildMember={guildMember} showBorder={showBorder} />,
-
     ViewPermissionsButton: ErrorBoundary.wrap(({ guild, guildMember }: { guild: Guild; guildMember: GuildMember; }) => (
         <Popout
             position="bottom"
             align="center"
             renderPopout={() => (
                 <Dialog className={PopoutClasses.container} style={{ width: "500px" }}>
-                    <UserPermissions guild={guild} guildMember={guildMember} showBorder forceOpen />
+                    <UserPermissions guild={guild} guildMember={guildMember} forceOpen />
                 </Dialog>
             )}
         >

src/plugins/pictureInPicture/index.tsx

@@ -24,13 +24,13 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "PictureInPicture",
     description: "Adds picture in picture to videos (next to the Download button)",
-    authors: [Devs.Nobody],
+    authors: [Devs.Lumap],
     settings,
     patches: [
         {
-            find: ".nonMediaMosaicItem]",
+            find: ".removeMosaicItemHoverButton),",
             replacement: {
-                match: /\.nonMediaMosaicItem\]:!(\i).{0,50}?children:\[(\S)/,
+                match: /\.nonMediaMosaicItem\]:!(\i).{0,50}?children:\[\S,(\S)/,
                 replace: "$&,$1&&$2&&$self.renderPiPButton(),"
             },
         },

src/plugins/pronoundb/index.ts

@@ -26,11 +26,6 @@ import { CompactPronounsChatComponentWrapper, PronounsChatComponentWrapper } fro
 import { useProfilePronouns } from "./pronoundbUtils";
 import { settings } from "./settings";
 
-const PRONOUN_TOOLTIP_PATCH = {
-    match: /text:(.{0,10}.Messages\.USER_PROFILE_PRONOUNS)(?=,)/,
-    replace: '$& + (typeof vcPronounSource !== "undefined" ? ` (${vcPronounSource})` : "")'
-};
-
 export default definePlugin({
     name: "PronounDB",
     authors: [Devs.Tyman, Devs.TheKodeToad, Devs.Ven, Devs.Elvyra],
@@ -51,26 +46,23 @@ export default definePlugin({
                 }
             ]
         },
-        // Patch the profile popout username header to use our pronoun hook instead of Discord's pronouns
+
         {
-            find: ".pronouns,children",
+            find: ".Messages.USER_PROFILE_PRONOUNS",
+            group: true,
             replacement: [
                 {
-                    match: /{user:(\i),[^}]*,pronouns:(\i),[^}]*}=\i.*?;(?=return)/,
+                    match: /\.PANEL},/,
-                    replace: "$&let vcPronounSource;[$2,vcPronounSource]=$self.useProfilePronouns($1.id);"
+                    replace: "$&[vcPronoun,vcPronounSource,vcHasPendingPronouns]=$self.useProfilePronouns(arguments[0].user?.id),"
                 },
-                PRONOUN_TOOLTIP_PATCH
-            ]
-        },
-        // Patch the profile modal username header to use our pronoun hook instead of Discord's pronouns
                 {
-            find: ".nameTagSmall)",
+                    match: /text:\i\.\i.Messages.USER_PROFILE_PRONOUNS/,
-            replacement: [
+                    replace: '$&+vcHasPendingPronouns?"":` (${vcPronounSource})`'
-                {
-                    match: /\.getName\(\i\);(?<=displayProfile.{0,200})/,
-                    replace: "$&const [vcPronounce,vcPronounSource]=$self.useProfilePronouns(arguments[0].user.id,true);if(arguments[0].displayProfile&&vcPronounce)arguments[0].displayProfile.pronouns=vcPronounce;"
                 },
-                PRONOUN_TOOLTIP_PATCH
+                {
+                    match: /(\.pronounsText.+?children:)(\i)/,
+                    replace: "$1vcHasPendingPronouns?$2:vcPronoun"
+                }
             ]
         }
     ],

src/plugins/pronoundb/pronoundbUtils.ts

@@ -21,13 +21,16 @@ import { debounce } from "@shared/debounce";
 import { VENCORD_USER_AGENT } from "@shared/vencordUserAgent";
 import { getCurrentChannel } from "@utils/discord";
 import { useAwaiter } from "@utils/react";
+import { findStoreLazy } from "@webpack";
 import { UserProfileStore, UserStore } from "@webpack/common";
 
 import { settings } from "./settings";
 import { CachePronouns, PronounCode, PronounMapping, PronounsResponse } from "./types";
 
-type PronounsWithSource = [string | null, string];
+const UserSettingsAccountStore = findStoreLazy("UserSettingsAccountStore");
-const EmptyPronouns: PronounsWithSource = [null, ""];
+
+type PronounsWithSource = [pronouns: string | null, source: string, hasPendingPronouns: boolean];
+const EmptyPronouns: PronounsWithSource = [null, "", false];
 
 export const enum PronounsFormat {
     Lowercase = "LOWERCASE",
@@ -75,13 +78,15 @@ export function useFormattedPronouns(id: string, useGlobalProfile: boolean = fal
         onError: e => console.error("Fetching pronouns failed: ", e)
     });
 
+    const hasPendingPronouns = UserSettingsAccountStore.getPendingPronouns() != null;
+
     if (settings.store.pronounSource === PronounSource.PreferDiscord && discordPronouns)
-        return [discordPronouns, "Discord"];
+        return [discordPronouns, "Discord", hasPendingPronouns];
 
     if (result && result !== PronounMapping.unspecified)
-        return [result, "PronounDB"];
+        return [result, "PronounDB", hasPendingPronouns];
 
-    return [discordPronouns, "Discord"];
+    return [discordPronouns, "Discord", hasPendingPronouns];
 }
 
 export function useProfilePronouns(id: string, useGlobalProfile: boolean = false): PronounsWithSource {
@@ -147,7 +152,7 @@ async function bulkFetchPronouns(ids: string[]): Promise<PronounsResponse> {
     }
 }
 
-export function extractPronouns(pronounSet?: { [locale: string]: PronounCode[] }): string {
+export function extractPronouns(pronounSet?: { [locale: string]: PronounCode[]; }): string {
     if (!pronounSet || !pronounSet.en) return PronounMapping.unspecified;
     // PronounDB returns an empty set instead of {sets: {en: ["unspecified"]}}.
     const pronouns = pronounSet.en;

src/plugins/reviewDB/index.tsx

@@ -20,18 +20,16 @@ import "./style.css";
 
 import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { ExpandableHeader } from "@components/ExpandableHeader";
 import { NotesIcon, OpenExternalIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { classes } from "@utils/misc";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { Alerts, Button, Menu, Parser, TooltipContainer, useState } from "@webpack/common";
+import { Alerts, Button, Menu, Parser, TooltipContainer } from "@webpack/common";
 import { Guild, User } from "discord-types/general";
 
 import { Auth, initAuth, updateAuth } from "./auth";
 import { openReviewsModal } from "./components/ReviewModal";
-import ReviewsView from "./components/ReviewsView";
 import { NotificationType } from "./entities";
 import { getCurrentUserInfo, readNotification } from "./reviewDbApi";
 import { settings } from "./settings";
@@ -79,17 +77,24 @@ export default definePlugin({
 
     patches: [
         {
-            find: "showBorder:null",
+            find: ".BITE_SIZE,user:",
             replacement: {
-                match: /user:(\i),setNote:\i,canDM.+?\}\)/,
+                match: /{profileType:\i\.\i\.BITE_SIZE,children:\[/,
-                replace: "$&,$self.getReviewsComponent($1)"
+                replace: "$&$self.BiteSizeReviewsButton({user:arguments[0].user}),"
             }
         },
         {
-            find: ".BITE_SIZE,user:",
+            find: ".FULL_SIZE,user:",
             replacement: {
-                match: /(?<=\.BITE_SIZE,children:\[)\(0,\i\.jsx\)\(\i\.\i,\{user:(\i),/,
+                match: /{profileType:\i\.\i\.FULL_SIZE,children:\[/,
-                replace: "$self.BiteSizeReviewsButton({user:$1}),$&"
+                replace: "$&$self.BiteSizeReviewsButton({user:arguments[0].user}),"
+            }
+        },
+        {
+            find: ".PANEL,isInteractionSource:",
+            replacement: {
+                match: /{profileType:\i\.\i\.PANEL,children:\[/,
+                replace: "$&$self.BiteSizeReviewsButton({user:arguments[0].user}),"
             }
         }
     ],
@@ -148,31 +153,6 @@ export default definePlugin({
         }, 4000);
     },
 
-    getReviewsComponent: ErrorBoundary.wrap((user: User) => {
-        const [reviewCount, setReviewCount] = useState<number>();
-
-        return (
-            <ExpandableHeader
-                headerText="User Reviews"
-                onMoreClick={() => openReviewsModal(user.id, user.username)}
-                moreTooltipText={
-                    reviewCount && reviewCount > 50
-                        ? `View all ${reviewCount} reviews`
-                        : "Open Review Modal"
-                }
-                onDropDownClick={state => settings.store.reviewsDropdownState = !state}
-                defaultState={settings.store.reviewsDropdownState}
-            >
-                <ReviewsView
-                    discordId={user.id}
-                    name={user.username}
-                    onFetchReviews={r => setReviewCount(r.reviewCount)}
-                    showInput
-                />
-            </ExpandableHeader>
-        );
-    }, { message: "Failed to render Reviews" }),
-
     BiteSizeReviewsButton: ErrorBoundary.wrap(({ user }: { user: User; }) => {
         return (
             <TooltipContainer text="View Reviews">

src/plugins/sendTimestamps/styles.css

@@ -26,8 +26,7 @@
 }
 
 .vc-st-modal-header {
-    justify-content: space-between;
+    place-content: center space-between;
-    align-content: center;
 }
 
 .vc-st-modal-header h1 {

src/plugins/showAllRoles/README.md

@@ -1,6 +0,0 @@
-# ShowAllRoles
-
-Display all roles on the new profiles instead of limiting them to the default two rows.
-
-![image](https://github.com/Vendicated/Vencord/assets/71079641/3f021f03-c6f9-4fe5-83ac-a1891b5e4b37)
-

src/plugins/showConnections/index.tsx

@@ -25,15 +25,12 @@ import { CopyIcon, LinkIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { copyWithToast } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy, findByPropsLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack";
+import { findByCodeLazy, findByPropsLazy } from "@webpack";
-import { Text, Tooltip, UserProfileStore } from "@webpack/common";
+import { Tooltip, UserProfileStore } from "@webpack/common";
 import { User } from "discord-types/general";
 
 import { VerifiedIcon } from "./VerifiedIcon";
 
-const Section = findComponentByCodeLazy(".lastSection", "children:");
-const ThemeStore = findStoreLazy("ThemeStore");
-
 const useLegacyPlatformType: (platform: string) => string = findByCodeLazy(".TWITTER_LEGACY:");
 const platforms: { get(type: string): ConnectionPlatform; } = findByPropsLazy("isSupported", "getByUrl");
 const getProfileThemeProps = findByCodeLazy(".getPreviewThemeColors", "primaryColor:");
@@ -76,7 +73,7 @@ interface ConnectionPlatform {
 }
 
 const profilePopoutComponent = ErrorBoundary.wrap(
-    (props: { user: User; displayProfile?: any; simplified?: boolean; }) => (
+    (props: { user: User; displayProfile?: any; }) => (
         <ConnectionsComponent
             {...props}
             id={props.user.id}
@@ -86,17 +83,7 @@ const profilePopoutComponent = ErrorBoundary.wrap(
     { noop: true }
 );
 
-const profilePanelComponent = ErrorBoundary.wrap(
+function ConnectionsComponent({ id, theme }: { id: string, theme: string; }) {
-    (props: { id: string; simplified?: boolean; }) => (
-        <ConnectionsComponent
-            {...props}
-            theme={ThemeStore.theme}
-        />
-    ),
-    { noop: true }
-);
-
-function ConnectionsComponent({ id, theme, simplified }: { id: string, theme: string, simplified?: boolean; }) {
     const profile = UserProfileStore.getUserProfile(id);
     if (!profile)
         return null;
@@ -105,31 +92,14 @@ function ConnectionsComponent({ id, theme, simplified }: { id: string, theme: st
     if (!connections?.length)
         return null;
 
-    const connectionsContainer = (
+    return (
         <Flex style={{
-            marginTop: !simplified ? "8px" : undefined,
             gap: getSpacingPx(settings.store.iconSpacing),
             flexWrap: "wrap"
         }}>
             {connections.map(connection => <CompactConnectionComponent connection={connection} theme={theme} />)}
         </Flex>
     );
-
-    if (simplified)
-        return connectionsContainer;
-
-    return (
-        <Section>
-            <Text
-                tag="h2"
-                variant="eyebrow"
-                style={{ color: "var(--header-primary)" }}
-            >
-                Connections
-            </Text>
-            {connectionsContainer}
-        </Section>
-    );
 }
 
 function CompactConnectionComponent({ connection, theme }: { connection: Connection, theme: string; }) {
@@ -194,31 +164,17 @@ export default definePlugin({
     name: "ShowConnections",
     description: "Show connected accounts in user popouts",
     authors: [Devs.TheKodeToad],
+    settings,
+
     patches: [
         {
-            find: "{isUsingGuildBio:null!==(",
+            find: ".hasAvatarForGuild(null==",
-            replacement: {
-                match: /,theme:\i\}\)(?=,.{0,150}setNote:)/,
-                replace: "$&,$self.profilePopoutComponent({ user: arguments[0].user, displayProfile: arguments[0].displayProfile })"
-            }
-        },
-        {
-            find: ".PROFILE_PANEL,",
-            replacement: {
-                // createElement(Divider, {}), createElement(NoteComponent)
-                match: /\(0,\i\.jsx\)\(\i\.\i,\{\}\).{0,100}setNote:(?=.+?channelId:(\i).id)/,
-                replace: "$self.profilePanelComponent({ id: $1.recipients[0] }),$&"
-            }
-        },
-        {
-            find: '"BiteSizeProfileBody"',
             replacement: {
                 match: /currentUser:\i,guild:\i}\)(?<=user:(\i),bio:null==(\i)\?.+?)/,
-                replace: "$&,$self.profilePopoutComponent({ user: $1, displayProfile: $2, simplified: true })"
+                replace: "$&,$self.profilePopoutComponent({ user: $1, displayProfile: $2 })"
             }
         }
     ],
-    settings,
+
     profilePopoutComponent,
-    profilePanelComponent
 });

src/plugins/showHiddenChannels/index.tsx

@@ -311,7 +311,7 @@ export default definePlugin({
             replacement: [
                 {
                     // Create a variable for the channel prop
-                    match: /maxUsers:\i,users:\i.+?}=(\i).*?;/,
+                    match: /users:\i,maxUsers:\i.+?}=(\i).*?;/,
                     replace: (m, props) => `${m}let{shcChannel}=${props};`
                 },
                 {

src/plugins/showHiddenThings/index.ts

@@ -51,7 +51,7 @@ export default definePlugin({
             },
         },
         {
-            find: "2022-07_invites_disabled",
+            find: "INVITES_DISABLED))||",
             predicate: () => settings.store.showInvitesPaused,
             replacement: {
                 match: /\i\.\i\.can\(\i\.\i.MANAGE_GUILD,\i\)/,
@@ -68,7 +68,7 @@ export default definePlugin({
         },
         // fixes a bug where Members page must be loaded to see highest role, why is Discord depending on MemberSafetyStore.getEnhancedMember for something that can be obtained here?
         {
-            find: "Messages.GUILD_MEMBER_MOD_VIEW_PERMISSION_GRANTED_BY_ARIA_LABEL,tooltipContentClassName",
+            find: "Messages.GUILD_MEMBER_MOD_VIEW_PERMISSION_GRANTED_BY_ARIA_LABEL,allowOverflow",
             predicate: () => settings.store.showModView,
             replacement: {
                 match: /(role:)\i(?=,guildId.{0,100}role:(\i\[))/,

src/plugins/spotifyControls/PlayerComponent.tsx

@@ -165,7 +165,6 @@ function SeekBar() {
 
     const [position, setPosition] = useState(storePosition);
 
-    // eslint-disable-next-line consistent-return
     useEffect(() => {
         if (isPlaying && !isSettingPosition) {
             setPosition(SpotifyStore.position);
@@ -358,7 +357,7 @@ export function Player() {
     const [shouldHide, setShouldHide] = useState(false);
 
     // Hide player after 5 minutes of inactivity
-    // eslint-disable-next-line consistent-return
+
     React.useEffect(() => {
         setShouldHide(false);
         if (!isPlaying) {

src/plugins/spotifyControls/SpotifyStore.ts

@@ -55,6 +55,7 @@ interface PlayerState {
 
     // added by patch
     actual_repeat: Repeat;
+    shuffle: boolean;
 }
 
 interface Device {
@@ -182,6 +183,7 @@ export const SpotifyStore = proxyLazyWebpack(() => {
             store.isPlaying = e.isPlaying ?? false;
             store.volume = e.volumePercent ?? 0;
             store.repeat = e.actual_repeat || "off";
+            store.shuffle = e.shuffle ?? false;
             store.position = e.position ?? 0;
             store.isSettingPosition = false;
             store.emitChange();

src/plugins/spotifyControls/index.tsx

@@ -70,21 +70,20 @@ export default definePlugin({
                 replace: "false",
             }]
         },
-        // Discord doesn't give you the repeat kind, only a boolean
         {
             find: 'repeat:"off"!==',
-            replacement: {
+            replacement: [
-                match: /repeat:"off"!==(.{1,3}),/,
+                {
-                replace: "actual_repeat:$1,$&"
+                    // Discord doesn't give you shuffle state and the repeat kind, only a boolean
-            }
+                    match: /repeat:"off"!==(\i),/,
+                    replace: "shuffle:arguments[2]?.shuffle_state??false,actual_repeat:$1,$&"
                 },
                 {
-            find: "artists.filter",
-            replacement: {
                     match: /(?<=artists.filter\(\i=>).{0,10}\i\.id\)&&/,
                     replace: ""
                 }
-        }
+            ]
+        },
     ],
 
     start: () => toggleHoverControls(Settings.plugins.SpotifyControls.hoverControls),

src/plugins/spotifyControls/spotifyStyles.css

@@ -101,9 +101,8 @@
     display: flex;
     flex-direction: column;
     padding: 0.2rem;
-    justify-content: center;
     align-items: flex-start;
-    align-content: flex-start;
+    place-content: flex-start center;
     overflow: hidden;
 }
 

src/plugins/stickerPaste/README.md

@@ -0,0 +1,3 @@
+# StickerPaste
+
+Makes picking a sticker in the sticker picker insert it into the chatbox instead of instantly sending.

src/plugins/stickerPaste/index.ts

@@ -8,15 +8,16 @@ import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 
 export default definePlugin({
-    name: "ShowAllRoles",
+    name: "StickerPaste",
-    description: "Show all roles in new profiles.",
+    description: "Makes picking a sticker in the sticker picker insert it into the chatbox instead of instantly sending",
-    authors: [Devs.Luna],
+    authors: [Devs.ImBanana],
+
     patches: [
         {
-            find: ".Messages.VIEW_ALL_ROLES",
+            find: ".stickers,previewSticker:",
             replacement: {
-                match: /(\i)\.slice\(0,\i\)/,
+                match: /if\(\i\.\i\.getUploadCount/,
-                replace: "$1"
+                replace: "return true;$&",
             }
         }
     ]

src/plugins/superReactionTweaks/index.ts

@@ -22,10 +22,10 @@ export const settings = definePluginSettings({
     },
 
     superReactionPlayingLimit: {
-        description: "Max Super Reactions to play at once",
+        description: "Max Super Reactions to play at once. 0 to disable playing Super Reactions",
         type: OptionType.SLIDER,
         default: 20,
-        markers: [5, 10, 20, 40, 60, 80, 100],
+        markers: [0, 5, 10, 20, 40, 60, 80, 100],
         stickToMarkers: true,
     },
 }, {
@@ -58,6 +58,7 @@ export default definePlugin({
 
     shouldPlayBurstReaction(playingCount: number) {
         if (settings.store.unlimitedSuperReactionPlaying) return true;
+        if (settings.store.superReactionPlayingLimit === 0) return false;
         if (playingCount <= settings.store.superReactionPlayingLimit) return true;
         return false;
     },

src/plugins/timeBarAllActivities/README.md

@@ -0,0 +1,5 @@
+# TimeBarAllActivities
+
+Adds the Spotify time bar to all activities if they have start and end timestamps.
+
+![](https://github.com/user-attachments/assets/9fbbe33c-8218-43c9-8b8d-f907a4e809fe)

src/plugins/timeBarAllActivities/index.tsx

@@ -0,0 +1,76 @@
+/*
+ * 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 { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { findComponentByCodeLazy } from "@webpack";
+
+interface Activity {
+    timestamps?: ActivityTimestamps;
+}
+
+interface ActivityTimestamps {
+    start?: string;
+    end?: string;
+}
+
+const ActivityTimeBar = findComponentByCodeLazy<ActivityTimestamps>(".Millis.HALF_SECOND", ".bar", ".progress");
+
+export const settings = definePluginSettings({
+    hideActivityDetailText: {
+        type: OptionType.BOOLEAN,
+        description: "Hide the large title text next to the activity",
+        default: true,
+    },
+    hideActivityTimerBadges: {
+        type: OptionType.BOOLEAN,
+        description: "Hide the timer badges next to the activity",
+        default: true,
+    }
+});
+
+export default definePlugin({
+    name: "TimeBarAllActivities",
+    description: "Adds the Spotify time bar to all activities if they have start and end timestamps",
+    authors: [Devs.fawn, Devs.niko],
+    settings,
+    patches: [
+        {
+            find: ".Messages.USER_ACTIVITY_PLAYING",
+            replacement: [
+                // Insert Spotify time bar component
+                {
+                    match: /\(0,.{0,30}activity:(\i),className:\i\.badges\}\)/g,
+                    replace: "$&,$self.getTimeBar($1)"
+                },
+                // Hide the large title on listening activities, to make them look more like Spotify (also visible from hovering over the large icon)
+                {
+                    match: /(\i).type===(\i\.\i)\.WATCHING/,
+                    replace: "($self.settings.store.hideActivityDetailText&&$self.isActivityTimestamped($1)&&$1.type===$2.LISTENING)||$&"
+                }
+            ]
+        },
+        // Hide the "badge" timers that count the time since the activity starts
+        {
+            find: ".TvIcon).otherwise",
+            replacement: {
+                match: /null!==\(\i=null===\(\i=(\i)\.timestamps\).{0,50}created_at/,
+                replace: "($self.settings.store.hideActivityTimerBadges&&$self.isActivityTimestamped($1))?null:$&"
+            }
+        }
+    ],
+
+    isActivityTimestamped(activity: Activity) {
+        return activity.timestamps != null && activity.timestamps.start != null && activity.timestamps.end != null;
+    },
+
+    getTimeBar(activity: Activity) {
+        if (this.isActivityTimestamped(activity)) {
+            return <ActivityTimeBar start={activity.timestamps!.start} end={activity.timestamps!.end} />;
+        }
+    }
+});

src/plugins/translate/TranslateIcon.tsx

@@ -17,10 +17,9 @@
 */
 
 import { ChatBarButton } from "@api/ChatButtons";
-import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
 import { openModal } from "@utils/modal";
-import { Alerts, Forms } from "@webpack/common";
+import { Alerts, Forms, Tooltip, useEffect, useState } from "@webpack/common";
 
 import { settings } from "./settings";
 import { TranslateModal } from "./TranslateModal";
@@ -39,9 +38,17 @@ export function TranslateIcon({ height = 24, width = 24, className }: { height?:
     );
 }
 
+export let setShouldShowTranslateEnabledTooltip: undefined | ((show: boolean) => void);
+
 export const TranslateChatBarIcon: ChatBarButton = ({ isMainChat }) => {
     const { autoTranslate, showChatBarButton } = settings.use(["autoTranslate", "showChatBarButton"]);
 
+    const [shouldShowTranslateEnabledTooltip, setter] = useState(false);
+    useEffect(() => {
+        setShouldShowTranslateEnabledTooltip = setter;
+        return () => setShouldShowTranslateEnabledTooltip = undefined;
+    }, []);
+
     if (!isMainChat || !showChatBarButton) return null;
 
     const toggle = () => {
@@ -52,21 +59,20 @@ export const TranslateChatBarIcon: ChatBarButton = ({ isMainChat }) => {
                 title: "Vencord Auto-Translate Enabled",
                 body: <>
                     <Forms.FormText>
-                        You just enabled auto translate (by right clicking the Translate icon). Any message you send will automatically be translated before being sent.
+                        You just enabled Auto Translate! Any message <b>will automatically be translated</b> before being sent.
-                    </Forms.FormText>
-                    <Forms.FormText className={Margins.top16}>
-                        If this was an accident, disable it again, or it will change your message content before sending.
                     </Forms.FormText>
                 </>,
-                cancelText: "Disable Auto-Translate",
+                confirmText: "Disable Auto-Translate",
-                confirmText: "Got it",
+                cancelText: "Got it",
                 secondaryConfirmText: "Don't show again",
                 onConfirmSecondary: () => settings.store.showAutoTranslateAlert = false,
-                onCancel: () => settings.store.autoTranslate = false
+                onConfirm: () => settings.store.autoTranslate = false,
+                // troll
+                confirmColor: "vc-notification-log-danger-btn",
             });
     };
 
-    return (
+    const button = (
         <ChatBarButton
             tooltip="Open Translate Modal"
             onClick={e => {
@@ -76,7 +82,7 @@ export const TranslateChatBarIcon: ChatBarButton = ({ isMainChat }) => {
                     <TranslateModal rootProps={props} />
                 ));
             }}
-            onContextMenu={() => toggle()}
+            onContextMenu={toggle}
             buttonProps={{
                 "aria-haspopup": "dialog"
             }}
@@ -84,4 +90,13 @@ export const TranslateChatBarIcon: ChatBarButton = ({ isMainChat }) => {
             <TranslateIcon className={cl({ "auto-translate": autoTranslate, "chat-button": true })} />
         </ChatBarButton>
     );
+
+    if (shouldShowTranslateEnabledTooltip && settings.store.showAutoTranslateTooltip)
+        return (
+            <Tooltip text="Auto Translate Enabled" forceOpen>
+                {() => button}
+            </Tooltip>
+        );
+
+    return button;
 };

src/plugins/translate/TranslateModal.tsx

@@ -20,9 +20,8 @@ import { Margins } from "@utils/margins";
 import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot } from "@utils/modal";
 import { Forms, SearchableSelect, Switch, useMemo } from "@webpack/common";
 
-import { Languages } from "./languages";
 import { settings } from "./settings";
-import { cl } from "./utils";
+import { cl, getLanguages } from "./utils";
 
 const LanguageSettingKeys = ["receivedInput", "receivedOutput", "sentInput", "sentOutput"] as const;
 
@@ -31,7 +30,7 @@ function LanguageSelect({ settingsKey, includeAuto }: { settingsKey: typeof Lang
 
     const options = useMemo(
         () => {
-            const options = Object.entries(Languages).map(([value, label]) => ({ value, label }));
+            const options = Object.entries(getLanguages()).map(([value, label]) => ({ value, label }));
             if (!includeAuto)
                 options.shift();
 

src/plugins/translate/TranslationAccessory.tsx

@@ -19,7 +19,6 @@
 import { Parser, useEffect, useState } from "@webpack/common";
 import { Message } from "discord-types/general";
 
-import { Languages } from "./languages";
 import { TranslateIcon } from "./TranslateIcon";
 import { cl, TranslationValue } from "./utils";
 
@@ -59,7 +58,7 @@ export function TranslationAccessory({ message }: { message: Message; }) {
             <TranslateIcon width={16} height={16} />
             {Parser.parse(translation.text)}
             {" "}
-            (translated from {Languages[translation.src] ?? translation.src} - <Dismiss onDismiss={() => setTranslation(undefined)} />)
+            (translated from {translation.sourceLanguage} - <Dismiss onDismiss={() => setTranslation(undefined)} />)
         </span>
     );
 }

src/plugins/translate/index.tsx

@@ -28,7 +28,7 @@ import definePlugin from "@utils/types";
 import { ChannelStore, Menu } from "@webpack/common";
 
 import { settings } from "./settings";
-import { TranslateChatBarIcon, TranslateIcon } from "./TranslateIcon";
+import { setShouldShowTranslateEnabledTooltip, TranslateChatBarIcon, TranslateIcon } from "./TranslateIcon";
 import { handleTranslate, TranslationAccessory } from "./TranslationAccessory";
 import { translate } from "./utils";
 
@@ -53,8 +53,8 @@ const messageCtxPatch: NavContextMenuPatchCallback = (children, { message }) =>
 
 export default definePlugin({
     name: "Translate",
-    description: "Translate messages with Google Translate",
+    description: "Translate messages with Google Translate or DeepL",
-    authors: [Devs.Ven],
+    authors: [Devs.Ven, Devs.AshtonMemer],
     dependencies: ["MessageAccessoriesAPI", "MessagePopoverAPI", "MessageEventsAPI", "ChatInputButtonAPI"],
     settings,
     contextMenus: {
@@ -83,11 +83,18 @@ export default definePlugin({
             };
         });
 
+        let tooltipTimeout: any;
         this.preSend = addPreSendListener(async (_, message) => {
             if (!settings.store.autoTranslate) return;
             if (!message.content) return;
 
-            message.content = (await translate("sent", message.content)).text;
+            setShouldShowTranslateEnabledTooltip?.(true);
+            clearTimeout(tooltipTimeout);
+            tooltipTimeout = setTimeout(() => setShouldShowTranslateEnabledTooltip?.(false), 2000);
+
+            const trans = await translate("sent", message.content);
+            message.content = trans.text;
+
         });
     },
 

src/plugins/translate/languages.ts

@@ -31,9 +31,10 @@ copy(Object.fromEntries(
 ))
 */
 
-export type Language = keyof typeof Languages;
+export type GoogleLanguage = keyof typeof GoogleLanguages;
+export type DeeplLanguage = keyof typeof DeeplLanguages;
 
-export const Languages = {
+export const GoogleLanguages = {
     "auto": "Detect language",
     "af": "Afrikaans",
     "sq": "Albanian",
@@ -169,3 +170,57 @@ export const Languages = {
     "yo": "Yoruba",
     "zu": "Zulu"
 } as const;
+
+export const DeeplLanguages = {
+    "": "Detect language",
+    "ar": "Arabic",
+    "bg": "Bulgarian",
+    "zh-hans": "Chinese (Simplified)",
+    "zh-hant": "Chinese (Traditional)",
+    "cs": "Czech",
+    "da": "Danish",
+    "nl": "Dutch",
+    "en-us": "English (American)",
+    "en-gb": "English (British)",
+    "et": "Estonian",
+    "fi": "Finnish",
+    "fr": "French",
+    "de": "German",
+    "el": "Greek",
+    "hu": "Hungarian",
+    "id": "Indonesian",
+    "it": "Italian",
+    "ja": "Japanese",
+    "ko": "Korean",
+    "lv": "Latvian",
+    "lt": "Lithuanian",
+    "nb": "Norwegian",
+    "pl": "Polish",
+    "pt-br": "Portuguese (Brazilian)",
+    "pt-pt": "Portuguese (European)",
+    "ro": "Romanian",
+    "ru": "Russian",
+    "sk": "Slovak",
+    "sl": "Slovenian",
+    "es": "Spanish",
+    "sv": "Swedish",
+    "tr": "Turkish",
+    "uk": "Ukrainian"
+} as const;
+
+export function deeplLanguageToGoogleLanguage(language: string) {
+    switch (language) {
+        case "": return "auto";
+        case "nb": return "no";
+        case "zh-hans": return "zh-CN";
+        case "zh-hant": return "zh-TW";
+        case "en-us":
+        case "en-gb":
+            return "en";
+        case "pt-br":
+        case "pt-pt":
+            return "pt";
+        default:
+            return language;
+    }
+}

src/plugins/translate/native.ts

@@ -0,0 +1,29 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { IpcMainInvokeEvent } from "electron";
+
+export async function makeDeeplTranslateRequest(_: IpcMainInvokeEvent, pro: boolean, apiKey: string, payload: string) {
+    const url = pro
+        ? "https://api.deepl.com/v2/translate"
+        : "https://api-free.deepl.com/v2/translate";
+
+    try {
+        const res = await fetch(url, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                "Authorization": `DeepL-Auth-Key ${apiKey}`
+            },
+            body: payload
+        });
+
+        const data = await res.text();
+        return { status: res.status, data };
+    } catch (e) {
+        return { status: -1, data: String(e) };
+    }
+}

src/plugins/translate/settings.ts

@@ -22,38 +22,76 @@ import { OptionType } from "@utils/types";
 export const settings = definePluginSettings({
     receivedInput: {
         type: OptionType.STRING,
-        description: "Input language for received messages",
+        description: "Language that received messages should be translated from",
         default: "auto",
         hidden: true
     },
     receivedOutput: {
         type: OptionType.STRING,
-        description: "Output language for received messages",
+        description: "Language that received messages should be translated to",
         default: "en",
         hidden: true
     },
     sentInput: {
         type: OptionType.STRING,
-        description: "Input language for sent messages",
+        description: "Language that your own messages should be translated from",
         default: "auto",
         hidden: true
     },
     sentOutput: {
         type: OptionType.STRING,
-        description: "Output language for sent messages",
+        description: "Language that your own messages should be translated to",
         default: "en",
         hidden: true
     },
+
+    showChatBarButton: {
+        type: OptionType.BOOLEAN,
+        description: "Show translate button in chat bar",
+        default: true
+    },
+    service: {
+        type: OptionType.SELECT,
+        description: IS_WEB ? "Translation service (Not supported on Web!)" : "Translation service",
+        disabled: () => IS_WEB,
+        options: [
+            { label: "Google Translate", value: "google", default: true },
+            { label: "DeepL Free", value: "deepl" },
+            { label: "DeepL Pro", value: "deepl-pro" }
+        ] as const,
+        onChange: resetLanguageDefaults
+    },
+    deeplApiKey: {
+        type: OptionType.STRING,
+        description: "DeepL API key",
+        default: "",
+        placeholder: "Get your API key from https://deepl.com/your-account",
+        disabled: () => IS_WEB
+    },
     autoTranslate: {
         type: OptionType.BOOLEAN,
         description: "Automatically translate your messages before sending. You can also shift/right click the translate button to toggle this",
         default: false
     },
-    showChatBarButton: {
+    showAutoTranslateTooltip: {
         type: OptionType.BOOLEAN,
-        description: "Show translate button in chat bar",
+        description: "Show a tooltip on the ChatBar button whenever a message is automatically translated",
         default: true
-    }
+    },
 }).withPrivateSettings<{
     showAutoTranslateAlert: boolean;
 }>();
+
+export function resetLanguageDefaults() {
+    if (IS_WEB || settings.store.service === "google") {
+        settings.store.receivedInput = "auto";
+        settings.store.receivedOutput = "en";
+        settings.store.sentInput = "auto";
+        settings.store.sentOutput = "en";
+    } else {
+        settings.store.receivedInput = "";
+        settings.store.receivedOutput = "en-us";
+        settings.store.sentInput = "";
+        settings.store.sentOutput = "en-us";
+    }
+}

src/plugins/translate/styles.css

@@ -3,8 +3,7 @@
 }
 
 .vc-trans-modal-header {
-    justify-content: space-between;
+    place-content: center space-between;
-    align-content: center;
 }
 
 .vc-trans-modal-header h1 {

src/plugins/translate/utils.ts

@@ -17,12 +17,18 @@
 */
 
 import { classNameFactory } from "@api/Styles";
+import { onlyOnce } from "@utils/onlyOnce";
+import { PluginNative } from "@utils/types";
+import { showToast, Toasts } from "@webpack/common";
 
-import { settings } from "./settings";
+import { DeeplLanguages, deeplLanguageToGoogleLanguage, GoogleLanguages } from "./languages";
+import { resetLanguageDefaults, settings } from "./settings";
 
 export const cl = classNameFactory("vc-trans-");
 
-interface TranslationData {
+const Native = VencordNative.pluginHelpers.Translate as PluginNative<typeof import("./native")>;
+
+interface GoogleData {
     src: string;
     sentences: {
         // 🏳️‍⚧️
@@ -30,15 +36,47 @@ interface TranslationData {
     }[];
 }
 
+interface DeeplData {
+    translations: {
+        detected_source_language: string;
+        text: string;
+    }[];
+}
+
 export interface TranslationValue {
-    src: string;
+    sourceLanguage: string;
     text: string;
 }
 
-export async function translate(kind: "received" | "sent", text: string): Promise<TranslationValue> {
+export const getLanguages = () => IS_WEB || settings.store.service === "google"
-    const sourceLang = settings.store[kind + "Input"];
+    ? GoogleLanguages
-    const targetLang = settings.store[kind + "Output"];
+    : DeeplLanguages;
 
+export async function translate(kind: "received" | "sent", text: string): Promise<TranslationValue> {
+    const translate = IS_WEB || settings.store.service === "google"
+        ? googleTranslate
+        : deeplTranslate;
+
+    try {
+        return await translate(
+            text,
+            settings.store[`${kind}Input`],
+            settings.store[`${kind}Output`]
+        );
+    } catch (e) {
+        const userMessage = typeof e === "string"
+            ? e
+            : "Something went wrong. If this issue persists, please check the console or ask for help in the support server.";
+
+        showToast(userMessage, Toasts.Type.FAILURE);
+
+        throw e instanceof Error
+            ? e
+            : new Error(userMessage);
+    }
+}
+
+async function googleTranslate(text: string, sourceLang: string, targetLang: string): Promise<TranslationValue> {
     const url = "https://translate.googleapis.com/translate_a/single?" + new URLSearchParams({
         // see https://stackoverflow.com/a/29537590 for more params
         // holy shidd nvidia
@@ -63,13 +101,69 @@ export async function translate(kind: "received" | "sent", text: string): Promis
             + `\n${res.status} ${res.statusText}`
         );
 
-    const { src, sentences }: TranslationData = await res.json();
+    const { src, sentences }: GoogleData = await res.json();
 
     return {
-        src,
+        sourceLanguage: GoogleLanguages[src] ?? src,
         text: sentences.
             map(s => s?.trans).
             filter(Boolean).
             join("")
     };
 }
+
+function fallbackToGoogle(text: string, sourceLang: string, targetLang: string): Promise<TranslationValue> {
+    return googleTranslate(
+        text,
+        deeplLanguageToGoogleLanguage(sourceLang),
+        deeplLanguageToGoogleLanguage(targetLang)
+    );
+}
+
+const showDeeplApiQuotaToast = onlyOnce(
+    () => showToast("Deepl API quota exceeded. Falling back to Google Translate", Toasts.Type.FAILURE)
+);
+
+async function deeplTranslate(text: string, sourceLang: string, targetLang: string): Promise<TranslationValue> {
+    if (!settings.store.deeplApiKey) {
+        showToast("DeepL API key is not set. Resetting to Google", Toasts.Type.FAILURE);
+
+        settings.store.service = "google";
+        resetLanguageDefaults();
+
+        return fallbackToGoogle(text, sourceLang, targetLang);
+    }
+
+    // CORS jumpscare
+    const { status, data } = await Native.makeDeeplTranslateRequest(
+        settings.store.service === "deepl-pro",
+        settings.store.deeplApiKey,
+        JSON.stringify({
+            text: [text],
+            target_lang: targetLang,
+            source_lang: sourceLang.split("-")[0]
+        })
+    );
+
+    switch (status) {
+        case 200:
+            break;
+        case -1:
+            throw "Failed to connect to DeepL API: " + data;
+        case 403:
+            throw "Invalid DeepL API key or version";
+        case 456:
+            showDeeplApiQuotaToast();
+            return fallbackToGoogle(text, sourceLang, targetLang);
+        default:
+            throw new Error(`Failed to translate "${text}" (${sourceLang} -> ${targetLang})\n${status} ${data}`);
+    }
+
+    const { translations }: DeeplData = JSON.parse(data);
+    const src = translations[0].detected_source_language;
+
+    return {
+        sourceLanguage: DeeplLanguages[src] ?? src,
+        text: translations[0].text
+    };
+}

src/plugins/userVoiceShow/components/VoiceChannelSection.tsx

@@ -18,12 +18,11 @@
 
 import "./VoiceChannelSection.css";
 
-import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { Button, Forms, PermissionStore, Toasts } from "@webpack/common";
 import { Channel } from "discord-types/general";
 
 const ChannelActions = findByPropsLazy("selectChannel", "selectVoiceChannel");
-const UserPopoutSection = findByCodeLazy(".lastSection", "children:");
 
 const CONNECT = 1n << 20n;
 
@@ -34,7 +33,8 @@ interface VoiceChannelFieldProps {
 }
 
 export const VoiceChannelSection = ({ channel, label, showHeader }: VoiceChannelFieldProps) => (
-    <UserPopoutSection>
+    // @TODO The div is supposed to be a UserPopoutSection
+    <div>
         {showHeader && <Forms.FormTitle className="vc-uvs-header">In a voice channel</Forms.FormTitle>}
         <Button
             className="vc-uvs-button"
@@ -57,5 +57,5 @@ export const VoiceChannelSection = ({ channel, label, showHeader }: VoiceChannel
         >
             {label}
         </Button>
-    </UserPopoutSection>
+    </div>
 );

src/plugins/userVoiceShow/index.tsx

@@ -84,7 +84,7 @@ export default definePlugin({
         );
     },
 
-    patchPopout: ({ user }: UserProps) => {
+    patchProfilePopout: ({ user }: UserProps) => {
         const isSelfUser = user.id === UserStore.getCurrentUser().id;
         return (
             <div className={isSelfUser ? "vc-uvs-popout-margin-self" : ""}>
@@ -94,21 +94,7 @@ export default definePlugin({
     },
 
     patches: [
-        // above message box
+        // @TODO Maybe patch UserVoiceShow in simplified profile popout
-        {
+        // @TODO Patch new profile modal
-            find: ".popularApplicationCommandIds,",
-            replacement: {
-                match: /(?<=,)(?=!\i&&!\i&&.{0,50}setNote:)/,
-                replace: "$self.patchPopout(arguments[0]),",
-            }
-        },
-        // below username
-        {
-            find: ".Messages.MUTUAL_GUILDS_WITH_END_COUNT", // Lazy-loaded
-            replacement: {
-                match: /\.body.+?displayProfile:\i}\),/,
-                replace: "$&$self.patchModal(arguments[0]),",
-            }
-        }
     ],
 });

src/plugins/usrbg/index.tsx

@@ -57,14 +57,7 @@ export default definePlugin({
     settings,
     patches: [
         {
-            find: ".NITRO_BANNER,",
+            find: '.banner)==null?"COMPLETE"',
-            replacement: {
-                match: /\?\(0,\i\.jsx\)\(\i,{type:\i,shown/,
-                replace: "&&$self.shouldShowBadge(arguments[0])$&"
-            }
-        },
-        {
-            find: ".banner)==null",
             replacement: {
                 match: /(?<=void 0:)\i.getPreviewBanner\(\i,\i,\i\)/,
                 replace: "$self.patchBannerUrl(arguments[0])||$&"
@@ -109,10 +102,6 @@ export default definePlugin({
         if (this.userHasBackground(displayProfile?.userId)) return this.getImageUrl(displayProfile?.userId);
     },
 
-    shouldShowBadge({ displayProfile, user }: any) {
-        return displayProfile?.banner && (!this.userHasBackground(user.id) || settings.store.nitroFirst);
-    },
-
     userHasBackground(userId: string) {
         return !!this.data?.users[userId];
     },

src/plugins/viewIcons/index.tsx

@@ -192,31 +192,12 @@ export default definePlugin({
             },
             all: true
         },
-        // Old Profiles Modal pfp
-        {
-            find: ".MODAL,hasProfileEffect",
-            replacement: {
-                match: /\{src:(\i)(?=,avatarDecoration)/,
-                replace: "{src:$1,onClick:()=>$self.openImage($1)"
-            }
-        },
         // Banners
-        ...[".NITRO_BANNER,", "=!1,canUsePremiumCustomization:"].map(find => ({
-            find,
-            replacement: {
-                // style: { backgroundImage: shouldShowBanner ? "url(".concat(bannerUrl,
-                match: /style:\{(?=backgroundImage:(null!=\i)\?"url\("\.concat\((\i),)/,
-                replace:
-                    // onClick: () => shouldShowBanner && ev.target.style.backgroundImage && openImage(bannerUrl), style: { cursor: shouldShowBanner ? "pointer" : void 0,
-                    'onClick:ev=>$1&&ev.target.style.backgroundImage&&$self.openImage($2),style:{cursor:$1?"pointer":void 0,'
-            }
-        })),
-        // Old User DMs "User Profile" popup in the right
         {
-            find: ".avatarPositionPanel",
+            find: 'backgroundColor:"COMPLETE"',
             replacement: {
-                match: /(avatarWrapperNonUserBot.{0,50})onClick:(\i\|\|\i)\?void 0(?<=,avatarSrc:(\i).+?)/,
+                match: /(\.banner,.+?),style:{(?=.+?backgroundImage:null!=(\i)\?"url\("\.concat\(\2,)/,
-                replace: "$1style:($2)?{cursor:\"pointer\"}:{},onClick:$2?()=>{$self.openImage($3)}"
+                replace: (_, rest, bannerSrc) => `${rest},onClick:()=>${bannerSrc}!=null&&$self.openImage(${bannerSrc}),style:{cursor:${bannerSrc}!=null?"pointer":void 0,`
             }
         },
         // Group DMs top small & large icon

src/plugins/viewRaw/index.tsx

@@ -153,6 +153,7 @@ export default definePlugin({
     contextMenus: {
         "guild-context": MakeContextCallback("Guild"),
         "channel-context": MakeContextCallback("Channel"),
+        "thread-context": MakeContextCallback("Channel"),
         "user-context": MakeContextCallback("User")
     },
 

src/plugins/volumeBooster/README.md

@@ -0,0 +1,9 @@
+# Volume Booster
+
+Allows you to boost the volume over 200% on desktop and over 100% on other clients.
+
+Works on users, bots, and streams!
+
+![the volume being moved up to 270% on vesktop](https://github.com/user-attachments/assets/793e012e-c069-4fa4-a3d5-61c2f55edd3e)
+
+![the volume being moved up to 297% on a stream](https://github.com/user-attachments/assets/77463eb9-2537-4821-a3ab-82f60633ccbc)

src/plugins/volumeBooster/index.ts

@@ -31,10 +31,27 @@ const settings = definePluginSettings({
     }
 });
 
+interface StreamData {
+    audioContext: AudioContext,
+    audioElement: HTMLAudioElement,
+    emitter: any,
+    // added by this plugin
+    gainNode?: GainNode,
+    id: string,
+    levelNode: AudioWorkletNode,
+    sinkId: string,
+    stream: MediaStream,
+    streamSourceNode?: MediaStreamAudioSourceNode,
+    videoStreamId: string,
+    _mute: boolean,
+    _speakingFlags: number,
+    _volume: number;
+}
+
 export default definePlugin({
     name: "VolumeBooster",
-    authors: [Devs.Nuckyz],
+    authors: [Devs.Nuckyz, Devs.sadan],
-    description: "Allows you to set the user and stream volume above the default maximum.",
+    description: "Allows you to set the user and stream volume above the default maximum",
     settings,
 
     patches: [
@@ -45,12 +62,28 @@ export default definePlugin({
         ].map(find => ({
             find,
             replacement: {
-                match: /(?<=maxValue:\i\.\i)\?(\d+?):(\d+?)(?=,)/,
+                match: /(?<=maxValue:)\i\.\i\?(\d+?):(\d+?)(?=,)/,
-                replace: (_, higherMaxVolume, minorMaxVolume) => ""
+                replace: (_, higherMaxVolume, minorMaxVolume) => `${higherMaxVolume}*$self.settings.store.multiplier`
-                    + `?${higherMaxVolume}*$self.settings.store.multiplier`
-                    + `:${minorMaxVolume}*$self.settings.store.multiplier`
             }
         })),
+        // Patches needed for web/vesktop
+        {
+            find: "streamSourceNode",
+            predicate: () => IS_WEB,
+            group: true,
+            replacement: [
+                // Remove rounding algorithm
+                {
+                    match: /Math\.max.{0,30}\)\)/,
+                    replace: "arguments[0]"
+                },
+                // Patch the volume
+                {
+                    match: /\.volume=this\._volume\/100;/,
+                    replace: ".volume=0.00;$self.patchVolume(this);"
+                }
+            ]
+        },
         // Prevent Audio Context Settings sync from trying to sync with values above 200, changing them to 200 before we send to Discord
         {
             find: "AudioContextSettingsMigrated",
@@ -83,4 +116,20 @@ export default definePlugin({
             ]
         }
     ],
+
+    patchVolume(data: StreamData) {
+        if (data.stream.getAudioTracks().length === 0) return;
+
+        data.streamSourceNode ??= data.audioContext.createMediaStreamSource(data.stream);
+
+        if (!data.gainNode) {
+            const gain = data.gainNode = data.audioContext.createGain();
+            data.streamSourceNode.connect(gain);
+            gain.connect(data.audioContext.destination);
+        }
+
+        data.gainNode.gain.value = data._mute
+            ? 0
+            : data._volume / 100;
+    }
 });

src/plugins/webKeybinds.web/index.ts

@@ -35,6 +35,7 @@ export default definePlugin({
         if (hasCtrl) switch (e.key) {
             case "t":
             case "T":
+                if (!IS_VESKTOP) return;
                 e.preventDefault();
                 if (e.shiftKey) {
                     if (SelectedGuildStore.getGuildId()) NavigationRouter.transitionToGuild("@me");
@@ -47,14 +48,15 @@ export default definePlugin({
                     });
                 }
                 break;
+            case "Tab":
+                if (!IS_VESKTOP) return;
+                const handler = e.shiftKey ? KeyBinds.SERVER_PREV : KeyBinds.SERVER_NEXT;
+                handler.action(e);
+                break;
             case ",":
                 e.preventDefault();
                 SettingsRouter.open("My Account");
                 break;
-            case "Tab":
-                const handler = e.shiftKey ? KeyBinds.SERVER_PREV : KeyBinds.SERVER_NEXT;
-                handler.action(e);
-                break;
             default:
                 if (e.key >= "1" && e.key <= "9") {
                     e.preventDefault();

src/plugins/xsOverlay/index.tsx

@@ -8,7 +8,7 @@ import { definePluginSettings } from "@api/Settings";
 import { makeRange } from "@components/PluginSettings/components";
 import { Devs } from "@utils/constants";
 import { Logger } from "@utils/Logger";
-import definePlugin, { OptionType, ReporterTestable } from "@utils/types";
+import definePlugin, { OptionType, PluginNative, ReporterTestable } from "@utils/types";
 import { findByCodeLazy, findLazy } from "@webpack";
 import { Button, ChannelStore, GuildStore, UserStore } from "@webpack/common";
 import type { Channel, Embed, GuildMember, MessageAttachment, User } from "discord-types/general";
@@ -102,6 +102,12 @@ const settings = definePluginSettings({
             await start();
         }
     },
+    preferUDP: {
+        type: OptionType.BOOLEAN,
+        description: "Enable if you use an older build of XSOverlay unable to connect through websockets. This setting is ignored on web.",
+        default: false,
+        disabled: () => IS_WEB
+    },
     botNotifications: {
         type: OptionType.BOOLEAN,
         description: "Allow bot notifications",
@@ -178,6 +184,8 @@ async function start() {
     });
 }
 
+const Native = VencordNative.pluginHelpers.XSOverlay as PluginNative<typeof import("./native")>;
+
 export default definePlugin({
     name: "XSOverlay",
     description: "Forwards discord notifications to XSOverlay, for easy viewing in VR",
@@ -349,6 +357,10 @@ function sendOtherNotif(content: string, titleString: string) {
 }
 
 async function sendToOverlay(notif: NotificationObject) {
+    if (!IS_WEB && settings.store.preferUDP) {
+        Native.sendToOverlay(notif);
+        return;
+    }
     const apiObject: ApiObject = {
         sender: "Vencord",
         target: "xsoverlay",

src/plugins/xsOverlay/native.ts

@@ -0,0 +1,16 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { createSocket, Socket } from "dgram";
+
+let xsoSocket: Socket;
+
+export function sendToOverlay(_, data: any) {
+    data.messageType = data.type;
+    const json = JSON.stringify(data);
+    xsoSocket ??= createSocket("udp4");
+    xsoSocket.send(json, 42069, "127.0.0.1");
+}

src/plugins/youtubeAdblock.desktop/README.md

@@ -1,6 +1,7 @@
 # WatchTogetherAdblock
 
-Block ads in the YouTube WatchTogether activity via AdGuard
+Block ads in YouTube embeds and the WatchTogether activity via AdGuard
 
 Note that this only works for yourself, other users in the activity will still see ads.
+
 Powered by a modified version of [Adguard's BlockYoutubeAdsShortcut](https://github.com/AdguardTeam/BlockYouTubeAdsShortcut)

src/plugins/youtubeAdblock.desktop/adguard.js

@@ -19,7 +19,6 @@
  * along with AdGuard's Block YouTube Ads.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-const LOGO_ID = "block-youtube-ads-logo";
 const hiddenCSS = [
     "#__ffYoutube1",
     "#__ffYoutube2",
@@ -98,7 +97,7 @@ const hideElements = () => {
     }
     const rule = selectors.join(", ") + " { display: none!important; }";
     const style = document.createElement("style");
-    style.innerHTML = rule;
+    style.textContent = rule;
     document.head.appendChild(style);
 };
 /**
@@ -165,11 +164,9 @@ const overrideObject = (obj, propertyName, overrideValue) => {
     }
     let overriden = false;
     for (const key in obj) {
-        // eslint-disable-next-line no-prototype-builtins
         if (obj.hasOwnProperty(key) && key === propertyName) {
             obj[key] = overrideValue;
             overriden = true;
-            // eslint-disable-next-line no-prototype-builtins
         } else if (obj.hasOwnProperty(key) && typeof obj[key] === "object") {
             if (overrideObject(obj[key], propertyName, overrideValue)) {
                 overriden = true;
@@ -195,68 +192,25 @@ const jsonOverride = (propertyName, overrideValue) => {
         return obj;
     };
     // Override Response.prototype.json
-    const nativeResponseJson = Response.prototype.json;
+    Response.prototype.json = new Proxy(Response.prototype.json, {
-    Response.prototype.json = new Proxy(nativeResponseJson, {
+        async apply(...args) {
-        apply(...args) {
             // Call the target function, get the original Promise
-            const promise = Reflect.apply(...args);
+            const result = await Reflect.apply(...args);
             // Create a new one and override the JSON inside
-            return new Promise((resolve, reject) => {
+            overrideObject(result, propertyName, overrideValue);
-                promise.then(data => {
+            return result;
-                    overrideObject(data, propertyName, overrideValue);
-                    resolve(data);
-                }).catch(error => reject(error));
-            });
         },
     });
 };
-const addAdGuardLogoStyle = () => { };
-const addAdGuardLogo = () => {
-    if (document.getElementById(LOGO_ID)) {
-        return;
-    }
-    const logo = document.createElement("span");
-    logo.innerHTML = "__logo_text__";
-    logo.setAttribute("id", LOGO_ID);
-    if (window.location.hostname === "m.youtube.com") {
-        const btn = document.querySelector("header.mobile-topbar-header > button");
-        if (btn) {
-            btn.parentNode?.insertBefore(logo, btn.nextSibling);
-            addAdGuardLogoStyle();
-        }
-    } else if (window.location.hostname === "www.youtube.com") {
-        const code = document.getElementById("country-code");
-        if (code) {
-            code.innerHTML = "";
-            code.appendChild(logo);
-            addAdGuardLogoStyle();
-        }
-    } else if (window.location.hostname === "music.youtube.com") {
-        const el = document.querySelector(".ytmusic-nav-bar#left-content");
-        if (el) {
-            el.appendChild(logo);
-            addAdGuardLogoStyle();
-        }
-    } else if (window.location.hostname === "www.youtube-nocookie.com") {
-        const code = document.querySelector("#yt-masthead #logo-container .content-region");
-        if (code) {
-            code.innerHTML = "";
-            code.appendChild(logo);
-            addAdGuardLogoStyle();
-        }
-    }
-};
 // Removes ads metadata from YouTube XHR requests
 jsonOverride("adPlacements", []);
 jsonOverride("playerAds", []);
 // Applies CSS that hides YouTube ad elements
 hideElements();
 // Some changes should be re-evaluated on every page change
-addAdGuardLogo();
 hideDynamicAds();
 autoSkipAds();
 observeDomChanges(() => {
-    addAdGuardLogo();
     hideDynamicAds();
     autoSkipAds();
 });

src/plugins/youtubeAdblock.desktop/index.ts

@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { migratePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 
 // The entire code of this plugin can be found in native.ts
+migratePluginSettings("YoutubeAdblock", "WatchTogetherAdblock");
 export default definePlugin({
-    name: "WatchTogetherAdblock",
+    name: "YoutubeAdblock",
-    description: "Block ads in the YouTube WatchTogether activity via AdGuard",
+    description: "Block ads in YouTube embeds and the WatchTogether activity via AdGuard",
-    authors: [Devs.ImLvna],
+    authors: [Devs.ImLvna, Devs.Ven],
 });

src/plugins/youtubeAdblock.desktop/native.ts

@@ -11,9 +11,9 @@ import adguard from "file://adguard.js?minify";
 app.on("browser-window-created", (_, win) => {
     win.webContents.on("frame-created", (_, { frame }) => {
         frame.once("dom-ready", () => {
-            if (frame.url.includes("discordsays") && frame.url.includes("youtube.com")) {
+            if (!RendererSettings.store.plugins?.YoutubeAdblock?.enabled) return;
-                if (!RendererSettings.store.plugins?.WatchTogetherAdblock?.enabled) return;
 
+            if (frame.url.includes("youtube.com/embed/") || (frame.url.includes("discordsays") && frame.url.includes("youtube.com"))) {
                 frame.executeJavaScript(adguard);
             }
         });