Merge branch 'main' into main

.eslintrc.json

@@ -6,8 +6,22 @@
         "@typescript-eslint",
         "header",
         "simple-import-sort",
-        "unused-imports"
+        "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
@@ -95,6 +109,8 @@
 
         "unused-imports/no-unused-imports": "error",
 
+        "path-alias/no-relative": "error",
+
         "@typescript-eslint/no-restricted-imports": [
             "error",
             {

.github/workflows/test.yml

@@ -23,5 +23,8 @@ jobs:
             - name: Install dependencies
               run: pnpm install --frozen-lockfile
 
-            - name: Lint & Test if it compiles
+            - name: Lint & Test if desktop version compiles
               run: pnpm test
+
+            - name: Lint & Test if web version compiles
+              run: pnpm testWeb

browser/VencordNativeStub.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import IpcEvents from "../src/utils/IpcEvents";
 import * as DataStore from "../src/api/DataStore";
+import IpcEvents from "../src/utils/IpcEvents";
 
 // Discord deletes this so need to store in variable
 const { localStorage } = window;

docs/2_PLUGINS.md

@@ -15,7 +15,7 @@ You don't need to run `pnpm build` every time you make a change. Instead, use `p
 3. In `index.ts`, copy-paste the following template code:
 
 ```ts
-import definePlugin from "../../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "Epic Plugin",

package.json

@@ -24,6 +24,7 @@
         "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
         "lint:fix": "pnpm lint --fix",
         "test": "pnpm lint && pnpm build && pnpm testTsc",
+        "testWeb": "pnpm lint && pnpm buildWeb && pnpm testTsc",
         "testTsc": "tsc --noEmit",
         "uninject": "node scripts/patcher/uninstall.js",
         "watch": "node scripts/build/build.mjs --watch"
@@ -44,7 +45,9 @@
         "discord-types": "^1.3.26",
         "esbuild": "^0.15.5",
         "eslint": "^8.24.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": "^8.0.0",
         "eslint-plugin-unused-imports": "^2.0.0",
         "moment": "^2.29.4",
@@ -53,5 +56,10 @@
         "type-fest": "^3.1.0",
         "typescript": "^4.8.4"
     },
-    "packageManager": "pnpm@7.13.4"
+    "packageManager": "pnpm@7.13.4",
+    "pnpm": {
+        "patchedDependencies": {
+            "eslint-plugin-path-alias@1.0.0": "patches/eslint-plugin-path-alias@1.0.0.patch"
+        }
+    }
 }

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

@@ -0,0 +1,13 @@
+diff --git a/lib/rules/no-relative.js b/lib/rules/no-relative.js
+index 71594c83f1f4f733ffcc6047d7f7084348335dbe..d8623d87c89499c442171db3272cba07c9efabbe 100644
+--- a/lib/rules/no-relative.js
++++ b/lib/rules/no-relative.js
+@@ -41,7 +41,7 @@ module.exports = {
+ 			ImportDeclaration(node) {
+ 				const importPath = node.source.value;
+ 
+-				if (!/^(\.?\.\/)/.test(importPath)) {
++				if (!/^(\.\.\/)/.test(importPath)) {
+ 					return;
+ 				}
+ 

pnpm-lock.yaml

@@ -1,5 +1,10 @@
 lockfileVersion: 5.4
 
+patchedDependencies:
+  eslint-plugin-path-alias@1.0.0:
+    hash: m6sma4g6bh67km3q6igf6uxaja
+    path: patches/eslint-plugin-path-alias@1.0.0.patch
+
 specifiers:
   '@types/diff': ^5.0.2
   '@types/node': ^18.7.13
@@ -13,7 +18,9 @@ specifiers:
   discord-types: ^1.3.26
   esbuild: ^0.15.5
   eslint: ^8.24.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: ^8.0.0
   eslint-plugin-unused-imports: ^2.0.0
   fflate: ^0.7.4
@@ -39,7 +46,9 @@ devDependencies:
   discord-types: 1.3.26
   esbuild: 0.15.5
   eslint: 8.24.0
+  eslint-import-resolver-alias: 1.1.2
   eslint-plugin-header: 3.1.1_eslint@8.24.0
+  eslint-plugin-path-alias: 1.0.0_m6sma4g6bh67km3q6igf6uxaja_eslint@8.24.0
   eslint-plugin-simple-import-sort: 8.0.0_eslint@8.24.0
   eslint-plugin-unused-imports: 2.0.0_5yz3upex2kb6hbdwaq7bihlxnq
   moment: 2.29.4
@@ -403,15 +412,54 @@ packages:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
     dev: true
 
+  /arr-diff/4.0.0:
+    resolution: {integrity: sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /arr-union/3.1.0:
+    resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /array-union/2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
     dev: true
 
+  /array-unique/0.3.2:
+    resolution: {integrity: sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /assign-symbols/1.0.0:
+    resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /atob/2.1.2:
+    resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
+    engines: {node: '>= 4.5.0'}
+    hasBin: true
+    dev: true
+
   /balanced-match/1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
     dev: true
 
+  /base/0.11.2:
+    resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      cache-base: 1.0.1
+      class-utils: 0.3.6
+      component-emitter: 1.3.0
+      define-property: 1.0.0
+      isobject: 3.0.1
+      mixin-deep: 1.3.2
+      pascalcase: 0.1.1
+    dev: true
+
   /base64-js/1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
     dev: true
@@ -449,6 +497,21 @@ packages:
       ieee754: 1.2.1
     dev: true
 
+  /cache-base/1.0.1:
+    resolution: {integrity: sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      collection-visit: 1.0.0
+      component-emitter: 1.3.0
+      get-value: 2.0.6
+      has-value: 1.0.0
+      isobject: 3.0.1
+      set-value: 2.0.1
+      to-object-path: 0.3.0
+      union-value: 1.0.1
+      unset-value: 1.0.0
+    dev: true
+
   /callsites/3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
@@ -466,6 +529,24 @@ packages:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
     dev: true
 
+  /class-utils/0.3.6:
+    resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      arr-union: 3.1.0
+      define-property: 0.2.5
+      isobject: 3.0.1
+      static-extend: 0.1.2
+    dev: true
+
+  /collection-visit/1.0.0:
+    resolution: {integrity: sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      map-visit: 1.0.0
+      object-visit: 1.0.1
+    dev: true
+
   /color-convert/2.0.1:
     resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
     engines: {node: '>=7.0.0'}
@@ -477,6 +558,10 @@ packages:
     resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
     dev: true
 
+  /component-emitter/1.3.0:
+    resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
+    dev: true
+
   /concat-map/0.0.1:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
@@ -487,6 +572,11 @@ packages:
       keypress: 0.2.1
     dev: false
 
+  /copy-descriptor/0.1.1:
+    resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /cross-fetch/3.1.5:
     resolution: {integrity: sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==}
     dependencies:
@@ -508,6 +598,17 @@ packages:
     resolution: {integrity: sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==}
     dev: true
 
+  /debug/2.6.9:
+    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+    dependencies:
+      ms: 2.0.0
+    dev: true
+
   /debug/4.3.4:
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
@@ -520,10 +621,37 @@ packages:
       ms: 2.1.2
     dev: true
 
+  /decode-uri-component/0.2.0:
+    resolution: {integrity: sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==}
+    engines: {node: '>=0.10'}
+    dev: true
+
   /deep-is/0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
     dev: true
 
+  /define-property/0.2.5:
+    resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      is-descriptor: 0.1.6
+    dev: true
+
+  /define-property/1.0.0:
+    resolution: {integrity: sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      is-descriptor: 1.0.2
+    dev: true
+
+  /define-property/2.0.2:
+    resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      is-descriptor: 1.0.2
+      isobject: 3.0.1
+    dev: true
+
   /devtools-protocol/0.0.1056733:
     resolution: {integrity: sha512-CmTu6SQx2g3TbZzDCAV58+LTxVdKplS7xip0g5oDXpZ+isr0rv5dDP8ToyVRywzPHkCCPKgKgScEcwz4uPWDIA==}
     dev: true
@@ -774,6 +902,13 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /eslint-import-resolver-alias/1.1.2:
+    resolution: {integrity: sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w==}
+    engines: {node: '>= 4'}
+    peerDependencies:
+      eslint-plugin-import: '>=1.4.0'
+    dev: true
+
   /eslint-plugin-header/3.1.1_eslint@8.24.0:
     resolution: {integrity: sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==}
     peerDependencies:
@@ -782,6 +917,18 @@ packages:
       eslint: 8.24.0
     dev: true
 
+  /eslint-plugin-path-alias/1.0.0_m6sma4g6bh67km3q6igf6uxaja_eslint@8.24.0:
+    resolution: {integrity: sha512-FXus57yC+Zd3sMv46pbloXYwFeNVNHJqlACr9V68FG/IzGFBBokGJpmjDbEjpt8ZCeVSndUubeDWWl2A8sCNVQ==}
+    peerDependencies:
+      eslint: ^7
+    dependencies:
+      eslint: 8.24.0
+      nanomatch: 1.2.13
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+    patched: true
+
   /eslint-plugin-simple-import-sort/8.0.0_eslint@8.24.0:
     resolution: {integrity: sha512-bXgJQ+lqhtQBCuWY/FUWdB27j4+lqcvXv5rUARkzbeWLwea+S5eBZEQrhnO+WgX3ZoJHVj0cn943iyXwByHHQw==}
     peerDependencies:
@@ -932,6 +1079,21 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /extend-shallow/2.0.1:
+    resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      is-extendable: 0.1.1
+    dev: true
+
+  /extend-shallow/3.0.2:
+    resolution: {integrity: sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      assign-symbols: 1.0.0
+      is-extendable: 1.0.1
+    dev: true
+
   /extract-zip/2.0.1:
     resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
     engines: {node: '>= 10.17.0'}
@@ -1019,6 +1181,18 @@ packages:
     resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
     dev: true
 
+  /for-in/1.0.2:
+    resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /fragment-cache/0.2.1:
+    resolution: {integrity: sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      map-cache: 0.2.2
+    dev: true
+
   /fs-constants/1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
     dev: true
@@ -1034,6 +1208,11 @@ packages:
       pump: 3.0.0
     dev: true
 
+  /get-value/2.0.6:
+    resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /glob-parent/5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
@@ -1087,6 +1266,37 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /has-value/0.3.1:
+    resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      get-value: 2.0.6
+      has-values: 0.1.4
+      isobject: 2.1.0
+    dev: true
+
+  /has-value/1.0.0:
+    resolution: {integrity: sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      get-value: 2.0.6
+      has-values: 1.0.0
+      isobject: 3.0.1
+    dev: true
+
+  /has-values/0.1.4:
+    resolution: {integrity: sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /has-values/1.0.0:
+    resolution: {integrity: sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      is-number: 3.0.0
+      kind-of: 4.0.0
+    dev: true
+
   /https-proxy-agent/5.0.1:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
@@ -1130,6 +1340,68 @@ packages:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
     dev: true
 
+  /is-accessor-descriptor/0.1.6:
+    resolution: {integrity: sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      kind-of: 3.2.2
+    dev: true
+
+  /is-accessor-descriptor/1.0.0:
+    resolution: {integrity: sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      kind-of: 6.0.3
+    dev: true
+
+  /is-buffer/1.1.6:
+    resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
+    dev: true
+
+  /is-data-descriptor/0.1.4:
+    resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      kind-of: 3.2.2
+    dev: true
+
+  /is-data-descriptor/1.0.0:
+    resolution: {integrity: sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      kind-of: 6.0.3
+    dev: true
+
+  /is-descriptor/0.1.6:
+    resolution: {integrity: sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      is-accessor-descriptor: 0.1.6
+      is-data-descriptor: 0.1.4
+      kind-of: 5.1.0
+    dev: true
+
+  /is-descriptor/1.0.2:
+    resolution: {integrity: sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      is-accessor-descriptor: 1.0.0
+      is-data-descriptor: 1.0.0
+      kind-of: 6.0.3
+    dev: true
+
+  /is-extendable/0.1.1:
+    resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /is-extendable/1.0.1:
+    resolution: {integrity: sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      is-plain-object: 2.0.4
+    dev: true
+
   /is-extglob/2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
@@ -1142,15 +1414,50 @@ packages:
       is-extglob: 2.1.1
     dev: true
 
+  /is-number/3.0.0:
+    resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      kind-of: 3.2.2
+    dev: true
+
   /is-number/7.0.0:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
     dev: true
 
+  /is-plain-object/2.0.4:
+    resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      isobject: 3.0.1
+    dev: true
+
+  /is-windows/1.0.2:
+    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /isarray/1.0.0:
+    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
+    dev: true
+
   /isexe/2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
     dev: true
 
+  /isobject/2.1.0:
+    resolution: {integrity: sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      isarray: 1.0.0
+    dev: true
+
+  /isobject/3.0.1:
+    resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /js-sdsl/4.1.5:
     resolution: {integrity: sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==}
     dev: true
@@ -1174,6 +1481,30 @@ packages:
     resolution: {integrity: sha512-HjorDJFNhnM4SicvaUXac0X77NiskggxJdesG72+O5zBKpSqKFCrqmndKVqpu3pFqkla0St6uGk8Ju0sCurrmg==}
     dev: false
 
+  /kind-of/3.2.2:
+    resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      is-buffer: 1.1.6
+    dev: true
+
+  /kind-of/4.0.0:
+    resolution: {integrity: sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      is-buffer: 1.1.6
+    dev: true
+
+  /kind-of/5.1.0:
+    resolution: {integrity: sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /kind-of/6.0.3:
+    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /levn/0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
@@ -1200,6 +1531,18 @@ packages:
       yallist: 4.0.0
     dev: true
 
+  /map-cache/0.2.2:
+    resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /map-visit/1.0.0:
+    resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      object-visit: 1.0.1
+    dev: true
+
   /merge2/1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
@@ -1219,6 +1562,14 @@ packages:
       brace-expansion: 1.1.11
     dev: true
 
+  /mixin-deep/1.3.2:
+    resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      for-in: 1.0.2
+      is-extendable: 1.0.1
+    dev: true
+
   /mkdirp-classic/0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
     dev: true
@@ -1227,10 +1578,33 @@ packages:
     resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==}
     dev: true
 
+  /ms/2.0.0:
+    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
+    dev: true
+
   /ms/2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
     dev: true
 
+  /nanomatch/1.2.13:
+    resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      arr-diff: 4.0.0
+      array-unique: 0.3.2
+      define-property: 2.0.2
+      extend-shallow: 3.0.2
+      fragment-cache: 0.2.1
+      is-windows: 1.0.2
+      kind-of: 6.0.3
+      object.pick: 1.3.0
+      regex-not: 1.0.2
+      snapdragon: 0.8.2
+      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /natural-compare-lite/1.4.0:
     resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
     dev: true
@@ -1251,6 +1625,29 @@ packages:
       whatwg-url: 5.0.0
     dev: true
 
+  /object-copy/0.1.0:
+    resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      copy-descriptor: 0.1.1
+      define-property: 0.2.5
+      kind-of: 3.2.2
+    dev: true
+
+  /object-visit/1.0.1:
+    resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      isobject: 3.0.1
+    dev: true
+
+  /object.pick/1.3.0:
+    resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      isobject: 3.0.1
+    dev: true
+
   /once/1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
     dependencies:
@@ -1290,6 +1687,11 @@ packages:
       callsites: 3.1.0
     dev: true
 
+  /pascalcase/0.1.1:
+    resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /path-exists/4.0.0:
     resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
     engines: {node: '>=8'}
@@ -1374,6 +1776,14 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
+  /regex-not/1.0.2:
+    resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      extend-shallow: 3.0.2
+      safe-regex: 1.1.0
+    dev: true
+
   /regexpp/3.2.0:
     resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
     engines: {node: '>=8'}
@@ -1384,6 +1794,16 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
+  /resolve-url/0.2.1:
+    resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
+    deprecated: https://github.com/lydell/resolve-url#deprecated
+    dev: true
+
+  /ret/0.1.15:
+    resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
+    engines: {node: '>=0.12'}
+    dev: true
+
   /reusify/1.0.4:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
@@ -1406,6 +1826,12 @@ packages:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
     dev: true
 
+  /safe-regex/1.1.0:
+    resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==}
+    dependencies:
+      ret: 0.1.15
+    dev: true
+
   /semver/7.3.7:
     resolution: {integrity: sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==}
     engines: {node: '>=10'}
@@ -1414,6 +1840,16 @@ packages:
       lru-cache: 6.0.0
     dev: true
 
+  /set-value/2.0.1:
+    resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      extend-shallow: 2.0.1
+      is-extendable: 0.1.1
+      is-plain-object: 2.0.4
+      split-string: 3.1.0
+    dev: true
+
   /shebang-command/2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
@@ -1431,12 +1867,64 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /snapdragon/0.8.2:
+    resolution: {integrity: sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      base: 0.11.2
+      debug: 2.6.9
+      define-property: 0.2.5
+      extend-shallow: 2.0.1
+      map-cache: 0.2.2
+      source-map: 0.5.7
+      source-map-resolve: 0.5.3
+      use: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /source-map-resolve/0.5.3:
+    resolution: {integrity: sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==}
+    deprecated: See https://github.com/lydell/source-map-resolve#deprecated
+    dependencies:
+      atob: 2.1.2
+      decode-uri-component: 0.2.0
+      resolve-url: 0.2.1
+      source-map-url: 0.4.1
+      urix: 0.1.0
+    dev: true
+
+  /source-map-url/0.4.1:
+    resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==}
+    deprecated: See https://github.com/lydell/source-map-url#deprecated
+    dev: true
+
+  /source-map/0.5.7:
+    resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /split-string/3.1.0:
+    resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      extend-shallow: 3.0.2
+    dev: true
+
   /standalone-electron-types/1.0.0:
     resolution: {integrity: sha512-0HOi/tlTz3mjWhsAz4uRbpQcHMZ+ifj1JzWW9nugykOHClBBG77ps8QinrzX1eow4Iw2pnC+RFaSYRgufF4BOg==}
     dependencies:
       '@types/node': 18.8.4
     dev: true
 
+  /static-extend/0.1.2:
+    resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      define-property: 0.2.5
+      object-copy: 0.1.0
+    dev: true
+
   /string_decoder/1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
     dependencies:
@@ -1490,6 +1978,13 @@ packages:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
     dev: true
 
+  /to-object-path/0.3.0:
+    resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      kind-of: 3.2.2
+    dev: true
+
   /to-regex-range/5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
@@ -1497,6 +1992,16 @@ packages:
       is-number: 7.0.0
     dev: true
 
+  /to-regex/3.0.2:
+    resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      define-property: 2.0.2
+      extend-shallow: 3.0.2
+      regex-not: 1.0.2
+      safe-regex: 1.1.0
+    dev: true
+
   /tr46/0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
     dev: true
@@ -1545,12 +2050,40 @@ packages:
       through: 2.3.8
     dev: true
 
+  /union-value/1.0.1:
+    resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      arr-union: 3.1.0
+      get-value: 2.0.6
+      is-extendable: 0.1.1
+      set-value: 2.0.1
+    dev: true
+
+  /unset-value/1.0.0:
+    resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      has-value: 0.3.1
+      isobject: 3.0.1
+    dev: true
+
   /uri-js/4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
       punycode: 2.1.1
     dev: true
 
+  /urix/0.1.0:
+    resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==}
+    deprecated: Please see https://github.com/lydell/urix#deprecated
+    dev: true
+
+  /use/3.1.1:
+    resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /util-deprecate/1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
     dev: true

scripts/genPluginList.js

@@ -58,6 +58,5 @@ ${p.description}
         list += "\n\n";
     }
 
-    const data = new TextEncoder().encode(header + tableOfContents + list);
+    copy(header + tableOfContents + list);
-    DiscordNative.fileManager.saveWithDialog(data, "plugins.md");
 })();

scripts/patcher/common.js

@@ -59,6 +59,7 @@ const LINUX_DISCORD_DIRS = [
     "/usr/lib64",
     "/opt",
     `${process.env.HOME}/.local/share`,
+    `${process.env.HOME}/.dvm`,
     "/var/lib/flatpak/app",
     `${process.env.HOME}/.local/share/flatpak/app`,
 ];

src/VencordNative.ts

@@ -16,10 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import IPC_EVENTS from "@utils/IpcEvents";
 import { IpcRenderer, ipcRenderer } from "electron";
 
-import IPC_EVENTS from "./utils/IpcEvents";
-
 function assertEventAllowed(event: string) {
     if (!(event in IPC_EVENTS)) throw new Error(`Event ${event} not allowed.`);
 }

src/api/Commands/commandHelpers.ts

@@ -16,15 +16,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { mergeDefaults } from "@utils/misc";
+import { findByCodeLazy, findByPropsLazy, waitFor } from "@webpack";
 import { Message } from "discord-types/general";
 import type { PartialDeep } from "type-fest";
 
-import { lazyWebpack, mergeDefaults } from "../../utils/misc";
-import { filters, waitFor } from "../../webpack";
 import { Argument } from "./types";
 
-const createBotMessage = lazyWebpack(filters.byCode('username:"Clyde"'));
+const createBotMessage = findByCodeLazy('username:"Clyde"');
-const MessageSender = lazyWebpack(filters.byProps("receiveMessage"));
+const MessageSender = findByPropsLazy("receiveMessage");
 
 let SnowflakeUtils: any;
 waitFor("fromTimestamp", m => SnowflakeUtils = m);

src/api/Commands/index.ts

@@ -16,7 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { makeCodeblock } from "../../utils/misc";
+import { makeCodeblock } from "@utils/misc";
+
 import { sendBotMessage } from "./commandHelpers";
 import { ApplicationCommandInputType, ApplicationCommandOptionType, ApplicationCommandType, Argument, Command, CommandContext, Option } from "./types";
 

src/api/MessageEvents.ts

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import Logger from "@utils/Logger";
+import { MessageStore } from "@webpack/common";
 import type { Channel, Message } from "discord-types/general";
 
-import Logger from "../utils/Logger";
-import { MessageStore } from "../webpack/common";
-
 const MessageEventsLogger = new Logger("MessageEvents", "#e5c890");
 
 export interface Emoji {

src/api/Notices.ts

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { waitFor } from "../webpack";
+import { waitFor } from "@webpack";
 
 let NoticesModule: any;
 waitFor(m => m.show && m.dismiss && !m.suppressAll, m => NoticesModule = m);

src/api/ServerList.ts

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import Logger from "../utils/Logger";
+import Logger from "@utils/Logger";
 
 const logger = new Logger("ServerListAPI");
 

src/api/settings.ts

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import plugins from "~plugins";
+import IpcEvents from "@utils/IpcEvents";
+import Logger from "@utils/Logger";
+import { mergeDefaults } from "@utils/misc";
+import { OptionType } from "@utils/types";
+import { React } from "@webpack/common";
 
-import IpcEvents from "../utils/IpcEvents";
+import plugins from "~plugins";
-import Logger from "../utils/Logger";
-import { mergeDefaults } from "../utils/misc";
-import { OptionType } from "../utils/types";
-import { React } from "../webpack/common";
 
 const logger = new Logger("Settings");
 export interface Settings {
@@ -48,16 +48,18 @@ try {
     var settings = JSON.parse(VencordNative.ipc.sendSync(IpcEvents.GET_SETTINGS)) as Settings;
     mergeDefaults(settings, DefaultSettings);
 } catch (err) {
-    console.error("Corrupt settings file. ", err);
     var settings = mergeDefaults({} as Settings, DefaultSettings);
+    logger.error("An error occurred while loading the settings. Corrupt settings file?\n", err);
 }
 
 type SubscriptionCallback = ((newValue: any, path: string) => void) & { _path?: string; };
 const subscriptions = new Set<SubscriptionCallback>();
 
+const proxyCache = {} as Record<string, any>;
+
 // Wraps the passed settings object in a Proxy to nicely handle change listeners and default values
 function makeProxy(settings: any, root = settings, path = ""): Settings {
-    return new Proxy(settings, {
+    return proxyCache[path] ??= new Proxy(settings, {
         get(target, p: string) {
             const v = target[p];
 
@@ -67,7 +69,7 @@ function makeProxy(settings: any, root = settings, path = ""): Settings {
                 if (path === "plugins" && p in plugins)
                     return target[p] = makeProxy({
                         enabled: plugins[p].required ?? false
-                    }, root, `plugins/${p}`);
+                    }, root, `plugins.${p}`);
 
                 // Since the property is not set, check if this is a plugin's setting and if so, try to resolve
                 // the default value.

src/components/CheckedTextInput.tsx

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { React, TextInput } from "../webpack/common";
+import { React, TextInput } from "@webpack/common";
 
 // TODO: Refactor settings to use this as well
 interface TextInputProps {

src/components/DonateButton.tsx

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import IpcEvents from "../utils/IpcEvents";
+import IpcEvents from "@utils/IpcEvents";
-import { Button } from "../webpack/common";
+import { Button } from "@webpack/common";
+
 import { Heart } from "./Heart";
 
 export default function DonateButton(props: any) {

src/components/ErrorBoundary.tsx

@@ -16,9 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import Logger from "../utils/Logger";
+import Logger from "@utils/Logger";
-import { LazyComponent } from "../utils/misc";
+import { LazyComponent } from "@utils/misc";
-import { Margins, React } from "../webpack/common";
+import { Margins, React } from "@webpack/common";
+
 import { ErrorCard } from "./ErrorCard";
 
 interface Props {

src/components/ErrorCard.tsx

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Card } from "../webpack/common";
+import { Card } from "@webpack/common";
 
 interface Props {
     style?: React.CSSProperties;

src/components/Flex.tsx

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import type { React } from "../webpack/common";
+import type { React } from "@webpack/common";
 
 export function Flex(props: React.PropsWithChildren<{
     flexDirection?: React.CSSProperties["flexDirection"];

src/components/Link.tsx

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { React } from "../webpack/common";
+import { React } from "@webpack/common";
 
 interface Props extends React.DetailedHTMLProps<React.AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement> {
     disabled?: boolean;

src/components/Monaco.ts

@@ -16,16 +16,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import monacoHtml from "~fileContent/monacoWin.html";
+import { debounce } from "@utils/debounce";
+import IpcEvents from "@utils/IpcEvents";
+import { Queue } from "@utils/Queue";
+import { find } from "@webpack";
 
-import { debounce } from "../utils/debounce";
+import monacoHtml from "~fileContent/monacoWin.html";
-import IpcEvents from "../utils/IpcEvents";
-import { Queue } from "../utils/Queue";
-import { find } from "../webpack/webpack";
 
 const queue = new Queue();
 const setCss = debounce((css: string) => {
-    queue.add(() => VencordNative.ipc.invoke(IpcEvents.SET_QUICK_CSS, css));
+    queue.push(() => VencordNative.ipc.invoke(IpcEvents.SET_QUICK_CSS, css));
 });
 
 export async function launchMonacoEditor() {

src/components/PatchHelper.tsx

@@ -16,10 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { debounce } from "../utils/debounce";
+import { debounce } from "@utils/debounce";
-import { makeCodeblock } from "../utils/misc";
+import { makeCodeblock } from "@utils/misc";
-import { Button, Clipboard, Forms, Margins, Parser, React, Switch, TextInput } from "../webpack/common";
+import { search } from "@webpack";
-import { search } from "../webpack/webpack";
+import { Button, Clipboard, Forms, Margins, Parser, React, Switch, Text, TextInput } from "@webpack/common";
+
 import { CheckedTextInput } from "./CheckedTextInput";
 import ErrorBoundary from "./ErrorBoundary";
 
@@ -243,7 +244,8 @@ function PatchHelper() {
     }
 
     return (
-        <>
+        <Forms.FormSection>
+            <Text variant="heading-md/normal" tag="h2" className={Margins.marginBottom8}>Patch Helper</Text>
             <Forms.FormTitle>find</Forms.FormTitle>
             <TextInput
                 type="text"
@@ -288,7 +290,7 @@ function PatchHelper() {
                     <Button onClick={() => Clipboard.copy(code)}>Copy to Clipboard</Button>
                 </>
             )}
-        </>
+        </Forms.FormSection>
     );
 }
 

src/components/PluginSettings/PluginModal.tsx

@@ -16,19 +16,19 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { generateId } from "@api/Commands";
+import { useSettings } from "@api/settings";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Flex } from "@components/Flex";
+import { LazyComponent } from "@utils/misc";
+import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize } from "@utils/modal";
+import { proxyLazy } from "@utils/proxyLazy";
+import { OptionType, Plugin } from "@utils/types";
+import { findByCode, findByPropsLazy } from "@webpack";
+import { Button, FluxDispatcher, Forms, React, Text, Tooltip, UserStore, UserUtils } from "@webpack/common";
 import { User } from "discord-types/general";
 import { Constructor } from "type-fest";
 
-import { generateId } from "../../api/Commands";
-import { useSettings } from "../../api/settings";
-import { LazyComponent, lazyWebpack } from "../../utils/misc";
-import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize } from "../../utils/modal";
-import { proxyLazy } from "../../utils/proxyLazy";
-import { OptionType, Plugin } from "../../utils/types";
-import { filters, findByCode } from "../../webpack";
-import { Button, FluxDispatcher, Forms, React, Text, Tooltip, UserStore, UserUtils } from "../../webpack/common";
-import ErrorBoundary from "../ErrorBoundary";
-import { Flex } from "../Flex";
 import {
     ISettingElementProps,
     SettingBooleanComponent,
@@ -40,7 +40,7 @@ import {
 } from "./components";
 
 const UserSummaryItem = LazyComponent(() => findByCode("defaultRenderUser", "showDefaultAvatarsForNullUsers"));
-const AvatarStyles = lazyWebpack(filters.byProps("moreUsers", "emptyUser", "avatarContainer", "clickableAvatar"));
+const AvatarStyles = findByPropsLazy("moreUsers", "emptyUser", "avatarContainer", "clickableAvatar");
 const UserRecord: Constructor<Partial<User>> = proxyLazy(() => UserStore.getCurrentUser().constructor) as any;
 
 interface PluginModalProps extends ModalProps {

src/components/PluginSettings/components/SettingBooleanComponent.tsx

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { PluginOptionBoolean } from "../../../utils/types";
+import { PluginOptionBoolean } from "@utils/types";
-import { Forms, React, Select } from "../../../webpack/common";
+import { Forms, React, Select } from "@webpack/common";
+
 import { ISettingElementProps } from ".";
 
 export function SettingBooleanComponent({ option, pluginSettings, id, onChange, onError }: ISettingElementProps<PluginOptionBoolean>) {

src/components/PluginSettings/components/SettingCustomComponent.tsx

@@ -16,7 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { PluginOptionComponent } from "../../../utils/types";
+import { PluginOptionComponent } from "@utils/types";
+
 import { ISettingElementProps } from ".";
 
 export function SettingCustomComponent({ option, onChange, onError }: ISettingElementProps<PluginOptionComponent>) {

src/components/PluginSettings/components/SettingNumericComponent.tsx

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { OptionType, PluginOptionNumber } from "../../../utils/types";
+import { OptionType, PluginOptionNumber } from "@utils/types";
-import { Forms, React, TextInput } from "../../../webpack/common";
+import { Forms, React, TextInput } from "@webpack/common";
+
 import { ISettingElementProps } from ".";
 
 const MAX_SAFE_NUMBER = BigInt(Number.MAX_SAFE_INTEGER);

src/components/PluginSettings/components/SettingSelectComponent.tsx

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { PluginOptionSelect } from "../../../utils/types";
+import { PluginOptionSelect } from "@utils/types";
-import { Forms, React, Select } from "../../../webpack/common";
+import { Forms, React, Select } from "@webpack/common";
+
 import { ISettingElementProps } from ".";
 
 export function SettingSelectComponent({ option, pluginSettings, onChange, onError, id }: ISettingElementProps<PluginOptionSelect>) {

src/components/PluginSettings/components/SettingSliderComponent.tsx

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { PluginOptionSlider } from "../../../utils/types";
+import { PluginOptionSlider } from "@utils/types";
-import { Forms, React, Slider } from "../../../webpack/common";
+import { Forms, React, Slider } from "@webpack/common";
+
 import { ISettingElementProps } from ".";
 
 export function makeRange(start: number, end: number, step = 1) {

src/components/PluginSettings/components/SettingTextComponent.tsx

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { PluginOptionString } from "../../../utils/types";
+import { PluginOptionString } from "@utils/types";
-import { Forms, React, TextInput } from "../../../webpack/common";
+import { Forms, React, TextInput } from "@webpack/common";
+
 import { ISettingElementProps } from ".";
 
 export function SettingTextComponent({ option, pluginSettings, id, onChange, onError }: ISettingElementProps<PluginOptionString>) {

src/components/PluginSettings/components/index.ts

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { PluginOptionBase } from "../../../utils/types";
+import { PluginOptionBase } from "@utils/types";
 
 export interface ISettingElementProps<T extends PluginOptionBase> {
     option: T;
@@ -35,3 +35,4 @@ export * from "./SettingNumericComponent";
 export * from "./SettingSelectComponent";
 export * from "./SettingSliderComponent";
 export * from "./SettingTextComponent";
+

src/components/PluginSettings/index.tsx

@@ -16,28 +16,29 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { showNotice } from "@api/Notices";
+import { Settings, useSettings } from "@api/settings";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { ErrorCard } from "@components/ErrorCard";
+import { Flex } from "@components/Flex";
+import { handleComponentFailed } from "@components/handleComponentFailed";
+import { ChangeList } from "@utils/ChangeList";
+import Logger from "@utils/Logger";
+import { classes, LazyComponent } from "@utils/misc";
+import { openModalLazy } from "@utils/modal";
+import { Plugin } from "@utils/types";
+import { findByCode, findByPropsLazy } from "@webpack";
+import { Alerts, Button, Forms, Margins, Parser, React, Select, Switch, Text, TextInput, Toasts, Tooltip } from "@webpack/common";
+
 import Plugins from "~plugins";
 
-import { showNotice } from "../../api/Notices";
-import { Settings, useSettings } from "../../api/settings";
 import { startDependenciesRecursive, startPlugin, stopPlugin } from "../../plugins";
-import { ChangeList } from "../../utils/ChangeList";
-import Logger from "../../utils/Logger";
-import { classes, LazyComponent, lazyWebpack } from "../../utils/misc";
-import { openModalLazy } from "../../utils/modal";
-import { Plugin } from "../../utils/types";
-import { filters, findByCode } from "../../webpack";
-import { Alerts, Button, Forms, Margins, Parser, React, Select, Switch, Text, TextInput, Toasts, Tooltip } from "../../webpack/common";
-import ErrorBoundary from "../ErrorBoundary";
-import { ErrorCard } from "../ErrorCard";
-import { Flex } from "../Flex";
-import { handleComponentFailed } from "../handleComponentFailed";
 import PluginModal from "./PluginModal";
 import * as styles from "./styles";
 
 const logger = new Logger("PluginSettings", "#a6d189");
 
-const InputStyles = lazyWebpack(filters.byProps("inputDefault", "inputWrapper"));
+const InputStyles = findByPropsLazy("inputDefault", "inputWrapper");
 
 const CogWheel = LazyComponent(() => findByCode("18.564C15.797 19.099 14.932 19.498 14 19.738V22H10V19.738C9.069"));
 const InfoIcon = LazyComponent(() => findByCode("4.4408921e-16 C4.4771525,-1.77635684e-15 4.4408921e-16"));
@@ -243,9 +244,9 @@ export default ErrorBoundary.wrap(function Settings() {
     };
 
     return (
-        <Forms.FormSection tag="h1" title="Vencord">
+        <Forms.FormSection>
             <Forms.FormTitle tag="h5" className={classes(Margins.marginTop20, Margins.marginBottom8)}>
-                Plugins
+                Filters
             </Forms.FormTitle>
 
             <ReloadRequiredCard plugins={[...changes.getChanges()]} style={{ marginBottom: 16 }} />
@@ -268,6 +269,8 @@ export default ErrorBoundary.wrap(function Settings() {
                 </div>
             </div>
 
+            <Forms.FormTitle className={Margins.marginTop20}>Plugins</Forms.FormTitle>
+
             <div style={styles.PluginsGrid}>
                 {sortedPlugins?.length ? sortedPlugins
                     .filter(a => !a.required && !dependencyCheck(a.name, depMap).length && pluginFilter(a))
@@ -302,7 +305,7 @@ export default ErrorBoundary.wrap(function Settings() {
                                 <PluginCard
                                     onMouseLeave={onMouseLeave}
                                     onMouseEnter={onMouseEnter}
-                                    onRestartNeeded={name => changes.add(name)}
+                                    onRestartNeeded={name => changes.handleChange(name)}
                                     disabled={plugin.required || !!dependency}
                                     plugin={plugin}
                                 />

src/components/Settings.tsx

@@ -1,162 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { useSettings } from "../api/settings";
-import { ChangeList } from "../utils/ChangeList";
-import IpcEvents from "../utils/IpcEvents";
-import { useAwaiter } from "../utils/misc";
-import { downloadSettingsBackup, uploadSettingsBackup } from "../utils/settingsSync";
-import { Alerts, Button, Card, Forms, Margins, Parser, React, Switch } from "../webpack/common";
-import DonateButton from "./DonateButton";
-import ErrorBoundary from "./ErrorBoundary";
-import { Flex } from "./Flex";
-import { handleComponentFailed } from "./handleComponentFailed";
-
-export default ErrorBoundary.wrap(function Settings() {
-    const [settingsDir, , settingsDirPending] = useAwaiter(() => VencordNative.ipc.invoke<string>(IpcEvents.GET_SETTINGS_DIR), "Loading...");
-    const settings = useSettings();
-    const changes = React.useMemo(() => new ChangeList<string>(), []);
-
-    React.useEffect(() => {
-        return () => void (changes.hasChanges && Alerts.show({
-            title: "Restart required",
-            body: (
-                <>
-                    <p>The following plugins require a restart:</p>
-                    <div>{changes.map((s, i) => (
-                        <>
-                            {i > 0 && ", "}
-                            {Parser.parse("`" + s + "`")}
-                        </>
-                    ))}</div>
-                </>
-            ),
-            confirmText: "Restart now",
-            cancelText: "Later!",
-            onConfirm: () => location.reload()
-        }));
-    }, []);
-
-    return (
-        <Forms.FormSection tag="h1" title="Vencord">
-            <Card style={{
-                padding: "1em",
-                display: "flex",
-                flexDirection: "row",
-                marginBottom: "1em"
-            }}>
-                <div>
-                    <Forms.FormTitle tag="h5">Support the Project</Forms.FormTitle>
-                    <Forms.FormText>
-                        Please consider supporting the Development of Vencord by donating!
-                    </Forms.FormText>
-                    <DonateButton style={{ transform: "translateX(-1em)" }} />
-                </div>
-                <img
-                    role="presentation"
-                    src="https://cdn.discordapp.com/emojis/1026533090627174460.png"
-                    alt=""
-                    style={{ marginLeft: "auto", transform: "rotate(10deg)" }}
-                />
-            </Card>
-
-            <Forms.FormTitle tag="h5">
-                Settings
-            </Forms.FormTitle>
-
-            <Forms.FormText className={Margins.marginBottom8}>
-                Settings Directory: <code style={{ userSelect: "text", cursor: "text" }}>{settingsDir}</code>
-            </Forms.FormText>
-
-            {!IS_WEB && <Flex className={Margins.marginBottom20}>
-                <Button
-                    onClick={() => window.DiscordNative.app.relaunch()}
-                    size={Button.Sizes.SMALL}
-                    color={Button.Colors.GREEN}
-                >
-                    Reload
-                </Button>
-                <Button
-                    onClick={() => window.DiscordNative.fileManager.showItemInFolder(settingsDir)}
-                    size={Button.Sizes.SMALL}
-                    disabled={settingsDirPending}
-                >
-                    Launch Directory
-                </Button>
-                <Button
-                    onClick={() => VencordNative.ipc.invoke(IpcEvents.OPEN_MONACO_EDITOR)}
-                    size={Button.Sizes.SMALL}
-                    disabled={settingsDir === "Loading..."}
-                >
-                    Open QuickCSS File
-                </Button>
-            </Flex>}
-
-            {IS_WEB && <Button
-                onClick={() => require("./Monaco").launchMonacoEditor()}
-                size={Button.Sizes.SMALL}
-                disabled={settingsDir === "Loading..."}
-            >
-                Open QuickCSS File
-            </Button>}
-
-            <Forms.FormDivider />
-            <Switch
-                value={settings.useQuickCss}
-                onChange={(v: boolean) => settings.useQuickCss = v}
-                note="Loads styles from your QuickCss file"
-            >
-                Use QuickCss
-            </Switch>
-            {!IS_WEB && <Switch
-                value={settings.enableReactDevtools}
-                onChange={(v: boolean) => settings.enableReactDevtools = v}
-                note="Requires a full restart"
-            >
-                Enable React Developer Tools
-            </Switch>}
-            {!IS_WEB && <Switch
-                value={settings.notifyAboutUpdates}
-                onChange={(v: boolean) => settings.notifyAboutUpdates = v}
-                note="Shows a Toast on StartUp"
-            >
-                Get notified about new Updates
-            </Switch>}
-
-            <Forms.FormDivider />
-            <Forms.FormTitle tag="h5">Settings Sync</Forms.FormTitle>
-            <Flex>
-                <Button
-                    onClick={uploadSettingsBackup}
-                    size={Button.Sizes.SMALL}
-                >
-                    Import Settings
-                </Button>
-                <Button
-                    onClick={downloadSettingsBackup}
-                    size={Button.Sizes.SMALL}
-                >
-                    Export Settings
-                </Button>
-            </Flex>
-        </Forms.FormSection >
-    );
-}, {
-    message: "Failed to render the Settings. If this persists, try using the installer to reinstall!",
-    onError: handleComponentFailed,
-});

src/components/VencordSettings/BackupRestoreTab.tsx

@@ -0,0 +1,69 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Flex } from "@components/Flex";
+import { downloadSettingsBackup, uploadSettingsBackup } from "@utils/settingsSync";
+import { Button, Card, Forms, Margins, Text } from "@webpack/common";
+
+function BackupRestoreTab() {
+    return (
+        <Forms.FormSection title="Settings Sync">
+            <Card style={{
+                backgroundColor: "var(--info-warning-background)",
+                borderColor: "var(--info-warning-foreground)",
+                color: "var(--info-warning-text)",
+                padding: "1em",
+                marginBottom: "0.5em",
+            }}>
+                <Flex flexDirection="column">
+                    <strong>Warning</strong>
+                    <span>Importing a settings file will overwrite your current settings.</span>
+                </Flex>
+            </Card>
+            <Text variant="text-md/normal" className={Margins.marginBottom8}>
+                You can import and export your Vencord settings as a JSON file.
+                This allows you to easily transfer your settings to another device,
+                or recover your settings after reinstalling Vencord or Discord.
+            </Text>
+            <Text variant="text-md/normal" className={Margins.marginBottom8}>
+                Settings Export contains:
+                <ul>
+                    <li>&mdash; Custom QuickCSS</li>
+                    <li>&mdash; Plugin Settings</li>
+                </ul>
+            </Text>
+            <Flex>
+                <Button
+                    onClick={uploadSettingsBackup}
+                    size={Button.Sizes.SMALL}
+                >
+                    Import Settings
+                </Button>
+                <Button
+                    onClick={downloadSettingsBackup}
+                    size={Button.Sizes.SMALL}
+                >
+                    Export Settings
+                </Button>
+            </Flex>
+        </Forms.FormSection>
+    );
+}
+
+export default ErrorBoundary.wrap(BackupRestoreTab);

src/components/VencordSettings/PluginsTab.tsx

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

src/components/VencordSettings/Updater.tsx

@@ -16,16 +16,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import gitHash from "~git-hash";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { ErrorCard } from "@components/ErrorCard";
+import { Flex } from "@components/Flex";
+import { handleComponentFailed } from "@components/handleComponentFailed";
+import { Link } from "@components/Link";
+import { classes, useAwaiter } from "@utils/misc";
+import { changes, checkForUpdates, getRepo, isNewer, rebuild, update, updateError, UpdateLogger } from "@utils/updater";
+import { Alerts, Button, Card, Forms, Margins, Parser, React, Toasts } from "@webpack/common";
 
-import { classes, useAwaiter } from "../utils/misc";
+import gitHash from "~git-hash";
-import { changes, checkForUpdates, getRepo, isNewer, rebuild, update, updateError, UpdateLogger } from "../utils/updater";
-import { Alerts, Button, Card, Forms, Margins, Parser, React, Toasts } from "../webpack/common";
-import ErrorBoundary from "./ErrorBoundary";
-import { ErrorCard } from "./ErrorCard";
-import { Flex } from "./Flex";
-import { handleComponentFailed } from "./handleComponentFailed";
-import { Link } from "./Link";
 
 function withDispatcher(dispatcher: React.Dispatch<React.SetStateAction<boolean>>, action: () => any) {
     return async () => {
@@ -192,7 +192,7 @@ function Updater() {
     };
 
     return (
-        <Forms.FormSection tag="h1" title="Vencord Updater">
+        <Forms.FormSection>
             <Forms.FormTitle tag="h5">Repo</Forms.FormTitle>
 
             <Forms.FormText>{repoPending ? repo : err ? "Failed to retrieve - check console" : (

src/components/VencordSettings/VencordTab.tsx

@@ -0,0 +1,134 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+
+import { useSettings } from "@api/settings";
+import DonateButton from "@components/DonateButton";
+import ErrorBoundary from "@components/ErrorBoundary";
+import IpcEvents from "@utils/IpcEvents";
+import { useAwaiter } from "@utils/misc";
+import { Button, Card, Forms, React, Switch } from "@webpack/common";
+
+const st = (style: string) => `vcSettings${style}`;
+
+function VencordSettings() {
+    const [settingsDir, , settingsDirPending] = useAwaiter(() => VencordNative.ipc.invoke<string>(IpcEvents.GET_SETTINGS_DIR), "Loading...");
+    const settings = useSettings();
+
+    return (
+        <React.Fragment>
+            <DonateCard />
+            <Forms.FormSection title="Quick Actions">
+                <Card className={st("QuickActionCard")}>
+                    {IS_WEB ? (
+                        <Button
+                            onClick={() => require("../Monaco").launchMonacoEditor()}
+                            size={Button.Sizes.SMALL}
+                            disabled={settingsDir === "Loading..."}>
+                            Open QuickCSS File
+                        </Button>
+                    ) : (
+                        <React.Fragment>
+                            <Button
+                                onClick={() => window.DiscordNative.app.relaunch()}
+                                size={Button.Sizes.SMALL}>
+                                Restart Client
+                            </Button>
+                            <Button
+                                onClick={() => VencordNative.ipc.invoke(IpcEvents.OPEN_MONACO_EDITOR)}
+                                size={Button.Sizes.SMALL}
+                                disabled={settingsDir === "Loading..."}>
+                                Open QuickCSS File
+                            </Button>
+                            <Button
+                                onClick={() => window.DiscordNative.fileManager.showItemInFolder(settingsDir)}
+                                size={Button.Sizes.SMALL}
+                                disabled={settingsDirPending}>
+                                Open Settings Folder
+                            </Button>
+                            <Button
+                                onClick={() => VencordNative.ipc.invoke(IpcEvents.OPEN_EXTERNAL, "https://github.com/Vendicated/Vencord")}
+                                size={Button.Sizes.SMALL}
+                                disabled={settingsDirPending}>
+                                Open in GitHub
+                            </Button>
+                        </React.Fragment>
+                    )}
+                </Card>
+            </Forms.FormSection>
+
+            <Forms.FormDivider />
+
+            <Forms.FormSection title="Settings">
+                <Switch
+                    value={settings.useQuickCss}
+                    onChange={(v: boolean) => settings.useQuickCss = v}
+                    note="Loads styles from your QuickCss file">
+                    Use QuickCss
+                </Switch>
+                {!IS_WEB && (
+                    <React.Fragment>
+                        <Switch
+                            value={settings.enableReactDevtools}
+                            onChange={(v: boolean) => settings.enableReactDevtools = v}
+                            note="Requires a full restart">
+                            Enable React Developer Tools
+                        </Switch>
+                        <Switch
+                            value={settings.notifyAboutUpdates}
+                            onChange={(v: boolean) => settings.notifyAboutUpdates = v}
+                            note="Shows a Toast on StartUp">
+                            Get notified about new Updates
+                        </Switch>
+                    </React.Fragment>
+                )}
+
+            </Forms.FormSection>
+        </React.Fragment>
+    );
+}
+
+
+
+function DonateCard() {
+    return (
+        <Card style={{
+            padding: "1em",
+            display: "flex",
+            flexDirection: "row",
+            marginBottom: "1em",
+            marginTop: "1em"
+        }}>
+            <div>
+                <Forms.FormTitle tag="h5">Support the Project</Forms.FormTitle>
+                <Forms.FormText>
+                    Please consider supporting the Development of Vencord by donating!
+                </Forms.FormText>
+                <DonateButton style={{ transform: "translateX(-1em)" }} />
+            </div>
+            <img
+                role="presentation"
+                src="https://cdn.discordapp.com/emojis/1026533090627174460.png"
+                alt=""
+                style={{ marginLeft: "auto", transform: "rotate(10deg)" }}
+            />
+        </Card>
+    );
+}
+
+export default ErrorBoundary.wrap(VencordSettings);

src/components/VencordSettings/index.tsx

@@ -0,0 +1,91 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import ErrorBoundary from "@components/ErrorBoundary";
+import { findByCodeLazy } from "@webpack";
+import { Forms, Router, Text } from "@webpack/common";
+
+import cssText from "~fileContent/settingsStyles.css";
+
+import BackupRestoreTab from "./BackupRestoreTab";
+import PluginsTab from "./PluginsTab";
+import Updater from "./Updater";
+import VencordSettings from "./VencordTab";
+
+const style = document.createElement("style");
+style.textContent = cssText;
+document.head.appendChild(style);
+
+const st = (style: string) => `vcSettings${style}`;
+
+const TabBar = findByCodeLazy('[role="tab"][aria-disabled="false"]');
+
+interface SettingsProps {
+    tab: string;
+}
+
+interface SettingsTab {
+    name: string;
+    component?: React.ComponentType;
+}
+
+const SettingsTabs: Record<string, SettingsTab> = {
+    VencordSettings: { name: "Vencord", component: () => <VencordSettings /> },
+    VencordPlugins: { name: "Plugins", component: () => <PluginsTab /> },
+    VencordThemes: { name: "Themes", component: () => <Text variant="text-md/medium">Coming soon to a Vencord near you!</Text> },
+    VencordUpdater: { name: "Updater" }, // Only show updater if IS_WEB is false
+    VencordSettingsSync: { name: "Backup & Restore", component: () => <BackupRestoreTab /> },
+};
+
+if (!IS_WEB) SettingsTabs.VencordUpdater.component = () => Updater && <Updater />;
+
+function Settings(props: SettingsProps) {
+    const { tab = "VencordSettings" } = props;
+
+    const CurrentTab = SettingsTabs[tab]?.component;
+
+    return <Forms.FormSection>
+        <Text variant="heading-md/normal" tag="h2">Vencord Settings</Text>
+
+        <TabBar
+            type={TabBar.Types.TOP}
+            look={TabBar.Looks.BRAND}
+            className={st("TabBar")}
+            selectedItem={tab}
+            onItemSelect={Router.open}
+        >
+            {Object.entries(SettingsTabs).map(([key, { name, component }]) => {
+                if (!component) return null;
+                return <TabBar.Item
+                    id={key}
+                    className={st("TabBarItem")}
+                    key={key}>
+                    {name}
+                </TabBar.Item>;
+            })}
+        </TabBar>
+        <Forms.FormDivider />
+        {CurrentTab && <CurrentTab />}
+    </Forms.FormSection >;
+}
+
+export default function (props: SettingsProps) {
+    return <ErrorBoundary>
+        <Settings tab={props.tab} />
+    </ErrorBoundary>;
+}

src/components/VencordSettings/settingsStyles.css

@@ -0,0 +1,23 @@
+.vcSettingsTabBar {
+    margin-top: 20px;
+    margin-bottom: -2px;
+    border-bottom: 2px solid var(--background-modifier-accent);
+}
+
+.vcSettingsTabBarItem {
+    margin-right: 32px;
+    padding-bottom: 16px;
+    margin-bottom: -2px;
+}
+
+.vcSettingsQuickActionCard {
+    padding: 1em;
+    display: flex;
+    gap: 1em;
+    align-items: center;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    flex-grow: 1;
+    flex-direction: row;
+    margin-bottom: 1em;
+}

src/components/handleComponentFailed.ts

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { isOutdated, rebuild, update } from "../utils/updater";
+import { isOutdated, rebuild, update } from "@utils/updater";
 
 export async function handleComponentFailed() {
     if (isOutdated) {

src/components/index.ts

@@ -18,5 +18,4 @@
 
 export { default as PatchHelper } from "./PatchHelper";
 export { default as PluginSettings } from "./PluginSettings";
-export { default as Settings } from "./Settings";
+export { default as VencordSettings } from "./VencordSettings";
-export { default as Updater } from "./Updater";

src/debug/Tracer.ts

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import Logger from "../utils/Logger";
+import Logger from "@utils/Logger";
 
 if (IS_DEV) {
     var traces = {} as Record<string, [number, any[]]>;

src/ipcMain/index.ts

@@ -18,6 +18,9 @@
 
 import "./updater";
 
+import { debounce } from "@utils/debounce";
+import IpcEvents from "@utils/IpcEvents";
+import { Queue } from "@utils/Queue";
 import { BrowserWindow, desktopCapturer, ipcMain, shell } from "electron";
 import { mkdirSync, readFileSync, watch } from "fs";
 import { open, readFile, writeFile } from "fs/promises";
@@ -25,9 +28,6 @@ import { join } from "path";
 
 import monacoHtml from "~fileContent/../components/monacoWin.html;base64";
 
-import { debounce } from "../utils/debounce";
-import IpcEvents from "../utils/IpcEvents";
-import { Queue } from "../utils/Queue";
 import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE } from "./constants";
 
 mkdirSync(SETTINGS_DIR, { recursive: true });
@@ -66,14 +66,14 @@ const settingsWriteQueue = new Queue();
 
 ipcMain.handle(IpcEvents.GET_QUICK_CSS, () => readCss());
 ipcMain.handle(IpcEvents.SET_QUICK_CSS, (_, css) =>
-    cssWriteQueue.add(() => writeFile(QUICKCSS_PATH, css))
+    cssWriteQueue.push(() => writeFile(QUICKCSS_PATH, css))
 );
 
 ipcMain.handle(IpcEvents.GET_SETTINGS_DIR, () => SETTINGS_DIR);
 ipcMain.on(IpcEvents.GET_SETTINGS, e => e.returnValue = readSettings());
 
 ipcMain.handle(IpcEvents.SET_SETTINGS, (_, s) => {
-    settingsWriteQueue.add(() => writeFile(SETTINGS_FILE, s));
+    settingsWriteQueue.push(() => writeFile(SETTINGS_FILE, s));
 });
 
 

src/ipcMain/updater/git.ts

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import IpcEvents from "@utils/IpcEvents";
 import { execFile as cpExecFile } from "child_process";
 import { ipcMain } from "electron";
 import { join } from "path";
 import { promisify } from "util";
 
-import IpcEvents from "../../utils/IpcEvents";
 import { calculateHashes, serializeErrors } from "./common";
 
 const VENCORD_SRC_DIR = join(__dirname, "..");

src/ipcMain/updater/http.ts

@@ -16,6 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { VENCORD_USER_AGENT } from "@utils/constants";
+import IpcEvents from "@utils/IpcEvents";
 import { ipcMain } from "electron";
 import { writeFile } from "fs/promises";
 import { join } from "path";
@@ -23,8 +25,6 @@ import { join } from "path";
 import gitHash from "~git-hash";
 import gitRemote from "~git-remote";
 
-import { VENCORD_USER_AGENT } from "../../utils/constants";
-import IpcEvents from "../../utils/IpcEvents";
 import { get } from "../simpleGet";
 import { calculateHashes, serializeErrors } from "./common";
 

src/modules.d.ts

@@ -20,7 +20,7 @@
 /// <reference types="standalone-electron-types"/>
 
 declare module "~plugins" {
-    const plugins: Record<string, import("./utils/types").Plugin>;
+    const plugins: Record<string, import("@utils/types").Plugin>;
     export default plugins;
 }
 

src/patcher.ts

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { onceDefined } from "@utils/onceDefined";
 import electron, { app, BrowserWindowConstructorOptions } from "electron";
 import { readFileSync } from "fs";
 import { dirname, join } from "path";
@@ -23,7 +24,6 @@ import { dirname, join } from "path";
 import { initIpc } from "./ipcMain";
 import { installExt } from "./ipcMain/extensions";
 import { readSettings } from "./ipcMain/index";
-import { onceDefined } from "./utils/onceDefined";
 
 console.log("[Vencord] Starting up...");
 

src/plugins/BetterNotes.ts

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Settings } from "../api/settings";
+import { Settings } from "@api/settings";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import { makeLazy } from "../utils/misc";
+import { makeLazy } from "@utils/misc";
-import definePlugin, { OptionType } from "../utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 
 export default definePlugin({
     name: "BetterNotesBox",

src/plugins/HideAttachments.tsx

@@ -16,14 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { get, set } from "@api/DataStore";
+import { Devs } from "@utils/constants";
+import Logger from "@utils/Logger";
+import definePlugin from "@utils/types";
+import { ChannelStore, FluxDispatcher } from "@webpack/common";
 import { Message } from "discord-types/general";
 
-import { get, set } from "../api/DataStore";
-import { Devs } from "../utils/constants";
-import Logger from "../utils/Logger";
-import definePlugin from "../utils/types";
-import { ChannelStore, FluxDispatcher } from "../webpack/common";
-
 let style: HTMLStyleElement;
 
 const KEY = "HideAttachments_HiddenIds";
@@ -99,7 +98,7 @@ export default definePlugin({
                 icon: isHidden ? ImageVisible : ImageInvisible,
                 message: msg,
                 channel: ChannelStore.getChannel(msg.channel_id),
-                onClick: () => this.toggleHide(msg)
+                onClick: () => this.toggleHide(msg.id)
             });
         } catch (err) {
             new Logger("HideAttachments").error(err);
@@ -107,10 +106,10 @@ export default definePlugin({
         }
     },
 
-    async toggleHide(message: Message) {
+    async toggleHide(id: string) {
         const ids = await getHiddenMessages();
-        if (!ids.delete(message.id))
+        if (!ids.delete(id))
-            ids.add(message.id);
+            ids.add(id);
 
         await saveHiddenMessages(ids);
         await this.buildCss();
@@ -118,7 +117,7 @@ export default definePlugin({
         // update is necessary to rerender the PopOver
         FluxDispatcher.dispatch({
             type: "MESSAGE_UPDATE",
-            message
+            message: { id }
         });
     }
 });

src/plugins/TimeBarAllActivities.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "TimeBarAllActivities",

src/plugins/anonymiseFileNames.ts

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Settings } from "@api/settings";
-import definePlugin, { OptionType } from "../utils/types";
+import { Devs } from "@utils/constants";
-import { Settings } from "../Vencord";
+import definePlugin, { OptionType } from "@utils/types";
 
 enum Methods {
     Random,

src/plugins/apiBadges.tsx

@@ -16,17 +16,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { BadgePosition, ProfileBadge } from "../api/Badges";
+import { BadgePosition, ProfileBadge } from "@api/Badges";
-import DonateButton from "../components/DonateButton";
+import DonateButton from "@components/DonateButton";
-import ErrorBoundary from "../components/ErrorBoundary";
+import ErrorBoundary from "@components/ErrorBoundary";
-import { Flex } from "../components/Flex";
+import { Flex } from "@components/Flex";
-import { Heart } from "../components/Heart";
+import { Heart } from "@components/Heart";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import IpcEvents from "../utils/IpcEvents";
+import IpcEvents from "@utils/IpcEvents";
-import Logger from "../utils/Logger";
+import Logger from "@utils/Logger";
-import { closeModal, Modals, openModal } from "../utils/modal";
+import { closeModal, Modals, openModal } from "@utils/modal";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
-import { Forms, Margins } from "../webpack/common";
+import { Forms, Margins } from "@webpack/common";
 
 const CONTRIBUTOR_BADGE = "https://media.discordapp.net/stickers/1026517526106087454.webp";
 

src/plugins/apiCommands.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "CommandsAPI",

src/plugins/apiMenuItemDeobfuscator.ts

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { migratePluginSettings } from "../api/settings";
+import { migratePluginSettings } from "@api/settings";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 // duplicate values have multiple branches with different types. Just include all to be safe
 const nameMap = {

src/plugins/apiMessageAccessories.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "MessageAccessoriesAPI",

src/plugins/apiMessageEvents.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "MessageEventsAPI",

src/plugins/apiNotices.ts

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { migratePluginSettings } from "../api/settings";
+import { migratePluginSettings } from "@api/settings";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 migratePluginSettings("NoticesAPI", "NoticesApi");
 

src/plugins/apiServerList.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "ServerListAPI",

src/plugins/arRPC.tsx

@@ -16,13 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { popNotice, showNotice } from "../api/Notices";
+import { popNotice, showNotice } from "@api/Notices";
-import { Link } from "../components/Link";
+import { Link } from "@components/Link";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import { lazyWebpack } from "../utils/misc";
+import definePlugin from "@utils/types";
-import definePlugin from "../utils/types";
+import { filters, findByCodeLazy, mapMangledModuleLazy } from "@webpack";
-import { filters, mapMangledModuleLazy } from "../webpack";
+import { FluxDispatcher, Forms, Toasts } from "@webpack/common";
-import { FluxDispatcher, Forms, Toasts } from "../webpack/common";
 
 const assetManager = mapMangledModuleLazy(
     "getAssetImage: size must === [number, number] for Twitch",
@@ -31,7 +30,7 @@ const assetManager = mapMangledModuleLazy(
     }
 );
 
-const rpcManager = lazyWebpack(filters.byCode(".APPLICATION_RPC("));
+const rpcManager = findByCodeLazy(".APPLICATION_RPC(");
 
 async function lookupAsset(applicationId: string, key: string): Promise<string> {
     return (await assetManager.getAsset(applicationId, [key, undefined]))[0];

src/plugins/banger.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "../utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 
 export default definePlugin({
     name: "BANger",

src/plugins/betterGifAltText.ts

@@ -17,8 +17,8 @@
 */
 
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "BetterGifAltText",

src/plugins/betterRoleDot.ts

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { migratePluginSettings, Settings } from "../api/settings";
+import { migratePluginSettings, Settings } from "@api/settings";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "../utils/types";
+import definePlugin, { OptionType } from "@utils/types";
-import { Clipboard, Toasts } from "../webpack/common";
+import { Clipboard, Toasts } from "@webpack/common";
 
 migratePluginSettings("BetterRoleDot", "ClickableRoleDot");
 export default definePlugin({

src/plugins/betterUploadButton.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "BetterUploadButton",

src/plugins/blurNsfw.ts

@@ -0,0 +1,77 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Settings } from "@api/settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+
+let style: HTMLStyleElement;
+
+function setCss() {
+    style.textContent = `
+        .vc-nsfw-img [class^=imageWrapper] img,
+        .vc-nsfw-img [class^=wrapperPaused] video {
+            filter: blur(${Settings.plugins.BlurNSFW.blurAmount}px);
+            transition: filter 0.2s;
+        }
+        .vc-nsfw-img [class^=imageWrapper]:hover img,
+        .vc-nsfw-img [class^=wrapperPaused]:hover video {
+            filter: unset;
+        }
+        `;
+}
+
+export default definePlugin({
+    name: "BlurNSFW",
+    description: "Blur attachments in NSFW channels until hovered",
+    authors: [Devs.Ven],
+
+    patches: [
+        {
+            find: "().embedWrapper,embed",
+            replacement: [{
+                match: /(\.renderEmbed=.+?(.)=.\.props)(.+?\(\)\.embedWrapper)/g,
+                replace: "$1,vcProps=$2$3+(vcProps.channel.nsfw?' vc-nsfw-img':'')"
+            }, {
+                match: /(\.renderAttachments=.+?(.)=this\.props)(.+?\(\)\.embedWrapper)/g,
+                replace: "$1,vcProps=$2$3+(vcProps.channel.nsfw?' vc-nsfw-img':'')"
+            }]
+        }
+    ],
+
+    options: {
+        blurAmount: {
+            type: OptionType.NUMBER,
+            description: "Blur Amount",
+            default: 10,
+            onChange: setCss
+        }
+    },
+
+    start() {
+        style = document.createElement("style");
+        style.id = "VcBlurNsfw";
+        document.head.appendChild(style);
+
+        setCss();
+    },
+
+    stop() {
+        style?.remove();
+    }
+});

src/plugins/callTimer.ts

@@ -1,116 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { Settings } from "../api/settings";
-import { Devs } from "../utils/constants";
-import definePlugin, { OptionType } from "../utils/types";
-import { FluxDispatcher } from "../webpack/common";
-
-export default definePlugin({
-    name: "CallTimer",
-    description: "Adds a timer to vcs",
-    authors: [Devs.Ven],
-
-    style: void 0 as HTMLStyleElement | undefined,
-    startTime: 0,
-    interval: void 0 as NodeJS.Timeout | undefined,
-
-    options: {
-        format: {
-            type: OptionType.SELECT,
-            description: "The timer format. This can be any valid moment.js format",
-            options: [
-                {
-                    label: "30d 23:00:42",
-                    value: "stopwatch",
-                    default: true
-                },
-                {
-                    label: "30d 23h 00m 42s",
-                    value: "human"
-                }
-            ]
-        }
-    },
-
-
-    formatDuration(ms: number) {
-        // here be dragons (moment fucking sucks)
-        const human = Settings.plugins.CallTimer.format === "human";
-
-        const format = (n: number) => human ? n : n.toString().padStart(2, "0");
-        const unit = (s: string) => human ? s : "";
-        const delim = human ? " " : ":";
-
-        // thx copilot
-        const d = Math.floor(ms / 86400000);
-        const h = Math.floor((ms % 86400000) / 3600000);
-        const m = Math.floor(((ms % 86400000) % 3600000) / 60000);
-        const s = Math.floor((((ms % 86400000) % 3600000) % 60000) / 1000);
-
-        let res = "";
-        if (d) res += `${d}d `;
-        if (h || res) res += `${format(h)}${unit("h")}${delim}`;
-        if (m || res || !human) res += `${format(m)}${unit("m")}${delim}`;
-        res += `${format(s)}${unit("s")}`;
-
-        return res;
-    },
-
-    setTimer(ms: number) {
-        if (!this.style) return;
-
-        this.style.textContent = `
-        [class*="connection-"] [class*="channel-"]::after {
-            content: "Connected for ${this.formatDuration(ms)}";
-            display: block;
-        }
-        `;
-    },
-
-    start() {
-        const style = this.style = document.createElement("style");
-        style.id = "VencordCallTimer";
-        document.head.appendChild(style);
-
-        this.setTimer(0);
-
-        this.handleRtcConnectionState = this.handleRtcConnectionState.bind(this);
-        FluxDispatcher.subscribe("RTC_CONNECTION_STATE", this.handleRtcConnectionState);
-    },
-
-    handleRtcConnectionState(e: { state: string; }) {
-        if (e.state === "RTC_CONNECTED" || e.state === "RTC_DISCONNECTED") {
-            clearInterval(this.interval);
-            if (e.state === "RTC_CONNECTED") {
-                this.startTime = Date.now();
-                this.interval = setInterval(
-                    () => this.setTimer(Math.round(Date.now() - this.startTime)),
-                    1000
-                );
-            } else this.startTime = 0;
-            this.setTimer(0);
-        }
-    },
-
-    stop() {
-        FluxDispatcher.unsubscribe("RCT_CONNECTION_STATE", this.handleRtcConnectionState);
-        this.style?.remove();
-        clearInterval(this.interval);
-    }
-});

src/plugins/callTimer.tsx

@@ -0,0 +1,101 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Settings } from "@api/settings";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { React } from "@webpack/common";
+
+function formatDuration(ms: number) {
+    // here be dragons (moment fucking sucks)
+    const human = Settings.plugins.CallTimer.format === "human";
+
+    const format = (n: number) => human ? n : n.toString().padStart(2, "0");
+    const unit = (s: string) => human ? s : "";
+    const delim = human ? " " : ":";
+
+    // thx copilot
+    const d = Math.floor(ms / 86400000);
+    const h = Math.floor((ms % 86400000) / 3600000);
+    const m = Math.floor(((ms % 86400000) % 3600000) / 60000);
+    const s = Math.floor((((ms % 86400000) % 3600000) % 60000) / 1000);
+
+    let res = "";
+    if (d) res += `${d}d `;
+    if (h || res) res += `${format(h)}${unit("h")}${delim}`;
+    if (m || res || !human) res += `${format(m)}${unit("m")}${delim}`;
+    res += `${format(s)}${unit("s")}`;
+
+    return res;
+}
+
+export default definePlugin({
+    name: "CallTimer",
+    description: "Adds a timer to vcs",
+    authors: [Devs.Ven],
+
+    startTime: 0,
+    interval: void 0 as NodeJS.Timeout | undefined,
+
+    options: {
+        format: {
+            type: OptionType.SELECT,
+            description: "The timer format. This can be any valid moment.js format",
+            options: [
+                {
+                    label: "30d 23:00:42",
+                    value: "stopwatch",
+                    default: true
+                },
+                {
+                    label: "30d 23h 00m 42s",
+                    value: "human"
+                }
+            ]
+        }
+    },
+
+    patches: [{
+        find: ".renderConnectionStatus=",
+        replacement: {
+            match: /(?<=renderConnectionStatus=.+\(\)\.channel,children:)\w/,
+            replace: "[$&, Vencord.Plugins.plugins.CallTimer.renderTimer(this.props.channel.id)]"
+        }
+    }],
+    renderTimer(channelId: string) {
+        return <ErrorBoundary noop>
+            <this.Timer channelId={channelId} />
+        </ErrorBoundary>;
+    },
+
+    Timer({ channelId }: { channelId: string; }) {
+        const [time, setTime] = React.useState(0);
+        const startTime = React.useMemo(() => Date.now(), [channelId]);
+
+        React.useEffect(() => {
+            const interval = setInterval(() => setTime(Date.now() - startTime), 1000);
+            return () => {
+                clearInterval(interval);
+                setTime(0);
+            };
+        }, [channelId]);
+
+        return <p style={{ margin: 0 }}>Connected for {formatDuration(time)}</p>;
+    }
+});

src/plugins/clearURLs/index.ts

@@ -22,10 +22,11 @@ import {
     MessageObject,
     removePreEditListener,
     removePreSendListener
-} from "../../api/MessageEvents";
+} from "@api/MessageEvents";
-import { migratePluginSettings } from "../../api/settings";
+import { migratePluginSettings } from "@api/settings";
-import { Devs } from "../../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../../utils/types";
+import definePlugin from "@utils/types";
+
 import { defaultRules } from "./defaultRules";
 
 // From lodash

src/plugins/consoleShortcuts.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 const WEB_ONLY = (f: string) => () => {
     throw new Error(`'${f}' is Discord Desktop only.`);

src/plugins/corruptMp4s.ts

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { ApplicationCommandOptionType, sendBotMessage } from "../api/Commands";
+import { ApplicationCommandOptionType, sendBotMessage } from "@api/Commands";
-import { findOption } from "../api/Commands/commandHelpers";
+import { findOption } from "@api/Commands/commandHelpers";
-import { ApplicationCommandInputType } from "../api/Commands/types";
+import { ApplicationCommandInputType } from "@api/Commands/types";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
-import { findByCode, findByProps } from "../webpack";
+import { findByCode, findByProps } from "@webpack";
 
 const DRAFT_TYPE = 0;
 

src/plugins/dictionary.ts

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { ApplicationCommandOptionType, sendBotMessage } from "../api/Commands";
+import { ApplicationCommandOptionType, sendBotMessage } from "@api/Commands";
-import { ApplicationCommandInputType } from "../api/Commands/types";
+import { ApplicationCommandInputType } from "@api/Commands/types";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "UrbanDictionary",

src/plugins/emoteCloner.tsx

@@ -16,20 +16,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { migratePluginSettings, Settings } from "../api/settings";
+import { migratePluginSettings, Settings } from "@api/settings";
-import { CheckedTextInput } from "../components/CheckedTextInput";
+import { CheckedTextInput } from "@components/CheckedTextInput";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import Logger from "../utils/Logger";
+import Logger from "@utils/Logger";
-import { lazyWebpack, makeLazy } from "../utils/misc";
+import { makeLazy } from "@utils/misc";
-import { ModalContent, ModalHeader, ModalRoot, openModal } from "../utils/modal";
+import { ModalContent, ModalHeader, ModalRoot, openModal } from "@utils/modal";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
-import { filters } from "../webpack";
+import { findByCodeLazy, findByPropsLazy } from "@webpack";
-import { Forms, GuildStore, Margins, Menu, PermissionStore, React, Toasts, Tooltip, UserStore } from "../webpack/common";
+import { Forms, GuildStore, Margins, Menu, PermissionStore, React, Toasts, Tooltip, UserStore } from "@webpack/common";
 
 const MANAGE_EMOJIS_AND_STICKERS = 1n << 30n;
 
-const GuildEmojiStore = lazyWebpack(filters.byProps("getGuilds", "getGuildEmoji"));
+const GuildEmojiStore = findByPropsLazy("getGuilds", "getGuildEmoji");
-const uploadEmoji = lazyWebpack(filters.byCode('"EMOJI_UPLOAD_START"', "GUILD_EMOJIS("));
+const uploadEmoji = findByCodeLazy('"EMOJI_UPLOAD_START"', "GUILD_EMOJIS(");
 
 function getGuildCandidates(isAnimated: boolean) {
     const meId = UserStore.getCurrentUser().id;

src/plugins/experiments.tsx

@@ -16,14 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Settings } from "@api/settings";
-import { lazyWebpack } from "../utils/misc";
+import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "../utils/types";
+import definePlugin, { OptionType } from "@utils/types";
-import { Settings } from "../Vencord";
+import { findByPropsLazy } from "@webpack";
-import { filters } from "../webpack";
+import { Forms, React } from "@webpack/common";
-import { Forms, React } from "../webpack/common";
 
-const KbdStyles = lazyWebpack(filters.byProps("key", "removeBuildOverride"));
+const KbdStyles = findByPropsLazy("key", "removeBuildOverride");
 
 export default definePlugin({
     name: "Experiments",

src/plugins/fakeNitro.ts

@@ -16,18 +16,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addPreEditListener, addPreSendListener, removePreEditListener, removePreSendListener } from "../api/MessageEvents";
+import { addPreEditListener, addPreSendListener, removePreEditListener, removePreSendListener } from "@api/MessageEvents";
-import { migratePluginSettings } from "../api/settings";
+import { migratePluginSettings, Settings } from "@api/settings";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import { ApngDisposeOp, getGifEncoder, importApngJs } from "../utils/dependencies";
+import { ApngDisposeOp, getGifEncoder, importApngJs } from "@utils/dependencies";
-import { lazyWebpack } from "../utils/misc";
+import definePlugin, { OptionType } from "@utils/types";
-import definePlugin, { OptionType } from "../utils/types";
+import { findByCodeLazy, findByPropsLazy } from "@webpack";
-import { Settings } from "../Vencord";
+import { ChannelStore, UserStore } from "@webpack/common";
-import { filters } from "../webpack";
-import { ChannelStore, UserStore } from "../webpack/common";
 
 const DRAFT_TYPE = 0;
-const promptToUpload = lazyWebpack(filters.byCode("UPLOAD_FILE_LIMIT_ERROR"));
+const promptToUpload = findByCodeLazy("UPLOAD_FILE_LIMIT_ERROR");
 
 interface BaseSticker {
     available: boolean;
@@ -225,8 +223,8 @@ export default definePlugin({
             return;
         }
 
-        const EmojiStore = lazyWebpack(filters.byProps("getCustomEmojiById"));
+        const EmojiStore = findByPropsLazy("getCustomEmojiById");
-        const StickerStore = lazyWebpack(filters.byProps("getAllGuildStickers")) as {
+        const StickerStore = findByPropsLazy("getAllGuildStickers") as {
             getPremiumPacks(): StickerPack[];
             getAllGuildStickers(): Map<string, Sticker[]>;
             getStickerById(id: string): Sticker | undefined;

src/plugins/fart.ts

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { ApplicationCommandOptionType } from "../api/Commands";
+import { ApplicationCommandOptionType } from "@api/Commands";
-import { makeRange } from "../components/PluginSettings/components";
+import { Settings } from "@api/settings";
-import { Devs } from "../utils/constants";
+import { makeRange } from "@components/PluginSettings/components";
-import definePlugin, { OptionType } from "../utils/types";
+import { Devs } from "@utils/constants";
-import { Settings } from "../Vencord";
+import definePlugin, { OptionType } from "@utils/types";
 
 export default definePlugin({
     name: "Fart2",

src/plugins/forceOwnerCrown.ts

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
-import { waitFor } from "../webpack";
+import { waitFor } from "@webpack";
 
 let GuildStore;
 waitFor(["getGuild"], m => GuildStore = m);

src/plugins/friendInvites.ts

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { ApplicationCommandInputType, sendBotMessage } from "../api/Commands";
+import { ApplicationCommandInputType, sendBotMessage } from "@api/Commands";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
-import { findByProps } from "../webpack";
+import { findByProps } from "@webpack";
 
 export default definePlugin({
     name: "FriendInvites",

src/plugins/fxTwitter.ts

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addPreSendListener, MessageObject, removePreSendListener } from "../api/MessageEvents";
+import { addPreSendListener, MessageObject, removePreSendListener } from "@api/MessageEvents";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 const re = /https?:\/\/twitter\.com(?=\/\w+?\/status\/)/g;
 

src/plugins/iLoveSpam.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "iLoveSpam",

src/plugins/ignoreActivities.ts

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { DataStore } from "../api";
+import * as DataStore from "@api/DataStore";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import { lazyWebpack } from "../utils/misc";
+import definePlugin from "@utils/types";
-import definePlugin from "../utils/types";
+import { findByPropsLazy } from "@webpack";
-import { filters } from "../webpack";
 
 interface MatchAndReplace {
     match: RegExp;
@@ -28,7 +27,7 @@ interface MatchAndReplace {
 }
 
 /** Used to re-render the Registered Games tab to update how our button looks like */
-const RunningGameStoreModule = lazyWebpack(filters.byProps("IgnoreActivities_reRenderGames"));
+const RunningGameStoreModule = findByPropsLazy("IgnoreActivities_reRenderGames");
 
 let ignoredActivitiesCache: string[] = [];
 

src/plugins/index.ts

@@ -16,13 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { registerCommand, unregisterCommand } from "@api/Commands";
+import { Settings } from "@api/settings";
+import Logger from "@utils/Logger";
+import { Patch, Plugin } from "@utils/types";
+
 import Plugins from "~plugins";
 
-import { registerCommand, unregisterCommand } from "../api/Commands";
-import { Settings } from "../api/settings";
 import { traceFunction } from "../debug/Tracer";
-import Logger from "../utils/Logger";
-import { Patch, Plugin } from "../utils/types";
 
 const logger = new Logger("PluginManager", "#a6d189");
 

src/plugins/keepCurrentChannel.ts

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { DataStore } from "../api";
+import * as DataStore from "@api/DataStore";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
-import { ChannelStore, FluxDispatcher, NavigationRouter, SelectedChannelStore, SelectedGuildStore } from "../webpack/common";
+import { ChannelStore, FluxDispatcher, NavigationRouter, SelectedChannelStore, SelectedGuildStore } from "@webpack/common";
 
 export interface LogoutEvent {
     type: "LOGOUT";

src/plugins/lastfm.tsx

@@ -16,43 +16,43 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Link } from "../components/Link";
+import { Settings } from "@api/settings";
-import { Devs } from "../utils/constants";
+import { Link } from "@components/Link";
-import { lazyWebpack } from "../utils/misc";
+import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "../utils/types";
+import definePlugin, { OptionType } from "@utils/types";
-import { Settings, Webpack } from "../Vencord";
+import { filters, findByPropsLazy, mapMangledModuleLazy } from "@webpack";
-import { FluxDispatcher, Forms } from "../webpack/common";
+import { FluxDispatcher, Forms } from "@webpack/common";
 
 interface ActivityAssets {
-    large_image?: string
+    large_image?: string;
-    large_text?: string
+    large_text?: string;
-    small_image?: string
+    small_image?: string;
-    small_text?: string
+    small_text?: string;
 }
 
 interface Activity {
-    state: string
+    state: string;
-    details?: string
+    details?: string;
     timestamps?: {
-        start?: Number
+        start?: Number;
-    }
+    };
-    assets?: ActivityAssets
+    assets?: ActivityAssets;
-    buttons?: Array<string>
+    buttons?: Array<string>;
-    name: string
+    name: string;
-    application_id: string
+    application_id: string;
     metadata?: {
-        button_urls?: Array<string>
+        button_urls?: Array<string>;
-    }
+    };
-    type: Number
+    type: Number;
-    flags: Number
+    flags: Number;
 }
 
 interface TrackData {
-    name: string
+    name: string;
-    album: string
+    album: string;
-    artist: string
+    artist: string;
-    url: string
+    url: string;
-    imageUrl?: string
+    imageUrl?: string;
 }
 
 // only relevant enum values
@@ -67,11 +67,11 @@ enum ActivityFlag {
 
 const applicationId = "1043533871037284423";
 
-const presenceStore = lazyWebpack(Webpack.filters.byProps("getLocalPresence"));
+const presenceStore = findByPropsLazy("getLocalPresence");
-const assetManager = Webpack.mapMangledModuleLazy(
+const assetManager = mapMangledModuleLazy(
     "getAssetImage: size must === [number, number] for Twitch",
     {
-        getAsset: Webpack.filters.byCode("apply("),
+        getAsset: filters.byCode("apply("),
     }
 );
 
@@ -196,9 +196,9 @@ export default definePlugin({
             state: hideAlbumName ? trackData.artist : `${trackData.artist} - ${trackData.album}`,
             assets,
 
-            buttons: [ "Open in Last.fm" ],
+            buttons: ["Open in Last.fm"],
             metadata: {
-                button_urls: [ trackData.url ]
+                button_urls: [trackData.url]
             },
 
             type: this.settings.useListeningStatus ? ActivityType.LISTENING : ActivityType.PLAYING,

src/plugins/loadingQuotes.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 // These are Xor encrypted to prevent you from spoiling yourself when you read the source code.
 // don't worry about it :P

src/plugins/messageActions.ts

@@ -16,13 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addClickListener, removeClickListener } from "../api/MessageEvents";
+import { addClickListener, removeClickListener } from "@api/MessageEvents";
-import { migratePluginSettings } from "../api/settings";
+import { migratePluginSettings } from "@api/settings";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import { lazyWebpack } from "../utils/misc";
+import definePlugin from "@utils/types";
-import definePlugin from "../utils/types";
+import { findByPropsLazy, findLazy } from "@webpack";
-import { filters } from "../webpack";
+import { UserStore } from "@webpack/common";
-import { UserStore } from "../webpack/common";
 
 let isDeletePressed = false;
 const keydown = (e: KeyboardEvent) => e.key === "Backspace" && (isDeletePressed = true);
@@ -37,10 +36,10 @@ export default definePlugin({
     dependencies: ["MessageEventsAPI"],
 
     start() {
-        const MessageActions = lazyWebpack(filters.byProps("deleteMessage", "startEditMessage"));
+        const MessageActions = findByPropsLazy("deleteMessage", "startEditMessage");
-        const PermissionStore = lazyWebpack(filters.byProps("can", "initialize"));
+        const PermissionStore = findByPropsLazy("can", "initialize");
-        const Permissions = lazyWebpack(m => typeof m.MANAGE_MESSAGES === "bigint");
+        const Permissions = findLazy(m => typeof m.MANAGE_MESSAGES === "bigint");
-        const EditStore = lazyWebpack(filters.byProps("isEditing", "isEditingAny"));
+        const EditStore = findByPropsLazy("isEditing", "isEditingAny");
 
         document.addEventListener("keydown", keydown);
         document.addEventListener("keyup", keyup);

src/plugins/messageLogger/index.tsx

@@ -16,14 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Settings } from "../../api/settings";
+import { Settings } from "@api/settings";
-import ErrorBoundary from "../../components/ErrorBoundary";
+import ErrorBoundary from "@components/ErrorBoundary";
-import { Devs } from "../../utils/constants";
+import { Devs } from "@utils/constants";
-import Logger from "../../utils/Logger";
+import Logger from "@utils/Logger";
-import { lazyWebpack } from "../../utils/misc";
+import definePlugin, { OptionType } from "@utils/types";
-import definePlugin, { OptionType } from "../../utils/types";
+import { findByPropsLazy } from "@webpack";
-import { filters } from "../../webpack";
+import { Parser, UserStore } from "@webpack/common";
-import { Parser, UserStore } from "../../webpack/common";
 
 function addDeleteStyleClass() {
     if (Settings.plugins.MessageLogger.deleteStyle === "text") {
@@ -74,8 +73,8 @@ export default definePlugin({
     `,
 
     start() {
-        this.moment = lazyWebpack(filters.byProps("relativeTimeRounding", "relativeTimeThreshold"));
+        this.moment = findByPropsLazy("relativeTimeRounding", "relativeTimeThreshold");
-        this.timestampModule = lazyWebpack(filters.byProps("messageLogger_TimestampComponent"));
+        this.timestampModule = findByPropsLazy("messageLogger_TimestampComponent");
 
         const style = this.style = document.createElement("style");
         style.textContent = this.css;

src/plugins/messageTags.ts

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { DataStore } from "../api";
+import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, registerCommand, sendBotMessage, unregisterCommand } from "@api/Commands";
-import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, registerCommand, sendBotMessage, unregisterCommand } from "../api/Commands";
+import * as DataStore from "@api/DataStore";
-import { Settings } from "../api/settings";
+import { Settings } from "@api/settings";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "../utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 
 const EMOTE = "<:luna:1035316192220553236>";
 const DATA_KEY = "MessageTags_TAGS";

src/plugins/moreCommands.ts

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { ApplicationCommandInputType, findOption, OptionalMessageOption, RequiredMessageOption, sendBotMessage } from "../api/Commands";
+import { ApplicationCommandInputType, findOption, OptionalMessageOption, RequiredMessageOption, sendBotMessage } from "@api/Commands";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 
 function mock(input: string): string {

src/plugins/moreKaomoji.ts

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { findOption, OptionalMessageOption } from "../api/Commands";
+import { findOption, OptionalMessageOption } from "@api/Commands";
-import { migratePluginSettings } from "../api/settings";
+import { migratePluginSettings } from "@api/settings";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 migratePluginSettings("MoreKaomoji", "moarKaomojis");
 export default definePlugin({

src/plugins/moyai.ts

@@ -16,15 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { Settings } from "@api/settings";
+import { makeRange } from "@components/PluginSettings/components/SettingSliderComponent";
+import { Devs } from "@utils/constants";
+import { sleep } from "@utils/misc";
+import definePlugin, { OptionType } from "@utils/types";
+import { FluxDispatcher, SelectedChannelStore, UserStore } from "@webpack/common";
 import { Message, ReactionEmoji } from "discord-types/general";
 
-import { makeRange } from "../components/PluginSettings/components/SettingSliderComponent";
-import { Devs } from "../utils/constants";
-import { sleep } from "../utils/misc";
-import definePlugin, { OptionType } from "../utils/types";
-import { Settings } from "../Vencord";
-import { FluxDispatcher, SelectedChannelStore, UserStore } from "../webpack/common";
-
 interface IMessageCreate {
     type: "MESSAGE_CREATE";
     optimistic: boolean;

src/plugins/muteNewGuild.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "MuteNewGuild",

src/plugins/noBlockedMessages.ts

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Settings } from "@api/settings";
-import { lazyWebpack } from "../utils/misc";
+import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "../utils/types";
+import definePlugin, { OptionType } from "@utils/types";
-import { Settings } from "../Vencord";
+import { findByPropsLazy } from "@webpack";
-import { filters } from "../webpack";
+
-const RelationshipStore = lazyWebpack(filters.byProps("getRelationships", "isBlocked"));
+const RelationshipStore = findByPropsLazy("getRelationships", "isBlocked");
 
 export default definePlugin({
     name: "NoBlockedMessages",

src/plugins/noCanaryMessageLinks.ts

@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addPreSendListener, MessageObject, removePreSendListener } from "../api/MessageEvents";
+import { addPreSendListener, MessageObject, removePreSendListener } from "@api/MessageEvents";
-import { Devs } from "../utils/constants";
+import { Settings } from "@api/settings";
-import definePlugin, { OptionType } from "../utils/types";
+import { Devs } from "@utils/constants";
-import { Settings } from "../Vencord";
+import definePlugin, { OptionType } from "@utils/types";
 
 export default definePlugin({
     name: "NoCanaryMessageLinks",

src/plugins/noDevtoolsWarning.ts

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { migratePluginSettings } from "../api/settings";
+import { migratePluginSettings } from "@api/settings";
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 migratePluginSettings("NoDevtoolsWarning", "STFU");
 

src/plugins/noF1.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "No F1",

src/plugins/noRPC.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "No RPC",

src/plugins/noReplyMention.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "NoReplyMention",

src/plugins/noSystemBadge.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "NoSystemBadge",

src/plugins/noTrack.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "NoTrack",

src/plugins/noUnblockToJump.ts

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "../utils/constants";
+import { Devs } from "@utils/constants";
-import definePlugin from "../utils/types";
+import definePlugin from "@utils/types";
 
 
 export default definePlugin({