bump to v1.4.3

futureproof settings patches
Settings: Give vencord sections classes so themes can match them
2023-08-12 03:02:55 +02:00 · 2023-08-12 03:01:53 +02:00 · 2023-08-12 02:59:24 +02:00 · 2023-08-12 02:46:38 +02:00 · 2023-08-12 02:45:11 +02:00 · 2023-08-12 02:23:00 +02:00
42 changed files with 319 additions and 276 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -4,7 +4,7 @@
    "ignorePatterns": ["dist", "browser"],
    "plugins": [
        "@typescript-eslint",
-        "header",
+        "simple-header",
        "simple-import-sort",
        "unused-imports",
        "path-alias"
@ -26,35 +26,12 @@
        // 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
-        "header/header": [
-            2,
-            "block",
-            [
+        "simple-header/header": [
+            "error",
            {
-                    "pattern": "!?",
-                    "template": " "
-                },
-                " * Vencord, a modification for Discord's desktop app",
-                {
-                    "pattern": " \\* Copyright \\(c\\) \\d{4}",
-                    "template": " * Copyright (c) 2023 Vendicated and contributors"
-                },
-                " *",
-                " * This program is free software: you can redistribute it and/or modify",
-                " * it under the terms of the GNU General Public License as published by",
-                " * the Free Software Foundation, either version 3 of the License, or",
-                " * (at your option) any later version.",
-                " *",
-                " * This program is distributed in the hope that it will be useful,",
-                " * but WITHOUT ANY WARRANTY; without even the implied warranty of",
-                " * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the",
-                " * GNU General Public License for more details.",
-                " *",
-                " * You should have received a copy of the GNU General Public License",
-                " * along with this program.  If not, see <https://www.gnu.org/licenses/>.",
-                ""
-            ],
-            2
+                "files": ["scripts/header-new.txt", "scripts/header-old.txt"],
+                "templates": { "author": [".*", "Vendicated and contributors"] }
+            }
        ],
        "quotes": ["error", "double", { "avoidEscape": true }],
        "jsx-quotes": ["error", "prefer-double"],
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
    "name": "vencord",
    "private": "true",
-    "version": "1.4.2",
+    "version": "1.4.3",
    "description": "The cutest Discord client mod",
    "homepage": "https://github.com/Vendicated/Vencord#readme",
    "bugs": {
@ -11,7 +11,7 @@
        "type": "git",
        "url": "git+https://github.com/Vendicated/Vencord.git"
    },
-    "license": "GPL-3.0",
+    "license": "GPL-3.0-or-later",
    "author": "Vendicated",
    "directories": {
        "doc": "docs"
@ -33,6 +33,7 @@
    "dependencies": {
        "@vap/core": "0.0.12",
        "@vap/shiki": "0.10.5",
+        "eslint-plugin-simple-header": "^1.0.2",
        "fflate": "^0.7.4",
        "nanoid": "^4.0.2",
        "virtual-merge": "^1.0.1"
@ -49,9 +50,8 @@
        "diff": "^5.1.0",
        "discord-types": "^1.3.26",
        "esbuild": "^0.15.18",
-        "eslint": "^8.28.0",
+        "eslint": "^8.46.0",
        "eslint-import-resolver-alias": "^1.1.2",
-        "eslint-plugin-header": "^3.1.1",
        "eslint-plugin-path-alias": "^1.0.0",
        "eslint-plugin-simple-import-sort": "^10.0.0",
        "eslint-plugin-unused-imports": "^2.0.0",
@ -69,7 +69,7 @@
    "pnpm": {
        "patchedDependencies": {
            "eslint-plugin-path-alias@1.0.0": "patches/eslint-plugin-path-alias@1.0.0.patch",
-            "eslint@8.28.0": "patches/eslint@8.28.0.patch"
+            "eslint@8.46.0": "patches/eslint@8.46.0.patch"
        },
        "peerDependencyRules": {
            "ignoreMissing": [
--- a/patches/eslint@8.46.0.patch
+++ b/patches/eslint@8.46.0.patch
@ -1,8 +1,8 @@
 diff --git a/lib/rules/no-useless-escape.js b/lib/rules/no-useless-escape.js
-index 2046a148a17fd1d5f3a4bbc9f45f7700259d11fa..f4898c6b57355a4fd72c43a9f32bf1a36a6ccf4a 100644
+index 0e0f6f09f2c35f3276173c08f832cde9f2cf56a0..7dc22851715f3574d935f513c1b5e35552985711 100644
 --- a/lib/rules/no-useless-escape.js
 +++ b/lib/rules/no-useless-escape.js
-@@ -97,12 +97,30 @@ module.exports = {
+@@ -65,13 +65,31 @@ module.exports = {
             escapeBackslash: "Replace the `\\` with `\\\\` to include the actual backslash character."
         },

@ -25,21 +25,25 @@ index 2046a148a17fd1d5f3a4bbc9f45f7700259d11fa..f4898c6b57355a4fd72c43a9f32bf1a3

     create(context) {
 +        const options = context.options[0] || {};
-+        const { extra, extraCharClass } = options || ''
-         const sourceCode = context.getSourceCode();
+        const { extra, extraCharClass } = options;
+         const sourceCode = context.sourceCode;
+         const parser = new RegExpParser();

-+        const NON_CHARCLASS_ESCAPES = union(REGEX_NON_CHARCLASS_ESCAPES, new Set(extra))
-+        const CHARCLASS_ESCAPES = union(REGEX_GENERAL_ESCAPES, new Set(extraCharClass))
+        const NON_CHARCLASS_ESCAPES = union(REGEX_NON_CHARCLASS_ESCAPES, new Set(extra));
+        const CHARCLASS_ESCAPES = union(REGEX_GENERAL_ESCAPES, new Set(extraCharClass));
 +
         /**
          * Reports a node
          * @param {ASTNode} node The node to report
-@@ -238,7 +256,7 @@ module.exports = {
-                     .filter(charInfo => charInfo.escaped)
+@@ -200,9 +218,9 @@ module.exports = {
+                     let allowedEscapes;

-                     // Filter out characters that are valid to escape, based on their position in the regular expression.
-                    .filter(charInfo => !(charInfo.inCharClass ? REGEX_GENERAL_ESCAPES : REGEX_NON_CHARCLASS_ESCAPES).has(charInfo.text))
-+                    .filter(charInfo => !(charInfo.inCharClass ? CHARCLASS_ESCAPES : NON_CHARCLASS_ESCAPES).has(charInfo.text))
- 
-                     // Report all the remaining characters.
-                     .forEach(charInfo => report(node, charInfo.index, charInfo.text));
+                     if (characterClassStack.length) {
+-                        allowedEscapes = unicodeSets ? REGEX_CLASSSET_CHARACTER_ESCAPES : REGEX_GENERAL_ESCAPES;
+                        allowedEscapes = unicodeSets ? REGEX_CLASSSET_CHARACTER_ESCAPES : CHARCLASS_ESCAPES;
+                     } else {
+-                        allowedEscapes = REGEX_NON_CHARCLASS_ESCAPES;
+                        allowedEscapes = NON_CHARCLASS_ESCAPES;
+                     }
+                     if (allowedEscapes.has(escapedChar)) {
+                         return;
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -4,9 +4,9 @@ patchedDependencies:
  eslint-plugin-path-alias@1.0.0:
    hash: m6sma4g6bh67km3q6igf6uxaja
    path: patches/eslint-plugin-path-alias@1.0.0.patch
-  eslint@8.28.0:
-    hash: 7wc6icvgtg3uswirb5tpsbjnbe
-    path: patches/eslint@8.28.0.patch
+  eslint@8.46.0:
+    hash: xm46kqcmdgzlmm4aifkfpxaho4
+    path: patches/eslint@8.46.0.patch

 dependencies:
  '@vap/core':
@ -15,6 +15,9 @@ dependencies:
  '@vap/shiki':
    specifier: 0.10.5
    version: 0.10.5
+  eslint-plugin-simple-header:
+    specifier: ^1.0.2
+    version: 1.0.2
  fflate:
    specifier: ^0.7.4
    version: 0.7.4
@ -46,10 +49,10 @@ devDependencies:
    version: 2.4.2
  '@typescript-eslint/eslint-plugin':
    specifier: ^5.59.1
-    version: 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.28.0)(typescript@5.0.4)
+    version: 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4)
  '@typescript-eslint/parser':
    specifier: ^5.59.1
-    version: 5.59.1(eslint@8.28.0)(typescript@5.0.4)
+    version: 5.59.1(eslint@8.46.0)(typescript@5.0.4)
  diff:
    specifier: ^5.1.0
    version: 5.1.0
@ -60,23 +63,20 @@ devDependencies:
    specifier: ^0.15.18
    version: 0.15.18
  eslint:
-    specifier: ^8.28.0
-    version: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
+    specifier: ^8.46.0
+    version: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
  eslint-import-resolver-alias:
    specifier: ^1.1.2
    version: 1.1.2
-  eslint-plugin-header:
-    specifier: ^3.1.1
-    version: 3.1.1(eslint@8.28.0)
  eslint-plugin-path-alias:
    specifier: ^1.0.0
-    version: 1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.28.0)
+    version: 1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0)
  eslint-plugin-simple-import-sort:
    specifier: ^10.0.0
-    version: 10.0.0(eslint@8.28.0)
+    version: 10.0.0(eslint@8.46.0)
  eslint-plugin-unused-imports:
    specifier: ^2.0.0
-    version: 2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.28.0)
+    version: 2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.46.0)
  highlight.js:
    specifier: 10.6.0
    version: 10.6.0
@ -107,6 +107,11 @@ devDependencies:

 packages:

+  /@aashutoshrathi/word-wrap@1.2.6:
+    resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
  /@babel/code-frame@7.21.4:
    resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==}
    engines: {node: '>=6.9.0'}
@ -399,7 +404,7 @@ packages:
    dev: true
    optional: true

-  /@eslint-community/eslint-utils@4.4.0(eslint@8.28.0):
+  /@eslint-community/eslint-utils@4.4.0(eslint@8.46.0):
    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -408,8 +413,8 @@ packages:
      eslint:
        optional: true
    dependencies:
-      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
-      eslint-visitor-keys: 3.4.0
+      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint-visitor-keys: 3.4.2
    dev: true

  /@eslint-community/regexpp@4.5.1:
@ -417,15 +422,20 @@ packages:
    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
    dev: true

-  /@eslint/eslintrc@1.3.3:
-    resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==}
+  /@eslint-community/regexpp@4.6.2:
+    resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+    dev: true
+
+  /@eslint/eslintrc@2.1.1:
+    resolution: {integrity: sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    dependencies:
      ajv: 6.12.6
      debug: 4.3.4
-      espree: 9.4.1
-      globals: 13.17.0
-      ignore: 5.2.0
+      espree: 9.6.1
+      globals: 13.20.0
+      ignore: 5.2.4
      import-fresh: 3.3.0
      js-yaml: 4.1.0
      minimatch: 3.1.2
@ -434,8 +444,13 @@ packages:
      - supports-color
    dev: true

-  /@humanwhocodes/config-array@0.11.7:
-    resolution: {integrity: sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==}
+  /@eslint/js@8.46.0:
+    resolution: {integrity: sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /@humanwhocodes/config-array@0.11.10:
+    resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==}
    engines: {node: '>=10.10.0'}
    dependencies:
      '@humanwhocodes/object-schema': 1.2.1
@ -569,7 +584,7 @@ packages:
      '@types/node': 18.16.3
    dev: true

-  /@typescript-eslint/eslint-plugin@5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.28.0)(typescript@5.0.4):
+  /@typescript-eslint/eslint-plugin@5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4):
    resolution: {integrity: sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -583,12 +598,12 @@ packages:
        optional: true
    dependencies:
      '@eslint-community/regexpp': 4.5.1
-      '@typescript-eslint/parser': 5.59.1(eslint@8.28.0)(typescript@5.0.4)
+      '@typescript-eslint/parser': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
      '@typescript-eslint/scope-manager': 5.59.1
-      '@typescript-eslint/type-utils': 5.59.1(eslint@8.28.0)(typescript@5.0.4)
-      '@typescript-eslint/utils': 5.59.1(eslint@8.28.0)(typescript@5.0.4)
+      '@typescript-eslint/type-utils': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/utils': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
      debug: 4.3.4
-      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
+      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
      grapheme-splitter: 1.0.4
      ignore: 5.2.4
      natural-compare-lite: 1.4.0
@ -599,7 +614,7 @@ packages:
      - supports-color
    dev: true

-  /@typescript-eslint/parser@5.59.1(eslint@8.28.0)(typescript@5.0.4):
+  /@typescript-eslint/parser@5.59.1(eslint@8.46.0)(typescript@5.0.4):
    resolution: {integrity: sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -615,7 +630,7 @@ packages:
      '@typescript-eslint/types': 5.59.1
      '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.0.4)
      debug: 4.3.4
-      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
+      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
      typescript: 5.0.4
    transitivePeerDependencies:
      - supports-color
@ -629,7 +644,7 @@ packages:
      '@typescript-eslint/visitor-keys': 5.59.1
    dev: true

-  /@typescript-eslint/type-utils@5.59.1(eslint@8.28.0)(typescript@5.0.4):
+  /@typescript-eslint/type-utils@5.59.1(eslint@8.46.0)(typescript@5.0.4):
    resolution: {integrity: sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -642,9 +657,9 @@ packages:
        optional: true
    dependencies:
      '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.0.4)
-      '@typescript-eslint/utils': 5.59.1(eslint@8.28.0)(typescript@5.0.4)
+      '@typescript-eslint/utils': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
      debug: 4.3.4
-      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
+      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
      tsutils: 3.21.0(typescript@5.0.4)
      typescript: 5.0.4
    transitivePeerDependencies:
@ -677,7 +692,7 @@ packages:
      - supports-color
    dev: true

-  /@typescript-eslint/utils@5.59.1(eslint@8.28.0)(typescript@5.0.4):
+  /@typescript-eslint/utils@5.59.1(eslint@8.46.0)(typescript@5.0.4):
    resolution: {integrity: sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -686,13 +701,13 @@ packages:
      eslint:
        optional: true
    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.28.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0)
      '@types/json-schema': 7.0.11
      '@types/semver': 7.3.13
      '@typescript-eslint/scope-manager': 5.59.1
      '@typescript-eslint/types': 5.59.1
      '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.0.4)
-      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
+      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
      eslint-scope: 5.1.1
      semver: 7.5.0
    transitivePeerDependencies:
@ -722,16 +737,16 @@ packages:
      vscode-textmate: 5.2.0
    dev: false

-  /acorn-jsx@5.3.2(acorn@8.8.0):
+  /acorn-jsx@5.3.2(acorn@8.10.0):
    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
    peerDependencies:
      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
    dependencies:
-      acorn: 8.8.0
+      acorn: 8.10.0
    dev: true

-  /acorn@8.8.0:
-    resolution: {integrity: sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==}
+  /acorn@8.10.0:
+    resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
    engines: {node: '>=0.4.0'}
    hasBin: true
    dev: true
@ -1446,18 +1461,7 @@ packages:
        optional: true
    dev: true

-  /eslint-plugin-header@3.1.1(eslint@8.28.0):
-    resolution: {integrity: sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==}
-    peerDependencies:
-      eslint: '>=7.7.0'
-    peerDependenciesMeta:
-      eslint:
-        optional: true
-    dependencies:
-      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
-    dev: true
-
-  /eslint-plugin-path-alias@1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.28.0):
+  /eslint-plugin-path-alias@1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0):
    resolution: {integrity: sha512-FXus57yC+Zd3sMv46pbloXYwFeNVNHJqlACr9V68FG/IzGFBBokGJpmjDbEjpt8ZCeVSndUubeDWWl2A8sCNVQ==}
    peerDependencies:
      eslint: ^7
@ -1465,14 +1469,18 @@ packages:
      eslint:
        optional: true
    dependencies:
-      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
+      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
      nanomatch: 1.2.13
    transitivePeerDependencies:
      - supports-color
    dev: true
    patched: true

-  /eslint-plugin-simple-import-sort@10.0.0(eslint@8.28.0):
+  /eslint-plugin-simple-header@1.0.2:
+    resolution: {integrity: sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA==}
+    dev: false
+
+  /eslint-plugin-simple-import-sort@10.0.0(eslint@8.46.0):
    resolution: {integrity: sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==}
    peerDependencies:
      eslint: '>=5.0.0'
@ -1480,10 +1488,10 @@ packages:
      eslint:
        optional: true
    dependencies:
-      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
+      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
    dev: true

-  /eslint-plugin-unused-imports@2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.28.0):
+  /eslint-plugin-unused-imports@2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.46.0):
    resolution: {integrity: sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -1495,8 +1503,8 @@ packages:
      eslint:
        optional: true
    dependencies:
-      '@typescript-eslint/eslint-plugin': 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.28.0)(typescript@5.0.4)
-      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
+      '@typescript-eslint/eslint-plugin': 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4)
+      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
      eslint-rule-composer: 0.3.0
    dev: true

@ -1513,49 +1521,34 @@ packages:
      estraverse: 4.3.0
    dev: true

-  /eslint-scope@7.1.1:
-    resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==}
+  /eslint-scope@7.2.2:
+    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    dependencies:
      esrecurse: 4.3.0
      estraverse: 5.3.0
    dev: true

-  /eslint-utils@3.0.0(eslint@8.28.0):
-    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
-    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
-    peerDependencies:
-      eslint: '>=5'
-    peerDependenciesMeta:
-      eslint:
-        optional: true
-    dependencies:
-      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
-      eslint-visitor-keys: 2.1.0
-    dev: true
-
-  /eslint-visitor-keys@2.1.0:
-    resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /eslint-visitor-keys@3.3.0:
-    resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
-
  /eslint-visitor-keys@3.4.0:
    resolution: {integrity: sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    dev: true

-  /eslint@8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe):
-    resolution: {integrity: sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==}
+  /eslint-visitor-keys@3.4.2:
+    resolution: {integrity: sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4):
+    resolution: {integrity: sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    hasBin: true
    dependencies:
-      '@eslint/eslintrc': 1.3.3
-      '@humanwhocodes/config-array': 0.11.7
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0)
+      '@eslint-community/regexpp': 4.6.2
+      '@eslint/eslintrc': 2.1.1
+      '@eslint/js': 8.46.0
+      '@humanwhocodes/config-array': 0.11.10
      '@humanwhocodes/module-importer': 1.0.1
      '@nodelib/fs.walk': 1.2.8
      ajv: 6.12.6
@ -1564,60 +1557,46 @@ packages:
      debug: 4.3.4
      doctrine: 3.0.0
      escape-string-regexp: 4.0.0
-      eslint-scope: 7.1.1
-      eslint-utils: 3.0.0(eslint@8.28.0)
-      eslint-visitor-keys: 3.3.0
-      espree: 9.4.0
-      esquery: 1.4.0
+      eslint-scope: 7.2.2
+      eslint-visitor-keys: 3.4.2
+      espree: 9.6.1
+      esquery: 1.5.0
      esutils: 2.0.3
      fast-deep-equal: 3.1.3
      file-entry-cache: 6.0.1
      find-up: 5.0.0
      glob-parent: 6.0.2
-      globals: 13.17.0
-      grapheme-splitter: 1.0.4
-      ignore: 5.2.0
-      import-fresh: 3.3.0
+      globals: 13.20.0
+      graphemer: 1.4.0
+      ignore: 5.2.4
      imurmurhash: 0.1.4
      is-glob: 4.0.3
      is-path-inside: 3.0.3
-      js-sdsl: 4.1.5
      js-yaml: 4.1.0
      json-stable-stringify-without-jsonify: 1.0.1
      levn: 0.4.1
      lodash.merge: 4.6.2
      minimatch: 3.1.2
      natural-compare: 1.4.0
-      optionator: 0.9.1
-      regexpp: 3.2.0
+      optionator: 0.9.3
      strip-ansi: 6.0.1
-      strip-json-comments: 3.1.1
      text-table: 0.2.0
    transitivePeerDependencies:
      - supports-color
    dev: true
    patched: true

-  /espree@9.4.0:
-    resolution: {integrity: sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==}
+  /espree@9.6.1:
+    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    dependencies:
-      acorn: 8.8.0
-      acorn-jsx: 5.3.2(acorn@8.8.0)
-      eslint-visitor-keys: 3.3.0
+      acorn: 8.10.0
+      acorn-jsx: 5.3.2(acorn@8.10.0)
+      eslint-visitor-keys: 3.4.2
    dev: true

-  /espree@9.4.1:
-    resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      acorn: 8.8.0
-      acorn-jsx: 5.3.2(acorn@8.8.0)
-      eslint-visitor-keys: 3.3.0
-    dev: true
-
-  /esquery@1.4.0:
-    resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
+  /esquery@1.5.0:
+    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
    engines: {node: '>=0.10'}
    dependencies:
      estraverse: 5.3.0
@ -1858,8 +1837,8 @@ packages:
      which: 1.3.1
    dev: true

-  /globals@13.17.0:
-    resolution: {integrity: sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==}
+  /globals@13.20.0:
+    resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==}
    engines: {node: '>=8'}
    dependencies:
      type-fest: 0.20.2
@ -1885,6 +1864,10 @@ packages:
    resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
    dev: true

+  /graphemer@1.4.0:
+    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
+    dev: true
+
  /hard-rejection@2.1.0:
    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
    engines: {node: '>=6'}
@ -1972,11 +1955,6 @@ packages:
    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
    dev: true

-  /ignore@5.2.0:
-    resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}
-    engines: {node: '>= 4'}
-    dev: true
-
  /ignore@5.2.4:
    resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
    engines: {node: '>= 4'}
@ -2168,10 +2146,6 @@ packages:
    engines: {node: '>=0.10.0'}
    dev: true

-  /js-sdsl@4.1.5:
-    resolution: {integrity: sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==}
-    dev: true
-
  /js-tokens@4.0.0:
    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
    dev: true
@ -2485,16 +2459,16 @@ packages:
      wrappy: 1.0.2
    dev: true

-  /optionator@0.9.1:
-    resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
+  /optionator@0.9.3:
+    resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
    engines: {node: '>= 0.8.0'}
    dependencies:
+      '@aashutoshrathi/word-wrap': 1.2.6
      deep-is: 0.1.4
      fast-levenshtein: 2.0.6
      levn: 0.4.1
      prelude-ls: 1.2.1
      type-check: 0.4.0
-      word-wrap: 1.2.3
    dev: true

  /p-limit@2.3.0:
@ -2734,11 +2708,6 @@ packages:
      safe-regex: 1.1.0
    dev: true

-  /regexpp@3.2.0:
-    resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
-    engines: {node: '>=8'}
-    dev: true
-
  /require-directory@2.1.1:
    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
    engines: {node: '>=0.10.0'}
@ -3323,11 +3292,6 @@ packages:
      isexe: 2.0.0
    dev: true

-  /word-wrap@1.2.3:
-    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
  /wrap-ansi@7.0.0:
    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
    engines: {node: '>=10'}
@ -3405,3 +3369,7 @@ packages:
    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
    engines: {node: '>=10'}
    dev: true
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
--- a/scripts/build/build.mjs
+++ b/scripts/build/build.mjs
@ -40,8 +40,6 @@ const nodeCommonOpts = {
    format: "cjs",
    platform: "node",
    target: ["esnext"],
-    minify: true,
-    bundle: true,
    external: ["electron", ...commonOpts.external],
    define: defines,
 };
@ -50,16 +48,7 @@ const sourceMapFooter = s => watch ? "" : `//# sourceMappingURL=vencord://${s}.j
 const sourcemap = watch ? "inline" : "external";

 await Promise.all([
-    // common preload
-    esbuild.build({
-        ...nodeCommonOpts,
-        entryPoints: ["src/preload.ts"],
-        outfile: "dist/preload.js",
-        footer: { js: "//# sourceURL=VencordPreload\n" + sourceMapFooter("preload") },
-        sourcemap,
-    }),
-
-    // Discord Desktop main & renderer
+    // Discord Desktop main & renderer & preload
    esbuild.build({
        ...nodeCommonOpts,
        entryPoints: ["src/main/index.ts"],
@ -92,8 +81,20 @@ await Promise.all([
            IS_VENCORD_DESKTOP: false
        }
    }),
+    esbuild.build({
+        ...nodeCommonOpts,
+        entryPoints: ["src/preload.ts"],
+        outfile: "dist/preload.js",
+        footer: { js: "//# sourceURL=VencordPreload\n" + sourceMapFooter("preload") },
+        sourcemap,
+        define: {
+            ...defines,
+            IS_DISCORD_DESKTOP: true,
+            IS_VENCORD_DESKTOP: false
+        }
+    }),

-    // Vencord Desktop main & renderer
+    // Vencord Desktop main & renderer & preload
    esbuild.build({
        ...nodeCommonOpts,
        entryPoints: ["src/main/index.ts"],
@ -126,6 +127,18 @@ await Promise.all([
            IS_VENCORD_DESKTOP: true
        }
    }),
+    esbuild.build({
+        ...nodeCommonOpts,
+        entryPoints: ["src/preload.ts"],
+        outfile: "dist/vencordDesktopPreload.js",
+        footer: { js: "//# sourceURL=VencordPreload\n" + sourceMapFooter("vencordDesktopPreload") },
+        sourcemap,
+        define: {
+            ...defines,
+            IS_DISCORD_DESKTOP: false,
+            IS_VENCORD_DESKTOP: true
+        }
+    }),
 ]).catch(err => {
    console.error("Build failed");
    console.error(err.message);
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@ -263,7 +263,7 @@ function runTime(token: string) {
            for (const id in ids) {
                const isWasm = await fetch(wreq.p + wreq.u(id))
                    .then(r => r.text())
-                    .then(t => t.includes(".module.wasm"));
+                    .then(t => t.includes(".module.wasm") || !t.includes("(this.webpackChunkdiscord_app=this.webpackChunkdiscord_app||[]).push"));

                if (!isWasm)
                    await wreq.e(id as any);
--- a/scripts/header-new.txt
+++ b/scripts/header-new.txt
@ -0,0 +1,3 @@
+Vencord, a Discord client mod
+Copyright (c) {year} {author}
+SPDX-License-Identifier: GPL-3.0-or-later
--- a/scripts/header-old.txt
+++ b/scripts/header-old.txt
@ -0,0 +1,17 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) {year} {author}
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
--- a/src/VencordNative.ts
+++ b/src/VencordNative.ts
@ -1,20 +1,8 @@
 /*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */

 import { IpcEvents } from "@utils/IpcEvents";
 import { IpcRes } from "@utils/types";
--- a/src/api/DataStore/index.ts
+++ b/src/api/DataStore/index.ts
@ -1,4 +1,4 @@
-/* eslint-disable header/header */
+/* eslint-disable simple-header/header */

 /*!
 * idb-keyval v6.2.0
--- a/src/components/VencordSettings/VencordTab.tsx
+++ b/src/components/VencordSettings/VencordTab.tsx
@ -16,7 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-
 import { openNotificationLogModal } from "@api/Notifications/notificationLog";
 import { Settings, useSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
--- a/src/main/index.ts
+++ b/src/main/index.ts
@ -44,6 +44,7 @@ if (IS_VENCORD_DESKTOP || !IS_VANILLA) {
                case "renderer.js.map":
                case "vencordDesktopRenderer.js.map":
                case "preload.js.map":
+                case "vencordDesktopPreload.js.map":
                case "patcher.js.map":
                case "vencordDesktopMain.js.map":
                    cb(join(__dirname, url));
--- a/src/main/ipcMain.ts
+++ b/src/main/ipcMain.ts
@ -138,7 +138,7 @@ ipcMain.handle(IpcEvents.OPEN_MONACO_EDITOR, async () => {
        autoHideMenuBar: true,
        darkTheme: true,
        webPreferences: {
-            preload: join(__dirname, "preload.js"),
+            preload: join(__dirname, IS_DISCORD_DESKTOP ? "preload.js" : "vencordDesktopPreload.js"),
            contextIsolation: true,
            nodeIntegration: false,
            sandbox: false
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@ -71,7 +71,7 @@ if (!IS_VANILLA) {
        constructor(options: BrowserWindowConstructorOptions) {
            if (options?.webPreferences?.preload && options.title) {
                const original = options.webPreferences.preload;
-                options.webPreferences.preload = join(__dirname, "preload.js");
+                options.webPreferences.preload = join(__dirname, IS_DISCORD_DESKTOP ? "preload.js" : "vencordDesktopPreload.js");
                options.webPreferences.sandbox = false;
                if (settings.frameless) {
                    options.frame = false;
--- a/src/main/themes/index.ts
+++ b/src/main/themes/index.ts
@ -1,4 +1,4 @@
-/* eslint-disable header/header */
+/* eslint-disable simple-header/header */

 /*!
 * BetterDiscord addon meta parser
--- a/src/main/updater/common.ts
+++ b/src/main/updater/common.ts
@ -16,12 +16,11 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-
 export const VENCORD_FILES = [
    IS_DISCORD_DESKTOP ? "patcher.js" : "vencordDesktopMain.js",
-    "preload.js",
+    IS_DISCORD_DESKTOP ? "preload.js" : "vencordDesktopPreload.js",
    IS_DISCORD_DESKTOP ? "renderer.js" : "vencordDesktopRenderer.js",
-    "renderer.css"
+    IS_DISCORD_DESKTOP ? "renderer.css" : "vencordDesktopRenderer.css",
 ];

 export function serializeErrors(func: (...args: any[]) => any) {
--- a/src/main/utils/crxToZip.ts
+++ b/src/main/utils/crxToZip.ts
@ -1,4 +1,4 @@
-/* eslint-disable header/header */
+/* eslint-disable simple-header/header */

 /*!
 * crxToZip
--- a/src/plugins/_core/noTrack.ts
+++ b/src/plugins/_core/noTrack.ts
@ -22,7 +22,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
    name: "NoTrack",
    description: "Disable Discord's tracking ('science'), metrics and Sentry crash reporting",
-    authors: [Devs.Cyn, Devs.Ven, Devs.Nuckyz],
+    authors: [Devs.Cyn, Devs.Ven, Devs.Nuckyz, Devs.Arrow],
    required: true,
    patches: [
        {
@ -51,6 +51,13 @@ export default definePlugin({
                    replace: "return;"
                }
            ]
+        },
+        {
+            find: ".installedLogHooks)",
+            replacement: {
+                match: /if\(\i\.getDebugLogging\(\)&&!\i\.installedLogHooks\)/,
+                replace: "if(false)"
            }
+        },
    ]
 });
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@ -19,7 +19,6 @@
 import { addContextMenuPatch } from "@api/ContextMenu";
 import { Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { React, SettingsRouter } from "@webpack/common";

@ -63,19 +62,14 @@ export default definePlugin({
        replacement: {
            get match() {
                switch (Settings.plugins.Settings.settingsLocation) {
-                    case "top": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.USER_SETTINGS\}/;
-                    case "aboveNitro": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.BILLING_SETTINGS\}/;
-                    case "belowNitro": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.APP_SETTINGS\}/;
-                    case "aboveActivity": return /\{section:(.{1,2})\.ID\.HEADER,\s*label:(.{1,2})\..{1,2}\.Messages\.ACTIVITY_SETTINGS\}/;
-                    case "belowActivity": return /(?<=\{section:(.{1,2})\.ID\.DIVIDER},)\{section:"changelog"/;
-                    case "bottom": return /\{section:(.{1,2})\.ID\.CUSTOM,\s*element:.+?}/;
-                    default: {
-                        new Logger("Settings").error(
-                            new Error("No switch case matched????? Don't mess with the settings, silly")
-                        );
-                        // matches nothing
-                        return /(?!a)a/;
-                    }
+                    case "top": return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.USER_SETTINGS\}/;
+                    case "aboveNitro": return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.BILLING_SETTINGS\}/;
+                    case "belowNitro": return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.APP_SETTINGS\}/;
+                    case "belowActivity": return /(?<=\{section:(\i)\.ID\.DIVIDER},)\{section:"changelog"/;
+                    case "bottom": return /\{section:(\i)\.ID\.CUSTOM,\s*element:.+?}/;
+                    case "aboveActivity":
+                    default:
+                        return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.ACTIVITY_SETTINGS\}/;
                }
            },
            replace: "...$self.makeSettingsCategories($1),$&"
@ -88,48 +82,57 @@ export default definePlugin({
        return [
            {
                section: ID.HEADER,
-                label: "Vencord"
+                label: "Vencord",
+                className: "vc-settings-header"
            },
            {
                section: "VencordSettings",
                label: "Vencord",
-                element: require("@components/VencordSettings/VencordTab").default
+                element: require("@components/VencordSettings/VencordTab").default,
+                className: "vc-settings"
            },
            {
                section: "VencordPlugins",
                label: "Plugins",
                element: require("@components/VencordSettings/PluginsTab").default,
+                className: "vc-plugins"
            },
            {
                section: "VencordThemes",
                label: "Themes",
                element: require("@components/VencordSettings/ThemesTab").default,
+                className: "vc-themes"
            },
            !IS_WEB && {
                section: "VencordUpdater",
                label: "Updater",
                element: require("@components/VencordSettings/UpdaterTab").default,
+                className: "vc-updater"
            },
            {
                section: "VencordCloud",
                label: "Cloud",
                element: require("@components/VencordSettings/CloudTab").default,
+                className: "vc-cloud"
            },
            {
                section: "VencordSettingsSync",
                label: "Backup & Restore",
                element: require("@components/VencordSettings/BackupAndRestoreTab").default,
+                className: "vc-backup-restore"
            },
            IS_DEV && {
                section: "VencordPatchHelper",
                label: "Patch Helper",
                element: require("@components/VencordSettings/PatchHelperTab").default,
+                className: "vc-patch-helper"
            },
            // TODO: make this use customSections
            IS_VENCORD_DESKTOP && {
                section: "VencordDesktop",
                label: "Desktop Settings",
                element: VencordDesktop.Components.Settings,
+                className: "vc-desktop-settings"
            },
            ...this.customSections.map(func => func(ID)),
            {
--- a/src/plugins/anonymiseFileNames.ts
+++ b/src/plugins/anonymiseFileNames.ts
@ -26,6 +26,8 @@ const enum Methods {
    Timestamp,
 }

+const tarExtMatcher = /\.tar\.\w+$/;
+
 export default definePlugin({
    name: "AnonymiseFileNames",
    authors: [Devs.obscurity],
@ -67,7 +69,8 @@ export default definePlugin({

    anonymise(file: string) {
        let name = "image";
-        const extIdx = file.lastIndexOf(".");
+        const tarMatch = tarExtMatcher.exec(file);
+        const extIdx = tarMatch?.index ?? file.lastIndexOf(".");
        const ext = extIdx !== -1 ? file.slice(extIdx) : "";

        switch (Settings.plugins.AnonymiseFileNames.method) {
--- a/src/plugins/betterGifAltText.ts
+++ b/src/plugins/betterGifAltText.ts
@ -16,7 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";

--- a/src/plugins/biggerStreamPreview/webpack/stores.ts
+++ b/src/plugins/biggerStreamPreview/webpack/stores.ts
@ -16,7 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-
 import { findStoreLazy } from "@webpack";

 import * as t from "./types/stores";
--- a/src/plugins/clearURLs/defaultRules.ts
+++ b/src/plugins/clearURLs/defaultRules.ts
@ -16,7 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-
 export const defaultRules = [
    "action_object_map",
    "action_type_map",
--- a/src/plugins/memberCount.tsx
+++ b/src/plugins/memberCount.tsx
@ -52,7 +52,6 @@ function MemberCount() {
    return (
        <Flex id="vc-membercount" style={{
            marginTop: "1em",
-            marginBottom: "-.5em",
            paddingInline: "1em",
            justifyContent: "center",
            alignContent: "center",
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@ -26,7 +26,7 @@ import { Devs } from "@utils/constants";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { FluxDispatcher, i18n, Menu, moment, Parser, Timestamp, UserStore } from "@webpack/common";
+import { ChannelStore, FluxDispatcher, i18n, Menu, moment, Parser, Timestamp, UserStore } from "@webpack/common";

 import overlayStyle from "./deleteStyleOverlay.css?managed";
 import textStyle from "./deleteStyleText.css?managed";
@ -92,7 +92,7 @@ const patchMessageContextMenu: NavContextMenuPatchCallback = (children, props) =
 export default definePlugin({
    name: "MessageLogger",
    description: "Temporarily logs deleted and edited messages.",
-    authors: [Devs.rushii, Devs.Ven],
+    authors: [Devs.rushii, Devs.Ven, Devs.AutumnVN],

    start() {
        addDeleteStyle();
@ -183,7 +183,7 @@ export default definePlugin({
                    ignoreSelf && msg.author?.id === myId ||
                    ignoreUsers.includes(msg.author?.id) ||
                    ignoreChannels.includes(msg.channel_id) ||
-                    ignoreGuilds.includes(msg.guild_id);
+                    ignoreGuilds.includes(ChannelStore.getChannel(msg.channel_id)?.guild_id);

                if (shouldIgnore) {
                    cache = cache.remove(id);
--- a/src/plugins/mutualGroupDMs.tsx
+++ b/src/plugins/mutualGroupDMs.tsx
@ -16,7 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

-
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
--- a/src/plugins/reviewDB/components/ReviewsView.tsx
+++ b/src/plugins/reviewDB/components/ReviewsView.tsx
@ -19,7 +19,7 @@
 import { classes } from "@utils/misc";
 import { useAwaiter, useForceUpdater } from "@utils/react";
 import { findByPropsLazy } from "@webpack";
-import { Forms, React, UserStore } from "@webpack/common";
+import { Forms, React, RelationshipStore, UserStore } from "@webpack/common";
 import type { KeyboardEvent } from "react";

 import { Review } from "../entities";
@ -60,6 +60,9 @@ export default function ReviewsView({
        fallbackValue: null,
        deps: [refetchSignal, signal, page],
        onSuccess: data => {
+            if (settings.store.hideBlockedUsers)
+                data!.reviews = data!.reviews?.filter(r => !RelationshipStore.isBlocked(r.sender.discordID));
+
            scrollToTop?.();
            onFetchReviews(data!);
        }
--- a/src/plugins/reviewDB/reviewDbApi.ts
+++ b/src/plugins/reviewDB/reviewDbApi.ts
@ -16,7 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-
 import { Review, ReviewDBUser } from "./entities";
 import { settings } from "./settings";
 import { authorize, showToast } from "./utils";
--- a/src/plugins/reviewDB/settings.tsx
+++ b/src/plugins/reviewDB/settings.tsx
@ -48,6 +48,11 @@ export const settings = definePluginSettings({
        description: "Hide timestamps on reviews",
        default: false,
    },
+    hideBlockedUsers: {
+        type: OptionType.BOOLEAN,
+        description: "Hide reviews from blocked users",
+        default: true,
+    },
    website: {
        type: OptionType.COMPONENT,
        description: "ReviewDB website",
--- a/src/plugins/secretRingTone.ts
+++ b/src/plugins/secretRingTone.ts
@ -0,0 +1,35 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "SecretRingToneEnabler",
+    description: "Always play the secret version of the discord ringtone",
+    authors: [Devs.AndrewDLO],
+    patches: [
+        {
+            find: "84a1b4e11d634dbfa1e5dd97a96de3ad",
+            replacement: {
+                match: "84a1b4e11d634dbfa1e5dd97a96de3ad.mp3",
+                replace: "b9411af07f154a6fef543e7e442e4da9.mp3",
+            },
+        },
+    ],
+});
--- a/src/plugins/sendTimestamps/index.tsx
+++ b/src/plugins/sendTimestamps/index.tsx
@ -146,7 +146,7 @@ export default definePlugin({
                    <div style={{ display: "flex" }}>
                        <Button
                            aria-haspopup="dialog"
-                            aria-label=""
+                            aria-label="Insert Timestamp"
                            size=""
                            look={ButtonLooks.BLANK}
                            onMouseEnter={onMouseEnter}
--- a/src/plugins/shikiCodeblocks/api/shiki.ts
+++ b/src/plugins/shikiCodeblocks/api/shiki.ts
@ -16,7 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-
 import { shikiOnigasmSrc, shikiWorkerSrc } from "@utils/dependencies";
 import { WorkerClient } from "@vap/core/ipc";
 import type { IShikiTheme, IThemedToken } from "@vap/shiki";
--- a/src/plugins/shikiCodeblocks/previewExample.tsx
+++ b/src/plugins/shikiCodeblocks/previewExample.tsx
@ -1,4 +1,4 @@
-/* eslint-disable header/header */
+/* eslint-disable simple-header/header */
 import React from "react";

 const handleClick = async () =>
--- a/src/plugins/showMeYourName/index.tsx
+++ b/src/plugins/showMeYourName/index.tsx
@ -40,6 +40,11 @@ const settings = definePluginSettings({
            { label: "Username only", value: "user" },
        ],
    },
+    displayNames: {
+        type: OptionType.BOOLEAN,
+        description: "Use display names in place of usernames",
+        default: false
+    },
    inReplies: {
        type: OptionType.BOOLEAN,
        default: false,
@ -50,7 +55,7 @@ const settings = definePluginSettings({
 export default definePlugin({
    name: "ShowMeYourName",
    description: "Display usernames next to nicks, or no nicks at all",
-    authors: [Devs.dzshn],
+    authors: [Devs.dzshn, Devs.TheKodeToad],
    patches: [
        {
            find: ".withMentionPrefix",
@ -63,9 +68,11 @@ export default definePlugin({
    settings,

    renderUsername: ({ author, message, isRepliedMessage, withMentionPrefix }: UsernameProps) => {
-        if (message.interaction) return author?.nick;
        try {
-            const { username } = message.author;
+            let { username } = message.author;
+            if (settings.store.displayNames)
+                username = (message.author as any).globalName || username;
+
            const { nick } = author;
            const prefix = withMentionPrefix ? "@" : "";
            if (username === nick || isRepliedMessage && !settings.store.inReplies)
--- a/src/plugins/startupTimings/index.tsx
+++ b/src/plugins/startupTimings/index.tsx
@ -16,7 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-
 import { Devs } from "@utils/constants";
 import { LazyComponent } from "@utils/react";
 import definePlugin from "@utils/types";
--- a/src/plugins/translate/TranslateIcon.tsx
+++ b/src/plugins/translate/TranslateIcon.tsx
@ -51,7 +51,7 @@ export function TranslateChatBarIcon({ slateProps }: { slateProps: { type: { ana
                <div style={{ display: "flex" }}>
                    <Button
                        aria-haspopup="dialog"
-                        aria-label=""
+                        aria-label="Open Translate Modal"
                        size=""
                        look={ButtonLooks.BLANK}
                        onMouseEnter={onMouseEnter}
--- a/src/plugins/translate/languages.ts
+++ b/src/plugins/translate/languages.ts
@ -16,7 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-
 /*
 To generate:
 - Visit https://translate.google.com/?sl=auto&tl=en&op=translate
--- a/src/plugins/vencordToolbox/index.tsx
+++ b/src/plugins/vencordToolbox/index.tsx
@ -19,6 +19,7 @@
 import "./index.css";

 import { openNotificationLogModal } from "@api/Notifications/notificationLog";
+import { Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { LazyComponent } from "@utils/react";
@ -66,6 +67,15 @@ function VencordPopout(onClose: () => void) {
                label="Open Notification Log"
                action={openNotificationLogModal}
            />
+            <Menu.MenuCheckboxItem
+                id="vc-toolbox-quickcss-toggle"
+                checked={Settings.useQuickCss}
+                label={"Enable QuickCSS"}
+                action={() => {
+                    Settings.useQuickCss = !Settings.useQuickCss;
+                    onClose();
+                }}
+            />
            <Menu.MenuItem
                id="vc-toolbox-quickcss"
                label="Open QuickCSS"
--- a/src/preload.ts
+++ b/src/preload.ts
@ -28,7 +28,7 @@ contextBridge.exposeInMainWorld("VencordNative", VencordNative);
 // Discord
 if (location.protocol !== "data:") {
    // #region cssInsert
-    const rendererCss = join(__dirname, "renderer.css");
+    const rendererCss = join(__dirname, IS_VENCORD_DESKTOP ? "vencordDesktopRenderer.css" : "renderer.css");

    const style = document.createElement("style");
    style.id = "vencord-css-core";
@ -51,9 +51,9 @@ if (location.protocol !== "data:") {
    }
    // #endregion

-    if (process.env.DISCORD_PRELOAD) {
+    if (IS_DISCORD_DESKTOP) {
        webFrame.executeJavaScript(readFileSync(join(__dirname, "renderer.js"), "utf-8"));
-        require(process.env.DISCORD_PRELOAD);
+        require(process.env.DISCORD_PRELOAD!);
    }
 } // Monaco popout
 else {
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@ -331,10 +331,22 @@ export const Devs = /* #__PURE__*/ Object.freeze({
        name: "rad",
        id: 610945092504780823n
    },
+    AndrewDLO: {
+        name: "Andrew-DLO",
+        id: 434135504792059917n
+    },
    HypedDomi: {
        name: "HypedDomi",
        id: 354191516979429376n
-    }
+    },
+    Rini: {
+        name: "Rini",
+        id: 1079479184478441643n
+    },
+    Arrow: {
+        name: "arrow",
+        id: 958158495302176778n
+    },
 } satisfies Record<string, Dev>);

 // iife so #__PURE__ works correctly
--- a/src/webpack/common/menu.ts
+++ b/src/webpack/common/menu.ts
@ -16,7 +16,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-
 // eslint-disable-next-line path-alias/no-relative
 import { filters, mapMangledModuleLazy, waitFor } from "../webpack";
 import type * as t from "./types/menu";
Author	SHA1	Message	Date
V	d5b3b51050	bump to v1.4.3	2023-08-12 03:02:55 +02:00
V	725fb27e54	futureproof settings patches	2023-08-12 03:01:53 +02:00
V	243381fc91	Settings: Give vencord sections classes so themes can match them	2023-08-12 02:59:24 +02:00
V	54cbdfdad0	MemberCount: Remove negative margin, fixes issues with some themes	2023-08-12 02:46:38 +02:00
V	fe80b8cc85	AnonymiseFileNames: Properly keep .tar.* extensions	2023-08-12 02:45:11 +02:00
Andrew-DLO	742f5cf556	feat(plugin): SecretRingToneEnabler (#1570 ) Co-authored-by: V <vendicated@riseup.net>	2023-08-12 02:23:00 +02:00
fawn	3b3da90c44	feat(VencordToolbox): add quickcss toggle (#1604 ) Co-authored-by: V <vendicated@riseup.net>	2023-08-12 02:14:07 +02:00
TheKodeToad	c79e065d09	ShowMeYourName: Option to use display names instead of usernames (#1634 ) Co-authored-by: V <vendicated@riseup.net>	2023-08-12 01:53:06 +02:00
V	3b8b43c7e0	ci: Fix reporter Co-authored-by: Justice Almanzar <superdash993@gmail.com>	2023-08-12 01:36:19 +02:00
AutumnVN	6e7996659f	messageLogger: fix ingore guild (#1632 )	2023-08-11 06:10:49 +02:00
Arrow	abdf4ebb05	feat(plugin): NoSentryConsole (#1623 ) Co-authored-by: V <vendicated@riseup.net> Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>	2023-08-11 00:17:29 +02:00
Justice Almanzar	fa124d8877	build: split preload & renderer.css into D. desktop / vesktop (#1629 )	2023-08-11 00:14:50 +02:00
im-h	135da2a5f3	Translate/SendTimestamps: Fix accessibility (#1628 ) Co-authored-by: V <vendicated@riseup.net>	2023-08-10 02:31:28 +02:00
Manti	c96a1a9998	[ReviewDB] hide blocked users (#1626 ) Co-authored-by: V <vendicated@riseup.net>	2023-08-10 00:28:46 +00:00
Rini	8b6c8bc0ec	chore: transition to shorter license headers (#6 ) Transition from the GPL jumpscare to a more concise header: /* * Vencord, a Discord client mod * Copyright (c) 2023 Vendicated and contributors * * SPDX-License-Identifier: GPL-3.0 */ Old files still keep the old headers, while eslint will now autofix the new header Reviewed-on: https://codeberg.org/Ven/cord/pulls/6 Co-authored-by: Rini <rini@rinici.de> Co-committed-by: Rini <rini@rinici.de>	2023-08-10 00:17:49 +00:00