From c25c95eecd1dcda62db73169877d84e9f12b38d5 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 21 Oct 2023 12:00:09 -0300
Subject: [PATCH 001/632] Fix IgnoreActivities making reporter angry

---
 src/plugins/ignoreActivities/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/ignoreActivities/index.tsx b/src/plugins/ignoreActivities/index.tsx
index e2888dd1e..18dd7993e 100644
--- a/src/plugins/ignoreActivities/index.tsx
+++ b/src/plugins/ignoreActivities/index.tsx
@@ -106,7 +106,7 @@ export default definePlugin({
             }
         },
         {
-            find: ".Messages.EMBEDDED_ACTIVITIES_HAVE_PLAYED_ONE_KNOWN",
+            find: ".Messages.EMBEDDED_ACTIVITIES_DEVELOPER_SHELF_SUBTITLE",
             replacement: [
                 {
                     match: /(?<=\(\)\.activityTitleText.+?children:(\i)\.name.*?}\),)/,

From b2a1410a96c8cfa21c86383415098eec6d5c765e Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 21 Oct 2023 12:03:54 -0300
Subject: [PATCH 002/632] Remove useless Experiments patch

---
 src/plugins/experiments/index.tsx | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx
index cf5f4e6fd..149c436c2 100644
--- a/src/plugins/experiments/index.tsx
+++ b/src/plugins/experiments/index.tsx
@@ -77,15 +77,6 @@ export default definePlugin({
                 }
             ]
         },
-        // Fix search history being disabled / broken with isStaff
-        {
-            find: 'get("disable_new_search")',
-            predicate: () => settings.store.enableIsStaff,
-            replacement: {
-                match: /(?<=showNewSearch"\);return)\s?!/,
-                replace: "!1&&!"
-            }
-        },
         {
             find: 'H1,title:"Experiments"',
             replacement: {

From 6c1b8b0d8a2c30ea28ddaea79d133b5c763369a4 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 21 Oct 2023 12:04:22 -0300
Subject: [PATCH 003/632] Fix MessageDecorationsAPI

---
 src/plugins/_api/messageDecorations.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/_api/messageDecorations.ts b/src/plugins/_api/messageDecorations.ts
index a3b251830..39f77e544 100644
--- a/src/plugins/_api/messageDecorations.ts
+++ b/src/plugins/_api/messageDecorations.ts
@@ -27,7 +27,7 @@ export default definePlugin({
         {
             find: ".withMentionPrefix",
             replacement: {
-                match: /(.roleDot.{10,50}{children:.{1,2})}\)/,
+                match: /(currentUserIsPremium:.{10,50}{children:.{1,2})}\)/,
                 replace: "$1.concat(Vencord.Api.MessageDecorations.__addDecorationsToMessage(arguments[0]))})"
             }
         }

From 5a0b2ee3f50c1d14bb7bd6af20d8fdd5532cac71 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 21 Oct 2023 12:04:32 -0300
Subject: [PATCH 004/632] Fix FakeNitro patch

---
 src/plugins/fakeNitro/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index a11a43de0..a6ddb4723 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -295,7 +295,7 @@ export default definePlugin({
                 },
                 {
                     predicate: () => settings.store.transformStickers,
-                    match: /renderAttachments=function\(\i\){var (\i)=\i.attachments.+?;/,
+                    match: /renderAttachments=function\(\i\){var \i=this,(\i)=\i.attachments.+?;/,
                     replace: (m, attachments) => `${m}${attachments}=$self.filterAttachments(${attachments});`
                 }
             ]

From fe60a72b804fd8a609c36fc568bd81143dac2b19 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 21 Oct 2023 12:13:49 -0300
Subject: [PATCH 005/632] Fix NoPendingCount patch

---
 src/plugins/noPendingCount/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/noPendingCount/index.ts b/src/plugins/noPendingCount/index.ts
index 2ce375e00..21bd196a6 100644
--- a/src/plugins/noPendingCount/index.ts
+++ b/src/plugins/noPendingCount/index.ts
@@ -84,8 +84,8 @@ export default definePlugin({
             find: "showProgressBadge:",
             predicate: () => settings.store.hidePremiumOffersCount,
             replacement: {
-                match: /\(function\(\){return \i\.\i\.getUnacknowledgedOffers\(\i\)\.length}\)/,
-                replace: "(function(){return 0})"
+                match: /=\i\.unviewedTrialCount\+\i\.unviewedDiscountCount/,
+                replace: "=0"
             }
         }
     ],

From ae1dc4eab0b668318d3a1d274178c52f62a8e46d Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 21 Oct 2023 12:51:07 -0300
Subject: [PATCH 006/632] Make reporter ignore useless Discord errors (#1829)

---
 scripts/generateReport.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 68e3c8081..180212126 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -61,6 +61,13 @@ const report = {
     otherErrors: [] as string[]
 };
 
+const IGNORED_DISCORD_ERRORS = [
+    "KeybindStore: Looking for callback action",
+    "Unable to process domain list delta: Client revision number is null",
+    "Downloading the full bad domains file",
+    /\[GatewaySocket\].{0,110}Cannot access '/
+] as Array<string | RegExp>;
+
 function toCodeBlock(s: string) {
     s = s.replace(/```/g, "`\u200B`\u200B`");
     return "```" + s + " ```";
@@ -86,6 +93,8 @@ async function printReport() {
         console.log(`  - Error: ${toCodeBlock(p.error)}`);
     });
 
+    report.otherErrors = report.otherErrors.filter(e => !IGNORED_DISCORD_ERRORS.some(regex => e.match(regex)));
+
     console.log("## Discord Errors");
     report.otherErrors.forEach(e => {
         console.log(`- ${toCodeBlock(e)}`);

From f659c46031c05f8255a2849cf99b43038650257a Mon Sep 17 00:00:00 2001
From: zImPatrick <23613354+zImPatrick@users.noreply.github.com>
Date: Sat, 21 Oct 2023 17:53:00 +0200
Subject: [PATCH 007/632] FakeNitro: Add app icon customization (#1822)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/fakeNitro/index.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index a6ddb4723..677286e72 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -329,6 +329,20 @@ export default definePlugin({
                 match: /(?<=\.Messages\.EMOJI_POPOUT_ADDED_PACK_DESCRIPTION.+?return ).{0,1200}\.Messages\.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION.+?(?=}\()/,
                 replace: reactNode => `$self.addFakeNotice(${FakeNoticeType.Emoji},${reactNode},!!arguments[0]?.fakeNitroNode?.fake)`
             }
+        },
+        {
+            find: "canUsePremiumAppIcons:function",
+            replacement: {
+                match: /canUsePremiumAppIcons:function\(\i\){/,
+                replace: "$&return true;"
+            }
+        },
+        {
+            find: "location:\"AppIconHome\"",
+            replacement: {
+                match: /\i\.\i\.isPremium\(\i\.\i\.getCurrentUser\(\)\)/,
+                replace: "true"
+            }
         }
     ],
 

From fada76ec81d8d18bc4d1a92c09078bee42305cb8 Mon Sep 17 00:00:00 2001
From: Macintosh II <95250141+mctaylors@users.noreply.github.com>
Date: Sat, 21 Oct 2023 19:41:56 +0300
Subject: [PATCH 008/632] PlatformIndicators: make size same as other
 memberlist icons (#1789)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/platformIndicators/index.tsx | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/plugins/platformIndicators/index.tsx b/src/plugins/platformIndicators/index.tsx
index 6a7a8be74..7233cd13d 100644
--- a/src/plugins/platformIndicators/index.tsx
+++ b/src/plugins/platformIndicators/index.tsx
@@ -30,13 +30,13 @@ import { User } from "discord-types/general";
 const SessionsStore = findStoreLazy("SessionsStore");
 
 function Icon(path: string, opts?: { viewBox?: string; width?: number; height?: number; }) {
-    return ({ color, tooltip }: { color: string; tooltip: string; }) => (
+    return ({ color, tooltip, small }: { color: string; tooltip: string; small: boolean; }) => (
         <Tooltip text={tooltip} >
             {(tooltipProps: any) => (
                 <svg
                     {...tooltipProps}
-                    height={opts?.height ?? 20}
-                    width={opts?.width ?? 20}
+                    height={(opts?.height ?? 20) - (small ? 3 : 0)}
+                    width={(opts?.width ?? 20) - (small ? 3 : 0)}
                     viewBox={opts?.viewBox ?? "0 0 24 24"}
                     fill={color}
                 >
@@ -57,16 +57,16 @@ type Platform = keyof typeof Icons;
 
 const getStatusColor = findByCodeLazy(".TWITCH", ".STREAMING", ".INVISIBLE");
 
-const PlatformIcon = ({ platform, status }: { platform: Platform, status: string; }) => {
+const PlatformIcon = ({ platform, status, small }: { platform: Platform, status: string; small: boolean; }) => {
     const tooltip = platform[0].toUpperCase() + platform.slice(1);
     const Icon = Icons[platform] ?? Icons.desktop;
 
-    return <Icon color={`var(--${getStatusColor(status)}`} tooltip={tooltip} />;
+    return <Icon color={`var(--${getStatusColor(status)}`} tooltip={tooltip} small={small} />;
 };
 
 const getStatus = (id: string): Record<Platform, string> => PresenceStore.getState()?.clientStatuses?.[id];
 
-const PlatformIndicator = ({ user, wantMargin = true, wantTopMargin = false }: { user: User; wantMargin?: boolean; wantTopMargin?: boolean; }) => {
+const PlatformIndicator = ({ user, wantMargin = true, wantTopMargin = false, small = false }: { user: User; wantMargin?: boolean; wantTopMargin?: boolean; small?: boolean; }) => {
     if (!user || user.bot) return null;
 
     if (user.id === UserStore.getCurrentUser().id) {
@@ -99,6 +99,7 @@ const PlatformIndicator = ({ user, wantMargin = true, wantTopMargin = false }: {
             key={platform}
             platform={platform as Platform}
             status={status}
+            small={small}
         />
     ));
 
@@ -137,7 +138,7 @@ const indicatorLocations = {
         description: "In the member list",
         onEnable: () => addDecorator("platform-indicator", props =>
             <ErrorBoundary noop>
-                <PlatformIndicator user={props.user} />
+                <PlatformIndicator user={props.user} small={true} />
             </ErrorBoundary>
         ),
         onDisable: () => removeDecorator("platform-indicator")

From e4485165d0a7c5781b4078cf52a5e32213c6a854 Mon Sep 17 00:00:00 2001
From: Dea <deatea@riseup.net>
Date: Sat, 21 Oct 2023 16:42:37 +0000
Subject: [PATCH 009/632] onePingPerDM: add settings (#1802)

Co-authored-by: V <vendicated@riseup.net>
Co-authored-by: Dea <dea-banana@riseup.net>
---
 src/plugins/onePingPerDM/index.ts | 40 +++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/plugins/onePingPerDM/index.ts b/src/plugins/onePingPerDM/index.ts
index 47502ebe8..e69620ae7 100644
--- a/src/plugins/onePingPerDM/index.ts
+++ b/src/plugins/onePingPerDM/index.ts
@@ -4,20 +4,44 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-import { ChannelStore, ReadStateStore } from "@webpack/common";
-import { Message } from "discord-types/general";
+import definePlugin, { OptionType } from "@utils/types";
+import { ChannelStore, ReadStateStore, UserStore } from "@webpack/common";
+import { MessageJSON } from "discord-types/general";
 
 const enum ChannelType {
     DM = 1,
     GROUP_DM = 3
 }
 
+const settings = definePluginSettings({
+    channelToAffect: {
+        type: OptionType.SELECT,
+        description: "Select the type of DM for the plugin to affect",
+        options: [
+            { label: "Both", value: "both_dms", default: true },
+            { label: "User DMs", value: "user_dm" },
+            { label: "Group DMs", value: "group_dm" },
+        ]
+    },
+    allowMentions: {
+        type: OptionType.BOOLEAN,
+        description: "Receive audio pings for @mentions",
+        default: false,
+    },
+    allowEveryone: {
+        type: OptionType.BOOLEAN,
+        description: "Receive audio pings for @everyone and @here in group DMs",
+        default: false,
+    },
+});
+
 export default definePlugin({
     name: "OnePingPerDM",
     description: "If unread messages are sent by a user in DMs multiple times, you'll only receive one audio ping. Read the messages to reset the limit",
     authors: [Devs.ProffDea],
+    settings,
     patches: [{
         find: ".getDesktopType()===",
         replacement: [{
@@ -29,11 +53,19 @@ export default definePlugin({
             replace: "sound:!$self.isPrivateChannelRead(arguments[0]?.message)?undefined:$1"
         }]
     }],
-    isPrivateChannelRead(message: Message) {
+    isPrivateChannelRead(message: MessageJSON) {
         const channelType = ChannelStore.getChannel(message.channel_id)?.type;
         if (channelType !== ChannelType.DM && channelType !== ChannelType.GROUP_DM) {
             return false;
         }
+        if (
+            (channelType === ChannelType.DM && settings.store.channelToAffect === "group_dm") ||
+            (channelType === ChannelType.GROUP_DM && settings.store.channelToAffect === "user_dm") ||
+            (settings.store.allowMentions && message.mentions.some(m => m.id === UserStore.getCurrentUser().id)) ||
+            (settings.store.allowEveryone && message.mention_everyone)
+        ) {
+            return true;
+        }
         return ReadStateStore.getOldestUnreadMessageId(message.channel_id) === message.id;
     },
 });

From 544edce9f9da6263a20a293e6b4d0a60e5657253 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 21 Oct 2023 19:26:29 +0200
Subject: [PATCH 010/632] bump to v1.5.8

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7a3ba0e25..9ab6b2233 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.5.7",
+    "version": "1.5.8",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 4a2def03e764138c46607ad2981f9d539df19465 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Mon, 23 Oct 2023 22:42:23 -0300
Subject: [PATCH 011/632] Fix MessageDecorationsAPI patch

---
 src/plugins/_api/messageDecorations.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/_api/messageDecorations.ts b/src/plugins/_api/messageDecorations.ts
index 39f77e544..3c235d768 100644
--- a/src/plugins/_api/messageDecorations.ts
+++ b/src/plugins/_api/messageDecorations.ts
@@ -27,8 +27,8 @@ export default definePlugin({
         {
             find: ".withMentionPrefix",
             replacement: {
-                match: /(currentUserIsPremium:.{10,50}{children:.{1,2})}\)/,
-                replace: "$1.concat(Vencord.Api.MessageDecorations.__addDecorationsToMessage(arguments[0]))})"
+                match: /currentUserIsPremium:.{0,70}{children:\i(?=}\))/,
+                replace: "$&.concat(Vencord.Api.MessageDecorations.__addDecorationsToMessage(arguments[0]))"
             }
         }
     ],

From 1a1d9b07e8fc5976989437caa1407b41eb96d3e9 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 00:17:11 +0200
Subject: [PATCH 012/632] Fix canary crashing (#1833)

---
 src/plugins/_core/settings.tsx                | 22 +++++-----
 src/plugins/messageLogger/index.tsx           |  2 +-
 .../components/PronounsChatComponent.tsx      | 13 +++---
 src/plugins/pronoundb/index.ts                |  4 +-
 src/utils/modal.tsx                           |  9 +---
 src/webpack/common/stores.ts                  | 12 +++++-
 src/webpack/common/utils.ts                   | 12 +++++-
 src/webpack/patchWebpack.ts                   |  6 +--
 src/webpack/webpack.ts                        | 43 ++++++++++++++++++-
 9 files changed, 87 insertions(+), 36 deletions(-)

diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index f7fcdd0aa..6f43b76a8 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -63,26 +63,26 @@ export default definePlugin({
         replacement: {
             get match() {
                 switch (Settings.plugins.Settings.settingsLocation) {
-                    case "top": return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.USER_SETTINGS\}/;
-                    case "aboveNitro": return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.BILLING_SETTINGS\}/;
-                    case "belowNitro": return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.APP_SETTINGS\}/;
-                    case "belowActivity": return /(?<=\{section:(\i)\.ID\.DIVIDER},)\{section:"changelog"/;
-                    case "bottom": return /\{section:(\i)\.ID\.CUSTOM,\s*element:.+?}/;
+                    case "top": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.USER_SETTINGS\}/;
+                    case "aboveNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.BILLING_SETTINGS\}/;
+                    case "belowNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.APP_SETTINGS\}/;
+                    case "belowActivity": return /(?<=\{section:(\i\.\i)\.DIVIDER},)\{section:"changelog"/;
+                    case "bottom": return /\{section:(\i\.\i)\.CUSTOM,\s*element:.+?}/;
                     case "aboveActivity":
                     default:
-                        return /\{section:(\i)\.ID\.HEADER,\s*label:(\i)\.\i\.Messages\.ACTIVITY_SETTINGS\}/;
+                        return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.ACTIVITY_SETTINGS\}/;
                 }
             },
             replace: "...$self.makeSettingsCategories($1),$&"
         }
     }],
 
-    customSections: [] as ((ID: Record<string, unknown>) => any)[],
+    customSections: [] as ((SectionTypes: Record<string, unknown>) => any)[],
 
-    makeSettingsCategories({ ID }: { ID: Record<string, unknown>; }) {
+    makeSettingsCategories(SectionTypes: Record<string, unknown>) {
         return [
             {
-                section: ID.HEADER,
+                section: SectionTypes.HEADER,
                 label: "Vencord",
                 className: "vc-settings-header"
             },
@@ -128,9 +128,9 @@ export default definePlugin({
                 element: require("@components/VencordSettings/PatchHelperTab").default,
                 className: "vc-patch-helper"
             },
-            ...this.customSections.map(func => func(ID)),
+            ...this.customSections.map(func => func(SectionTypes)),
             {
-                section: ID.DIVIDER
+                section: SectionTypes.DIVIDER
             }
         ].filter(Boolean);
     },
diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index 645892810..934df2fbe 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -360,7 +360,7 @@ export default definePlugin({
                 {
                     // Render editHistory in the deepest div for message content
                     match: /(\)\("div",\{id:.+?children:\[)/,
-                    replace: "$1 (arguments[0].message.editHistory.length > 0 ? arguments[0].message.editHistory.map(edit => $self.renderEdit(edit)) : null), "
+                    replace: "$1 (arguments[0].message.editHistory?.length > 0 ? arguments[0].message.editHistory.map(edit => $self.renderEdit(edit)) : null), "
                 }
             ]
         },
diff --git a/src/plugins/pronoundb/components/PronounsChatComponent.tsx b/src/plugins/pronoundb/components/PronounsChatComponent.tsx
index 97d24943d..64fac18ba 100644
--- a/src/plugins/pronoundb/components/PronounsChatComponent.tsx
+++ b/src/plugins/pronoundb/components/PronounsChatComponent.tsx
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import ErrorBoundary from "@components/ErrorBoundary";
 import { classes } from "@utils/misc";
 import { findByPropsLazy } from "@webpack";
 import { UserStore } from "@webpack/common";
@@ -39,17 +40,17 @@ function shouldShow(message: Message): boolean {
     return true;
 }
 
-export function PronounsChatComponentWrapper({ message }: { message: Message; }) {
+export const PronounsChatComponentWrapper = ErrorBoundary.wrap(({ message }: { message: Message; }) => {
     return shouldShow(message)
         ? <PronounsChatComponent message={message} />
         : null;
-}
+}, { noop: true });
 
-export function CompactPronounsChatComponentWrapper({ message }: { message: Message; }) {
+export const CompactPronounsChatComponentWrapper = ErrorBoundary.wrap(({ message }: { message: Message; }) => {
     return shouldShow(message)
         ? <CompactPronounsChatComponent message={message} />
         : null;
-}
+}, { noop: true });
 
 function PronounsChatComponent({ message }: { message: Message; }) {
     const [result] = useFormattedPronouns(message.author.id);
@@ -63,7 +64,7 @@ function PronounsChatComponent({ message }: { message: Message; }) {
         : null;
 }
 
-export function CompactPronounsChatComponent({ message }: { message: Message; }) {
+export const CompactPronounsChatComponent = ErrorBoundary.wrap(({ message }: { message: Message; }) => {
     const [result] = useFormattedPronouns(message.author.id);
 
     return result
@@ -73,4 +74,4 @@ export function CompactPronounsChatComponent({ message }: { message: Message; })
             >• {result}</span>
         )
         : null;
-}
+}, { noop: true });
diff --git a/src/plugins/pronoundb/index.ts b/src/plugins/pronoundb/index.ts
index c9dc2725e..bd5b2c5a9 100644
--- a/src/plugins/pronoundb/index.ts
+++ b/src/plugins/pronoundb/index.ts
@@ -41,7 +41,7 @@ export default definePlugin({
             find: "showCommunicationDisabledStyles",
             replacement: {
                 match: /("span",{id:\i,className:\i,children:\i}\))/,
-                replace: "$1, $self.CompactPronounsChatComponentWrapper(e)"
+                replace: "$1, $self.CompactPronounsChatComponentWrapper(arguments[0])"
             }
         },
         // Patch the chat timestamp element (normal mode)
@@ -49,7 +49,7 @@ export default definePlugin({
             find: "showCommunicationDisabledStyles",
             replacement: {
                 match: /(?<=return\s*\(0,\i\.jsxs?\)\(.+!\i&&)(\(0,\i.jsxs?\)\(.+?\{.+?\}\))/,
-                replace: "[$1, $self.PronounsChatComponentWrapper(e)]"
+                replace: "[$1, $self.PronounsChatComponentWrapper(arguments[0])]"
             }
         },
         // Patch the profile popout username header to use our pronoun hook instead of Discord's pronouns
diff --git a/src/utils/modal.tsx b/src/utils/modal.tsx
index 4ac6f9b1f..d7a054a5b 100644
--- a/src/utils/modal.tsx
+++ b/src/utils/modal.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { filters, findByCode, mapMangledModuleLazy } from "@webpack";
+import { filters, findByCode, findByPropsLazy, mapMangledModuleLazy } from "@webpack";
 import type { ComponentType, PropsWithChildren, ReactNode, Ref } from "react";
 
 import { LazyComponent } from "./react";
@@ -132,12 +132,7 @@ export const ModalContent = LazyComponent(() => Modals.ModalContent);
 export const ModalFooter = LazyComponent(() => Modals.ModalFooter);
 export const ModalCloseButton = LazyComponent(() => Modals.ModalCloseButton);
 
-const ModalAPI = mapMangledModuleLazy("onCloseRequest:null!=", {
-    openModal: filters.byCode("onCloseRequest:null!="),
-    closeModal: filters.byCode("onCloseCallback&&"),
-    openModalLazy: m => m?.length === 1 && filters.byCode(".apply(this,arguments)")(m),
-    closeAllModals: filters.byCode(".value.key,")
-});
+const ModalAPI = findByPropsLazy("openModalLazy");
 
 /**
  * Wait for the render promise to resolve, then open a modal with it.
diff --git a/src/webpack/common/stores.ts b/src/webpack/common/stores.ts
index d42cb6b56..c4ebd4a95 100644
--- a/src/webpack/common/stores.ts
+++ b/src/webpack/common/stores.ts
@@ -16,10 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { proxyLazy } from "@utils/lazy";
 import type * as Stores from "discord-types/stores";
 
 // eslint-disable-next-line path-alias/no-relative
-import { filters, findByCodeLazy, findByPropsLazy, mapMangledModuleLazy } from "../webpack";
+import { filters, findByCode, findByProps, findByPropsLazy, mapMangledModuleLazy } from "../webpack";
 import { waitForStore } from "./internal";
 import * as t from "./types/stores";
 
@@ -83,7 +84,14 @@ export const useStateFromStores: <T>(
     idk?: any,
     isEqual?: (old: T, newer: T) => boolean
 ) => T
-    = findByCodeLazy("useStateFromStores");
+    // FIXME: hack to support old stable and new canary
+    = proxyLazy(() => {
+        try {
+            return findByProps("useStateFromStores").useStateFromStores;
+        } catch {
+            return findByCode('("useStateFromStores")');
+        }
+    });
 
 waitForStore("DraftStore", s => DraftStore = s);
 waitForStore("UserStore", s => UserStore = s);
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 2c814de57..bc97f5e74 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -16,10 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { proxyLazy } from "@utils/lazy";
 import type { User } from "discord-types/general";
 
 // eslint-disable-next-line path-alias/no-relative
-import { _resolveReady, filters, findByCodeLazy, findByPropsLazy, findLazy, mapMangledModuleLazy, waitFor } from "../webpack";
+import { _resolveReady, filters, find, findByCodeLazy, findByPropsLazy, findLazy, mapMangledModuleLazy, waitFor } from "../webpack";
 import type * as t from "./types/utils";
 
 export let FluxDispatcher: t.FluxDispatcher;
@@ -126,4 +127,11 @@ waitFor("parseTopic", m => Parser = m);
 export let SettingsRouter: any;
 waitFor(["open", "saveAccountChanges"], m => SettingsRouter = m);
 
-export const PermissionsBits: t.PermissionsBits = findLazy(m => typeof m.ADMINISTRATOR === "bigint");
+// FIXME: hack to support old stable and new canary
+export const PermissionsBits: t.PermissionsBits = proxyLazy(() => {
+    try {
+        return find(m => m.Permissions?.ADMINISTRATOR).Permissions;
+    } catch {
+        return find(m => typeof m.ADMINISTRATOR === "bigint");
+    }
+});
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index f422372c1..9e7af6b73 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -36,9 +36,8 @@ if (window[WEBPACK_CHUNK]) {
     Object.defineProperty(window, WEBPACK_CHUNK, {
         get: () => webpackChunk,
         set: v => {
-            if (v?.push !== Array.prototype.push) {
+            if (v?.push !== Array.prototype.push && _initWebpack(v)) {
                 logger.info(`Patching ${WEBPACK_CHUNK}.push`);
-                _initWebpack(v);
                 patchPush();
                 // @ts-ignore
                 delete window[WEBPACK_CHUNK];
@@ -85,10 +84,9 @@ function patchPush() {
                         logger.error("Error in patched chunk", err);
                         return void originalMod(module, exports, require);
                     }
-
                     // There are (at the time of writing) 11 modules exporting the window
                     // Make these non enumerable to improve webpack search performance
-                    if (module.exports === window) {
+                    if (exports === window) {
                         Object.defineProperty(require.c, id, {
                             value: require.c[id],
                             enumerable: false,
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index b4a896086..1fdfa43e9 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -62,9 +62,50 @@ export type CallbackFn = (mod: any, id: number) => void;
 export function _initWebpack(instance: typeof window.webpackChunkdiscord_app) {
     if (cache !== void 0) throw "no.";
 
-    wreq = instance.push([[Symbol("Vencord")], {}, r => r]);
+    instance.push([[Symbol("Vencord")], {}, r => wreq = r]);
+    if (!wreq) return false;
+
     cache = wreq.c;
     instance.pop();
+
+    for (const id in cache) {
+        const { exports } = cache[id];
+        if (!exports) continue;
+
+        const numberId = Number(id);
+
+        for (const callback of listeners) {
+            try {
+                callback(exports, numberId);
+            } catch (err) {
+                logger.error("Error in webpack listener", err);
+            }
+        }
+
+        for (const [filter, callback] of subscriptions) {
+            try {
+                if (filter(exports)) {
+                    subscriptions.delete(filter);
+                    callback(exports, numberId);
+                } else if (typeof exports === "object") {
+                    if (exports.default && filter(exports.default)) {
+                        subscriptions.delete(filter);
+                        callback(exports.default, numberId);
+                    }
+
+                    for (const nested in exports) if (nested.length <= 3) {
+                        if (exports[nested] && filter(exports[nested])) {
+                            subscriptions.delete(filter);
+                            callback(exports[nested], numberId);
+                        }
+                    }
+                }
+            } catch (err) {
+                logger.error("Error while firing callback for webpack chunk", err);
+            }
+        }
+    }
+    return true;
 }
 
 if (IS_DEV && IS_DISCORD_DESKTOP) {

From 97c0face2f246b9534c1a1c30bc402976924ad02 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 00:38:02 +0200
Subject: [PATCH 013/632] PinDMs: Fix canary crash

---
 src/plugins/pinDms/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index 02fe332dc..a7406aa41 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -81,7 +81,7 @@ export default definePlugin({
                     // array with the count, or an empty array. Due to spreading, only in the former
                     // case will an element be added to the outer array
                     // Thanks for the fix, Strencher!
-                    replace: "$&...$1.props.pinCount,"
+                    replace: "$&...($1.props.pinCount ?? []),"
                 },
                 {
                     // Patch renderSection (renders the header) to set the text to "Pinned DMs" instead of "Direct Messages"

From 4e27722b543f8a7c86270276df68d7cb89adeec3 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 14:26:10 +0200
Subject: [PATCH 014/632] fix webpack patching

---
 src/plugins/_core/noTrack.ts |  2 +-
 src/webpack/patchWebpack.ts  | 36 ++++++++++++++++++++++++------------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/plugins/_core/noTrack.ts b/src/plugins/_core/noTrack.ts
index 79ef5a6ef..4267a6280 100644
--- a/src/plugins/_core/noTrack.ts
+++ b/src/plugins/_core/noTrack.ts
@@ -24,7 +24,7 @@ export default definePlugin({
     description: "Disable Discord's tracking ('science'), metrics and Sentry crash reporting",
     authors: [Devs.Cyn, Devs.Ven, Devs.Nuckyz, Devs.Arrow],
     required: true,
-    patches: [
+    patches: true ? [] : [
         {
             find: "TRACKING_URL:",
             replacement: {
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index 9e7af6b73..a3bc7a6f6 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -31,17 +31,23 @@ const logger = new Logger("WebpackInterceptor", "#8caaee");
 if (window[WEBPACK_CHUNK]) {
     logger.info(`Patching ${WEBPACK_CHUNK}.push (was already existant, likely from cache!)`);
     _initWebpack(window[WEBPACK_CHUNK]);
-    patchPush();
+    patchPush(window[WEBPACK_CHUNK]);
 } else {
     Object.defineProperty(window, WEBPACK_CHUNK, {
         get: () => webpackChunk,
         set: v => {
-            if (v?.push !== Array.prototype.push && _initWebpack(v)) {
-                logger.info(`Patching ${WEBPACK_CHUNK}.push`);
-                patchPush();
-                // @ts-ignore
-                delete window[WEBPACK_CHUNK];
-                window[WEBPACK_CHUNK] = v;
+            if (v?.push) {
+                if (!v.push.$$vencordOriginal) {
+                    logger.info(`Patching ${WEBPACK_CHUNK}.push`);
+                    patchPush(v);
+                }
+
+                if (_initWebpack(v)) {
+                    logger.info("Successfully initialised Vencord webpack");
+                    // @ts-ignore
+                    delete window[WEBPACK_CHUNK];
+                    window[WEBPACK_CHUNK] = v;
+                }
             }
             webpackChunk = v;
         },
@@ -49,7 +55,7 @@ if (window[WEBPACK_CHUNK]) {
     });
 }
 
-function patchPush() {
+function patchPush(webpackGlobal: any) {
     function handlePush(chunk: any) {
         try {
             const modules = chunk[1];
@@ -213,13 +219,19 @@ function patchPush() {
             logger.error("Error in handlePush", err);
         }
 
-        return handlePush.original.call(window[WEBPACK_CHUNK], chunk);
+        return handlePush.$$vencordOriginal.call(webpackGlobal, chunk);
     }
 
-    handlePush.original = window[WEBPACK_CHUNK].push;
-    Object.defineProperty(window[WEBPACK_CHUNK], "push", {
+    handlePush.$$vencordOriginal = webpackGlobal.push;
+    Object.defineProperty(webpackGlobal, "push", {
         get: () => handlePush,
-        set: v => (handlePush.original = v),
+        set(v) {
+            Object.defineProperty(this, "push", {
+                value: v,
+                configurable: true
+            });
+            patchPush(this);
+        },
         configurable: true
     });
 }

From 4da79abb2149013ca6e3ed8b28d7073695bf1106 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 14:37:54 +0200
Subject: [PATCH 015/632] Fix components filter

---
 src/webpack/common/components.ts |  2 +-
 src/webpack/patchWebpack.ts      | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/webpack/common/components.ts b/src/webpack/common/components.ts
index 55d3b84d4..e44b1c9f6 100644
--- a/src/webpack/common/components.ts
+++ b/src/webpack/common/components.ts
@@ -55,7 +55,7 @@ export const MaskedLink = waitForComponent<t.MaskedLink>("MaskedLink", m => m?.t
 export const Timestamp = waitForComponent<t.Timestamp>("Timestamp", filters.byCode(".Messages.MESSAGE_EDITED_TIMESTAMP_A11Y_LABEL.format"));
 export const Flex = waitForComponent<t.Flex>("Flex", ["Justify", "Align", "Wrap"]);
 
-waitFor("FormItem", m => {
+waitFor(["FormItem", "Button"], m => {
     ({ useToken, Card, Button, FormSwitch: Switch, Tooltip, TextInput, TextArea, Text, Select, SearchableSelect, Slider, ButtonLooks, TabBar, Popout, Dialog, Paginator, ScrollerThin, Clickable, Avatar } = m);
     Forms = m;
 });
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index a3bc7a6f6..395c35fe5 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -90,6 +90,11 @@ function patchPush(webpackGlobal: any) {
                         logger.error("Error in patched chunk", err);
                         return void originalMod(module, exports, require);
                     }
+
+                    exports = module.exports;
+
+                    if (!exports) return;
+
                     // There are (at the time of writing) 11 modules exporting the window
                     // Make these non enumerable to improve webpack search performance
                     if (exports === window) {
@@ -226,11 +231,9 @@ function patchPush(webpackGlobal: any) {
     Object.defineProperty(webpackGlobal, "push", {
         get: () => handlePush,
         set(v) {
-            Object.defineProperty(this, "push", {
-                value: v,
-                configurable: true
-            });
-            patchPush(this);
+            delete webpackGlobal.push;
+            webpackGlobal.push = v;
+            patchPush(webpackGlobal);
         },
         configurable: true
     });

From 4beef9f73be01716a9e5dc880e28afd0c821a571 Mon Sep 17 00:00:00 2001
From: megumin <megumin.bakaretsurie@gmail.com>
Date: Wed, 25 Oct 2023 13:39:57 +0100
Subject: [PATCH 016/632] fix: ComponentDispatch and GifPaste plugin (#1843)

Co-authored-by: V <vendicated@riseup.net>
---
 .eslintrc.json                | 5 ++++-
 src/plugins/gifPaste/index.ts | 2 +-
 src/webpack/common/utils.ts   | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 8fa3386ab..2ee24e8b3 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -51,7 +51,10 @@
         "eqeqeq": ["error", "always", { "null": "ignore" }],
         "spaced-comment": ["error", "always", { "markers": ["!"] }],
         "yoda": "error",
-        "prefer-destructuring": ["error", { "object": true, "array": false }],
+        "prefer-destructuring": ["error", {
+                "VariableDeclarator": { "array": false, "object": true },
+                "AssignmentExpression": { "array": false, "object": false }
+        }],
         "operator-assignment": ["error", "always"],
         "no-useless-computed-key": "error",
         "no-unneeded-ternary": ["error", { "defaultAssignment": false }],
diff --git a/src/plugins/gifPaste/index.ts b/src/plugins/gifPaste/index.ts
index f1dfb2ff9..8c1303ba4 100644
--- a/src/plugins/gifPaste/index.ts
+++ b/src/plugins/gifPaste/index.ts
@@ -33,7 +33,7 @@ export default definePlugin({
     patches: [{
         find: ".handleSelectGIF=",
         replacement: {
-            match: /\.handleSelectGIF=function.+?\{/,
+            match: /\.handleSelectGIF=\i=>\{/,
             replace: ".handleSelectGIF=function(gif){return $self.handleSelect(gif);"
         }
     }],
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index bc97f5e74..25fda58bb 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -24,7 +24,9 @@ import { _resolveReady, filters, find, findByCodeLazy, findByPropsLazy, findLazy
 import type * as t from "./types/utils";
 
 export let FluxDispatcher: t.FluxDispatcher;
-export const ComponentDispatch = findLazy(m => m.emitter?._events?.INSERT_TEXT);
+export let ComponentDispatch;
+waitFor(["ComponentDispatch", "ComponentDispatcher"], m => ComponentDispatch = m.ComponentDispatch);
+
 
 export const RestAPI: t.RestAPI = findByPropsLazy("getAPIBaseURL", "get");
 export const moment: typeof import("moment") = findByPropsLazy("parseTwoDigitYear");

From cb93c11e166964b9f1f03a28cd1d0b7b246f5407 Mon Sep 17 00:00:00 2001
From: Erik <81252038+Captain8771@users.noreply.github.com>
Date: Wed, 25 Oct 2023 14:40:17 +0200
Subject: [PATCH 017/632] Fix CustomRPC (#1846)

---
 src/plugins/customRPC/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/customRPC/index.tsx b/src/plugins/customRPC/index.tsx
index a58e54260..2ec7f53f7 100644
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@@ -32,7 +32,7 @@ const Colors = findByPropsLazy("profileColors");
 const assetManager = mapMangledModuleLazy(
     "getAssetImage: size must === [number, number] for Twitch",
     {
-        getAsset: filters.byCode("apply("),
+        getAsset: filters.byCode("APPLICATION_ASSETS_FETCH_SUCCESS"),
     }
 );
 

From 922e3ce6fec18a78488ca8efabfef9b6047c0f1d Mon Sep 17 00:00:00 2001
From: Syncx <47534062+Syncxv@users.noreply.github.com>
Date: Wed, 25 Oct 2023 18:10:50 +0530
Subject: [PATCH 018/632] fix: FavoriteGifSearch (#1842)

---
 src/plugins/favGifSearch/index.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/favGifSearch/index.tsx b/src/plugins/favGifSearch/index.tsx
index d2966e95c..0cb5166e1 100644
--- a/src/plugins/favGifSearch/index.tsx
+++ b/src/plugins/favGifSearch/index.tsx
@@ -91,13 +91,13 @@ export default definePlugin({
 
     patches: [
         {
-            find: "renderCategoryExtras",
+            find: "renderHeaderContent()",
             replacement: [
                 {
-                    // https://regex101.com/r/4uHtTE/1
+                    // https://regex101.com/r/07gpzP/1
                     // ($1 renderHeaderContent=function { ... switch (x) ... case FAVORITES:return) ($2) ($3 case default:return r.jsx(($<searchComp>), {...props}))
-                    match: /(renderHeaderContent=function.{1,150}FAVORITES:return)(.{1,150};)(case.{1,200}default:return\(0,\i\.jsx\)\((?<searchComp>\i\.\i))/,
-                    replace: "$1 this.state.resultType === \"Favorites\" ? $self.renderSearchBar(this, $<searchComp>) : $2; $3"
+                    match: /(renderHeaderContent\(\).{1,150}FAVORITES:return)(.{1,150});(case.{1,200}default:return\(0,\i\.jsx\)\((?<searchComp>\i\..{1,10}),)/,
+                    replace: "$1 this.state.resultType === 'Favorites' ? $self.renderSearchBar(this, $<searchComp>) : $2;$3"
                 },
                 {
                     // to persist filtered favorites when component re-renders.
@@ -182,7 +182,7 @@ function SearchBar({ instance, SearchBarComponent }: { instance: Instance; Searc
             ref={ref}
             autoFocus={true}
             className={containerClasses.searchBar}
-            size={SearchBarComponent.Sizes.MEDIUM}
+            size={SearchBarComponent.Sizes.SMALL}
             onChange={onChange}
             onClear={() => {
                 setQuery("");

From 09b646b86031312692a988c489bc6bad810906e3 Mon Sep 17 00:00:00 2001
From: Hugo C <lumap@duck.com>
Date: Wed, 25 Oct 2023 14:41:09 +0200
Subject: [PATCH 019/632] fix: PictureInPicture (#1839)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/pictureInPicture/index.tsx | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/plugins/pictureInPicture/index.tsx b/src/plugins/pictureInPicture/index.tsx
index bb6aee18f..f5f0a5128 100644
--- a/src/plugins/pictureInPicture/index.tsx
+++ b/src/plugins/pictureInPicture/index.tsx
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import "./styles.css";
-
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
@@ -26,13 +24,12 @@ export default definePlugin({
     description: "Adds picture in picture to videos (next to the Download button)",
     authors: [Devs.Lumap],
     settings,
-
     patches: [
         {
-            find: ".onRemoveAttachment,",
+            find: ".nonMediaAttachment]",
             replacement: {
-                match: /\.nonMediaAttachment,!(\i).{0,7}children:\[(\i),/,
-                replace: "$&$1&&$2&&$self.renderPiPButton(),"
+                match: /\.nonMediaAttachment\].{0,10}children:\[\S{3}/,
+                replace: "$&&&$self.renderPiPButton(),"
             },
         },
     ],
@@ -43,7 +40,6 @@ export default definePlugin({
                 {tooltipProps => (
                     <div
                         {...tooltipProps}
-                        className="vc-pip-button"
                         role="button"
                         style={{
                             cursor: "pointer",
@@ -74,7 +70,7 @@ export default definePlugin({
                     >
                         <svg width="24px" height="24px" viewBox="0 0 24 24">
                             <path
-                                fill="currentColor"
+                                fill="var(--interactive-normal)"
                                 d="M21 3a1 1 0 0 1 1 1v7h-2V5H4v14h6v2H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h18zm0 10a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1h-8a1 1 0 0 1-1-1v-6a1 1 0 0 1 1-1h8zm-1 2h-6v4h6v-4z"
                             />
                         </svg>

From 940193c30bd0e426799e1507f74d47560d38e90a Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Wed, 25 Oct 2023 19:47:08 +0700
Subject: [PATCH 020/632] noMosaic: fix (#1849)

---
 src/plugins/noMosaic/index.ts   | 26 ++++++++++++++------------
 src/plugins/noMosaic/styles.css |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/plugins/noMosaic/index.ts b/src/plugins/noMosaic/index.ts
index 60576ba93..49343503d 100644
--- a/src/plugins/noMosaic/index.ts
+++ b/src/plugins/noMosaic/index.ts
@@ -15,23 +15,25 @@ export default definePlugin({
     authors: [Devs.AutumnVN],
     description: "Removes Discord new image mosaic",
     tags: ["image", "mosaic", "media"],
-    patches: [{
-        find: "Media Mosaic",
-        replacement: [
-            {
+    patches: [
+        {
+            find: ".oneByTwoLayoutThreeGrid",
+            replacement: [{
                 match: /mediaLayoutType:\i\.\i\.MOSAIC/,
-                replace: 'mediaLayoutType:"RESPONSIVE"',
-            },
-            {
-                match: /\i===\i\.\i\.MOSAIC/,
-                replace: "true",
+                replace: 'mediaLayoutType:"RESPONSIVE"'
             },
             {
                 match: /null!==\(\i=\i\.get\(\i\)\)&&void 0!==\i\?\i:"INVALID"/,
                 replace: '"INVALID"',
-            },
-        ],
-    }],
+            },]
+        },
+        {
+            find: "Messages.REMOVE_ATTACHMENT_TOOLTIP_TEXT",
+            replacement: {
+                match: /\i===\i\.\i\.MOSAIC/,
+                replace: "true"
+            }
+        }],
     start() {
         enableStyle(style);
     },
diff --git a/src/plugins/noMosaic/styles.css b/src/plugins/noMosaic/styles.css
index 546168584..05ea24899 100644
--- a/src/plugins/noMosaic/styles.css
+++ b/src/plugins/noMosaic/styles.css
@@ -1,3 +1,3 @@
-[class^="nonMediaAttachmentsContainer-"] [class*="messageAttachment-"] {
+[class^="nonMediaAttachmentsContainer_"] [class*="messageAttachment_"] {
     position: relative;
 }

From baa7d8c078aab9a2e71a03784f5069e129be4716 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Wed, 25 Oct 2023 19:48:05 +0700
Subject: [PATCH 021/632] noDevToolsWarning: fix (#1851)

---
 src/plugins/noDevtoolsWarning/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/noDevtoolsWarning/index.ts b/src/plugins/noDevtoolsWarning/index.ts
index 188b8fa3f..e897e5793 100644
--- a/src/plugins/noDevtoolsWarning/index.ts
+++ b/src/plugins/noDevtoolsWarning/index.ts
@@ -26,8 +26,8 @@ export default definePlugin({
     patches: [{
         find: "setDevtoolsCallbacks",
         replacement: {
-            match: /if\(.{0,10}\|\|"0.0.0"!==.{0,2}\.remoteApp\.getVersion\(\)\)/,
-            replace: "if(false)"
+            match: /if\(null!=\i&&"0.0.0"===\i\.remoteApp\.getVersion\(\)\)/,
+            replace: "if(true)"
         }
     }]
 });

From 2a56081bc24c069df55857ed08c70c84449f1a40 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Wed, 25 Oct 2023 19:48:42 +0700
Subject: [PATCH 022/632] callTimer: fix (#1850)

---
 src/plugins/callTimer/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/callTimer/index.tsx b/src/plugins/callTimer/index.tsx
index 2e0aa9650..c018cc715 100644
--- a/src/plugins/callTimer/index.tsx
+++ b/src/plugins/callTimer/index.tsx
@@ -73,9 +73,9 @@ export default definePlugin({
     },
 
     patches: [{
-        find: ".renderConnectionStatus=",
+        find: "renderConnectionStatus(){",
         replacement: {
-            match: /(?<=renderConnectionStatus=.+\.channel,children:)\w/,
+            match: /(?<=renderConnectionStatus\(\)\{.+\.channel,children:)\i/,
             replace: "[$&, $self.renderTimer(this.props.channel.id)]"
         }
     }],

From 69b54535c33bc08495b068876ad61b1024b20610 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 14:56:20 +0200
Subject: [PATCH 023/632] Fix NoTrack

---
 src/plugins/_core/noTrack.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/_core/noTrack.ts b/src/plugins/_core/noTrack.ts
index 4267a6280..ca1126593 100644
--- a/src/plugins/_core/noTrack.ts
+++ b/src/plugins/_core/noTrack.ts
@@ -24,9 +24,9 @@ export default definePlugin({
     description: "Disable Discord's tracking ('science'), metrics and Sentry crash reporting",
     authors: [Devs.Cyn, Devs.Ven, Devs.Nuckyz, Devs.Arrow],
     required: true,
-    patches: true ? [] : [
+    patches: [
         {
-            find: "TRACKING_URL:",
+            find: "AnalyticsActionHandlers.handle",
             replacement: {
                 match: /^.+$/,
                 replace: "()=>{}",
@@ -43,8 +43,8 @@ export default definePlugin({
             find: ".METRICS,",
             replacement: [
                 {
-                    match: /this\._intervalId.+?12e4\)/,
-                    replace: ""
+                    match: /this\._intervalId=/,
+                    replace: "this._intervalId=undefined&&"
                 },
                 {
                     match: /(?<=increment=function\(\i\){)/,

From 7ee9a8bb990c6d28db1ecbac856fac6a82ac0cf4 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 14:58:59 +0200
Subject: [PATCH 024/632] SpotifyControls: Fix

---
 src/webpack/common/menu.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webpack/common/menu.ts b/src/webpack/common/menu.ts
index e2ad37202..c0d9c5f9d 100644
--- a/src/webpack/common/menu.ts
+++ b/src/webpack/common/menu.ts
@@ -22,7 +22,7 @@ import type * as t from "./types/menu";
 
 export let Menu = {} as t.Menu;
 
-waitFor("MenuItem", m => Menu = m);
+waitFor(["MenuItem", "MenuSliderControl"], m => Menu = m);
 
 export const ContextMenu: t.ContextMenuApi = mapMangledModuleLazy('type:"CONTEXT_MENU_OPEN"', {
     open: filters.byCode("stopPropagation"),

From 322ecc5e88b3dd027e62f2e83b550529741f4340 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Wed, 25 Oct 2023 19:59:35 +0700
Subject: [PATCH 025/632] usrbg: fix (#1853)

---
 src/plugins/usrbg/index.css |  2 +-
 src/plugins/usrbg/index.tsx | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/usrbg/index.css b/src/plugins/usrbg/index.css
index 93e37ef48..69c5b1857 100644
--- a/src/plugins/usrbg/index.css
+++ b/src/plugins/usrbg/index.css
@@ -7,6 +7,6 @@
     top: 76px;
 }
 
-[style*="background-image"] [class*="background-"] {
+[style*="background-image"] [class*="background_"] {
     background-color: transparent !important;
 }
diff --git a/src/plugins/usrbg/index.tsx b/src/plugins/usrbg/index.tsx
index 3e8c12257..ce6bd709b 100644
--- a/src/plugins/usrbg/index.tsx
+++ b/src/plugins/usrbg/index.tsx
@@ -59,8 +59,8 @@ export default definePlugin({
                     replace: "$self.premiumHook($1)||$&"
                 },
                 {
-                    match: /(\i)\.bannerSrc,/,
-                    replace: "$self.useBannerHook($1),"
+                    match: /(?<=function \i\((\i)\)\{)(?=var.{30,50},bannerSrc:)/,
+                    replace: "$1.bannerSrc=$self.useBannerHook($1);"
                 },
                 {
                     match: /\?\(0,\i\.jsx\)\(\i,{type:\i,shown/,
@@ -73,8 +73,8 @@ export default definePlugin({
             predicate: () => settings.store.voiceBackground,
             replacement: [
                 {
-                    match: /(\i)\.style,/,
-                    replace: "$self.voiceBackgroundHook($1),"
+                    match: /(?<=function\((\i),\i\)\{)(?=let.{20,40},style:)/,
+                    replace: "$1.style=$self.voiceBackgroundHook($1);"
                 }
             ]
         }
@@ -90,7 +90,7 @@ export default definePlugin({
     },
 
     voiceBackgroundHook({ className, participantUserId }: any) {
-        if (className.includes("tile-")) {
+        if (className.includes("tile_")) {
             if (data[participantUserId]) {
                 return {
                     backgroundImage: `url(${data[participantUserId]})`,

From 44c96757956428c7b74f37e52bb7e2a8eb7cf7cf Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 15:07:45 +0200
Subject: [PATCH 026/632] ContextMenuApi: fix

---
 src/plugins/_api/contextMenu.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/_api/contextMenu.ts b/src/plugins/_api/contextMenu.ts
index d04e0e662..55fdf3eae 100644
--- a/src/plugins/_api/contextMenu.ts
+++ b/src/plugins/_api/contextMenu.ts
@@ -29,8 +29,8 @@ export default definePlugin({
         {
             find: "♫ (つ｡◕‿‿◕｡)つ ♪",
             replacement: {
-                match: /(?<=function \i\((\i)\){)(?=var \i,\i=\i\.navId)/,
-                replace: (_, props) => `Vencord.Api.ContextMenu._patchContextMenu(${props});`
+                match: /let{navId:/,
+                replace: "Vencord.Api.ContextMenu._patchContextMenu(arguments[0]);$&"
             }
         },
         {

From 554bb18e9b6a554c9b7b5fd6d5e5613a3e529d3c Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 15:24:06 +0200
Subject: [PATCH 027/632] BadgeAPI: fix

---
 src/plugins/_api/badges.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/plugins/_api/badges.tsx b/src/plugins/_api/badges.tsx
index d10d00210..11e843db4 100644
--- a/src/plugins/_api/badges.tsx
+++ b/src/plugins/_api/badges.tsx
@@ -85,17 +85,19 @@ export default definePlugin({
                 },
                 {
                     // alt: "", aria-hidden: false, src: originalSrc
-                    match: /alt:" ","aria-hidden":!0,src:(?=(\i)\.src)/g,
+                    match: /alt:" ","aria-hidden":!0,src:(?=(\i)\.src)/,
                     // ...badge.props, ..., src: badge.image ?? ...
                     replace: "...$1.props,$& $1.image??"
                 },
+                // replace their component with ours if applicable
                 {
-                    match: /children:function(?<=(\i)\.(?:tooltip|description),spacing:\d.+?)/g,
-                    replace: "children:$1.component ? () => $self.renderBadgeComponent($1) : function"
+                    match: /(?<=text:(\i)\.description,spacing:12,)children:/,
+                    replace: "children:$1.component ? () => $self.renderBadgeComponent($1) :"
                 },
+                // conditionally override their onClick with badge.onClick if it exists
                 {
-                    match: /onClick:function(?=.{0,200}href:(\i)\.link)/,
-                    replace: "onClick:$1.onClick??function"
+                    match: /href:(\i)\.link/,
+                    replace: "...($1.onClick && { onClick: $1.onClick }),$&"
                 }
             ]
         }

From fb22c57da13c5033d4d1764aabe355c0f509a4b4 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 15:28:50 +0200
Subject: [PATCH 028/632] MessageAccessoriesAPI: Fix

---
 src/plugins/_api/messageAccessories.ts | 5 ++---
 src/webpack/webpack.ts                 | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/plugins/_api/messageAccessories.ts b/src/plugins/_api/messageAccessories.ts
index 5bb13cfe1..a98fdb32b 100644
--- a/src/plugins/_api/messageAccessories.ts
+++ b/src/plugins/_api/messageAccessories.ts
@@ -27,9 +27,8 @@ export default definePlugin({
         {
             find: ".Messages.REMOVE_ATTACHMENT_BODY",
             replacement: {
-                match: /(.container\)?,children:)(\[[^\]]+\])(}\)\};return)/,
-                replace: (_, pre, accessories, post) =>
-                    `${pre}Vencord.Api.MessageAccessories._modifyAccessories(${accessories},this.props)${post}`,
+                match: /(?<=.container\)?,children:)(\[.+?\])/,
+                replace: "Vencord.Api.MessageAccessories._modifyAccessories($1,this.props)",
             },
         },
     ],
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 1fdfa43e9..812e36079 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -458,7 +458,7 @@ export function extract(id: number) {
 // WARNING: This module was extracted to be more easily readable.
 //          This module is NOT ACTUALLY USED! This means putting breakpoints will have NO EFFECT!!
 
-${mod.toString()}
+0,${mod.toString()}
 //# sourceURL=ExtractedWebpackModule${id}
 `;
     const extracted = (0, eval)(code);

From 8c998b9330af7e7db089709ba05170e2a3c45cfc Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Wed, 25 Oct 2023 20:34:00 +0700
Subject: [PATCH 029/632] experiments: fix (#1855)

---
 src/plugins/experiments/index.tsx | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx
index 149c436c2..89fcf33e7 100644
--- a/src/plugins/experiments/index.tsx
+++ b/src/plugins/experiments/index.tsx
@@ -52,7 +52,7 @@ export default definePlugin({
         {
             find: "Object.defineProperties(this,{isDeveloper",
             replacement: {
-                match: /(?<={isDeveloper:\{[^}]+?,get:function\(\)\{return )\w/,
+                match: /(?<={isDeveloper:\{[^}]+?,get:\(\)=>)\i/,
                 replace: "true"
             }
         },
@@ -64,19 +64,28 @@ export default definePlugin({
             }
         },
         {
-            find: ".isStaff=function(){",
+            find: ".isStaff=()",
             predicate: () => settings.store.enableIsStaff,
             replacement: [
                 {
-                    match: /return\s*?(\i)\.hasFlag\((\i\.\i)\.STAFF\)}/,
-                    replace: (_, user, flags) => `return Vencord.Webpack.Common.UserStore.getCurrentUser()?.id===${user}.id||${user}.hasFlag(${flags}.STAFF)}`
+                    match: /=>*?(\i)\.hasFlag\((\i\.\i)\.STAFF\)}/,
+                    replace: (_, user, flags) => `=>Vencord.Webpack.Common.UserStore.getCurrentUser()?.id===${user}.id||${user}.hasFlag(${flags}.STAFF)}`
                 },
                 {
-                    match: /hasFreePremium=function\(\){return this.isStaff\(\)\s*?\|\|/,
-                    replace: "hasFreePremium=function(){return ",
+                    match: /hasFreePremium\(\){return this.isStaff\(\)\s*?\|\|/,
+                    replace: "hasFreePremium(){return ",
                 }
             ]
         },
+        // Fix search history being disabled / broken with isStaff
+        {
+            find: '("showNewSearch")',
+            predicate: () => settings.store.enableIsStaff,
+            replacement: {
+                match: /(?<=showNewSearch"\);return)\s?/,
+                replace: "!1&&"
+            }
+        },
         {
             find: 'H1,title:"Experiments"',
             replacement: {

From cb2532d22cb39232f362453e2fc1e935640e047f Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Wed, 25 Oct 2023 20:34:17 +0700
Subject: [PATCH 030/632] disableDMCallIdle: fix (#1856)

---
 src/plugins/disableDMCallIdle/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/disableDMCallIdle/index.ts b/src/plugins/disableDMCallIdle/index.ts
index 26ea3cdac..bce119d01 100644
--- a/src/plugins/disableDMCallIdle/index.ts
+++ b/src/plugins/disableDMCallIdle/index.ts
@@ -27,7 +27,7 @@ export default definePlugin({
         {
             find: ".Messages.BOT_CALL_IDLE_DISCONNECT",
             replacement: {
-                match: /(?<=function \i\(\){)(?=.{1,100}\.Messages\.BOT_CALL_IDLE_DISCONNECT)/,
+                match: /(?<=function \i\(\){)(?=.{1,120}\.Messages\.BOT_CALL_IDLE_DISCONNECT)/,
                 replace: "return;"
             }
         }

From 4d8e4e62ca2783bea7963ce3267ebd1ab0d94bfb Mon Sep 17 00:00:00 2001
From: megumin <megumin.bakaretsurie@gmail.com>
Date: Wed, 25 Oct 2023 14:41:57 +0100
Subject: [PATCH 031/632] fix: notrack failing patches (#1857)

---
 src/plugins/_core/noTrack.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugins/_core/noTrack.ts b/src/plugins/_core/noTrack.ts
index ca1126593..424e62c04 100644
--- a/src/plugins/_core/noTrack.ts
+++ b/src/plugins/_core/noTrack.ts
@@ -47,16 +47,17 @@ export default definePlugin({
                     replace: "this._intervalId=undefined&&"
                 },
                 {
-                    match: /(?<=increment=function\(\i\){)/,
-                    replace: "return;"
+                    match: /(increment\(\i\){)/,
+                    replace: "$1return;"
                 }
             ]
         },
         {
             find: ".installedLogHooks)",
             replacement: {
-                match: /if\(\i\.getDebugLogging\(\)&&!\i\.installedLogHooks\)/,
-                replace: "if(false)"
+                // if getDebugLogging() returns false, the hooks don't get installed.
+                match: "getDebugLogging(){",
+                replace: "getDebugLogging(){return false;"
             }
         },
     ]

From cf5e93ee52ad8f36014f07d6f3303cef88b2b875 Mon Sep 17 00:00:00 2001
From: Jack <30497388+FieryFlames@users.noreply.github.com>
Date: Wed, 25 Oct 2023 09:45:19 -0400
Subject: [PATCH 032/632] fix: fakeProfileThemes (#1837)

---
 src/plugins/fakeProfileThemes/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/fakeProfileThemes/index.tsx b/src/plugins/fakeProfileThemes/index.tsx
index 70003e5ab..c61437269 100644
--- a/src/plugins/fakeProfileThemes/index.tsx
+++ b/src/plugins/fakeProfileThemes/index.tsx
@@ -87,15 +87,15 @@ export default definePlugin({
     authors: [Devs.Alyxia, Devs.Remty],
     patches: [
         {
-            find: "getUserProfile=",
+            find: "UserProfileStore",
             replacement: {
-                match: /(?<=getUserProfile=function\(\i\){return )(\i\[\i\])/,
+                match: /(?<=getUserProfile\(\i\){return )(\i\[\i\])/,
                 replace: "$self.colorDecodeHook($1)"
             }
         }, {
             find: ".USER_SETTINGS_PROFILE_THEME_ACCENT",
             replacement: {
-                match: /RESET_PROFILE_THEME}\)(?<=},color:(\i).+?},color:(\i).+?)/,
+                match: /RESET_PROFILE_THEME}\)(?<=color:(\i),.{0,500}?color:(\i),.{0,500}?)/,
                 replace: "$&,$self.addCopy3y3Button({primary:$1,accent:$2})"
             }
         }

From 65d39dcf21ecbcb1d45fefd38eee55965668de4b Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Wed, 25 Oct 2023 14:56:43 +0100
Subject: [PATCH 033/632] ShowConnections, NoProfileThemes: Fix (#1854)

---
 src/plugins/noProfileThemes/index.ts  | 10 +++++-----
 src/plugins/showConnections/index.tsx | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/plugins/noProfileThemes/index.ts b/src/plugins/noProfileThemes/index.ts
index 97d195e36..c31f42838 100644
--- a/src/plugins/noProfileThemes/index.ts
+++ b/src/plugins/noProfileThemes/index.ts
@@ -34,19 +34,19 @@ export default definePlugin({
             }
         },
         {
-            find: "().avatarPositionPremiumNoBanner,default:",
+            find: ".avatarPositionPremiumNoBanner,default:",
             replacement: {
                 // premiumUserWithoutBanner: foo().avatarPositionPremiumNoBanner, default: foo().avatarPositionNormal
-                match: /\.avatarPositionPremiumNoBanner(?=,default:\i\(\)\.(\i))/,
+                match: /\.avatarPositionPremiumNoBanner(?=,default:\i\.(\i))/,
                 // premiumUserWithoutBanner: foo().avatarPositionNormal...
                 replace: ".$1"
             }
         },
         {
-            find: ".hasThemeColors=function(){",
+            find: "hasThemeColors(){",
             replacement: {
-                match: /(?<=key:"canUsePremiumProfileCustomization",get:function\(\){return)/,
-                replace: " false;"
+                match: /get canUsePremiumProfileCustomization\(\){return /,
+                replace: "$&false &&"
             }
         }
     ]
diff --git a/src/plugins/showConnections/index.tsx b/src/plugins/showConnections/index.tsx
index 1f6ef34ef..948bdb83b 100644
--- a/src/plugins/showConnections/index.tsx
+++ b/src/plugins/showConnections/index.tsx
@@ -32,7 +32,7 @@ import { User } from "discord-types/general";
 
 import { VerifiedIcon } from "./VerifiedIcon";
 
-const Section = LazyComponent(() => findByCode("().lastSection"));
+const Section = LazyComponent(() => findByCode(".lastSection]:"));
 const ThemeStore = findStoreLazy("ThemeStore");
 const platforms: { get(type: string): ConnectionPlatform; } = findByPropsLazy("isSupported", "getByUrl");
 const getTheme: (user: User, displayProfile: any) => any = findByCodeLazy(',"--profile-gradient-primary-color"');
@@ -74,12 +74,12 @@ interface ConnectionPlatform {
     icon: { lightSVG: string, darkSVG: string; };
 }
 
-const profilePopoutComponent = ErrorBoundary.wrap(e =>
-    <ConnectionsComponent id={e.user.id} theme={getTheme(e.user, e.displayProfile).profileTheme} />
+const profilePopoutComponent = ErrorBoundary.wrap(({ user, displayProfile }: { user: User, displayProfile; }) =>
+    <ConnectionsComponent id={user.id} theme={getTheme(user, displayProfile).profileTheme} />
 );
 
-const profilePanelComponent = ErrorBoundary.wrap(e =>
-    <ConnectionsComponent id={e.channel.recipients[0]} theme={ThemeStore.theme} />
+const profilePanelComponent = ErrorBoundary.wrap(({ id }: { id: string; }) =>
+    <ConnectionsComponent id={id} theme={ThemeStore.theme} />
 );
 
 function ConnectionsComponent({ id, theme }: { id: string, theme: string; }) {
@@ -175,18 +175,18 @@ export default definePlugin({
     authors: [Devs.TheKodeToad],
     patches: [
         {
-            find: ".Messages.BOT_PROFILE_SLASH_COMMANDS",
+            find: "{isUsingGuildBio:null!==(",
             replacement: {
-                match: /,theme:\i\}\)(?=,.{0,100}setNote:)/,
-                replace: "$&,$self.profilePopoutComponent(arguments[0])"
+                match: /,theme:\i\}\)(?=,.{0,150}setNote:)/,
+                replace: "$&,$self.profilePopoutComponent({ user: arguments[0].user, displayProfile: arguments[0].displayProfile })"
             }
         },
         {
             find: "\"Profile Panel: user cannot be undefined\"",
             replacement: {
                 // createElement(Divider, {}), createElement(NoteComponent)
-                match: /\(0,\i\.jsx\)\(\i\.\i,\{\}\).{0,100}setNote:/,
-                replace: "$self.profilePanelComponent(arguments[0]),$&"
+                match: /\(0,\i\.jsx\)\(\i\.\i,\{\}\).{0,100}setNote:(?=.+?channelId:(\i).id)/,
+                replace: "$self.profilePanelComponent({ id: $1.recipients[0] }),$&"
             }
         }
     ],

From bb771153e3e620e52202935a5ec603f59b68ecfe Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 16:12:01 +0200
Subject: [PATCH 034/632] MessageEvents: Fix

---
 src/plugins/_api/messageEvents.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/plugins/_api/messageEvents.ts b/src/plugins/_api/messageEvents.ts
index fa467522c..bc5f5abf2 100644
--- a/src/plugins/_api/messageEvents.ts
+++ b/src/plugins/_api/messageEvents.ts
@@ -27,10 +27,8 @@ export default definePlugin({
         {
             find: '"MessageActionCreators"',
             replacement: {
-                // editMessage: function (...) {
-                match: /\beditMessage:(function\(.+?\))\{/,
-                // editMessage: async function (...) { await handlePreEdit(...); ...
-                replace: "editMessage:async $1{await Vencord.Api.MessageEvents._handlePreEdit(...arguments);"
+                match: /async editMessage\(.+?\)\{/,
+                replace: "$&await Vencord.Api.MessageEvents._handlePreEdit(...arguments);"
             }
         },
         {
@@ -38,7 +36,7 @@ export default definePlugin({
             replacement: {
                 // props.chatInputType...then((function(isMessageValid)... var parsedMessage = b.c.parse(channel,... var replyOptions = f.g.getSendMessageOptionsForReply(pendingReply);
                 // Lookbehind: validateMessage)({openWarningPopout:..., type: i.props.chatInputType, content: t, stickers: r, ...}).then((function(isMessageValid)
-                match: /(props\.chatInputType.+?\.then\(\()(function.+?var (\i)=\i\.\i\.parse\((\i),.+?var (\i)=\i\.\i\.getSendMessageOptionsForReply\(\i\);)(?<=\)\(({.+?})\)\.then.+?)/,
+                match: /(type:this\.props\.chatInputType.+?\.then\()(\i=>\{.+?let (\i)=\i\.\i\.parse\((\i),.+?let (\i)=\i\.\i\.getSendMessageOptionsForReply\(\i\);)(?<=\)\(({.+?})\)\.then.+?)/,
                 // props.chatInputType...then((async function(isMessageValid)... var replyOptions = f.g.getSendMessageOptionsForReply(pendingReply); if(await Vencord.api...) return { shoudClear:true, shouldRefocus:true };
                 replace: (_, rest1, rest2, parsedMessage, channel, replyOptions, extra) => "" +
                     `${rest1}async ${rest2}` +
@@ -49,10 +47,10 @@ export default definePlugin({
         {
             find: '("interactionUsernameProfile',
             replacement: {
-                match: /var \i=(\i)\.id,\i=(\i)\.id;return \i\.useCallback\(\(?function\((\i)\){/,
+                match: /let\{id:\i}=(\i),{id:\i}=(\i);return \i\.useCallback\((\i)=>\{/,
                 replace: (m, message, channel, event) =>
                     // the message param is shadowed by the event param, so need to alias them
-                    `var _msg=${message},_chan=${channel};${m}Vencord.Api.MessageEvents._handleClick(_msg, _chan, ${event});`
+                    `const vcMsg=${message},vcChan=${channel};${m}Vencord.Api.MessageEvents._handleClick(vcMsg, vcChan, ${event});`
             }
         }
     ]

From 7e0fc1d0ea227743c88ce36df6f16a9658d44a95 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 16:15:52 +0200
Subject: [PATCH 035/632] ServerListAPI: fix

---
 src/plugins/_api/serverList.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/_api/serverList.ts b/src/plugins/_api/serverList.ts
index ec377fce1..f45bbf104 100644
--- a/src/plugins/_api/serverList.ts
+++ b/src/plugins/_api/serverList.ts
@@ -27,15 +27,15 @@ export default definePlugin({
         {
             find: "Messages.DISCODO_DISABLED",
             replacement: {
-                match: /(Messages\.DISCODO_DISABLED.+?return)(\(.{0,75}?tutorialContainer.+?}\))(?=}function)/,
-                replace: "$1[$2].concat(Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.Above))"
+                match: /(?<=Messages\.DISCODO_DISABLED.+?return)(\(.{0,75}?tutorialContainer.+?}\))(?=}function)/,
+                replace: "[$1].concat(Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.Above))"
             }
         },
         {
             find: "Messages.SERVERS,children",
             replacement: {
-                match: /(Messages\.SERVERS,children:)(.+?default:return null\}\}\)\))/,
-                replace: "$1Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.In).concat($2)"
+                match: /(?<=Messages\.SERVERS,children:).+?default:return null\}\}\)/,
+                replace: "Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.In).concat($&)"
             }
         }
     ]

From 98955409433ae8c38243dee36500adbb427ccf74 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 16:29:37 +0200
Subject: [PATCH 036/632] MemberListDecoratorAPI: Fix

---
 src/plugins/_api/memberListDecorators.ts | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/plugins/_api/memberListDecorators.ts b/src/plugins/_api/memberListDecorators.ts
index a6d4125d3..bf7377e85 100644
--- a/src/plugins/_api/memberListDecorators.ts
+++ b/src/plugins/_api/memberListDecorators.ts
@@ -25,18 +25,23 @@ export default definePlugin({
     authors: [Devs.TheSun, Devs.Ven],
     patches: [
         {
-            find: "lostPermissionTooltipText,",
-            replacement: {
-                match: /decorators:.{0,100}?children:\[(?<=(\i)\.lostPermissionTooltipText.+?)/,
-                replace: "$&...Vencord.Api.MemberListDecorators.__getDecorators($1),"
-            }
+            find: ".lostPermission)",
+            replacement: [
+                {
+                    match: /let\{[^}]*lostPermissionTooltipText:\i[^}]*\}=(\i),/,
+                    replace: "$&vencordProps=$1,"
+                }, {
+                    match: /decorators:.{0,100}?children:\[/,
+                    replace: "$&...(typeof vencordProps=='undefined'?[]:Vencord.Api.MemberListDecorators.__getDecorators(vencordProps)),"
+                }
+            ]
         },
         {
             find: "PrivateChannel.renderAvatar",
             replacement: [
                 // props are shadowed by nested props so we have to do this
                 {
-                    match: /\i=(\i)\.applicationStream,/,
+                    match: /let\{[^}]*applicationStream:\i[^}]*\}=(\i),/,
                     replace: "$&vencordProps=$1,"
                 },
                 {

From 892a79b2a7c21d04aafdf8de54a117fb7522c2c0 Mon Sep 17 00:00:00 2001
From: redstonekasi <kasi@hanneskann.de>
Date: Wed, 25 Oct 2023 16:16:16 +0200
Subject: [PATCH 037/632] fix: CommandsAPI

---
 src/api/Commands/commandHelpers.ts | 6 +++---
 src/plugins/_api/commands.ts       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/api/Commands/commandHelpers.ts b/src/api/Commands/commandHelpers.ts
index dd1196f9f..2fd189032 100644
--- a/src/api/Commands/commandHelpers.ts
+++ b/src/api/Commands/commandHelpers.ts
@@ -17,14 +17,14 @@
 */
 
 import { mergeDefaults } from "@utils/misc";
-import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { SnowflakeUtils } from "@webpack/common";
 import { Message } from "discord-types/general";
 import type { PartialDeep } from "type-fest";
 
 import { Argument } from "./types";
 
-const createBotMessage = findByCodeLazy('username:"Clyde"');
+const MessageCreator = findByPropsLazy("createBotMessage");
 const MessageSender = findByPropsLazy("receiveMessage");
 
 export function generateId() {
@@ -38,7 +38,7 @@ export function generateId() {
  * @returns {Message}
  */
 export function sendBotMessage(channelId: string, message: PartialDeep<Message>): Message {
-    const botMessage = createBotMessage({ channelId, content: "", embeds: [] });
+    const botMessage = MessageCreator.createBotMessage({ channelId, content: "", embeds: [] });
 
     MessageSender.receiveMessage(channelId, mergeDefaults(message, botMessage));
 
diff --git a/src/plugins/_api/commands.ts b/src/plugins/_api/commands.ts
index b7d6ef9fe..3a7619365 100644
--- a/src/plugins/_api/commands.ts
+++ b/src/plugins/_api/commands.ts
@@ -44,8 +44,8 @@ export default definePlugin({
             find: "Unexpected value for option",
             replacement: {
                 // return [2, cmd.execute(args, ctx)]
-                match: /,(.{1,2})\.execute\((.{1,2}),(.{1,2})\)]/,
-                replace: (_, cmd, args, ctx) => `,Vencord.Api.Commands._handleCommand(${cmd}, ${args}, ${ctx})]`
+                match: /,(\i)\.execute\((\i),(\i)\)/,
+                replace: (_, cmd, args, ctx) => `,Vencord.Api.Commands._handleCommand(${cmd}, ${args}, ${ctx})`
             }
         },
         // Show plugin name instead of "Built-In"

From b69ac1cdad0de10dd20ae1954581f05bbef36a2e Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 16:50:09 +0200
Subject: [PATCH 038/632] Fix PlatformIndicators

---
 src/plugins/platformIndicators/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/platformIndicators/index.tsx b/src/plugins/platformIndicators/index.tsx
index 7233cd13d..5ccc3b783 100644
--- a/src/plugins/platformIndicators/index.tsx
+++ b/src/plugins/platformIndicators/index.tsx
@@ -23,7 +23,7 @@ import { Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy, findStoreLazy } from "@webpack";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
 import { PresenceStore, Tooltip, UserStore } from "@webpack/common";
 import { User } from "discord-types/general";
 
@@ -55,13 +55,13 @@ const Icons = {
 };
 type Platform = keyof typeof Icons;
 
-const getStatusColor = findByCodeLazy(".TWITCH", ".STREAMING", ".INVISIBLE");
+const StatusUtils = findByPropsLazy("getStatusColor", "StatusTypes");
 
 const PlatformIcon = ({ platform, status, small }: { platform: Platform, status: string; small: boolean; }) => {
     const tooltip = platform[0].toUpperCase() + platform.slice(1);
     const Icon = Icons[platform] ?? Icons.desktop;
 
-    return <Icon color={`var(--${getStatusColor(status)}`} tooltip={tooltip} small={small} />;
+    return <Icon color={`var(--${StatusUtils.getStatusColor(status)}`} tooltip={tooltip} small={small} />;
 };
 
 const getStatus = (id: string): Record<Platform, string> => PresenceStore.getState()?.clientStatuses?.[id];

From 788d22f9e90276e08ccfce83d113ce793f2655c8 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 16:52:59 +0200
Subject: [PATCH 039/632] MessageDecorationsAPI: fix

---
 src/plugins/_api/messageDecorations.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/_api/messageDecorations.ts b/src/plugins/_api/messageDecorations.ts
index 3c235d768..3f0fd11db 100644
--- a/src/plugins/_api/messageDecorations.ts
+++ b/src/plugins/_api/messageDecorations.ts
@@ -25,7 +25,7 @@ export default definePlugin({
     authors: [Devs.TheSun],
     patches: [
         {
-            find: ".withMentionPrefix",
+            find: "UsernameDecorationTypes:",
             replacement: {
                 match: /currentUserIsPremium:.{0,70}{children:\i(?=}\))/,
                 replace: "$&.concat(Vencord.Api.MessageDecorations.__addDecorationsToMessage(arguments[0]))"

From 2478ffb695ee4e8225eb3dee7bc8dd57ee1ad4db Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Wed, 25 Oct 2023 21:57:50 +0700
Subject: [PATCH 040/632] fix userutils (#1861)

---
 src/components/PluginSettings/PluginModal.tsx   | 2 +-
 src/plugins/relationshipNotifier/functions.ts   | 2 +-
 src/plugins/relationshipNotifier/utils.ts       | 4 ++--
 src/plugins/serverProfile/GuildProfileModal.tsx | 2 +-
 src/utils/discord.tsx                           | 2 +-
 src/webpack/common/utils.ts                     | 6 ++----
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/components/PluginSettings/PluginModal.tsx b/src/components/PluginSettings/PluginModal.tsx
index d8b949066..03789ac6c 100644
--- a/src/components/PluginSettings/PluginModal.tsx
+++ b/src/components/PluginSettings/PluginModal.tsx
@@ -94,7 +94,7 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
         (async () => {
             for (const user of plugin.authors.slice(0, 6)) {
                 const author = user.id
-                    ? await UserUtils.fetchUser(`${user.id}`)
+                    ? await UserUtils.getUser(`${user.id}`)
                         .catch(() => makeDummyUser({ username: user.name }))
                     : makeDummyUser({ username: user.name });
 
diff --git a/src/plugins/relationshipNotifier/functions.ts b/src/plugins/relationshipNotifier/functions.ts
index e712382b5..980b11300 100644
--- a/src/plugins/relationshipNotifier/functions.ts
+++ b/src/plugins/relationshipNotifier/functions.ts
@@ -37,7 +37,7 @@ export async function onRelationshipRemove({ relationship: { type, id } }: Relat
         return;
     }
 
-    const user = await UserUtils.fetchUser(id)
+    const user = await UserUtils.getUser(id)
         .catch(() => null);
     if (!user) return;
 
diff --git a/src/plugins/relationshipNotifier/utils.ts b/src/plugins/relationshipNotifier/utils.ts
index 5de9d75a7..16f1892af 100644
--- a/src/plugins/relationshipNotifier/utils.ts
+++ b/src/plugins/relationshipNotifier/utils.ts
@@ -68,7 +68,7 @@ export async function syncAndRunChecks() {
             for (const id of oldFriends.friends) {
                 if (friends.friends.includes(id)) continue;
 
-                const user = await UserUtils.fetchUser(id).catch(() => void 0);
+                const user = await UserUtils.getUser(id).catch(() => void 0);
                 if (user)
                     notify(
                         `You are no longer friends with ${getUniqueUsername(user)}.`,
@@ -85,7 +85,7 @@ export async function syncAndRunChecks() {
                     [RelationshipType.FRIEND, RelationshipType.BLOCKED, RelationshipType.OUTGOING_REQUEST].includes(RelationshipStore.getRelationshipType(id))
                 ) continue;
 
-                const user = await UserUtils.fetchUser(id).catch(() => void 0);
+                const user = await UserUtils.getUser(id).catch(() => void 0);
                 if (user)
                     notify(
                         `Friend request from ${getUniqueUsername(user)} has been revoked.`,
diff --git a/src/plugins/serverProfile/GuildProfileModal.tsx b/src/plugins/serverProfile/GuildProfileModal.tsx
index 2be9b57d9..2a7958a10 100644
--- a/src/plugins/serverProfile/GuildProfileModal.tsx
+++ b/src/plugins/serverProfile/GuildProfileModal.tsx
@@ -162,7 +162,7 @@ function Owner(guildId: string, owner: User) {
 }
 
 function ServerInfoTab({ guild }: GuildProps) {
-    const [owner] = useAwaiter(() => UserUtils.fetchUser(guild.ownerId), {
+    const [owner] = useAwaiter(() => UserUtils.getUser(guild.ownerId), {
         deps: [guild.ownerId],
         fallbackValue: null
     });
diff --git a/src/utils/discord.tsx b/src/utils/discord.tsx
index 458509b42..a36ecfbb9 100644
--- a/src/utils/discord.tsx
+++ b/src/utils/discord.tsx
@@ -103,7 +103,7 @@ export function openImageModal(url: string, props?: Partial<React.ComponentProps
 const openProfile = findByCodeLazy("friendToken", "USER_PROFILE_MODAL_OPEN");
 
 export async function openUserProfile(id: string) {
-    const user = await UserUtils.fetchUser(id);
+    const user = await UserUtils.getUser(id);
     if (!user) throw new Error("No such user: " + id);
 
     const guildId = SelectedGuildStore.getGuildId();
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 25fda58bb..ec0de86d0 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -20,7 +20,7 @@ import { proxyLazy } from "@utils/lazy";
 import type { User } from "discord-types/general";
 
 // eslint-disable-next-line path-alias/no-relative
-import { _resolveReady, filters, find, findByCodeLazy, findByPropsLazy, findLazy, mapMangledModuleLazy, waitFor } from "../webpack";
+import { _resolveReady, filters, find, findByPropsLazy, findLazy, mapMangledModuleLazy, waitFor } from "../webpack";
 import type * as t from "./types/utils";
 
 export let FluxDispatcher: t.FluxDispatcher;
@@ -91,9 +91,7 @@ export function showToast(message: string, type = ToastType.MESSAGE) {
     });
 }
 
-export const UserUtils = {
-    fetchUser: findByCodeLazy(".USER(", "getUser") as (id: string) => Promise<User>,
-};
+export const UserUtils = findByPropsLazy("getUser", "fetchCurrentUser") as { getUser: (id: string) => Promise<User>; };
 
 export const Clipboard = mapMangledModuleLazy('document.queryCommandEnabled("copy")||document.queryCommandSupported("copy")', {
     copy: filters.byCode(".copy("),

From e69236c5f83c935b8e00658928536cae380a8776 Mon Sep 17 00:00:00 2001
From: Nico <nico@d3sox.me>
Date: Wed, 25 Oct 2023 16:58:02 +0200
Subject: [PATCH 041/632] fix(vcDoubleClick): update for new discord build
 (#1862)

---
 src/plugins/vcDoubleClick/index.ts | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/plugins/vcDoubleClick/index.ts b/src/plugins/vcDoubleClick/index.ts
index 31543510e..a55ac7b67 100644
--- a/src/plugins/vcDoubleClick/index.ts
+++ b/src/plugins/vcDoubleClick/index.ts
@@ -30,20 +30,22 @@ export default definePlugin({
     description: "Join voice chats via double click instead of single click",
     authors: [Devs.Ven, Devs.D3SOX],
     patches: [
-        {
-            find: "VoiceChannel.renderPopout",
+        ...[
+            ".handleVoiceStatusClick", // voice channels
+            ".handleClickChat" // stage channels
+        ].map(find => ({
+            find,
             // hack: these are not React onClick, it is a custom prop handled by Discord
             // thus, replacing this with onDoubleClick won't work, and you also cannot check
             // e.detail since instead of the event they pass the channel.
             // do this timer workaround instead
             replacement: [
-                // voice/stage channels
                 {
-                    match: /onClick:function\(\)\{(e\.handleClick.+?)}/g,
-                    replace: "onClick:function(){$self.schedule(()=>{$1},e)}",
+                    match: /onClick:\(\)=>\{this.handleClick\(\)/g,
+                    replace: "onClick:()=>{$self.schedule(()=>{this.handleClick()},this)",
                 },
-            ],
-        },
+            ]
+        })),
         {
             // channel mentions
             find: ".shouldCloseDefaultModals",

From cd06980016b2646d4941b3a5bcf24278cd06123f Mon Sep 17 00:00:00 2001
From: megumin <megumin.bakaretsurie@gmail.com>
Date: Wed, 25 Oct 2023 16:00:24 +0100
Subject: [PATCH 042/632] fix: pronoundb profile popout (#1860)

---
 src/plugins/pronoundb/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/pronoundb/index.ts b/src/plugins/pronoundb/index.ts
index bd5b2c5a9..6eac86698 100644
--- a/src/plugins/pronoundb/index.ts
+++ b/src/plugins/pronoundb/index.ts
@@ -57,8 +57,8 @@ export default definePlugin({
             find: ".userTagNoNickname",
             replacement: [
                 {
-                    match: /,(\i)=(\i)\.pronouns/,
-                    replace: ",[$1,vcPronounSource]=$self.useProfilePronouns($2.user.id)"
+                    match: /{user:(\i),[^}]*,pronouns:(\i),[^}]*}=\i;/,
+                    replace: "$&let vcPronounSource;[$2,vcPronounSource]=$self.useProfilePronouns($1.id);"
                 },
                 PRONOUN_TOOLTIP_PATCH
             ]

From 7de1b5dcb6fea56f53a164894dedebb1cb9de7e3 Mon Sep 17 00:00:00 2001
From: megumin <megumin.bakaretsurie@gmail.com>
Date: Wed, 25 Oct 2023 16:00:39 +0100
Subject: [PATCH 043/632] fix: sortFriendRequests patches (#1848)

---
 src/plugins/sortFriendRequests/index.tsx | 36 +++++++++++++-----------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/plugins/sortFriendRequests/index.tsx b/src/plugins/sortFriendRequests/index.tsx
index b9732afb8..3698379c8 100644
--- a/src/plugins/sortFriendRequests/index.tsx
+++ b/src/plugins/sortFriendRequests/index.tsx
@@ -29,26 +29,28 @@ export default definePlugin({
     description: "Sorts friend requests by date of receipt",
 
     patches: [{
-        find: ".PENDING_INCOMING||",
-        replacement: [{
-            match: /\.sortBy\(\(function\((\w)\){return \w{1,3}\.comparator}\)\)/,
-            // If the row type is 3 or 4 (pendinng incoming or outgoing), sort by date of receipt
-            // Otherwise, use the default comparator
-            replace: (_, row) => `.sortBy((function(${row}) {
-                return ${row}.type === 3 || ${row}.type === 4
-                    ? -Vencord.Plugins.plugins.SortFriendRequests.getSince(${row}.user)
-                    : ${row}.comparator
-            }))`
-        }, {
+        find: "getRelationshipCounts(){",
+        replacement: {
+            match: /\.sortBy\(\i=>\i\.comparator\)/,
+            replace: ".sortBy((row) => $self.sortList(row))"
+        }
+    }, {
+        find: "RelationshipTypes.PENDING_INCOMING?",
+        replacement: {
             predicate: () => Settings.plugins.SortFriendRequests.showDates,
-            match: /(user:(\w{1,3}),.{10,30}),subText:(\w{1,3}),(.{10,30}userInfo}\))/,
-            // Show dates in the friend request list
-            replace: (_, pre, user, subText, post) => `${pre},
-                subText: Vencord.Plugins.plugins.SortFriendRequests.makeSubtext(${subText}, ${user}),
-                ${post}`
-        }]
+            match: /(user:(\i),.{10,50}),subText:(\i),(className:\i\.userInfo}\))/,
+            replace: (_, pre, user, subtext, post) => `${pre},
+                    subText: $self.makeSubtext(${subtext}, ${user}),
+                    ${post}`
+        }
     }],
 
+    sortList(row: any) {
+        return row.type === 3 || row.type === 4
+            ? -this.getSince(row.user)
+            : row.comparator;
+    },
+
     getSince(user: User) {
         return new Date(RelationshipStore.getSince(user.id));
     },

From af1aa396479f62bc5e7e9960d133c604606446a1 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 17:03:17 +0200
Subject: [PATCH 044/632] Delete RNNoise - Krisp is now on web, so this is
 obsolete

---
 src/plugins/rnnoise.web/icons.tsx  |  21 ---
 src/plugins/rnnoise.web/index.tsx  | 250 -----------------------------
 src/plugins/rnnoise.web/styles.css |  29 ----
 3 files changed, 300 deletions(-)
 delete mode 100644 src/plugins/rnnoise.web/icons.tsx
 delete mode 100644 src/plugins/rnnoise.web/index.tsx
 delete mode 100644 src/plugins/rnnoise.web/styles.css

diff --git a/src/plugins/rnnoise.web/icons.tsx b/src/plugins/rnnoise.web/icons.tsx
deleted file mode 100644
index 8fda9839a..000000000
--- a/src/plugins/rnnoise.web/icons.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-export const SupressionIcon = ({ enabled }: { enabled: boolean; }) => enabled
-    ? <svg aria-hidden="true" role="img" width="20" height="20" viewBox="0 0 24 24"><path d="M10.889 4C10.889 3.44772 11.3367 3 11.889 3H12.1112C12.6635 3 13.1112 3.44772 13.1112 4V20C13.1112 20.5523 12.6635 21 12.1112 21H11.889C11.3367 21 10.889 20.5523 10.889 20V4Z" fill="currentColor"></path><path d="M6.44439 6.25C6.44439 5.69772 6.89211 5.25 7.44439 5.25H7.66661C8.2189 5.25 8.66661 5.69772 8.66661 6.25V17.75C8.66661 18.3023 8.2189 18.75 7.66661 18.75H7.44439C6.89211 18.75 6.44439 18.3023 6.44439 17.75V6.25Z" fill="currentColor"></path><path d="M3.22222 15.375C3.77451 15.375 4.22222 14.9273 4.22222 14.375L4.22222 9.625C4.22222 9.07272 3.77451 8.625 3.22222 8.625H3C2.44772 8.625 2 9.07272 2 9.625V14.375C2 14.9273 2.44772 15.375 3 15.375H3.22222Z" fill="currentColor"></path><path d="M22.0001 13.25C22.0001 13.8023 21.5523 14.25 21.0001 14.25H20.7778C20.2255 14.25 19.7778 13.8023 19.7778 13.25V10.75C19.7778 10.1977 20.2255 9.75 20.7778 9.75H21.0001C21.5523 9.75 22.0001 10.1977 22.0001 10.75V13.25Z" fill="currentColor"></path><path d="M16.3333 7.5C15.781 7.5 15.3333 7.94772 15.3333 8.5V15.5C15.3333 16.0523 15.781 16.5 16.3333 16.5H16.5555C17.1078 16.5 17.5555 16.0523 17.5555 15.5V8.5C17.5555 7.94772 17.1078 7.5 16.5555 7.5H16.3333Z" fill="currentColor"></path></svg>
-    : <svg aria-hidden="true" role="img" width="20" height="20" viewBox="0 0 48 48"><path d="M30.6666 24.9644L35.1111 20.5199V31C35.1111 32.1046 34.2156 33 33.1111 33H32.6666C31.562 33 30.6666 32.1046 30.6666 31V24.9644Z" fill="currentColor"></path><path d="M26.2224 14.1463V8C26.2224 6.89543 25.327 6 24.2224 6H23.7779C22.6734 6 21.7779 6.89543 21.7779 8V18.5907L26.2224 14.1463Z" fill="currentColor"></path><path d="M21.7779 33.8543L21.9254 33.7056L26.2224 29.4086V40C26.2224 41.1046 25.327 42 24.2224 42H23.7779C22.6734 42 21.7779 41.1046 21.7779 40V33.8543Z" fill="currentColor"></path><path d="M17.3332 23.0354L12.8888 27.4799V12.5C12.8888 11.3954 13.7842 10.5 14.8888 10.5H15.3332C16.4378 10.5 17.3332 11.3954 17.3332 12.5V23.0354Z" fill="currentColor"></path><path d="M8.44445 28.75C8.44445 29.8546 7.54902 30.75 6.44445 30.75H6C4.89543 30.75 4 29.8546 4 28.75V19.25C4 18.1454 4.89543 17.25 6 17.25H6.44445C7.54902 17.25 8.44445 18.1454 8.44445 19.25L8.44445 28.75Z" fill="currentColor"></path><path d="M44.0001 26.5C44.0001 27.6046 43.1047 28.5 42.0001 28.5H41.5557C40.4511 28.5 39.5557 27.6046 39.5557 26.5V21.5C39.5557 20.3954 40.4511 19.5 41.5557 19.5H42.0001C43.1047 19.5 44.0001 20.3954 44.0001 21.5V26.5Z" fill="currentColor"></path><path d="M42 8.54L39.46 6L6 39.46L8.54 42L16.92 33.64L19.38 31.16L22.7 27.84L29.98 20.56L42 8.54Z" fill="currentColor"></path></svg>;
diff --git a/src/plugins/rnnoise.web/index.tsx b/src/plugins/rnnoise.web/index.tsx
deleted file mode 100644
index 8de6557e7..000000000
--- a/src/plugins/rnnoise.web/index.tsx
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import "./styles.css";
-
-import { definePluginSettings } from "@api/Settings";
-import { classNameFactory } from "@api/Styles";
-import { Switch } from "@components/Switch";
-import { loadRnnoise, RnnoiseWorkletNode } from "@sapphi-red/web-noise-suppressor";
-import { Devs } from "@utils/constants";
-import { rnnoiseWasmSrc, rnnoiseWorkletSrc } from "@utils/dependencies";
-import { makeLazy } from "@utils/lazy";
-import { Logger } from "@utils/Logger";
-import { LazyComponent } from "@utils/react";
-import definePlugin from "@utils/types";
-import { findByCode } from "@webpack";
-import { FluxDispatcher, Popout, React } from "@webpack/common";
-import { MouseEvent, ReactNode } from "react";
-
-import { SupressionIcon } from "./icons";
-
-const RNNOISE_OPTION = "RNNOISE";
-
-interface PanelButtonProps {
-    tooltipText: string;
-    icon: () => ReactNode;
-    onClick: (event: MouseEvent<HTMLElement>) => void;
-    tooltipClassName?: string;
-    disabled?: boolean;
-    shouldShow?: boolean;
-}
-const PanelButton = LazyComponent<PanelButtonProps>(() => findByCode("Masks.PANEL_BUTTON"));
-const enum SpinnerType {
-    SpinningCircle = "spinningCircle",
-    ChasingDots = "chasingDots",
-    LowMotion = "lowMotion",
-    PulsingEllipsis = "pulsingEllipsis",
-    WanderingCubes = "wanderingCubes",
-}
-export interface SpinnerProps {
-    type: SpinnerType;
-    animated?: boolean;
-    className?: string;
-    itemClassName?: string;
-}
-const Spinner = LazyComponent<SpinnerProps>(() => findByCode(".spinningCircleInner"));
-
-function createExternalStore<S>(init: () => S) {
-    const subscribers = new Set<() => void>();
-    let state = init();
-
-    return {
-        get: () => state,
-        set: (newStateGetter: (oldState: S) => S) => {
-            state = newStateGetter(state);
-            for (const cb of subscribers) cb();
-        },
-        use: () => {
-            return React.useSyncExternalStore<S>(onStoreChange => {
-                subscribers.add(onStoreChange);
-                return () => subscribers.delete(onStoreChange);
-            }, () => state);
-        },
-    } as const;
-}
-
-const cl = classNameFactory("vc-rnnoise-");
-
-const loadedStore = createExternalStore(() => ({
-    isLoaded: false,
-    isLoading: false,
-    isError: false,
-}));
-const getRnnoiseWasm = makeLazy(() => {
-    loadedStore.set(s => ({ ...s, isLoading: true }));
-    return loadRnnoise({
-        url: rnnoiseWasmSrc(),
-        simdUrl: rnnoiseWasmSrc(true),
-    }).then(buffer => {
-        // Check WASM magic number cus fetch doesnt throw on 4XX or 5XX
-        if (new DataView(buffer.slice(0, 4)).getUint32(0) !== 0x0061736D) throw buffer;
-
-        loadedStore.set(s => ({ ...s, isLoaded: true }));
-        return buffer;
-    }).catch(error => {
-        if (error instanceof ArrayBuffer) error = new TextDecoder().decode(error);
-        logger.error("Failed to load RNNoise WASM:", error);
-        loadedStore.set(s => ({ ...s, isError: true }));
-        return null;
-    }).finally(() => {
-        loadedStore.set(s => ({ ...s, isLoading: false }));
-    });
-});
-
-const logger = new Logger("RNNoise");
-const settings = definePluginSettings({}).withPrivateSettings<{ isEnabled: boolean; }>();
-const setEnabled = (enabled: boolean) => {
-    settings.store.isEnabled = enabled;
-    FluxDispatcher.dispatch({ type: "AUDIO_SET_NOISE_SUPPRESSION", enabled });
-};
-
-function NoiseSupressionPopout() {
-    const { isEnabled } = settings.use();
-    const { isLoading, isError } = loadedStore.use();
-    const isWorking = isEnabled && !isError;
-
-    return <div className={cl("popout")}>
-        <div className={cl("popout-heading")}>
-            <span>Noise Supression</span>
-            <div style={{ flex: 1 }} />
-            {isLoading && <Spinner type={SpinnerType.PulsingEllipsis} />}
-            <Switch checked={isWorking} onChange={setEnabled} disabled={isError} />
-        </div>
-        <div className={cl("popout-desc")}>
-            Enable AI noise suppression! Make some noise&mdash;like becoming an air conditioner, or a vending machine fan&mdash;while speaking. Your friends will hear nothing but your beautiful voice ✨
-        </div>
-    </div>;
-}
-
-export default definePlugin({
-    name: "AI Noise Suppression",
-    description: "Uses an open-source AI model (RNNoise) to remove background noise from your microphone",
-    authors: [Devs.Vap],
-    settings,
-    enabledByDefault: true,
-
-    patches: [
-        {
-            // Pass microphone stream to RNNoise
-            find: "window.webkitAudioContext",
-            replacement: {
-                match: /(?<=\i\.acquire=function\((\i)\)\{return )navigator\.mediaDevices\.getUserMedia\(\1\)(?=\})/,
-                replace: "$&.then(stream => $self.connectRnnoise(stream, $1.audio))"
-            },
-        },
-        {
-            // Noise suppression button in call modal
-            find: "renderNoiseCancellation()",
-            replacement: {
-                match: /(?<=(\i)\.jsxs?.{0,70}children:\[)(?=\i\?\i\.renderNoiseCancellation\(\))/,
-                replace: (_, react) => `${react}.jsx($self.NoiseSupressionButton, {}),`
-            },
-        },
-        {
-            // Give noise suppression component a "shouldShow" prop
-            find: "Masks.PANEL_BUTTON",
-            replacement: {
-                match: /(?<==(\i)\.tooltipForceOpen.{0,100})(?=tooltipClassName:)/,
-                replace: (_, props) => `shouldShow: ${props}.shouldShow,`
-            }
-        },
-        {
-            // Noise suppression option in voice settings
-            find: "Messages.USER_SETTINGS_NOISE_CANCELLATION_KRISP",
-            replacement: [{
-                match: /(?<=(\i)=\i\?\i\.KRISP:\i.{1,20}?;)/,
-                replace: (_, option) => `if ($self.isEnabled()) ${option} = ${JSON.stringify(RNNOISE_OPTION)};`,
-            }, {
-                match: /(?=\i&&(\i)\.push\(\{name:(?:\i\.){1,2}Messages.USER_SETTINGS_NOISE_CANCELLATION_KRISP)/,
-                replace: (_, options) => `${options}.push({ name: "AI (RNNoise)", value: "${RNNOISE_OPTION}" });`,
-            }, {
-                match: /(?<=onChange:function\((\i)\)\{)(?=(?:\i\.){1,2}setNoiseCancellation)/,
-                replace: (_, option) => `$self.setEnabled(${option}.value === ${JSON.stringify(RNNOISE_OPTION)});`,
-            }],
-        },
-    ],
-
-    setEnabled,
-    isEnabled: () => settings.store.isEnabled,
-    async connectRnnoise(stream: MediaStream, isAudio: boolean): Promise<MediaStream> {
-        if (!isAudio) return stream;
-        if (!settings.store.isEnabled) return stream;
-
-        const audioCtx = new AudioContext();
-        await audioCtx.audioWorklet.addModule(rnnoiseWorkletSrc);
-
-        const rnnoiseWasm = await getRnnoiseWasm();
-        if (!rnnoiseWasm) {
-            logger.warn("Failed to load RNNoise, noise suppression won't work");
-            return stream;
-        }
-
-        const rnnoise = new RnnoiseWorkletNode(audioCtx, {
-            wasmBinary: rnnoiseWasm,
-            maxChannels: 1,
-        });
-
-        const source = audioCtx.createMediaStreamSource(stream);
-        source.connect(rnnoise);
-
-        const dest = audioCtx.createMediaStreamDestination();
-        rnnoise.connect(dest);
-
-        // Cleanup
-        const onEnded = () => {
-            rnnoise.disconnect();
-            source.disconnect();
-            audioCtx.close();
-            rnnoise.destroy();
-        };
-        stream.addEventListener("inactive", onEnded, { once: true });
-
-        return dest.stream;
-    },
-    NoiseSupressionButton(): ReactNode {
-        const { isEnabled } = settings.use();
-        const { isLoading, isError } = loadedStore.use();
-
-        return <Popout
-            key="rnnoise-popout"
-            align="center"
-            animation={Popout.Animation.TRANSLATE}
-            autoInvert={true}
-            nudgeAlignIntoViewport={true}
-            position="top"
-            renderPopout={() => <NoiseSupressionPopout />}
-            spacing={8}
-        >
-            {(props, { isShown }) => (
-                <PanelButton
-                    {...props}
-                    tooltipText="Noise Suppression powered by RNNoise"
-                    tooltipClassName={cl("tooltip")}
-                    shouldShow={!isShown}
-                    icon={() => <div style={{
-                        color: isError ? "var(--status-danger)" : "inherit",
-                        opacity: isLoading ? 0.5 : 1,
-                    }}>
-                        <SupressionIcon enabled={isEnabled} />
-                    </div>}
-                />
-            )}
-        </Popout>;
-    },
-});
diff --git a/src/plugins/rnnoise.web/styles.css b/src/plugins/rnnoise.web/styles.css
deleted file mode 100644
index 7945c496a..000000000
--- a/src/plugins/rnnoise.web/styles.css
+++ /dev/null
@@ -1,29 +0,0 @@
-.vc-rnnoise-popout {
-    background: var(--background-floating);
-    border-radius: 0.25em;
-    padding: 1em;
-    width: 16em;
-}
-
-.vc-rnnoise-popout-heading {
-    color: var(--text-normal);
-    font-weight: 500;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    font-size: 1.1em;
-    margin-bottom: 1em;
-    gap: 0.5em;
-}
-
-.vc-rnnoise-popout-desc {
-    color: var(--text-muted);
-    font-size: 0.9em;
-    display: flex;
-    align-items: center;
-    line-height: 1.5;
-}
-
-.vc-rnnoise-tooltip {
-    text-align: center;
-}

From cf3c28e1ff32dae2ae3d89338c9a645ae8c96ebd Mon Sep 17 00:00:00 2001
From: Dea <deatea@riseup.net>
Date: Wed, 25 Oct 2023 15:19:09 +0000
Subject: [PATCH 045/632] fix: onePingPerDM (#1867)

---
 src/plugins/onePingPerDM/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/onePingPerDM/index.ts b/src/plugins/onePingPerDM/index.ts
index e69620ae7..37ca87125 100644
--- a/src/plugins/onePingPerDM/index.ts
+++ b/src/plugins/onePingPerDM/index.ts
@@ -45,11 +45,11 @@ export default definePlugin({
     patches: [{
         find: ".getDesktopType()===",
         replacement: [{
-            match: /if\((\i\.\i\.getDesktopType\(\)===\i\.\i\.NEVER)\){/,
-            replace: "if($1){if(!$self.isPrivateChannelRead(arguments[0]?.message))return;"
+            match: /(\i\.\i\.getDesktopType\(\)===\i\.\i\.NEVER)\)/,
+            replace: "$&if(!$self.isPrivateChannelRead(arguments[0]?.message))return;else "
         },
         {
-            match: /sound:(\i\?\i:void 0,volume:\i,onClick:)/,
+            match: /sound:(\i\?\i:void 0,volume:\i,onClick)/,
             replace: "sound:!$self.isPrivateChannelRead(arguments[0]?.message)?undefined:$1"
         }]
     }],

From 8d1561aed4baa9babdb3bcfccfa91e08f7cf7aab Mon Sep 17 00:00:00 2001
From: redstonekasi <kasi@hanneskann.de>
Date: Wed, 25 Oct 2023 17:19:53 +0200
Subject: [PATCH 046/632] fix: NoticesAPI (#1863)

---
 src/plugins/_api/notices.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/_api/notices.ts b/src/plugins/_api/notices.ts
index af7cb15e8..0648afa04 100644
--- a/src/plugins/_api/notices.ts
+++ b/src/plugins/_api/notices.ts
@@ -29,12 +29,12 @@ export default definePlugin({
             find: 'displayName="NoticeStore"',
             replacement: [
                 {
-                    match: /(?=;\i=null;.{0,70}getPremiumSubscription)/g,
-                    replace: ";if(Vencord.Api.Notices.currentNotice)return false"
+                    match: /\i=null;(?=.{0,80}getPremiumSubscription\(\))/g,
+                    replace: "if(Vencord.Api.Notices.currentNotice)return false;$&"
                 },
                 {
-                    match: /(?<=,NOTICE_DISMISS:function\(\i\){)(?=if\(null==(\i)\))/,
-                    replace: (_, notice) => `if(${notice}.id=="VencordNotice")return(${notice}=null,Vencord.Api.Notices.nextNotice(),true);`
+                    match: /(?<=,NOTICE_DISMISS:function\(\i\){)return null!=(\i)/,
+                    replace: "if($1.id==\"VencordNotice\")return($1=null,Vencord.Api.Notices.nextNotice(),true);$&"
                 }
             ]
         }

From 3917193e8fee9832e958a71c5109d39cb808c1da Mon Sep 17 00:00:00 2001
From: Syncx <47534062+Syncxv@users.noreply.github.com>
Date: Wed, 25 Oct 2023 20:50:11 +0530
Subject: [PATCH 047/632] fix: ImageZoom (#1864)

---
 src/plugins/imageZoom/index.tsx | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/plugins/imageZoom/index.tsx b/src/plugins/imageZoom/index.tsx
index 1f0d7e127..23dcddde7 100644
--- a/src/plugins/imageZoom/index.tsx
+++ b/src/plugins/imageZoom/index.tsx
@@ -37,13 +37,6 @@ export const settings = definePluginSettings({
         default: true,
     },
 
-    preventCarouselFromClosingOnClick: {
-        type: OptionType.BOOLEAN,
-        // Thanks chat gpt
-        description: "Allow the image modal in the image slideshow thing / carousel to remain open when clicking on the image",
-        default: true,
-    },
-
     invertScroll: {
         type: OptionType.BOOLEAN,
         description: "Invert scroll",
@@ -163,10 +156,14 @@ export default definePlugin({
 
     patches: [
         {
-            find: '"renderLinkComponent","maxWidth"',
+            find: "Messages.OPEN_IN_BROWSER",
             replacement: {
-                match: /(return\(.{1,100}\(\)\.wrapper.{1,200})(src)/,
-                replace: `$1id: '${ELEMENT_ID}',$2`
+                // there are 2 image thingies. one for carosuel and one for the single image.
+                // so thats why i added global flag.
+                // also idk if this patch is good, should it be more specific?
+                // https://regex101.com/r/xfvNvV/1
+                match: /return.{1,200}\.wrapper.{1,200}src:\i,/g,
+                replace: `$&id: '${ELEMENT_ID}',`
             }
         },
 
@@ -174,28 +171,21 @@ export default definePlugin({
             find: "handleImageLoad=",
             replacement: [
                 {
-                    match: /showThumbhashPlaceholder:/,
+                    match: /showThumbhashPlaceholder:\i,/,
                     replace: "...$self.makeProps(this),$&"
                 },
 
                 {
-                    match: /componentDidMount=function\(\){/,
+                    match: /componentDidMount\(\){/,
                     replace: "$&$self.renderMagnifier(this);",
                 },
 
                 {
-                    match: /componentWillUnmount=function\(\){/,
+                    match: /componentWillUnmount\(\){/,
                     replace: "$&$self.unMountMagnifier();"
                 }
             ]
         },
-        {
-            find: ".carouselModal,",
-            replacement: {
-                match: /onClick:(\i),/,
-                replace: "onClick:$self.settings.store.preventCarouselFromClosingOnClick ? () => {} : $1,"
-            }
-        }
     ],
 
     settings,

From 06b4dffa628d39914eaaaf3358d3d0e63d1811eb Mon Sep 17 00:00:00 2001
From: Nico <nico@d3sox.me>
Date: Wed, 25 Oct 2023 17:26:28 +0200
Subject: [PATCH 048/632] forceOwnerCrown: fix (#1858)

---
 src/plugins/forceOwnerCrown/index.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/plugins/forceOwnerCrown/index.ts b/src/plugins/forceOwnerCrown/index.ts
index eaee62840..15b1f6f56 100644
--- a/src/plugins/forceOwnerCrown/index.ts
+++ b/src/plugins/forceOwnerCrown/index.ts
@@ -27,18 +27,17 @@ export default definePlugin({
     authors: [Devs.D3SOX, Devs.Nickyux],
     patches: [
         {
-            // This is the logic where it decides whether to render the owner crown or not
-            find: ".MULTIPLE_AVATAR",
+            find: "AVATAR_DECORATION_PADDING:",
             replacement: {
-                match: /(\i)=(\i)\.isOwner,/,
-                replace: "$1=$self.isGuildOwner($2),"
+                match: /,isOwner:(\i),/,
+                replace: ",_isOwner:$1=$self.isGuildOwner(e),"
             }
         }
     ],
-    isGuildOwner(props: { user: User, channel: Channel, guildId?: string; }) {
-        if (!props?.user?.id) return false;
+    isGuildOwner(props: { user: User, channel: Channel, isOwner: boolean, guildId?: string; }) {
+        if (!props?.user?.id) return props.isOwner;
         if (props.channel?.type === 3 /* GROUP_DM */)
-            return false;
+            return props.isOwner;
 
         // guild id is in props twice, fallback if the first is undefined
         const guildId = props.guildId ?? props.channel?.guild_id;

From 131e91a37c7fae071df80817f90791a5d5a63f11 Mon Sep 17 00:00:00 2001
From: redstonekasi <kasi@hanneskann.de>
Date: Wed, 25 Oct 2023 17:29:07 +0200
Subject: [PATCH 049/632] fix: AlwaysTrust (#1868)

---
 src/plugins/alwaysTrust/index.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/alwaysTrust/index.ts b/src/plugins/alwaysTrust/index.ts
index 79193b0af..07e92afce 100644
--- a/src/plugins/alwaysTrust/index.ts
+++ b/src/plugins/alwaysTrust/index.ts
@@ -27,15 +27,15 @@ export default definePlugin({
         {
             find: ".displayName=\"MaskedLinkStore\"",
             replacement: {
-                match: /\.isTrustedDomain=function\(.\){return.+?};/,
-                replace: ".isTrustedDomain=function(){return true};"
+                match: /(?<=isTrustedDomain\(\i\){)return \i\(\i\)/,
+                replace: "return true"
             }
         },
         {
-            find: '"7z","ade","adp"',
+            find: "isSuspiciousDownload:",
             replacement: {
-                match: /JSON\.parse\('\[.+?'\)/,
-                replace: "[]"
+                match: /function \i\(\i\){(?=.{0,60}\.parse\(\i\))/,
+                replace: "$&return null;"
             }
         }
     ]

From c5dd50ad8fbee871b182e3d1203a812d6c43396e Mon Sep 17 00:00:00 2001
From: sunnie <78964224+sunnniee@users.noreply.github.com>
Date: Wed, 25 Oct 2023 18:33:22 +0300
Subject: [PATCH 050/632] fix messageLinkEmbeds, moreUserTags (#1859)

---
 src/plugins/messageLinkEmbeds/index.tsx | 27 +++-------
 src/plugins/moreUserTags/index.tsx      | 69 +++++++++++++------------
 src/webpack/common/index.ts             |  1 +
 src/webpack/common/settingsStores.ts    |  9 ++++
 4 files changed, 52 insertions(+), 54 deletions(-)
 create mode 100644 src/webpack/common/settingsStores.ts

diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index c7b3bd012..e600d737d 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -18,7 +18,6 @@
 
 import { addAccessory } from "@api/MessageAccessories";
 import { definePluginSettings } from "@api/Settings";
-import { getSettingStoreLazy } from "@api/SettingsStore";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants.js";
 import { classes } from "@utils/misc";
@@ -36,6 +35,7 @@ import {
     PermissionStore,
     RestAPI,
     Text,
+    TextAndImagesSettingsStores,
     UserStore
 } from "@webpack/common";
 import { Channel, Guild, Message } from "discord-types/general";
@@ -46,12 +46,11 @@ const messageCache = new Map<string, {
 }>();
 
 const Embed = LazyComponent(() => findByCode(".inlineMediaEmbed"));
-const ChannelMessage = LazyComponent(() => find(m => m.type?.toString()?.includes('["message","compact","className",')));
+const AutoModEmbed = LazyComponent(() => findByCode(".withFooter]:", "childrenMessageContent:"));
+const ChannelMessage = LazyComponent(() => find(m => m.type?.toString()?.includes("renderSimpleAccessories)")));
 
 const SearchResultClasses = findByPropsLazy("message", "searchResult");
 
-let AutoModEmbed: React.ComponentType<any> = () => null;
-
 const messageLinkRegex = /(?<!<)https?:\/\/(?:\w+\.)?discord(?:app)?\.com\/channels\/(\d{17,20}|@me)\/(\d{17,20})\/(\d{17,20})/g;
 const tenorRegex = /^https:\/\/(?:www\.)?tenor\.com\//;
 
@@ -319,10 +318,9 @@ function ChannelMessageEmbedAccessory({ message, channel, guildID }: MessageEmbe
     />;
 }
 
-const compactModeEnabled = getSettingStoreLazy<boolean>("textAndImages", "messageDisplayCompact")!;
-
 function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
     const { message, channel, guildID } = props;
+    const compact = TextAndImagesSettingsStores.MessageDisplayCompact.useSetting();
     const isDM = guildID === "@me";
     const images = getImages(message);
     const { parse } = Parser;
@@ -338,7 +336,7 @@ function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
                 <span>{isDM ? " - Direct Message" : " - " + GuildStore.getGuild(channel.guild_id)?.name}</span>
             </Text>
         }
-        compact={compactModeEnabled.getSetting()}
+        compact={compact}
         content={
             <>
                 {message.content || message.attachments.length <= images.length
@@ -365,20 +363,7 @@ export default definePlugin({
     name: "MessageLinkEmbeds",
     description: "Adds a preview to messages that link another message",
     authors: [Devs.TheSun, Devs.Ven, Devs.RyanCaoDev],
-    dependencies: ["MessageAccessoriesAPI", "SettingsStoreAPI"],
-    patches: [
-        {
-            find: ".embedCard",
-            replacement: [{
-                match: /function (\i)\(\i\){var \i=\i\.message,\i=\i\.channel.{0,200}\.hideTimestamp/,
-                replace: "$self.AutoModEmbed=$1;$&"
-            }]
-        }
-    ],
-
-    set AutoModEmbed(e: any) {
-        AutoModEmbed = e;
-    },
+    dependencies: ["MessageAccessoriesAPI"],
 
     settings,
 
diff --git a/src/plugins/moreUserTags/index.tsx b/src/plugins/moreUserTags/index.tsx
index c8820f8be..9921bca8e 100644
--- a/src/plugins/moreUserTags/index.tsx
+++ b/src/plugins/moreUserTags/index.tsx
@@ -22,7 +22,7 @@ import { Devs } from "@utils/constants";
 import { Margins } from "@utils/margins";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy, findLazy } from "@webpack";
-import { Card, ChannelStore, Forms, GuildStore, Switch, TextInput, Tooltip, useState } from "@webpack/common";
+import { Card, ChannelStore, Forms, GuildStore, PermissionsBits, Switch, TextInput, Tooltip, useState } from "@webpack/common";
 import { RC } from "@webpack/types";
 import { Channel, Message, User } from "discord-types/general";
 
@@ -58,7 +58,6 @@ const PermissionUtil = findByPropsLazy("computePermissions", "canEveryoneRole")
     computePermissions({ ...args }): bigint;
 };
 
-const Permissions = findByPropsLazy("SEND_MESSAGES", "VIEW_CREATOR_MONETIZATION_ANALYTICS") as Record<PermissionName, bigint>;
 const Tag = findLazy(m => m.Types?.[0] === "BOT") as RC<{ type?: number, className?: string, useRemSizes?: boolean; }> & { Types: Record<string, number>; };
 
 const isWebhook = (message: Message, user: User) => !!message?.webhookId && user.isNonUserBot();
@@ -188,17 +187,14 @@ export default definePlugin({
     patches: [
         // add tags to the tag list
         {
-            find: '.BOT=0]="BOT"',
-            replacement: [
-                // add tags to the exported tags list (Tag.Types)
-                {
-                    match: /(\i)\[.\.BOT=0\]="BOT";/,
-                    replace: "$&$1=$self.addTagVariants($1);"
-                }
-            ]
+            find: "BotTagTypes:",
+            replacement: {
+                match: /\((\i)=\{\}\)\)\[(\i)\.BOT/,
+                replace: "($1=$self.getTagTypes()))[$2.BOT"
+            }
         },
         {
-            find: ".DISCORD_SYSTEM_MESSAGE_BOT_TAG_TOOLTIP;",
+            find: ".DISCORD_SYSTEM_MESSAGE_BOT_TAG_TOOLTIP,",
             replacement: [
                 // make the tag show the right text
                 {
@@ -213,25 +209,25 @@ export default definePlugin({
                 },
                 // add HTML data attributes (for easier theming)
                 {
-                    match: /children:\[(?=\i\?null:\i,\i,\(0,\i\.jsx\)\("span",{className:\i\(\)\.botText,children:(\i)}\)\])/,
-                    replace: "'data-tag':$1.toLowerCase(),children:["
+                    match: /.botText,children:(\i)}\)]/,
+                    replace: "$&,'data-tag':$1.toLowerCase()"
                 }
             ],
         },
         // in messages
         {
-            find: ".Types.ORIGINAL_POSTER",
+            find: "renderSystemTag:",
             replacement: {
-                match: /return null==(\i)\?null:\(0,/,
-                replace: "$1=$self.getTag({...arguments[0],origType:$1,location:'chat'});$&"
+                match: /;return\((\(null==\i\?void 0:\i\.isSystemDM\(\).+?.Types.ORIGINAL_POSTER\)),null==(\i)\)/,
+                replace: ";$1;$2=$self.getTag({...arguments[0],origType:$2,location:'chat'});return $2 == null"
             }
         },
         // in the member list
         {
             find: ".Messages.GUILD_OWNER,",
             replacement: {
-                match: /(?<type>\i)=\(null==.{0,50}\.BOT,null!=(?<user>\i)&&\i\.bot/,
-                replace: "$<type> = $self.getTag({user: $<user>, channel: arguments[0].channel, origType: $<user>.bot ? 0 : null, location: 'not-chat' }), typeof $<type> === 'number'"
+                match: /(?<type>\i)=\(null==.{0,100}\.BOT;return null!=(?<user>\i)&&\i\.bot/,
+                replace: "$<type> = $self.getTag({user: $<user>, channel: arguments[0].channel, origType: $<user>.bot ? 0 : null, location: 'not-chat' }); return typeof $<type> === 'number'"
             }
         },
         // pass channel id down props to be used in profiles
@@ -251,11 +247,18 @@ export default definePlugin({
         },
         // in profiles
         {
-            find: "showStreamerModeTooltip:",
-            replacement: {
-                match: /,botType:(\i\((\i)\)),/g,
-                replace: ",botType:$self.getTag({user:$2,channelId:arguments[0].moreTags_channelId,origType:$1,location:'not-chat'}),"
-            }
+            find: ",overrideDiscriminator:",
+            replacement: [
+                {
+                    // prevent channel id from getting ghosted
+                    // it's either this or extremely long lookbehind
+                    match: /user:\i,nick:\i,/,
+                    replace: "$&moreTags_channelId,"
+                }, {
+                    match: /,botType:(\i\((\i)\)),/g,
+                    replace: ",botType:$self.getTag({user:$2,channelId:moreTags_channelId,origType:$1,location:'not-chat'}),"
+                }
+            ]
         },
     ],
 
@@ -295,24 +298,25 @@ export default definePlugin({
         if (!guild) return [];
 
         const permissions = PermissionUtil.computePermissions({ user, context: guild, overwrites: channel.permissionOverwrites });
-        return Object.entries(Permissions)
+        return Object.entries(PermissionsBits)
             .map(([perm, permInt]) =>
                 permissions & permInt ? perm : ""
             )
             .filter(Boolean);
     },
 
-    addTagVariants(tagConstant) {
+    getTagTypes() {
+        const obj = {};
         let i = 100;
         tags.forEach(({ name }) => {
-            tagConstant[name] = ++i;
-            tagConstant[i] = name;
-            tagConstant[`${name}-BOT`] = ++i;
-            tagConstant[i] = `${name}-BOT`;
-            tagConstant[`${name}-OP`] = ++i;
-            tagConstant[i] = `${name}-OP`;
+            obj[name] = ++i;
+            obj[i] = name;
+            obj[`${name}-BOT`] = ++i;
+            obj[i] = `${name}-BOT`;
+            obj[`${name}-OP`] = ++i;
+            obj[i] = `${name}-OP`;
         });
-        return tagConstant;
+        return obj;
     },
 
     isOPTag: (tag: number) => tag === Tag.Types.ORIGINAL_POSTER || tags.some(t => tag === Tag.Types[`${t.name}-OP`]),
@@ -377,7 +381,6 @@ export default definePlugin({
                 break;
             }
         }
-
         return type;
     }
 });
diff --git a/src/webpack/common/index.ts b/src/webpack/common/index.ts
index 2ad9c54ec..5da3cc68b 100644
--- a/src/webpack/common/index.ts
+++ b/src/webpack/common/index.ts
@@ -20,6 +20,7 @@ export * from "./classes";
 export * from "./components";
 export * from "./menu";
 export * from "./react";
+export * from "./settingsStores";
 export * from "./stores";
 export * as ComponentTypes from "./types/components.d";
 export * as MenuTypes from "./types/menu.d";
diff --git a/src/webpack/common/settingsStores.ts b/src/webpack/common/settingsStores.ts
new file mode 100644
index 000000000..ab281e569
--- /dev/null
+++ b/src/webpack/common/settingsStores.ts
@@ -0,0 +1,9 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { findByPropsLazy } from "@webpack";
+
+export const TextAndImagesSettingsStores = findByPropsLazy("MessageDisplayCompact");

From 9c60b38acc13c7fe6b5334beaadfe36288ad825d Mon Sep 17 00:00:00 2001
From: rini <rini@rinici.de>
Date: Wed, 25 Oct 2023 12:34:23 -0300
Subject: [PATCH 051/632] Fix PinDMs, SMYN, SilentTyping, ValidUser,
 PlatformIndicators (#1865)

---
 src/plugins/_api/memberListDecorators.ts | 15 ++++---------
 src/plugins/_api/messageDecorations.ts   |  2 +-
 src/plugins/pinDms/index.tsx             | 28 ++++++++++++------------
 src/plugins/showMeYourName/index.tsx     | 28 +++++++-----------------
 src/plugins/silentTyping/index.tsx       |  6 ++---
 src/plugins/validUser/index.tsx          | 11 ++++------
 6 files changed, 34 insertions(+), 56 deletions(-)

diff --git a/src/plugins/_api/memberListDecorators.ts b/src/plugins/_api/memberListDecorators.ts
index bf7377e85..1251c3578 100644
--- a/src/plugins/_api/memberListDecorators.ts
+++ b/src/plugins/_api/memberListDecorators.ts
@@ -38,17 +38,10 @@ export default definePlugin({
         },
         {
             find: "PrivateChannel.renderAvatar",
-            replacement: [
-                // props are shadowed by nested props so we have to do this
-                {
-                    match: /let\{[^}]*applicationStream:\i[^}]*\}=(\i),/,
-                    replace: "$&vencordProps=$1,"
-                },
-                {
-                    match: /decorators:(\i\.isSystemDM\(\))\?(.+?):null/,
-                    replace: "decorators:[...(typeof vencordProps=='undefined'?[]:Vencord.Api.MemberListDecorators.__getDecorators(vencordProps)), $1?$2:null]"
-                }
-            ]
+            replacement: {
+                match: /decorators:(\i\.isSystemDM\(\))\?(.+?):null/,
+                replace: "decorators:[...Vencord.Api.MemberListDecorators.__getDecorators(arguments[0]), $1?$2:null]"
+            }
         }
     ],
 });
diff --git a/src/plugins/_api/messageDecorations.ts b/src/plugins/_api/messageDecorations.ts
index 3f0fd11db..1646ad645 100644
--- a/src/plugins/_api/messageDecorations.ts
+++ b/src/plugins/_api/messageDecorations.ts
@@ -25,7 +25,7 @@ export default definePlugin({
     authors: [Devs.TheSun],
     patches: [
         {
-            find: "UsernameDecorationTypes:",
+            find: '"Message Username"',
             replacement: {
                 match: /currentUserIsPremium:.{0,70}{children:\i(?=}\))/,
                 replace: "$&.concat(Vencord.Api.MessageDecorations.__addDecorationsToMessage(arguments[0]))"
diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index a7406aa41..ac5957b33 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -66,7 +66,7 @@ export default definePlugin({
                     // filter Discord's privateChannelIds list to remove pins, and pass
                     // pinCount as prop. This needs to be here so that the entire DM list receives
                     // updates on pin/unpin
-                    match: /privateChannelIds:(\i),/,
+                    match: /(?<=\i,{channels:\i,)privateChannelIds:(\i),/,
                     replace: "privateChannelIds:$1.filter(c=>!$self.isPinned(c)),pinCount:$self.usePinCount($1),"
                 },
                 {
@@ -75,39 +75,39 @@ export default definePlugin({
                     // - Section 1: buttons for pages like Friends & Library
                     // - Section 2: our pinned dms
                     // - Section 3: the normal dm list
-                    match: /(?<=renderRow:(\i)\.renderRow,)sections:\[\i,/,
+                    match: /(?<=renderRow:this\.renderRow,)sections:\[\i,/,
                     // For some reason, adding our sections when no private channels are ready yet
                     // makes DMs infinitely load. Thus usePinCount returns either a single element
                     // array with the count, or an empty array. Due to spreading, only in the former
                     // case will an element be added to the outer array
                     // Thanks for the fix, Strencher!
-                    replace: "$&...($1.props.pinCount ?? []),"
+                    replace: "$&...this.props.pinCount??[],"
                 },
                 {
                     // Patch renderSection (renders the header) to set the text to "Pinned DMs" instead of "Direct Messages"
                     // lookbehind is used to lookup parameter name. We could use arguments[0], but
                     // if children ever is wrapped in an iife, it will break
-                    match: /children:(\i\.\i\.Messages.DIRECT_MESSAGES)(?<=renderSection=function\((\i)\).+?)/,
+                    match: /children:(\i\.\i\.Messages.DIRECT_MESSAGES)(?<=renderSection=(\i)=>{.+?)/,
                     replace: "children:$2.section===1?'Pinned DMs':$1"
                 },
                 {
                     // Patch channel lookup inside renderDM
                     // channel=channels[channelIds[row]];
-                    match: /(?<=preRenderedChildren,(\i)=)((\i)\[\i\[\i\]\]);/,
+                    match: /(?<=renderDM=\((\i),(\i)\)=>{.*?this.state,\i=\i\[\i\],\i=)((\i)\[\i\]);/,
                     // section 1 is us, manually get our own channel
                     // section === 1 ? getChannel(channels, row) : channels[channelIds[row]];
-                    replace: "arguments[0]===1?$self.getChannel($3,arguments[1]):$2;"
+                    replace: "$1===1?$self.getChannel($4,$2):$3;"
                 },
                 {
                     // Fix getRowHeight's check for whether this is the DMs section
                     // section === DMS
-                    match: /===\i.DMS&&0/,
+                    match: /===\i\.DMS&&0/,
                     // section -1 === DMS
                     replace: "-1$&"
                 },
                 {
                     // Override scrollToChannel to properly account for pinned channels
-                    match: /(?<=else\{\i\+=)(\i)\*\(.+?(?=;)/,
+                    match: /(?<=scrollTo\(\{to:\i\}\):\(\i\+=)(\d+)\*\(.+?(?=,)/,
                     replace: "$self.getScrollOffset(arguments[0],$1,this.props.padding,this.state.preRenderedChildren,$&)"
                 }
             ]
@@ -115,19 +115,19 @@ export default definePlugin({
 
         // Fix Alt Up/Down navigation
         {
-            find: '"mod+alt+right"',
+            find: ".Routes.APPLICATION_STORE&&",
             replacement: {
-                // channelIds = __OVERLAY__ ? stuff : toArray(getStaticPaths()).concat(toArray(channelIds))
-                match: /(?<=(\i)=__OVERLAY__\?\i:.{0,10})\.concat\((.{0,10})\)/,
+                // channelIds = __OVERLAY__ ? stuff : [...getStaticPaths(),...channelIds)]
+                match: /(?<=\i=__OVERLAY__\?\i:\[\.\.\.\i\(\),\.\.\.)\i/,
                 // ....concat(pins).concat(toArray(channelIds).filter(c => !isPinned(c)))
-                replace: ".concat($self.getSnapshot()).concat($2.filter(c=>!$self.isPinned(c)))"
+                replace: "$self.getSnapshot().concat($&.filter(c=>!$self.isPinned(c)))"
             }
         },
         // fix alt+shift+up/down
         {
-            find: '"alt+shift+down"',
+            find: ".getFlattenedGuildIds()],",
             replacement: {
-                match: /(?<=return \i===\i\.ME\?)\i\.\i\.getPrivateChannelIds\(\)/,
+                match: /(?<=\i===\i\.ME\?)\i\.\i\.getPrivateChannelIds\(\)/,
                 replace: "$self.getSnapshot().concat($&.filter(c=>!$self.isPinned(c)))"
             }
         },
diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx
index 4ccaeea8e..6986f69f2 100644
--- a/src/plugins/showMeYourName/index.tsx
+++ b/src/plugins/showMeYourName/index.tsx
@@ -1,20 +1,8 @@
 /*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Sofia Lima
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 rini
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 import "./styles.css";
 
@@ -56,13 +44,13 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "ShowMeYourName",
     description: "Display usernames next to nicks, or no nicks at all",
-    authors: [Devs.dzshn, Devs.TheKodeToad],
+    authors: [Devs.Rini, Devs.TheKodeToad],
     patches: [
         {
-            find: ".withMentionPrefix",
+            find: '"Message Username"',
             replacement: {
-                match: /(?<=onContextMenu:\i,children:)\i\+\i/,
-                replace: "$self.renderUsername(arguments[0])"
+                match: /(?<=onContextMenu:\i,children:).*?\}/,
+                replace: "$self.renderUsername(arguments[0])}"
             }
         },
     ],
diff --git a/src/plugins/silentTyping/index.tsx b/src/plugins/silentTyping/index.tsx
index a4dc2568d..d4cb27ba4 100644
--- a/src/plugins/silentTyping/index.tsx
+++ b/src/plugins/silentTyping/index.tsx
@@ -74,13 +74,13 @@ function SilentTypingToggle(chatBoxProps: {
 
 export default definePlugin({
     name: "SilentTyping",
-    authors: [Devs.Ven, Devs.dzshn],
+    authors: [Devs.Ven, Devs.Rini],
     description: "Hide that you are typing",
     patches: [
         {
-            find: "startTyping:",
+            find: '.dispatch({type:"TYPING_START_LOCAL"',
             replacement: {
-                match: /startTyping:.+?,stop/,
+                match: /startTyping\(\i\){.+?},stop/,
                 replace: "startTyping:$self.startTyping,stop"
             }
         },
diff --git a/src/plugins/validUser/index.tsx b/src/plugins/validUser/index.tsx
index a3862d4d0..b0c77cb46 100644
--- a/src/plugins/validUser/index.tsx
+++ b/src/plugins/validUser/index.tsx
@@ -21,14 +21,11 @@ import { Devs } from "@utils/constants";
 import { sleep } from "@utils/misc";
 import { Queue } from "@utils/Queue";
 import definePlugin from "@utils/types";
-import { findByCodeLazy } from "@webpack";
-import { UserStore, useState } from "@webpack/common";
-import type { User } from "discord-types/general";
+import { UserStore, UserUtils, useState } from "@webpack/common";
 import type { ComponentType, ReactNode } from "react";
 
 const fetching = new Set<string>();
 const queue = new Queue(5);
-const fetchUser = findByCodeLazy("USER(") as (id: string) => Promise<User>;
 
 interface MentionProps {
     data: {
@@ -88,7 +85,7 @@ function MentionWrapper({ data, UserMention, RoleMention, parse, props }: Mentio
                         fetching.add(id);
 
                         queue.unshift(() =>
-                            fetchUser(id)
+                            UserUtils.getUser(id)
                                 .then(() => {
                                     setUserId(id);
                                     fetching.delete(id);
@@ -122,9 +119,9 @@ export default definePlugin({
         find: 'className:"mention"',
         replacement: {
             // mention = { react: function (data, parse, props) { if (data.userId == null) return RoleMention() else return UserMention()
-            match: /react:(?=function\(\i,\i,\i\).{0,50}return null==\i\?\(0,\i\.jsx\)\((\i),.+?jsx\)\((\i),\{className:"mention")/,
+            match: /react(?=\(\i,\i,\i\).{0,50}return null==\i\?\(0,\i\.jsx\)\((\i\.\i),.+?jsx\)\((\i\.\i),\{className:"mention")/,
             // react: (...args) => OurWrapper(RoleMention, UserMention, ...args), originalReact: theirFunc
-            replace: "react:(...args)=>$self.renderMention($1,$2,...args),originalReact:"
+            replace: "react:(...args)=>$self.renderMention($1,$2,...args),originalReact"
         }
     }],
 

From b659d4e9c1f350769284a4dc2d983aeb942c9e7a Mon Sep 17 00:00:00 2001
From: Syncx <47534062+Syncxv@users.noreply.github.com>
Date: Wed, 25 Oct 2023 21:05:50 +0530
Subject: [PATCH 052/632] fix: FavoriteEmojiFirst (#1844)

---
 src/plugins/favEmojiFirst/index.ts | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/plugins/favEmojiFirst/index.ts b/src/plugins/favEmojiFirst/index.ts
index fec0b045d..f34b13884 100644
--- a/src/plugins/favEmojiFirst/index.ts
+++ b/src/plugins/favEmojiFirst/index.ts
@@ -39,22 +39,27 @@ export default definePlugin({
     description: "Puts your favorite emoji first in the emoji autocomplete.",
     patches: [
         {
-            find: ".activeCommandOption",
+            find: "renderResults({results:",
             replacement: [
                 {
-                    // = someFunc(a.selectedIndex); ...trackEmojiSearch({ state: theState, isInPopoutExperimental: someBool })
-                    match: /=\i\(\i\.selectedIndex\);(?=.+?state:(\i),isInPopoutExperiment:\i)/,
-                    // self.sortEmojis(theState)
-                    replace: "$&$self.sortEmojis($1);"
+                    // https://regex101.com/r/N7kpLM/1
+                    match: /let \i=.{1,100}renderResults\({results:(\i)\.query\.results,/,
+                    replace: "$self.sortEmojis($1);$&"
                 },
+            ],
+        },
 
+        {
+            find: "MAX_AUTOCOMPLETE_RESULTS+",
+            replacement: [
                 // set maxCount to Infinity so our sortEmojis callback gets the entire list, not just the first 10
                 // and remove Discord's emojiResult slice, storing the endIndex on the array for us to use later
                 {
+                    // https://regex101.com/r/x2mobQ/1
                     // searchEmojis(...,maxCount: stuff) ... endEmojis = emojis.slice(0, maxCount - gifResults.length)
-                    match: /,maxCount:(\i)(.+?)=(\i)\.slice\(0,(\1-\i\.length)\)/,
+                    match: /,maxCount:(\i)(.{1,500}\i)=(\i)\.slice\(0,(\i-\i\.length)\)/,
                     // ,maxCount:Infinity ... endEmojis = (emojis.sliceTo = n, emojis)
-                    replace: ",maxCount:Infinity$2=($3.sliceTo=$4,$3)"
+                    replace: ",maxCount:Infinity$2=($3.sliceTo = $4, $3)"
                 }
             ]
         }

From 3bd657611cbc6b3cf3142ae59c39713922d167df Mon Sep 17 00:00:00 2001
From: redstonekasi <kasi@hanneskann.de>
Date: Wed, 25 Oct 2023 17:36:19 +0200
Subject: [PATCH 053/632] fix: StartupTimings (#1869)

---
 src/plugins/startupTimings/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/startupTimings/index.tsx b/src/plugins/startupTimings/index.tsx
index 3eec9d0cd..c7417f0fc 100644
--- a/src/plugins/startupTimings/index.tsx
+++ b/src/plugins/startupTimings/index.tsx
@@ -25,9 +25,9 @@ export default definePlugin({
     description: "Adds Startup Timings to the Settings menu",
     authors: [Devs.Megu],
     patches: [{
-        find: "PAYMENT_FLOW_MODAL_TEST_PAGE,",
+        find: "UserSettingsSections.PAYMENT_FLOW_MODAL_TEST_PAGE,",
         replacement: {
-            match: /{section:.{1,2}\..{1,3}\.PAYMENT_FLOW_MODAL_TEST_PAGE/,
+            match: /{section:\i\.UserSettingsSections\.PAYMENT_FLOW_MODAL_TEST_PAGE/,
             replace: '{section:"StartupTimings",label:"Startup Timings",element:$self.StartupTimingPage},$&'
         }
     }],

From 1130521e4b2e5f5f06bab458767224dca44b3b33 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 18:07:12 +0200
Subject: [PATCH 054/632] Fix WebContextMenus

---
 src/plugins/webContextMenus.web/index.ts | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index 26ae19c5d..cd31e7aa8 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -98,8 +98,8 @@ export default definePlugin({
             replacement: [
                 {
                     // if (!IS_WEB || null ==
-                    match: /if\(!\i\.\i\|\|null==/,
-                    replace: "if(null=="
+                    match: /!\i\.isPlatformEmbedded/,
+                    replace: "false"
                 },
                 {
                     match: /return\s*?\[\i\.\i\.canCopyImage\(\)/,
@@ -132,23 +132,22 @@ export default definePlugin({
             find: '"interactionUsernameProfile"',
             predicate: () => settings.store.addBack,
             replacement: {
-                match: /if\("A"===\i\.tagName&&""!==\i\.textContent\)/,
-                replace: "if(false)"
+                match: /if\((?="A"===\i\.tagName&&""!==\i\.textContent)/,
+                replace: "if(false&&"
             }
         },
 
         // Add back slate / text input context menu
         {
-            find: '"slate-toolbar"',
+            find: 'getElementById("slate-toolbar"',
             predicate: () => settings.store.addBack,
             replacement: {
-                match: /(?<=\.handleContextMenu=.+?"bottom";)\i\.\i\?/,
-                replace: "true?"
+                match: /(?<=handleContextMenu\(\i\)\{.{0,200}isPlatformEmbedded)\?/,
+                replace: "||true?"
             }
         },
         {
             find: 'navId:"textarea-context"',
-            all: true,
             predicate: () => settings.store.addBack,
             replacement: [
                 {
@@ -167,7 +166,7 @@ export default definePlugin({
             find: '"add-to-dictionary"',
             predicate: () => settings.store.addBack,
             replacement: {
-                match: /var \i=\i\.text,/,
+                match: /let\{text:\i=""/,
                 replace: "return [null,null];$&"
             }
         }

From 024a77c577cb7b082c46ce24b0ee33851abface9 Mon Sep 17 00:00:00 2001
From: Jack Matthews <jm5112356@gmail.com>
Date: Wed, 25 Oct 2023 11:48:17 -0400
Subject: [PATCH 055/632] fix: typingIndicator

---
 src/plugins/typingIndicator/index.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/plugins/typingIndicator/index.tsx b/src/plugins/typingIndicator/index.tsx
index 5f7df4770..8ac344606 100644
--- a/src/plugins/typingIndicator/index.tsx
+++ b/src/plugins/typingIndicator/index.tsx
@@ -26,7 +26,12 @@ import { ChannelStore, GuildMemberStore, RelationshipStore, Tooltip, UserStore,
 
 import { buildSeveralUsers } from "../typingTweaks";
 
-const ThreeDots = LazyComponent(() => find(m => m.type?.render?.toString()?.includes("().dots")));
+const ThreeDots = LazyComponent(() => {
+    // This doesn't really need to explicitly find Dots' own module, but it's fine
+    const res = find(m => m.Dots && !m.Menu);
+
+    return res?.Dots;
+});
 
 const TypingStore = findStoreLazy("TypingStore");
 const UserGuildSettingsStore = findStoreLazy("UserGuildSettingsStore");
@@ -126,8 +131,8 @@ export default definePlugin({
         {
             find: ".UNREAD_HIGHLIGHT",
             replacement: {
-                match: /\(\).children.+?:null(?<=(\i)=\i\.channel,.+?)/,
-                replace: (m, channel) => `${m},$self.TypingIndicator(${channel}.id)`
+                match: /channel:(\i).{0,100}?channelEmoji,.{0,250}?\.children.{0,50}?:null/,
+                replace: "$&,$self.TypingIndicator($1.id)"
             }
         }
     ],

From 4f8c75372cd63f891f21452f6144823a646c26f6 Mon Sep 17 00:00:00 2001
From: redstonekasi <kasi@hanneskann.de>
Date: Wed, 25 Oct 2023 18:09:04 +0200
Subject: [PATCH 056/632] fix: NoBlockedMessages (#1870)

---
 src/plugins/noBlockedMessages/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/noBlockedMessages/index.ts b/src/plugins/noBlockedMessages/index.ts
index 54bb2d051..f9de3e13c 100644
--- a/src/plugins/noBlockedMessages/index.ts
+++ b/src/plugins/noBlockedMessages/index.ts
@@ -29,11 +29,11 @@ export default definePlugin({
     authors: [Devs.rushii, Devs.Samu],
     patches: [
         {
-            find: 'safety_prompt:"DMSpamExperiment",response:"show_redacted_messages"',
+            find: "Messages.BLOCKED_MESSAGES_HIDE",
             replacement: [
                 {
-                    match: /\.collapsedReason;return/,
-                    replace: ".collapsedReason;return null;return;"
+                    match: /let\{[^}]*collapsedReason[^}]*\}/,
+                    replace: "return null;$&"
                 }
             ]
         },

From ddc39fe84d8b382bf2b5aa93b52c21fc4636330b Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 18:15:12 +0200
Subject: [PATCH 057/632] Fix SettingStores, GameActivityToggle

---
 src/api/SettingsStore.ts                 | 69 ------------------------
 src/api/index.ts                         |  5 --
 src/plugins/_api/settingsStore.ts        | 38 -------------
 src/plugins/gameActivityToggle/index.tsx | 10 ++--
 src/plugins/gameActivityToggle/style.css |  2 +-
 src/plugins/ignoreActivities/index.tsx   |  7 +--
 src/webpack/common/settingsStores.ts     |  1 +
 7 files changed, 8 insertions(+), 124 deletions(-)
 delete mode 100644 src/api/SettingsStore.ts
 delete mode 100644 src/plugins/_api/settingsStore.ts

diff --git a/src/api/SettingsStore.ts b/src/api/SettingsStore.ts
deleted file mode 100644
index d9369a956..000000000
--- a/src/api/SettingsStore.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { proxyLazy } from "@utils/lazy";
-import { Logger } from "@utils/Logger";
-import { findModuleId, wreq } from "@webpack";
-
-import { Settings } from "./Settings";
-
-interface Setting<T> {
-    /**
-     * Get the setting value
-     */
-    getSetting(): T;
-    /**
-     * Update the setting value
-     * @param value The new value
-     */
-    updateSetting(value: T | ((old: T) => T)): Promise<void>;
-    /**
-     * React hook for automatically updating components when the setting is updated
-     */
-    useSetting(): T;
-    settingsStoreApiGroup: string;
-    settingsStoreApiName: string;
-}
-
-const SettingsStores: Array<Setting<any>> | undefined = proxyLazy(() => {
-    const modId = findModuleId('"textAndImages","renderSpoilers"');
-    if (modId == null) return new Logger("SettingsStoreAPI").error("Didn't find stores module.");
-
-    const mod = wreq(modId);
-    if (mod == null) return;
-
-    return Object.values(mod).filter((s: any) => s?.settingsStoreApiGroup) as any;
-});
-
-/**
- * Get the store for a setting
- * @param group The setting group
- * @param name The name of the setting
- */
-export function getSettingStore<T = any>(group: string, name: string): Setting<T> | undefined {
-    if (!Settings.plugins.SettingsStoreAPI.enabled) throw new Error("Cannot use SettingsStoreAPI without setting as dependency.");
-
-    return SettingsStores?.find(s => s?.settingsStoreApiGroup === group && s?.settingsStoreApiName === name);
-}
-
-/**
- * getSettingStore but lazy
- */
-export function getSettingStoreLazy<T = any>(group: string, name: string) {
-    return proxyLazy(() => getSettingStore<T>(group, name));
-}
diff --git a/src/api/index.ts b/src/api/index.ts
index f2c47e559..08f238104 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -29,7 +29,6 @@ import * as $Notices from "./Notices";
 import * as $Notifications from "./Notifications";
 import * as $ServerList from "./ServerList";
 import * as $Settings from "./Settings";
-import * as $SettingsStore from "./SettingsStore";
 import * as $Styles from "./Styles";
 
 /**
@@ -91,10 +90,6 @@ export const MemberListDecorators = $MemberListDecorators;
  * An API allowing you to persist data
  */
 export const Settings = $Settings;
-/**
- * An API allowing you to read, manipulate and automatically update components based on Discord settings
- */
-export const SettingsStore = $SettingsStore;
 /**
  * An API allowing you to dynamically load styles
  * a
diff --git a/src/plugins/_api/settingsStore.ts b/src/plugins/_api/settingsStore.ts
deleted file mode 100644
index ca1dc65bf..000000000
--- a/src/plugins/_api/settingsStore.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-
-export default definePlugin({
-    name: "SettingsStoreAPI",
-    description: "Patches Discord's SettingsStores to expose their group and name",
-    authors: [Devs.Nuckyz],
-
-    patches: [
-        {
-            find: '"textAndImages","renderSpoilers"',
-            replacement: [
-                {
-                    match: /(?<=INFREQUENT_USER_ACTION.{0,20}),useSetting:function/,
-                    replace: ",settingsStoreApiGroup:arguments[0],settingsStoreApiName:arguments[1]$&"
-                }
-            ]
-        }
-    ]
-});
diff --git a/src/plugins/gameActivityToggle/index.tsx b/src/plugins/gameActivityToggle/index.tsx
index 40318c023..735f124c5 100644
--- a/src/plugins/gameActivityToggle/index.tsx
+++ b/src/plugins/gameActivityToggle/index.tsx
@@ -16,16 +16,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { getSettingStoreLazy } from "@api/SettingsStore";
 import { disableStyle, enableStyle } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { findByCodeLazy } from "@webpack";
+import { StatusSettingsStores } from "@webpack/common";
 
 import style from "./style.css?managed";
 
-const ShowCurrentGame = getSettingStoreLazy<boolean>("status", "showCurrentGame");
 const Button = findByCodeLazy("Button.Sizes.NONE,disabled:");
 
 function makeIcon(showCurrentGame?: boolean) {
@@ -40,7 +39,7 @@ function makeIcon(showCurrentGame?: boolean) {
                 {!showCurrentGame && <>
                     <mask id="gameActivityMask" >
                         <rect fill="white" x="0" y="0" width="24" height="24" />
-                        <path fill="black" d="M23.27 4.54 19.46.73 .73 19.46 4.54 23.27 23.27 4.54Z"/>
+                        <path fill="black" d="M23.27 4.54 19.46.73 .73 19.46 4.54 23.27 23.27 4.54Z" />
                     </mask>
                     <path fill="var(--status-danger)" d="M23 2.27 21.73 1 1 21.73 2.27 23 23 2.27Z" />
                 </>}
@@ -50,7 +49,7 @@ function makeIcon(showCurrentGame?: boolean) {
 }
 
 function GameActivityToggleButton() {
-    const showCurrentGame = ShowCurrentGame?.useSetting();
+    const showCurrentGame = StatusSettingsStores.ShowCurrentGame.useSetting();
 
     return (
         <Button
@@ -58,7 +57,7 @@ function GameActivityToggleButton() {
             icon={makeIcon(showCurrentGame)}
             role="switch"
             aria-checked={!showCurrentGame}
-            onClick={() => ShowCurrentGame?.updateSetting(old => !old)}
+            onClick={() => StatusSettingsStores.ShowCurrentGame.updateSetting(old => !old)}
         />
     );
 }
@@ -67,7 +66,6 @@ export default definePlugin({
     name: "GameActivityToggle",
     description: "Adds a button next to the mic and deafen button to toggle game activity.",
     authors: [Devs.Nuckyz, Devs.RuukuLada],
-    dependencies: ["SettingsStoreAPI"],
 
     patches: [
         {
diff --git a/src/plugins/gameActivityToggle/style.css b/src/plugins/gameActivityToggle/style.css
index c25b366c9..d77d30096 100644
--- a/src/plugins/gameActivityToggle/style.css
+++ b/src/plugins/gameActivityToggle/style.css
@@ -1,3 +1,3 @@
 [class*="withTagAsButton"] {
-    min-width: 88px;
+    min-width: 88px !important;
 }
diff --git a/src/plugins/ignoreActivities/index.tsx b/src/plugins/ignoreActivities/index.tsx
index 18dd7993e..6f8e27b3e 100644
--- a/src/plugins/ignoreActivities/index.tsx
+++ b/src/plugins/ignoreActivities/index.tsx
@@ -6,13 +6,12 @@
 
 import * as DataStore from "@api/DataStore";
 import { definePluginSettings } from "@api/Settings";
-import { getSettingStoreLazy } from "@api/SettingsStore";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { useForceUpdater } from "@utils/react";
 import definePlugin from "@utils/types";
 import { findStoreLazy } from "@webpack";
-import { Tooltip } from "webpack/common";
+import { StatusSettingsStores, Tooltip } from "webpack/common";
 
 const enum ActivitiesTypes {
     Game,
@@ -26,7 +25,6 @@ interface IgnoredActivity {
 }
 
 const RunningGameStore = findStoreLazy("RunningGameStore");
-const ShowCurrentGame = getSettingStoreLazy<boolean>("status", "showCurrentGame");
 
 function ToggleIcon(activity: IgnoredActivity, tooltipText: string, path: string, fill: string) {
     const forceUpdate = useForceUpdater();
@@ -68,7 +66,7 @@ function handleActivityToggle(e: React.MouseEvent<HTMLButtonElement, MouseEvent>
     else settings.store.ignoredActivities = getIgnoredActivities().filter((_, index) => index !== ignoredActivityIndex);
 
     // Trigger activities recalculation
-    ShowCurrentGame?.updateSetting(old => old);
+    StatusSettingsStores.ShowCurrentGame.updateSetting(old => old);
     forceUpdateButton();
 }
 
@@ -85,7 +83,6 @@ export default definePlugin({
     authors: [Devs.Nuckyz],
     description: "Ignore activities from showing up on your status ONLY. You can configure which ones are ignored from the Registered Games and Activities tabs.",
 
-    dependencies: ["SettingsStoreAPI"],
     settings,
 
     patches: [
diff --git a/src/webpack/common/settingsStores.ts b/src/webpack/common/settingsStores.ts
index ab281e569..c8afb72d8 100644
--- a/src/webpack/common/settingsStores.ts
+++ b/src/webpack/common/settingsStores.ts
@@ -7,3 +7,4 @@
 import { findByPropsLazy } from "@webpack";
 
 export const TextAndImagesSettingsStores = findByPropsLazy("MessageDisplayCompact");
+export const StatusSettingsStores = findByPropsLazy("ShowCurrentGame");

From fbc5038306eeeb809a77639237d50aa25c71211f Mon Sep 17 00:00:00 2001
From: rini <rini@rinici.de>
Date: Wed, 25 Oct 2023 13:20:32 -0300
Subject: [PATCH 058/632] fix: RPC plugins (#1873)

---
 src/plugins/arRPC.web/index.tsx | 17 +++++------------
 src/plugins/customRPC/index.tsx | 14 +++-----------
 src/plugins/lastfm/index.tsx    | 12 +++---------
 src/webpack/common/utils.ts     |  4 ++++
 4 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/src/plugins/arRPC.web/index.tsx b/src/plugins/arRPC.web/index.tsx
index 1db0c4578..423dce9b5 100644
--- a/src/plugins/arRPC.web/index.tsx
+++ b/src/plugins/arRPC.web/index.tsx
@@ -20,26 +20,19 @@ import { popNotice, showNotice } from "@api/Notices";
 import { Link } from "@components/Link";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { filters, findByCodeLazy, mapMangledModuleLazy } from "@webpack";
-import { FluxDispatcher, Forms, Toasts } from "@webpack/common";
+import { findByPropsLazy } from "@webpack";
+import { ApplicationAssetUtils, FluxDispatcher, Forms, Toasts } from "@webpack/common";
 
-const assetManager = mapMangledModuleLazy(
-    "getAssetImage: size must === [number, number] for Twitch",
-    {
-        getAsset: filters.byCode("apply("),
-    }
-);
-
-const lookupRpcApp = findByCodeLazy(".APPLICATION_RPC(");
+const RpcUtils = findByPropsLazy("fetchApplicationsRPC", "getRemoteIconURL");
 
 async function lookupAsset(applicationId: string, key: string): Promise<string> {
-    return (await assetManager.getAsset(applicationId, [key, undefined]))[0];
+    return (await ApplicationAssetUtils.fetchAssetIds(applicationId, [key]))[0];
 }
 
 const apps: any = {};
 async function lookupApp(applicationId: string): Promise<string> {
     const socket: any = {};
-    await lookupRpcApp(socket, applicationId);
+    await RpcUtils.fetchApplicationsRPC(socket, applicationId);
     return socket.application;
 }
 
diff --git a/src/plugins/customRPC/index.tsx b/src/plugins/customRPC/index.tsx
index 2ec7f53f7..25ad7b3e6 100644
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@@ -22,23 +22,15 @@ import { Devs } from "@utils/constants";
 import { isTruthy } from "@utils/guards";
 import { useAwaiter } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { filters, findByCodeLazy, findByPropsLazy, mapMangledModuleLazy } from "@webpack";
-import { FluxDispatcher, Forms, GuildStore, React, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common";
+import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { ApplicationAssetUtils, FluxDispatcher, Forms, GuildStore, React, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common";
 
 const ActivityComponent = findByCodeLazy("onOpenGameProfile");
 const ActivityClassName = findByPropsLazy("activity", "buttonColor");
 const Colors = findByPropsLazy("profileColors");
 
-const assetManager = mapMangledModuleLazy(
-    "getAssetImage: size must === [number, number] for Twitch",
-    {
-        getAsset: filters.byCode("APPLICATION_ASSETS_FETCH_SUCCESS"),
-    }
-);
-
 async function getApplicationAsset(key: string): Promise<string> {
-    if (/https?:\/\/(cdn|media)\.discordapp\.(com|net)\/attachments\//.test(key)) return "mp:" + key.replace(/https?:\/\/(cdn|media)\.discordapp\.(com|net)\//, "");
-    return (await assetManager.getAsset(settings.store.appID, [key, undefined]))[0];
+    return (await ApplicationAssetUtils.fetchAssetIds(settings.store.appID!, [key]))[0];
 }
 
 interface ActivityAssets {
diff --git a/src/plugins/lastfm/index.tsx b/src/plugins/lastfm/index.tsx
index 7a42f8f78..179b8260c 100644
--- a/src/plugins/lastfm/index.tsx
+++ b/src/plugins/lastfm/index.tsx
@@ -21,8 +21,8 @@ import { Link } from "@components/Link";
 import { Devs } from "@utils/constants";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
-import { filters, findByPropsLazy, mapMangledModuleLazy } from "@webpack";
-import { FluxDispatcher, Forms } from "@webpack/common";
+import { findByPropsLazy } from "@webpack";
+import { ApplicationAssetUtils, FluxDispatcher, Forms } from "@webpack/common";
 
 interface ActivityAssets {
     large_image?: string;
@@ -86,15 +86,9 @@ const placeholderId = "2a96cbd8b46e442fc41c2b86b821562f";
 const logger = new Logger("LastFMRichPresence");
 
 const presenceStore = findByPropsLazy("getLocalPresence");
-const assetManager = mapMangledModuleLazy(
-    "getAssetImage: size must === [number, number] for Twitch",
-    {
-        getAsset: filters.byCode("apply("),
-    }
-);
 
 async function getApplicationAsset(key: string): Promise<string> {
-    return (await assetManager.getAsset(applicationId, [key, undefined]))[0];
+    return (await ApplicationAssetUtils.fetchAssetIds(applicationId, [key]))[0];
 }
 
 function setActivity(activity: Activity | null) {
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index ec0de86d0..a1dcadc69 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -93,6 +93,10 @@ export function showToast(message: string, type = ToastType.MESSAGE) {
 
 export const UserUtils = findByPropsLazy("getUser", "fetchCurrentUser") as { getUser: (id: string) => Promise<User>; };
 
+export const ApplicationAssetUtils = findByPropsLazy("fetchAssetIds", "getAssetImage") as {
+    fetchAssetIds: (applicationId: string, e: string[]) => Promise<string[]>;
+};
+
 export const Clipboard = mapMangledModuleLazy('document.queryCommandEnabled("copy")||document.queryCommandSupported("copy")', {
     copy: filters.byCode(".copy("),
     SUPPORTS_COPY: x => typeof x === "boolean",

From baf952512cf042b11599d96e34950881ab940e97 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 18:34:56 +0200
Subject: [PATCH 059/632] Fix InvisChat, PreviewMsg, SendTimestamps, SilentMsg,
 SilentType, Translate

---
 src/plugins/invisibleChat.desktop/index.tsx |  6 +++---
 src/plugins/previewMessage/index.tsx        |  6 +++---
 src/plugins/sendTimestamps/index.tsx        |  6 +++---
 src/plugins/silentMessageToggle/index.tsx   | 10 +++++-----
 src/plugins/silentTyping/index.tsx          |  7 +++----
 src/plugins/translate/index.tsx             |  6 +++---
 6 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/plugins/invisibleChat.desktop/index.tsx b/src/plugins/invisibleChat.desktop/index.tsx
index 58fccb9ce..e55f1e0c6 100644
--- a/src/plugins/invisibleChat.desktop/index.tsx
+++ b/src/plugins/invisibleChat.desktop/index.tsx
@@ -136,10 +136,10 @@ export default definePlugin({
             }
         },
         {
-            find: ".activeCommandOption",
+            find: "ChannelTextAreaButtons",
             replacement: {
-                match: /(.)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
-                replace: "$&;try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}",
+                match: /(\i)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
+                replace: "$&,(()=>{try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}})()",
             }
         },
     ],
diff --git a/src/plugins/previewMessage/index.tsx b/src/plugins/previewMessage/index.tsx
index 393b5209f..bc6751141 100644
--- a/src/plugins/previewMessage/index.tsx
+++ b/src/plugins/previewMessage/index.tsx
@@ -129,10 +129,10 @@ export default definePlugin({
     authors: [Devs.Aria],
     patches: [
         {
-            find: ".activeCommandOption",
+            find: "ChannelTextAreaButtons",
             replacement: {
-                match: /(.)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
-                replace: "$&;try{$2||$1.unshift($self.previewIcon(arguments[0]))}catch{}",
+                match: /(\i)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
+                replace: "$&,(()=>{try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}})()",
             }
         },
     ],
diff --git a/src/plugins/sendTimestamps/index.tsx b/src/plugins/sendTimestamps/index.tsx
index a69dbaccc..7904545c8 100644
--- a/src/plugins/sendTimestamps/index.tsx
+++ b/src/plugins/sendTimestamps/index.tsx
@@ -121,10 +121,10 @@ export default definePlugin({
 
     patches: [
         {
-            find: ".activeCommandOption",
+            find: "ChannelTextAreaButtons",
             replacement: {
-                match: /(.)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
-                replace: "$&;try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}",
+                match: /(\i)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
+                replace: "$&,(()=>{try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}})()",
             }
         },
     ],
diff --git a/src/plugins/silentMessageToggle/index.tsx b/src/plugins/silentMessageToggle/index.tsx
index 22d2c0541..a1ee8de89 100644
--- a/src/plugins/silentMessageToggle/index.tsx
+++ b/src/plugins/silentMessageToggle/index.tsx
@@ -108,13 +108,13 @@ export default definePlugin({
     settings,
     patches: [
         {
-            find: ".activeCommandOption",
+            find: "ChannelTextAreaButtons",
             replacement: {
-                match: /"gift"\)\);(?<=(\i)\.push.+?disabled:(\i),.+?)/,
-                replace: (m, array, disabled) => `${m};try{${disabled}||${array}.push($self.SilentMessageToggle(arguments[0]));}catch{}`
+                match: /(\i)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
+                replace: "$&,(()=>{try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}})()",
             }
-        }
+        },
     ],
 
-    SilentMessageToggle: ErrorBoundary.wrap(SilentMessageToggle, { noop: true }),
+    chatBarIcon: ErrorBoundary.wrap(SilentMessageToggle, { noop: true }),
 });
diff --git a/src/plugins/silentTyping/index.tsx b/src/plugins/silentTyping/index.tsx
index d4cb27ba4..031db0998 100644
--- a/src/plugins/silentTyping/index.tsx
+++ b/src/plugins/silentTyping/index.tsx
@@ -85,11 +85,10 @@ export default definePlugin({
             }
         },
         {
-            find: ".activeCommandOption",
-            predicate: () => settings.store.showIcon,
+            find: "ChannelTextAreaButtons",
             replacement: {
-                match: /(.)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
-                replace: "$&;try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}",
+                match: /(\i)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
+                replace: "$&,(()=>{try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}})()",
             }
         },
     ],
diff --git a/src/plugins/translate/index.tsx b/src/plugins/translate/index.tsx
index 3007032b8..3b067c634 100644
--- a/src/plugins/translate/index.tsx
+++ b/src/plugins/translate/index.tsx
@@ -62,10 +62,10 @@ export default definePlugin({
 
     patches: [
         {
-            find: ".activeCommandOption",
+            find: "ChannelTextAreaButtons",
             replacement: {
-                match: /(.)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
-                replace: "$&;try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}",
+                match: /(\i)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
+                replace: "$&,(()=>{try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}})()",
             }
         },
     ],

From c90440f03140d77876402a46d28851474e53815d Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 18:42:31 +0200
Subject: [PATCH 060/632] Fix Settings Proto

---
 src/utils/discord.tsx                | 7 +++----
 src/webpack/common/settingsStores.ts | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/utils/discord.tsx b/src/utils/discord.tsx
index a36ecfbb9..76721d044 100644
--- a/src/utils/discord.tsx
+++ b/src/utils/discord.tsx
@@ -17,13 +17,12 @@
 */
 
 import { MessageObject } from "@api/MessageEvents";
-import { findByCodeLazy, findByPropsLazy, findLazy } from "@webpack";
-import { ChannelStore, ComponentDispatch, FluxDispatcher, GuildStore, MaskedLink, ModalImageClasses, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileStore, UserUtils } from "@webpack/common";
+import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { ChannelStore, ComponentDispatch, FluxDispatcher, GuildStore, MaskedLink, ModalImageClasses, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
 import { Guild, Message, User } from "discord-types/general";
 
 import { ImageModal, ModalRoot, ModalSize, openModal } from "./modal";
 
-const PreloadedUserSettings = findLazy(m => m.ProtoClass?.typeName.endsWith("PreloadedUserSettings"));
 const MessageActions = findByPropsLazy("editMessage", "sendMessage");
 
 export function getCurrentChannel() {
@@ -44,7 +43,7 @@ export const enum Theme {
 }
 
 export function getTheme(): Theme {
-    return PreloadedUserSettings.getCurrentValue()?.appearance?.theme;
+    return UserSettingsActionCreators.PreloadedUserSettingsActionCreators.getCurrentValue()?.appearance?.theme;
 }
 
 export function insertTextIntoChatInputBox(text: string) {
diff --git a/src/webpack/common/settingsStores.ts b/src/webpack/common/settingsStores.ts
index c8afb72d8..6db21949a 100644
--- a/src/webpack/common/settingsStores.ts
+++ b/src/webpack/common/settingsStores.ts
@@ -8,3 +8,5 @@ import { findByPropsLazy } from "@webpack";
 
 export const TextAndImagesSettingsStores = findByPropsLazy("MessageDisplayCompact");
 export const StatusSettingsStores = findByPropsLazy("ShowCurrentGame");
+
+export const UserSettingsActionCreators = findByPropsLazy("PreloadedUserSettingsActionCreators");

From 1a607639ccc9e7cbd977f5d5306d486508e4cc24 Mon Sep 17 00:00:00 2001
From: Jack <30497388+FieryFlames@users.noreply.github.com>
Date: Wed, 25 Oct 2023 12:43:28 -0400
Subject: [PATCH 061/632] fix: greetStickerPicker (#1874)

---
 src/plugins/greetStickerPicker/index.tsx | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/plugins/greetStickerPicker/index.tsx b/src/plugins/greetStickerPicker/index.tsx
index 52f70b3cd..2c8f33799 100644
--- a/src/plugins/greetStickerPicker/index.tsx
+++ b/src/plugins/greetStickerPicker/index.tsx
@@ -18,8 +18,9 @@
 
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
+import { proxyLazy } from "@utils/lazy";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { findByProps, findByPropsLazy } from "@webpack";
 import { ContextMenu, FluxDispatcher, Menu } from "@webpack/common";
 import { Channel, Message } from "discord-types/general";
 
@@ -50,6 +51,7 @@ const settings = definePluginSettings({
 }>();
 
 const MessageActions = findByPropsLazy("sendGreetMessage");
+const WELCOME_STICKERS = proxyLazy(() => findByProps("WELCOME_STICKERS")?.WELCOME_STICKERS);
 
 function greet(channel: Channel, message: Message, stickers: string[]) {
     const options = MessageActions.getSendMessageOptionsForReply({
@@ -75,7 +77,7 @@ function greet(channel: Channel, message: Message, stickers: string[]) {
 }
 
 
-function GreetMenu({ stickers, channel, message }: { stickers: Sticker[], message: Message, channel: Channel; }) {
+function GreetMenu({ channel, message }: { message: Message, channel: Channel; }) {
     const s = settings.use(["greetMode", "multiGreetChoices"]);
     const { greetMode, multiGreetChoices = [] } = s;
 
@@ -105,7 +107,7 @@ function GreetMenu({ stickers, channel, message }: { stickers: Sticker[], messag
             <Menu.MenuGroup
                 label="Greet Stickers"
             >
-                {stickers.map(sticker => (
+                {WELCOME_STICKERS.map(sticker => (
                     <Menu.MenuItem
                         key={sticker.id}
                         id={"greet-" + sticker.id}
@@ -123,7 +125,7 @@ function GreetMenu({ stickers, channel, message }: { stickers: Sticker[], messag
                         label="Unholy Multi-Greet"
                         id="unholy-multi-greet"
                     >
-                        {stickers.map(sticker => {
+                        {WELCOME_STICKERS.map(sticker => {
                             const checked = multiGreetChoices.some(s => s === sticker.id);
 
                             return (
@@ -168,21 +170,20 @@ export default definePlugin({
         {
             find: "Messages.WELCOME_CTA_LABEL",
             replacement: {
-                match: /innerClassName:\i\(\).welcomeCTAButton,(?<=%\i\.length;return (\i)\[\i\].+?)/,
-                replace: "$&onContextMenu:(e)=>$self.pickSticker(e,$1,arguments[0]),"
+                match: /innerClassName:\i\.welcomeCTAButton,(?<={channel:\i,message:\i}=(\i).{0,400}?)/,
+                replace: "$&onContextMenu:(vcEvent)=>$self.pickSticker(vcEvent, $1),"
             }
         }
     ],
 
     pickSticker(
         event: React.UIEvent,
-        stickers: Sticker[],
         props: {
             channel: Channel,
             message: Message;
         }
     ) {
         if (!(props.message as any).deleted)
-            ContextMenu.open(event, () => <GreetMenu stickers={stickers} {...props} />);
+            ContextMenu.open(event, () => <GreetMenu {...props} />);
     }
 });

From 61fac0a8f1adc35b3c54cd58bde17c7dd55abcc0 Mon Sep 17 00:00:00 2001
From: redstonekasi <kasi@hanneskann.de>
Date: Wed, 25 Oct 2023 18:46:32 +0200
Subject: [PATCH 062/632] fix: NoPendingCount (#1871)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/noPendingCount/index.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/noPendingCount/index.ts b/src/plugins/noPendingCount/index.ts
index 21bd196a6..9dce56ba6 100644
--- a/src/plugins/noPendingCount/index.ts
+++ b/src/plugins/noPendingCount/index.ts
@@ -84,8 +84,10 @@ export default definePlugin({
             find: "showProgressBadge:",
             predicate: () => settings.store.hidePremiumOffersCount,
             replacement: {
-                match: /=\i\.unviewedTrialCount\+\i\.unviewedDiscountCount/,
-                replace: "=0"
+                // The two groups inside the first group grab the minified names of the variables,
+                // they are then referenced later to find unviewedTrialCount + unviewedDiscountCount.
+                match: /(?<=\{unviewedTrialCount:(\i),unviewedDiscountCount:(\i)\}.{0,200}\i=)\1\+\2/,
+                replace: "0"
             }
         }
     ],

From bb900785ed85ad536a353455ae627a96121779f2 Mon Sep 17 00:00:00 2001
From: redstonekasi <kasi@hanneskann.de>
Date: Wed, 25 Oct 2023 18:52:21 +0200
Subject: [PATCH 063/632] fix: ShowAllMessageButtons (#1876)

---
 src/plugins/showAllMessageButtons/index.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/plugins/showAllMessageButtons/index.ts b/src/plugins/showAllMessageButtons/index.ts
index da0d3c6b3..bff513c14 100644
--- a/src/plugins/showAllMessageButtons/index.ts
+++ b/src/plugins/showAllMessageButtons/index.ts
@@ -28,9 +28,8 @@ export default definePlugin({
         {
             find: ".Messages.MESSAGE_UTILITIES_A11Y_LABEL",
             replacement: {
-                // isExpanded: V, (?<=,V = shiftKeyDown && !H...,|;)
-                match: /isExpanded:(\i),(?<=,\1=\i&&(?=(!.+?)[,;]).+?)/,
-                replace: "isExpanded:$2,"
+                match: /isExpanded:\i&&.*?,/,
+                replace: "isExpanded:true,"
             }
         }
     ]

From f385dc380eb67db7b12cb5590c36b79ebe4a2809 Mon Sep 17 00:00:00 2001
From: rini <rini@rinici.de>
Date: Wed, 25 Oct 2023 14:09:37 -0300
Subject: [PATCH 064/632] fix whoreacted, betteruploadbutton (#1877)

---
 src/plugins/betterUploadButton/index.ts | 5 ++---
 src/plugins/whoReacted/index.tsx        | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/plugins/betterUploadButton/index.ts b/src/plugins/betterUploadButton/index.ts
index 64a378502..3eeb1e453 100644
--- a/src/plugins/betterUploadButton/index.ts
+++ b/src/plugins/betterUploadButton/index.ts
@@ -29,9 +29,8 @@ export default definePlugin({
             replacement: {
                 // Discord merges multiple props here with Object.assign()
                 // This patch passes a third object to it with which we override onClick and onContextMenu
-                match: /CHAT_ATTACH_UPLOAD_OR_INVITE,onDoubleClick:(.+?:void 0)\},(.{1,3})\)/,
-                replace: (m, onDblClick, otherProps) =>
-                    `${m.slice(0, -1)},{onClick:${onDblClick},onContextMenu:${otherProps}.onClick})`,
+                match: /CHAT_ATTACH_UPLOAD_OR_INVITE,onDoubleClick:(.+?:void 0),\.\.\.(\i),/,
+                replace: "$&onClick:$1,onContextMenu:$2.onClick,",
             },
         },
     ],
diff --git a/src/plugins/whoReacted/index.tsx b/src/plugins/whoReacted/index.tsx
index a4e74f941..fb84c155a 100644
--- a/src/plugins/whoReacted/index.tsx
+++ b/src/plugins/whoReacted/index.tsx
@@ -96,8 +96,8 @@ export default definePlugin({
     patches: [{
         find: ",reactionRef:",
         replacement: {
-            match: /(?<=(\i)=(\i)\.hideCount,)(.+?reactionCount.+?\}\))/,
-            replace: (_, hideCount, props, rest) => `whoReactedProps=${props},${rest},${hideCount}?null:$self.renderUsers(whoReactedProps)`
+            match: /(\i)\?null:\(0,\i\.jsx\)\(\i\.\i,{className:\i\.reactionCount,.*?}\),/,
+            replace: "$&$1?null:$self.renderUsers(this.props),"
         }
     }, {
         find: '.displayName="MessageReactionsStore";',

From 8f0009778ae38cb2bed21f3c6cb780dc677000ef Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 19:08:28 +0200
Subject: [PATCH 065/632] Fix ViewIcons

---
 src/plugins/viewIcons/index.tsx       | 6 +++---
 src/utils/modal.tsx                   | 4 ++--
 src/webpack/common/classes.ts         | 4 ++--
 src/webpack/common/types/classes.d.ts | 1 -
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index 06a7c0a74..fd6b7b6bf 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -173,7 +173,7 @@ export default definePlugin({
     patches: [
         // Make pfps clickable
         {
-            find: "onAddFriend:",
+            find: "onAddFriend:function",
             replacement: {
                 match: /\{src:(\i)(?=,avatarDecoration)/,
                 replace: "{src:$1,onClick:()=>$self.openImage($1)"
@@ -191,9 +191,9 @@ export default definePlugin({
             }
         },
         {
-            find: "().avatarWrapperNonUserBot",
+            find: ".avatarPositionPanel",
             replacement: {
-                match: /(?<=avatarPositionPanel.+?)onClick:(\i\|\|\i)\?void 0(?<=,(\i)=\i\.avatarSrc.+?)/,
+                match: /(?<=avatarWrapperNonUserBot.{0,50})onClick:(\i\|\|\i)\?void 0(?<=,avatarSrc:(\i).+?)/,
                 replace: "style:($1)?{cursor:\"pointer\"}:{},onClick:$1?()=>{$self.openImage($2)}"
             }
         }
diff --git a/src/utils/modal.tsx b/src/utils/modal.tsx
index d7a054a5b..1efb9cdd8 100644
--- a/src/utils/modal.tsx
+++ b/src/utils/modal.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { filters, findByCode, findByPropsLazy, mapMangledModuleLazy } from "@webpack";
+import { filters, findByProps, findByPropsLazy, mapMangledModuleLazy } from "@webpack";
 import type { ComponentType, PropsWithChildren, ReactNode, Ref } from "react";
 
 import { LazyComponent } from "./react";
@@ -124,7 +124,7 @@ export type ImageModal = ComponentType<{
     shouldHideMediaOptions?: boolean;
 }>;
 
-export const ImageModal = LazyComponent(() => findByCode(".renderLinkComponent", ".responsive") as ImageModal);
+export const ImageModal = LazyComponent(() => findByProps("ImageModal").ImageModal as ImageModal);
 
 export const ModalRoot = LazyComponent(() => Modals.ModalRoot);
 export const ModalHeader = LazyComponent(() => Modals.ModalHeader);
diff --git a/src/webpack/common/classes.ts b/src/webpack/common/classes.ts
index 8bc76409d..ca3d75f57 100644
--- a/src/webpack/common/classes.ts
+++ b/src/webpack/common/classes.ts
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { findByPropsLazy } from "@webpack";
+import { findByPropsLazy, findLazy } from "@webpack";
 
 import * as t from "./types/classes";
 
-export const ModalImageClasses: t.ImageModalClasses = findByPropsLazy("image", "modal", "responsiveWidthMobile");
+export const ModalImageClasses: t.ImageModalClasses = findLazy(m => m.image && m.modal && !m.applicationIcon);
 export const ButtonWrapperClasses: t.ButtonWrapperClasses = findByPropsLazy("buttonWrapper", "buttonContent");
diff --git a/src/webpack/common/types/classes.d.ts b/src/webpack/common/types/classes.d.ts
index 0d2946fe7..b60661777 100644
--- a/src/webpack/common/types/classes.d.ts
+++ b/src/webpack/common/types/classes.d.ts
@@ -19,7 +19,6 @@
 export interface ImageModalClasses {
     image: string,
     modal: string,
-    responsiveWidthMobile: string;
 }
 
 export interface ButtonWrapperClasses {

From 685f44d40ff0909a8a8fd41398bacf27a2f3228c Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 19:22:57 +0200
Subject: [PATCH 066/632] Fix OpenInApp

---
 src/plugins/openInApp/index.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/openInApp/index.ts b/src/plugins/openInApp/index.ts
index 9fd335bdc..e26a01eb9 100644
--- a/src/plugins/openInApp/index.ts
+++ b/src/plugins/openInApp/index.ts
@@ -53,10 +53,10 @@ export default definePlugin({
 
     patches: [
         {
-            find: '"MaskedLinkStore"',
+            find: "trackAnnouncementMessageLinkClicked({",
             replacement: {
-                match: /return ((\i)\.apply\(this,arguments\))(?=\}function \i.{0,250}\.trusted)/,
-                replace: "return $self.handleLink(...arguments).then(handled => handled||$1)"
+                match: /(?<=handleClick:function\(\)\{return (\i)\}.+?)async function \1\(.+?\)\{/,
+                replace: "$& if(await $self.handleLink(...arguments)) return;"
             }
         },
         // Make Spotify profile activity links open in app on web
@@ -71,7 +71,7 @@ export default definePlugin({
         {
             find: ".CONNECTED_ACCOUNT_VIEWED,",
             replacement: {
-                match: /(?<=href:\i,onClick:function\(\i\)\{)(?=\i=(\i)\.type,.{0,50}CONNECTED_ACCOUNT_VIEWED)/,
+                match: /(?<=href:\i,onClick:\i=>\{)(?=.{0,10}\i=(\i)\.type,.{0,100}CONNECTED_ACCOUNT_VIEWED)/,
                 replace: "$self.handleAccountView(arguments[0],$1.type,$1.id);"
             }
         }

From c3ccbbfa999dc169c6081887881981bc69d8f88f Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 19:28:07 +0200
Subject: [PATCH 067/632] Fix SpotifyControls

---
 src/plugins/spotifyControls/SpotifyStore.ts | 4 ++--
 src/plugins/spotifyControls/index.tsx       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/spotifyControls/SpotifyStore.ts b/src/plugins/spotifyControls/SpotifyStore.ts
index d65be74db..f940d8d57 100644
--- a/src/plugins/spotifyControls/SpotifyStore.ts
+++ b/src/plugins/spotifyControls/SpotifyStore.ts
@@ -71,7 +71,7 @@ export const SpotifyStore = proxyLazy(() => {
     const { Store } = Flux;
 
     const SpotifySocket = findByPropsLazy("getActiveSocketAndDevice");
-    const SpotifyAPI = findByPropsLazy("SpotifyAPIMarker");
+    const SpotifyUtils = findByPropsLazy("SpotifyAPI");
 
     const API_BASE = "https://api.spotify.com/v1/me/player";
 
@@ -169,7 +169,7 @@ export const SpotifyStore = proxyLazy(() => {
                 (data.query ??= {}).device_id = this.device.id;
 
             const { socket } = SpotifySocket.getActiveSocketAndDevice();
-            return SpotifyAPI[method](socket.accountId, socket.accessToken, {
+            return SpotifyUtils.SpotifyAPI[method](socket.accountId, socket.accessToken, {
                 url: API_BASE + route,
                 ...data
             });
diff --git a/src/plugins/spotifyControls/index.tsx b/src/plugins/spotifyControls/index.tsx
index fa1e8960c..829f7850a 100644
--- a/src/plugins/spotifyControls/index.tsx
+++ b/src/plugins/spotifyControls/index.tsx
@@ -59,8 +59,8 @@ export default definePlugin({
         {
             find: ".PLAYER_DEVICES",
             replacement: {
-                match: /get:(.{1,3})\.bind\(null,(.{1,6})\.get\)/,
-                replace: "SpotifyAPIMarker:1,post:$1.bind(null,$2.post),$&"
+                match: /get:(\i)\.bind\(null,(\i\.\i)\.get\)/,
+                replace: "post:$1.bind(null,$2.post),$&"
             }
         },
         // Discord doesn't give you the repeat kind, only a boolean

From aa2a57b7339f9d1843722f7643d4433e7e7d6bc3 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 19:33:39 +0200
Subject: [PATCH 068/632] Fix Dearrow

---
 src/plugins/dearrow/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/dearrow/index.tsx b/src/plugins/dearrow/index.tsx
index 88d0dd6c4..c6bf4e05d 100644
--- a/src/plugins/dearrow/index.tsx
+++ b/src/plugins/dearrow/index.tsx
@@ -147,8 +147,8 @@ export default definePlugin({
         replacement: [
             // patch componentDidMount to replace embed thumbnail and title
             {
-                match: /(\i).render=function.{0,50}\i\.embed/,
-                replace: "$1.componentDidMount=$self.embedDidMount,$&"
+                match: /render\(\)\{let\{embed:/,
+                replace: "componentDidMount=$self.embedDidMount;$&"
             },
 
             // add dearrow button

From cbc23b1bddf87e469bd6a585dd4a4e72a86ad0b1 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 19:41:18 +0200
Subject: [PATCH 069/632] Fix BetterGifAltText

---
 src/plugins/betterGifAltText/index.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugins/betterGifAltText/index.ts b/src/plugins/betterGifAltText/index.ts
index 4dd30f2dd..f07295704 100644
--- a/src/plugins/betterGifAltText/index.ts
+++ b/src/plugins/betterGifAltText/index.ts
@@ -34,17 +34,18 @@ export default definePlugin({
             },
         },
         {
-            find: ".embedGallerySide",
+            find: ".Messages.GIF,",
             replacement: {
-                match: /(?<==(.{1,3})\.alt.{0,20})\?.{0,5}\.Messages\.GIF/,
+                match: /alt:(\i)=(\i\.default\.Messages\.GIF)(?=,[^}]*\}=(\i))/,
                 replace:
-                    "?($1.alt='GIF',$self.altify($1))",
+                    // rename prop so we can always use default value
+                    "alt_$$:$1=$self.altify($3)||$2",
             },
         },
     ],
 
     altify(props: any) {
-        if (props.alt !== "GIF") return props.alt;
+        if (props.alt && props.alt !== "GIF") return props.alt;
 
         let url: string = props.original || props.src;
         try {

From 535d510d3bdb3be4d703a9709c7784747306f792 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 19:47:29 +0200
Subject: [PATCH 070/632] Fix LoadingQuotes

---
 src/plugins/loadingQuotes/index.ts | 31 ++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/plugins/loadingQuotes/index.ts b/src/plugins/loadingQuotes/index.ts
index 963705b6e..eed5b3ec5 100644
--- a/src/plugins/loadingQuotes/index.ts
+++ b/src/plugins/loadingQuotes/index.ts
@@ -16,8 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } 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
@@ -60,17 +61,35 @@ const quotes = [
     "Wdn`khc'|f*eghl{%"
 ];
 
+const settings = definePluginSettings({
+    replaceEvents: {
+        description: "Replace Event Quotes too",
+        type: OptionType.BOOLEAN,
+        default: true
+    }
+});
+
 export default definePlugin({
     name: "LoadingQuotes",
     description: "Replace Discords loading quotes",
     authors: [Devs.Ven, Devs.KraXen72],
+
+    settings,
+
     patches: [
         {
-            find: ".LOADING_DID_YOU_KNOW",
-            replacement: {
-                match: /\._loadingText=.+?random\(.+?;/s,
-                replace: "._loadingText=$self.quote;",
-            },
+            find: ".LOADING_DID_YOU_KNOW}",
+            replacement: [
+                {
+                    match: /\._loadingText=function\(\)\{/,
+                    replace: "$&return $self.quote;",
+                },
+                {
+                    match: /\._eventLoadingText=function\(\)\{/,
+                    replace: "$&return $self.quote;",
+                    predicate: () => settings.store.replaceEvents
+                }
+            ],
         },
     ],
 

From 88c6e2a0e9e216965dfaa82289164a39568e2890 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 19:54:13 +0200
Subject: [PATCH 071/632] Fix PermissionViewer

---
 src/plugins/permissionsViewer/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx
index 8f31080ed..bdfb7b13f 100644
--- a/src/plugins/permissionsViewer/index.tsx
+++ b/src/plugins/permissionsViewer/index.tsx
@@ -161,7 +161,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: ".Messages.BOT_PROFILE_SLASH_COMMANDS",
+            find: ".popularApplicationCommandIds,",
             replacement: {
                 match: /showBorder:.{0,60}}\),(?<=guild:(\i),guildMember:(\i),.+?)/,
                 replace: (m, guild, guildMember) => `${m}$self.UserPermissions(${guild},${guildMember}),`

From 0d7157dd20aee9e9776500b519385f7c4f0878bc Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 19:59:20 +0200
Subject: [PATCH 072/632] Fix BetterNoteBox

---
 src/plugins/betterNotes/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/betterNotes/index.tsx b/src/plugins/betterNotes/index.tsx
index 06c735504..7049a3693 100644
--- a/src/plugins/betterNotes/index.tsx
+++ b/src/plugins/betterNotes/index.tsx
@@ -48,8 +48,8 @@ export default definePlugin({
         {
             find: ".Messages.NOTE}",
             replacement: {
-                match: /(\i)\.hideNote\?null/,
-                replace: "$1.hideNote?$self.patchPadding($1)"
+                match: /(?<=return \i\?)null(?=:\(0,\i\.jsxs)/,
+                replace: "$self.patchPadding(arguments[0])"
             }
         }
     ],

From 13c59f47cb76d7f88d0cb3e0bffa6320a9b544a5 Mon Sep 17 00:00:00 2001
From: Amia <9750071+aamiaa@users.noreply.github.com>
Date: Wed, 25 Oct 2023 20:01:25 +0200
Subject: [PATCH 073/632] fix: MutualGroupDMs (#1879)

---
 src/plugins/mutualGroupDMs/index.tsx | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx
index d445522bd..226d000f1 100644
--- a/src/plugins/mutualGroupDMs/index.tsx
+++ b/src/plugins/mutualGroupDMs/index.tsx
@@ -47,16 +47,17 @@ export default definePlugin({
     patches: [
         {
             find: ".Messages.USER_PROFILE_MODAL", // Note: the module is lazy-loaded
-            replacement: [
-                {
-                    match: /(?<=\.MUTUAL_GUILDS\}\),)(?=(\i\.bot).{0,20}(\(0,\i\.jsx\)\(.{0,100}id:))/,
-                    replace: '$1?null:$2"MUTUAL_GDMS",children:"Mutual Groups"}),'
-                },
-                {
-                    match: /(?<={user:(\i),onClose:(\i)}\);)(?=case \i\.\i\.MUTUAL_FRIENDS)/,
-                    replace: "case \"MUTUAL_GDMS\":return $self.renderMutualGDMs($1,$2);"
-                }
-            ]
+            replacement: {
+                match: /(?<=\.MUTUAL_GUILDS\}\),)(?=(\i\.bot).{0,20}(\(0,\i\.jsx\)\(.{0,100}id:))/,
+                replace: '($1||arguments[0].isCurrentUser)?null:$2"MUTUAL_GDMS",children:"Mutual Groups"}),'
+            }
+        },
+        {
+            find: ".UserProfileSections.USER_INFO_CONNECTIONS:",
+            replacement: {
+                match: /(?<={user:(\i),onClose:(\i)}\);)(?=case \i\.\i\.MUTUAL_FRIENDS)/,
+                replace: "case \"MUTUAL_GDMS\":return $self.renderMutualGDMs($1,$2);"
+            }
         }
     ],
 

From 465a87f66bcc8dd6a3841e14b4c072e20fc2eda4 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 20:07:45 +0200
Subject: [PATCH 074/632] Fix ColorSighted

---
 src/plugins/colorSighted/index.ts | 5 +++--
 src/webpack/patchWebpack.ts       | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/colorSighted/index.ts b/src/plugins/colorSighted/index.ts
index d2fb0d653..d741aaae6 100644
--- a/src/plugins/colorSighted/index.ts
+++ b/src/plugins/colorSighted/index.ts
@@ -34,8 +34,9 @@ export default definePlugin({
         {
             find: ".AVATAR_STATUS_MOBILE_16;",
             replacement: {
-                match: /(\.fromIsMobile,.+?)\i.status/,
-                replace: (_, rest) => `${rest}"online"`
+                match: /(?<=fromIsMobile:\i=!0,.+?)status:(\i)/,
+                // Rename field to force it to always use "online"
+                replace: 'status_$:$1="online"'
             }
         }
     ]
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index 395c35fe5..880aa2559 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -167,6 +167,7 @@ function patchPush(webpackGlobal: any) {
                             try {
                                 const newCode = executePatch(replacement.match, replacement.replace as string);
                                 if (newCode === code && !patch.noWarn) {
+                                    (window.explosivePlugins ??= new Set<string>()).add(patch.plugin);
                                     logger.warn(`Patch by ${patch.plugin} had no effect (Module id is ${id}): ${replacement.match}`);
                                     if (IS_DEV) {
                                         logger.debug("Function Source:\n", code);

From 3a7c27253bcf16b7ce75cdadd75f58ac9d0cd91e Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 20:14:39 +0200
Subject: [PATCH 075/632] Fix PermissionFreeWill

---
 src/plugins/permissionFreeWill/index.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugins/permissionFreeWill/index.ts b/src/plugins/permissionFreeWill/index.ts
index f3fdf159a..70a858689 100644
--- a/src/plugins/permissionFreeWill/index.ts
+++ b/src/plugins/permissionFreeWill/index.ts
@@ -31,7 +31,7 @@ export default definePlugin({
     patches: [
         // Permission lockout, just set the check to true
         {
-            find: "Messages.SELF_DENY_PERMISSION_BODY",
+            find: ".showPermissionLockoutModal(",
             replacement: [
                 {
                     match: /case"DENY":.{0,50}if\((?=\i\.\i\.can)/,
@@ -42,11 +42,12 @@ export default definePlugin({
         },
         // Onboarding, same thing but we need to prevent the check
         {
-            find: "Messages.ONBOARDING_CHANNEL_THRESHOLD_WARNING",
+            find: ".ONBOARDING_CHANNEL_THRESHOLD_WARNING",
             replacement: [
                 {
-                    match: /case 1:if\((?=!\i\.sent.{20,30}Messages\.CANNOT_CHANGE_CHANNEL_PERMS)/,
-                    replace: "$&false&&"
+                    // are we java yet?
+                    match: /(?<=(?:isDefaultChannelThresholdMetAfterDelete|checkDefaultChannelThresholdMetAfterChannelPermissionDeny):function\(\)\{)return \i(?=\})/g,
+                    replace: "return () => true"
                 }
             ],
             predicate: () => settings.store.onboarding

From 5e13de72c2921e4d964f6371b66ce3ff2c7a6f8c Mon Sep 17 00:00:00 2001
From: redstonekasi <kasi@hanneskann.de>
Date: Wed, 25 Oct 2023 20:16:57 +0200
Subject: [PATCH 076/632] fix: BlurNSFW (#1880)

---
 src/plugins/blurNsfw/index.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/plugins/blurNsfw/index.ts b/src/plugins/blurNsfw/index.ts
index 54b1e49a4..cb6be54c9 100644
--- a/src/plugins/blurNsfw/index.ts
+++ b/src/plugins/blurNsfw/index.ts
@@ -45,11 +45,8 @@ export default definePlugin({
         {
             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.nsfw?' vc-nsfw-img':'')"
+                match: /\.embedWrapper/g,
+                replace: "$&+(this.props.channel.nsfw?' vc-nsfw-img':'')"
             }]
         }
     ],

From 2169090ce50f3cf0d3d80c9c5e67208692a6d373 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 20:20:41 +0200
Subject: [PATCH 077/632] Fix SpotifyCrack

---
 src/plugins/spotifyCrack/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/spotifyCrack/index.ts b/src/plugins/spotifyCrack/index.ts
index f02df72db..5d890349c 100644
--- a/src/plugins/spotifyCrack/index.ts
+++ b/src/plugins/spotifyCrack/index.ts
@@ -60,7 +60,7 @@ export default definePlugin({
                 },
                 {
                     predicate: () => settings.store.keepSpotifyActivityOnIdle,
-                    match: /(?<=shouldShowActivity=function\(\){.{0,50})&&!\i\.\i\.isIdle\(\)/,
+                    match: /(?<=shouldShowActivity\(\){.{0,50})&&!\i\.\i\.isIdle\(\)/,
                     replace: ""
                 }
             ]

From 3fdd0edf1466848d48fc3919e5648d47fb1858a7 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 20:24:17 +0200
Subject: [PATCH 078/632] Fix InvisibleChat

---
 src/plugins/invisibleChat.desktop/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/invisibleChat.desktop/index.tsx b/src/plugins/invisibleChat.desktop/index.tsx
index e55f1e0c6..c80c4ce54 100644
--- a/src/plugins/invisibleChat.desktop/index.tsx
+++ b/src/plugins/invisibleChat.desktop/index.tsx
@@ -131,7 +131,7 @@ export default definePlugin({
             // Indicator
             find: ".Messages.MESSAGE_EDITED,",
             replacement: {
-                match: /var .,.,.=(.)\.className,.=.\.message,.=.\.children,.=.\.content,.=.\.onUpdate/gm,
+                match: /let\{className:\i,message:\i[^}]*\}=(\i)/,
                 replace: "try {$1 && $self.INV_REGEX.test($1.message.content) ? $1.content.push($self.indicator()) : null } catch {};$&"
             }
         },

From 9c13befcb67b3d075a5efcc72853fa365f48d373 Mon Sep 17 00:00:00 2001
From: Amia <9750071+aamiaa@users.noreply.github.com>
Date: Wed, 25 Oct 2023 20:24:31 +0200
Subject: [PATCH 079/632] fix: ServerProfile (#1881)

---
 src/plugins/serverProfile/GuildProfileModal.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/serverProfile/GuildProfileModal.tsx b/src/plugins/serverProfile/GuildProfileModal.tsx
index 2a7958a10..80f0842bb 100644
--- a/src/plugins/serverProfile/GuildProfileModal.tsx
+++ b/src/plugins/serverProfile/GuildProfileModal.tsx
@@ -11,13 +11,13 @@ import { openImageModal, openUserProfile } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { LazyComponent, useAwaiter } from "@utils/react";
-import { findByCode, findByPropsLazy } from "@webpack";
+import { findByProps, findByPropsLazy } from "@webpack";
 import { FluxDispatcher, Forms, GuildChannelStore, GuildMemberStore, moment, Parser, PresenceStore, RelationshipStore, ScrollerThin, SnowflakeUtils, TabBar, Timestamp, useEffect, UserStore, UserUtils, useState, useStateFromStores } from "@webpack/common";
 import { Guild, User } from "discord-types/general";
 
 const IconUtils = findByPropsLazy("getGuildBannerURL");
 const IconClasses = findByPropsLazy("icon", "acronym", "childWrapper");
-const UserRow = LazyComponent(() => findByCode(".listDiscriminator"));
+const FriendRow = LazyComponent(() => findByProps("FriendRow").FriendRow);
 
 const cl = classNameFactory("vc-gp-");
 
@@ -235,7 +235,7 @@ function UserList(type: "friends" | "blocked", guild: Guild, ids: string[], setC
     return (
         <ScrollerThin fade className={cl("scroller")}>
             {members.map(id =>
-                <UserRow
+                <FriendRow
                     user={UserStore.getUser(id)}
                     status={PresenceStore.getStatus(id) || "offline"}
                     onSelect={() => openUserProfile(id)}

From c7a20769f9f4b6ac6f4f298abbbf68076f8b8119 Mon Sep 17 00:00:00 2001
From: rini <rini@rinici.de>
Date: Wed, 25 Oct 2023 15:29:32 -0300
Subject: [PATCH 080/632] fix things using lodash (#1882)

---
 src/components/PluginSettings/index.tsx | 4 ++--
 src/plugins/fakeNitro/index.ts          | 4 ++--
 src/plugins/voiceMessages/index.tsx     | 4 ++--
 src/webpack/common/utils.ts             | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/PluginSettings/index.tsx b/src/components/PluginSettings/index.tsx
index 22657e730..0c44fef53 100644
--- a/src/components/PluginSettings/index.tsx
+++ b/src/components/PluginSettings/index.tsx
@@ -34,7 +34,7 @@ import { openModalLazy } from "@utils/modal";
 import { useAwaiter } from "@utils/react";
 import { Plugin } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { Alerts, Button, Card, Forms, Parser, React, Select, Text, TextInput, Toasts, Tooltip } from "@webpack/common";
+import { Alerts, Button, Card, Forms, Parser, React, Select, Text, TextInput, Toasts, Tooltip, lodash } from "@webpack/common";
 
 import Plugins from "~plugins";
 
@@ -251,7 +251,7 @@ export default function PluginSettings() {
         }
         DataStore.set("Vencord_existingPlugins", existingTimestamps);
 
-        return window._.isEqual(newPlugins, sortedPluginNames) ? [] : newPlugins;
+        return lodash.isEqual(newPlugins, sortedPluginNames) ? [] : newPlugins;
     }));
 
     type P = JSX.Element | JSX.Element[];
diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index 677286e72..1ae8dfe38 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -25,7 +25,7 @@ import { proxyLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, EmojiStore, FluxDispatcher, Parser, PermissionStore, UserStore } from "@webpack/common";
+import { ChannelStore, EmojiStore, FluxDispatcher, lodash, Parser, PermissionStore, UserStore } from "@webpack/common";
 import type { Message } from "discord-types/general";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
 import type { ReactElement, ReactNode } from "react";
@@ -532,7 +532,7 @@ export default definePlugin({
         };
 
         try {
-            return modifyChildren(window._.cloneDeep(content));
+            return modifyChildren(lodash.cloneDeep(content));
         } catch (err) {
             new Logger("FakeNitro").error(err);
             return content;
diff --git a/src/plugins/voiceMessages/index.tsx b/src/plugins/voiceMessages/index.tsx
index a5271c2ad..1b8d7a4e4 100644
--- a/src/plugins/voiceMessages/index.tsx
+++ b/src/plugins/voiceMessages/index.tsx
@@ -26,7 +26,7 @@ import { useAwaiter } from "@utils/react";
 import definePlugin from "@utils/types";
 import { chooseFile } from "@utils/web";
 import { findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
-import { Button, FluxDispatcher, Forms, Menu, PermissionsBits, PermissionStore, RestAPI, SelectedChannelStore, showToast, SnowflakeUtils, Toasts, useEffect, useState } from "@webpack/common";
+import { Button, FluxDispatcher, Forms, lodash, Menu, PermissionsBits, PermissionStore, RestAPI, SelectedChannelStore, showToast, SnowflakeUtils, Toasts, useEffect, useState } from "@webpack/common";
 import { ComponentType } from "react";
 
 import { VoiceRecorderDesktop } from "./DesktopRecorder";
@@ -138,7 +138,7 @@ function Modal({ modalProps }: { modalProps: ModalProps; }) {
         const channelData = audioBuffer.getChannelData(0);
 
         // average the samples into much lower resolution bins, maximum of 256 total bins
-        const bins = new Uint8Array(window._.clamp(Math.floor(audioBuffer.duration * 10), Math.min(32, channelData.length), 256));
+        const bins = new Uint8Array(lodash.clamp(Math.floor(audioBuffer.duration * 10), Math.min(32, channelData.length), 256));
         const samplesPerBin = Math.floor(channelData.length / bins.length);
 
         // Get root mean square of each bin
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index a1dcadc69..487a4bc78 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -33,6 +33,8 @@ export const moment: typeof import("moment") = findByPropsLazy("parseTwoDigitYea
 
 export const hljs: typeof import("highlight.js") = findByPropsLazy("highlight");
 
+export const lodash: typeof import("lodash") = findByPropsLazy("debounce", "cloneDeep");
+
 export const i18n: t.i18n = findLazy(m => m.Messages?.["en-US"]);
 
 export let SnowflakeUtils: t.SnowflakeUtils;

From ab1b002ed17c7f012e25ae11ec5db8a03264b322 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Wed, 25 Oct 2023 19:43:48 +0100
Subject: [PATCH 081/632] TypingTweaks: fix (#1883)

---
 src/plugins/typingIndicator/index.tsx |  2 +-
 src/plugins/typingTweaks/index.tsx    | 31 +++++++++++++++------------
 src/utils/discord.tsx                 |  7 +++---
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/plugins/typingIndicator/index.tsx b/src/plugins/typingIndicator/index.tsx
index 8ac344606..9de76cacf 100644
--- a/src/plugins/typingIndicator/index.tsx
+++ b/src/plugins/typingIndicator/index.tsx
@@ -83,7 +83,7 @@ function TypingIndicator({ channelId }: { channelId: string; }) {
         }
         default: {
             tooltipText = Settings.plugins.TypingTweaks.enabled
-                ? buildSeveralUsers({ a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]), c: typingUsersArray.length - 2 })
+                ? buildSeveralUsers({ a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]), count: typingUsersArray.length - 2 })
                 : Formatters.Messages.SEVERAL_USERS_TYPING;
             break;
         }
diff --git a/src/plugins/typingTweaks/index.tsx b/src/plugins/typingTweaks/index.tsx
index b76f4931f..62bcd41f6 100644
--- a/src/plugins/typingTweaks/index.tsx
+++ b/src/plugins/typingTweaks/index.tsx
@@ -21,12 +21,9 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { openUserProfile } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy } from "@webpack";
-import { GuildMemberStore, React, RelationshipStore } from "@webpack/common";
+import { Avatar, GuildMemberStore, React, RelationshipStore } from "@webpack/common";
 import { User } from "discord-types/general";
 
-const Avatar = findByCodeLazy(".typingIndicatorRef", "svg");
-
 const settings = definePluginSettings({
     showAvatars: {
         type: OptionType.BOOLEAN,
@@ -45,12 +42,12 @@ const settings = definePluginSettings({
     }
 });
 
-export function buildSeveralUsers({ a, b, c }: { a: string, b: string, c: number; }) {
+export function buildSeveralUsers({ a, b, count }: { a: string, b: string, count: number; }) {
     return [
         <strong key="0">{a}</strong>,
         ", ",
-        <strong key="2">{b}</strong>,
-        `, and ${c} others are typing...`
+        <strong key="1">{b}</strong>,
+        `, and ${count} others are typing...`
     ];
 }
 
@@ -99,30 +96,36 @@ export default definePlugin({
         {
             find: "getCooldownTextStyle",
             replacement: {
-                match: /=(\i)\[2];(.+)"aria-atomic":!0,children:(\i)}\)/,
-                replace: "=$1[2];$2\"aria-atomic\":!0,style:{display:\"grid\",gridAutoFlow:\"column\",gridGap:\"0.25em\"},children:$self.mutateChildren(this.props,$1,$3)})"
+                match: /(?<=children:\[(\i)\.length>0.{0,200}?"aria-atomic":!0,children:)\i/,
+                replace: "$self.mutateChildren(this.props, $1, $&), style: $self.TYPING_TEXT_STYLE"
             }
         },
         // Changes the indicator to keep the user object when creating the list of typing users
         {
             find: "getCooldownTextStyle",
             replacement: {
-                match: /return \i\.\i\.getName\(.,.\.props\.channel\.id,(.)\)/,
-                replace: "return $1"
+                match: /(?<=map\(\i=>)\i\.\i\.getName\(\i,this\.props\.channel\.id,(\i)\)/,
+                replace: "$1"
             }
         },
         // Adds the alternative formatting for several users typing
         {
             find: "getCooldownTextStyle",
             replacement: {
-                match: /((\i)\.length\?.\..\.Messages\.THREE_USERS_TYPING.format\(\{a:(\i),b:(\i),c:.}\)):.+?SEVERAL_USERS_TYPING/,
-                replace: "$1:$self.buildSeveralUsers({a:$3,b:$4,c:$2.length-2})"
+                match: /(?<=(\i)\.length\?\i.\i\.Messages.THREE_USERS_TYPING\.format\({\i:(\i),\i:(\i),\i:\i}\):)\i\.\i\.Messages\.SEVERAL_USERS_TYPING/,
+                replace: (_, users, a, b) => `$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2 })`
             },
             predicate: () => settings.store.alternativeFormatting
         }
     ],
     settings,
 
+    TYPING_TEXT_STYLE: {
+        display: "grid",
+        gridAutoFlow: "column",
+        gridGap: "0.25em"
+    },
+
     buildSeveralUsers,
 
     mutateChildren(props: any, users: User[], children: any) {
@@ -135,5 +138,5 @@ export default definePlugin({
                 ? <TypingUser {...props} user={users[element++]} />
                 : c
         );
-    },
+    }
 });
diff --git a/src/utils/discord.tsx b/src/utils/discord.tsx
index 76721d044..96193f219 100644
--- a/src/utils/discord.tsx
+++ b/src/utils/discord.tsx
@@ -17,13 +17,14 @@
 */
 
 import { MessageObject } from "@api/MessageEvents";
-import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { ChannelStore, ComponentDispatch, FluxDispatcher, GuildStore, MaskedLink, ModalImageClasses, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
 import { Guild, Message, User } from "discord-types/general";
 
 import { ImageModal, ModalRoot, ModalSize, openModal } from "./modal";
 
 const MessageActions = findByPropsLazy("editMessage", "sendMessage");
+const UserProfileActions = findByPropsLazy("openUserProfileModal", "closeUserProfileModal");
 
 export function getCurrentChannel() {
     return ChannelStore.getChannel(SelectedChannelStore.getChannelId());
@@ -99,14 +100,12 @@ export function openImageModal(url: string, props?: Partial<React.ComponentProps
     ));
 }
 
-const openProfile = findByCodeLazy("friendToken", "USER_PROFILE_MODAL_OPEN");
-
 export async function openUserProfile(id: string) {
     const user = await UserUtils.getUser(id);
     if (!user) throw new Error("No such user: " + id);
 
     const guildId = SelectedGuildStore.getGuildId();
-    openProfile({
+    UserProfileActions.openUserProfileModal({
         userId: id,
         guildId,
         channelId: SelectedChannelStore.getChannelId(),

From 148a32096c90d0c7f266a7e2f44ec9e128a024e4 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 20:51:37 +0200
Subject: [PATCH 082/632] Fix PronounDB in profile

---
 src/plugins/pronoundb/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/pronoundb/index.ts b/src/plugins/pronoundb/index.ts
index 6eac86698..b1e74158b 100644
--- a/src/plugins/pronoundb/index.ts
+++ b/src/plugins/pronoundb/index.ts
@@ -65,7 +65,7 @@ export default definePlugin({
         },
         // Patch the profile modal username header to use our pronoun hook instead of Discord's pronouns
         {
-            find: ".USER_PROFILE_ACTIVITY",
+            find: ".nameTagSmall)",
             replacement: [
                 {
                     match: /\.getName\(\i\);(?<=displayProfile.{0,200})/,

From 70943455161031d63a4481249d14833afe94f5a5 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 21:01:20 +0200
Subject: [PATCH 083/632] fix lintttttttttttttttttt :3

---
 src/components/PluginSettings/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/PluginSettings/index.tsx b/src/components/PluginSettings/index.tsx
index 0c44fef53..fe111fa9d 100644
--- a/src/components/PluginSettings/index.tsx
+++ b/src/components/PluginSettings/index.tsx
@@ -34,7 +34,7 @@ import { openModalLazy } from "@utils/modal";
 import { useAwaiter } from "@utils/react";
 import { Plugin } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { Alerts, Button, Card, Forms, Parser, React, Select, Text, TextInput, Toasts, Tooltip, lodash } from "@webpack/common";
+import { Alerts, Button, Card, Forms, lodash, Parser, React, Select, Text, TextInput, Toasts, Tooltip } from "@webpack/common";
 
 import Plugins from "~plugins";
 

From 0c6445b66b004e5490eae6227c8349d7381d44d5 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 21:06:18 +0200
Subject: [PATCH 084/632] fix reporter

---
 scripts/generateReport.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 180212126..c94adf9bf 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -268,7 +268,7 @@ function runTime(token: string) {
             const { wreq } = Vencord.Webpack;
 
             console.error("[PUP_DEBUG]", "Loading all chunks...");
-            const ids = Function("return" + wreq.u.toString().match(/\{.+\}/s)![0])();
+            const ids = Function("return" + wreq.u.toString().match(/(?<=\()\{.+?\}/s)![0])();
             for (const id in ids) {
                 const isWasm = await fetch(wreq.p + wreq.u(id))
                     .then(r => r.text())

From 123853e848ad409426d012b1389d5450d8d2d9ea Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 25 Oct 2023 17:20:51 -0300
Subject: [PATCH 085/632] Fix ShowHiddenChannels

---
 .../components/HiddenChannelLockScreen.tsx    |  17 +-
 src/plugins/showHiddenChannels/index.tsx      | 185 ++++++++++--------
 2 files changed, 104 insertions(+), 98 deletions(-)

diff --git a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
index 8b41e16e9..26efce1d8 100644
--- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
+++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
@@ -20,14 +20,13 @@ import { Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { LazyComponent } from "@utils/react";
 import { formatDuration } from "@utils/text";
-import { find, findByPropsLazy } from "@webpack";
-import { EmojiStore, FluxDispatcher, GuildMemberStore, GuildStore, moment, Parser, PermissionStore, SnowflakeUtils, Text, Timestamp, Tooltip, useEffect, useState } from "@webpack/common";
+import { find, findByCode, findByPropsLazy } from "@webpack";
+import { EmojiStore, FluxDispatcher, GuildMemberStore, GuildStore, moment, Parser, PermissionsBits, PermissionStore, SnowflakeUtils, Text, Timestamp, Tooltip, useEffect, useState } from "@webpack/common";
 import type { Channel } from "discord-types/general";
-import type { ComponentType } from "react";
 
 import openRolesAndUsersPermissionsModal, { PermissionType, RoleOrUserPermission } from "../../permissionsViewer/components/RolesAndUsersPermissions";
 import { sortPermissionOverwrites } from "../../permissionsViewer/utils";
-import { settings, VIEW_CHANNEL } from "..";
+import { settings } from "..";
 
 const enum SortOrderTypes {
     LATEST_ACTIVITY = 0,
@@ -79,19 +78,15 @@ const enum ChannelFlags {
     REQUIRE_TAG = 1 << 4
 }
 
-let ChannelBeginHeader: ComponentType<any>;
-
-export function setChannelBeginHeaderComponent(component: ComponentType<any>) {
-    ChannelBeginHeader = component;
-}
 
 const ChatScrollClasses = findByPropsLazy("auto", "content", "scrollerBase");
 const ChatClasses = findByPropsLazy("chat", "content", "noChat", "chatContent");
+const ChannelBeginHeader = LazyComponent(() => findByCode(".Messages.ROLE_REQUIRED_SINGLE_USER_MESSAGE"));
 const TagComponent = LazyComponent(() => find(m => {
     if (typeof m !== "function") return false;
 
     const code = Function.prototype.toString.call(m);
-    // Get the component which doesn't include increasedActivity logic
+    // Get the component which doesn't include increasedActivity
     return code.includes(".Messages.FORUM_TAG_A11Y_FILTER_BY_TAG") && !code.includes("increasedActivityPill");
 }));
 
@@ -185,7 +180,7 @@ function HiddenChannelLockScreen({ channel }: { channel: ExtendedChannel; }) {
                 <img className="shc-lock-screen-logo" src={HiddenChannelLogo} />
 
                 <div className="shc-lock-screen-heading-container">
-                    <Text variant="heading-xxl/bold">This is a {!PermissionStore.can(VIEW_CHANNEL, channel) ? "hidden" : "locked"} {ChannelTypesToChannelNames[type]} channel.</Text>
+                    <Text variant="heading-xxl/bold">This is a {!PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel) ? "hidden" : "locked"} {ChannelTypesToChannelNames[type]} channel.</Text>
                     {channel.isNSFW() &&
                         <Tooltip text="NSFW">
                             {({ onMouseLeave, onMouseEnter }) => (
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 6f7728e4c..88e3cc4f5 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -24,16 +24,13 @@ import { Devs } from "@utils/constants";
 import { canonicalizeMatch } from "@utils/patches";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { ChannelStore, PermissionStore, Tooltip } from "@webpack/common";
+import { ChannelStore, PermissionsBits, PermissionStore, Tooltip } from "@webpack/common";
 import type { Channel, Role } from "discord-types/general";
 
-import HiddenChannelLockScreen, { setChannelBeginHeaderComponent } from "./components/HiddenChannelLockScreen";
+import HiddenChannelLockScreen from "./components/HiddenChannelLockScreen";
 
 const ChannelListClasses = findByPropsLazy("channelEmoji", "unread", "icon");
 
-export const VIEW_CHANNEL = 1n << 10n;
-const CONNECT = 1n << 20n;
-
 const enum ShowMode {
     LockIcon,
     HiddenIconWithMutedStyle
@@ -72,16 +69,10 @@ export default definePlugin({
         {
             // RenderLevel defines if a channel is hidden, collapsed in category, visible, etc
             find: ".CannotShow=",
-            // These replacements only change the necessary CannotShow's
             replacement: [
                 {
-                    match: /(?<=isChannelGatedAndVisible\(this\.record\.guild_id,this\.record\.id\).+?renderLevel:)(\i)\..+?(?=,)/,
-                    replace: (_, RenderLevels) => `this.category.isCollapsed?${RenderLevels}.WouldShowIfUncollapsed:${RenderLevels}.Show`
-                },
-                // Move isChannelGatedAndVisible renderLevel logic to the bottom to not show hidden channels in case they are muted
-                {
-                    match: /(?<=(if\(!\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL.+?{)if\(this\.id===\i\).+?};)(if\(!\i\.\i\.isChannelGatedAndVisible\(.+?})(.+?)(?=return{renderLevel:\i\.Show.{0,40}?return \i)/,
-                    replace: (_, permissionCheck, isChannelGatedAndVisibleCondition, rest) => `${rest}${permissionCheck}${isChannelGatedAndVisibleCondition}}`
+                    match: /if\(!\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL.+?{if\(this\.id===\i\).+?threadIds:\i}}/,
+                    replace: ""
                 },
                 {
                     match: /(?<=renderLevel:(\i\(this,\i\)\?\i\.Show:\i\.WouldShowIfUncollapsed).+?renderLevel:).+?(?=,)/,
@@ -92,8 +83,8 @@ export default definePlugin({
                     replace: (_, RenderLevels) => `${RenderLevels}.Show`
                 },
                 {
-                    match: /(?<=getRenderLevel=function.+?return ).+?\?(.+?):\i\.CannotShow(?=})/,
-                    replace: (_, renderLevelExpressionWithoutPermCheck) => renderLevelExpressionWithoutPermCheck
+                    match: /(?<=getRenderLevel\(\i\){.+?return)!\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL,this\.record\)\|\|/,
+                    replace: " "
                 }
             ]
         },
@@ -102,13 +93,13 @@ export default definePlugin({
             replacement: [
                 {
                     // Do not show confirmation to join a voice channel when already connected to another if clicking on a hidden voice channel
-                    match: /(?<=getCurrentClientVoiceChannelId\((\i)\.guild_id\);if\()/,
+                    match: /(?<=getCurrentClientVoiceChannelId\((\i)\.guild_id\);return)/,
                     replace: (_, channel) => `!$self.isHiddenChannel(${channel})&&`
                 },
                 {
-                    // Prevent Discord from trying to connect to hidden channels
-                    match: /(?=\|\|\i\.default\.selectVoiceChannel\((\i)\.id\))/,
-                    replace: (_, channel) => `||$self.isHiddenChannel(${channel})`
+                    // Prevent Discord from trying to connect to hidden voice channels
+                    match: /(?=&&\i\.\i\.selectVoiceChannel\((\i)\.id\))/,
+                    replace: (_, channel) => `&&!$self.isHiddenChannel(${channel})`
                 },
                 {
                     // Make Discord show inside the channel if clicking on a hidden or locked channel
@@ -117,26 +108,42 @@ export default definePlugin({
                 }
             ]
         },
+        // Prevent Discord from trying to connect to hidden stage channels
         {
-            find: "VoiceChannel.renderPopout: There must always be something to render",
+            find: ".MAX_STAGE_VOICE_USER_LIMIT})",
+            replacement: {
+                match: /!(\i)\.isRoleSubscriptionTemplatePreviewChannel\(\)/,
+                replace: (m, channel) => `${m}&&!$self.isHiddenChannel(${channel})`
+            }
+        },
+        {
+            find: "ChannelItemEditButton:function(){",
             replacement: [
                 // Render null instead of the buttons if the channel is hidden
                 ...[
                     "renderEditButton",
                     "renderInviteButton",
-                    "renderOpenChatButton"
                 ].map(func => ({
-                    match: new RegExp(`(?<=${func}=function\\(\\){)`, "g"), // Global because Discord has multiple declarations of the same functions
+                    match: new RegExp(`(?<=${func}\\(\\){)`, "g"), // Global because Discord has multiple declarations of the same functions
                     replace: "if($self.isHiddenChannel(this.props.channel))return null;"
                 }))
             ]
         },
+        {
+            find: "VoiceChannel.renderPopout: There must always be something to render",
+            all: true,
+            // Render null instead of the buttons if the channel is hidden
+            replacement: {
+                match: /(?<=renderOpenChatButton=\(\)=>{)/,
+                replace: "if($self.isHiddenChannel(this.props.channel))return null;"
+            }
+        },
         {
             find: ".Messages.CHANNEL_TOOLTIP_DIRECTORY",
             predicate: () => settings.store.showMode === ShowMode.LockIcon,
             replacement: {
                 // Lock Icon
-                match: /(?=switch\((\i)\.type\).{0,30}\.GUILD_ANNOUNCEMENT.{0,30}\(0,\i\.\i\))/,
+                match: /(?=switch\((\i)\.type\).{0,30}\.GUILD_ANNOUNCEMENT.{0,70}\(0,\i\.\i\))/,
                 replace: (_, channel) => `if($self.isHiddenChannel(${channel}))return $self.LockIcon;`
             }
         },
@@ -146,18 +153,18 @@ export default definePlugin({
             replacement: [
                 // Make the channel appear as muted if it's hidden
                 {
-                    match: /(?<=\i\.name,\i=)(?=(\i)\.muted)/,
-                    replace: (_, props) => `$self.isHiddenChannel(${props}.channel)?true:`
+                    match: /(?<={channel:(\i),name:\i,muted:(\i).+?;)/,
+                    replace: (_, channel, muted) => `${muted}=$self.isHiddenChannel(${channel})?true:${muted};`
                 },
                 // Add the hidden eye icon if the channel is hidden
                 {
-                    match: /\(\).children.+?:null(?<=(\i)=\i\.channel,.+?)/,
+                    match: /\i\.children.+?:null(?<=,channel:(\i).+?)/,
                     replace: (m, channel) => `${m},$self.isHiddenChannel(${channel})?$self.HiddenChannelIcon():null`
                 },
                 // Make voice channels also appear as muted if they are muted
                 {
-                    match: /(?<=\.wrapper:\i\(\)\.notInteractive,)(.+?)((\i)\?\i\.MUTED)/,
-                    replace: (_, otherClasses, mutedClassExpression, isMuted) => `${mutedClassExpression}:"",${otherClasses}${isMuted}?""`
+                    match: /(?<=\.wrapper:\i\.notInteractive,)(.+?)if\((\i)\)return (\i\.MUTED);/,
+                    replace: (_, otherClasses, isMuted, mutedClassExpression) => `${isMuted}?${mutedClassExpression}:"",${otherClasses}if(${isMuted})return "";`
                 }
             ]
         },
@@ -167,14 +174,14 @@ export default definePlugin({
                 {
                     // Make muted channels also appear as unread if hide unreads is false, using the HiddenIconWithMutedStyle and the channel is hidden
                     predicate: () => settings.store.hideUnreads === false && settings.store.showMode === ShowMode.HiddenIconWithMutedStyle,
-                    match: /\.LOCKED:\i(?<=(\i)=\i\.channel,.+?)/,
-                    replace: (m, channel) => `${m}&&!$self.isHiddenChannel(${channel})`
+                    match: /\.LOCKED;if\((?<={channel:(\i).+?)/,
+                    replace: (m, channel) => `${m}!$self.isHiddenChannel(${channel})&&`
                 },
                 {
                     // Hide unreads
                     predicate: () => settings.store.hideUnreads === true,
-                    match: /(?<=\i\.connected,\i=)(?=(\i)\.unread)/,
-                    replace: (_, props) => `$self.isHiddenChannel(${props}.channel)?false:`
+                    match: /(?<={channel:(\i),name:\i,.+?unread:(\i).+?;)/,
+                    replace: (_, channel, unread) => `${unread}=$self.isHiddenChannel(${channel})?false:${unread};`
                 }
             ]
         },
@@ -182,8 +189,8 @@ export default definePlugin({
             // Hide New unreads box for hidden channels
             find: '.displayName="ChannelListUnreadsStore"',
             replacement: {
-                match: /(?<=return null!=(\i))(?=.{0,130}?hasRelevantUnread\(\i\))/g, // Global because Discord has multiple methods like that in the same module
-                replace: (_, channel) => `&&!$self.isHiddenChannel(${channel})`
+                match: /(?<=if\(null==(\i))(?=.{0,160}?hasRelevantUnread\(\i\))/g, // Global because Discord has multiple methods like that in the same module
+                replace: (_, channel) => `||$self.isHiddenChannel(${channel})`
             }
         },
         // Only render the channel header and buttons that work when transitioning to a hidden channel
@@ -191,27 +198,27 @@ export default definePlugin({
             find: "Missing channel in Channel.renderHeaderToolbar",
             replacement: [
                 {
-                    match: /(?<=renderHeaderToolbar=function.+?case \i\.\i\.GUILD_TEXT:)(?=.+?;(.+?{channel:(\i)},"notifications"\)\);))/,
-                    replace: (_, pushNotificationButtonExpression, channel) => `if($self.isHiddenChannel(${channel})){${pushNotificationButtonExpression}break;}`
+                    match: /(?<=renderHeaderToolbar=\(\)=>{.+?case \i\.\i\.GUILD_TEXT:)(?=.+?(\i\.push.{0,50}channel:(\i)},"notifications"\)\)))(?<=isLurking:(\i).+?)/,
+                    replace: (_, pushNotificationButtonExpression, channel, isLurking) => `if(!${isLurking}&&$self.isHiddenChannel(${channel})){${pushNotificationButtonExpression};break;}`
                 },
                 {
-                    match: /(?<=renderHeaderToolbar=function.+?case \i\.\i\.GUILD_FORUM:.+?if\(!\i\){)(?=.+?;(.+?{channel:(\i)},"notifications"\)\)))/,
-                    replace: (_, pushNotificationButtonExpression, channel) => `if($self.isHiddenChannel(${channel})){${pushNotificationButtonExpression};break;}`
+                    match: /(?<=renderHeaderToolbar=\(\)=>{.+?case \i\.\i\.GUILD_MEDIA:)(?=.+?(\i\.push.{0,40}channel:(\i)},"notifications"\)\)))(?<=isLurking:(\i).+?)/,
+                    replace: (_, pushNotificationButtonExpression, channel, isLurking) => `if(!${isLurking}&&$self.isHiddenChannel(${channel})){${pushNotificationButtonExpression};break;}`
                 },
                 {
-                    match: /renderMobileToolbar=function.+?case \i\.\i\.GUILD_FORUM:(?<=(\i)\.renderMobileToolbar.+?)/,
-                    replace: (m, that) => `${m}if($self.isHiddenChannel(${that}.props.channel))break;`
+                    match: /renderMobileToolbar=\(\)=>{.+?case \i\.\i\.GUILD_DIRECTORY:(?<=let{channel:(\i).+?)/,
+                    replace: (m, channel) => `${m}if($self.isHiddenChannel(${channel}))break;`
                 },
                 {
-                    match: /(?<=renderHeaderBar=function.+?hideSearch:(\i)\.isDirectory\(\))/,
+                    match: /(?<=renderHeaderBar=\(\)=>{.+?hideSearch:(\i)\.isDirectory\(\))/,
                     replace: (_, channel) => `||$self.isHiddenChannel(${channel})`
                 },
                 {
-                    match: /(?<=renderSidebar=function\(\){)/,
+                    match: /(?<=renderSidebar\(\){)/,
                     replace: "if($self.isHiddenChannel(this.props.channel))return null;"
                 },
                 {
-                    match: /(?<=renderChat=function\(\){)/,
+                    match: /(?<=renderChat\(\){)/,
                     replace: "if($self.isHiddenChannel(this.props.channel))return $self.HiddenChannelLockScreen(this.props.channel);"
                 }
             ]
@@ -220,7 +227,7 @@ export default definePlugin({
         {
             find: '"MessageManager"',
             replacement: {
-                match: /"Skipping fetch because channelId is a static route"\);else{(?=.+?getChannel\((\i)\))/,
+                match: /"Skipping fetch because channelId is a static route"\);return}(?=.+?getChannel\((\i)\))/,
                 replace: (m, channelId) => `${m}if($self.isHiddenChannel({channelId:${channelId}}))return;`
             }
         },
@@ -228,48 +235,44 @@ export default definePlugin({
         {
             find: '"alt+shift+down"',
             replacement: {
-                match: /(?<=getChannel\(\i\);return null!=(\i))(?=.{0,130}?hasRelevantUnread\(\i\))/,
+                match: /(?<=getChannel\(\i\);return null!=(\i))(?=.{0,150}?hasRelevantUnread\(\i\))/,
                 replace: (_, channel) => `&&!$self.isHiddenChannel(${channel})`
             }
         },
+        // Patch keybind handlers so you can't accidentally jump to hidden channels
         {
-            find: '"alt+down"',
+            find: ".APPLICATION_STORE&&null!=",
             replacement: {
                 match: /(?<=getState\(\)\.channelId.{0,30}?\(0,\i\.\i\)\(\i\))(?=\.map\()/,
-                replace: ".filter(ch=>!$self.isHiddenChannel(ch))"
+                replace: ".filter(e=>!$self.isHiddenChannel(e))"
             }
         },
         {
             find: ".Messages.ROLE_REQUIRED_SINGLE_USER_MESSAGE",
             replacement: [
-                {
-                    // Export the channel beginning header
-                    match: /computePermissionsForRoles.+?}\)}(?<=function (\i)\(.+?)(?=var)/,
-                    replace: (m, component) => `${m}$self.setChannelBeginHeaderComponent(${component});`
-                },
                 {
                     // Change the role permission check to CONNECT if the channel is locked
                     match: /ADMINISTRATOR\)\|\|(?<=context:(\i)}.+?)(?=(.+?)VIEW_CHANNEL)/,
-                    replace: (m, channel, permCheck) => `${m}!Vencord.Webpack.Common.PermissionStore.can(${CONNECT}n,${channel})?${permCheck}CONNECT):`
+                    replace: (m, channel, permCheck) => `${m}!Vencord.Webpack.Common.PermissionStore.can(${PermissionsBits.CONNECT}n,${channel})?${permCheck}CONNECT):`
                 },
                 {
                     // Change the permissionOverwrite check to CONNECT if the channel is locked
                     match: /permissionOverwrites\[.+?\i=(?<=context:(\i)}.+?)(?=(.+?)VIEW_CHANNEL)/,
-                    replace: (m, channel, permCheck) => `${m}!Vencord.Webpack.Common.PermissionStore.can(${CONNECT}n,${channel})?${permCheck}CONNECT):`
+                    replace: (m, channel, permCheck) => `${m}!Vencord.Webpack.Common.PermissionStore.can(${PermissionsBits.CONNECT}n,${channel})?${permCheck}CONNECT):`
                 },
                 {
                     // Include the @everyone role in the allowed roles list for Hidden Channels
-                    match: /sortBy.{0,100}?return (?<=var (\i)=\i\.channel.+?)(?=\i\.id)/,
+                    match: /sortBy.{0,30}?\.filter\(\i=>(?<=channel:(\i).+?)/,
                     replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?true:`
                 },
                 {
                     // If the @everyone role has the required permissions, make the array only contain it
-                    match: /computePermissionsForRoles.+?.value\(\)(?<=var (\i)=\i\.channel.+?)/,
+                    match: /computePermissionsForRoles.+?.value\(\)(?<=channel:(\i).+?)/,
                     replace: (m, channel) => `${m}.reduce(...$self.makeAllowedRolesReduce(${channel}.guild_id))`
                 },
                 {
                     // Patch the header to only return allowed users and roles if it's a hidden channel or locked channel (Like when it's used on the HiddenChannelLockScreen)
-                    match: /MANAGE_ROLES.{0,60}?return(?=\(.+?(\(0,\i\.jsxs\)\("div",{className:\i\(\)\.members.+?guildId:(\i)\.guild_id.+?roleColor.+?]}\)))/,
+                    match: /MANAGE_ROLES.{0,90}?return(?=\(.+?(\(0,\i\.jsxs\)\("div",{className:\i\.members.+?guildId:(\i)\.guild_id.+?roleColor.+?\]}\)))/,
                     replace: (m, component, channel) => {
                         // Export the channel for the users allowed component patch
                         component = component.replace(canonicalizeMatch(/(?<=users:\i)/), `,channel:${channel}`);
@@ -282,12 +285,12 @@ export default definePlugin({
             ]
         },
         {
-            find: "().avatars),children",
+            find: ".avatars),children",
             replacement: [
                 {
                     // Create a variable for the channel prop
-                    match: /=(\i)\.maxUsers,/,
-                    replace: (m, props) => `${m}channel=${props}.channel,`
+                    match: /maxUsers:\i,users:\i.+?=(\i).+?;/,
+                    replace: (m, props) => `${m}var channel=${props}.channel;`
                 },
                 {
                     // Make Discord always render the plus button if the component is used inside the HiddenChannelLockScreen
@@ -307,63 +310,73 @@ export default definePlugin({
             ]
         },
         {
-            find: ".Messages.SHOW_CHAT",
+            find: ".Messages.CHANNEL_CALL_CURRENT_SPEAKER.format",
             replacement: [
                 {
                     // Remove the divider and the open chat button for the HiddenChannelLockScreen
-                    match: /"more-options-popout"\)\);if\((?<=function \i\((\i)\).+?)/,
-                    replace: (m, props) => `${m}!${props}.inCall&&$self.isHiddenChannel(${props}.channel,true)){}else if(`
+                    match: /"more-options-popout"\)\),(?<=let{channel:(\i).+?inCall:(\i).+?)/,
+                    replace: (m, channel, inCall) => `${m}${inCall}||!$self.isHiddenChannel(${channel},true)&&`
                 },
                 {
                     // Remove invite users button for the HiddenChannelLockScreen
-                    match: /"popup".{0,100}?if\((?<=(\i)\.channel.+?)/,
-                    replace: (m, props) => `${m}(${props}.inCall||!$self.isHiddenChannel(${props}.channel,true))&&`
+                    match: /"popup".{0,100}?if\((?<=let{channel:(\i).+?inCall:(\i).+?)/,
+                    replace: (m, channel, inCall) => `${m}(${inCall}||!$self.isHiddenChannel(${channel},true))&&`
                 },
+            ]
+        },
+        {
+            find: ".Messages.EMBEDDED_ACTIVITIES_DEVELOPER_ACTIVITY_SHELF_FETCH_ERROR",
+            replacement: [
                 {
                     // Render our HiddenChannelLockScreen component instead of the main voice channel component
-                    match: /this\.renderVoiceChannelEffects.+?children:(?<=renderContent=function.+?)/,
+                    match: /renderContent\(\i\){.+?this\.renderVoiceChannelEffects.+?children:/,
                     replace: "$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel,true)?$self.HiddenChannelLockScreen(this.props.channel):"
                 },
                 {
                     // Disable gradients for the HiddenChannelLockScreen of voice channels
-                    match: /this\.renderVoiceChannelEffects.+?disableGradients:(?<=renderContent=function.+?)/,
+                    match: /renderContent\(\i\){.+?disableGradients:/,
                     replace: "$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel,true)||"
                 },
                 {
                     // Disable useless components for the HiddenChannelLockScreen of voice channels
-                    match: /(?:{|,)render(?!Header|ExternalHeader).{0,30}?:(?<=renderContent=function.+?)(?!void)/g,
-                    replace: "$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel,true)?null:"
+                    match: /(?:{|,)render(?!Header|ExternalHeader).{0,30}?:/g,
+                    replace: "$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel,true)?()=>null:"
                 },
                 {
                     // Disable bad CSS class which mess up hidden voice channels styling
-                    match: /callContainer,(?<=\(\)\.callContainer,)/,
+                    match: /callContainer,(?<=\i\.callContainer,)/,
                     replace: '$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel,true)?"":'
                 }
             ]
         },
         {
-            find: "useNotificationSettingsItem: channel cannot be undefined",
+            find: '"HasBeenInStageChannel"',
             replacement: [
                 {
                     // Render our HiddenChannelLockScreen component instead of the main stage channel component
-                    match: /"124px".+?children:(?<=var (\i)=\i\.channel.+?)(?=.{0,20}?}\)}function)/,
+                    match: /"124px".+?children:(?<=let \i,{channel:(\i).+?)(?=.{0,20}?}\)}function)/,
                     replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?$self.HiddenChannelLockScreen(${channel}):`
                 },
                 {
                     // Disable useless components for the HiddenChannelLockScreen of stage channels
-                    match: /render(?:BottomLeft|BottomCenter|BottomRight|ChatToasts):(?<=var (\i)=\i\.channel.+?)/g,
+                    match: /render(?:BottomLeft|BottomCenter|BottomRight|ChatToasts):\(\)=>(?<=let \i,{channel:(\i).+?)/g,
                     replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?null:`
                 },
                 {
                     // Disable gradients for the HiddenChannelLockScreen of stage channels
-                    match: /"124px".+?disableGradients:(?<=(\i)\.getGuildId\(\).+?)/,
+                    match: /"124px".+?disableGradients:(?<=let \i,{channel:(\i).+?)/,
                     replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})||`
                 },
                 {
                     // Disable strange styles applied to the header for the HiddenChannelLockScreen of stage channels
-                    match: /"124px".+?style:(?<=(\i)\.getGuildId\(\).+?)/,
+                    match: /"124px".+?style:(?<=let \i,{channel:(\i).+?)/,
                     replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?void 0:`
-                },
+                }
+            ]
+        },
+        {
+            find: ".Messages.STAGE_FULL_MODERATOR_TITLE",
+            replacement: [
                 {
                     // Remove the divider and amount of users in stage channel components for the HiddenChannelLockScreen
                     match: /\(0,\i\.jsx\)\(\i\.\i\.Divider.+?}\)]}\)(?=.+?:(\i)\.guild_id)/,
@@ -374,7 +387,7 @@ export default definePlugin({
                     match: /"recents".+?&&(?=\(.+?channelId:(\i)\.id,showRequestToSpeakSidebar)/,
                     replace: (m, channel) => `${m}!$self.isHiddenChannel(${channel})&&`
                 }
-            ],
+            ]
         },
         {
             find: "\"^/guild-stages/(\\\\d+)(?:/)?(\\\\d+)?\"",
@@ -388,8 +401,8 @@ export default definePlugin({
             find: ".shouldCloseDefaultModals",
             replacement: {
                 // Show inside voice channel instead of trying to join them when clicking on a channel mention
-                match: /(?<=getChannel\((\i)\)\)(?=.{0,100}?selectVoiceChannel))/,
-                replace: (_, channelId) => `&&!$self.isHiddenChannel({channelId:${channelId}})`
+                match: /(?<=getChannel\(\i\);if\(null!=(\i))(?=.{0,100}?selectVoiceChannel)/,
+                replace: (_, channel) => `&&!$self.isHiddenChannel(${channel})`
             }
         },
         {
@@ -397,13 +410,13 @@ export default definePlugin({
             replacement: [
                 {
                     // Make GuildChannelStore contain hidden channels
-                    match: /isChannelGated\(.+?\)(?=\|\|)/,
-                    replace: m => `${m}||true`
+                    match: /isChannelGated\(.+?\)(?=&&)/,
+                    replace: m => `${m}&&false`
                 },
                 {
                     // Filter hidden channels from GuildChannelStore.getChannels unless told otherwise
-                    match: /(?<=getChannels=function\(\i)\).+?(?=return (\i)})/,
-                    replace: (rest, channels) => `,shouldIncludeHidden=false${rest}${channels}=$self.resolveGuildChannels(${channels},shouldIncludeHidden);`
+                    match: /(?<=getChannels\(\i)(\){.+?)return (.+?)}/,
+                    replace: (_, rest, channels) => `,shouldIncludeHidden=false${rest}return $self.resolveGuildChannels(${channels},shouldIncludeHidden);}`
                 }
             ]
         },
@@ -418,22 +431,20 @@ export default definePlugin({
         {
             find: '.displayName="NowPlayingViewStore"',
             replacement: {
-                // Make active now voice states on hiddenl channels
+                // Make active now voice states on hidden channels
                 match: /(getVoiceStateForUser.{0,150}?)&&\i\.\i\.canWithPartialContext.{0,20}VIEW_CHANNEL.+?}\)(?=\?)/,
                 replace: "$1"
             }
         }
     ],
 
-    setChannelBeginHeaderComponent,
-
     isHiddenChannel(channel: Channel & { channelId?: string; }, checkConnect = false) {
         if (!channel) return false;
 
         if (channel.channelId) channel = ChannelStore.getChannel(channel.channelId);
         if (!channel || channel.isDM() || channel.isGroupDM() || channel.isMultiUserDM()) return false;
 
-        return !PermissionStore.can(VIEW_CHANNEL, channel) || checkConnect && !PermissionStore.can(CONNECT, channel);
+        return !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel) || checkConnect && !PermissionStore.can(PermissionsBits.CONNECT, channel);
     },
 
     resolveGuildChannels(channels: Record<string | number, Array<{ channel: Channel; comparator: number; }> | string | number>, shouldIncludeHidden: boolean) {

From 6c4afa52a3ec2877a91b21e1d5e05c03d3d25cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aubrey/=E3=82=AA=E3=83=BC=E3=83=96=E3=83=AA=E3=83=BC?=
 <44238627+aubymori@users.noreply.github.com>
Date: Wed, 25 Oct 2023 15:49:41 -0500
Subject: [PATCH 086/632] Fix titlebar duplication with native Windows titlebar
 (#1890)

Co-authored-by: V <vendicated@riseup.net>
---
 src/Vencord.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Vencord.ts b/src/Vencord.ts
index 508ac50a8..83c69e738 100644
--- a/src/Vencord.ts
+++ b/src/Vencord.ts
@@ -136,7 +136,7 @@ if (IS_DISCORD_DESKTOP && Settings.winNativeTitleBar && navigator.platform.toLow
     document.addEventListener("DOMContentLoaded", () => {
         document.head.append(Object.assign(document.createElement("style"), {
             id: "vencord-native-titlebar-style",
-            textContent: "[class*=titleBar-]{display: none!important}"
+            textContent: "[class*=titleBar]{display: none!important}"
         }));
     }, { once: true });
 }

From ddee3e12642f75954f579f68a788ffc960082434 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 23:00:04 +0200
Subject: [PATCH 087/632] Fix VencordToolbox

---
 src/plugins/vencordToolbox/index.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/plugins/vencordToolbox/index.tsx b/src/plugins/vencordToolbox/index.tsx
index dd2cc115e..ba55fdeef 100644
--- a/src/plugins/vencordToolbox/index.tsx
+++ b/src/plugins/vencordToolbox/index.tsx
@@ -24,11 +24,14 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { LazyComponent } from "@utils/react";
 import definePlugin from "@utils/types";
-import { findByCode } from "@webpack";
+import { filters, find } from "@webpack";
 import { Menu, Popout, useState } from "@webpack/common";
 import type { ReactNode } from "react";
 
-const HeaderBarIcon = LazyComponent(() => findByCode(".HEADER_BAR_BADGE,", ".tooltip"));
+const HeaderBarIcon = LazyComponent(() => {
+    const filter = filters.byCode(".HEADER_BAR_BADGE");
+    return find(m => m.Icon && filter(m.Icon)).Icon;
+});
 
 function VencordPopout(onClose: () => void) {
     const pluginEntries = [] as ReactNode[];
@@ -137,7 +140,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: ".mobileToolbar",
+            find: "toolbar:function",
             replacement: {
                 match: /(?<=toolbar:function.{0,100}\()\i.Fragment,/,
                 replace: "$self.ToolboxFragmentWrapper,"

From a41abfef319ef2dd4db87ab2f6617a562dd24ccd Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 23:06:30 +0200
Subject: [PATCH 088/632] Fix MemberCount

---
 src/plugins/memberCount/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/memberCount/index.tsx b/src/plugins/memberCount/index.tsx
index ecdb8afb8..d9cd548e9 100644
--- a/src/plugins/memberCount/index.tsx
+++ b/src/plugins/memberCount/index.tsx
@@ -105,10 +105,10 @@ export default definePlugin({
     authors: [Devs.Ven, Devs.Commandtechno],
 
     patches: [{
-        find: ".isSidebarVisible,",
+        find: "{isSidebarVisible:",
         replacement: {
-            match: /(var (\i)=\i\.className.+?children):\[(\i\.useMemo[^}]+"aria-multiselectable")/,
-            replace: "$1:[$2?.startsWith('members')?$self.render():null,$3"
+            match: /(?<=let\{className:(\i),.+?children):\[(\i\.useMemo[^}]+"aria-multiselectable")/,
+            replace: ":[$1?.startsWith('members')?$self.render():null,$2"
         }
     }],
 

From 23963f40c2c28beb257c59ef4dca3d4fe2e994b4 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 25 Oct 2023 18:12:09 -0300
Subject: [PATCH 089/632] Fix IgnoreActivities

---
 src/plugins/ignoreActivities/index.tsx | 31 +++++++++++++-------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/plugins/ignoreActivities/index.tsx b/src/plugins/ignoreActivities/index.tsx
index 6f8e27b3e..0b42a8b0b 100644
--- a/src/plugins/ignoreActivities/index.tsx
+++ b/src/plugins/ignoreActivities/index.tsx
@@ -90,30 +90,31 @@ export default definePlugin({
             find: '.displayName="LocalActivityStore"',
             replacement: [
                 {
-                    match: /LISTENING.+?\)\);(?<=(\i)\.push.+?)/,
-                    replace: (m, activities) => `${m}${activities}=${activities}.filter($self.isActivityNotIgnored);`
+                    match: /LISTENING.+?}\),(?<=(\i)\.push.+?)/,
+                    replace: (m, activities) => `${m}${activities}=${activities}.filter($self.isActivityNotIgnored),`
                 }
             ]
         },
         {
             find: ".Messages.SETTINGS_GAMES_TOGGLE_OVERLAY",
             replacement: {
-                match: /\(\)\.removeGame.+?null(?<=(\i)\?\i=\i\.\i\.Messages\.SETTINGS_GAMES_NOW_PLAYING_STATE.+?=(\i)\.overlay.+?)/,
-                replace: (m, nowPlaying, props) => `${m},$self.renderToggleGameActivityButton(${props},${nowPlaying})`
+                match: /\.Messages\.SETTINGS_GAMES_TOGGLE_OVERLAY.+?}\(\),(?<={overlay:\i,.+?=(\i),.+?)(?=!(\i))/,
+                replace: (m, props, nowPlaying) => `${m}$self.renderToggleGameActivityButton(${props},${nowPlaying}),`
             }
         },
         {
-            find: ".Messages.EMBEDDED_ACTIVITIES_DEVELOPER_SHELF_SUBTITLE",
-            replacement: [
-                {
-                    match: /(?<=\(\)\.activityTitleText.+?children:(\i)\.name.*?}\),)/,
-                    replace: (_, props) => `$self.renderToggleActivityButton(${props}),`
-                },
-                {
-                    match: /(?<=\(\)\.activityCardDetails.+?children:(\i\.application)\.name.*?}\),)/,
-                    replace: (_, props) => `$self.renderToggleActivityButton(${props}),`
-                }
-            ]
+            find: ".activityTitleText,variant",
+            replacement: {
+                match: /(?<=\i\.activityTitleText.+?children:(\i)\.name.*?}\),)/,
+                replace: (_, props) => `$self.renderToggleActivityButton(${props}),`
+            },
+        },
+        {
+            find: ".activityCardDetails,children",
+            replacement: {
+                match: /(?<=\i\.activityCardDetails.+?children:(\i\.application)\.name.*?}\),)/,
+                replace: (_, props) => `$self.renderToggleActivityButton(${props}),`
+            }
         }
     ],
 

From 09a922a01cdd777b69fcbcc68ad8e2ac7dc9e81c Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 23:19:57 +0200
Subject: [PATCH 090/632] Fix MuteNewGuild

---
 src/plugins/muteNewGuild/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/muteNewGuild/index.tsx b/src/plugins/muteNewGuild/index.tsx
index e77f64aad..7586830bb 100644
--- a/src/plugins/muteNewGuild/index.tsx
+++ b/src/plugins/muteNewGuild/index.tsx
@@ -45,16 +45,16 @@ export default definePlugin({
     authors: [Devs.Glitch, Devs.Nuckyz, Devs.carince],
     patches: [
         {
-            find: ",acceptInvite:function",
+            find: ",acceptInvite(",
             replacement: {
-                match: /INVITE_ACCEPT_SUCCESS.+?;(\i)=null.+?;/,
+                match: /INVITE_ACCEPT_SUCCESS.+?,(\i)=null!==.+?;/,
                 replace: (m, guildId) => `${m}$self.handleMute(${guildId});`
             }
         },
         {
-            find: "{joinGuild:function",
+            find: "{joinGuild:",
             replacement: {
-                match: /guildId:(\w+),lurker:(\w+).{0,20}\)}\)\);/,
+                match: /guildId:(\i),lurker:(\i).{0,20}}\)\);/,
                 replace: (m, guildId, lurker) => `${m}if(!${lurker})$self.handleMute(${guildId});`
             }
         }

From d54f8b5e8e666b3a5c985d31851cc0ddc0c9203d Mon Sep 17 00:00:00 2001
From: Jack <30497388+FieryFlames@users.noreply.github.com>
Date: Wed, 25 Oct 2023 17:25:02 -0400
Subject: [PATCH 091/632] fix: BANger (#1885)

---
 src/plugins/banger/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/banger/index.ts b/src/plugins/banger/index.ts
index 68163cbd6..dd9b4c82f 100644
--- a/src/plugins/banger/index.ts
+++ b/src/plugins/banger/index.ts
@@ -27,7 +27,7 @@ export default definePlugin({
         {
             find: "BAN_CONFIRM_TITLE.",
             replacement: {
-                match: /src:\w\(\d+\)/g,
+                match: /src:\i\("\d+"\)/g,
                 replace: "src: Vencord.Settings.plugins.BANger.source"
             }
         }

From ec9e11104766ce9c4e536ca2378b97fd3987c8a2 Mon Sep 17 00:00:00 2001
From: Jack <30497388+FieryFlames@users.noreply.github.com>
Date: Wed, 25 Oct 2023 17:25:39 -0400
Subject: [PATCH 092/632] fix: (rewrite) SecretRingToneEnabler (#1887)

---
 src/plugins/secretRingTone/index.ts | 31 ++++++++++-------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/plugins/secretRingTone/index.ts b/src/plugins/secretRingTone/index.ts
index 0b0b7e3e7..9d6d6a155 100644
--- a/src/plugins/secretRingTone/index.ts
+++ b/src/plugins/secretRingTone/index.ts
@@ -1,35 +1,24 @@
 /*
- * Vencord, a modification for Discord's desktop app
+ * Vencord, a Discord client mod
  * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 
+// NOTE - Ultimately should probably be turned into a ringtone picker plugin
 export default definePlugin({
     name: "SecretRingToneEnabler",
-    description: "Always play the secret version of the discord ringtone",
-    authors: [Devs.AndrewDLO],
+    description: "Always play the secret version of the discord ringtone (except during special ringtone events)",
+    authors: [Devs.AndrewDLO, Devs.FieryFlames],
     patches: [
         {
-            find: "84a1b4e11d634dbfa1e5dd97a96de3ad",
+            find: "call_ringing_beat\"",
             replacement: {
-                match: "84a1b4e11d634dbfa1e5dd97a96de3ad.mp3",
-                replace: "b9411af07f154a6fef543e7e442e4da9.mp3",
-            },
+                match: /500===\i\.random\(1,1e3\)/,
+                replace: "true"
+            }
         },
     ],
 });

From 635b80c58bdd29b22bcd79bc00ab18964cb8df00 Mon Sep 17 00:00:00 2001
From: Amia <9750071+aamiaa@users.noreply.github.com>
Date: Wed, 25 Oct 2023 23:26:50 +0200
Subject: [PATCH 093/632] fix: NoPendingCount (#1886)

---
 src/plugins/noPendingCount/index.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/noPendingCount/index.ts b/src/plugins/noPendingCount/index.ts
index 9dce56ba6..29458df9d 100644
--- a/src/plugins/noPendingCount/index.ts
+++ b/src/plugins/noPendingCount/index.ts
@@ -55,18 +55,18 @@ export default definePlugin({
     // or by searching for "showProgressBadge:"
     patches: [
         {
-            find: ".getPendingCount=",
+            find: "getPendingCount(){",
             predicate: () => settings.store.hideFriendRequestsCount,
             replacement: {
-                match: /(?<=\.getPendingCount=function\(\)\{)/,
+                match: /(?<=getPendingCount\(\)\{)/,
                 replace: "return 0;"
             }
         },
         {
-            find: ".getMessageRequestsCount=",
+            find: "getMessageRequestsCount(){",
             predicate: () => settings.store.hideMessageRequestsCount,
             replacement: {
-                match: /(?<=\.getMessageRequestsCount=function\(\)\{)/,
+                match: /(?<=getMessageRequestsCount\(\)\{)/,
                 replace: "return 0;"
             }
         },

From 38daf6ec2b68f3a44ebf3589f64a49908c4c3970 Mon Sep 17 00:00:00 2001
From: nora <mctorzod@gmail.com>
Date: Wed, 25 Oct 2023 16:37:07 -0500
Subject: [PATCH 094/632] ImageZoom: fix typo (#1832)

---
 src/plugins/imageZoom/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/imageZoom/index.tsx b/src/plugins/imageZoom/index.tsx
index 23dcddde7..08f2e29d3 100644
--- a/src/plugins/imageZoom/index.tsx
+++ b/src/plugins/imageZoom/index.tsx
@@ -94,7 +94,7 @@ const imageContextMenuPatch: NavContextMenuPatchCallback = children => () => {
             />
             <Menu.MenuCheckboxItem
                 id="vc-nearest-neighbour"
-                label="Nearset Neighbour"
+                label="Nearest Neighbour"
                 checked={settings.store.nearestNeighbour}
                 action={() => {
                     settings.store.nearestNeighbour = !settings.store.nearestNeighbour;

From 53cd14844f114acf75a44f760327535cc82d40f0 Mon Sep 17 00:00:00 2001
From: Ben Richeson <36977340+Benricheson101@users.noreply.github.com>
Date: Wed, 25 Oct 2023 17:46:51 -0400
Subject: [PATCH 095/632] Fix MessageLogger (#1888)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/messageLogger/deleteStyleText.css |  4 +-
 src/plugins/messageLogger/index.tsx           | 44 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/plugins/messageLogger/deleteStyleText.css b/src/plugins/messageLogger/deleteStyleText.css
index a39dd3dfd..8fb8bf129 100644
--- a/src/plugins/messageLogger/deleteStyleText.css
+++ b/src/plugins/messageLogger/deleteStyleText.css
@@ -1,10 +1,10 @@
 /* Message content highlighting */
-.messagelogger-deleted [class*="contents-"] > :is(div, h1, h2, h3, p) {
+.messagelogger-deleted [class*="contents"] > :is(div, h1, h2, h3, p) {
     color: #f04747 !important;
 }
 
 /* Bot "thinking" text highlighting */
-.messagelogger-deleted [class*="colorStandard-"] {
+.messagelogger-deleted [class*="colorStandard"] {
     color: #f04747 !important;
 }
 
diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index 934df2fbe..36f9ab3f9 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -210,7 +210,7 @@ export default definePlugin({
             ignoreGuilds.includes(ChannelStore.getChannel(message.channel_id)?.guild_id);
     },
 
-    // Based on canary 9ab8626bcebceaea6da570b9c586172d02b9c996
+    // Based on canary 63b8f1b4f2025213c5cf62f0966625bee3d53136
     patches: [
         {
             // MessageStore
@@ -219,7 +219,7 @@ export default definePlugin({
             replacement: [
                 {
                     // Add deleted=true to all target messages in the MESSAGE_DELETE event
-                    match: /MESSAGE_DELETE:function\((\w)\){var .+?((?:\w{1,2}\.){2})getOrCreate.+?},/,
+                    match: /MESSAGE_DELETE:function\((\i)\){let.+?((?:\i\.){2})getOrCreate.+?},/,
                     replace:
                         "MESSAGE_DELETE:function($1){" +
                         "   var cache = $2getOrCreate($1.channelId);" +
@@ -229,7 +229,7 @@ export default definePlugin({
                 },
                 {
                     // Add deleted=true to all target messages in the MESSAGE_DELETE_BULK event
-                    match: /MESSAGE_DELETE_BULK:function\((\w)\){var .+?((?:\w{1,2}\.){2})getOrCreate.+?},/,
+                    match: /MESSAGE_DELETE_BULK:function\((\i)\){let.+?((?:\i\.){2})getOrCreate.+?},/,
                     replace:
                         "MESSAGE_DELETE_BULK:function($1){" +
                         "   var cache = $2getOrCreate($1.channelId);" +
@@ -239,7 +239,7 @@ export default definePlugin({
                 },
                 {
                     // Add current cached content + new edit time to cached message's editHistory
-                    match: /(MESSAGE_UPDATE:function\((\w)\).+?)\.update\((\w)/,
+                    match: /(MESSAGE_UPDATE:function\((\i)\).+?)\.update\((\i)/,
                     replace: "$1" +
                         ".update($3,m =>" +
                         "   (($2.message.flags & 64) === 64 || $self.shouldIgnore($2.message)) ? m :" +
@@ -251,8 +251,8 @@ export default definePlugin({
                 },
                 {
                     // fix up key (edit last message) attempting to edit a deleted message
-                    match: /(?<=getLastEditableMessage=.{0,200}\.find\(\(function\((\i)\)\{)return/,
-                    replace: "return !$1.deleted &&"
+                    match: /(?<=getLastEditableMessage\(\i\)\{.{0,200}\.find\((\i)=>)/,
+                    replace: "!$1.deleted &&"
                 }
             ]
         },
@@ -260,13 +260,13 @@ export default definePlugin({
         {
             // Message domain model
             // Module 451
-            find: "isFirstMessageInForumPost=function",
+            find: "}addReaction(",
             replacement: [
                 {
-                    match: /(\w)\.customRenderedContent=(\w)\.customRenderedContent;/,
-                    replace: "$1.customRenderedContent = $2.customRenderedContent;" +
-                        "$1.deleted = $2.deleted || false;" +
-                        "$1.editHistory = $2.editHistory || [];"
+                    match: /this\.customRenderedContent=(\i)\.customRenderedContent,/,
+                    replace: "this.customRenderedContent = $1.customRenderedContent," +
+                        "this.deleted = $1.deleted || false," +
+                        "this.editHistory = $1.editHistory || [],"
                 }
             ]
         },
@@ -283,7 +283,7 @@ export default definePlugin({
                 // },
                 {
                     // Pass through editHistory & deleted & original attachments to the "edited message" transformer
-                    match: /interactionData:(\w)\.interactionData/,
+                    match: /interactionData:(\i)\.interactionData/,
                     replace:
                         "interactionData:$1.interactionData," +
                         "deleted:$1.deleted," +
@@ -299,7 +299,7 @@ export default definePlugin({
                 {
                     // Construct new edited message and add editHistory & deleted (ref above)
                     // Pass in custom data to attachment parser to mark attachments deleted as well
-                    match: /attachments:(\w{1,2})\((\w)\)/,
+                    match: /attachments:(\i)\((\i)\)/,
                     replace:
                         "attachments: $1((() => {" +
                         "   let old = arguments[1]?.attachments;" +
@@ -315,7 +315,7 @@ export default definePlugin({
                 },
                 {
                     // Preserve deleted attribute on attachments
-                    match: /(\((\w)\){return null==\2\.attachments.+?)spoiler:/,
+                    match: /(\((\i)\){return null==\2\.attachments.+?)spoiler:/,
                     replace:
                         "$1deleted: arguments[0]?.deleted," +
                         "spoiler:"
@@ -326,15 +326,15 @@ export default definePlugin({
         {
             // Attachment renderer
             // Module 96063
-            find: "().removeAttachmentHoverButton",
+            find: ".removeAttachmentHoverButton",
             replacement: [
                 {
-                    match: /((\w)\.className,\w=\2\.attachment),/,
-                    replace: "$1,deleted=$2.attachment?.deleted,"
+                    match: /(className:\i,attachment:\i),/,
+                    replace: "$1,attachment: {deleted},"
                 },
                 {
-                    match: /\["className","attachment".+?className:/,
-                    replace: "$& (deleted ? 'messagelogger-deleted-attachment ' : '') +"
+                    match: /\[\i\.obscured\]:.+?,/,
+                    replace: "$& 'messagelogger-deleted-attachment': deleted,"
                 }
             ]
         },
@@ -371,11 +371,11 @@ export default definePlugin({
             find: "displayName=\"ReferencedMessageStore\"",
             replacement: [
                 {
-                    match: /MESSAGE_DELETE:function\((\w)\).+?},/,
+                    match: /MESSAGE_DELETE:function\((\i)\).+?},/,
                     replace: "MESSAGE_DELETE:function($1){},"
                 },
                 {
-                    match: /MESSAGE_DELETE_BULK:function\((\w)\).+?},/,
+                    match: /MESSAGE_DELETE_BULK:function\((\i)\).+?},/,
                     replace: "MESSAGE_DELETE_BULK:function($1){},"
                 }
             ]
@@ -384,7 +384,7 @@ export default definePlugin({
         {
             // Message context base menu
             // Module 600300
-            find: "id:\"remove-reactions\"",
+            find: "useMessageMenu:",
             replacement: [
                 {
                     // Remove the first section if message is deleted

From 722dcb033ed25e33321bd912e36b6be0a1d0b828 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 23:50:19 +0200
Subject: [PATCH 096/632] Fix RelationShipNotifier

---
 src/plugins/relationshipNotifier/index.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/plugins/relationshipNotifier/index.ts b/src/plugins/relationshipNotifier/index.ts
index 7300fba8f..d913dde48 100644
--- a/src/plugins/relationshipNotifier/index.ts
+++ b/src/plugins/relationshipNotifier/index.ts
@@ -31,23 +31,23 @@ export default definePlugin({
 
     patches: [
         {
-            find: "removeRelationship:function(",
+            find: "removeRelationship:(",
             replacement: {
-                match: /(removeRelationship:function\((\i),\i,\i\){)/,
-                replace: "$1$self.removeFriend($2);"
+                match: /(removeRelationship:\((\i),\i,\i\)=>)/,
+                replace: "$1($self.removeFriend($2),0)||"
             }
         },
         {
-            find: "leaveGuild:function(",
+            find: "async leaveGuild(",
             replacement: {
-                match: /(leaveGuild:function\((\i)\){)/,
+                match: /(leaveGuild\((\i)\){)/,
                 replace: "$1$self.removeGuild($2);"
             }
         },
         {
-            find: "closePrivateChannel:function(",
+            find: "},closePrivateChannel(",
             replacement: {
-                match: /(closePrivateChannel:function\((\i)\){)/,
+                match: /(closePrivateChannel\((\i)\){)/,
                 replace: "$1$self.removeGroup($2);"
             }
         }

From 2183d2d29d7f809e0e55adbb0540647a6efd5920 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 23:59:38 +0200
Subject: [PATCH 097/632] fix TimeBarAllActivities

---
 src/plugins/timeBarAllActivities/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/timeBarAllActivities/index.ts b/src/plugins/timeBarAllActivities/index.ts
index 223f1828c..ff8fd8b17 100644
--- a/src/plugins/timeBarAllActivities/index.ts
+++ b/src/plugins/timeBarAllActivities/index.ts
@@ -25,10 +25,10 @@ export default definePlugin({
     authors: [Devs.obscurity],
     patches: [
         {
-            find: "renderTimeBar=function",
+            find: "}renderTimeBar(",
             replacement: {
-                match: /renderTimeBar=function\((.{1,3})\){.{0,50}?var/,
-                replace: "renderTimeBar=function($1){var"
+                match: /renderTimeBar\((.{1,3})\){.{0,50}?let/,
+                replace: "renderTimeBar($1){let"
             }
         }
     ],

From c1b87391049ccf1b20a88ec72a4e03a2089a14bb Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 26 Oct 2023 00:01:49 +0200
Subject: [PATCH 098/632] Fix RevealAllSpoilers

---
 src/plugins/revealAllSpoilers/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/revealAllSpoilers/index.ts b/src/plugins/revealAllSpoilers/index.ts
index a12001632..746973b42 100644
--- a/src/plugins/revealAllSpoilers/index.ts
+++ b/src/plugins/revealAllSpoilers/index.ts
@@ -30,9 +30,9 @@ export default definePlugin({
 
     patches: [
         {
-            find: ".removeObscurity=function",
+            find: ".removeObscurity=",
             replacement: {
-                match: /(?<=\.removeObscurity=function\((\i)\){)/,
+                match: /(?<=\.removeObscurity=(\i)=>{)/,
                 replace: (_, event) => `$self.reveal(${event});`
             }
         }

From 96dff84ed8bc80198febd5b7938867e6fbdc865f Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 26 Oct 2023 00:03:51 +0200
Subject: [PATCH 099/632] Fix PlatformIndicators

---
 src/plugins/platformIndicators/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/platformIndicators/index.tsx b/src/plugins/platformIndicators/index.tsx
index 5ccc3b783..ae26a8f86 100644
--- a/src/plugins/platformIndicators/index.tsx
+++ b/src/plugins/platformIndicators/index.tsx
@@ -230,7 +230,7 @@ export default definePlugin({
             ]
         },
         {
-            find: "isMobileOnline=function",
+            find: "}isMobileOnline(",
             predicate: () => Settings.plugins.PlatformIndicators.colorMobileIndicator,
             replacement: {
                 // Make isMobileOnline return true no matter what is the user status

From 45fa4f89c605b47aac986f142f0909ae6e9f948e Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 26 Oct 2023 00:20:56 +0200
Subject: [PATCH 100/632] Fix NoScreensharePreview

---
 src/plugins/noScreensharePreview/index.ts | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/plugins/noScreensharePreview/index.ts b/src/plugins/noScreensharePreview/index.ts
index df3daadb9..ca50ad284 100644
--- a/src/plugins/noScreensharePreview/index.ts
+++ b/src/plugins/noScreensharePreview/index.ts
@@ -25,14 +25,11 @@ export default definePlugin({
     authors: [Devs.Nuckyz],
     patches: [
         {
-            find: '("ApplicationStreamPreviewUploadManager")',
-            replacement: [
-                String.raw`\i\.\i\.makeChunkedRequest\(`,
-                String.raw`\i\.\i\.post\({url:`
-            ].map(match => ({
-                match: new RegExp(String.raw`(?=return\[(\d),${match}\i\.\i\.STREAM_PREVIEW.+?}\)\];)`),
-                replace: (_, code) => `return[${code},Promise.resolve({body:"",status:204})];`
-            }))
+            find: '"ApplicationStreamPreviewUploadManager"',
+            replacement: {
+                match: /await \i\.\i\.(makeChunkedRequest\(|post\(\{url:)\i\.\i\.STREAM_PREVIEW.+?\}\)/g,
+                replace: "0"
+            }
         }
     ]
 });

From 150202444096072b96250cfb4edf26e7fecf0f9b Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 26 Oct 2023 00:29:03 +0200
Subject: [PATCH 101/632] Fix iLoveSpam

---
 src/plugins/iLoveSpam/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/iLoveSpam/index.ts b/src/plugins/iLoveSpam/index.ts
index 79b2e3fb0..8556de426 100644
--- a/src/plugins/iLoveSpam/index.ts
+++ b/src/plugins/iLoveSpam/index.ts
@@ -25,10 +25,10 @@ export default definePlugin({
     authors: [Devs.botato, Devs.Animal],
     patches: [
         {
-            find: "),{hasFlag:",
+            find: "hasFlag:{writable",
             replacement: {
-                match: /(if\((.{1,2})<=1<<30\)return)/,
-                replace: "if($2===(1<<20)){return false};$1",
+                match: /if\((\i)<=(?:1<<30|1073741824)\)return/,
+                replace: "if($1===(1<<20))return false;$&",
             },
         },
     ],

From 0c12500c0a0b85248b53faf8255114ea56d2a268 Mon Sep 17 00:00:00 2001
From: IThundxr <contact@ithundxr.dev>
Date: Wed, 25 Oct 2023 18:29:26 -0400
Subject: [PATCH 102/632] Fix: noUnblockToJump (#1893)

---
 src/plugins/noUnblockToJump/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/noUnblockToJump/index.ts b/src/plugins/noUnblockToJump/index.ts
index 15f602b59..cba6bb9aa 100644
--- a/src/plugins/noUnblockToJump/index.ts
+++ b/src/plugins/noUnblockToJump/index.ts
@@ -33,7 +33,7 @@ export default definePlugin({
             }
         },
         {
-            find: "renderJumpButton=function()",
+            find: "renderJumpButton()",
             replacement: {
                 match: /if\(.{1,10}\)(.{1,10}\.show\({.{1,50}UNBLOCK_TO_JUMP_TITLE)/,
                 replace: "if(false)$1"

From d852393cfb5b253fcbf3b2b1f3baf436c7007af5 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 26 Oct 2023 00:36:23 +0200
Subject: [PATCH 103/632] fix UserVoiceShow

---
 .../userVoiceShow/components/VoiceChannelSection.tsx   |  2 +-
 src/plugins/userVoiceShow/index.tsx                    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/userVoiceShow/components/VoiceChannelSection.tsx b/src/plugins/userVoiceShow/components/VoiceChannelSection.tsx
index b429f0571..c1bcbd657 100644
--- a/src/plugins/userVoiceShow/components/VoiceChannelSection.tsx
+++ b/src/plugins/userVoiceShow/components/VoiceChannelSection.tsx
@@ -23,7 +23,7 @@ import { Button, Forms, PermissionStore, Toasts } from "@webpack/common";
 import { Channel } from "discord-types/general";
 
 const ChannelActions = findByPropsLazy("selectChannel", "selectVoiceChannel");
-const UserPopoutSection = findByCodeLazy(".lastSection", ".children");
+const UserPopoutSection = findByCodeLazy(".lastSection", "children:");
 
 const CONNECT = 1n << 20n;
 
diff --git a/src/plugins/userVoiceShow/index.tsx b/src/plugins/userVoiceShow/index.tsx
index 85c1bedf1..c95307cc4 100644
--- a/src/plugins/userVoiceShow/index.tsx
+++ b/src/plugins/userVoiceShow/index.tsx
@@ -94,19 +94,19 @@ export default definePlugin({
     },
 
     patches: [
+        // above message box
         {
-            find: ".showCopiableUsername",
+            find: ".lastEditedByContainer",
             replacement: {
-                match: /\(0,\w\.jsx\)\(\w{2},{user:\w,setNote/,
-                // paste my fancy custom button above the message field
+                match: /\(0,\i\.jsx\)\(\i\.\i,{user:\i,setNote/,
                 replace: "$self.patchPopout(arguments[0]),$&",
             }
         },
+        // below username
         {
             find: ".USER_PROFILE_MODAL",
             replacement: {
-                match: /\(\)\.body.+?displayProfile:\i}\),/,
-                // paste my fancy custom button below the username
+                match: /\.body.+?displayProfile:\i}\),/,
                 replace: "$&$self.patchModal(arguments[0]),",
             }
         }

From 6b28e5ad85e634b764bbda2a9a9cd15b0cee535f Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 25 Oct 2023 19:37:52 -0300
Subject: [PATCH 104/632] Partially fix FakeNitro

---
 src/plugins/fakeNitro/index.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index 1ae8dfe38..921b738a2 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -176,8 +176,8 @@ export default definePlugin({
             predicate: () => settings.store.enableEmojiBypass,
             replacement: [
                 {
-                    match: /(?<=(\i)=\i\.intention)/,
-                    replace: (_, intention) => `,fakeNitroIntention=${intention}`
+                    match: /(?<=,intention:(\i).+?;)/,
+                    replace: (_, intention) => `var fakeNitroIntention=${intention};`
                 },
                 {
                     match: /\.(?:canUseEmojisEverywhere|canUseAnimatedEmojis)\(\i(?=\))/g,
@@ -234,7 +234,7 @@ export default definePlugin({
             find: "STREAM_FPS_OPTION.format",
             predicate: () => settings.store.enableStreamQualityBypass,
             replacement: {
-                match: /(userPremiumType|guildPremiumTier):.{0,10}TIER_\d,?/g,
+                match: /guildPremiumTier:\i\.\i\.TIER_\d,?/g,
                 replace: ""
             }
         },
@@ -318,7 +318,7 @@ export default definePlugin({
             find: ".EMOJI_UPSELL_POPOUT_MORE_EMOJIS_OPENED,",
             predicate: () => settings.store.transformEmojis,
             replacement: {
-                match: /isDiscoverable:\i,shouldHideRoleSubscriptionCTA:\i,(?<=(\i)=\i\.node.+?)/,
+                match: /isDiscoverable:\i,shouldHideRoleSubscriptionCTA:\i,(?<={node:(\i),.+?)/,
                 replace: (m, node) => `${m}fakeNitroNode:${node},`
             }
         },
@@ -326,8 +326,8 @@ export default definePlugin({
             find: ".Messages.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION",
             predicate: () => settings.store.transformEmojis,
             replacement: {
-                match: /(?<=\.Messages\.EMOJI_POPOUT_ADDED_PACK_DESCRIPTION.+?return ).{0,1200}\.Messages\.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION.+?(?=}\()/,
-                replace: reactNode => `$self.addFakeNotice(${FakeNoticeType.Emoji},${reactNode},!!arguments[0]?.fakeNitroNode?.fake)`
+                match: /(?<=isDiscoverable:\i,emojiComesFromCurrentGuild:\i,.+?}=(\i).+?;)(.+?return )(.{0,1000}\.Messages\.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION.+?)(?=},)/,
+                replace: (_, props, rest, reactNode) => `var fakeNitroNode=${props}.fakeNitroNode;${rest}$self.addFakeNotice(${FakeNoticeType.Emoji},${reactNode},fakeNitroNode?.fake)`
             }
         },
         {

From 9eaeb241960cd4be73f67e4aa6d02ba03a4a5d89 Mon Sep 17 00:00:00 2001
From: redstonekasi <kasi@hanneskann.de>
Date: Thu, 26 Oct 2023 00:56:39 +0200
Subject: [PATCH 105/632] fix: RoleColorEverywhere (#1884)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/roleColorEverywhere/index.tsx | 39 ++++++++++++-----------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index e4fa4fe10..d718f4027 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -49,10 +49,10 @@ export default definePlugin({
     patches: [
         // Chat Mentions
         {
-            find: 'className:"mention"',
+            find: "CLYDE_AI_MENTION_COLOR:null,",
             replacement: [
                 {
-                    match: /user:(\i),channel:(\i).{0,300}?"@"\.concat\(.+?\)/,
+                    match: /user:(\i),channel:(\i).{0,400}?"@"\.concat\(.+?\)/,
                     replace: "$&,color:$self.getUserColor($1?.id,{channelId:$2?.id})"
                 }
             ],
@@ -60,37 +60,34 @@ export default definePlugin({
         },
         // Slate
         {
-            // taken from CommandsAPI
-            find: ".source,children",
+            find: ".userTooltip,children",
             replacement: [
                 {
-                    match: /function \i\((\i)\).{5,20}id.{5,20}guildId.{5,10}channelId.{100,150}hidePersonalInformation.{5,50}jsx.{5,20},{/,
-                    replace: "$&color:$self.getUserColor($1.id,{guildId:$1?.guildId}),"
+                    match: /let\{id:(\i),guildId:(\i)[^}]*\}.*?\.default,{(?=children)/,
+                    replace: "$&color:$self.getUserColor($1,{guildId:$2}),"
                 }
             ],
             predicate: () => settings.store.chatMentions,
         },
-        // Member List Role Names
         {
-            find: ".memberGroupsPlaceholder",
+            find: 'tutorialId:"whos-online',
             replacement: [
                 {
-                    match: /(memo\(\(function\((\i)\).{300,500}CHANNEL_MEMBERS_A11Y_LABEL.{100,200}roleIcon.{5,20}null,).," \u2014 ",.\]/,
-                    replace: "$1$self.roleGroupColor($2)]"
+                    match: /\i.roleIcon,\.\.\.\i/,
+                    replace: "$&,color:$self.roleGroupColor(arguments[0])"
                 },
                 {
-                    match: /children:\[.," \u2014 ",.\]/,
-                    replace: "children:[$self.roleGroupColor(arguments[0])]"
+                    match: /null,\i," — ",\i\]/,
+                    replace: "null,$self.roleGroupColor(arguments[0])]"
                 },
             ],
             predicate: () => settings.store.memberList,
         },
-        // Voice chat users
         {
             find: "renderPrioritySpeaker",
             replacement: [
                 {
-                    match: /renderName=function\(\).{50,75}speaking.{50,100}jsx.{5,10}{/,
+                    match: /renderName\(\).{0,100}speaking:.{50,100}jsx.{5,10}{/,
                     replace: "$&...$self.getVoiceProps(this.props),"
                 }
             ],
@@ -113,11 +110,15 @@ export default definePlugin({
         const guild = GuildStore.getGuild(guildId);
         const role = guild?.roles[id];
 
-        return <span style={{
-            color: role?.colorString,
-            fontWeight: "unset",
-            letterSpacing: ".05em"
-        }}>{title ?? label} &mdash; {count}</span>;
+        return (
+            <span style={{
+                color: role?.colorString,
+                fontWeight: "unset",
+                letterSpacing: ".05em"
+            }}>
+                {title ?? label} &mdash; {count}
+            </span>
+        );
     },
 
     getVoiceProps({ user: { id: userId }, guildId }: { user: { id: string; }; guildId: string; }) {

From a6b8b59d5c2be3f8894e1287479d8546bc102339 Mon Sep 17 00:00:00 2001
From: Luna <imlvnaa@gmail.com>
Date: Wed, 25 Oct 2023 19:03:11 -0400
Subject: [PATCH 106/632] fix: shikicodeblocks, betterroledot (#1895)

---
 src/plugins/betterRoleDot/index.ts           |  1 +
 src/plugins/shikiCodeblocks.desktop/index.ts | 10 +++++-----
 src/utils/constants.ts                       |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/plugins/betterRoleDot/index.ts b/src/plugins/betterRoleDot/index.ts
index ed121b9ab..3886de3f7 100644
--- a/src/plugins/betterRoleDot/index.ts
+++ b/src/plugins/betterRoleDot/index.ts
@@ -38,6 +38,7 @@ export default definePlugin({
         {
             find: '"dot"===',
             all: true,
+            noWarn: true,
             predicate: () => Settings.plugins.BetterRoleDot.bothStyles,
             replacement: {
                 match: /"(?:username|dot)"===\i(?!\.\i)/g,
diff --git a/src/plugins/shikiCodeblocks.desktop/index.ts b/src/plugins/shikiCodeblocks.desktop/index.ts
index 58e55b4e5..12c8c858d 100644
--- a/src/plugins/shikiCodeblocks.desktop/index.ts
+++ b/src/plugins/shikiCodeblocks.desktop/index.ts
@@ -37,12 +37,12 @@ export default definePlugin({
     authors: [Devs.Vap],
     patches: [
         {
-            find: "codeBlock:{react:function",
+            find: "codeBlock:{react(",
             replacement: {
-                match: /codeBlock:\{react:function\((\i),(\i),(\i)\)\{/,
-                replace: "$&return $self.renderHighlighter($1,$2,$3);",
-            },
-        },
+                match: /codeBlock:\{react\((\i),(\i),(\i)\)\{/,
+                replace: "$&return $self.renderHighlighter($1,$2,$3);"
+            }
+        }
     ],
     start: async () => {
         if (settings.store.useDevIcon !== DeviconSetting.Disabled)
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 6395ddfb1..aeadcdbfb 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -325,7 +325,7 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     },
     ImLvna: {
         name: "Luna <3",
-        id: 174200708818665472n
+        id: 799319081723232267n
     },
     rad: {
         name: "rad",

From 74faaa216f0f8d29216db8c351ef2f883ae9fc67 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 26 Oct 2023 01:29:52 +0200
Subject: [PATCH 107/632] Fix PlatformIndicators colorMobileIndicator

---
 src/plugins/platformIndicators/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/platformIndicators/index.tsx b/src/plugins/platformIndicators/index.tsx
index ae26a8f86..2972b4a46 100644
--- a/src/plugins/platformIndicators/index.tsx
+++ b/src/plugins/platformIndicators/index.tsx
@@ -198,13 +198,13 @@ export default definePlugin({
             replacement: [
                 {
                     // Return the STATUS_ONLINE_MOBILE mask if the user is on mobile, no matter the status
-                    match: /(?<=return \i\.\i\.Masks\.STATUS_TYPING;)(.+?)(\i)\?(\i\.\i\.Masks\.STATUS_ONLINE_MOBILE):/,
-                    replace: (_, rest, isMobile, mobileMask) => `if(${isMobile})return ${mobileMask};${rest}`
+                    match: /\.STATUS_TYPING;switch(?=.+?(if\(\i\)return \i\.\i\.Masks\.STATUS_ONLINE_MOBILE))/,
+                    replace: ".STATUS_TYPING;$1;switch"
                 },
                 {
                     // Return the STATUS_ONLINE_MOBILE mask if the user is on mobile, no matter the status
-                    match: /(switch\(\i\){case \i\.\i\.ONLINE:return )(\i)\?({.+?}):/,
-                    replace: (_, rest, isMobile, component) => `if(${isMobile})return${component};${rest}`
+                    match: /switch\(\i\)\{case \i\.\i\.ONLINE:(if\(\i\)return\{[^}]+\})/,
+                    replace: "$1;$&"
                 }
             ]
         },

From ffe6bb1c5d4191cad35a1bdcb84695e886ff4528 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 26 Oct 2023 01:32:15 +0200
Subject: [PATCH 108/632] Bump to v1.6.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9ab6b2233..61940d080 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.5.8",
+    "version": "1.6.0",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 8ac80488454ba789791f69eb1e196adcf3e8be3a Mon Sep 17 00:00:00 2001
From: Hugo C <lumap@duck.com>
Date: Thu, 26 Oct 2023 02:17:31 +0200
Subject: [PATCH 109/632] fix: ImageZoom + PiP (#1894)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/imageZoom/styles.css       | 6 ------
 src/plugins/pictureInPicture/index.tsx | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/plugins/imageZoom/styles.css b/src/plugins/imageZoom/styles.css
index 9d5867886..09c3c8580 100644
--- a/src/plugins/imageZoom/styles.css
+++ b/src/plugins/imageZoom/styles.css
@@ -25,12 +25,6 @@
     box-shadow: none;
 }
 
-[class*="modalCarouselWrapper"] {
-    height: fit-content;
-    top: 50%;
-    transform: translateY(-50%);
-}
-
 [class|="wrapper"]:has(> #vc-imgzoom-magnify-modal) {
     position: absolute;
     left: 50%;
diff --git a/src/plugins/pictureInPicture/index.tsx b/src/plugins/pictureInPicture/index.tsx
index f5f0a5128..dc6ddb0b5 100644
--- a/src/plugins/pictureInPicture/index.tsx
+++ b/src/plugins/pictureInPicture/index.tsx
@@ -28,7 +28,7 @@ export default definePlugin({
         {
             find: ".nonMediaAttachment]",
             replacement: {
-                match: /\.nonMediaAttachment\].{0,10}children:\[\S{3}/,
+                match: /\.nonMediaAttachment\].{0,10}children:\[\S/,
                 replace: "$&&&$self.renderPiPButton(),"
             },
         },

From 25dc25c707fe6582a7aea1f5c5ccf68ef0b48987 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 26 Oct 2023 02:28:17 +0200
Subject: [PATCH 110/632] Fix VoiceMessages

---
 src/plugins/voiceMessages/VoicePreview.tsx | 4 ++--
 src/plugins/voiceMessages/index.tsx        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/voiceMessages/VoicePreview.tsx b/src/plugins/voiceMessages/VoicePreview.tsx
index 70830a920..912c55ae0 100644
--- a/src/plugins/voiceMessages/VoicePreview.tsx
+++ b/src/plugins/voiceMessages/VoicePreview.tsx
@@ -17,7 +17,7 @@
 */
 
 import { LazyComponent, useTimer } from "@utils/react";
-import { findByCode } from "@webpack";
+import { find } from "@webpack";
 
 import { cl } from "./utils";
 
@@ -25,7 +25,7 @@ interface VoiceMessageProps {
     src: string;
     waveform: string;
 }
-const VoiceMessage = LazyComponent<VoiceMessageProps>(() => findByCode('["onVolumeChange","volume","onMute"]'));
+const VoiceMessage = LazyComponent<VoiceMessageProps>(() => find(m => m.type?.toString().includes("waveform:")));
 
 export type VoicePreviewOptions = {
     src?: string;
diff --git a/src/plugins/voiceMessages/index.tsx b/src/plugins/voiceMessages/index.tsx
index 1b8d7a4e4..7c8a06943 100644
--- a/src/plugins/voiceMessages/index.tsx
+++ b/src/plugins/voiceMessages/index.tsx
@@ -25,7 +25,7 @@ import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModa
 import { useAwaiter } from "@utils/react";
 import definePlugin from "@utils/types";
 import { chooseFile } from "@utils/web";
-import { findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
 import { Button, FluxDispatcher, Forms, lodash, Menu, PermissionsBits, PermissionStore, RestAPI, SelectedChannelStore, showToast, SnowflakeUtils, Toasts, useEffect, useState } from "@webpack/common";
 import { ComponentType } from "react";
 
@@ -35,7 +35,7 @@ import { cl } from "./utils";
 import { VoicePreview } from "./VoicePreview";
 import { VoiceRecorderWeb } from "./WebRecorder";
 
-const CloudUpload = findLazy(m => m.prototype?.uploadFileToCloud);
+const CloudUtils = findByPropsLazy("CloudUpload");
 const MessageCreator = findByPropsLazy("getSendMessageOptionsForReply", "sendMessage");
 const PendingReplyStore = findStoreLazy("PendingReplyStore");
 const OptionClasses = findByPropsLazy("optionName", "optionIcon", "optionLabel");
@@ -76,7 +76,7 @@ function sendAudio(blob: Blob, meta: AudioMetadata) {
     const reply = PendingReplyStore.getPendingReply(channelId);
     if (reply) FluxDispatcher.dispatch({ type: "DELETE_PENDING_REPLY", channelId });
 
-    const upload = new CloudUpload({
+    const upload = new CloudUtils.CloudUpload({
         file: new File([blob], "voice-message.ogg", { type: "audio/ogg; codecs=opus" }),
         isClip: false,
         isThumbnail: false,

From 03523446c177aa7a71b75a6c9b4eba2e9e04c963 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Thu, 26 Oct 2023 07:50:33 +0700
Subject: [PATCH 111/632] silentTyping: fix showIcon toggle (#1898)

---
 src/plugins/silentTyping/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/silentTyping/index.tsx b/src/plugins/silentTyping/index.tsx
index 031db0998..dae7ad4c9 100644
--- a/src/plugins/silentTyping/index.tsx
+++ b/src/plugins/silentTyping/index.tsx
@@ -86,6 +86,7 @@ export default definePlugin({
         },
         {
             find: "ChannelTextAreaButtons",
+            predicate: () => settings.store.showIcon,
             replacement: {
                 match: /(\i)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
                 replace: "$&,(()=>{try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}})()",

From 64c6f5740fa389a7672bd53c863d6f4549996907 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 26 Oct 2023 00:19:26 -0300
Subject: [PATCH 112/632] Fix FakeNitro completely (#1903)

---
 src/plugins/fakeNitro/index.ts           | 119 ++++++++++++++---------
 src/plugins/showHiddenChannels/index.tsx |   2 +-
 2 files changed, 74 insertions(+), 47 deletions(-)

diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index 921b738a2..3441cd4fb 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -24,35 +24,34 @@ import { getCurrentGuild } from "@utils/discord";
 import { proxyLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy, findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, EmojiStore, FluxDispatcher, lodash, Parser, PermissionStore, UserStore } from "@webpack/common";
+import { findByCodeLazy, findByPropsLazy, findStoreLazy } from "@webpack";
+import { ChannelStore, EmojiStore, FluxDispatcher, lodash, Parser, PermissionStore, UserSettingsActionCreators, UserStore } from "@webpack/common";
 import type { Message } from "discord-types/general";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
 import type { ReactElement, ReactNode } from "react";
 
 const DRAFT_TYPE = 0;
 const promptToUpload = findByCodeLazy("UPLOAD_FILE_LIMIT_ERROR");
-const UserSettingsProtoStore = findStoreLazy("UserSettingsProtoStore");
-const PreloadedUserSettingsProtoHandler = findLazy(m => m.ProtoClass?.typeName === "discord_protos.discord_users.v1.PreloadedUserSettings");
-const ReaderFactory = findByPropsLazy("readerFactory");
 const StickerStore = findStoreLazy("StickersStore") as {
     getPremiumPacks(): StickerPack[];
     getAllGuildStickers(): Map<string, Sticker[]>;
     getStickerById(id: string): Sticker | undefined;
 };
 
-function searchProtoClass(localName: string, parentProtoClass: any) {
-    if (!parentProtoClass) return;
+const UserSettingsProtoStore = findStoreLazy("UserSettingsProtoStore");
+const ProtoUtils = findByPropsLazy("BINARY_READ_OPTIONS");
 
-    const field = parentProtoClass.fields.find(field => field.localName === localName);
+function searchProtoClassField(localName: string, protoClass: any) {
+    const field = protoClass?.fields?.find((field: any) => field.localName === localName);
     if (!field) return;
 
-    const getter: any = Object.values(field).find(value => typeof value === "function");
-    return getter?.();
+    const fieldGetter = Object.values(field).find(value => typeof value === "function") as any;
+    return fieldGetter?.();
 }
 
-const AppearanceSettingsProto = proxyLazy(() => searchProtoClass("appearance", PreloadedUserSettingsProtoHandler.ProtoClass));
-const ClientThemeSettingsProto = proxyLazy(() => searchProtoClass("clientThemeSettings", AppearanceSettingsProto));
+const PreloadedUserSettingsActionCreators = proxyLazy(() => UserSettingsActionCreators.PreloadedUserSettingsActionCreators);
+const AppearanceSettingsActionCreators = proxyLazy(() => searchProtoClassField("appearance", PreloadedUserSettingsActionCreators.ProtoClass));
+const ClientThemeSettingsActionsCreators = proxyLazy(() => searchProtoClassField("clientThemeSettings", AppearanceSettingsActionCreators));
 
 const USE_EXTERNAL_EMOJIS = 1n << 18n;
 const USE_EXTERNAL_STICKERS = 1n << 37n;
@@ -176,31 +175,37 @@ export default definePlugin({
             predicate: () => settings.store.enableEmojiBypass,
             replacement: [
                 {
+                    // Create a variable for the intention of listing the emoji
                     match: /(?<=,intention:(\i).+?;)/,
-                    replace: (_, intention) => `var fakeNitroIntention=${intention};`
+                    replace: (_, intention) => `let fakeNitroIntention=${intention};`
                 },
                 {
+                    // Send the intention of listing the emoji to the nitro permission check functions
                     match: /\.(?:canUseEmojisEverywhere|canUseAnimatedEmojis)\(\i(?=\))/g,
                     replace: '$&,typeof fakeNitroIntention!=="undefined"?fakeNitroIntention:void 0'
                 },
                 {
+                    // Disallow the emoji if the intention doesn't allow it
                     match: /(&&!\i&&)!(\i)(?=\)return \i\.\i\.DISALLOW_EXTERNAL;)/,
                     replace: (_, rest, canUseExternal) => `${rest}(!${canUseExternal}&&(typeof fakeNitroIntention==="undefined"||![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)))`
                 },
                 {
+                    // Make the emoji always available if the intention allows it
                     match: /if\(!\i\.available/,
                     replace: m => `${m}&&(typeof fakeNitroIntention==="undefined"||![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention))`
                 }
             ]
         },
+        // Allow emojis and animated emojis to be sent everywhere
         {
             find: "canUseAnimatedEmojis:function",
             predicate: () => settings.store.enableEmojiBypass,
             replacement: {
-                match: /((?:canUseEmojisEverywhere|canUseAnimatedEmojis):function\(\i)\){(.+?\))/g,
-                replace: (_, rest, premiumCheck) => `${rest},fakeNitroIntention){${premiumCheck}||fakeNitroIntention==null||[${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)`
+                match: /((?:canUseEmojisEverywhere|canUseAnimatedEmojis):function\(\i)\){(.+?\))(?=})/g,
+                replace: (_, rest, premiumCheck) => `${rest},fakeNitroIntention){${premiumCheck}||fakeNitroIntention!=null||[${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)`
             }
         },
+        // Allow stickers to be sent everywhere
         {
             find: "canUseStickersEverywhere:function",
             predicate: () => settings.store.enableStickerBypass,
@@ -209,6 +214,7 @@ export default definePlugin({
                 replace: "$&return true;"
             },
         },
+        // Make stickers always available
         {
             find: "\"SENDABLE\"",
             predicate: () => settings.store.enableStickerBypass,
@@ -217,6 +223,7 @@ export default definePlugin({
                 replace: "true?"
             }
         },
+        // Allow streaming with high quality
         {
             find: "canUseHighVideoUploadQuality:function",
             predicate: () => settings.store.enableStreamQualityBypass,
@@ -230,6 +237,7 @@ export default definePlugin({
                 };
             })
         },
+        // Remove boost requirements to stream with high quality
         {
             find: "STREAM_FPS_OPTION.format",
             predicate: () => settings.store.enableStreamQualityBypass,
@@ -238,6 +246,7 @@ export default definePlugin({
                 replace: ""
             }
         },
+        // Allow client themes to be changeable
         {
             find: "canUseClientThemes:function",
             replacement: {
@@ -249,19 +258,22 @@ export default definePlugin({
             find: '.displayName="UserSettingsProtoStore"',
             replacement: [
                 {
+                    // Overwrite incoming connection settings proto with our local settings
                     match: /CONNECTION_OPEN:function\((\i)\){/,
                     replace: (m, props) => `${m}$self.handleProtoChange(${props}.userSettingsProto,${props}.user);`
                 },
                 {
-                    match: /=(\i)\.local;/,
-                    replace: (m, props) => `${m}${props}.local||$self.handleProtoChange(${props}.settings.proto);`
+                    // Overwrite non local proto changes with our local settings
+                    match: /let{settings:/,
+                    replace: "arguments[0].local||$self.handleProtoChange(arguments[0].settings.proto);$&"
                 }
             ]
         },
+        // Call our function to handle changing the gradient theme when selecting a new one
         {
-            find: "updateTheme:function",
+            find: ",updateTheme(",
             replacement: {
-                match: /(function \i\(\i\){var (\i)=\i\.backgroundGradientPresetId.+?)(\i\.\i\.updateAsync.+?theme=(.+?);.+?\),\i\))/,
+                match: /(function \i\(\i\){let{backgroundGradientPresetId:(\i).+?)(\i\.\i\.updateAsync.+?theme=(.+?),.+?},\i\))/,
                 replace: (_, rest, backgroundGradientPresetId, originalCall, theme) => `${rest}$self.handleGradientThemeSelect(${backgroundGradientPresetId},${theme},()=>${originalCall});`
             }
         },
@@ -269,11 +281,13 @@ export default definePlugin({
             find: '["strong","em","u","text","inlineCode","s","spoiler"]',
             replacement: [
                 {
+                    // Call our function to decide whether the emoji link should be kept or not
                     predicate: () => settings.store.transformEmojis,
                     match: /1!==(\i)\.length\|\|1!==\i\.length/,
                     replace: (m, content) => `${m}||$self.shouldKeepEmojiLink(${content}[0])`
                 },
                 {
+                    // Patch the rendered message content to add fake nitro emojis or remove sticker links
                     predicate: () => settings.store.transformEmojis || settings.store.transformStickers,
                     match: /(?=return{hasSpoilerEmbeds:\i,content:(\i)})/,
                     replace: (_, content) => `${content}=$self.patchFakeNitroEmojisOrRemoveStickersLinks(${content},arguments[2]?.formatInline);`
@@ -281,36 +295,41 @@ export default definePlugin({
             ]
         },
         {
-            find: "renderEmbeds=function",
+            find: "renderEmbeds(",
             replacement: [
                 {
+                    // Call our function to decide whether the embed should be ignored or not
                     predicate: () => settings.store.transformEmojis || settings.store.transformStickers,
-                    match: /(renderEmbeds=function\((\i)\){)(.+?embeds\.map\(\(function\((\i)\){)/,
+                    match: /(renderEmbeds\((\i)\){)(.+?embeds\.map\((\i)=>{)/,
                     replace: (_, rest1, message, rest2, embed) => `${rest1}const fakeNitroMessage=${message};${rest2}if($self.shouldIgnoreEmbed(${embed},fakeNitroMessage))return null;`
                 },
                 {
+                    // Patch the stickers array to add fake nitro stickers
                     predicate: () => settings.store.transformStickers,
-                    match: /renderStickersAccessories=function\((\i)\){var (\i)=\(0,\i\.\i\)\(\i\),/,
-                    replace: (m, message, stickers) => `${m}${stickers}=$self.patchFakeNitroStickers(${stickers},${message}),`
+                    match: /(?<=renderStickersAccessories\((\i)\){let (\i)=\(0,\i\.\i\)\(\i\).+?;)/,
+                    replace: (_, message, stickers) => `${stickers}=$self.patchFakeNitroStickers(${stickers},${message});`
                 },
                 {
+                    // Filter attachments to remove fake nitro stickers or emojis
                     predicate: () => settings.store.transformStickers,
-                    match: /renderAttachments=function\(\i\){var \i=this,(\i)=\i.attachments.+?;/,
+                    match: /renderAttachments\(\i\){let{attachments:(\i).+?;/,
                     replace: (m, attachments) => `${m}${attachments}=$self.filterAttachments(${attachments});`
                 }
             ]
         },
         {
-            find: ".STICKER_IN_MESSAGE_HOVER,",
+            find: ".Messages.STICKER_POPOUT_UNJOINED_PRIVATE_GUILD_DESCRIPTION.format",
             predicate: () => settings.store.transformStickers,
             replacement: [
                 {
-                    match: /var (\i)=\i\.renderableSticker,.{0,50}closePopout.+?channel:\i,closePopout:\i,/,
-                    replace: (m, renderableSticker) => `${m}renderableSticker:${renderableSticker},`
+                    // Export the renderable sticker to be used in the fake nitro sticker notice
+                    match: /let{renderableSticker:(\i).{0,250}isGuildSticker.+?channel:\i,/,
+                    replace: (m, renderableSticker) => `${m}fakeNitroRenderableSticker:${renderableSticker},`
                 },
                 {
-                    match: /(emojiSection.{0,50}description:)(\i)(?<=(\i)\.sticker,.+?)(?=,)/,
-                    replace: (_, rest, reactNode, props) => `${rest}$self.addFakeNotice(${FakeNoticeType.Sticker},${reactNode},!!${props}.renderableSticker?.fake)`
+                    // Add the fake nitro sticker notice
+                    match: /(let \i,{sticker:\i,channel:\i,closePopout:\i.+?}=(\i).+?;)(.+?description:)(\i)(?=,sticker:\i)/,
+                    replace: (_, rest, props, rest2, reactNode) => `${rest}let{fakeNitroRenderableSticker}=${props};${rest2}$self.addFakeNotice(${FakeNoticeType.Sticker},${reactNode},!!fakeNitroRenderableSticker?.fake)`
                 }
             ]
         },
@@ -318,6 +337,7 @@ export default definePlugin({
             find: ".EMOJI_UPSELL_POPOUT_MORE_EMOJIS_OPENED,",
             predicate: () => settings.store.transformEmojis,
             replacement: {
+                // Export the emoji node to be used in the fake nitro emoji notice
                 match: /isDiscoverable:\i,shouldHideRoleSubscriptionCTA:\i,(?<={node:(\i),.+?)/,
                 replace: (m, node) => `${m}fakeNitroNode:${node},`
             }
@@ -326,10 +346,12 @@ export default definePlugin({
             find: ".Messages.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION",
             predicate: () => settings.store.transformEmojis,
             replacement: {
+                // Add the fake nitro emoji notice
                 match: /(?<=isDiscoverable:\i,emojiComesFromCurrentGuild:\i,.+?}=(\i).+?;)(.+?return )(.{0,1000}\.Messages\.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION.+?)(?=},)/,
-                replace: (_, props, rest, reactNode) => `var fakeNitroNode=${props}.fakeNitroNode;${rest}$self.addFakeNotice(${FakeNoticeType.Emoji},${reactNode},fakeNitroNode?.fake)`
+                replace: (_, props, rest, reactNode) => `let{fakeNitroNode}=${props};${rest}$self.addFakeNotice(${FakeNoticeType.Emoji},${reactNode},!!fakeNitroNode?.fake)`
             }
         },
+        // Allow using custom app icons
         {
             find: "canUsePremiumAppIcons:function",
             replacement: {
@@ -337,6 +359,7 @@ export default definePlugin({
                 replace: "$&return true;"
             }
         },
+        // Separate patch for allowing using custom app icons
         {
             find: "location:\"AppIconHome\"",
             replacement: {
@@ -359,26 +382,30 @@ export default definePlugin({
     },
 
     handleProtoChange(proto: any, user: any) {
-        if (proto == null || typeof proto === "string" || !UserSettingsProtoStore || (!proto.appearance && !AppearanceSettingsProto)) return;
+        if (proto == null || typeof proto === "string" || !UserSettingsProtoStore || !PreloadedUserSettingsActionCreators || !AppearanceSettingsActionCreators || !ClientThemeSettingsActionsCreators) return;
 
         const premiumType: number = user?.premium_type ?? UserStore?.getCurrentUser()?.premiumType ?? 0;
 
         if (premiumType !== 2) {
-            proto.appearance ??= AppearanceSettingsProto.create();
+            proto.appearance ??= AppearanceSettingsActionCreators.create();
 
             if (UserSettingsProtoStore.settings.appearance?.theme != null) {
-                proto.appearance.theme = UserSettingsProtoStore.settings.appearance.theme;
+                const appearanceSettingsDummy = AppearanceSettingsActionCreators.create({
+                    theme: UserSettingsProtoStore.settings.appearance.theme
+                });
+
+                proto.appearance.theme = appearanceSettingsDummy.theme;
             }
 
-            if (UserSettingsProtoStore.settings.appearance?.clientThemeSettings?.backgroundGradientPresetId?.value != null && ClientThemeSettingsProto) {
-                const clientThemeSettingsDummyProto = ClientThemeSettingsProto.create({
+            if (UserSettingsProtoStore.settings.appearance?.clientThemeSettings?.backgroundGradientPresetId?.value != null) {
+                const clientThemeSettingsDummy = ClientThemeSettingsActionsCreators.create({
                     backgroundGradientPresetId: {
                         value: UserSettingsProtoStore.settings.appearance.clientThemeSettings.backgroundGradientPresetId.value
                     }
                 });
 
-                proto.appearance.clientThemeSettings ??= clientThemeSettingsDummyProto;
-                proto.appearance.clientThemeSettings.backgroundGradientPresetId = clientThemeSettingsDummyProto.backgroundGradientPresetId;
+                proto.appearance.clientThemeSettings ??= clientThemeSettingsDummy;
+                proto.appearance.clientThemeSettings.backgroundGradientPresetId = clientThemeSettingsDummy.backgroundGradientPresetId;
             }
         }
     },
@@ -387,26 +414,26 @@ export default definePlugin({
         const premiumType = UserStore?.getCurrentUser()?.premiumType ?? 0;
         if (premiumType === 2 || backgroundGradientPresetId == null) return original();
 
-        if (!AppearanceSettingsProto || !ClientThemeSettingsProto || !ReaderFactory) return;
+        if (!PreloadedUserSettingsActionCreators || !AppearanceSettingsActionCreators || !ClientThemeSettingsActionsCreators || !ProtoUtils) return;
 
-        const currentAppearanceProto = PreloadedUserSettingsProtoHandler.getCurrentValue().appearance;
+        const currentAppearanceSettings = PreloadedUserSettingsActionCreators.getCurrentValue().appearance;
 
-        const newAppearanceProto = currentAppearanceProto != null
-            ? AppearanceSettingsProto.fromBinary(AppearanceSettingsProto.toBinary(currentAppearanceProto), ReaderFactory)
-            : AppearanceSettingsProto.create();
+        const newAppearanceProto = currentAppearanceSettings != null
+            ? AppearanceSettingsActionCreators.fromBinary(AppearanceSettingsActionCreators.toBinary(currentAppearanceSettings), ProtoUtils.BINARY_READ_OPTIONS)
+            : AppearanceSettingsActionCreators.create();
 
         newAppearanceProto.theme = theme;
 
-        const clientThemeSettingsDummyProto = ClientThemeSettingsProto.create({
+        const clientThemeSettingsDummy = ClientThemeSettingsActionsCreators.create({
             backgroundGradientPresetId: {
                 value: backgroundGradientPresetId
             }
         });
 
-        newAppearanceProto.clientThemeSettings ??= clientThemeSettingsDummyProto;
-        newAppearanceProto.clientThemeSettings.backgroundGradientPresetId = clientThemeSettingsDummyProto.backgroundGradientPresetId;
+        newAppearanceProto.clientThemeSettings ??= clientThemeSettingsDummy;
+        newAppearanceProto.clientThemeSettings.backgroundGradientPresetId = clientThemeSettingsDummy.backgroundGradientPresetId;
 
-        const proto = PreloadedUserSettingsProtoHandler.ProtoClass.create();
+        const proto = PreloadedUserSettingsActionCreators.ProtoClass.create();
         proto.appearance = newAppearanceProto;
 
         FluxDispatcher.dispatch({
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 88e3cc4f5..ecfd08e33 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -416,7 +416,7 @@ export default definePlugin({
                 {
                     // Filter hidden channels from GuildChannelStore.getChannels unless told otherwise
                     match: /(?<=getChannels\(\i)(\){.+?)return (.+?)}/,
-                    replace: (_, rest, channels) => `,shouldIncludeHidden=false${rest}return $self.resolveGuildChannels(${channels},shouldIncludeHidden);}`
+                    replace: (_, rest, channels) => `,shouldIncludeHidden${rest}return $self.resolveGuildChannels(${channels},shouldIncludeHidden??false);}`
                 }
             ]
         },

From c1de41436a6d0e02b940e6f24ef374ccb77281c0 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Thu, 26 Oct 2023 17:49:06 +0100
Subject: [PATCH 113/632] Fix plugins using promptToUpload (#1908)

---
 src/plugins/fakeNitro/index.ts | 7 +++----
 src/plugins/petpet/index.ts    | 9 ++++-----
 src/webpack/common/utils.ts    | 5 ++++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index 3441cd4fb..efec9a8b5 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -24,14 +24,13 @@ import { getCurrentGuild } from "@utils/discord";
 import { proxyLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy, findByPropsLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, EmojiStore, FluxDispatcher, lodash, Parser, PermissionStore, UserSettingsActionCreators, UserStore } from "@webpack/common";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
+import { ChannelStore, EmojiStore, FluxDispatcher, lodash, Parser, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
 import type { Message } from "discord-types/general";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
 import type { ReactElement, ReactNode } from "react";
 
 const DRAFT_TYPE = 0;
-const promptToUpload = findByCodeLazy("UPLOAD_FILE_LIMIT_ERROR");
 const StickerStore = findStoreLazy("StickersStore") as {
     getPremiumPacks(): StickerPack[];
     getAllGuildStickers(): Map<string, Sticker[]>;
@@ -756,7 +755,7 @@ export default definePlugin({
         gif.finish();
 
         const file = new File([gif.bytesView()], `${stickerId}.gif`, { type: "image/gif" });
-        promptToUpload([file], ChannelStore.getChannel(channelId), DRAFT_TYPE);
+        UploadHandler.promptToUpload([file], ChannelStore.getChannel(channelId), DRAFT_TYPE);
     },
 
     start() {
diff --git a/src/plugins/petpet/index.ts b/src/plugins/petpet/index.ts
index 0bfd21af1..3f9743255 100644
--- a/src/plugins/petpet/index.ts
+++ b/src/plugins/petpet/index.ts
@@ -20,7 +20,8 @@ import { ApplicationCommandInputType, ApplicationCommandOptionType, Argument, Co
 import { Devs } from "@utils/constants";
 import { makeLazy } from "@utils/lazy";
 import definePlugin from "@utils/types";
-import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
+import { UploadHandler, UserUtils } from "@webpack/common";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
 
 const DRAFT_TYPE = 0;
@@ -35,8 +36,6 @@ const getFrames = makeLazy(() => Promise.all(
     ))
 );
 
-const fetchUser = findByCodeLazy(".USER(");
-const promptToUpload = findByCodeLazy("UPLOAD_FILE_LIMIT_ERROR");
 const UploadStore = findByPropsLazy("getUploads");
 
 function loadImage(source: File | string) {
@@ -70,7 +69,7 @@ async function resolveImage(options: Argument[], ctx: CommandContext, noServerPf
                 return opt.value;
             case "user":
                 try {
-                    const user = await fetchUser(opt.value);
+                    const user = await UserUtils.getUser(opt.value);
                     return user.getAvatarURL(noServerPfp ? void 0 : ctx.guild?.id, 2048).replace(/\?size=\d+$/, "?size=2048");
                 } catch (err) {
                     console.error("[petpet] Failed to fetch user\n", err);
@@ -175,7 +174,7 @@ export default definePlugin({
                 const file = new File([gif.bytesView()], "petpet.gif", { type: "image/gif" });
                 // Immediately after the command finishes, Discord clears all input, including pending attachments.
                 // Thus, setTimeout is needed to make this execute after Discord cleared the input
-                setTimeout(() => promptToUpload([file], cmdCtx.channel, DRAFT_TYPE), 10);
+                setTimeout(() => UploadHandler.promptToUpload([file], cmdCtx.channel, DRAFT_TYPE), 10);
             },
         },
     ]
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 487a4bc78..6de57c92d 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -17,7 +17,7 @@
 */
 
 import { proxyLazy } from "@utils/lazy";
-import type { User } from "discord-types/general";
+import type { Channel, User } from "discord-types/general";
 
 // eslint-disable-next-line path-alias/no-relative
 import { _resolveReady, filters, find, findByPropsLazy, findLazy, mapMangledModuleLazy, waitFor } from "../webpack";
@@ -94,6 +94,9 @@ export function showToast(message: string, type = ToastType.MESSAGE) {
 }
 
 export const UserUtils = findByPropsLazy("getUser", "fetchCurrentUser") as { getUser: (id: string) => Promise<User>; };
+export const UploadHandler = findByPropsLazy("showUploadFileSizeExceededError", "promptToUpload") as {
+    promptToUpload: (files: File[], channel: Channel, draftType: Number) => void;
+};
 
 export const ApplicationAssetUtils = findByPropsLazy("fetchAssetIds", "getAssetImage") as {
     fetchAssetIds: (applicationId: string, e: string[]) => Promise<string[]>;

From 07c4a097e0d4bc433e48f7cb037b3c939fcad275 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Thu, 26 Oct 2023 17:49:18 +0100
Subject: [PATCH 114/632] Fix EmoteCloner (#1907)

---
 src/plugins/emoteCloner/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/emoteCloner/index.tsx b/src/plugins/emoteCloner/index.tsx
index 7acb6ecb5..c44731152 100644
--- a/src/plugins/emoteCloner/index.tsx
+++ b/src/plugins/emoteCloner/index.tsx
@@ -23,12 +23,12 @@ import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
 import { ModalContent, ModalHeader, ModalRoot, openModalLazy } from "@utils/modal";
 import definePlugin from "@utils/types";
-import { findByCodeLazy, findStoreLazy } from "@webpack";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
 import { EmojiStore, FluxDispatcher, Forms, GuildStore, Menu, PermissionsBits, PermissionStore, React, RestAPI, Toasts, Tooltip, UserStore } from "@webpack/common";
 import { Promisable } from "type-fest";
 
 const StickersStore = findStoreLazy("StickersStore");
-const uploadEmoji = findByCodeLazy('"EMOJI_UPLOAD_START"', "GUILD_EMOJIS(");
+const EmojiManager = findByPropsLazy("fetchEmoji", "uploadEmoji", "deleteEmoji");
 
 interface Sticker {
     t: "Sticker";
@@ -106,7 +106,7 @@ async function cloneEmoji(guildId: string, emoji: Emoji) {
         reader.readAsDataURL(data);
     });
 
-    return uploadEmoji({
+    return EmojiManager.uploadEmoji({
         guildId,
         name: emoji.name.split("~")[0],
         image: dataUrl

From 6d605050e18ede4eba875f5fe2f52d984647d678 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 26 Oct 2023 15:07:44 -0300
Subject: [PATCH 115/632] Fix BetterNoteBox

---
 src/plugins/betterNotes/index.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/plugins/betterNotes/index.tsx b/src/plugins/betterNotes/index.tsx
index 7049a3693..da41b9732 100644
--- a/src/plugins/betterNotes/index.tsx
+++ b/src/plugins/betterNotes/index.tsx
@@ -32,10 +32,16 @@ export default definePlugin({
         {
             find: "hideNote:",
             all: true,
+            // Some modules match the find but the replacement is returned untouched
+            noWarn: true,
             predicate: () => Vencord.Settings.plugins.BetterNotesBox.hide,
             replacement: {
-                match: /hideNote:.+?(?=[,}])/g,
-                replace: "hideNote:true",
+                match: /hideNote:.+?(?=([,}].*?\)))/g,
+                replace: (m, rest) => {
+                    const destructuringMatch = rest.match(/}=.+/);
+                    if (destructuringMatch == null) return "hideNote:!0";
+                    return m;
+                }
             }
         },
         {

From b48998d485e08052bcdb3602af2d5fff9b6af24f Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 26 Oct 2023 15:25:29 -0300
Subject: [PATCH 116/632] More accurate ShowAllMessageButtons patch

---
 src/plugins/showAllMessageButtons/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/showAllMessageButtons/index.ts b/src/plugins/showAllMessageButtons/index.ts
index bff513c14..44a5741cb 100644
--- a/src/plugins/showAllMessageButtons/index.ts
+++ b/src/plugins/showAllMessageButtons/index.ts
@@ -28,8 +28,8 @@ export default definePlugin({
         {
             find: ".Messages.MESSAGE_UTILITIES_A11Y_LABEL",
             replacement: {
-                match: /isExpanded:\i&&.*?,/,
-                replace: "isExpanded:true,"
+                match: /isExpanded:\i&&(.+?),/,
+                replace: "isExpanded:$1,"
             }
         }
     ]

From 85bfa1e719a92073c270f68ca180334ac93a7415 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 26 Oct 2023 15:36:05 -0300
Subject: [PATCH 117/632] Fix duplicated WebContextMenus find

---
 src/plugins/webContextMenus.web/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index cd31e7aa8..bbfaa6747 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -147,7 +147,7 @@ export default definePlugin({
             }
         },
         {
-            find: 'navId:"textarea-context"',
+            find: ".SLASH_COMMAND_SUGGESTIONS_TOGGLED,{",
             predicate: () => settings.store.addBack,
             replacement: [
                 {

From 25f101602dcfbf75e5082b3c8965e44e74a7a8c1 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 26 Oct 2023 21:03:05 +0200
Subject: [PATCH 118/632] fix modules being patched multiple times

---
 src/webpack/patchWebpack.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index 880aa2559..0a3f6d14d 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -229,12 +229,17 @@ function patchPush(webpackGlobal: any) {
     }
 
     handlePush.$$vencordOriginal = webpackGlobal.push;
+    // Webpack overwrites .push with its own push like so: `d.push = n.bind(null, d.push.bind(d));`
+    // it wraps the old push (`d.push.bind(d)`). this old push is in this case our handlePush.
+    // If we then repatched the new push, we would end up with recursive patching, which leads to our patches
+    // being applied multiple times.
+    // Thus, override bind to use the original push
+    handlePush.bind = (...args: unknown[]) => handlePush.$$vencordOriginal.bind(...args);
+
     Object.defineProperty(webpackGlobal, "push", {
         get: () => handlePush,
         set(v) {
-            delete webpackGlobal.push;
-            webpackGlobal.push = v;
-            patchPush(webpackGlobal);
+            handlePush.$$vencordOriginal = v;
         },
         configurable: true
     });

From e4701769a5b8e0a71dba0e26bc311ff6e34eadf7 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 26 Oct 2023 21:21:21 +0200
Subject: [PATCH 119/632] Fix entry webpack modules not being patched

---
 src/webpack/patchWebpack.ts | 352 +++++++++++++++++++-----------------
 1 file changed, 189 insertions(+), 163 deletions(-)

diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index 0a3f6d14d..23ef99e24 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -53,174 +53,35 @@ if (window[WEBPACK_CHUNK]) {
         },
         configurable: true
     });
+
+    // wreq.m is the webpack module factory.
+    // normally, this is populated via webpackGlobal.push, which we patch below.
+    // However, Discord has their .m prepopulated.
+    // Thus, we use this hack to immediately access their wreq.m and patch all already existing factories
+    Object.defineProperty(Function.prototype, "m", {
+        set(v: any) {
+            // When using react devtools or other extensions, we may also catch their webpack here.
+            // This ensures we actually got the right one
+            if (new Error().stack?.includes("discord.com")) {
+                logger.info("Found webpack module factory");
+                patchFactories(v);
+
+                delete (Function.prototype as any).m;
+            }
+
+            Object.defineProperty(this, "m", {
+                value: v,
+                configurable: true,
+            });
+        },
+        configurable: true
+    });
 }
 
 function patchPush(webpackGlobal: any) {
     function handlePush(chunk: any) {
         try {
-            const modules = chunk[1];
-            const { subscriptions, listeners } = Vencord.Webpack;
-            const { patches } = Vencord.Plugins;
-
-            for (const id in modules) {
-                let mod = modules[id];
-                // Discords Webpack chunks for some ungodly reason contain random
-                // newlines. Cyn recommended this workaround and it seems to work fine,
-                // however this could potentially break code, so if anything goes weird,
-                // this is probably why.
-                // Additionally, `[actual newline]` is one less char than "\n", so if Discord
-                // ever targets newer browsers, the minifier could potentially use this trick and
-                // cause issues.
-                let code: string = mod.toString().replaceAll("\n", "");
-                // a very small minority of modules use function() instead of arrow functions,
-                // but, unnamed toplevel functions aren't valid. However 0, function() makes it a statement
-                if (code.startsWith("function(")) {
-                    code = "0," + code;
-                }
-                const originalMod = mod;
-                const patchedBy = new Set();
-
-                const factory = modules[id] = function (module, exports, require) {
-                    try {
-                        mod(module, exports, require);
-                    } catch (err) {
-                        // Just rethrow discord errors
-                        if (mod === originalMod) throw err;
-
-                        logger.error("Error in patched chunk", err);
-                        return void originalMod(module, exports, require);
-                    }
-
-                    exports = module.exports;
-
-                    if (!exports) return;
-
-                    // There are (at the time of writing) 11 modules exporting the window
-                    // Make these non enumerable to improve webpack search performance
-                    if (exports === window) {
-                        Object.defineProperty(require.c, id, {
-                            value: require.c[id],
-                            enumerable: false,
-                            configurable: true,
-                            writable: true
-                        });
-                        return;
-                    }
-
-                    const numberId = Number(id);
-
-                    for (const callback of listeners) {
-                        try {
-                            callback(exports, numberId);
-                        } catch (err) {
-                            logger.error("Error in webpack listener", err);
-                        }
-                    }
-
-                    for (const [filter, callback] of subscriptions) {
-                        try {
-                            if (filter(exports)) {
-                                subscriptions.delete(filter);
-                                callback(exports, numberId);
-                            } else if (typeof exports === "object") {
-                                if (exports.default && filter(exports.default)) {
-                                    subscriptions.delete(filter);
-                                    callback(exports.default, numberId);
-                                }
-
-                                for (const nested in exports) if (nested.length <= 3) {
-                                    if (exports[nested] && filter(exports[nested])) {
-                                        subscriptions.delete(filter);
-                                        callback(exports[nested], numberId);
-                                    }
-                                }
-                            }
-                        } catch (err) {
-                            logger.error("Error while firing callback for webpack chunk", err);
-                        }
-                    }
-                } as any as { toString: () => string, original: any, (...args: any[]): void; };
-
-                // for some reason throws some error on which calling .toString() leads to infinite recursion
-                // when you force load all chunks???
-                try {
-                    factory.toString = () => mod.toString();
-                    factory.original = originalMod;
-                } catch { }
-
-                for (let i = 0; i < patches.length; i++) {
-                    const patch = patches[i];
-                    const executePatch = traceFunction(`patch by ${patch.plugin}`, (match: string | RegExp, replace: string) => code.replace(match, replace));
-                    if (patch.predicate && !patch.predicate()) continue;
-
-                    if (code.includes(patch.find)) {
-                        patchedBy.add(patch.plugin);
-
-                        // we change all patch.replacement to array in plugins/index
-                        for (const replacement of patch.replacement as PatchReplacement[]) {
-                            if (replacement.predicate && !replacement.predicate()) continue;
-                            const lastMod = mod;
-                            const lastCode = code;
-
-                            canonicalizeReplacement(replacement, patch.plugin);
-
-                            try {
-                                const newCode = executePatch(replacement.match, replacement.replace as string);
-                                if (newCode === code && !patch.noWarn) {
-                                    (window.explosivePlugins ??= new Set<string>()).add(patch.plugin);
-                                    logger.warn(`Patch by ${patch.plugin} had no effect (Module id is ${id}): ${replacement.match}`);
-                                    if (IS_DEV) {
-                                        logger.debug("Function Source:\n", code);
-                                    }
-                                } else {
-                                    code = newCode;
-                                    mod = (0, eval)(`// Webpack Module ${id} - Patched by ${[...patchedBy].join(", ")}\n${newCode}\n//# sourceURL=WebpackModule${id}`);
-                                }
-                            } catch (err) {
-                                logger.error(`Patch by ${patch.plugin} errored (Module id is ${id}): ${replacement.match}\n`, err);
-
-                                if (IS_DEV) {
-                                    const changeSize = code.length - lastCode.length;
-                                    const match = lastCode.match(replacement.match)!;
-
-                                    // Use 200 surrounding characters of context
-                                    const start = Math.max(0, match.index! - 200);
-                                    const end = Math.min(lastCode.length, match.index! + match[0].length + 200);
-                                    // (changeSize may be negative)
-                                    const endPatched = end + changeSize;
-
-                                    const context = lastCode.slice(start, end);
-                                    const patchedContext = code.slice(start, endPatched);
-
-                                    // inline require to avoid including it in !IS_DEV builds
-                                    const diff = (require("diff") as typeof import("diff")).diffWordsWithSpace(context, patchedContext);
-                                    let fmt = "%c %s ";
-                                    const elements = [] as string[];
-                                    for (const d of diff) {
-                                        const color = d.removed
-                                            ? "red"
-                                            : d.added
-                                                ? "lime"
-                                                : "grey";
-                                        fmt += "%c%s";
-                                        elements.push("color:" + color, d.value);
-                                    }
-
-                                    logger.errorCustomFmt(...Logger.makeTitle("white", "Before"), context);
-                                    logger.errorCustomFmt(...Logger.makeTitle("white", "After"), patchedContext);
-                                    const [titleFmt, ...titleElements] = Logger.makeTitle("white", "Diff");
-                                    logger.errorCustomFmt(titleFmt + fmt, ...titleElements, ...elements);
-                                }
-                                code = lastCode;
-                                mod = lastMod;
-                                patchedBy.delete(patch.plugin);
-                            }
-                        }
-
-                        if (!patch.all) patches.splice(i--, 1);
-                    }
-                }
-            }
+            patchFactories(chunk[1]);
         } catch (err) {
             logger.error("Error in handlePush", err);
         }
@@ -244,3 +105,168 @@ function patchPush(webpackGlobal: any) {
         configurable: true
     });
 }
+
+function patchFactories(factories: Record<string | number, (module: { exports: any; }, exports: any, require: any) => void>) {
+    const { subscriptions, listeners } = Vencord.Webpack;
+    const { patches } = Vencord.Plugins;
+
+    for (const id in factories) {
+        let mod = factories[id];
+        // Discords Webpack chunks for some ungodly reason contain random
+        // newlines. Cyn recommended this workaround and it seems to work fine,
+        // however this could potentially break code, so if anything goes weird,
+        // this is probably why.
+        // Additionally, `[actual newline]` is one less char than "\n", so if Discord
+        // ever targets newer browsers, the minifier could potentially use this trick and
+        // cause issues.
+        let code: string = mod.toString().replaceAll("\n", "");
+        // a very small minority of modules use function() instead of arrow functions,
+        // but, unnamed toplevel functions aren't valid. However 0, function() makes it a statement
+        if (code.startsWith("function(")) {
+            code = "0," + code;
+        }
+        const originalMod = mod;
+        const patchedBy = new Set();
+
+        const factory = factories[id] = function (module, exports, require) {
+            try {
+                mod(module, exports, require);
+            } catch (err) {
+                // Just rethrow discord errors
+                if (mod === originalMod) throw err;
+
+                logger.error("Error in patched chunk", err);
+                return void originalMod(module, exports, require);
+            }
+
+            exports = module.exports;
+
+            if (!exports) return;
+
+            // There are (at the time of writing) 11 modules exporting the window
+            // Make these non enumerable to improve webpack search performance
+            if (exports === window) {
+                Object.defineProperty(require.c, id, {
+                    value: require.c[id],
+                    enumerable: false,
+                    configurable: true,
+                    writable: true
+                });
+                return;
+            }
+
+            const numberId = Number(id);
+
+            for (const callback of listeners) {
+                try {
+                    callback(exports, numberId);
+                } catch (err) {
+                    logger.error("Error in webpack listener", err);
+                }
+            }
+
+            for (const [filter, callback] of subscriptions) {
+                try {
+                    if (filter(exports)) {
+                        subscriptions.delete(filter);
+                        callback(exports, numberId);
+                    } else if (typeof exports === "object") {
+                        if (exports.default && filter(exports.default)) {
+                            subscriptions.delete(filter);
+                            callback(exports.default, numberId);
+                        }
+
+                        for (const nested in exports) if (nested.length <= 3) {
+                            if (exports[nested] && filter(exports[nested])) {
+                                subscriptions.delete(filter);
+                                callback(exports[nested], numberId);
+                            }
+                        }
+                    }
+                } catch (err) {
+                    logger.error("Error while firing callback for webpack chunk", err);
+                }
+            }
+        } as any as { toString: () => string, original: any, (...args: any[]): void; };
+
+        // for some reason throws some error on which calling .toString() leads to infinite recursion
+        // when you force load all chunks???
+        try {
+            factory.toString = () => mod.toString();
+            factory.original = originalMod;
+        } catch { }
+
+        for (let i = 0; i < patches.length; i++) {
+            const patch = patches[i];
+            const executePatch = traceFunction(`patch by ${patch.plugin}`, (match: string | RegExp, replace: string) => code.replace(match, replace));
+            if (patch.predicate && !patch.predicate()) continue;
+
+            if (code.includes(patch.find)) {
+                patchedBy.add(patch.plugin);
+
+                // we change all patch.replacement to array in plugins/index
+                for (const replacement of patch.replacement as PatchReplacement[]) {
+                    if (replacement.predicate && !replacement.predicate()) continue;
+                    const lastMod = mod;
+                    const lastCode = code;
+
+                    canonicalizeReplacement(replacement, patch.plugin);
+
+                    try {
+                        const newCode = executePatch(replacement.match, replacement.replace as string);
+                        if (newCode === code && !patch.noWarn) {
+                            (window.explosivePlugins ??= new Set<string>()).add(patch.plugin);
+                            logger.warn(`Patch by ${patch.plugin} had no effect (Module id is ${id}): ${replacement.match}`);
+                            if (IS_DEV) {
+                                logger.debug("Function Source:\n", code);
+                            }
+                        } else {
+                            code = newCode;
+                            mod = (0, eval)(`// Webpack Module ${id} - Patched by ${[...patchedBy].join(", ")}\n${newCode}\n//# sourceURL=WebpackModule${id}`);
+                        }
+                    } catch (err) {
+                        logger.error(`Patch by ${patch.plugin} errored (Module id is ${id}): ${replacement.match}\n`, err);
+
+                        if (IS_DEV) {
+                            const changeSize = code.length - lastCode.length;
+                            const match = lastCode.match(replacement.match)!;
+
+                            // Use 200 surrounding characters of context
+                            const start = Math.max(0, match.index! - 200);
+                            const end = Math.min(lastCode.length, match.index! + match[0].length + 200);
+                            // (changeSize may be negative)
+                            const endPatched = end + changeSize;
+
+                            const context = lastCode.slice(start, end);
+                            const patchedContext = code.slice(start, endPatched);
+
+                            // inline require to avoid including it in !IS_DEV builds
+                            const diff = (require("diff") as typeof import("diff")).diffWordsWithSpace(context, patchedContext);
+                            let fmt = "%c %s ";
+                            const elements = [] as string[];
+                            for (const d of diff) {
+                                const color = d.removed
+                                    ? "red"
+                                    : d.added
+                                        ? "lime"
+                                        : "grey";
+                                fmt += "%c%s";
+                                elements.push("color:" + color, d.value);
+                            }
+
+                            logger.errorCustomFmt(...Logger.makeTitle("white", "Before"), context);
+                            logger.errorCustomFmt(...Logger.makeTitle("white", "After"), patchedContext);
+                            const [titleFmt, ...titleElements] = Logger.makeTitle("white", "Diff");
+                            logger.errorCustomFmt(titleFmt + fmt, ...titleElements, ...elements);
+                        }
+                        code = lastCode;
+                        mod = lastMod;
+                        patchedBy.delete(patch.plugin);
+                    }
+                }
+
+                if (!patch.all) patches.splice(i--, 1);
+            }
+        }
+    }
+}

From 8567ff62393230a49d2f72a5c869ac42c0c8dcb1 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 26 Oct 2023 16:51:27 -0300
Subject: [PATCH 120/632] Little bit of SHC cleanup

---
 src/plugins/showHiddenChannels/index.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index ecfd08e33..9cdf30496 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -275,7 +275,7 @@ export default definePlugin({
                     match: /MANAGE_ROLES.{0,90}?return(?=\(.+?(\(0,\i\.jsxs\)\("div",{className:\i\.members.+?guildId:(\i)\.guild_id.+?roleColor.+?\]}\)))/,
                     replace: (m, component, channel) => {
                         // Export the channel for the users allowed component patch
-                        component = component.replace(canonicalizeMatch(/(?<=users:\i)/), `,channel:${channel}`);
+                        component = component.replace(canonicalizeMatch(/(?<=users:\i)/), `,shcChannel:${channel}`);
                         // Always render the component for multiple allowed users
                         component = component.replace(canonicalizeMatch(/1!==\i\.length/), "true");
 
@@ -290,22 +290,22 @@ export default definePlugin({
                 {
                     // Create a variable for the channel prop
                     match: /maxUsers:\i,users:\i.+?=(\i).+?;/,
-                    replace: (m, props) => `${m}var channel=${props}.channel;`
+                    replace: (m, props) => `${m}let{shcChannel}=${props};`
                 },
                 {
                     // Make Discord always render the plus button if the component is used inside the HiddenChannelLockScreen
                     match: /\i>0(?=&&.{0,60}renderPopout)/,
-                    replace: m => `($self.isHiddenChannel(typeof channel!=="undefined"?channel:void 0,true)?true:${m})`
+                    replace: m => `($self.isHiddenChannel(shcChannel,true)?true:${m})`
                 },
                 {
                     // Prevent Discord from overwriting the last children with the plus button if the overflow amount is <= 0 and the component is used inside the HiddenChannelLockScreen
                     match: /(?<=\.value\(\),(\i)=.+?length-)1(?=\]=.{0,60}renderPopout)/,
-                    replace: (_, amount) => `($self.isHiddenChannel(typeof channel!=="undefined"?channel:void 0,true)&&${amount}<=0?0:1)`
+                    replace: (_, amount) => `($self.isHiddenChannel(shcChannel,true)&&${amount}<=0?0:1)`
                 },
                 {
                     // Show only the plus text without overflowed children amount if the overflow amount is <= 0 and the component is used inside the HiddenChannelLockScreen
                     match: /(?<="\+",)(\i)\+1/,
-                    replace: (m, amount) => `$self.isHiddenChannel(typeof channel!=="undefined"?channel:void 0,true)&&${amount}<=0?"":${m}`
+                    replace: (m, amount) => `$self.isHiddenChannel(shcChannel,true)&&${amount}<=0?"":${m}`
                 }
             ]
         },

From 589c0707735cf0b59d0534052e33b54ee4486669 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 26 Oct 2023 22:51:03 +0200
Subject: [PATCH 121/632] fix not removing vencord 'chunks' from webpack

---
 src/webpack/webpack.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 812e36079..3ef5ac80a 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -63,10 +63,10 @@ export function _initWebpack(instance: typeof window.webpackChunkdiscord_app) {
     if (cache !== void 0) throw "no.";
 
     instance.push([[Symbol("Vencord")], {}, r => wreq = r]);
+    instance.pop();
     if (!wreq) return false;
 
     cache = wreq.c;
-    instance.pop();
 
     for (const id in cache) {
         const { exports } = cache[id];

From 2f94e167c415797fde67934e92cb3ab2286820da Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Fri, 27 Oct 2023 03:52:48 +0700
Subject: [PATCH 122/632] noProfileThemes: fix usrbg compatibility (#1905)

---
 src/plugins/noProfileThemes/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/noProfileThemes/index.ts b/src/plugins/noProfileThemes/index.ts
index c31f42838..e2b9327e8 100644
--- a/src/plugins/noProfileThemes/index.ts
+++ b/src/plugins/noProfileThemes/index.ts
@@ -30,7 +30,7 @@ export default definePlugin({
                 // = isPremiumAtLeast(user.premiumType, TIER_2)
                 match: /=(?=\i\.\i\.isPremiumAtLeast\(null==(\i))/,
                 // = user.banner && isPremiumAtLeast(user.premiumType, TIER_2)
-                replace: "=$1?.banner&&"
+                replace: "=(arguments[0]?.bannerSrc||$1?.banner)&&"
             }
         },
         {

From 0847f205b836a958864a17490c22d0702536f3d1 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:10:32 -0300
Subject: [PATCH 123/632] Fix some hidden channels not collapsing

---
 src/plugins/showHiddenChannels/index.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 9cdf30496..524942104 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -74,6 +74,10 @@ export default definePlugin({
                     match: /if\(!\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL.+?{if\(this\.id===\i\).+?threadIds:\i}}/,
                     replace: ""
                 },
+                {
+                    match: /(?=!1===\i.\i\.hasRelevantUnread\(this\.record\))/,
+                    replace: "$self.isHiddenChannel(this.record)||"
+                },
                 {
                     match: /(?<=renderLevel:(\i\(this,\i\)\?\i\.Show:\i\.WouldShowIfUncollapsed).+?renderLevel:).+?(?=,)/,
                     replace: (_, renderLevelExpression) => renderLevelExpression

From 8692109bc5bd2ded817bbbfcef937a1d036cc2a8 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:13:25 -0300
Subject: [PATCH 124/632] Add comments to some SHC patches

---
 src/plugins/showHiddenChannels/index.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 524942104..9a7f1e63c 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -70,22 +70,27 @@ export default definePlugin({
             // RenderLevel defines if a channel is hidden, collapsed in category, visible, etc
             find: ".CannotShow=",
             replacement: [
+                // Remove the special logic for channels we don't have access to
                 {
                     match: /if\(!\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL.+?{if\(this\.id===\i\).+?threadIds:\i}}/,
                     replace: ""
                 },
+                // Do not check for unreads when selecting the render level if the channel is hidden
                 {
                     match: /(?=!1===\i.\i\.hasRelevantUnread\(this\.record\))/,
                     replace: "$self.isHiddenChannel(this.record)||"
                 },
+                // Make channels we dont have access to be the same level as normal ones
                 {
                     match: /(?<=renderLevel:(\i\(this,\i\)\?\i\.Show:\i\.WouldShowIfUncollapsed).+?renderLevel:).+?(?=,)/,
                     replace: (_, renderLevelExpression) => renderLevelExpression
                 },
+                // Make channels we dont have access to be the same level as normal ones
                 {
                     match: /(?<=activeJoinedRelevantThreads.+?renderLevel:.+?,threadIds:\i\(this.record.+?renderLevel:)(\i)\..+?(?=,)/,
                     replace: (_, RenderLevels) => `${RenderLevels}.Show`
                 },
+                // Remove permission checking for getRenderLevel function
                 {
                     match: /(?<=getRenderLevel\(\i\){.+?return)!\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL,this\.record\)\|\|/,
                     replace: " "

From 1676956f6113b74490d974e81a2f78f22f496cc9 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 26 Oct 2023 20:59:48 -0300
Subject: [PATCH 125/632] Fix hidden channels triggering the unread box

---
 src/plugins/showHiddenChannels/index.tsx | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 9a7f1e63c..4d828acd2 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -195,13 +195,29 @@ export default definePlugin({
             ]
         },
         {
-            // Hide New unreads box for hidden channels
+            // Hide the new version of unreads box for hidden channels
             find: '.displayName="ChannelListUnreadsStore"',
             replacement: {
                 match: /(?<=if\(null==(\i))(?=.{0,160}?hasRelevantUnread\(\i\))/g, // Global because Discord has multiple methods like that in the same module
                 replace: (_, channel) => `||$self.isHiddenChannel(${channel})`
             }
         },
+        {
+            // Make the old version of unreads box not visible for hidden channels
+            find: "renderBottomUnread(){",
+            replacement: {
+                match: /(?=&&\i\.\i\.hasRelevantUnread\((\i\.record)\))/,
+                replace: "&&!$self.isHiddenChannel($1)"
+            }
+        },
+        {
+            // Make the state of the old version of unreads box not include hidden channels
+            find: ".useFlattenedChannelIdListWithThreads)",
+            replacement: {
+                match: /(?=&&\i\.\i\.hasRelevantUnread\((\i)\))/,
+                replace: "&&!$self.isHiddenChannel($1)"
+            }
+        },
         // Only render the channel header and buttons that work when transitioning to a hidden channel
         {
             find: "Missing channel in Channel.renderHeaderToolbar",

From a9e67e2955dfa07d734361c66ceabb0278ec5e34 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 27 Oct 2023 03:53:58 +0200
Subject: [PATCH 126/632] Bump to v1.6.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 61940d080..da8fc449a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.6.0",
+    "version": "1.6.1",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 0afe319141a261ee0a1f67bf13d9b5b4bfd6619c Mon Sep 17 00:00:00 2001
From: Susheel Thapa <sushilthapa9844242743@gmail.com>
Date: Fri, 27 Oct 2023 07:51:05 +0545
Subject: [PATCH 127/632] fix typo in multiple files (#1911)

---
 scripts/generateReport.ts                     | 2 +-
 src/api/ContextMenu.ts                        | 4 ++--
 src/components/VencordSettings/UpdaterTab.tsx | 2 +-
 src/plugins/customRPC/index.tsx               | 2 +-
 src/plugins/spotifyControls/spotifyStyles.css | 4 ++--
 src/utils/types.ts                            | 2 +-
 src/webpack/patchWebpack.ts                   | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index c94adf9bf..4e044c94b 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -289,7 +289,7 @@ function runTime(token: string) {
             setTimeout(() => console.log("PUPPETEER_TEST_DONE_SIGNAL"), 1000);
         }, 1000));
     } catch (e) {
-        console.error("[PUP_DEBUG]", "A fatal error occured");
+        console.error("[PUP_DEBUG]", "A fatal error occurred");
         console.error("[PUP_DEBUG]", e);
         process.exit(1);
     }
diff --git a/src/api/ContextMenu.ts b/src/api/ContextMenu.ts
index 156ae209a..d66d98c4f 100644
--- a/src/api/ContextMenu.ts
+++ b/src/api/ContextMenu.ts
@@ -69,7 +69,7 @@ export function addGlobalContextMenuPatch(patch: GlobalContextMenuPatchCallback)
  * Remove a context menu patch
  * @param navId The navId(s) for the context menu(s) to remove the patch
  * @param patch The patch to be removed
- * @returns Wheter the patch was sucessfully removed from the context menu(s)
+ * @returns Whether the patch was successfully removed from the context menu(s)
  */
 export function removeContextMenuPatch<T extends string | Array<string>>(navId: T, patch: NavContextMenuPatchCallback): T extends string ? boolean : Array<boolean> {
     const navIds = Array.isArray(navId) ? navId : [navId as string];
@@ -82,7 +82,7 @@ export function removeContextMenuPatch<T extends string | Array<string>>(navId:
 /**
  * Remove a global context menu patch
  * @param patch The patch to be removed
- * @returns Wheter the patch was sucessfully removed
+ * @returns Whether the patch was successfully removed
  */
 export function removeGlobalContextMenuPatch(patch: GlobalContextMenuPatchCallback): boolean {
     return globalPatches.delete(patch);
diff --git a/src/components/VencordSettings/UpdaterTab.tsx b/src/components/VencordSettings/UpdaterTab.tsx
index 6766cf08a..81433960f 100644
--- a/src/components/VencordSettings/UpdaterTab.tsx
+++ b/src/components/VencordSettings/UpdaterTab.tsx
@@ -46,7 +46,7 @@ function withDispatcher(dispatcher: React.Dispatch<React.SetStateAction<boolean>
                 if (code === "ENOENT")
                     var err = `Command \`${path}\` not found.\nPlease install it and try again`;
                 else {
-                    var err = `An error occured while running \`${cmd}\`:\n`;
+                    var err = `An error occurred while running \`${cmd}\`:\n`;
                     err += stderr || `Code \`${code}\`. See the console for more info`;
                 }
 
diff --git a/src/plugins/customRPC/index.tsx b/src/plugins/customRPC/index.tsx
index 25ad7b3e6..8ed741215 100644
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@@ -395,7 +395,7 @@ export default definePlugin({
         return (
             <>
                 <Forms.FormText>
-                    Go to <Link href="https://discord.com/developers/applications">Discord Deverloper Portal</Link> to create an application and
+                    Go to <Link href="https://discord.com/developers/applications">Discord Developer Portal</Link> to create an application and
                     get the application ID.
                 </Forms.FormText>
                 <Forms.FormText>
diff --git a/src/plugins/spotifyControls/spotifyStyles.css b/src/plugins/spotifyControls/spotifyStyles.css
index a9b985161..9e585ebec 100644
--- a/src/plugins/spotifyControls/spotifyStyles.css
+++ b/src/plugins/spotifyControls/spotifyStyles.css
@@ -2,7 +2,7 @@
     padding: 0.375rem 0.5rem;
     border-bottom: 1px solid var(--background-modifier-accent);
 
-    --vc-spotify-green: #1db954; /* so cusotm themes can easily change it */
+    --vc-spotify-green: #1db954; /* so custom themes can easily change it */
 }
 
 .theme-light #vc-spotify-player {
@@ -167,7 +167,7 @@
 }
 
 #vc-spotify-progress-bar > [class^="slider"] [class^="grabber"] {
-    /* these importants are neccessary, it applies a width and height through inline styles */
+    /* these importants are necessary, it applies a width and height through inline styles */
     height: 10px !important;
     width: 10px !important;
     background-color: var(--interactive-normal);
diff --git a/src/utils/types.ts b/src/utils/types.ts
index 7b682e9b9..ff2c79af3 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -269,7 +269,7 @@ export interface DefinedSettings<
     store: SettingsStore<Def> & PrivateSettings;
     /**
      * React hook for getting the settings for this plugin
-     * @param filter optional filter to avoid rerenders for irrelavent settings
+     * @param filter optional filter to avoid rerenders for irrelevent settings
      */
     use<F extends Extract<keyof Def | keyof PrivateSettings, string>>(filter?: F[]): Pick<SettingsStore<Def> & PrivateSettings, F>;
     /** Definitions of each setting */
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index 23ef99e24..b81415e61 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -29,7 +29,7 @@ let webpackChunk: any[];
 const logger = new Logger("WebpackInterceptor", "#8caaee");
 
 if (window[WEBPACK_CHUNK]) {
-    logger.info(`Patching ${WEBPACK_CHUNK}.push (was already existant, likely from cache!)`);
+    logger.info(`Patching ${WEBPACK_CHUNK}.push (was already existent, likely from cache!)`);
     _initWebpack(window[WEBPACK_CHUNK]);
     patchPush(window[WEBPACK_CHUNK]);
 } else {

From 98d49af72899432657d24a7a82dd24ea13912576 Mon Sep 17 00:00:00 2001
From: Luna <imlvnaa@gmail.com>
Date: Fri, 27 Oct 2023 09:07:50 -0400
Subject: [PATCH 128/632] Fix git updater for other branches (#1915)

---
 src/main/updater/git.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts
index c6e5cc90a..7f7785940 100644
--- a/src/main/updater/git.ts
+++ b/src/main/updater/git.ts
@@ -49,7 +49,9 @@ async function getRepo() {
 async function calculateGitChanges() {
     await git("fetch");
 
-    const res = await git("log", "HEAD...origin/main", "--pretty=format:%an/%h/%s");
+    const branch = await git("branch", "--show-current");
+
+    const res = await git("log", `HEAD...origin/${branch}`, "--pretty=format:%an/%h/%s");
 
     const commits = res.stdout.trim();
     return commits ? commits.split("\n").map(line => {

From 38834ef7acac78a3d0b77dddbcc98efca9076d91 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:03:52 -0300
Subject: [PATCH 129/632] Fix git updater

---
 src/main/updater/git.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts
index 7f7785940..e96026443 100644
--- a/src/main/updater/git.ts
+++ b/src/main/updater/git.ts
@@ -51,7 +51,7 @@ async function calculateGitChanges() {
 
     const branch = await git("branch", "--show-current");
 
-    const res = await git("log", `HEAD...origin/${branch}`, "--pretty=format:%an/%h/%s");
+    const res = await git("log", `HEAD...origin/${branch.stdout.trim()}`, "--pretty=format:%an/%h/%s");
 
     const commits = res.stdout.trim();
     return commits ? commits.split("\n").map(line => {

From e05c630a5497e37701cfd707334512d888895259 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 27 Oct 2023 14:29:25 -0300
Subject: [PATCH 130/632] SHC: Make Chat Input Bar channel list include hidden
 channels

---
 src/plugins/showHiddenChannels/index.tsx | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 4d828acd2..95b16d625 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -414,6 +414,22 @@ export default definePlugin({
                 }
             ]
         },
+        {
+            // Make the chat input bar channel list contain hidden channels
+            find: ",queryStaticRouteChannels(",
+            replacement: [
+                {
+                    // Make the getChannels call to GuildChannelStore return hidden channels
+                    match: /(?<=queryChannels\(\i\){.+?getChannels\(\i)(?=\))/,
+                    replace: ",true"
+                },
+                {
+                    // Avoid filtering out hidden channels from the channel list
+                    match: /(?<=queryChannels\(\i\){.+?isGuildChannelType\)\((\i)\.type\))(?=&&!\i\.\i\.can\()/,
+                    replace: "&&!$self.isHiddenChannel($1)"
+                }
+            ]
+        },
         {
             find: "\"^/guild-stages/(\\\\d+)(?:/)?(\\\\d+)?\"",
             replacement: {

From 89672882b951649473c895138911f186e4b3b3ea Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 27 Oct 2023 14:33:18 -0300
Subject: [PATCH 131/632] PermViewer: Fix incorrectly displaying some role
 names as Unknown Role

---
 .../permissionsViewer/components/RolesAndUsersPermissions.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
index 8d4b15790..629880467 100644
--- a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
@@ -135,9 +135,9 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
                                             <Text variant="text-md/normal">
                                                 {
                                                     permission.type === PermissionType.Role
-                                                        ? role?.name || "Unknown Role"
+                                                        ? role?.name ?? "Unknown Role"
                                                         : permission.type === PermissionType.User
-                                                            ? (user && getUniqueUsername(user)) || "Unknown User"
+                                                            ? (user && getUniqueUsername(user)) ?? "Unknown User"
                                                             : (
                                                                 <Flex style={{ gap: "0.2em", justifyItems: "center" }}>
                                                                     @owner

From 7845af0802de70700c5855ea687a67b6dd85b6cc Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 27 Oct 2023 19:55:39 -0300
Subject: [PATCH 132/632] Remove hacks to support no longer active versions of
 Discord

---
 src/webpack/common/stores.ts | 11 ++---------
 src/webpack/common/utils.ts  |  9 +--------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/webpack/common/stores.ts b/src/webpack/common/stores.ts
index c4ebd4a95..d10b18664 100644
--- a/src/webpack/common/stores.ts
+++ b/src/webpack/common/stores.ts
@@ -20,7 +20,7 @@ import { proxyLazy } from "@utils/lazy";
 import type * as Stores from "discord-types/stores";
 
 // eslint-disable-next-line path-alias/no-relative
-import { filters, findByCode, findByProps, findByPropsLazy, mapMangledModuleLazy } from "../webpack";
+import { filters, findByProps, findByPropsLazy, mapMangledModuleLazy } from "../webpack";
 import { waitForStore } from "./internal";
 import * as t from "./types/stores";
 
@@ -84,14 +84,7 @@ export const useStateFromStores: <T>(
     idk?: any,
     isEqual?: (old: T, newer: T) => boolean
 ) => T
-    // FIXME: hack to support old stable and new canary
-    = proxyLazy(() => {
-        try {
-            return findByProps("useStateFromStores").useStateFromStores;
-        } catch {
-            return findByCode('("useStateFromStores")');
-        }
-    });
+    = proxyLazy(() => findByProps("useStateFromStores").useStateFromStores);
 
 waitForStore("DraftStore", s => DraftStore = s);
 waitForStore("UserStore", s => UserStore = s);
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 6de57c92d..04df3c07d 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -136,11 +136,4 @@ waitFor("parseTopic", m => Parser = m);
 export let SettingsRouter: any;
 waitFor(["open", "saveAccountChanges"], m => SettingsRouter = m);
 
-// FIXME: hack to support old stable and new canary
-export const PermissionsBits: t.PermissionsBits = proxyLazy(() => {
-    try {
-        return find(m => m.Permissions?.ADMINISTRATOR).Permissions;
-    } catch {
-        return find(m => typeof m.ADMINISTRATOR === "bigint");
-    }
-});
+export const PermissionsBits: t.PermissionsBits = proxyLazy(() => find(m => typeof m.Permissions?.ADMINISTRATOR === "bigint").Permissions);

From 9ce923d4d7b598c955d774bf0c953661496eb278 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 27 Oct 2023 19:56:11 -0300
Subject: [PATCH 133/632] Fix BetterFolders

---
 src/plugins/betterFolders/FolderSideBar.tsx |  64 ++----
 src/plugins/betterFolders/betterFolders.css |  17 --
 src/plugins/betterFolders/index.ts          | 177 ---------------
 src/plugins/betterFolders/index.tsx         | 229 ++++++++++++++++++++
 4 files changed, 251 insertions(+), 236 deletions(-)
 delete mode 100644 src/plugins/betterFolders/betterFolders.css
 delete mode 100644 src/plugins/betterFolders/index.ts
 create mode 100644 src/plugins/betterFolders/index.tsx

diff --git a/src/plugins/betterFolders/FolderSideBar.tsx b/src/plugins/betterFolders/FolderSideBar.tsx
index 6353a9716..f3884701a 100644
--- a/src/plugins/betterFolders/FolderSideBar.tsx
+++ b/src/plugins/betterFolders/FolderSideBar.tsx
@@ -16,56 +16,34 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Settings } from "@api/Settings";
-import { classNameFactory } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { findByPropsLazy, findStoreLazy } from "@webpack";
-import { i18n, React, useStateFromStores } from "@webpack/common";
+import { LazyComponent } from "@utils/react";
+import { find, findByPropsLazy } from "@webpack";
+import { React, useStateFromStores } from "@webpack/common";
 
-const cl = classNameFactory("vc-bf-");
-const classes = findByPropsLazy("sidebar", "guilds");
+import { ExpandedGuildFolderStore, settings } from ".";
 
 const Animations = findByPropsLazy("a", "animated", "useTransition");
-const ChannelRTCStore = findStoreLazy("ChannelRTCStore");
-const ExpandedGuildFolderStore = findStoreLazy("ExpandedGuildFolderStore");
+const GuildsBar = LazyComponent(() => find(m => m.type?.toString().includes('("guildsnav")')));
 
-function Guilds(props: {
-    className: string;
-    bfGuildFolders: any[];
-}) {
-    // @ts-expect-error
-    const res = Vencord.Plugins.plugins.BetterFolders.Guilds(props);
-
-    // TODO: Make this better
-    const scrollerProps = res.props.children?.props?.children?.props?.children?.[1]?.props;
-    if (scrollerProps?.children) {
-        const servers = scrollerProps.children.find(c => c?.props?.["aria-label"] === i18n.Messages.SERVERS);
-        if (servers) scrollerProps.children = servers;
-    }
-
-    return res;
-}
-
-export default ErrorBoundary.wrap(() => {
+export default ErrorBoundary.wrap(guildsBarProps => {
     const expandedFolders = useStateFromStores([ExpandedGuildFolderStore], () => ExpandedGuildFolderStore.getExpandedFolders());
-    const fullscreen = useStateFromStores([ChannelRTCStore], () => ChannelRTCStore.isFullscreenInContext());
-
-    const guilds = document.querySelector(`.${classes.guilds}`);
-
-    const visible = !!expandedFolders.size;
-    const className = cl("folder-sidebar", { fullscreen });
 
     const Sidebar = (
-        <Guilds
-            className={classes.guilds}
-            bfGuildFolders={Array.from(expandedFolders)}
+        <GuildsBar
+            {...guildsBarProps}
+            isBetterFolders={true}
         />
     );
 
-    if (!guilds || !Settings.plugins.BetterFolders.sidebarAnim)
+    const visible = !!expandedFolders.size;
+    const guilds = document.querySelector(guildsBarProps.className.split(" ").map(c => `.${c}`).join(""));
+
+    if (!guilds || !settings.store.sidebarAnim) {
         return visible
-            ? <div className={className}>{Sidebar}</div>
+            ? <div style={{ display: "flex " }}>{Sidebar}</div>
             : null;
+    }
 
     return (
         <Animations.Transition
@@ -75,11 +53,13 @@ export default ErrorBoundary.wrap(() => {
             leave={{ width: 0 }}
             config={{ duration: 200 }}
         >
-            {(style, show) => show && (
-                <Animations.animated.div style={style} className={className}>
-                    {Sidebar}
-                </Animations.animated.div>
-            )}
+            {(style, show) =>
+                show && (
+                    <Animations.animated.div style={{ ...style, display: "flex" }}>
+                        {Sidebar}
+                    </Animations.animated.div>
+                )
+            }
         </Animations.Transition>
     );
 }, { noop: true });
diff --git a/src/plugins/betterFolders/betterFolders.css b/src/plugins/betterFolders/betterFolders.css
deleted file mode 100644
index 5d8fc2188..000000000
--- a/src/plugins/betterFolders/betterFolders.css
+++ /dev/null
@@ -1,17 +0,0 @@
-.vc-bf-folder-sidebar [class*="wrapper-"] > [class*="listItem-"]:first-of-type,
-.vc-bf-folder-sidebar [class*="unreadMentionsIndicator"] {
-    display: none;
-}
-
-.vc-bf-folder-sidebar [class*="expandedFolderBackground-"] {
-    background-color: transparent;
-}
-
-.vc-bf-folder-sidebar {
-    display: flex;
-}
-
-.vc-bf-fullscreen {
-    width: 0 !important;
-    visibility: hidden;
-}
diff --git a/src/plugins/betterFolders/index.ts b/src/plugins/betterFolders/index.ts
deleted file mode 100644
index d41ba75c7..000000000
--- a/src/plugins/betterFolders/index.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import "./betterFolders.css";
-
-import { definePluginSettings } from "@api/Settings";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
-import { FluxDispatcher } from "@webpack/common";
-
-import FolderSideBar from "./FolderSideBar";
-
-const GuildsTree = findLazy(m => m.prototype?.convertToFolder);
-const GuildFolderStore = findStoreLazy("SortedGuildStore");
-const ExpandedFolderStore = findStoreLazy("ExpandedGuildFolderStore");
-const FolderUtils = findByPropsLazy("move", "toggleGuildFolderExpand");
-
-const settings = definePluginSettings({
-    sidebar: {
-        type: OptionType.BOOLEAN,
-        description: "Display servers from folder on dedicated sidebar",
-        default: true,
-    },
-    sidebarAnim: {
-        type: OptionType.BOOLEAN,
-        description: "Animate opening the folder sidebar",
-        default: true,
-    },
-    closeAllFolders: {
-        type: OptionType.BOOLEAN,
-        description: "Close all folders when selecting a server not in a folder",
-        default: false,
-    },
-    closeAllHomeButton: {
-        type: OptionType.BOOLEAN,
-        description: "Close all folders when clicking on the home button",
-        default: false,
-    },
-    closeOthers: {
-        type: OptionType.BOOLEAN,
-        description: "Close other folders when opening a folder",
-        default: false,
-    },
-    forceOpen: {
-        type: OptionType.BOOLEAN,
-        description: "Force a folder to open when switching to a server of that folder",
-        default: false,
-    },
-});
-
-export default definePlugin({
-    name: "BetterFolders",
-    description: "Shows server folders on dedicated sidebar and adds folder related improvements",
-    authors: [Devs.juby, Devs.AutumnVN],
-    patches: [
-        {
-            find: '("guildsnav")',
-            predicate: () => settings.store.sidebar,
-            replacement: [
-                {
-                    match: /(\i)\(\){return \i\(\(0,\i\.jsx\)\("div",{className:\i\(\)\.guildSeparator}\)\)}/,
-                    replace: "$&$self.Separator=$1;"
-                },
-
-                // Folder component patch
-                {
-                    match: /\i\(\(function\(\i,\i,\i\){var \i=\i\.key;return.+\(\i\)},\i\)}\)\)/,
-                    replace: "arguments[0].bfHideServers?null:$&"
-                },
-
-                // BEGIN Guilds component patch
-                {
-                    match: /(\i)\.themeOverride,(.{15,25}\(function\(\){var \i=)(\i\.\i\.getGuildsTree\(\))/,
-                    replace: "$1.themeOverride,bfPatch=$1.bfGuildFolders,$2bfPatch?$self.getGuildsTree(bfPatch,$3):$3"
-                },
-                {
-                    match: /return(\(0,\i\.jsx\))(\(\i,{)(folderNode:\i,setNodeRef:\i\.setNodeRef,draggable:!0,.+},\i\.id\));case/,
-                    replace: "var bfHideServers=typeof bfPatch==='undefined',folder=$1$2bfHideServers,$3;return !bfHideServers&&arguments[1]?[$1($self.Separator,{}),folder]:folder;case"
-                },
-                // END
-
-                {
-                    match: /\("guildsnav"\);return\(0,\i\.jsx\)\(.{1,6},{navigator:\i,children:\(0,\i\.jsx\)\(/,
-                    replace: "$&$self.Guilds="
-                }
-            ]
-        },
-        {
-            find: "APPLICATION_LIBRARY,render",
-            predicate: () => settings.store.sidebar,
-            replacement: {
-                match: /(\(0,\i\.jsx\))\(\i\..,{className:\i\(\)\.guilds,themeOverride:\i}\)/,
-                replace: "$&,$1($self.FolderSideBar,{})"
-            }
-        },
-        {
-            find: '("guildsnav")',
-            predicate: () => settings.store.closeAllHomeButton,
-            replacement: {
-                match: ",onClick:function(){if(!__OVERLAY__){",
-                replace: "$&$self.closeFolders();"
-            }
-        }
-    ],
-
-    settings,
-
-    start() {
-        const getGuildFolder = (id: string) => GuildFolderStore.getGuildFolders().find(f => f.guildIds.includes(id));
-
-        FluxDispatcher.subscribe("CHANNEL_SELECT", this.onSwitch = data => {
-            if (!settings.store.closeAllFolders && !settings.store.forceOpen)
-                return;
-
-            if (this.lastGuildId !== data.guildId) {
-                this.lastGuildId = data.guildId;
-
-                const guildFolder = getGuildFolder(data.guildId);
-                if (guildFolder?.folderId) {
-                    if (settings.store.forceOpen && !ExpandedFolderStore.isFolderExpanded(guildFolder.folderId))
-                        FolderUtils.toggleGuildFolderExpand(guildFolder.folderId);
-                } else if (settings.store.closeAllFolders)
-                    this.closeFolders();
-            }
-        });
-
-        FluxDispatcher.subscribe("TOGGLE_GUILD_FOLDER_EXPAND", this.onToggleFolder = e => {
-            if (settings.store.closeOthers && !this.dispatching)
-                FluxDispatcher.wait(() => {
-                    const expandedFolders = ExpandedFolderStore.getExpandedFolders();
-                    if (expandedFolders.size > 1) {
-                        this.dispatching = true;
-
-                        for (const id of expandedFolders) if (id !== e.folderId)
-                            FolderUtils.toggleGuildFolderExpand(id);
-
-                        this.dispatching = false;
-                    }
-                });
-        });
-    },
-
-    stop() {
-        FluxDispatcher.unsubscribe("CHANNEL_SELECT", this.onSwitch);
-        FluxDispatcher.unsubscribe("TOGGLE_GUILD_FOLDER_EXPAND", this.onToggleFolder);
-    },
-
-    FolderSideBar,
-
-    getGuildsTree(folders, oldTree) {
-        const tree = new GuildsTree();
-        tree.root.children = oldTree.root.children.filter(e => folders.includes(e.id));
-        tree.nodes = folders.map(id => oldTree.nodes[id]);
-        return tree;
-    },
-
-    closeFolders() {
-        for (const id of ExpandedFolderStore.getExpandedFolders())
-            FolderUtils.toggleGuildFolderExpand(id);
-    },
-});
diff --git a/src/plugins/betterFolders/index.tsx b/src/plugins/betterFolders/index.tsx
new file mode 100644
index 000000000..e4bdc9800
--- /dev/null
+++ b/src/plugins/betterFolders/index.tsx
@@ -0,0 +1,229 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
+import { FluxDispatcher, i18n } from "@webpack/common";
+
+import FolderSideBar from "./FolderSideBar";
+
+const GuildFolderStore = findStoreLazy("SortedGuildStore");
+export const ExpandedGuildFolderStore = findStoreLazy("ExpandedGuildFolderStore");
+const FolderUtils = findByPropsLazy("move", "toggleGuildFolderExpand");
+
+let lastGuildId = null as string | null;
+let dispatchingFoldersClose = false;
+
+function getGuildFolder(id: string) {
+    return GuildFolderStore.getGuildFolders().find(folder => folder.guildIds.includes(id));
+}
+
+function closeFolders() {
+    for (const id of ExpandedGuildFolderStore.getExpandedFolders())
+        FolderUtils.toggleGuildFolderExpand(id);
+}
+
+export const settings = definePluginSettings({
+    sidebar: {
+        type: OptionType.BOOLEAN,
+        description: "Display servers from folder on dedicated sidebar",
+        restartNeeded: true,
+        default: true
+    },
+    sidebarAnim: {
+        type: OptionType.BOOLEAN,
+        description: "Animate opening the folder sidebar",
+        restartNeeded: true,
+        default: true
+    },
+    closeAllFolders: {
+        type: OptionType.BOOLEAN,
+        description: "Close all folders when selecting a server not in a folder",
+        default: false
+    },
+    closeAllHomeButton: {
+        type: OptionType.BOOLEAN,
+        description: "Close all folders when clicking on the home button",
+        restartNeeded: true,
+        default: false
+    },
+    closeOthers: {
+        type: OptionType.BOOLEAN,
+        description: "Close other folders when opening a folder",
+        default: false
+    },
+    forceOpen: {
+        type: OptionType.BOOLEAN,
+        description: "Force a folder to open when switching to a server of that folder",
+        default: false
+    }
+});
+
+export default definePlugin({
+    name: "BetterFolders",
+    description: "Shows server folders on dedicated sidebar and adds folder related improvements",
+    authors: [Devs.juby, Devs.AutumnVN, Devs.Nuckyz],
+
+    settings,
+
+    patches: [
+        {
+            find: '("guildsnav")',
+            predicate: () => settings.store.sidebar,
+            replacement: [
+                // Create the isBetterFolders variable in the GuildsBar component
+                {
+                    match: /(?<=let{disableAppDownload:\i=\i\.isPlatformEmbedded,isOverlay:.+?)(?=}=\i,)/,
+                    replace: ",isBetterFolders"
+                },
+                // If we are rendering the Better Folders sidebar, we filter out everything but the servers and folders from the GuildsBar Guild List children
+                {
+                    match: /lastTargetNode:\i\[\i\.length-1\].+?Fragment.+?\]}\)\]/,
+                    replace: '$&.filter($self.makeGuildsBarGuildListFilter(typeof isBetterFolders!=="undefined"?isBetterFolders:false))'
+                },
+                // If we are rendering the Better Folders sidebar, we filter out everything but the scroller for the guild list from the GuildsBar Tree children
+                {
+                    match: /unreadMentionsIndicatorBottom,barClassName.+?}\)\]/,
+                    replace: '$&.filter($self.makeGuildsBarTreeFilter(typeof isBetterFolders!=="undefined"?isBetterFolders:false))'
+                },
+                // Export the isBetterFolders variable to the folders component
+                {
+                    match: /(?<=\.Messages\.SERVERS.+?switch\((\i)\.type\){case \i\.\i\.FOLDER:.+?folderNode:\i,)/,
+                    replace: 'isBetterFolders:typeof isBetterFolders!=="undefined"?isBetterFolders:false,'
+                },
+                // Avoid rendering servers that are not in folders in the Better Folders sidebar
+                {
+                    match: /(?<=\.Messages\.SERVERS.+?switch\((\i)\.type\){case \i\.\i\.FOLDER:.+?GUILD:)/,
+                    replace: 'if((typeof isBetterFolders!=="undefined"?isBetterFolders:false)&&$1.parentId==null)return null;'
+                }
+            ]
+        },
+        {
+            find: ".FOLDER_ITEM_GUILD_ICON_MARGIN);",
+            replacement: [
+                // Create the isBetterFolders variable in the nested folders component (the parent exports all the props so we don't have to patch it)
+                {
+                    match: /(?<=let{folderNode:\i,setNodeRef:\i,)/,
+                    replace: "isBetterFolders,"
+                },
+                // If we are rendering the normal GuildsBar sidebar, we make Discord think the folder is always collapsed to show better icons (the mini guild icons) and avoid transitions
+                {
+                    match: /(?<=let{folderNode:\i,setNodeRef:\i,.+?expanded:(\i).+?;)(?=let)/,
+                    replace: '$1=(typeof isBetterFolders!=="undefined"?isBetterFolders:false)?$1:false;'
+                },
+                // If we are rendering the Better Folders sidebar, we filter out folders that are not expanded
+                {
+                    match: /(?=return\(0,\i.\i\)\("div")(?<=selected:\i,expanded:(\i),.+?)/,
+                    replace: (_, expanded) => `if((typeof isBetterFolders!=="undefined"?isBetterFolders:false)&&!${expanded})return null;`
+                }
+                // This code is required for the plugin to work, but we don't need it right now because we are making Discord think the folder is always collapsed
+                // If we no longer want to make Discord think the folder is always collapsed, we can use this code for the plugin to work
+                // One reason to no longer want that is to make better icons (the mini guild icons) no longer show
+                /* // Disable expanding and collapsing folders transition in the normal GuildsBar sidebar
+                {
+                    match: /(?<=\.Messages\.SERVER_FOLDER_PLACEHOLDER.+?useTransition\)\()/,
+                    replace: '(typeof isBetterFolders!=="undefined"?isBetterFolders:false)&&'
+                },
+                // If we are rendering the normal GuildsBar sidebar, we avoid rendering guilds from folders that are expanded
+                {
+                    match: /expandedFolderBackground,.+?,(?=\i\(\(\i,\i,\i\)=>{let{key.{0,45}ul)(?<=selected:\i,expanded:(\i),.+?)/,
+                    replace: (m, expanded) => `${m}((typeof isBetterFolders!=="undefined"?isBetterFolders:false)||!${expanded})&&`
+                } */
+            ]
+        },
+        {
+            find: "APPLICATION_LIBRARY,render",
+            predicate: () => settings.store.sidebar,
+            replacement: {
+                // Render the Better Folders sidebar
+                match: /(?<=({className:\i\.guilds,themeOverride:\i})\))/,
+                replace: ",$self.FolderSideBar($1)"
+            }
+        },
+        {
+            find: ".Messages.DISCODO_DISABLED",
+            predicate: () => settings.store.closeAllHomeButton,
+            replacement: {
+                // Close all folders when clicking the home button
+                match: /(?<=onClick:\(\)=>{)(?=.{0,200}"discodo")/,
+                replace: "$self.closeFolders();"
+            }
+        }
+    ],
+
+    flux: {
+        CHANNEL_SELECT(data) {
+            if (!settings.store.closeAllFolders && !settings.store.forceOpen)
+                return;
+
+            if (lastGuildId !== data.guildId) {
+                lastGuildId = data.guildId;
+                const guildFolder = getGuildFolder(data.guildId);
+
+                if (guildFolder?.folderId) {
+                    if (settings.store.forceOpen && !ExpandedGuildFolderStore.isFolderExpanded(guildFolder.folderId)) {
+                        FolderUtils.toggleGuildFolderExpand(guildFolder.folderId);
+                    }
+                } else if (settings.store.closeAllFolders) {
+                    closeFolders();
+                }
+            }
+        },
+
+        TOGGLE_GUILD_FOLDER_EXPAND(data) {
+            if (settings.store.closeOthers && !dispatchingFoldersClose) {
+                dispatchingFoldersClose = true;
+
+                FluxDispatcher.wait(() => {
+                    const expandedFolders = ExpandedGuildFolderStore.getExpandedFolders();
+
+                    if (expandedFolders.size > 1) {
+                        for (const id of expandedFolders) if (id !== data.folderId)
+                            FolderUtils.toggleGuildFolderExpand(id);
+                    }
+
+                    dispatchingFoldersClose = false;
+                });
+            }
+        }
+    },
+
+    makeGuildsBarGuildListFilter(isBetterFolders: boolean) {
+        return child => {
+            if (isBetterFolders) {
+                return child?.props?.["aria-label"] === i18n.Messages.SERVERS;
+            }
+            return true;
+        };
+    },
+
+    makeGuildsBarTreeFilter(isBetterFolders: boolean) {
+        return child => {
+            if (isBetterFolders) {
+                return "onScroll" in child.props;
+            }
+            return true;
+        };
+    },
+
+    FolderSideBar: guildsBarProps => <FolderSideBar {...guildsBarProps} />,
+
+    closeFolders
+});

From bc092252582d0e94c1470f7480c2b12f525d6667 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 27 Oct 2023 20:10:44 -0300
Subject: [PATCH 134/632] Add missing patches predicates to BetterFolders

---
 src/plugins/betterFolders/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/betterFolders/index.tsx b/src/plugins/betterFolders/index.tsx
index e4bdc9800..5eb0fb16e 100644
--- a/src/plugins/betterFolders/index.tsx
+++ b/src/plugins/betterFolders/index.tsx
@@ -117,6 +117,7 @@ export default definePlugin({
         },
         {
             find: ".FOLDER_ITEM_GUILD_ICON_MARGIN);",
+            predicate: () => settings.store.sidebar,
             replacement: [
                 // Create the isBetterFolders variable in the nested folders component (the parent exports all the props so we don't have to patch it)
                 {

From b3311c6f12f06cf0600aeaab9069fccde6195e62 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 28 Oct 2023 02:19:43 +0200
Subject: [PATCH 135/632] BetterGifAltText: Fix displaying undefined

---
 src/plugins/betterGifAltText/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/betterGifAltText/index.ts b/src/plugins/betterGifAltText/index.ts
index f07295704..8b4116318 100644
--- a/src/plugins/betterGifAltText/index.ts
+++ b/src/plugins/betterGifAltText/index.ts
@@ -45,7 +45,8 @@ export default definePlugin({
     ],
 
     altify(props: any) {
-        if (props.alt && props.alt !== "GIF") return props.alt;
+        props.alt ??= "GIF";
+        if (props.alt !== "GIF") return props.alt;
 
         let url: string = props.original || props.src;
         try {

From 7f17e70697cb0899c960c9da2822ffc35bf84534 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Sat, 28 Oct 2023 07:20:29 +0700
Subject: [PATCH 136/632] noSystemBadge: fix (#1914)

---
 src/plugins/noSystemBadge.discordDesktop/index.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/noSystemBadge.discordDesktop/index.ts b/src/plugins/noSystemBadge.discordDesktop/index.ts
index 591a0be03..0fbb5332a 100644
--- a/src/plugins/noSystemBadge.discordDesktop/index.ts
+++ b/src/plugins/noSystemBadge.discordDesktop/index.ts
@@ -25,15 +25,15 @@ export default definePlugin({
     authors: [Devs.rushii],
     patches: [
         {
-            find: "setSystemTrayApplications:function",
+            find: ",setSystemTrayApplications",
             replacement: [
                 {
-                    match: /setBadge:function.+?},/,
-                    replace: "setBadge:function(){},"
+                    match: /setBadge\(\i\).+?},/,
+                    replace: "setBadge(){},"
                 },
                 {
-                    match: /setSystemTrayIcon:function.+?},/,
-                    replace: "setSystemTrayIcon:function(){},"
+                    match: /setSystemTrayIcon\(\i\).+?},/,
+                    replace: "setSystemTrayIcon(){},"
                 }
             ]
         }

From aae790f1c1f49160651039a816ec79914ebdbb83 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Sat, 28 Oct 2023 07:21:35 +0700
Subject: [PATCH 137/632] vencordToolbox: correct hover color + oneko (#1913)

---
 src/plugins/vencordToolbox/index.css | 10 +++++++---
 src/plugins/vencordToolbox/index.tsx |  8 ++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/plugins/vencordToolbox/index.css b/src/plugins/vencordToolbox/index.css
index 8b509868f..a1c85ad50 100644
--- a/src/plugins/vencordToolbox/index.css
+++ b/src/plugins/vencordToolbox/index.css
@@ -1,12 +1,16 @@
 .vc-toolbox-btn,
-.vc-toolbox-btn svg {
+.vc-toolbox-btn>svg {
     -webkit-app-region: no-drag;
 }
 
-.vc-toolbox-btn svg {
+.vc-toolbox-btn>svg {
     color: var(--interactive-normal);
 }
 
-:is(.vc-toolbox-btn:hover, .vc-toolbox-btn[class*="selected"]) svg {
+.vc-toolbox-btn[class*="selected"]>svg {
     color: var(--interactive-active);
 }
+
+.vc-toolbox-btn:hover>svg {
+    color: var(--interactive-hover);
+}
diff --git a/src/plugins/vencordToolbox/index.tsx b/src/plugins/vencordToolbox/index.tsx
index ba55fdeef..cd266c6f2 100644
--- a/src/plugins/vencordToolbox/index.tsx
+++ b/src/plugins/vencordToolbox/index.tsx
@@ -89,10 +89,10 @@ function VencordPopout(onClose: () => void) {
     );
 }
 
-function VencordPopoutIcon() {
+function VencordPopoutIcon(isShown: boolean) {
     return (
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96 96" width={24} height={24}>
-            <path fill="currentColor" d="M53 10h7v1h-1v1h-1v1h-1v1h-1v1h-1v1h5v1h-7v-1h1v-1h1v-1h1v-1h1v-1h1v-1h-5m-43 1v32h2v2h2v2h2v2h2v2h2v2h2v2h2v2h2v2h8v-2h2V46h-2v2h-2v2h-4v-2h-2v-2h-2v-2h-2v-2h-2v-2h-2V12m24 0v27h-2v3h4v-6h2v-2h4V12m13 2h5v1h-1v1h-1v1h-1v1h3v1h-5v-1h1v-1h1v-1h1v-1h-3m8 5h1v5h1v-1h1v1h-1v1h1v-1h1v1h-1v3h-1v1h-2v1h-1v1h1v-1h2v-1h1v2h-1v1h-2v1h-1v-1h-1v1h-6v-1h-1v-1h-1v-2h1v1h2v1h3v1h1v-1h-1v-1h-3v-1h-4v-4h1v-2h1v-1h1v-1h1v2h1v1h1v-1h1v1h-1v1h2v-2h1v-2h1v-1h1m-13 4h2v1h-1v4h1v2h1v1h1v1h1v1h4v1h-6v-1h-6v-1h-1v-5h1v-1h1v-2h2m17 3h1v3h-1v1h-1v1h-1v2h-2v-2h2v-1h1v-1h1m1 0h1v3h-1v1h-2v-1h1v-1h1m-30 2v8h-8v32h8v8h32v-8h8v-8H70v8H54V44h16v8h16v-8h-8v-8h-1v1h-7v-1h-2v1h-8v-1" />
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 27 27" width={24} height={24}>
+            <path fill="currentColor" d={isShown ? "M9 0h1v1h1v2h1v2h3V3h1V1h1V0h1v2h1v2h1v7h-1v-1h-3V9h1V6h-1v4h-3v1h1v-1h2v1h3v1h-1v1h-3v2h1v1h1v1h1v3h-1v4h-2v-1h-1v-4h-1v4h-1v1h-2v-4H9v-3h1v-1h1v-1h1v-2H9v-1H8v-1h3V6h-1v3h1v1H8v1H7V4h1V2h1M5 19h2v1h1v1h1v3H4v-1h2v-1H4v-2h1m15-1h2v1h1v2h-2v1h2v1h-5v-3h1v-1h1m4 3h4v1h-4" : "M0 0h7v1H6v1H5v1H4v1H3v1H2v1h5v1H0V6h1V5h1V4h1V3h1V2h1V1H0m13 2h5v1h-1v1h-1v1h-1v1h3v1h-5V7h1V6h1V5h1V4h-3m8 5h1v5h1v-1h1v1h-1v1h1v-1h1v1h-1v3h-1v1h-2v1h-1v1h1v-1h2v-1h1v2h-1v1h-2v1h-1v-1h-1v1h-6v-1h-1v-1h-1v-2h1v1h2v1h3v1h1v-1h-1v-1h-3v-1h-4v-4h1v-2h1v-1h1v-1h1v2h1v1h1v-1h1v1h-1v1h2v-2h1v-2h1v-1h1M8 14h2v1H9v4h1v2h1v1h1v1h1v1h4v1h-6v-1H5v-1H4v-5h1v-1h1v-2h2m17 3h1v3h-1v1h-1v1h-1v2h-2v-2h2v-1h1v-1h1m1 0h1v3h-1v1h-2v-1h1v-1h1"} />
         </svg>
     );
 }
@@ -114,7 +114,7 @@ function VencordPopoutButton() {
                     className="vc-toolbox-btn"
                     onClick={() => setShow(v => !v)}
                     tooltip={isShown ? null : "Vencord Toolbox"}
-                    icon={VencordPopoutIcon}
+                    icon={() => VencordPopoutIcon(isShown)}
                     selected={isShown}
                 />
             )}

From 9dd8e72245038c51a5b49d5e1f8e34888171ea5b Mon Sep 17 00:00:00 2001
From: Hugo C <lumap@duck.com>
Date: Sat, 28 Oct 2023 02:22:04 +0200
Subject: [PATCH 138/632] fix: PiP replacing video download button (#1910)

---
 src/plugins/pictureInPicture/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/pictureInPicture/index.tsx b/src/plugins/pictureInPicture/index.tsx
index dc6ddb0b5..4b6f87970 100644
--- a/src/plugins/pictureInPicture/index.tsx
+++ b/src/plugins/pictureInPicture/index.tsx
@@ -28,8 +28,8 @@ export default definePlugin({
         {
             find: ".nonMediaAttachment]",
             replacement: {
-                match: /\.nonMediaAttachment\].{0,10}children:\[\S/,
-                replace: "$&&&$self.renderPiPButton(),"
+                match: /\.nonMediaAttachment\].{0,10}children:\[(\S)/,
+                replace: "$&,$1&&$self.renderPiPButton(),"
             },
         },
     ],

From bfb48b4faf5a87cbd8d9784ad6348ade24a306ae Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 28 Oct 2023 01:00:17 -0300
Subject: [PATCH 139/632] BetterFolders: Option to choose whether to keep guild
 icons (#1918)

---
 src/plugins/betterFolders/index.tsx | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/plugins/betterFolders/index.tsx b/src/plugins/betterFolders/index.tsx
index 5eb0fb16e..a3b20c6ca 100644
--- a/src/plugins/betterFolders/index.tsx
+++ b/src/plugins/betterFolders/index.tsx
@@ -73,6 +73,12 @@ export const settings = definePluginSettings({
         type: OptionType.BOOLEAN,
         description: "Force a folder to open when switching to a server of that folder",
         default: false
+    },
+    keepIcons: {
+        type: OptionType.BOOLEAN,
+        description: "Keep showing guild icons in the primary guild bar folder when it's open in the BetterFolders sidebar",
+        restartNeeded: true,
+        default: false
     }
 });
 
@@ -126,6 +132,7 @@ export default definePlugin({
                 },
                 // If we are rendering the normal GuildsBar sidebar, we make Discord think the folder is always collapsed to show better icons (the mini guild icons) and avoid transitions
                 {
+                    predicate: () => settings.store.keepIcons,
                     match: /(?<=let{folderNode:\i,setNodeRef:\i,.+?expanded:(\i).+?;)(?=let)/,
                     replace: '$1=(typeof isBetterFolders!=="undefined"?isBetterFolders:false)?$1:false;'
                 },
@@ -133,20 +140,19 @@ export default definePlugin({
                 {
                     match: /(?=return\(0,\i.\i\)\("div")(?<=selected:\i,expanded:(\i),.+?)/,
                     replace: (_, expanded) => `if((typeof isBetterFolders!=="undefined"?isBetterFolders:false)&&!${expanded})return null;`
-                }
-                // This code is required for the plugin to work, but we don't need it right now because we are making Discord think the folder is always collapsed
-                // If we no longer want to make Discord think the folder is always collapsed, we can use this code for the plugin to work
-                // One reason to no longer want that is to make better icons (the mini guild icons) no longer show
-                /* // Disable expanding and collapsing folders transition in the normal GuildsBar sidebar
+                },
+                // Disable expanding and collapsing folders transition in the normal GuildsBar sidebar
                 {
+                    predicate: () => !settings.store.keepIcons,
                     match: /(?<=\.Messages\.SERVER_FOLDER_PLACEHOLDER.+?useTransition\)\()/,
                     replace: '(typeof isBetterFolders!=="undefined"?isBetterFolders:false)&&'
                 },
                 // If we are rendering the normal GuildsBar sidebar, we avoid rendering guilds from folders that are expanded
                 {
+                    predicate: () => !settings.store.keepIcons,
                     match: /expandedFolderBackground,.+?,(?=\i\(\(\i,\i,\i\)=>{let{key.{0,45}ul)(?<=selected:\i,expanded:(\i),.+?)/,
                     replace: (m, expanded) => `${m}((typeof isBetterFolders!=="undefined"?isBetterFolders:false)||!${expanded})&&`
-                } */
+                }
             ]
         },
         {

From 4b958d17fd28ce39917c006c614efb4189fa4dd0 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 28 Oct 2023 17:18:00 -0300
Subject: [PATCH 140/632] Fix BetterFolders freeze and add new options (#1923)

---
 src/plugins/betterFolders/FolderSideBar.tsx |   1 +
 src/plugins/betterFolders/index.tsx         | 119 ++++++++++++++++----
 2 files changed, 96 insertions(+), 24 deletions(-)

diff --git a/src/plugins/betterFolders/FolderSideBar.tsx b/src/plugins/betterFolders/FolderSideBar.tsx
index f3884701a..5504e1d56 100644
--- a/src/plugins/betterFolders/FolderSideBar.tsx
+++ b/src/plugins/betterFolders/FolderSideBar.tsx
@@ -33,6 +33,7 @@ export default ErrorBoundary.wrap(guildsBarProps => {
         <GuildsBar
             {...guildsBarProps}
             isBetterFolders={true}
+            betterFoldersExpandedIds={expandedFolders}
         />
     );
 
diff --git a/src/plugins/betterFolders/index.tsx b/src/plugins/betterFolders/index.tsx
index a3b20c6ca..8f40d90ff 100644
--- a/src/plugins/betterFolders/index.tsx
+++ b/src/plugins/betterFolders/index.tsx
@@ -18,13 +18,21 @@
 
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
+import { proxyLazy } from "@utils/lazy";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findStoreLazy } from "@webpack";
+import { findByProps, findByPropsLazy, findStoreLazy } from "@webpack";
 import { FluxDispatcher, i18n } from "@webpack/common";
 
 import FolderSideBar from "./FolderSideBar";
 
-const GuildFolderStore = findStoreLazy("SortedGuildStore");
+enum FolderIconDisplay {
+    Never,
+    Always,
+    MoreThanOneFolderExpanded
+}
+
+const GuildsTree = proxyLazy(() => findByProps("GuildsTree").GuildsTree);
+const SortedGuildStore = findStoreLazy("SortedGuildStore");
 export const ExpandedGuildFolderStore = findStoreLazy("ExpandedGuildFolderStore");
 const FolderUtils = findByPropsLazy("move", "toggleGuildFolderExpand");
 
@@ -32,7 +40,7 @@ let lastGuildId = null as string | null;
 let dispatchingFoldersClose = false;
 
 function getGuildFolder(id: string) {
-    return GuildFolderStore.getGuildFolders().find(folder => folder.guildIds.includes(id));
+    return SortedGuildStore.getGuildFolders().find(folder => folder.guildIds.includes(id));
 }
 
 function closeFolders() {
@@ -50,7 +58,6 @@ export const settings = definePluginSettings({
     sidebarAnim: {
         type: OptionType.BOOLEAN,
         description: "Animate opening the folder sidebar",
-        restartNeeded: true,
         default: true
     },
     closeAllFolders: {
@@ -79,6 +86,16 @@ export const settings = definePluginSettings({
         description: "Keep showing guild icons in the primary guild bar folder when it's open in the BetterFolders sidebar",
         restartNeeded: true,
         default: false
+    },
+    showFolderIcon: {
+        type: OptionType.SELECT,
+        description: "Show the folder icon above the folder guilds in the BetterFolders sidebar",
+        options: [
+            { label: "Never", value: FolderIconDisplay.Never },
+            { label: "Always", value: FolderIconDisplay.Always, default: true },
+            { label: "When more than one folder is expanded", value: FolderIconDisplay.MoreThanOneFolderExpanded }
+        ],
+        restartNeeded: true
     }
 });
 
@@ -99,25 +116,45 @@ export default definePlugin({
                     match: /(?<=let{disableAppDownload:\i=\i\.isPlatformEmbedded,isOverlay:.+?)(?=}=\i,)/,
                     replace: ",isBetterFolders"
                 },
+                // If we are rendering the Better Folders sidebar, we filter out guilds that are not in folders and unexpanded folders
+                {
+                    match: /(useStateFromStoresArray\).{0,25}let \i)=(\i\.\i.getGuildsTree\(\))/,
+                    replace: (_, rest, guildsTree) => `${rest}=$self.getGuildTree(!!arguments[0].isBetterFolders,${guildsTree},arguments[0].betterFoldersExpandedIds)`
+                },
                 // If we are rendering the Better Folders sidebar, we filter out everything but the servers and folders from the GuildsBar Guild List children
                 {
                     match: /lastTargetNode:\i\[\i\.length-1\].+?Fragment.+?\]}\)\]/,
-                    replace: '$&.filter($self.makeGuildsBarGuildListFilter(typeof isBetterFolders!=="undefined"?isBetterFolders:false))'
+                    replace: "$&.filter($self.makeGuildsBarGuildListFilter(!!arguments[0].isBetterFolders))"
                 },
                 // If we are rendering the Better Folders sidebar, we filter out everything but the scroller for the guild list from the GuildsBar Tree children
                 {
                     match: /unreadMentionsIndicatorBottom,barClassName.+?}\)\]/,
-                    replace: '$&.filter($self.makeGuildsBarTreeFilter(typeof isBetterFolders!=="undefined"?isBetterFolders:false))'
+                    replace: "$&.filter($self.makeGuildsBarTreeFilter(!!arguments[0].isBetterFolders))"
                 },
                 // Export the isBetterFolders variable to the folders component
                 {
                     match: /(?<=\.Messages\.SERVERS.+?switch\((\i)\.type\){case \i\.\i\.FOLDER:.+?folderNode:\i,)/,
                     replace: 'isBetterFolders:typeof isBetterFolders!=="undefined"?isBetterFolders:false,'
-                },
-                // Avoid rendering servers that are not in folders in the Better Folders sidebar
+                }
+            ]
+        },
+        {
+            // This is the parent folder component
+            find: ".MAX_GUILD_FOLDER_NAME_LENGTH,",
+            predicate: () => settings.store.sidebar && settings.store.showFolderIcon !== FolderIconDisplay.Always,
+            replacement: [
                 {
-                    match: /(?<=\.Messages\.SERVERS.+?switch\((\i)\.type\){case \i\.\i\.FOLDER:.+?GUILD:)/,
-                    replace: 'if((typeof isBetterFolders!=="undefined"?isBetterFolders:false)&&$1.parentId==null)return null;'
+                    // Modify the expanded state to instead return the list of expanded folders
+                    match: /(useStateFromStores\).{0,20}=>)(\i\.\i)\.isFolderExpanded\(\i\)/,
+                    replace: (_, rest, ExpandedGuildFolderStore) => `${rest}${ExpandedGuildFolderStore}.getExpandedFolders()`,
+                },
+                {
+                    // Modify the expanded prop to use the boolean if the above patch fails, or check if the folder is expanded from the list if it succeeds
+                    // Also export the list of expanded folders to the child folder component if the patch above succeeds, else export undefined
+                    match: /(?<=folderNode:(\i),expanded:)\i(?=,)/,
+                    replace: (isExpandedOrExpandedIds, folderNote) => ""
+                        + `typeof ${isExpandedOrExpandedIds}==="boolean"?${isExpandedOrExpandedIds}:${isExpandedOrExpandedIds}.has(${folderNote}.id),`
+                        + `betterFoldersExpandedIds:${isExpandedOrExpandedIds} instanceof Set?${isExpandedOrExpandedIds}:void 0`
                 }
             ]
         },
@@ -125,33 +162,37 @@ export default definePlugin({
             find: ".FOLDER_ITEM_GUILD_ICON_MARGIN);",
             predicate: () => settings.store.sidebar,
             replacement: [
-                // Create the isBetterFolders variable in the nested folders component (the parent exports all the props so we don't have to patch it)
-                {
-                    match: /(?<=let{folderNode:\i,setNodeRef:\i,)/,
-                    replace: "isBetterFolders,"
-                },
+                // We use arguments[0] to access the isBetterFolders variable in this nested folder component (the parent exports all the props so we don't have to patch it)
+
                 // If we are rendering the normal GuildsBar sidebar, we make Discord think the folder is always collapsed to show better icons (the mini guild icons) and avoid transitions
                 {
                     predicate: () => settings.store.keepIcons,
-                    match: /(?<=let{folderNode:\i,setNodeRef:\i,.+?expanded:(\i).+?;)(?=let)/,
-                    replace: '$1=(typeof isBetterFolders!=="undefined"?isBetterFolders:false)?$1:false;'
-                },
-                // If we are rendering the Better Folders sidebar, we filter out folders that are not expanded
-                {
-                    match: /(?=return\(0,\i.\i\)\("div")(?<=selected:\i,expanded:(\i),.+?)/,
-                    replace: (_, expanded) => `if((typeof isBetterFolders!=="undefined"?isBetterFolders:false)&&!${expanded})return null;`
+                    match: /(?<=let{folderNode:\i,setNodeRef:\i,.+?expanded:(\i),.+?;)(?=let)/,
+                    replace: (_, isExpanded) => `${isExpanded}=!!arguments[0].isBetterFolders&&${isExpanded};`
                 },
                 // Disable expanding and collapsing folders transition in the normal GuildsBar sidebar
                 {
                     predicate: () => !settings.store.keepIcons,
                     match: /(?<=\.Messages\.SERVER_FOLDER_PLACEHOLDER.+?useTransition\)\()/,
-                    replace: '(typeof isBetterFolders!=="undefined"?isBetterFolders:false)&&'
+                    replace: "!!arguments[0].isBetterFolders&&"
                 },
                 // If we are rendering the normal GuildsBar sidebar, we avoid rendering guilds from folders that are expanded
                 {
                     predicate: () => !settings.store.keepIcons,
                     match: /expandedFolderBackground,.+?,(?=\i\(\(\i,\i,\i\)=>{let{key.{0,45}ul)(?<=selected:\i,expanded:(\i),.+?)/,
-                    replace: (m, expanded) => `${m}((typeof isBetterFolders!=="undefined"?isBetterFolders:false)||!${expanded})&&`
+                    replace: (m, isExpanded) => `${m}!arguments[0].isBetterFolders&&${isExpanded}?null:`
+                },
+                {
+                    // Decide if we should render the expanded folder background if we are rendering the Better Folders sidebar
+                    predicate: () => settings.store.showFolderIcon !== FolderIconDisplay.Always,
+                    match: /(?<=\.wrapper,children:\[)/,
+                    replace: "$self.shouldShowFolderIconAndBackground(!!arguments[0].isBetterFolders,arguments[0].betterFoldersExpandedIds)&&"
+                },
+                {
+                    // Decide if we should render the expanded folder icon if we are rendering the Better Folders sidebar
+                    predicate: () => settings.store.showFolderIcon !== FolderIconDisplay.Always,
+                    match: /(?<=\.expandedFolderBackground.+?}\),)(?=\i,)/,
+                    replace: "!$self.shouldShowFolderIconAndBackground(!!arguments[0].isBetterFolders,arguments[0].betterFoldersExpandedIds)?null:"
                 }
             ]
         },
@@ -212,6 +253,21 @@ export default definePlugin({
         }
     },
 
+    getGuildTree(isBetterFolders: boolean, oldTree: any, expandedFolderIds?: Set<any>) {
+        if (!isBetterFolders || expandedFolderIds == null) return oldTree;
+
+        const newTree = new GuildsTree();
+        // Children is every folder and guild which is not in a folder, this filters out only the expanded folders
+        newTree.root.children = oldTree.root.children.filter(guildOrFolder => expandedFolderIds.has(guildOrFolder.id));
+        // Nodes is every folder and guild, even if it's in a folder, this filters out only the expanded folders and guilds inside them
+        newTree.nodes = Object.fromEntries(
+            Object.entries(oldTree.nodes)
+                .filter(([_, guildOrFolder]: any[]) => expandedFolderIds.has(guildOrFolder.id) || expandedFolderIds.has(guildOrFolder.parentId))
+        );
+
+        return newTree;
+    },
+
     makeGuildsBarGuildListFilter(isBetterFolders: boolean) {
         return child => {
             if (isBetterFolders) {
@@ -230,6 +286,21 @@ export default definePlugin({
         };
     },
 
+    shouldShowFolderIconAndBackground(isBetterFolders: boolean, expandedFolderIds?: Set<any>) {
+        if (!isBetterFolders) return true;
+
+        switch (settings.store.showFolderIcon) {
+            case FolderIconDisplay.Never:
+                return false;
+            case FolderIconDisplay.Always:
+                return true;
+            case FolderIconDisplay.MoreThanOneFolderExpanded:
+                return (expandedFolderIds?.size ?? 0) > 1;
+            default:
+                return true;
+        }
+    },
+
     FolderSideBar: guildsBarProps => <FolderSideBar {...guildsBarProps} />,
 
     closeFolders

From af135b9245226013ebf1a56752da5d35dc5e59fe Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 28 Oct 2023 17:43:27 -0300
Subject: [PATCH 141/632] Fix AlwaysAnimate

---
 src/plugins/alwaysAnimate/index.ts | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/plugins/alwaysAnimate/index.ts b/src/plugins/alwaysAnimate/index.ts
index f3ae27afd..d53e51452 100644
--- a/src/plugins/alwaysAnimate/index.ts
+++ b/src/plugins/alwaysAnimate/index.ts
@@ -21,16 +21,30 @@ import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "AlwaysAnimate",
-    description: "Animates anything that can be animated, besides status emojis.",
+    description: "Animates anything that can be animated",
     authors: [Devs.FieryFlames],
 
     patches: [
         {
-            find: ".canAnimate",
+            find: "canAnimate:",
             all: true,
+            // Some modules match the find but the replacement is returned untouched
+            noWarn: true,
             replacement: {
-                match: /\.canAnimate\b/g,
-                replace: ".canAnimate || true"
+                match: /canAnimate:.+?(?=([,}].*?\)))/g,
+                replace: (m, rest) => {
+                    const destructuringMatch = rest.match(/}=.+/);
+                    if (destructuringMatch == null) return "canAnimate:!0";
+                    return m;
+                }
+            }
+        },
+        {
+            // Status emojis
+            find: ".Messages.GUILD_OWNER,",
+            replacement: {
+                match: /(?<=\.activityEmoji,.+?animate:)\i/,
+                replace: "!0"
             }
         }
     ]

From 522fdcd15de906ffd86ae868f5eb0905812b908a Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sat, 28 Oct 2023 23:51:04 +0200
Subject: [PATCH 142/632] WebKeyBinds: Fix & make available on ArmCord

---
 .../index.ts                                      | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
 rename src/plugins/{webKeybinds.vencordDesktop => webKeybinds.web}/index.ts (84%)

diff --git a/src/plugins/webKeybinds.vencordDesktop/index.ts b/src/plugins/webKeybinds.web/index.ts
similarity index 84%
rename from src/plugins/webKeybinds.vencordDesktop/index.ts
rename to src/plugins/webKeybinds.web/index.ts
index 798713d50..12d485aac 100644
--- a/src/plugins/webKeybinds.vencordDesktop/index.ts
+++ b/src/plugins/webKeybinds.web/index.ts
@@ -18,19 +18,14 @@
 
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { findLazy, mapMangledModuleLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { ComponentDispatch, FluxDispatcher, NavigationRouter, SelectedGuildStore, SettingsRouter } from "@webpack/common";
 
-const GuildNavBinds = mapMangledModuleLazy("mod+alt+down", {
-    CtrlTab: m => m.binds?.at(-1) === "ctrl+tab",
-    CtrlShiftTab: m => m.binds?.at(-1) === "ctrl+shift+tab",
-});
-
-const DigitBinds = findLazy(m => m.binds?.[0] === "mod+1");
+const KeyBinds = findByPropsLazy("JUMP_TO_GUILD", "SERVER_NEXT");
 
 export default definePlugin({
     name: "WebKeybinds",
-    description: "Re-adds keybinds missing in the web version of Discord: ctrl+t, ctrl+shift+t, ctrl+tab, ctrl+shift+tab, ctrl+1-9, ctrl+,",
+    description: "Re-adds keybinds missing in the web version of Discord: ctrl+t, ctrl+shift+t, ctrl+tab, ctrl+shift+tab, ctrl+1-9, ctrl+,. Only works fully on Vesktop/ArmCord, not inside your browser",
     authors: [Devs.Ven],
     enabledByDefault: true,
 
@@ -57,13 +52,13 @@ export default definePlugin({
                 SettingsRouter.open("My Account");
                 break;
             case "Tab":
-                const handler = e.shiftKey ? GuildNavBinds.CtrlShiftTab : GuildNavBinds.CtrlTab;
+                const handler = e.shiftKey ? KeyBinds.SERVER_PREV : KeyBinds.SERVER_NEXT;
                 handler.action(e);
                 break;
             default:
                 if (e.key >= "1" && e.key <= "9") {
                     e.preventDefault();
-                    DigitBinds.action(e, `mod+${e.key}`);
+                    KeyBinds.JUMP_TO_GUILD.action(e, `mod+${e.key}`);
                 }
                 break;
         }

From 18fdc33ee7d1f60d58645c2a98f402988b97e996 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 31 Oct 2023 23:43:28 +0100
Subject: [PATCH 143/632] [skip ci] add react linting

---
 .eslintrc.json                                |  12 +-
 package.json                                  |   1 +
 pnpm-lock.yaml                                | 768 ++++++++++++++++++
 .../Notifications/NotificationComponent.tsx   |   2 +-
 src/components/ErrorBoundary.tsx              |   5 +-
 src/components/Heart.tsx                      |   2 +-
 src/components/Icons.tsx                      |   2 +-
 src/components/PluginSettings/index.tsx       |  20 +-
 .../VencordSettings/PatchHelperTab.tsx        |   4 +-
 src/components/VencordSettings/ThemesTab.tsx  |   2 +-
 src/components/VencordSettings/UpdaterTab.tsx |   4 +-
 src/plugins/betterFolders/FolderSideBar.tsx   |   2 +-
 src/plugins/callTimer/index.tsx               |   1 -
 src/plugins/consoleShortcuts/index.ts         |   1 +
 src/plugins/customRPC/index.tsx               |   2 +-
 src/plugins/emoteCloner/index.tsx             |  42 +-
 src/plugins/gameActivityToggle/index.tsx      |   2 +-
 src/plugins/messageLinkEmbeds/index.tsx       |   4 +-
 src/plugins/moreUserTags/index.tsx            |   2 +-
 src/plugins/mutualGroupDMs/index.tsx          |   1 +
 .../components/RolesAndUsersPermissions.tsx   |   3 +-
 .../components/UserPermissions.tsx            |   4 +-
 src/plugins/pictureInPicture/index.tsx        |   2 +-
 src/plugins/platformIndicators/index.tsx      |  32 +-
 .../readAllNotificationsButton/index.tsx      |   2 +-
 src/plugins/sendTimestamps/index.tsx          |   2 +-
 .../serverProfile/GuildProfileModal.tsx       |   1 +
 .../components/Code.tsx                       |   6 +-
 .../components/Highlighter.tsx                |   2 +-
 src/plugins/showConnections/index.tsx         |   2 +-
 .../components/HiddenChannelLockScreen.tsx    |   2 +-
 src/plugins/silentMessageToggle/index.tsx     |   2 +-
 src/plugins/silentTyping/index.tsx            |   4 +-
 .../spotifyControls/PlayerComponent.tsx       |  28 +-
 .../startupTimings/StartupTimingPage.tsx      |   4 +-
 src/plugins/typingTweaks/index.tsx            |   4 +-
 src/utils/react.tsx                           |   2 +-
 37 files changed, 884 insertions(+), 97 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 2ee24e8b3..5d1b7c763 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -9,6 +9,7 @@
         "unused-imports",
         "path-alias"
     ],
+    "extends": ["plugin:react/recommended", "plugin:react/jsx-runtime"],
     "settings": {
         "import/resolver": {
             "alias": {
@@ -20,6 +21,9 @@
                     ["@components", "./src/components"]
                 ]
             }
+        },
+        "react": {
+            "version": "18.2"
         }
     },
     "rules": {
@@ -93,6 +97,12 @@
 
         "unused-imports/no-unused-imports": "error",
 
-        "path-alias/no-relative": "error"
+        "path-alias/no-relative": "error",
+
+        "react/no-unescaped-entities": "off",
+        "react/prop-types": "off",
+
+        /* we dont target ancient browsers */
+        "react/jsx-no-target-blank": "off"
     }
 }
diff --git a/package.json b/package.json
index da8fc449a..ec23a4cb0 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
         "eslint": "^8.46.0",
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-path-alias": "^1.0.0",
+        "eslint-plugin-react": "^7.33.2",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-unused-imports": "^2.0.0",
         "highlight.js": "10.6.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index be7befab3..2eb545560 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -87,6 +87,9 @@ devDependencies:
   eslint-plugin-path-alias:
     specifier: ^1.0.0
     version: 1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0)
+  eslint-plugin-react:
+    specifier: ^7.33.2
+    version: 7.33.2(eslint@8.46.0)
   eslint-plugin-simple-import-sort:
     specifier: ^10.0.0
     version: 10.0.0(eslint@8.46.0)
@@ -855,6 +858,24 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /array-buffer-byte-length@1.0.0:
+    resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==}
+    dependencies:
+      call-bind: 1.0.5
+      is-array-buffer: 3.0.2
+    dev: true
+
+  /array-includes@3.1.7:
+    resolution: {integrity: sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+      get-intrinsic: 1.2.2
+      is-string: 1.0.7
+    dev: true
+
   /array-union@2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
@@ -865,6 +886,49 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /array.prototype.flat@1.3.2:
+    resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+      es-shim-unscopables: 1.0.2
+    dev: true
+
+  /array.prototype.flatmap@1.3.2:
+    resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+      es-shim-unscopables: 1.0.2
+    dev: true
+
+  /array.prototype.tosorted@1.1.2:
+    resolution: {integrity: sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+      es-shim-unscopables: 1.0.2
+      get-intrinsic: 1.2.2
+    dev: true
+
+  /arraybuffer.prototype.slice@1.0.2:
+    resolution: {integrity: sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      array-buffer-byte-length: 1.0.0
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+      get-intrinsic: 1.2.2
+      is-array-buffer: 3.0.2
+      is-shared-array-buffer: 1.0.2
+    dev: true
+
   /arrify@1.0.1:
     resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
     engines: {node: '>=0.10.0'}
@@ -884,12 +948,23 @@ packages:
     resolution: {integrity: sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==}
     dev: true
 
+  /asynciterator.prototype@1.0.0:
+    resolution: {integrity: sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==}
+    dependencies:
+      has-symbols: 1.0.3
+    dev: true
+
   /atob@2.1.2:
     resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
     engines: {node: '>= 4.5.0'}
     hasBin: true
     dev: true
 
+  /available-typed-arrays@1.0.5:
+    resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
     dev: true
@@ -967,6 +1042,14 @@ packages:
       unset-value: 1.0.0
     dev: true
 
+  /call-bind@1.0.5:
+    resolution: {integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==}
+    dependencies:
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.2
+      set-function-length: 1.1.1
+    dev: true
+
   /callsites@3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
@@ -1176,6 +1259,24 @@ packages:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
     dev: true
 
+  /define-data-property@1.1.1:
+    resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      get-intrinsic: 1.2.2
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.1
+    dev: true
+
+  /define-properties@1.2.1:
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-data-property: 1.1.1
+      has-property-descriptors: 1.0.1
+      object-keys: 1.1.1
+    dev: true
+
   /define-property@0.2.5:
     resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
     engines: {node: '>=0.10.0'}
@@ -1221,6 +1322,13 @@ packages:
       moment: 2.29.4
     dev: true
 
+  /doctrine@2.1.0:
+    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      esutils: 2.0.3
+    dev: true
+
   /doctrine@3.0.0:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
     engines: {node: '>=6.0.0'}
@@ -1244,6 +1352,94 @@ packages:
       is-arrayish: 0.2.1
     dev: true
 
+  /es-abstract@1.22.3:
+    resolution: {integrity: sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      array-buffer-byte-length: 1.0.0
+      arraybuffer.prototype.slice: 1.0.2
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.5
+      es-set-tostringtag: 2.0.2
+      es-to-primitive: 1.2.1
+      function.prototype.name: 1.1.6
+      get-intrinsic: 1.2.2
+      get-symbol-description: 1.0.0
+      globalthis: 1.0.3
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.1
+      has-proto: 1.0.1
+      has-symbols: 1.0.3
+      hasown: 2.0.0
+      internal-slot: 1.0.6
+      is-array-buffer: 3.0.2
+      is-callable: 1.2.7
+      is-negative-zero: 2.0.2
+      is-regex: 1.1.4
+      is-shared-array-buffer: 1.0.2
+      is-string: 1.0.7
+      is-typed-array: 1.1.12
+      is-weakref: 1.0.2
+      object-inspect: 1.13.1
+      object-keys: 1.1.1
+      object.assign: 4.1.4
+      regexp.prototype.flags: 1.5.1
+      safe-array-concat: 1.0.1
+      safe-regex-test: 1.0.0
+      string.prototype.trim: 1.2.8
+      string.prototype.trimend: 1.0.7
+      string.prototype.trimstart: 1.0.7
+      typed-array-buffer: 1.0.0
+      typed-array-byte-length: 1.0.0
+      typed-array-byte-offset: 1.0.0
+      typed-array-length: 1.0.4
+      unbox-primitive: 1.0.2
+      which-typed-array: 1.1.13
+    dev: true
+
+  /es-iterator-helpers@1.0.15:
+    resolution: {integrity: sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==}
+    dependencies:
+      asynciterator.prototype: 1.0.0
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+      es-set-tostringtag: 2.0.2
+      function-bind: 1.1.1
+      get-intrinsic: 1.2.2
+      globalthis: 1.0.3
+      has-property-descriptors: 1.0.1
+      has-proto: 1.0.1
+      has-symbols: 1.0.3
+      internal-slot: 1.0.6
+      iterator.prototype: 1.1.2
+      safe-array-concat: 1.0.1
+    dev: true
+
+  /es-set-tostringtag@2.0.2:
+    resolution: {integrity: sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      get-intrinsic: 1.2.2
+      has-tostringtag: 1.0.0
+      hasown: 2.0.0
+    dev: true
+
+  /es-shim-unscopables@1.0.2:
+    resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
+    dependencies:
+      hasown: 2.0.0
+    dev: true
+
+  /es-to-primitive@1.2.1:
+    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      is-callable: 1.2.7
+      is-date-object: 1.0.5
+      is-symbol: 1.0.4
+    dev: true
+
   /esbuild-android-64@0.15.18:
     resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==}
     engines: {node: '>=12'}
@@ -1524,6 +1720,34 @@ packages:
     dev: true
     patched: true
 
+  /eslint-plugin-react@7.33.2(eslint@8.46.0):
+    resolution: {integrity: sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+    peerDependenciesMeta:
+      eslint:
+        optional: true
+    dependencies:
+      array-includes: 3.1.7
+      array.prototype.flatmap: 1.3.2
+      array.prototype.tosorted: 1.1.2
+      doctrine: 2.1.0
+      es-iterator-helpers: 1.0.15
+      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      estraverse: 5.3.0
+      jsx-ast-utils: 3.3.5
+      minimatch: 3.1.2
+      object.entries: 1.1.7
+      object.fromentries: 2.0.7
+      object.hasown: 1.1.3
+      object.values: 1.1.7
+      prop-types: 15.8.1
+      resolve: 2.0.0-next.5
+      semver: 6.3.1
+      string.prototype.matchall: 4.0.10
+    dev: true
+
   /eslint-plugin-simple-header@1.0.2:
     resolution: {integrity: sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA==}
     dev: false
@@ -1791,6 +2015,12 @@ packages:
     resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
     dev: true
 
+  /for-each@0.3.3:
+    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+    dependencies:
+      is-callable: 1.2.7
+    dev: true
+
   /for-in@1.0.2:
     resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
     engines: {node: '>=0.10.0'}
@@ -1823,11 +2053,38 @@ packages:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
     dev: true
 
+  /function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+    dev: true
+
+  /function.prototype.name@1.1.6:
+    resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+      functions-have-names: 1.2.3
+    dev: true
+
+  /functions-have-names@1.2.3:
+    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
+    dev: true
+
   /get-caller-file@2.0.5:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
     dev: true
 
+  /get-intrinsic@1.2.2:
+    resolution: {integrity: sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==}
+    dependencies:
+      function-bind: 1.1.2
+      has-proto: 1.0.1
+      has-symbols: 1.0.3
+      hasown: 2.0.0
+    dev: true
+
   /get-stream@5.2.0:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
     engines: {node: '>=8'}
@@ -1835,6 +2092,14 @@ packages:
       pump: 3.0.0
     dev: true
 
+  /get-symbol-description@1.0.0:
+    resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
+    dev: true
+
   /get-tsconfig@4.5.0:
     resolution: {integrity: sha512-MjhiaIWCJ1sAU4pIQ5i5OfOuHHxVo1oYeNsWTON7jxYkod8pHocXeh+SSbmu5OZZZK73B6cbJ2XADzXehLyovQ==}
     dev: true
@@ -1892,6 +2157,13 @@ packages:
       type-fest: 0.20.2
     dev: true
 
+  /globalthis@1.0.3:
+    resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-properties: 1.2.1
+    dev: true
+
   /globby@11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
     engines: {node: '>=10'}
@@ -1908,6 +2180,12 @@ packages:
     resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
     dev: true
 
+  /gopd@1.0.1:
+    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
+    dependencies:
+      get-intrinsic: 1.2.2
+    dev: true
+
   /graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
     dev: true
@@ -1925,6 +2203,10 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /has-bigints@1.0.2:
+    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
+    dev: true
+
   /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
@@ -1935,6 +2217,29 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /has-property-descriptors@1.0.1:
+    resolution: {integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==}
+    dependencies:
+      get-intrinsic: 1.2.2
+    dev: true
+
+  /has-proto@1.0.1:
+    resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /has-symbols@1.0.3:
+    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /has-tostringtag@1.0.0:
+    resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-symbols: 1.0.3
+    dev: true
+
   /has-value@0.3.1:
     resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
     engines: {node: '>=0.10.0'}
@@ -1973,6 +2278,13 @@ packages:
       function-bind: 1.1.1
     dev: true
 
+  /hasown@2.0.0:
+    resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      function-bind: 1.1.2
+    dev: true
+
   /highlight.js@10.6.0:
     resolution: {integrity: sha512-8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ==}
     dev: true
@@ -2050,6 +2362,15 @@ packages:
     resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
     dev: true
 
+  /internal-slot@1.0.6:
+    resolution: {integrity: sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      get-intrinsic: 1.2.2
+      hasown: 2.0.0
+      side-channel: 1.0.4
+    dev: true
+
   /is-accessor-descriptor@0.1.6:
     resolution: {integrity: sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==}
     engines: {node: '>=0.10.0'}
@@ -2064,20 +2385,60 @@ packages:
       kind-of: 6.0.3
     dev: true
 
+  /is-array-buffer@3.0.2:
+    resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
+    dependencies:
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
+      is-typed-array: 1.1.12
+    dev: true
+
   /is-arrayish@0.2.1:
     resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
     dev: true
 
+  /is-async-function@2.0.0:
+    resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-tostringtag: 1.0.0
+    dev: true
+
+  /is-bigint@1.0.4:
+    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
+    dependencies:
+      has-bigints: 1.0.2
+    dev: true
+
+  /is-boolean-object@1.1.2:
+    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      has-tostringtag: 1.0.0
+    dev: true
+
   /is-buffer@1.1.6:
     resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
     dev: true
 
+  /is-callable@1.2.7:
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /is-core-module@2.12.0:
     resolution: {integrity: sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==}
     dependencies:
       has: 1.0.3
     dev: true
 
+  /is-core-module@2.13.1:
+    resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==}
+    dependencies:
+      hasown: 2.0.0
+    dev: true
+
   /is-data-descriptor@0.1.4:
     resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==}
     engines: {node: '>=0.10.0'}
@@ -2092,6 +2453,13 @@ packages:
       kind-of: 6.0.3
     dev: true
 
+  /is-date-object@1.0.5:
+    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-tostringtag: 1.0.0
+    dev: true
+
   /is-descriptor@0.1.6:
     resolution: {integrity: sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==}
     engines: {node: '>=0.10.0'}
@@ -2127,11 +2495,24 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /is-finalizationregistry@1.0.2:
+    resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==}
+    dependencies:
+      call-bind: 1.0.5
+    dev: true
+
   /is-fullwidth-code-point@3.0.0:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
     dev: true
 
+  /is-generator-function@1.0.10:
+    resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-tostringtag: 1.0.0
+    dev: true
+
   /is-glob@4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
@@ -2139,6 +2520,22 @@ packages:
       is-extglob: 2.1.1
     dev: true
 
+  /is-map@2.0.2:
+    resolution: {integrity: sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==}
+    dev: true
+
+  /is-negative-zero@2.0.2:
+    resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /is-number-object@1.0.7:
+    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-tostringtag: 1.0.0
+    dev: true
+
   /is-number@3.0.0:
     resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==}
     engines: {node: '>=0.10.0'}
@@ -2173,6 +2570,62 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /is-regex@1.1.4:
+    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      has-tostringtag: 1.0.0
+    dev: true
+
+  /is-set@2.0.2:
+    resolution: {integrity: sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==}
+    dev: true
+
+  /is-shared-array-buffer@1.0.2:
+    resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
+    dependencies:
+      call-bind: 1.0.5
+    dev: true
+
+  /is-string@1.0.7:
+    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-tostringtag: 1.0.0
+    dev: true
+
+  /is-symbol@1.0.4:
+    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-symbols: 1.0.3
+    dev: true
+
+  /is-typed-array@1.1.12:
+    resolution: {integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      which-typed-array: 1.1.13
+    dev: true
+
+  /is-weakmap@2.0.1:
+    resolution: {integrity: sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==}
+    dev: true
+
+  /is-weakref@1.0.2:
+    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
+    dependencies:
+      call-bind: 1.0.5
+    dev: true
+
+  /is-weakset@2.0.2:
+    resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==}
+    dependencies:
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
+    dev: true
+
   /is-windows@1.0.2:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
     engines: {node: '>=0.10.0'}
@@ -2182,6 +2635,10 @@ packages:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
     dev: true
 
+  /isarray@2.0.5:
+    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
+    dev: true
+
   /isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
     dev: true
@@ -2198,6 +2655,16 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /iterator.prototype@1.1.2:
+    resolution: {integrity: sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==}
+    dependencies:
+      define-properties: 1.2.1
+      get-intrinsic: 1.2.2
+      has-symbols: 1.0.3
+      reflect.getprototypeof: 1.0.4
+      set-function-name: 2.0.1
+    dev: true
+
   /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
     dev: true
@@ -2229,6 +2696,16 @@ packages:
     resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
     dev: false
 
+  /jsx-ast-utils@3.3.5:
+    resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
+    engines: {node: '>=4.0'}
+    dependencies:
+      array-includes: 3.1.7
+      array.prototype.flat: 1.3.2
+      object.assign: 4.1.4
+      object.values: 1.1.7
+    dev: true
+
   /jszip@2.7.0:
     resolution: {integrity: sha512-JIsRKRVC3gTRo2vM4Wy9WBC3TRcfnIZU8k65Phi3izkvPH975FowRYtKGT6PxevA0XnJ/yO8b0QwV0ydVyQwfw==}
     dependencies:
@@ -2297,6 +2774,13 @@ packages:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
 
+  /loose-envify@1.4.0:
+    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
+    hasBin: true
+    dependencies:
+      js-tokens: 4.0.0
+    dev: true
+
   /lru-cache@6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
@@ -2492,6 +2976,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /object-assign@4.1.1:
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /object-copy@0.1.0:
     resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
     engines: {node: '>=0.10.0'}
@@ -2501,6 +2990,15 @@ packages:
       kind-of: 3.2.2
     dev: true
 
+  /object-inspect@1.13.1:
+    resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
+    dev: true
+
+  /object-keys@1.1.1:
+    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /object-visit@1.0.1:
     resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
     engines: {node: '>=0.10.0'}
@@ -2508,6 +3006,41 @@ packages:
       isobject: 3.0.1
     dev: true
 
+  /object.assign@4.1.4:
+    resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      has-symbols: 1.0.3
+      object-keys: 1.1.1
+    dev: true
+
+  /object.entries@1.1.7:
+    resolution: {integrity: sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+    dev: true
+
+  /object.fromentries@2.0.7:
+    resolution: {integrity: sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+    dev: true
+
+  /object.hasown@1.1.3:
+    resolution: {integrity: sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==}
+    dependencies:
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+    dev: true
+
   /object.pick@1.3.0:
     resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
     engines: {node: '>=0.10.0'}
@@ -2515,6 +3048,15 @@ packages:
       isobject: 3.0.1
     dev: true
 
+  /object.values@1.1.7:
+    resolution: {integrity: sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+    dev: true
+
   /once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
     dependencies:
@@ -2677,6 +3219,14 @@ packages:
     engines: {node: '>=0.4.0'}
     dev: true
 
+  /prop-types@15.8.1:
+    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react-is: 16.13.1
+    dev: true
+
   /proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
     dev: true
@@ -2735,6 +3285,10 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /react-is@16.13.1:
+    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
+    dev: true
+
   /read-pkg-up@7.0.1:
     resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
     engines: {node: '>=8'}
@@ -2771,6 +3325,18 @@ packages:
       strip-indent: 3.0.0
     dev: true
 
+  /reflect.getprototypeof@1.0.4:
+    resolution: {integrity: sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+      get-intrinsic: 1.2.2
+      globalthis: 1.0.3
+      which-builtin-type: 1.1.3
+    dev: true
+
   /regex-not@1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -2779,6 +3345,15 @@ packages:
       safe-regex: 1.1.0
     dev: true
 
+  /regexp.prototype.flags@1.5.1:
+    resolution: {integrity: sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      set-function-name: 2.0.1
+    dev: true
+
   /require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -2813,6 +3388,15 @@ packages:
       supports-preserve-symlinks-flag: 1.0.0
     dev: true
 
+  /resolve@2.0.0-next.5:
+    resolution: {integrity: sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==}
+    hasBin: true
+    dependencies:
+      is-core-module: 2.13.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+    dev: true
+
   /ret@0.1.15:
     resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
     engines: {node: '>=0.12'}
@@ -2836,10 +3420,28 @@ packages:
       queue-microtask: 1.2.3
     dev: true
 
+  /safe-array-concat@1.0.1:
+    resolution: {integrity: sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==}
+    engines: {node: '>=0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
+      has-symbols: 1.0.3
+      isarray: 2.0.5
+    dev: true
+
   /safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
     dev: true
 
+  /safe-regex-test@1.0.0:
+    resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
+    dependencies:
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
+      is-regex: 1.1.4
+    dev: true
+
   /safe-regex@1.1.0:
     resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==}
     dependencies:
@@ -2851,6 +3453,11 @@ packages:
     hasBin: true
     dev: true
 
+  /semver@6.3.1:
+    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
+    hasBin: true
+    dev: true
+
   /semver@7.5.0:
     resolution: {integrity: sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==}
     engines: {node: '>=10'}
@@ -2859,6 +3466,25 @@ packages:
       lru-cache: 6.0.0
     dev: true
 
+  /set-function-length@1.1.1:
+    resolution: {integrity: sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-data-property: 1.1.1
+      get-intrinsic: 1.2.2
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.1
+    dev: true
+
+  /set-function-name@2.0.1:
+    resolution: {integrity: sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-data-property: 1.1.1
+      functions-have-names: 1.2.3
+      has-property-descriptors: 1.0.1
+    dev: true
+
   /set-value@2.0.1:
     resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
     engines: {node: '>=0.10.0'}
@@ -2881,6 +3507,14 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /side-channel@1.0.4:
+    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
+    dependencies:
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
+      object-inspect: 1.13.1
+    dev: true
+
   /signal-exit@4.0.1:
     resolution: {integrity: sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw==}
     engines: {node: '>=14'}
@@ -3006,6 +3640,45 @@ packages:
       strip-ansi: 6.0.1
     dev: true
 
+  /string.prototype.matchall@4.0.10:
+    resolution: {integrity: sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+      get-intrinsic: 1.2.2
+      has-symbols: 1.0.3
+      internal-slot: 1.0.6
+      regexp.prototype.flags: 1.5.1
+      set-function-name: 2.0.1
+      side-channel: 1.0.4
+    dev: true
+
+  /string.prototype.trim@1.2.8:
+    resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+    dev: true
+
+  /string.prototype.trimend@1.0.7:
+    resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+    dev: true
+
+  /string.prototype.trimstart@1.0.7:
+    resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==}
+    dependencies:
+      call-bind: 1.0.5
+      define-properties: 1.2.1
+      es-abstract: 1.22.3
+    dev: true
+
   /string_decoder@1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
     dependencies:
@@ -3263,12 +3936,59 @@ packages:
     engines: {node: '>=14.16'}
     dev: true
 
+  /typed-array-buffer@1.0.0:
+    resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
+      is-typed-array: 1.1.12
+    dev: true
+
+  /typed-array-byte-length@1.0.0:
+    resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      for-each: 0.3.3
+      has-proto: 1.0.1
+      is-typed-array: 1.1.12
+    dev: true
+
+  /typed-array-byte-offset@1.0.0:
+    resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.5
+      for-each: 0.3.3
+      has-proto: 1.0.1
+      is-typed-array: 1.1.12
+    dev: true
+
+  /typed-array-length@1.0.4:
+    resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
+    dependencies:
+      call-bind: 1.0.5
+      for-each: 0.3.3
+      is-typed-array: 1.1.12
+    dev: true
+
   /typescript@5.0.4:
     resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==}
     engines: {node: '>=12.20'}
     hasBin: true
     dev: true
 
+  /unbox-primitive@1.0.2:
+    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
+    dependencies:
+      call-bind: 1.0.5
+      has-bigints: 1.0.2
+      has-symbols: 1.0.3
+      which-boxed-primitive: 1.0.2
+    dev: true
+
   /unbzip2-stream@1.4.3:
     resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
     dependencies:
@@ -3348,6 +4068,54 @@ packages:
       webidl-conversions: 3.0.1
     dev: true
 
+  /which-boxed-primitive@1.0.2:
+    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
+    dependencies:
+      is-bigint: 1.0.4
+      is-boolean-object: 1.1.2
+      is-number-object: 1.0.7
+      is-string: 1.0.7
+      is-symbol: 1.0.4
+    dev: true
+
+  /which-builtin-type@1.1.3:
+    resolution: {integrity: sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      function.prototype.name: 1.1.6
+      has-tostringtag: 1.0.0
+      is-async-function: 2.0.0
+      is-date-object: 1.0.5
+      is-finalizationregistry: 1.0.2
+      is-generator-function: 1.0.10
+      is-regex: 1.1.4
+      is-weakref: 1.0.2
+      isarray: 2.0.5
+      which-boxed-primitive: 1.0.2
+      which-collection: 1.0.1
+      which-typed-array: 1.1.13
+    dev: true
+
+  /which-collection@1.0.1:
+    resolution: {integrity: sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==}
+    dependencies:
+      is-map: 2.0.2
+      is-set: 2.0.2
+      is-weakmap: 2.0.1
+      is-weakset: 2.0.2
+    dev: true
+
+  /which-typed-array@1.1.13:
+    resolution: {integrity: sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.5
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.0
+    dev: true
+
   /which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
     hasBin: true
diff --git a/src/api/Notifications/NotificationComponent.tsx b/src/api/Notifications/NotificationComponent.tsx
index caa4b64ef..71c40c736 100644
--- a/src/api/Notifications/NotificationComponent.tsx
+++ b/src/api/Notifications/NotificationComponent.tsx
@@ -21,7 +21,7 @@ import "./styles.css";
 import { useSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { classes } from "@utils/misc";
-import { React, useEffect, useMemo, useState, useStateFromStores, WindowStore } from "@webpack/common";
+import { useEffect, useMemo, useState, useStateFromStores, WindowStore } from "@webpack/common";
 
 import { NotificationData } from "./Notifications";
 
diff --git a/src/components/ErrorBoundary.tsx b/src/components/ErrorBoundary.tsx
index ea2e02b51..02e0e939b 100644
--- a/src/components/ErrorBoundary.tsx
+++ b/src/components/ErrorBoundary.tsx
@@ -80,10 +80,7 @@ const ErrorBoundary = LazyComponent(() => {
             if (this.props.noop) return null;
 
             if (this.props.fallback)
-                return <this.props.fallback
-                    children={this.props.children}
-                    {...this.state}
-                />;
+                return <this.props.fallback {...this.state}>{this.props.children}</this.props.fallback>;
 
             const msg = this.props.message || "An error occurred while rendering this Component. More info can be found below and in your console.";
 
diff --git a/src/components/Heart.tsx b/src/components/Heart.tsx
index b33b83643..017b41645 100644
--- a/src/components/Heart.tsx
+++ b/src/components/Heart.tsx
@@ -27,7 +27,7 @@ export function Heart() {
         >
             <path
                 fill="#db61a2"
-                fill-rule="evenodd"
+                fillRule="evenodd"
                 d="M4.25 2.5c-1.336 0-2.75 1.164-2.75 3 0 2.15 1.58 4.144 3.365 5.682A20.565 20.565 0 008 13.393a20.561 20.561 0 003.135-2.211C12.92 9.644 14.5 7.65 14.5 5.5c0-1.836-1.414-3-2.75-3-1.373 0-2.609.986-3.029 2.456a.75.75 0 01-1.442 0C6.859 3.486 5.623 2.5 4.25 2.5zM8 14.25l-.345.666-.002-.001-.006-.003-.018-.01a7.643 7.643 0 01-.31-.17 22.075 22.075 0 01-3.434-2.414C2.045 10.731 0 8.35 0 5.5 0 2.836 2.086 1 4.25 1 5.797 1 7.153 1.802 8 3.02 8.847 1.802 10.203 1 11.75 1 13.914 1 16 2.836 16 5.5c0 2.85-2.045 5.231-3.885 6.818a22.08 22.08 0 01-3.744 2.584l-.018.01-.006.003h-.002L8 14.25zm0 0l.345.666a.752.752 0 01-.69 0L8 14.25z"
             />
         </svg>
diff --git a/src/components/Icons.tsx b/src/components/Icons.tsx
index 93b1323e7..01012d1fc 100644
--- a/src/components/Icons.tsx
+++ b/src/components/Icons.tsx
@@ -58,7 +58,7 @@ export function LinkIcon({ height = 24, width = 24, className }: IconProps) {
             className={classes(className, "vc-link-icon")}
             viewBox="0 0 24 24"
         >
-            <g fill="none" fill-rule="evenodd">
+            <g fill="none" fillRule="evenodd">
                 <path fill="currentColor" d="M10.59 13.41c.41.39.41 1.03 0 1.42-.39.39-1.03.39-1.42 0a5.003 5.003 0 0 1 0-7.07l3.54-3.54a5.003 5.003 0 0 1 7.07 0 5.003 5.003 0 0 1 0 7.07l-1.49 1.49c.01-.82-.12-1.64-.4-2.42l.47-.48a2.982 2.982 0 0 0 0-4.24 2.982 2.982 0 0 0-4.24 0l-3.53 3.53a2.982 2.982 0 0 0 0 4.24zm2.82-4.24c.39-.39 1.03-.39 1.42 0a5.003 5.003 0 0 1 0 7.07l-3.54 3.54a5.003 5.003 0 0 1-7.07 0 5.003 5.003 0 0 1 0-7.07l1.49-1.49c-.01.82.12 1.64.4 2.43l-.47.47a2.982 2.982 0 0 0 0 4.24 2.982 2.982 0 0 0 4.24 0l3.53-3.53a2.982 2.982 0 0 0 0-4.24.973.973 0 0 1 0-1.42z" />
                 <rect width={width} height={height} />
             </g>
diff --git a/src/components/PluginSettings/index.tsx b/src/components/PluginSettings/index.tsx
index fe111fa9d..19e9fb3f4 100644
--- a/src/components/PluginSettings/index.tsx
+++ b/src/components/PluginSettings/index.tsx
@@ -30,7 +30,7 @@ import { ChangeList } from "@utils/ChangeList";
 import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
 import { classes, isObjectEmpty } from "@utils/misc";
-import { openModalLazy } from "@utils/modal";
+import { openModal } from "@utils/modal";
 import { useAwaiter } from "@utils/react";
 import { Plugin } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
@@ -95,12 +95,14 @@ export function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, on
 
     const isEnabled = () => settings.enabled ?? false;
 
-    function openModal() {
-        openModalLazy(async () => {
-            return modalProps => {
-                return <PluginModal {...modalProps} plugin={plugin} onRestartNeeded={() => onRestartNeeded(plugin.name)} />;
-            };
-        });
+    function openPluginModal() {
+        openModal(modalProps => (
+            <PluginModal
+                {...modalProps}
+                plugin={plugin}
+                onRestartNeeded={() => onRestartNeeded(plugin.name)}
+            />
+        ));
     }
 
     function toggleEnabled() {
@@ -159,7 +161,7 @@ export function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, on
             onMouseEnter={onMouseEnter}
             onMouseLeave={onMouseLeave}
             infoButton={
-                <button role="switch" onClick={() => openModal()} className={classes(ButtonClasses.button, cl("info-button"))}>
+                <button role="switch" onClick={() => openPluginModal()} className={classes(ButtonClasses.button, cl("info-button"))}>
                     {plugin.options && !isObjectEmpty(plugin.options)
                         ? <CogWheel />
                         : <InfoIcon />}
@@ -352,7 +354,7 @@ function makeDependencyList(deps: string[]) {
     return (
         <React.Fragment>
             <Forms.FormText>This plugin is required by:</Forms.FormText>
-            {deps.map((dep: string) => <Forms.FormText className={cl("dep-text")}>{dep}</Forms.FormText>)}
+            {deps.map((dep: string) => <Forms.FormText key={dep} className={cl("dep-text")}>{dep}</Forms.FormText>)}
         </React.Fragment>
     );
 }
diff --git a/src/components/VencordSettings/PatchHelperTab.tsx b/src/components/VencordSettings/PatchHelperTab.tsx
index 0b869a518..31af957e0 100644
--- a/src/components/VencordSettings/PatchHelperTab.tsx
+++ b/src/components/VencordSettings/PatchHelperTab.tsx
@@ -106,9 +106,9 @@ function ReplacementComponent({ module, match, replacement, setReplacementError
     }
 
     function renderDiff() {
-        return diff?.map(p => {
+        return diff?.map((p, i) => {
             const color = p.added ? "lime" : p.removed ? "red" : "grey";
-            return <div style={{ color, userSelect: "text" }}>{p.value}</div>;
+            return <div key={i} style={{ color, userSelect: "text" }}>{p.value}</div>;
         });
     }
 
diff --git a/src/components/VencordSettings/ThemesTab.tsx b/src/components/VencordSettings/ThemesTab.tsx
index e65de2192..83df69b4a 100644
--- a/src/components/VencordSettings/ThemesTab.tsx
+++ b/src/components/VencordSettings/ThemesTab.tsx
@@ -26,7 +26,7 @@ import { classes } from "@utils/misc";
 import { showItemInFolder } from "@utils/native";
 import { useAwaiter } from "@utils/react";
 import { findByPropsLazy, findLazy } from "@webpack";
-import { Button, Card, FluxDispatcher, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
+import { Button, Card, FluxDispatcher, Forms, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
 import { UserThemeHeader } from "main/themes";
 import type { ComponentType, Ref, SyntheticEvent } from "react";
 
diff --git a/src/components/VencordSettings/UpdaterTab.tsx b/src/components/VencordSettings/UpdaterTab.tsx
index 81433960f..147c0c854 100644
--- a/src/components/VencordSettings/UpdaterTab.tsx
+++ b/src/components/VencordSettings/UpdaterTab.tsx
@@ -57,7 +57,7 @@ function withDispatcher(dispatcher: React.Dispatch<React.SetStateAction<boolean>
                 title: "Oops!",
                 body: (
                     <ErrorCard>
-                        {err.split("\n").map(line => <div>{Parser.parse(line)}</div>)}
+                        {err.split("\n").map((line, i) => <div key={i}>{Parser.parse(line)}</div>)}
                     </ErrorCard>
                 )
             });
@@ -83,7 +83,7 @@ function Changes({ updates, repo, repoPending }: CommonProps & { updates: typeof
     return (
         <Card style={{ padding: ".5em" }}>
             {updates.map(({ hash, author, message }) => (
-                <div>
+                <div key={hash}>
                     <code><HashLink {...{ repo, hash }} disabled={repoPending} /></code>
                     <span style={{
                         marginLeft: "0.5em",
diff --git a/src/plugins/betterFolders/FolderSideBar.tsx b/src/plugins/betterFolders/FolderSideBar.tsx
index 5504e1d56..56ff4f3e0 100644
--- a/src/plugins/betterFolders/FolderSideBar.tsx
+++ b/src/plugins/betterFolders/FolderSideBar.tsx
@@ -19,7 +19,7 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { LazyComponent } from "@utils/react";
 import { find, findByPropsLazy } from "@webpack";
-import { React, useStateFromStores } from "@webpack/common";
+import { useStateFromStores } from "@webpack/common";
 
 import { ExpandedGuildFolderStore, settings } from ".";
 
diff --git a/src/plugins/callTimer/index.tsx b/src/plugins/callTimer/index.tsx
index c018cc715..55c902373 100644
--- a/src/plugins/callTimer/index.tsx
+++ b/src/plugins/callTimer/index.tsx
@@ -21,7 +21,6 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { useTimer } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { React } from "@webpack/common";
 
 function formatDuration(ms: number) {
     // here be dragons (moment fucking sucks)
diff --git a/src/plugins/consoleShortcuts/index.ts b/src/plugins/consoleShortcuts/index.ts
index 1c23d60e7..e18fbad83 100644
--- a/src/plugins/consoleShortcuts/index.ts
+++ b/src/plugins/consoleShortcuts/index.ts
@@ -92,6 +92,7 @@ export default definePlugin({
                 fakeRenderWin = new WeakRef(win);
                 win.focus();
 
+                // eslint-disable-next-line react/no-deprecated
                 ReactDOM.render(React.createElement(component, props), win.document.body);
             }
         };
diff --git a/src/plugins/customRPC/index.tsx b/src/plugins/customRPC/index.tsx
index 8ed741215..8dc6f60ed 100644
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@@ -23,7 +23,7 @@ import { isTruthy } from "@utils/guards";
 import { useAwaiter } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy } from "@webpack";
-import { ApplicationAssetUtils, FluxDispatcher, Forms, GuildStore, React, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common";
+import { ApplicationAssetUtils, FluxDispatcher, Forms, GuildStore, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common";
 
 const ActivityComponent = findByCodeLazy("onOpenGameProfile");
 const ActivityClassName = findByPropsLazy("activity", "buttonColor");
diff --git a/src/plugins/emoteCloner/index.tsx b/src/plugins/emoteCloner/index.tsx
index c44731152..6b4be9818 100644
--- a/src/plugins/emoteCloner/index.tsx
+++ b/src/plugins/emoteCloner/index.tsx
@@ -205,7 +205,7 @@ function CloneModal({ data }: { data: Sticker | Emoji; }) {
                 alignItems: "center"
             }}>
                 {guilds.map(g => (
-                    <Tooltip text={g.name}>
+                    <Tooltip key={g.id} text={g.name}>
                         {({ onMouseLeave, onMouseEnter }) => (
                             <div
                                 onMouseLeave={onMouseLeave}
@@ -278,25 +278,27 @@ function buildMenuItem(type: "Emoji" | "Sticker", fetchData: () => Promisable<Om
                     const data = { t: type, ...res } as Sticker | Emoji;
                     const url = getUrl(data);
 
-                    return modalProps => (
-                        <ModalRoot {...modalProps}>
-                            <ModalHeader>
-                                <img
-                                    role="presentation"
-                                    aria-hidden
-                                    src={url}
-                                    alt=""
-                                    height={24}
-                                    width={24}
-                                    style={{ marginRight: "0.5em" }}
-                                />
-                                <Forms.FormText>Clone {data.name}</Forms.FormText>
-                            </ModalHeader>
-                            <ModalContent>
-                                <CloneModal data={data} />
-                            </ModalContent>
-                        </ModalRoot>
-                    );
+                    return function EmoteClonerModal(modalProps) {
+                        return (
+                            <ModalRoot {...modalProps}>
+                                <ModalHeader>
+                                    <img
+                                        role="presentation"
+                                        aria-hidden
+                                        src={url}
+                                        alt=""
+                                        height={24}
+                                        width={24}
+                                        style={{ marginRight: "0.5em" }}
+                                    />
+                                    <Forms.FormText>Clone {data.name}</Forms.FormText>
+                                </ModalHeader>
+                                <ModalContent>
+                                    <CloneModal data={data} />
+                                </ModalContent>
+                            </ModalRoot>
+                        );
+                    };
                 })
             }
         />
diff --git a/src/plugins/gameActivityToggle/index.tsx b/src/plugins/gameActivityToggle/index.tsx
index 735f124c5..361b0297d 100644
--- a/src/plugins/gameActivityToggle/index.tsx
+++ b/src/plugins/gameActivityToggle/index.tsx
@@ -28,7 +28,7 @@ import style from "./style.css?managed";
 const Button = findByCodeLazy("Button.Sizes.NONE,disabled:");
 
 function makeIcon(showCurrentGame?: boolean) {
-    return function () {
+    return function GameActivityToggle() {
         return (
             <svg
                 width="20"
diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index e600d737d..b441d5427 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -343,10 +343,10 @@ function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
                     ? parse(message.content)
                     : [noContent(message.attachments.length, message.embeds.length)]
                 }
-                {images.map(a => {
+                {images.map((a, i) => {
                     const { width, height } = computeWidthAndHeight(a.width, a.height);
                     return (
-                        <div>
+                        <div key={i}>
                             <img src={a.url} width={width} height={height} />
                         </div>
                     );
diff --git a/src/plugins/moreUserTags/index.tsx b/src/plugins/moreUserTags/index.tsx
index 9921bca8e..c7ea76a0b 100644
--- a/src/plugins/moreUserTags/index.tsx
+++ b/src/plugins/moreUserTags/index.tsx
@@ -111,7 +111,7 @@ function SettingsComponent(props: { setValue(v: any): void; }) {
     return (
         <Flex flexDirection="column">
             {tags.map(t => (
-                <Card style={{ padding: "1em 1em 0" }}>
+                <Card key={t.name} style={{ padding: "1em 1em 0" }}>
                     <Forms.FormTitle style={{ width: "fit-content" }}>
                         <Tooltip text={t.description}>
                             {({ onMouseEnter, onMouseLeave }) => (
diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx
index 226d000f1..3048a5c49 100644
--- a/src/plugins/mutualGroupDMs/index.tsx
+++ b/src/plugins/mutualGroupDMs/index.tsx
@@ -64,6 +64,7 @@ export default definePlugin({
     renderMutualGDMs(user: User, onClose: () => void) {
         const entries = ChannelStore.getSortedPrivateChannels().filter(c => c.isGroupDM() && c.recipients.includes(user.id)).map(c => (
             <Clickable
+                key={c.id}
                 className={ProfileListClasses.listRow}
                 onClick={() => {
                     onClose();
diff --git a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
index 629880467..04812eeff 100644
--- a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
@@ -104,6 +104,7 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
 
                                 return (
                                     <button
+                                        key={permission.id}
                                         className={cl("perms-list-item-btn")}
                                         onClick={() => selectItem(index)}
                                     >
@@ -157,7 +158,7 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
                         </div>
                         <div className={cl("perms-perms")}>
                             {Object.entries(PermissionsBits).map(([permissionName, bit]) => (
-                                <div className={cl("perms-perms-item")}>
+                                <div key={permissionName} className={cl("perms-perms-item")}>
                                     <div className={cl("perms-perms-item-icon")}>
                                         {(() => {
                                             const { permissions, overwriteAllow, overwriteDeny } = selectedItem;
diff --git a/src/plugins/permissionsViewer/components/UserPermissions.tsx b/src/plugins/permissionsViewer/components/UserPermissions.tsx
index 37d9d0f42..61d4dcb51 100644
--- a/src/plugins/permissionsViewer/components/UserPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/UserPermissions.tsx
@@ -109,7 +109,7 @@ function UserPermissionsComponent({ guild, guildMember }: { guild: Guild; guildM
             }
             defaultState={settings.store.defaultPermissionsDropdownState}
             buttons={[
-                (<Tooltip text={`Sorting by ${stns.permissionsSortOrder === PermissionsSortOrder.HighestRole ? "Highest Role" : "Lowest Role"}`}>
+                (<Tooltip key="sort" text={`Sorting by ${stns.permissionsSortOrder === PermissionsSortOrder.HighestRole ? "Highest Role" : "Lowest Role"}`}>
                     {tooltipProps => (
                         <button
                             {...tooltipProps}
@@ -133,7 +133,7 @@ function UserPermissionsComponent({ guild, guildMember }: { guild: Guild; guildM
             {userPermissions.length > 0 && (
                 <div className={classes(root, roles)}>
                     {userPermissions.map(({ permission, roleColor }) => (
-                        <div className={classes(role, rolePill, rolePillBorder)}>
+                        <div key={permission} className={classes(role, rolePill, rolePillBorder)}>
                             <div className={roleRemoveButton}>
                                 <span
                                     className={roleCircle}
diff --git a/src/plugins/pictureInPicture/index.tsx b/src/plugins/pictureInPicture/index.tsx
index 4b6f87970..cbec53706 100644
--- a/src/plugins/pictureInPicture/index.tsx
+++ b/src/plugins/pictureInPicture/index.tsx
@@ -8,7 +8,7 @@ import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { React, Tooltip } from "@webpack/common";
+import { Tooltip } from "@webpack/common";
 
 const settings = definePluginSettings({
     loop: {
diff --git a/src/plugins/platformIndicators/index.tsx b/src/plugins/platformIndicators/index.tsx
index 2972b4a46..b6b08f646 100644
--- a/src/plugins/platformIndicators/index.tsx
+++ b/src/plugins/platformIndicators/index.tsx
@@ -30,21 +30,23 @@ import { User } from "discord-types/general";
 const SessionsStore = findStoreLazy("SessionsStore");
 
 function Icon(path: string, opts?: { viewBox?: string; width?: number; height?: number; }) {
-    return ({ color, tooltip, small }: { color: string; tooltip: string; small: boolean; }) => (
-        <Tooltip text={tooltip} >
-            {(tooltipProps: any) => (
-                <svg
-                    {...tooltipProps}
-                    height={(opts?.height ?? 20) - (small ? 3 : 0)}
-                    width={(opts?.width ?? 20) - (small ? 3 : 0)}
-                    viewBox={opts?.viewBox ?? "0 0 24 24"}
-                    fill={color}
-                >
-                    <path d={path} />
-                </svg>
-            )}
-        </Tooltip>
-    );
+    return function PlatformIndicator({ color, tooltip, small }: { color: string; tooltip: string; small: boolean; }) {
+        return (
+            <Tooltip text={tooltip} >
+                {(tooltipProps: any) => (
+                    <svg
+                        {...tooltipProps}
+                        height={(opts?.height ?? 20) - (small ? 3 : 0)}
+                        width={(opts?.width ?? 20) - (small ? 3 : 0)}
+                        viewBox={opts?.viewBox ?? "0 0 24 24"}
+                        fill={color}
+                    >
+                        <path d={path} />
+                    </svg>
+                )}
+            </Tooltip>
+        );
+    };
 }
 
 const Icons = {
diff --git a/src/plugins/readAllNotificationsButton/index.tsx b/src/plugins/readAllNotificationsButton/index.tsx
index b5b0b5f82..9b1c9dfb6 100644
--- a/src/plugins/readAllNotificationsButton/index.tsx
+++ b/src/plugins/readAllNotificationsButton/index.tsx
@@ -19,7 +19,7 @@
 import { addServerListElement, removeServerListElement, ServerListRenderPosition } from "@api/ServerList";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { Button, FluxDispatcher, GuildChannelStore, GuildStore, React, ReadStateStore } from "@webpack/common";
+import { Button, FluxDispatcher, GuildChannelStore, GuildStore, ReadStateStore } from "@webpack/common";
 
 function onClick() {
     const channels: Array<any> = [];
diff --git a/src/plugins/sendTimestamps/index.tsx b/src/plugins/sendTimestamps/index.tsx
index 7904545c8..3ef4022d1 100644
--- a/src/plugins/sendTimestamps/index.tsx
+++ b/src/plugins/sendTimestamps/index.tsx
@@ -172,7 +172,7 @@ export default definePlugin({
                                     height="24"
                                     viewBox="0 0 24 24"
                                 >
-                                    <g fill="none" fill-rule="evenodd">
+                                    <g fill="none" fillRule="evenodd">
                                         <path fill="currentColor" d="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99.9-1.99 2L3 19a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7v-5z" />
                                         <rect width="24" height="24" />
                                     </g>
diff --git a/src/plugins/serverProfile/GuildProfileModal.tsx b/src/plugins/serverProfile/GuildProfileModal.tsx
index 80f0842bb..2fe4dc0c7 100644
--- a/src/plugins/serverProfile/GuildProfileModal.tsx
+++ b/src/plugins/serverProfile/GuildProfileModal.tsx
@@ -236,6 +236,7 @@ function UserList(type: "friends" | "blocked", guild: Guild, ids: string[], setC
         <ScrollerThin fade className={cl("scroller")}>
             {members.map(id =>
                 <FriendRow
+                    key={id}
                     user={UserStore.getUser(id)}
                     status={PresenceStore.getStatus(id) || "offline"}
                     onSelect={() => openUserProfile(id)}
diff --git a/src/plugins/shikiCodeblocks.desktop/components/Code.tsx b/src/plugins/shikiCodeblocks.desktop/components/Code.tsx
index ce6a70584..e151df20d 100644
--- a/src/plugins/shikiCodeblocks.desktop/components/Code.tsx
+++ b/src/plugins/shikiCodeblocks.desktop/components/Code.tsx
@@ -46,7 +46,7 @@ export const Code = ({
                 .split("\n")
                 .map((line, i) => <span key={i} dangerouslySetInnerHTML={{ __html: line }} />);
         } catch {
-            lines = content.split("\n").map(line => <span>{line}</span>);
+            lines = content.split("\n").map((line, i) => <span key={i}>{line}</span>);
         }
     } else {
         const renderTokens =
@@ -55,11 +55,11 @@ export const Code = ({
                 .split("\n")
                 .map(line => [{ color: theme.plainColor, content: line } as IThemedToken]);
 
-        lines = renderTokens.map(line => {
+        lines = renderTokens.map((line, i) => {
             // [Cynthia] this makes it so when you highlight the codeblock
             // empty lines are also selected and copied when you Ctrl+C.
             if (line.length === 0) {
-                return <span>{"\n"}</span>;
+                return <span key={i}>{"\n"}</span>;
             }
 
             return (
diff --git a/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx b/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx
index dd1401939..e14171e58 100644
--- a/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx
+++ b/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx
@@ -18,7 +18,7 @@
 
 import ErrorBoundary from "@components/ErrorBoundary";
 import { useAwaiter, useIntersection } from "@utils/react";
-import { hljs, React } from "@webpack/common";
+import { hljs } from "@webpack/common";
 
 import { resolveLang } from "../api/languages";
 import { shiki } from "../api/shiki";
diff --git a/src/plugins/showConnections/index.tsx b/src/plugins/showConnections/index.tsx
index 948bdb83b..e7963a764 100644
--- a/src/plugins/showConnections/index.tsx
+++ b/src/plugins/showConnections/index.tsx
@@ -105,7 +105,7 @@ function ConnectionsComponent({ id, theme }: { id: string, theme: string; }) {
                 gap: getSpacingPx(settings.store.iconSpacing),
                 flexWrap: "wrap"
             }}>
-                {connections.map(connection => <CompactConnectionComponent connection={connection} theme={theme} />)}
+                {connections.map(connection => <CompactConnectionComponent connection={connection} theme={theme} key={connection.id} />)}
             </Flex>
         </Section>
     );
diff --git a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
index 26efce1d8..ebd42580e 100644
--- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
+++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
@@ -275,7 +275,7 @@ function HiddenChannelLockScreen({ channel }: { channel: ExtendedChannel; }) {
                     <div className="shc-lock-screen-tags-container">
                         <Text variant="text-lg/bold">Available tags:</Text>
                         <div className="shc-lock-screen-tags">
-                            {availableTags.map(tag => <TagComponent tag={tag} />)}
+                            {availableTags.map(tag => <TagComponent tag={tag} key={tag.id} />)}
                         </div>
                     </div>
                 }
diff --git a/src/plugins/silentMessageToggle/index.tsx b/src/plugins/silentMessageToggle/index.tsx
index a1ee8de89..6d2b9c3b6 100644
--- a/src/plugins/silentMessageToggle/index.tsx
+++ b/src/plugins/silentMessageToggle/index.tsx
@@ -88,7 +88,7 @@ function SilentMessageToggle(chatBoxProps: {
                                 <g fill="currentColor">
                                     <path d="M18 10.7101C15.1085 9.84957 13 7.17102 13 4C13 3.69264 13.0198 3.3899 13.0582 3.093C12.7147 3.03189 12.3611 3 12 3C8.686 3 6 5.686 6 9V14C6 15.657 4.656 17 3 17V18H21V17C19.344 17 18 15.657 18 14V10.7101ZM8.55493 19C9.24793 20.19 10.5239 21 11.9999 21C13.4759 21 14.7519 20.19 15.4449 19H8.55493Z" />
                                     <path d="M18.2624 5.50209L21 2.5V1H16.0349V2.49791H18.476L16 5.61088V7H21V5.50209H18.2624Z" />
-                                    {!enabled && <line x1="22" y1="2" x2="2" y2="22" stroke="var(--red-500)" stroke-width="2.5" />}
+                                    {!enabled && <line x1="22" y1="2" x2="2" y2="22" stroke="var(--red-500)" strokeWidth="2.5" />}
                                 </g>
                             </svg>
                         </div>
diff --git a/src/plugins/silentTyping/index.tsx b/src/plugins/silentTyping/index.tsx
index dae7ad4c9..134cfa677 100644
--- a/src/plugins/silentTyping/index.tsx
+++ b/src/plugins/silentTyping/index.tsx
@@ -21,7 +21,7 @@ import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { Button, ButtonLooks, ButtonWrapperClasses, FluxDispatcher, React, Tooltip } from "@webpack/common";
+import { Button, ButtonLooks, ButtonWrapperClasses, FluxDispatcher, Tooltip } from "@webpack/common";
 
 const settings = definePluginSettings({
     showIcon: {
@@ -62,7 +62,7 @@ function SilentTypingToggle(chatBoxProps: {
                         <div className={ButtonWrapperClasses.buttonWrapper}>
                             <svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
                                 <path fill="currentColor" d="M528 448H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h480c26.51 0 48 21.49 48 48v288c0 26.51-21.49 48-48 48zM128 180v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm288 0v-40c0-6.627-5.373-12-12-12H172c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h232c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12z" />
-                                {isEnabled && <path d="M13 432L590 48" stroke="var(--red-500)" stroke-width="72" stroke-linecap="round" />}
+                                {isEnabled && <path d="M13 432L590 48" stroke="var(--red-500)" strokeWidth="72" strokeLinecap="round" />}
                             </svg>
                         </div>
                     </Button>
diff --git a/src/plugins/spotifyControls/PlayerComponent.tsx b/src/plugins/spotifyControls/PlayerComponent.tsx
index 43c499ab7..64ee52fc1 100644
--- a/src/plugins/spotifyControls/PlayerComponent.tsx
+++ b/src/plugins/spotifyControls/PlayerComponent.tsx
@@ -38,19 +38,21 @@ function msToHuman(ms: number) {
 }
 
 function Svg(path: string, label: string) {
-    return () => (
-        <svg
-            className={classes(cl("button-icon"), cl(label))}
-            height="24"
-            width="24"
-            viewBox="0 0 24 24"
-            fill="currentColor"
-            aria-label={label}
-            focusable={false}
-        >
-            <path d={path} />
-        </svg>
-    );
+    return function Icon() {
+        return (
+            <svg
+                className={classes(cl("button-icon"), cl(label))}
+                height="24"
+                width="24"
+                viewBox="0 0 24 24"
+                fill="currentColor"
+                aria-label={label}
+                focusable={false}
+            >
+                <path d={path} />
+            </svg>
+        );
+    };
 }
 
 // KraXen's icons :yesyes:
diff --git a/src/plugins/startupTimings/StartupTimingPage.tsx b/src/plugins/startupTimings/StartupTimingPage.tsx
index c8cf51da2..0950b0688 100644
--- a/src/plugins/startupTimings/StartupTimingPage.tsx
+++ b/src/plugins/startupTimings/StartupTimingPage.tsx
@@ -120,8 +120,8 @@ function ServerTrace({ trace }: ServerTraceProps) {
         <Forms.FormSection title="Server Trace" tag="h2">
             <code>
                 <Flex flexDirection="column" style={{ color: "var(--header-primary)", gap: 5, userSelect: "text" }}>
-                    {lines.map(line => (
-                        <span>{line}</span>
+                    {lines.map((line, i) => (
+                        <span key={i}>{line}</span>
                     ))}
                 </Flex>
             </code>
diff --git a/src/plugins/typingTweaks/index.tsx b/src/plugins/typingTweaks/index.tsx
index 62bcd41f6..ccb863ce7 100644
--- a/src/plugins/typingTweaks/index.tsx
+++ b/src/plugins/typingTweaks/index.tsx
@@ -21,7 +21,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { openUserProfile } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
-import { Avatar, GuildMemberStore, React, RelationshipStore } from "@webpack/common";
+import { Avatar, GuildMemberStore, RelationshipStore } from "@webpack/common";
 import { User } from "discord-types/general";
 
 const settings = definePluginSettings({
@@ -135,7 +135,7 @@ export default definePlugin({
 
         return children.map(c =>
             c.type === "strong"
-                ? <TypingUser {...props} user={users[element++]} />
+                ? <TypingUser {...props} user={users[element++]} key={users[element].id} />
                 : c
         );
     }
diff --git a/src/utils/react.tsx b/src/utils/react.tsx
index 0181c95b8..43a4d121e 100644
--- a/src/utils/react.tsx
+++ b/src/utils/react.tsx
@@ -133,7 +133,7 @@ export function useForceUpdater(withDep?: true) {
 
 export function LazyComponent<T extends object = any>(factory: () => React.ComponentType<T>, attempts = 5) {
     const get = makeLazy(factory, attempts);
-    return (props: T) => {
+    return function Lazy(props: T) {
         const Component = get() ?? NoopComponent;
         return <Component {...props} />;
     };

From 584885acf5a650afdff145b3f6bac971995d4a2c Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 31 Oct 2023 23:56:13 +0100
Subject: [PATCH 144/632] [skip ci] Revert "add react linting"

doesnt work properly :(

This reverts commit 18fdc33ee7d1f60d58645c2a98f402988b97e996.
---
 .eslintrc.json                                |  12 +-
 package.json                                  |   1 -
 pnpm-lock.yaml                                | 768 ------------------
 .../Notifications/NotificationComponent.tsx   |   2 +-
 src/components/ErrorBoundary.tsx              |   5 +-
 src/components/Heart.tsx                      |   2 +-
 src/components/Icons.tsx                      |   2 +-
 src/components/PluginSettings/index.tsx       |  20 +-
 .../VencordSettings/PatchHelperTab.tsx        |   4 +-
 src/components/VencordSettings/ThemesTab.tsx  |   2 +-
 src/components/VencordSettings/UpdaterTab.tsx |   4 +-
 src/plugins/betterFolders/FolderSideBar.tsx   |   2 +-
 src/plugins/callTimer/index.tsx               |   1 +
 src/plugins/consoleShortcuts/index.ts         |   1 -
 src/plugins/customRPC/index.tsx               |   2 +-
 src/plugins/emoteCloner/index.tsx             |  42 +-
 src/plugins/gameActivityToggle/index.tsx      |   2 +-
 src/plugins/messageLinkEmbeds/index.tsx       |   4 +-
 src/plugins/moreUserTags/index.tsx            |   2 +-
 src/plugins/mutualGroupDMs/index.tsx          |   1 -
 .../components/RolesAndUsersPermissions.tsx   |   3 +-
 .../components/UserPermissions.tsx            |   4 +-
 src/plugins/pictureInPicture/index.tsx        |   2 +-
 src/plugins/platformIndicators/index.tsx      |  32 +-
 .../readAllNotificationsButton/index.tsx      |   2 +-
 src/plugins/sendTimestamps/index.tsx          |   2 +-
 .../serverProfile/GuildProfileModal.tsx       |   1 -
 .../components/Code.tsx                       |   6 +-
 .../components/Highlighter.tsx                |   2 +-
 src/plugins/showConnections/index.tsx         |   2 +-
 .../components/HiddenChannelLockScreen.tsx    |   2 +-
 src/plugins/silentMessageToggle/index.tsx     |   2 +-
 src/plugins/silentTyping/index.tsx            |   4 +-
 .../spotifyControls/PlayerComponent.tsx       |  28 +-
 .../startupTimings/StartupTimingPage.tsx      |   4 +-
 src/plugins/typingTweaks/index.tsx            |   4 +-
 src/utils/react.tsx                           |   2 +-
 37 files changed, 97 insertions(+), 884 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 5d1b7c763..2ee24e8b3 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -9,7 +9,6 @@
         "unused-imports",
         "path-alias"
     ],
-    "extends": ["plugin:react/recommended", "plugin:react/jsx-runtime"],
     "settings": {
         "import/resolver": {
             "alias": {
@@ -21,9 +20,6 @@
                     ["@components", "./src/components"]
                 ]
             }
-        },
-        "react": {
-            "version": "18.2"
         }
     },
     "rules": {
@@ -97,12 +93,6 @@
 
         "unused-imports/no-unused-imports": "error",
 
-        "path-alias/no-relative": "error",
-
-        "react/no-unescaped-entities": "off",
-        "react/prop-types": "off",
-
-        /* we dont target ancient browsers */
-        "react/jsx-no-target-blank": "off"
+        "path-alias/no-relative": "error"
     }
 }
diff --git a/package.json b/package.json
index ec23a4cb0..da8fc449a 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,6 @@
         "eslint": "^8.46.0",
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-path-alias": "^1.0.0",
-        "eslint-plugin-react": "^7.33.2",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-unused-imports": "^2.0.0",
         "highlight.js": "10.6.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2eb545560..be7befab3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -87,9 +87,6 @@ devDependencies:
   eslint-plugin-path-alias:
     specifier: ^1.0.0
     version: 1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0)
-  eslint-plugin-react:
-    specifier: ^7.33.2
-    version: 7.33.2(eslint@8.46.0)
   eslint-plugin-simple-import-sort:
     specifier: ^10.0.0
     version: 10.0.0(eslint@8.46.0)
@@ -858,24 +855,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /array-buffer-byte-length@1.0.0:
-    resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==}
-    dependencies:
-      call-bind: 1.0.5
-      is-array-buffer: 3.0.2
-    dev: true
-
-  /array-includes@3.1.7:
-    resolution: {integrity: sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-      get-intrinsic: 1.2.2
-      is-string: 1.0.7
-    dev: true
-
   /array-union@2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
@@ -886,49 +865,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /array.prototype.flat@1.3.2:
-    resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-      es-shim-unscopables: 1.0.2
-    dev: true
-
-  /array.prototype.flatmap@1.3.2:
-    resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-      es-shim-unscopables: 1.0.2
-    dev: true
-
-  /array.prototype.tosorted@1.1.2:
-    resolution: {integrity: sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-      es-shim-unscopables: 1.0.2
-      get-intrinsic: 1.2.2
-    dev: true
-
-  /arraybuffer.prototype.slice@1.0.2:
-    resolution: {integrity: sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      array-buffer-byte-length: 1.0.0
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-      get-intrinsic: 1.2.2
-      is-array-buffer: 3.0.2
-      is-shared-array-buffer: 1.0.2
-    dev: true
-
   /arrify@1.0.1:
     resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
     engines: {node: '>=0.10.0'}
@@ -948,23 +884,12 @@ packages:
     resolution: {integrity: sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==}
     dev: true
 
-  /asynciterator.prototype@1.0.0:
-    resolution: {integrity: sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==}
-    dependencies:
-      has-symbols: 1.0.3
-    dev: true
-
   /atob@2.1.2:
     resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
     engines: {node: '>= 4.5.0'}
     hasBin: true
     dev: true
 
-  /available-typed-arrays@1.0.5:
-    resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
   /balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
     dev: true
@@ -1042,14 +967,6 @@ packages:
       unset-value: 1.0.0
     dev: true
 
-  /call-bind@1.0.5:
-    resolution: {integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==}
-    dependencies:
-      function-bind: 1.1.2
-      get-intrinsic: 1.2.2
-      set-function-length: 1.1.1
-    dev: true
-
   /callsites@3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
@@ -1259,24 +1176,6 @@ packages:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
     dev: true
 
-  /define-data-property@1.1.1:
-    resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      get-intrinsic: 1.2.2
-      gopd: 1.0.1
-      has-property-descriptors: 1.0.1
-    dev: true
-
-  /define-properties@1.2.1:
-    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      define-data-property: 1.1.1
-      has-property-descriptors: 1.0.1
-      object-keys: 1.1.1
-    dev: true
-
   /define-property@0.2.5:
     resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
     engines: {node: '>=0.10.0'}
@@ -1322,13 +1221,6 @@ packages:
       moment: 2.29.4
     dev: true
 
-  /doctrine@2.1.0:
-    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      esutils: 2.0.3
-    dev: true
-
   /doctrine@3.0.0:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
     engines: {node: '>=6.0.0'}
@@ -1352,94 +1244,6 @@ packages:
       is-arrayish: 0.2.1
     dev: true
 
-  /es-abstract@1.22.3:
-    resolution: {integrity: sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      array-buffer-byte-length: 1.0.0
-      arraybuffer.prototype.slice: 1.0.2
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.5
-      es-set-tostringtag: 2.0.2
-      es-to-primitive: 1.2.1
-      function.prototype.name: 1.1.6
-      get-intrinsic: 1.2.2
-      get-symbol-description: 1.0.0
-      globalthis: 1.0.3
-      gopd: 1.0.1
-      has-property-descriptors: 1.0.1
-      has-proto: 1.0.1
-      has-symbols: 1.0.3
-      hasown: 2.0.0
-      internal-slot: 1.0.6
-      is-array-buffer: 3.0.2
-      is-callable: 1.2.7
-      is-negative-zero: 2.0.2
-      is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.2
-      is-string: 1.0.7
-      is-typed-array: 1.1.12
-      is-weakref: 1.0.2
-      object-inspect: 1.13.1
-      object-keys: 1.1.1
-      object.assign: 4.1.4
-      regexp.prototype.flags: 1.5.1
-      safe-array-concat: 1.0.1
-      safe-regex-test: 1.0.0
-      string.prototype.trim: 1.2.8
-      string.prototype.trimend: 1.0.7
-      string.prototype.trimstart: 1.0.7
-      typed-array-buffer: 1.0.0
-      typed-array-byte-length: 1.0.0
-      typed-array-byte-offset: 1.0.0
-      typed-array-length: 1.0.4
-      unbox-primitive: 1.0.2
-      which-typed-array: 1.1.13
-    dev: true
-
-  /es-iterator-helpers@1.0.15:
-    resolution: {integrity: sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==}
-    dependencies:
-      asynciterator.prototype: 1.0.0
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-      es-set-tostringtag: 2.0.2
-      function-bind: 1.1.1
-      get-intrinsic: 1.2.2
-      globalthis: 1.0.3
-      has-property-descriptors: 1.0.1
-      has-proto: 1.0.1
-      has-symbols: 1.0.3
-      internal-slot: 1.0.6
-      iterator.prototype: 1.1.2
-      safe-array-concat: 1.0.1
-    dev: true
-
-  /es-set-tostringtag@2.0.2:
-    resolution: {integrity: sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      get-intrinsic: 1.2.2
-      has-tostringtag: 1.0.0
-      hasown: 2.0.0
-    dev: true
-
-  /es-shim-unscopables@1.0.2:
-    resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
-    dependencies:
-      hasown: 2.0.0
-    dev: true
-
-  /es-to-primitive@1.2.1:
-    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      is-callable: 1.2.7
-      is-date-object: 1.0.5
-      is-symbol: 1.0.4
-    dev: true
-
   /esbuild-android-64@0.15.18:
     resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==}
     engines: {node: '>=12'}
@@ -1720,34 +1524,6 @@ packages:
     dev: true
     patched: true
 
-  /eslint-plugin-react@7.33.2(eslint@8.46.0):
-    resolution: {integrity: sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-    peerDependenciesMeta:
-      eslint:
-        optional: true
-    dependencies:
-      array-includes: 3.1.7
-      array.prototype.flatmap: 1.3.2
-      array.prototype.tosorted: 1.1.2
-      doctrine: 2.1.0
-      es-iterator-helpers: 1.0.15
-      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
-      estraverse: 5.3.0
-      jsx-ast-utils: 3.3.5
-      minimatch: 3.1.2
-      object.entries: 1.1.7
-      object.fromentries: 2.0.7
-      object.hasown: 1.1.3
-      object.values: 1.1.7
-      prop-types: 15.8.1
-      resolve: 2.0.0-next.5
-      semver: 6.3.1
-      string.prototype.matchall: 4.0.10
-    dev: true
-
   /eslint-plugin-simple-header@1.0.2:
     resolution: {integrity: sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA==}
     dev: false
@@ -2015,12 +1791,6 @@ packages:
     resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
     dev: true
 
-  /for-each@0.3.3:
-    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
-    dependencies:
-      is-callable: 1.2.7
-    dev: true
-
   /for-in@1.0.2:
     resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
     engines: {node: '>=0.10.0'}
@@ -2053,38 +1823,11 @@ packages:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
     dev: true
 
-  /function-bind@1.1.2:
-    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
-    dev: true
-
-  /function.prototype.name@1.1.6:
-    resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-      functions-have-names: 1.2.3
-    dev: true
-
-  /functions-have-names@1.2.3:
-    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
-    dev: true
-
   /get-caller-file@2.0.5:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
     dev: true
 
-  /get-intrinsic@1.2.2:
-    resolution: {integrity: sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==}
-    dependencies:
-      function-bind: 1.1.2
-      has-proto: 1.0.1
-      has-symbols: 1.0.3
-      hasown: 2.0.0
-    dev: true
-
   /get-stream@5.2.0:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
     engines: {node: '>=8'}
@@ -2092,14 +1835,6 @@ packages:
       pump: 3.0.0
     dev: true
 
-  /get-symbol-description@1.0.0:
-    resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      get-intrinsic: 1.2.2
-    dev: true
-
   /get-tsconfig@4.5.0:
     resolution: {integrity: sha512-MjhiaIWCJ1sAU4pIQ5i5OfOuHHxVo1oYeNsWTON7jxYkod8pHocXeh+SSbmu5OZZZK73B6cbJ2XADzXehLyovQ==}
     dev: true
@@ -2157,13 +1892,6 @@ packages:
       type-fest: 0.20.2
     dev: true
 
-  /globalthis@1.0.3:
-    resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      define-properties: 1.2.1
-    dev: true
-
   /globby@11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
     engines: {node: '>=10'}
@@ -2180,12 +1908,6 @@ packages:
     resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
     dev: true
 
-  /gopd@1.0.1:
-    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
-    dependencies:
-      get-intrinsic: 1.2.2
-    dev: true
-
   /graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
     dev: true
@@ -2203,10 +1925,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /has-bigints@1.0.2:
-    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
-    dev: true
-
   /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
@@ -2217,29 +1935,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /has-property-descriptors@1.0.1:
-    resolution: {integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==}
-    dependencies:
-      get-intrinsic: 1.2.2
-    dev: true
-
-  /has-proto@1.0.1:
-    resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /has-symbols@1.0.3:
-    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /has-tostringtag@1.0.0:
-    resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-symbols: 1.0.3
-    dev: true
-
   /has-value@0.3.1:
     resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
     engines: {node: '>=0.10.0'}
@@ -2278,13 +1973,6 @@ packages:
       function-bind: 1.1.1
     dev: true
 
-  /hasown@2.0.0:
-    resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      function-bind: 1.1.2
-    dev: true
-
   /highlight.js@10.6.0:
     resolution: {integrity: sha512-8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ==}
     dev: true
@@ -2362,15 +2050,6 @@ packages:
     resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
     dev: true
 
-  /internal-slot@1.0.6:
-    resolution: {integrity: sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      get-intrinsic: 1.2.2
-      hasown: 2.0.0
-      side-channel: 1.0.4
-    dev: true
-
   /is-accessor-descriptor@0.1.6:
     resolution: {integrity: sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==}
     engines: {node: '>=0.10.0'}
@@ -2385,60 +2064,20 @@ packages:
       kind-of: 6.0.3
     dev: true
 
-  /is-array-buffer@3.0.2:
-    resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
-    dependencies:
-      call-bind: 1.0.5
-      get-intrinsic: 1.2.2
-      is-typed-array: 1.1.12
-    dev: true
-
   /is-arrayish@0.2.1:
     resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
     dev: true
 
-  /is-async-function@2.0.0:
-    resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /is-bigint@1.0.4:
-    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
-    dependencies:
-      has-bigints: 1.0.2
-    dev: true
-
-  /is-boolean-object@1.1.2:
-    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      has-tostringtag: 1.0.0
-    dev: true
-
   /is-buffer@1.1.6:
     resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
     dev: true
 
-  /is-callable@1.2.7:
-    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
   /is-core-module@2.12.0:
     resolution: {integrity: sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==}
     dependencies:
       has: 1.0.3
     dev: true
 
-  /is-core-module@2.13.1:
-    resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==}
-    dependencies:
-      hasown: 2.0.0
-    dev: true
-
   /is-data-descriptor@0.1.4:
     resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==}
     engines: {node: '>=0.10.0'}
@@ -2453,13 +2092,6 @@ packages:
       kind-of: 6.0.3
     dev: true
 
-  /is-date-object@1.0.5:
-    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-tostringtag: 1.0.0
-    dev: true
-
   /is-descriptor@0.1.6:
     resolution: {integrity: sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==}
     engines: {node: '>=0.10.0'}
@@ -2495,24 +2127,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-finalizationregistry@1.0.2:
-    resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==}
-    dependencies:
-      call-bind: 1.0.5
-    dev: true
-
   /is-fullwidth-code-point@3.0.0:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
     dev: true
 
-  /is-generator-function@1.0.10:
-    resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-tostringtag: 1.0.0
-    dev: true
-
   /is-glob@4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
@@ -2520,22 +2139,6 @@ packages:
       is-extglob: 2.1.1
     dev: true
 
-  /is-map@2.0.2:
-    resolution: {integrity: sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==}
-    dev: true
-
-  /is-negative-zero@2.0.2:
-    resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /is-number-object@1.0.7:
-    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-tostringtag: 1.0.0
-    dev: true
-
   /is-number@3.0.0:
     resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==}
     engines: {node: '>=0.10.0'}
@@ -2570,62 +2173,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-regex@1.1.4:
-    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /is-set@2.0.2:
-    resolution: {integrity: sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==}
-    dev: true
-
-  /is-shared-array-buffer@1.0.2:
-    resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
-    dependencies:
-      call-bind: 1.0.5
-    dev: true
-
-  /is-string@1.0.7:
-    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /is-symbol@1.0.4:
-    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-symbols: 1.0.3
-    dev: true
-
-  /is-typed-array@1.1.12:
-    resolution: {integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      which-typed-array: 1.1.13
-    dev: true
-
-  /is-weakmap@2.0.1:
-    resolution: {integrity: sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==}
-    dev: true
-
-  /is-weakref@1.0.2:
-    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
-    dependencies:
-      call-bind: 1.0.5
-    dev: true
-
-  /is-weakset@2.0.2:
-    resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==}
-    dependencies:
-      call-bind: 1.0.5
-      get-intrinsic: 1.2.2
-    dev: true
-
   /is-windows@1.0.2:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
     engines: {node: '>=0.10.0'}
@@ -2635,10 +2182,6 @@ packages:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
     dev: true
 
-  /isarray@2.0.5:
-    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
-    dev: true
-
   /isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
     dev: true
@@ -2655,16 +2198,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /iterator.prototype@1.1.2:
-    resolution: {integrity: sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==}
-    dependencies:
-      define-properties: 1.2.1
-      get-intrinsic: 1.2.2
-      has-symbols: 1.0.3
-      reflect.getprototypeof: 1.0.4
-      set-function-name: 2.0.1
-    dev: true
-
   /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
     dev: true
@@ -2696,16 +2229,6 @@ packages:
     resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
     dev: false
 
-  /jsx-ast-utils@3.3.5:
-    resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
-    engines: {node: '>=4.0'}
-    dependencies:
-      array-includes: 3.1.7
-      array.prototype.flat: 1.3.2
-      object.assign: 4.1.4
-      object.values: 1.1.7
-    dev: true
-
   /jszip@2.7.0:
     resolution: {integrity: sha512-JIsRKRVC3gTRo2vM4Wy9WBC3TRcfnIZU8k65Phi3izkvPH975FowRYtKGT6PxevA0XnJ/yO8b0QwV0ydVyQwfw==}
     dependencies:
@@ -2774,13 +2297,6 @@ packages:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
 
-  /loose-envify@1.4.0:
-    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
-    hasBin: true
-    dependencies:
-      js-tokens: 4.0.0
-    dev: true
-
   /lru-cache@6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
@@ -2976,11 +2492,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /object-assign@4.1.1:
-    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /object-copy@0.1.0:
     resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
     engines: {node: '>=0.10.0'}
@@ -2990,15 +2501,6 @@ packages:
       kind-of: 3.2.2
     dev: true
 
-  /object-inspect@1.13.1:
-    resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
-    dev: true
-
-  /object-keys@1.1.1:
-    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
   /object-visit@1.0.1:
     resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
     engines: {node: '>=0.10.0'}
@@ -3006,41 +2508,6 @@ packages:
       isobject: 3.0.1
     dev: true
 
-  /object.assign@4.1.4:
-    resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      has-symbols: 1.0.3
-      object-keys: 1.1.1
-    dev: true
-
-  /object.entries@1.1.7:
-    resolution: {integrity: sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-    dev: true
-
-  /object.fromentries@2.0.7:
-    resolution: {integrity: sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-    dev: true
-
-  /object.hasown@1.1.3:
-    resolution: {integrity: sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==}
-    dependencies:
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-    dev: true
-
   /object.pick@1.3.0:
     resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
     engines: {node: '>=0.10.0'}
@@ -3048,15 +2515,6 @@ packages:
       isobject: 3.0.1
     dev: true
 
-  /object.values@1.1.7:
-    resolution: {integrity: sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-    dev: true
-
   /once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
     dependencies:
@@ -3219,14 +2677,6 @@ packages:
     engines: {node: '>=0.4.0'}
     dev: true
 
-  /prop-types@15.8.1:
-    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
-    dependencies:
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-      react-is: 16.13.1
-    dev: true
-
   /proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
     dev: true
@@ -3285,10 +2735,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /react-is@16.13.1:
-    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
-    dev: true
-
   /read-pkg-up@7.0.1:
     resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
     engines: {node: '>=8'}
@@ -3325,18 +2771,6 @@ packages:
       strip-indent: 3.0.0
     dev: true
 
-  /reflect.getprototypeof@1.0.4:
-    resolution: {integrity: sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-      get-intrinsic: 1.2.2
-      globalthis: 1.0.3
-      which-builtin-type: 1.1.3
-    dev: true
-
   /regex-not@1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -3345,15 +2779,6 @@ packages:
       safe-regex: 1.1.0
     dev: true
 
-  /regexp.prototype.flags@1.5.1:
-    resolution: {integrity: sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      set-function-name: 2.0.1
-    dev: true
-
   /require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -3388,15 +2813,6 @@ packages:
       supports-preserve-symlinks-flag: 1.0.0
     dev: true
 
-  /resolve@2.0.0-next.5:
-    resolution: {integrity: sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==}
-    hasBin: true
-    dependencies:
-      is-core-module: 2.13.1
-      path-parse: 1.0.7
-      supports-preserve-symlinks-flag: 1.0.0
-    dev: true
-
   /ret@0.1.15:
     resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
     engines: {node: '>=0.12'}
@@ -3420,28 +2836,10 @@ packages:
       queue-microtask: 1.2.3
     dev: true
 
-  /safe-array-concat@1.0.1:
-    resolution: {integrity: sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==}
-    engines: {node: '>=0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      get-intrinsic: 1.2.2
-      has-symbols: 1.0.3
-      isarray: 2.0.5
-    dev: true
-
   /safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
     dev: true
 
-  /safe-regex-test@1.0.0:
-    resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
-    dependencies:
-      call-bind: 1.0.5
-      get-intrinsic: 1.2.2
-      is-regex: 1.1.4
-    dev: true
-
   /safe-regex@1.1.0:
     resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==}
     dependencies:
@@ -3453,11 +2851,6 @@ packages:
     hasBin: true
     dev: true
 
-  /semver@6.3.1:
-    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
-    hasBin: true
-    dev: true
-
   /semver@7.5.0:
     resolution: {integrity: sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==}
     engines: {node: '>=10'}
@@ -3466,25 +2859,6 @@ packages:
       lru-cache: 6.0.0
     dev: true
 
-  /set-function-length@1.1.1:
-    resolution: {integrity: sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      define-data-property: 1.1.1
-      get-intrinsic: 1.2.2
-      gopd: 1.0.1
-      has-property-descriptors: 1.0.1
-    dev: true
-
-  /set-function-name@2.0.1:
-    resolution: {integrity: sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      define-data-property: 1.1.1
-      functions-have-names: 1.2.3
-      has-property-descriptors: 1.0.1
-    dev: true
-
   /set-value@2.0.1:
     resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
     engines: {node: '>=0.10.0'}
@@ -3507,14 +2881,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /side-channel@1.0.4:
-    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
-    dependencies:
-      call-bind: 1.0.5
-      get-intrinsic: 1.2.2
-      object-inspect: 1.13.1
-    dev: true
-
   /signal-exit@4.0.1:
     resolution: {integrity: sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw==}
     engines: {node: '>=14'}
@@ -3640,45 +3006,6 @@ packages:
       strip-ansi: 6.0.1
     dev: true
 
-  /string.prototype.matchall@4.0.10:
-    resolution: {integrity: sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-      get-intrinsic: 1.2.2
-      has-symbols: 1.0.3
-      internal-slot: 1.0.6
-      regexp.prototype.flags: 1.5.1
-      set-function-name: 2.0.1
-      side-channel: 1.0.4
-    dev: true
-
-  /string.prototype.trim@1.2.8:
-    resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-    dev: true
-
-  /string.prototype.trimend@1.0.7:
-    resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-    dev: true
-
-  /string.prototype.trimstart@1.0.7:
-    resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==}
-    dependencies:
-      call-bind: 1.0.5
-      define-properties: 1.2.1
-      es-abstract: 1.22.3
-    dev: true
-
   /string_decoder@1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
     dependencies:
@@ -3936,59 +3263,12 @@ packages:
     engines: {node: '>=14.16'}
     dev: true
 
-  /typed-array-buffer@1.0.0:
-    resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      get-intrinsic: 1.2.2
-      is-typed-array: 1.1.12
-    dev: true
-
-  /typed-array-byte-length@1.0.0:
-    resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.5
-      for-each: 0.3.3
-      has-proto: 1.0.1
-      is-typed-array: 1.1.12
-    dev: true
-
-  /typed-array-byte-offset@1.0.0:
-    resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.5
-      for-each: 0.3.3
-      has-proto: 1.0.1
-      is-typed-array: 1.1.12
-    dev: true
-
-  /typed-array-length@1.0.4:
-    resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
-    dependencies:
-      call-bind: 1.0.5
-      for-each: 0.3.3
-      is-typed-array: 1.1.12
-    dev: true
-
   /typescript@5.0.4:
     resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==}
     engines: {node: '>=12.20'}
     hasBin: true
     dev: true
 
-  /unbox-primitive@1.0.2:
-    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
-    dependencies:
-      call-bind: 1.0.5
-      has-bigints: 1.0.2
-      has-symbols: 1.0.3
-      which-boxed-primitive: 1.0.2
-    dev: true
-
   /unbzip2-stream@1.4.3:
     resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
     dependencies:
@@ -4068,54 +3348,6 @@ packages:
       webidl-conversions: 3.0.1
     dev: true
 
-  /which-boxed-primitive@1.0.2:
-    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
-    dependencies:
-      is-bigint: 1.0.4
-      is-boolean-object: 1.1.2
-      is-number-object: 1.0.7
-      is-string: 1.0.7
-      is-symbol: 1.0.4
-    dev: true
-
-  /which-builtin-type@1.1.3:
-    resolution: {integrity: sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      function.prototype.name: 1.1.6
-      has-tostringtag: 1.0.0
-      is-async-function: 2.0.0
-      is-date-object: 1.0.5
-      is-finalizationregistry: 1.0.2
-      is-generator-function: 1.0.10
-      is-regex: 1.1.4
-      is-weakref: 1.0.2
-      isarray: 2.0.5
-      which-boxed-primitive: 1.0.2
-      which-collection: 1.0.1
-      which-typed-array: 1.1.13
-    dev: true
-
-  /which-collection@1.0.1:
-    resolution: {integrity: sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==}
-    dependencies:
-      is-map: 2.0.2
-      is-set: 2.0.2
-      is-weakmap: 2.0.1
-      is-weakset: 2.0.2
-    dev: true
-
-  /which-typed-array@1.1.13:
-    resolution: {integrity: sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.5
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-tostringtag: 1.0.0
-    dev: true
-
   /which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
     hasBin: true
diff --git a/src/api/Notifications/NotificationComponent.tsx b/src/api/Notifications/NotificationComponent.tsx
index 71c40c736..caa4b64ef 100644
--- a/src/api/Notifications/NotificationComponent.tsx
+++ b/src/api/Notifications/NotificationComponent.tsx
@@ -21,7 +21,7 @@ import "./styles.css";
 import { useSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { classes } from "@utils/misc";
-import { useEffect, useMemo, useState, useStateFromStores, WindowStore } from "@webpack/common";
+import { React, useEffect, useMemo, useState, useStateFromStores, WindowStore } from "@webpack/common";
 
 import { NotificationData } from "./Notifications";
 
diff --git a/src/components/ErrorBoundary.tsx b/src/components/ErrorBoundary.tsx
index 02e0e939b..ea2e02b51 100644
--- a/src/components/ErrorBoundary.tsx
+++ b/src/components/ErrorBoundary.tsx
@@ -80,7 +80,10 @@ const ErrorBoundary = LazyComponent(() => {
             if (this.props.noop) return null;
 
             if (this.props.fallback)
-                return <this.props.fallback {...this.state}>{this.props.children}</this.props.fallback>;
+                return <this.props.fallback
+                    children={this.props.children}
+                    {...this.state}
+                />;
 
             const msg = this.props.message || "An error occurred while rendering this Component. More info can be found below and in your console.";
 
diff --git a/src/components/Heart.tsx b/src/components/Heart.tsx
index 017b41645..b33b83643 100644
--- a/src/components/Heart.tsx
+++ b/src/components/Heart.tsx
@@ -27,7 +27,7 @@ export function Heart() {
         >
             <path
                 fill="#db61a2"
-                fillRule="evenodd"
+                fill-rule="evenodd"
                 d="M4.25 2.5c-1.336 0-2.75 1.164-2.75 3 0 2.15 1.58 4.144 3.365 5.682A20.565 20.565 0 008 13.393a20.561 20.561 0 003.135-2.211C12.92 9.644 14.5 7.65 14.5 5.5c0-1.836-1.414-3-2.75-3-1.373 0-2.609.986-3.029 2.456a.75.75 0 01-1.442 0C6.859 3.486 5.623 2.5 4.25 2.5zM8 14.25l-.345.666-.002-.001-.006-.003-.018-.01a7.643 7.643 0 01-.31-.17 22.075 22.075 0 01-3.434-2.414C2.045 10.731 0 8.35 0 5.5 0 2.836 2.086 1 4.25 1 5.797 1 7.153 1.802 8 3.02 8.847 1.802 10.203 1 11.75 1 13.914 1 16 2.836 16 5.5c0 2.85-2.045 5.231-3.885 6.818a22.08 22.08 0 01-3.744 2.584l-.018.01-.006.003h-.002L8 14.25zm0 0l.345.666a.752.752 0 01-.69 0L8 14.25z"
             />
         </svg>
diff --git a/src/components/Icons.tsx b/src/components/Icons.tsx
index 01012d1fc..93b1323e7 100644
--- a/src/components/Icons.tsx
+++ b/src/components/Icons.tsx
@@ -58,7 +58,7 @@ export function LinkIcon({ height = 24, width = 24, className }: IconProps) {
             className={classes(className, "vc-link-icon")}
             viewBox="0 0 24 24"
         >
-            <g fill="none" fillRule="evenodd">
+            <g fill="none" fill-rule="evenodd">
                 <path fill="currentColor" d="M10.59 13.41c.41.39.41 1.03 0 1.42-.39.39-1.03.39-1.42 0a5.003 5.003 0 0 1 0-7.07l3.54-3.54a5.003 5.003 0 0 1 7.07 0 5.003 5.003 0 0 1 0 7.07l-1.49 1.49c.01-.82-.12-1.64-.4-2.42l.47-.48a2.982 2.982 0 0 0 0-4.24 2.982 2.982 0 0 0-4.24 0l-3.53 3.53a2.982 2.982 0 0 0 0 4.24zm2.82-4.24c.39-.39 1.03-.39 1.42 0a5.003 5.003 0 0 1 0 7.07l-3.54 3.54a5.003 5.003 0 0 1-7.07 0 5.003 5.003 0 0 1 0-7.07l1.49-1.49c-.01.82.12 1.64.4 2.43l-.47.47a2.982 2.982 0 0 0 0 4.24 2.982 2.982 0 0 0 4.24 0l3.53-3.53a2.982 2.982 0 0 0 0-4.24.973.973 0 0 1 0-1.42z" />
                 <rect width={width} height={height} />
             </g>
diff --git a/src/components/PluginSettings/index.tsx b/src/components/PluginSettings/index.tsx
index 19e9fb3f4..fe111fa9d 100644
--- a/src/components/PluginSettings/index.tsx
+++ b/src/components/PluginSettings/index.tsx
@@ -30,7 +30,7 @@ import { ChangeList } from "@utils/ChangeList";
 import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
 import { classes, isObjectEmpty } from "@utils/misc";
-import { openModal } from "@utils/modal";
+import { openModalLazy } from "@utils/modal";
 import { useAwaiter } from "@utils/react";
 import { Plugin } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
@@ -95,14 +95,12 @@ export function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, on
 
     const isEnabled = () => settings.enabled ?? false;
 
-    function openPluginModal() {
-        openModal(modalProps => (
-            <PluginModal
-                {...modalProps}
-                plugin={plugin}
-                onRestartNeeded={() => onRestartNeeded(plugin.name)}
-            />
-        ));
+    function openModal() {
+        openModalLazy(async () => {
+            return modalProps => {
+                return <PluginModal {...modalProps} plugin={plugin} onRestartNeeded={() => onRestartNeeded(plugin.name)} />;
+            };
+        });
     }
 
     function toggleEnabled() {
@@ -161,7 +159,7 @@ export function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, on
             onMouseEnter={onMouseEnter}
             onMouseLeave={onMouseLeave}
             infoButton={
-                <button role="switch" onClick={() => openPluginModal()} className={classes(ButtonClasses.button, cl("info-button"))}>
+                <button role="switch" onClick={() => openModal()} className={classes(ButtonClasses.button, cl("info-button"))}>
                     {plugin.options && !isObjectEmpty(plugin.options)
                         ? <CogWheel />
                         : <InfoIcon />}
@@ -354,7 +352,7 @@ function makeDependencyList(deps: string[]) {
     return (
         <React.Fragment>
             <Forms.FormText>This plugin is required by:</Forms.FormText>
-            {deps.map((dep: string) => <Forms.FormText key={dep} className={cl("dep-text")}>{dep}</Forms.FormText>)}
+            {deps.map((dep: string) => <Forms.FormText className={cl("dep-text")}>{dep}</Forms.FormText>)}
         </React.Fragment>
     );
 }
diff --git a/src/components/VencordSettings/PatchHelperTab.tsx b/src/components/VencordSettings/PatchHelperTab.tsx
index 31af957e0..0b869a518 100644
--- a/src/components/VencordSettings/PatchHelperTab.tsx
+++ b/src/components/VencordSettings/PatchHelperTab.tsx
@@ -106,9 +106,9 @@ function ReplacementComponent({ module, match, replacement, setReplacementError
     }
 
     function renderDiff() {
-        return diff?.map((p, i) => {
+        return diff?.map(p => {
             const color = p.added ? "lime" : p.removed ? "red" : "grey";
-            return <div key={i} style={{ color, userSelect: "text" }}>{p.value}</div>;
+            return <div style={{ color, userSelect: "text" }}>{p.value}</div>;
         });
     }
 
diff --git a/src/components/VencordSettings/ThemesTab.tsx b/src/components/VencordSettings/ThemesTab.tsx
index 83df69b4a..e65de2192 100644
--- a/src/components/VencordSettings/ThemesTab.tsx
+++ b/src/components/VencordSettings/ThemesTab.tsx
@@ -26,7 +26,7 @@ import { classes } from "@utils/misc";
 import { showItemInFolder } from "@utils/native";
 import { useAwaiter } from "@utils/react";
 import { findByPropsLazy, findLazy } from "@webpack";
-import { Button, Card, FluxDispatcher, Forms, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
+import { Button, Card, FluxDispatcher, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
 import { UserThemeHeader } from "main/themes";
 import type { ComponentType, Ref, SyntheticEvent } from "react";
 
diff --git a/src/components/VencordSettings/UpdaterTab.tsx b/src/components/VencordSettings/UpdaterTab.tsx
index 147c0c854..81433960f 100644
--- a/src/components/VencordSettings/UpdaterTab.tsx
+++ b/src/components/VencordSettings/UpdaterTab.tsx
@@ -57,7 +57,7 @@ function withDispatcher(dispatcher: React.Dispatch<React.SetStateAction<boolean>
                 title: "Oops!",
                 body: (
                     <ErrorCard>
-                        {err.split("\n").map((line, i) => <div key={i}>{Parser.parse(line)}</div>)}
+                        {err.split("\n").map(line => <div>{Parser.parse(line)}</div>)}
                     </ErrorCard>
                 )
             });
@@ -83,7 +83,7 @@ function Changes({ updates, repo, repoPending }: CommonProps & { updates: typeof
     return (
         <Card style={{ padding: ".5em" }}>
             {updates.map(({ hash, author, message }) => (
-                <div key={hash}>
+                <div>
                     <code><HashLink {...{ repo, hash }} disabled={repoPending} /></code>
                     <span style={{
                         marginLeft: "0.5em",
diff --git a/src/plugins/betterFolders/FolderSideBar.tsx b/src/plugins/betterFolders/FolderSideBar.tsx
index 56ff4f3e0..5504e1d56 100644
--- a/src/plugins/betterFolders/FolderSideBar.tsx
+++ b/src/plugins/betterFolders/FolderSideBar.tsx
@@ -19,7 +19,7 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { LazyComponent } from "@utils/react";
 import { find, findByPropsLazy } from "@webpack";
-import { useStateFromStores } from "@webpack/common";
+import { React, useStateFromStores } from "@webpack/common";
 
 import { ExpandedGuildFolderStore, settings } from ".";
 
diff --git a/src/plugins/callTimer/index.tsx b/src/plugins/callTimer/index.tsx
index 55c902373..c018cc715 100644
--- a/src/plugins/callTimer/index.tsx
+++ b/src/plugins/callTimer/index.tsx
@@ -21,6 +21,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { useTimer } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
+import { React } from "@webpack/common";
 
 function formatDuration(ms: number) {
     // here be dragons (moment fucking sucks)
diff --git a/src/plugins/consoleShortcuts/index.ts b/src/plugins/consoleShortcuts/index.ts
index e18fbad83..1c23d60e7 100644
--- a/src/plugins/consoleShortcuts/index.ts
+++ b/src/plugins/consoleShortcuts/index.ts
@@ -92,7 +92,6 @@ export default definePlugin({
                 fakeRenderWin = new WeakRef(win);
                 win.focus();
 
-                // eslint-disable-next-line react/no-deprecated
                 ReactDOM.render(React.createElement(component, props), win.document.body);
             }
         };
diff --git a/src/plugins/customRPC/index.tsx b/src/plugins/customRPC/index.tsx
index 8dc6f60ed..8ed741215 100644
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@@ -23,7 +23,7 @@ import { isTruthy } from "@utils/guards";
 import { useAwaiter } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy } from "@webpack";
-import { ApplicationAssetUtils, FluxDispatcher, Forms, GuildStore, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common";
+import { ApplicationAssetUtils, FluxDispatcher, Forms, GuildStore, React, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common";
 
 const ActivityComponent = findByCodeLazy("onOpenGameProfile");
 const ActivityClassName = findByPropsLazy("activity", "buttonColor");
diff --git a/src/plugins/emoteCloner/index.tsx b/src/plugins/emoteCloner/index.tsx
index 6b4be9818..c44731152 100644
--- a/src/plugins/emoteCloner/index.tsx
+++ b/src/plugins/emoteCloner/index.tsx
@@ -205,7 +205,7 @@ function CloneModal({ data }: { data: Sticker | Emoji; }) {
                 alignItems: "center"
             }}>
                 {guilds.map(g => (
-                    <Tooltip key={g.id} text={g.name}>
+                    <Tooltip text={g.name}>
                         {({ onMouseLeave, onMouseEnter }) => (
                             <div
                                 onMouseLeave={onMouseLeave}
@@ -278,27 +278,25 @@ function buildMenuItem(type: "Emoji" | "Sticker", fetchData: () => Promisable<Om
                     const data = { t: type, ...res } as Sticker | Emoji;
                     const url = getUrl(data);
 
-                    return function EmoteClonerModal(modalProps) {
-                        return (
-                            <ModalRoot {...modalProps}>
-                                <ModalHeader>
-                                    <img
-                                        role="presentation"
-                                        aria-hidden
-                                        src={url}
-                                        alt=""
-                                        height={24}
-                                        width={24}
-                                        style={{ marginRight: "0.5em" }}
-                                    />
-                                    <Forms.FormText>Clone {data.name}</Forms.FormText>
-                                </ModalHeader>
-                                <ModalContent>
-                                    <CloneModal data={data} />
-                                </ModalContent>
-                            </ModalRoot>
-                        );
-                    };
+                    return modalProps => (
+                        <ModalRoot {...modalProps}>
+                            <ModalHeader>
+                                <img
+                                    role="presentation"
+                                    aria-hidden
+                                    src={url}
+                                    alt=""
+                                    height={24}
+                                    width={24}
+                                    style={{ marginRight: "0.5em" }}
+                                />
+                                <Forms.FormText>Clone {data.name}</Forms.FormText>
+                            </ModalHeader>
+                            <ModalContent>
+                                <CloneModal data={data} />
+                            </ModalContent>
+                        </ModalRoot>
+                    );
                 })
             }
         />
diff --git a/src/plugins/gameActivityToggle/index.tsx b/src/plugins/gameActivityToggle/index.tsx
index 361b0297d..735f124c5 100644
--- a/src/plugins/gameActivityToggle/index.tsx
+++ b/src/plugins/gameActivityToggle/index.tsx
@@ -28,7 +28,7 @@ import style from "./style.css?managed";
 const Button = findByCodeLazy("Button.Sizes.NONE,disabled:");
 
 function makeIcon(showCurrentGame?: boolean) {
-    return function GameActivityToggle() {
+    return function () {
         return (
             <svg
                 width="20"
diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index b441d5427..e600d737d 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -343,10 +343,10 @@ function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
                     ? parse(message.content)
                     : [noContent(message.attachments.length, message.embeds.length)]
                 }
-                {images.map((a, i) => {
+                {images.map(a => {
                     const { width, height } = computeWidthAndHeight(a.width, a.height);
                     return (
-                        <div key={i}>
+                        <div>
                             <img src={a.url} width={width} height={height} />
                         </div>
                     );
diff --git a/src/plugins/moreUserTags/index.tsx b/src/plugins/moreUserTags/index.tsx
index c7ea76a0b..9921bca8e 100644
--- a/src/plugins/moreUserTags/index.tsx
+++ b/src/plugins/moreUserTags/index.tsx
@@ -111,7 +111,7 @@ function SettingsComponent(props: { setValue(v: any): void; }) {
     return (
         <Flex flexDirection="column">
             {tags.map(t => (
-                <Card key={t.name} style={{ padding: "1em 1em 0" }}>
+                <Card style={{ padding: "1em 1em 0" }}>
                     <Forms.FormTitle style={{ width: "fit-content" }}>
                         <Tooltip text={t.description}>
                             {({ onMouseEnter, onMouseLeave }) => (
diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx
index 3048a5c49..226d000f1 100644
--- a/src/plugins/mutualGroupDMs/index.tsx
+++ b/src/plugins/mutualGroupDMs/index.tsx
@@ -64,7 +64,6 @@ export default definePlugin({
     renderMutualGDMs(user: User, onClose: () => void) {
         const entries = ChannelStore.getSortedPrivateChannels().filter(c => c.isGroupDM() && c.recipients.includes(user.id)).map(c => (
             <Clickable
-                key={c.id}
                 className={ProfileListClasses.listRow}
                 onClick={() => {
                     onClose();
diff --git a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
index 04812eeff..629880467 100644
--- a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
@@ -104,7 +104,6 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
 
                                 return (
                                     <button
-                                        key={permission.id}
                                         className={cl("perms-list-item-btn")}
                                         onClick={() => selectItem(index)}
                                     >
@@ -158,7 +157,7 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
                         </div>
                         <div className={cl("perms-perms")}>
                             {Object.entries(PermissionsBits).map(([permissionName, bit]) => (
-                                <div key={permissionName} className={cl("perms-perms-item")}>
+                                <div className={cl("perms-perms-item")}>
                                     <div className={cl("perms-perms-item-icon")}>
                                         {(() => {
                                             const { permissions, overwriteAllow, overwriteDeny } = selectedItem;
diff --git a/src/plugins/permissionsViewer/components/UserPermissions.tsx b/src/plugins/permissionsViewer/components/UserPermissions.tsx
index 61d4dcb51..37d9d0f42 100644
--- a/src/plugins/permissionsViewer/components/UserPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/UserPermissions.tsx
@@ -109,7 +109,7 @@ function UserPermissionsComponent({ guild, guildMember }: { guild: Guild; guildM
             }
             defaultState={settings.store.defaultPermissionsDropdownState}
             buttons={[
-                (<Tooltip key="sort" text={`Sorting by ${stns.permissionsSortOrder === PermissionsSortOrder.HighestRole ? "Highest Role" : "Lowest Role"}`}>
+                (<Tooltip text={`Sorting by ${stns.permissionsSortOrder === PermissionsSortOrder.HighestRole ? "Highest Role" : "Lowest Role"}`}>
                     {tooltipProps => (
                         <button
                             {...tooltipProps}
@@ -133,7 +133,7 @@ function UserPermissionsComponent({ guild, guildMember }: { guild: Guild; guildM
             {userPermissions.length > 0 && (
                 <div className={classes(root, roles)}>
                     {userPermissions.map(({ permission, roleColor }) => (
-                        <div key={permission} className={classes(role, rolePill, rolePillBorder)}>
+                        <div className={classes(role, rolePill, rolePillBorder)}>
                             <div className={roleRemoveButton}>
                                 <span
                                     className={roleCircle}
diff --git a/src/plugins/pictureInPicture/index.tsx b/src/plugins/pictureInPicture/index.tsx
index cbec53706..4b6f87970 100644
--- a/src/plugins/pictureInPicture/index.tsx
+++ b/src/plugins/pictureInPicture/index.tsx
@@ -8,7 +8,7 @@ import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { Tooltip } from "@webpack/common";
+import { React, Tooltip } from "@webpack/common";
 
 const settings = definePluginSettings({
     loop: {
diff --git a/src/plugins/platformIndicators/index.tsx b/src/plugins/platformIndicators/index.tsx
index b6b08f646..2972b4a46 100644
--- a/src/plugins/platformIndicators/index.tsx
+++ b/src/plugins/platformIndicators/index.tsx
@@ -30,23 +30,21 @@ import { User } from "discord-types/general";
 const SessionsStore = findStoreLazy("SessionsStore");
 
 function Icon(path: string, opts?: { viewBox?: string; width?: number; height?: number; }) {
-    return function PlatformIndicator({ color, tooltip, small }: { color: string; tooltip: string; small: boolean; }) {
-        return (
-            <Tooltip text={tooltip} >
-                {(tooltipProps: any) => (
-                    <svg
-                        {...tooltipProps}
-                        height={(opts?.height ?? 20) - (small ? 3 : 0)}
-                        width={(opts?.width ?? 20) - (small ? 3 : 0)}
-                        viewBox={opts?.viewBox ?? "0 0 24 24"}
-                        fill={color}
-                    >
-                        <path d={path} />
-                    </svg>
-                )}
-            </Tooltip>
-        );
-    };
+    return ({ color, tooltip, small }: { color: string; tooltip: string; small: boolean; }) => (
+        <Tooltip text={tooltip} >
+            {(tooltipProps: any) => (
+                <svg
+                    {...tooltipProps}
+                    height={(opts?.height ?? 20) - (small ? 3 : 0)}
+                    width={(opts?.width ?? 20) - (small ? 3 : 0)}
+                    viewBox={opts?.viewBox ?? "0 0 24 24"}
+                    fill={color}
+                >
+                    <path d={path} />
+                </svg>
+            )}
+        </Tooltip>
+    );
 }
 
 const Icons = {
diff --git a/src/plugins/readAllNotificationsButton/index.tsx b/src/plugins/readAllNotificationsButton/index.tsx
index 9b1c9dfb6..b5b0b5f82 100644
--- a/src/plugins/readAllNotificationsButton/index.tsx
+++ b/src/plugins/readAllNotificationsButton/index.tsx
@@ -19,7 +19,7 @@
 import { addServerListElement, removeServerListElement, ServerListRenderPosition } from "@api/ServerList";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { Button, FluxDispatcher, GuildChannelStore, GuildStore, ReadStateStore } from "@webpack/common";
+import { Button, FluxDispatcher, GuildChannelStore, GuildStore, React, ReadStateStore } from "@webpack/common";
 
 function onClick() {
     const channels: Array<any> = [];
diff --git a/src/plugins/sendTimestamps/index.tsx b/src/plugins/sendTimestamps/index.tsx
index 3ef4022d1..7904545c8 100644
--- a/src/plugins/sendTimestamps/index.tsx
+++ b/src/plugins/sendTimestamps/index.tsx
@@ -172,7 +172,7 @@ export default definePlugin({
                                     height="24"
                                     viewBox="0 0 24 24"
                                 >
-                                    <g fill="none" fillRule="evenodd">
+                                    <g fill="none" fill-rule="evenodd">
                                         <path fill="currentColor" d="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99.9-1.99 2L3 19a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7v-5z" />
                                         <rect width="24" height="24" />
                                     </g>
diff --git a/src/plugins/serverProfile/GuildProfileModal.tsx b/src/plugins/serverProfile/GuildProfileModal.tsx
index 2fe4dc0c7..80f0842bb 100644
--- a/src/plugins/serverProfile/GuildProfileModal.tsx
+++ b/src/plugins/serverProfile/GuildProfileModal.tsx
@@ -236,7 +236,6 @@ function UserList(type: "friends" | "blocked", guild: Guild, ids: string[], setC
         <ScrollerThin fade className={cl("scroller")}>
             {members.map(id =>
                 <FriendRow
-                    key={id}
                     user={UserStore.getUser(id)}
                     status={PresenceStore.getStatus(id) || "offline"}
                     onSelect={() => openUserProfile(id)}
diff --git a/src/plugins/shikiCodeblocks.desktop/components/Code.tsx b/src/plugins/shikiCodeblocks.desktop/components/Code.tsx
index e151df20d..ce6a70584 100644
--- a/src/plugins/shikiCodeblocks.desktop/components/Code.tsx
+++ b/src/plugins/shikiCodeblocks.desktop/components/Code.tsx
@@ -46,7 +46,7 @@ export const Code = ({
                 .split("\n")
                 .map((line, i) => <span key={i} dangerouslySetInnerHTML={{ __html: line }} />);
         } catch {
-            lines = content.split("\n").map((line, i) => <span key={i}>{line}</span>);
+            lines = content.split("\n").map(line => <span>{line}</span>);
         }
     } else {
         const renderTokens =
@@ -55,11 +55,11 @@ export const Code = ({
                 .split("\n")
                 .map(line => [{ color: theme.plainColor, content: line } as IThemedToken]);
 
-        lines = renderTokens.map((line, i) => {
+        lines = renderTokens.map(line => {
             // [Cynthia] this makes it so when you highlight the codeblock
             // empty lines are also selected and copied when you Ctrl+C.
             if (line.length === 0) {
-                return <span key={i}>{"\n"}</span>;
+                return <span>{"\n"}</span>;
             }
 
             return (
diff --git a/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx b/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx
index e14171e58..dd1401939 100644
--- a/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx
+++ b/src/plugins/shikiCodeblocks.desktop/components/Highlighter.tsx
@@ -18,7 +18,7 @@
 
 import ErrorBoundary from "@components/ErrorBoundary";
 import { useAwaiter, useIntersection } from "@utils/react";
-import { hljs } from "@webpack/common";
+import { hljs, React } from "@webpack/common";
 
 import { resolveLang } from "../api/languages";
 import { shiki } from "../api/shiki";
diff --git a/src/plugins/showConnections/index.tsx b/src/plugins/showConnections/index.tsx
index e7963a764..948bdb83b 100644
--- a/src/plugins/showConnections/index.tsx
+++ b/src/plugins/showConnections/index.tsx
@@ -105,7 +105,7 @@ function ConnectionsComponent({ id, theme }: { id: string, theme: string; }) {
                 gap: getSpacingPx(settings.store.iconSpacing),
                 flexWrap: "wrap"
             }}>
-                {connections.map(connection => <CompactConnectionComponent connection={connection} theme={theme} key={connection.id} />)}
+                {connections.map(connection => <CompactConnectionComponent connection={connection} theme={theme} />)}
             </Flex>
         </Section>
     );
diff --git a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
index ebd42580e..26efce1d8 100644
--- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
+++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
@@ -275,7 +275,7 @@ function HiddenChannelLockScreen({ channel }: { channel: ExtendedChannel; }) {
                     <div className="shc-lock-screen-tags-container">
                         <Text variant="text-lg/bold">Available tags:</Text>
                         <div className="shc-lock-screen-tags">
-                            {availableTags.map(tag => <TagComponent tag={tag} key={tag.id} />)}
+                            {availableTags.map(tag => <TagComponent tag={tag} />)}
                         </div>
                     </div>
                 }
diff --git a/src/plugins/silentMessageToggle/index.tsx b/src/plugins/silentMessageToggle/index.tsx
index 6d2b9c3b6..a1ee8de89 100644
--- a/src/plugins/silentMessageToggle/index.tsx
+++ b/src/plugins/silentMessageToggle/index.tsx
@@ -88,7 +88,7 @@ function SilentMessageToggle(chatBoxProps: {
                                 <g fill="currentColor">
                                     <path d="M18 10.7101C15.1085 9.84957 13 7.17102 13 4C13 3.69264 13.0198 3.3899 13.0582 3.093C12.7147 3.03189 12.3611 3 12 3C8.686 3 6 5.686 6 9V14C6 15.657 4.656 17 3 17V18H21V17C19.344 17 18 15.657 18 14V10.7101ZM8.55493 19C9.24793 20.19 10.5239 21 11.9999 21C13.4759 21 14.7519 20.19 15.4449 19H8.55493Z" />
                                     <path d="M18.2624 5.50209L21 2.5V1H16.0349V2.49791H18.476L16 5.61088V7H21V5.50209H18.2624Z" />
-                                    {!enabled && <line x1="22" y1="2" x2="2" y2="22" stroke="var(--red-500)" strokeWidth="2.5" />}
+                                    {!enabled && <line x1="22" y1="2" x2="2" y2="22" stroke="var(--red-500)" stroke-width="2.5" />}
                                 </g>
                             </svg>
                         </div>
diff --git a/src/plugins/silentTyping/index.tsx b/src/plugins/silentTyping/index.tsx
index 134cfa677..dae7ad4c9 100644
--- a/src/plugins/silentTyping/index.tsx
+++ b/src/plugins/silentTyping/index.tsx
@@ -21,7 +21,7 @@ import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { Button, ButtonLooks, ButtonWrapperClasses, FluxDispatcher, Tooltip } from "@webpack/common";
+import { Button, ButtonLooks, ButtonWrapperClasses, FluxDispatcher, React, Tooltip } from "@webpack/common";
 
 const settings = definePluginSettings({
     showIcon: {
@@ -62,7 +62,7 @@ function SilentTypingToggle(chatBoxProps: {
                         <div className={ButtonWrapperClasses.buttonWrapper}>
                             <svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
                                 <path fill="currentColor" d="M528 448H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h480c26.51 0 48 21.49 48 48v288c0 26.51-21.49 48-48 48zM128 180v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm288 0v-40c0-6.627-5.373-12-12-12H172c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h232c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12z" />
-                                {isEnabled && <path d="M13 432L590 48" stroke="var(--red-500)" strokeWidth="72" strokeLinecap="round" />}
+                                {isEnabled && <path d="M13 432L590 48" stroke="var(--red-500)" stroke-width="72" stroke-linecap="round" />}
                             </svg>
                         </div>
                     </Button>
diff --git a/src/plugins/spotifyControls/PlayerComponent.tsx b/src/plugins/spotifyControls/PlayerComponent.tsx
index 64ee52fc1..43c499ab7 100644
--- a/src/plugins/spotifyControls/PlayerComponent.tsx
+++ b/src/plugins/spotifyControls/PlayerComponent.tsx
@@ -38,21 +38,19 @@ function msToHuman(ms: number) {
 }
 
 function Svg(path: string, label: string) {
-    return function Icon() {
-        return (
-            <svg
-                className={classes(cl("button-icon"), cl(label))}
-                height="24"
-                width="24"
-                viewBox="0 0 24 24"
-                fill="currentColor"
-                aria-label={label}
-                focusable={false}
-            >
-                <path d={path} />
-            </svg>
-        );
-    };
+    return () => (
+        <svg
+            className={classes(cl("button-icon"), cl(label))}
+            height="24"
+            width="24"
+            viewBox="0 0 24 24"
+            fill="currentColor"
+            aria-label={label}
+            focusable={false}
+        >
+            <path d={path} />
+        </svg>
+    );
 }
 
 // KraXen's icons :yesyes:
diff --git a/src/plugins/startupTimings/StartupTimingPage.tsx b/src/plugins/startupTimings/StartupTimingPage.tsx
index 0950b0688..c8cf51da2 100644
--- a/src/plugins/startupTimings/StartupTimingPage.tsx
+++ b/src/plugins/startupTimings/StartupTimingPage.tsx
@@ -120,8 +120,8 @@ function ServerTrace({ trace }: ServerTraceProps) {
         <Forms.FormSection title="Server Trace" tag="h2">
             <code>
                 <Flex flexDirection="column" style={{ color: "var(--header-primary)", gap: 5, userSelect: "text" }}>
-                    {lines.map((line, i) => (
-                        <span key={i}>{line}</span>
+                    {lines.map(line => (
+                        <span>{line}</span>
                     ))}
                 </Flex>
             </code>
diff --git a/src/plugins/typingTweaks/index.tsx b/src/plugins/typingTweaks/index.tsx
index ccb863ce7..62bcd41f6 100644
--- a/src/plugins/typingTweaks/index.tsx
+++ b/src/plugins/typingTweaks/index.tsx
@@ -21,7 +21,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { openUserProfile } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
-import { Avatar, GuildMemberStore, RelationshipStore } from "@webpack/common";
+import { Avatar, GuildMemberStore, React, RelationshipStore } from "@webpack/common";
 import { User } from "discord-types/general";
 
 const settings = definePluginSettings({
@@ -135,7 +135,7 @@ export default definePlugin({
 
         return children.map(c =>
             c.type === "strong"
-                ? <TypingUser {...props} user={users[element++]} key={users[element].id} />
+                ? <TypingUser {...props} user={users[element++]} />
                 : c
         );
     }
diff --git a/src/utils/react.tsx b/src/utils/react.tsx
index 43a4d121e..0181c95b8 100644
--- a/src/utils/react.tsx
+++ b/src/utils/react.tsx
@@ -133,7 +133,7 @@ export function useForceUpdater(withDep?: true) {
 
 export function LazyComponent<T extends object = any>(factory: () => React.ComponentType<T>, attempts = 5) {
     const get = makeLazy(factory, attempts);
-    return function Lazy(props: T) {
+    return (props: T) => {
         const Component = get() ?? NoopComponent;
         return <Component {...props} />;
     };

From 9af2ec65ae5ebcfabedbc3fc703b25868ed0d65b Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 1 Nov 2023 02:09:43 +0100
Subject: [PATCH 145/632] OnePingPerDM: fix server pings

---
 src/plugins/onePingPerDM/index.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/plugins/onePingPerDM/index.ts b/src/plugins/onePingPerDM/index.ts
index 37ca87125..ae38343db 100644
--- a/src/plugins/onePingPerDM/index.ts
+++ b/src/plugins/onePingPerDM/index.ts
@@ -55,10 +55,8 @@ export default definePlugin({
     }],
     isPrivateChannelRead(message: MessageJSON) {
         const channelType = ChannelStore.getChannel(message.channel_id)?.type;
-        if (channelType !== ChannelType.DM && channelType !== ChannelType.GROUP_DM) {
-            return false;
-        }
         if (
+            (channelType !== ChannelType.DM && channelType !== ChannelType.GROUP_DM) ||
             (channelType === ChannelType.DM && settings.store.channelToAffect === "group_dm") ||
             (channelType === ChannelType.GROUP_DM && settings.store.channelToAffect === "user_dm") ||
             (settings.store.allowMentions && message.mentions.some(m => m.id === UserStore.getCurrentUser().id)) ||

From 9d78233afad79402b1422c484f4d233fd9a60540 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 28 Oct 2023 20:32:53 -0300
Subject: [PATCH 146/632] Fix displaying BetterFolders sidebar when watching
 streams in fullscreen

---
 src/plugins/betterFolders/FolderSideBar.tsx | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/plugins/betterFolders/FolderSideBar.tsx b/src/plugins/betterFolders/FolderSideBar.tsx
index 5504e1d56..97959873f 100644
--- a/src/plugins/betterFolders/FolderSideBar.tsx
+++ b/src/plugins/betterFolders/FolderSideBar.tsx
@@ -18,16 +18,19 @@
 
 import ErrorBoundary from "@components/ErrorBoundary";
 import { LazyComponent } from "@utils/react";
-import { find, findByPropsLazy } from "@webpack";
-import { React, useStateFromStores } from "@webpack/common";
+import { find, findByPropsLazy, findStoreLazy } from "@webpack";
+import { useStateFromStores } from "@webpack/common";
+import type { CSSProperties } from "react";
 
 import { ExpandedGuildFolderStore, settings } from ".";
 
+const ChannelRTCStore = findStoreLazy("ChannelRTCStore");
 const Animations = findByPropsLazy("a", "animated", "useTransition");
 const GuildsBar = LazyComponent(() => find(m => m.type?.toString().includes('("guildsnav")')));
 
 export default ErrorBoundary.wrap(guildsBarProps => {
     const expandedFolders = useStateFromStores([ExpandedGuildFolderStore], () => ExpandedGuildFolderStore.getExpandedFolders());
+    const isFullscreen = useStateFromStores([ChannelRTCStore], () => ChannelRTCStore.isFullscreenInContext());
 
     const Sidebar = (
         <GuildsBar
@@ -40,9 +43,15 @@ export default ErrorBoundary.wrap(guildsBarProps => {
     const visible = !!expandedFolders.size;
     const guilds = document.querySelector(guildsBarProps.className.split(" ").map(c => `.${c}`).join(""));
 
+    // We need to display none if we are in fullscreen. Yes this seems horrible doing with css, but it's literally how Discord does it.
+    // Also display flex otherwise to fix scrolling
+    const barStyle = {
+        display: isFullscreen ? "none" : "flex",
+    } as CSSProperties;
+
     if (!guilds || !settings.store.sidebarAnim) {
         return visible
-            ? <div style={{ display: "flex " }}>{Sidebar}</div>
+            ? <div style={barStyle}>{Sidebar}</div>
             : null;
     }
 
@@ -54,9 +63,9 @@ export default ErrorBoundary.wrap(guildsBarProps => {
             leave={{ width: 0 }}
             config={{ duration: 200 }}
         >
-            {(style, show) =>
+            {(animationStyle, show) =>
                 show && (
-                    <Animations.animated.div style={{ ...style, display: "flex" }}>
+                    <Animations.animated.div style={{ ...animationStyle, ...barStyle }}>
                         {Sidebar}
                     </Animations.animated.div>
                 )

From 56a9d79f856fd1bffd703e8723b5c1dfb6de6be1 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Wed, 1 Nov 2023 08:14:32 +0700
Subject: [PATCH 147/632] PiP: fix issues / styles (#1927)

---
 src/plugins/pictureInPicture/index.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/plugins/pictureInPicture/index.tsx b/src/plugins/pictureInPicture/index.tsx
index 4b6f87970..ba4aa8387 100644
--- a/src/plugins/pictureInPicture/index.tsx
+++ b/src/plugins/pictureInPicture/index.tsx
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import "./styles.css";
+
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
@@ -28,8 +30,8 @@ export default definePlugin({
         {
             find: ".nonMediaAttachment]",
             replacement: {
-                match: /\.nonMediaAttachment\].{0,10}children:\[(\S)/,
-                replace: "$&,$1&&$self.renderPiPButton(),"
+                match: /\.nonMediaAttachment\]:!(\i).{0,10}children:\[(\S)/,
+                replace: "$&,$1&&$2&&$self.renderPiPButton(),"
             },
         },
     ],
@@ -40,6 +42,7 @@ export default definePlugin({
                 {tooltipProps => (
                     <div
                         {...tooltipProps}
+                        className="vc-pip-button"
                         role="button"
                         style={{
                             cursor: "pointer",
@@ -70,7 +73,7 @@ export default definePlugin({
                     >
                         <svg width="24px" height="24px" viewBox="0 0 24 24">
                             <path
-                                fill="var(--interactive-normal)"
+                                fill="currentColor"
                                 d="M21 3a1 1 0 0 1 1 1v7h-2V5H4v14h6v2H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h18zm0 10a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1h-8a1 1 0 0 1-1-1v-6a1 1 0 0 1 1-1h8zm-1 2h-6v4h6v-4z"
                             />
                         </svg>

From e37f62ac0a8d93bd354f09567e3e19dd7e8b7d63 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Wed, 1 Nov 2023 08:19:02 +0700
Subject: [PATCH 148/632] imageZoom: dont close carousel modal on image click
 (#1926)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/imageZoom/index.tsx  |  7 +++++++
 src/plugins/imageZoom/styles.css | 18 ++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/plugins/imageZoom/index.tsx b/src/plugins/imageZoom/index.tsx
index 08f2e29d3..75c944ebd 100644
--- a/src/plugins/imageZoom/index.tsx
+++ b/src/plugins/imageZoom/index.tsx
@@ -186,6 +186,13 @@ export default definePlugin({
                 }
             ]
         },
+        {
+            find: ".carouselModal",
+            replacement: {
+                match: /(?<=\.carouselModal.{0,100}onClick:)\i,/,
+                replace: "()=>{},"
+            }
+        }
     ],
 
     settings,
diff --git a/src/plugins/imageZoom/styles.css b/src/plugins/imageZoom/styles.css
index 09c3c8580..51e225c05 100644
--- a/src/plugins/imageZoom/styles.css
+++ b/src/plugins/imageZoom/styles.css
@@ -15,19 +15,17 @@
     border-radius: 0;
 }
 
-.vc-imgzoom-nearest-neighbor > img {
-    image-rendering: pixelated; /* https://googlechrome.github.io/samples/image-rendering-pixelated/index.html */
+.vc-imgzoom-nearest-neighbor>img {
+    image-rendering: pixelated;
+
+    /* https://googlechrome.github.io/samples/image-rendering-pixelated/index.html */
 }
 
 /* make the carousel take up less space so we can click the backdrop and exit out of it */
-[class|="carouselModal"] {
-    height: fit-content;
-    box-shadow: none;
+[class*="modalCarouselWrapper_"] {
+    top: 0 !important;
 }
 
-[class|="wrapper"]:has(> #vc-imgzoom-magnify-modal) {
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
+[class*="carouselModal_"] {
+    height: 0 !important;
 }

From 9de6c2d4ff17ccf9a2a205b00cccc534692a6c51 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Wed, 1 Nov 2023 08:19:26 +0700
Subject: [PATCH 149/632] previewMessage: fix button (#1919)

---
 src/plugins/previewMessage/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/previewMessage/index.tsx b/src/plugins/previewMessage/index.tsx
index bc6751141..f2634ae6b 100644
--- a/src/plugins/previewMessage/index.tsx
+++ b/src/plugins/previewMessage/index.tsx
@@ -137,5 +137,5 @@ export default definePlugin({
         },
     ],
 
-    previewIcon: ErrorBoundary.wrap(PreviewButton, { noop: true }),
+    chatBarIcon: ErrorBoundary.wrap(PreviewButton, { noop: true }),
 });

From 5dc0d06be16733e2d5a49b7b8ad8127fea9660ae Mon Sep 17 00:00:00 2001
From: Haruka <96925398+nakoyasha@users.noreply.github.com>
Date: Wed, 1 Nov 2023 03:23:45 +0200
Subject: [PATCH 150/632] EmoteCloner: make the error toasts useful (#1938)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/emoteCloner/index.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/plugins/emoteCloner/index.tsx b/src/plugins/emoteCloner/index.tsx
index c44731152..219ce435f 100644
--- a/src/plugins/emoteCloner/index.tsx
+++ b/src/plugins/emoteCloner/index.tsx
@@ -155,10 +155,15 @@ async function doClone(guildId: string, data: Sticker | Emoji) {
             type: Toasts.Type.SUCCESS,
             id: Toasts.genId()
         });
-    } catch (e) {
+    } catch (e: any) {
+        let message = "Something went wrong (check console!)";
+        try {
+            message = JSON.parse(e.text).message;
+        } catch { }
+
         new Logger("EmoteCloner").error("Failed to clone", data.name, "to", guildId, e);
         Toasts.show({
-            message: "Oopsie something went wrong :( Check console!!!",
+            message: "Failed to clone: " + message,
             type: Toasts.Type.FAILURE,
             id: Toasts.genId()
         });

From dd61b0c9992c53958508104e3489b63954285121 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 1 Nov 2023 02:25:13 +0100
Subject: [PATCH 151/632] bump to v1.6.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index da8fc449a..fa463823c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 9cf88d42324f3930f707cfdb74613e4b1fac9ff7 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 1 Nov 2023 22:46:06 -0300
Subject: [PATCH 152/632] Fix MessageDecorationsAPI

---
 src/plugins/_api/messageDecorations.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/_api/messageDecorations.ts b/src/plugins/_api/messageDecorations.ts
index 1646ad645..b41ec0be9 100644
--- a/src/plugins/_api/messageDecorations.ts
+++ b/src/plugins/_api/messageDecorations.ts
@@ -27,8 +27,8 @@ export default definePlugin({
         {
             find: '"Message Username"',
             replacement: {
-                match: /currentUserIsPremium:.{0,70}{children:\i(?=}\))/,
-                replace: "$&.concat(Vencord.Api.MessageDecorations.__addDecorationsToMessage(arguments[0]))"
+                match: /\.Messages\.GUILD_COMMUNICATION_DISABLED_BOTTOM_SHEET_TITLE.+?}\),\i(?=\])/,
+                replace: "$&,...Vencord.Api.MessageDecorations.__addDecorationsToMessage(arguments[0])"
             }
         }
     ],

From 098da8c3fd95cdd1f299b86d0b919b001009a1df Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 1 Nov 2023 23:26:13 -0300
Subject: [PATCH 153/632] Fix ViewIcons

---
 src/plugins/viewIcons/index.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index fd6b7b6bf..ccbc8ddca 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -65,7 +65,9 @@ const settings = definePluginSettings({
     }
 });
 
-function openImage(url: string) {
+function openImage(url?: string) {
+    if (!url) return;
+
     const format = url.startsWith("/") ? "png" : settings.store.format;
 
     const u = new URL(url, window.location.href);
@@ -171,12 +173,12 @@ export default definePlugin({
     },
 
     patches: [
-        // Make pfps clickable
+        // Make pfps clickable and add pointer cursor
         {
-            find: "onAddFriend:function",
+            find: ".AVATAR_DECORATION_STATUS_ROUND_16;",
             replacement: {
-                match: /\{src:(\i)(?=,avatarDecoration)/,
-                replace: "{src:$1,onClick:()=>$self.openImage($1)"
+                match: /memo\(.{0,50}(?=let{statusColor:\i,status:\i,...\i}=(\i),)/,
+                replace: (m, props) => `${m}${props}.onClick=()=>$self.openImage(${props}.src);${props}.style={cursor:${props}.src?"pointer":void 0};`
             }
         },
         // Make banners clickable

From 27fffc8bc3fcb6bdca22704f268710f72cc94c4c Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 1 Nov 2023 23:28:52 -0300
Subject: [PATCH 154/632] Fix ShowMeYourName

---
 src/plugins/showMeYourName/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx
index 6986f69f2..62d0645d2 100644
--- a/src/plugins/showMeYourName/index.tsx
+++ b/src/plugins/showMeYourName/index.tsx
@@ -47,7 +47,7 @@ export default definePlugin({
     authors: [Devs.Rini, Devs.TheKodeToad],
     patches: [
         {
-            find: '"Message Username"',
+            find: ".useCanSeeRemixBadge)",
             replacement: {
                 match: /(?<=onContextMenu:\i,children:).*?\}/,
                 replace: "$self.renderUsername(arguments[0])}"

From 44b21394b317079721ec5ec48cc3d00bcfeda873 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Fri, 3 Nov 2023 07:56:31 +0700
Subject: [PATCH 155/632] gifPaste: fix unable to use gif picker in profile
 customization (#1947)

---
 src/plugins/gifPaste/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/gifPaste/index.ts b/src/plugins/gifPaste/index.ts
index 8c1303ba4..9ce88f9d2 100644
--- a/src/plugins/gifPaste/index.ts
+++ b/src/plugins/gifPaste/index.ts
@@ -33,8 +33,8 @@ export default definePlugin({
     patches: [{
         find: ".handleSelectGIF=",
         replacement: {
-            match: /\.handleSelectGIF=\i=>\{/,
-            replace: ".handleSelectGIF=function(gif){return $self.handleSelect(gif);"
+            match: /\.handleSelectGIF=(\i)=>\{/,
+            replace: ".handleSelectGIF=$1=>{if (!this.props.className) return $self.handleSelect($1);"
         }
     }],
 

From fa9da2d693fb6dde3c973bf467a6e14674f9ea06 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Fri, 3 Nov 2023 07:57:39 +0700
Subject: [PATCH 156/632] noMosaic: play video inline + optional media layout
 type (#1946)

---
 src/plugins/noMosaic/index.ts | 45 +++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/plugins/noMosaic/index.ts b/src/plugins/noMosaic/index.ts
index 49343503d..7f9fad53c 100644
--- a/src/plugins/noMosaic/index.ts
+++ b/src/plugins/noMosaic/index.ts
@@ -4,28 +4,58 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { definePluginSettings } from "@api/Settings";
 import { disableStyle, enableStyle } from "@api/Styles";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 
 import style from "./styles.css?managed";
 
+const settings = definePluginSettings({
+    inlineVideo: {
+        description: "Play videos without carousel modal",
+        type: OptionType.BOOLEAN,
+        default: true,
+        restartNeeded: true
+    },
+    mediaLayoutType: {
+        description: "Choose media layout type",
+        type: OptionType.SELECT,
+        restartNeeded: true,
+        options: [
+            { label: "STATIC, render loading image but image isn't resposive, no problem unless discord window width is too small", value: "STATIC", default: true },
+            { label: "RESPONSIVE, image is responsive but not render loading image, cause messages shift when loaded", value: "RESPONSIVE" },
+        ]
+    }
+});
+
 export default definePlugin({
     name: "NoMosaic",
     authors: [Devs.AutumnVN],
     description: "Removes Discord new image mosaic",
     tags: ["image", "mosaic", "media"],
+
+    settings,
+
     patches: [
         {
             find: ".oneByTwoLayoutThreeGrid",
             replacement: [{
                 match: /mediaLayoutType:\i\.\i\.MOSAIC/,
-                replace: 'mediaLayoutType:"RESPONSIVE"'
+                replace: "mediaLayoutType:$self.mediaLayoutType()",
             },
             {
                 match: /null!==\(\i=\i\.get\(\i\)\)&&void 0!==\i\?\i:"INVALID"/,
                 replace: '"INVALID"',
-            },]
+            }]
+        },
+        {
+            find: "renderAttachments(",
+            predicate: () => settings.store.inlineVideo,
+            replacement: {
+                match: /url:(\i)\.url\}\);return /,
+                replace: "$&$1.content_type?.startsWith('image/')&&"
+            }
         },
         {
             find: "Messages.REMOVE_ATTACHMENT_TOOLTIP_TEXT",
@@ -33,10 +63,17 @@ export default definePlugin({
                 match: /\i===\i\.\i\.MOSAIC/,
                 replace: "true"
             }
-        }],
+        }
+    ],
+
+    mediaLayoutType() {
+        return settings.store.mediaLayoutType;
+    },
+
     start() {
         enableStyle(style);
     },
+
     stop() {
         disableStyle(style);
     }

From fcf2bdda70201c87585b2f3060f9b380e13938e3 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 3 Nov 2023 02:03:53 +0100
Subject: [PATCH 157/632] fix TypingTweaks

---
 src/plugins/typingTweaks/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/typingTweaks/index.tsx b/src/plugins/typingTweaks/index.tsx
index 62bcd41f6..d3f4a1409 100644
--- a/src/plugins/typingTweaks/index.tsx
+++ b/src/plugins/typingTweaks/index.tsx
@@ -112,7 +112,7 @@ export default definePlugin({
         {
             find: "getCooldownTextStyle",
             replacement: {
-                match: /(?<=(\i)\.length\?\i.\i\.Messages.THREE_USERS_TYPING\.format\({\i:(\i),\i:(\i),\i:\i}\):)\i\.\i\.Messages\.SEVERAL_USERS_TYPING/,
+                match: /(?<=(\i)\.length\?\i.\i\.Messages.THREE_USERS_TYPING\.format\({\i:(\i),(?:\i:)?(\i),\i:\i}\):)\i\.\i\.Messages\.SEVERAL_USERS_TYPING/,
                 replace: (_, users, a, b) => `$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2 })`
             },
             predicate: () => settings.store.alternativeFormatting

From 7f73e133647fe612ca5b2e571062f768f47f6cda Mon Sep 17 00:00:00 2001
From: Lewis Crichton <lewi@lewisakura.moe>
Date: Sat, 4 Nov 2023 17:41:38 +0000
Subject: [PATCH 158/632] docs: point people to advisories for security bugs
 (#1957)

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 74b2a418b..d79f5e490 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -14,7 +14,8 @@ body:
         DO NOT USE THIS FORM, unless
         - you are a vencord contributor
         - you were given explicit permission to use this form by a moderator in our support server
-        - you are filing a security related report
+        
+        DO NOT USE THIS FORM FOR SECURITY RELATED ISSUES. [CREATE A SECURITY ADVISORY INSTEAD.](https://github.com/Vendicated/Vencord/security/advisories/new)
   
   - type: input
     id: discord

From 37b9a6246081400091a815205cc63cb217535661 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Sun, 5 Nov 2023 00:44:29 +0700
Subject: [PATCH 159/632] favGifSearch: fix search bar (#1955)

---
 src/plugins/favGifSearch/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/favGifSearch/index.tsx b/src/plugins/favGifSearch/index.tsx
index 0cb5166e1..592d8f547 100644
--- a/src/plugins/favGifSearch/index.tsx
+++ b/src/plugins/favGifSearch/index.tsx
@@ -60,7 +60,7 @@ interface Instance {
 }
 
 
-const containerClasses: { searchBar: string; } = findByPropsLazy("searchBar", "searchHeader", "searchInput");
+const containerClasses: { searchBar: string; } = findByPropsLazy("searchBar", "searchBarFullRow");
 
 export const settings = definePluginSettings({
     searchOption: {
@@ -182,7 +182,7 @@ function SearchBar({ instance, SearchBarComponent }: { instance: Instance; Searc
             ref={ref}
             autoFocus={true}
             className={containerClasses.searchBar}
-            size={SearchBarComponent.Sizes.SMALL}
+            size={SearchBarComponent.Sizes.MEDIUM}
             onChange={onChange}
             onClear={() => {
                 setQuery("");

From 77659be4f0d7e6cc8d643037cf4188d1255c143f Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Sun, 5 Nov 2023 00:44:53 +0700
Subject: [PATCH 160/632] fakeNitro: disallow emoji in add reaction (#1954)

---
 src/plugins/fakeNitro/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index efec9a8b5..e4311106d 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -201,7 +201,7 @@ export default definePlugin({
             predicate: () => settings.store.enableEmojiBypass,
             replacement: {
                 match: /((?:canUseEmojisEverywhere|canUseAnimatedEmojis):function\(\i)\){(.+?\))(?=})/g,
-                replace: (_, rest, premiumCheck) => `${rest},fakeNitroIntention){${premiumCheck}||fakeNitroIntention!=null||[${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)`
+                replace: (_, rest, premiumCheck) => `${rest},fakeNitroIntention){${premiumCheck}||fakeNitroIntention==null||[${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)`
             }
         },
         // Allow stickers to be sent everywhere

From a257926609d9c88f44015ee0b06040be5936d85f Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Sun, 5 Nov 2023 00:45:17 +0700
Subject: [PATCH 161/632] customRpc: fix discord attachment link (#1949)

---
 src/plugins/customRPC/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/customRPC/index.tsx b/src/plugins/customRPC/index.tsx
index 8ed741215..feed52fde 100644
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@@ -30,6 +30,7 @@ const ActivityClassName = findByPropsLazy("activity", "buttonColor");
 const Colors = findByPropsLazy("profileColors");
 
 async function getApplicationAsset(key: string): Promise<string> {
+    if (/https?:\/\/(cdn|media)\.discordapp\.(com|net)\/attachments\//.test(key)) return "mp:" + key.replace(/https?:\/\/(cdn|media)\.discordapp\.(com|net)\//, "");
     return (await ApplicationAssetUtils.fetchAssetIds(settings.store.appID!, [key]))[0];
 }
 

From 2c9793202d1e9538736ec7e795e1b466a46a66cb Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 4 Nov 2023 18:54:02 +0100
Subject: [PATCH 162/632] Revert "Fix ViewIcons"

This reverts commit 098da8c3fd95cdd1f299b86d0b919b001009a1df.
---
 src/plugins/viewIcons/index.tsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index ccbc8ddca..fd6b7b6bf 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -65,9 +65,7 @@ const settings = definePluginSettings({
     }
 });
 
-function openImage(url?: string) {
-    if (!url) return;
-
+function openImage(url: string) {
     const format = url.startsWith("/") ? "png" : settings.store.format;
 
     const u = new URL(url, window.location.href);
@@ -173,12 +171,12 @@ export default definePlugin({
     },
 
     patches: [
-        // Make pfps clickable and add pointer cursor
+        // Make pfps clickable
         {
-            find: ".AVATAR_DECORATION_STATUS_ROUND_16;",
+            find: "onAddFriend:function",
             replacement: {
-                match: /memo\(.{0,50}(?=let{statusColor:\i,status:\i,...\i}=(\i),)/,
-                replace: (m, props) => `${m}${props}.onClick=()=>$self.openImage(${props}.src);${props}.style={cursor:${props}.src?"pointer":void 0};`
+                match: /\{src:(\i)(?=,avatarDecoration)/,
+                replace: "{src:$1,onClick:()=>$self.openImage($1)"
             }
         },
         // Make banners clickable

From a67c7f841d3a4fc96cb64a61aa37d00454d658bc Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 4 Nov 2023 18:54:29 +0100
Subject: [PATCH 163/632] Fix ViewIcons correctly

---
 src/plugins/viewIcons/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index fd6b7b6bf..2da3e21c2 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -173,7 +173,7 @@ export default definePlugin({
     patches: [
         // Make pfps clickable
         {
-            find: "onAddFriend:function",
+            find: "User Profile Modal - Context Menu",
             replacement: {
                 match: /\{src:(\i)(?=,avatarDecoration)/,
                 replace: "{src:$1,onClick:()=>$self.openImage($1)"

From 370b3d366df87b6359c5844e6f7784f31fbcd748 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 4 Nov 2023 18:59:16 +0100
Subject: [PATCH 164/632] OpenInApp: Fix links in messages

---
 src/plugins/openInApp/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/openInApp/index.ts b/src/plugins/openInApp/index.ts
index e26a01eb9..a65c49317 100644
--- a/src/plugins/openInApp/index.ts
+++ b/src/plugins/openInApp/index.ts
@@ -55,8 +55,8 @@ export default definePlugin({
         {
             find: "trackAnnouncementMessageLinkClicked({",
             replacement: {
-                match: /(?<=handleClick:function\(\)\{return (\i)\}.+?)async function \1\(.+?\)\{/,
-                replace: "$& if(await $self.handleLink(...arguments)) return;"
+                match: /(?<=handleClick:function\(\)\{return (\i)\}.+?)function \1\(.+?\)\{/,
+                replace: "async $& if(await $self.handleLink(...arguments)) return;"
             }
         },
         // Make Spotify profile activity links open in app on web

From dd44ac1ad2280672e2c60587a177f51a351c77fa Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 4 Nov 2023 19:08:44 +0100
Subject: [PATCH 165/632] OpenInApp: Support podcasts

---
 src/plugins/openInApp/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/openInApp/index.ts b/src/plugins/openInApp/index.ts
index a65c49317..5a2641e2a 100644
--- a/src/plugins/openInApp/index.ts
+++ b/src/plugins/openInApp/index.ts
@@ -23,7 +23,7 @@ import { showToast, Toasts } from "@webpack/common";
 import type { MouseEvent } from "react";
 
 const ShortUrlMatcher = /^https:\/\/(spotify\.link|s\.team)\/.+$/;
-const SpotifyMatcher = /^https:\/\/open\.spotify\.com\/(track|album|artist|playlist|user)\/(.+)(?:\?.+?)?$/;
+const SpotifyMatcher = /^https:\/\/open\.spotify\.com\/(track|album|artist|playlist|user|episode)\/(.+)(?:\?.+?)?$/;
 const SteamMatcher = /^https:\/\/(steamcommunity\.com|(?:help|store)\.steampowered\.com)\/.+$/;
 const EpicMatcher = /^https:\/\/store\.epicgames\.com\/(.+)$/;
 

From 86e94343cca10b950f2dc8d18d496d6db9f3b728 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 5 Nov 2023 02:07:33 +0100
Subject: [PATCH 166/632] bump to v1.6.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fa463823c..f3307d7d5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.6.2",
+    "version": "1.6.3",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 04d2dd26c412884e7699f4a104bda4ac6259b995 Mon Sep 17 00:00:00 2001
From: Marvin Witt <nurmarvinwitt@proton.me>
Date: Sun, 5 Nov 2023 02:06:08 +0100
Subject: [PATCH 167/632] fix(dearrow): don't replace thumbnail if only
 original available (#1959)

---
 src/plugins/dearrow/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/dearrow/index.tsx b/src/plugins/dearrow/index.tsx
index c6bf4e05d..f6b9ef952 100644
--- a/src/plugins/dearrow/index.tsx
+++ b/src/plugins/dearrow/index.tsx
@@ -63,7 +63,7 @@ async function embedDidMount(this: Component<Props>) {
             embed.rawTitle = titles[0].title;
         }
 
-        if (thumbnails[0]?.votes >= 0) {
+        if (thumbnails[0]?.votes >= 0 && thumbnails[0].timestamp) {
             embed.dearrow.oldThumb = embed.thumbnail.proxyURL;
             embed.thumbnail.proxyURL = `https://dearrow-thumb.ajay.app/api/v1/getThumbnail?videoID=${videoId}&time=${thumbnails[0].timestamp}`;
         }

From 32f204319394ca7545e779b0d5ffb415d64a6e56 Mon Sep 17 00:00:00 2001
From: zImPatrick <23613354+zImPatrick@users.noreply.github.com>
Date: Tue, 7 Nov 2023 19:58:10 +0100
Subject: [PATCH 168/632] Fix FakeNitro sticker bypass (#1964)

---
 src/plugins/fakeNitro/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index e4311106d..4d6b7957b 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -206,10 +206,10 @@ export default definePlugin({
         },
         // Allow stickers to be sent everywhere
         {
-            find: "canUseStickersEverywhere:function",
+            find: "canUseCustomStickersEverywhere:function",
             predicate: () => settings.store.enableStickerBypass,
             replacement: {
-                match: /canUseStickersEverywhere:function\(\i\){/,
+                match: /canUseCustomStickersEverywhere:function\(\i\){/,
                 replace: "$&return true;"
             },
         },

From 119b628f331e9282342df213f941851f98630ebb Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 9 Nov 2023 02:32:34 +0100
Subject: [PATCH 169/632] feat: simple plugin natives (#1965)

---
 scripts/build/build.mjs                       | 64 ++++++++++++++-
 scripts/build/common.mjs                      | 12 ++-
 src/VencordNative.ts                          | 20 +++--
 src/main/ipcPlugins.ts                        | 77 ++++---------------
 src/modules.d.ts                              |  5 ++
 .../fixSpotifyEmbeds.desktop/native.ts        | 27 +++++++
 src/plugins/openInApp/index.ts                |  6 +-
 src/plugins/openInApp/native.ts               | 31 ++++++++
 src/plugins/voiceMessages/DesktopRecorder.tsx |  5 +-
 src/plugins/voiceMessages/native.ts           | 24 ++++++
 src/utils/IpcEvents.ts                        |  2 +
 src/utils/types.ts                            |  7 ++
 12 files changed, 200 insertions(+), 80 deletions(-)
 create mode 100644 src/plugins/fixSpotifyEmbeds.desktop/native.ts
 create mode 100644 src/plugins/openInApp/native.ts
 create mode 100644 src/plugins/voiceMessages/native.ts

diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs
index f606f1b08..89cca7e47 100755
--- a/scripts/build/build.mjs
+++ b/scripts/build/build.mjs
@@ -18,8 +18,10 @@
 */
 
 import esbuild from "esbuild";
+import { readdir } from "fs/promises";
+import { join } from "path";
 
-import { BUILD_TIMESTAMP, commonOpts, globPlugins, isStandalone, updaterDisabled, VERSION, watch } from "./common.mjs";
+import { BUILD_TIMESTAMP, commonOpts, existsAsync, globPlugins, isStandalone, updaterDisabled, VERSION, watch } from "./common.mjs";
 
 const defines = {
     IS_STANDALONE: isStandalone,
@@ -43,13 +45,59 @@ const nodeCommonOpts = {
     format: "cjs",
     platform: "node",
     target: ["esnext"],
-    external: ["electron", "original-fs", ...commonOpts.external],
+    external: ["electron", "original-fs", "~pluginNatives", ...commonOpts.external],
     define: defines,
 };
 
 const sourceMapFooter = s => watch ? "" : `//# sourceMappingURL=vencord://${s}.js.map`;
 const sourcemap = watch ? "inline" : "external";
 
+/**
+ * @type {import("esbuild").Plugin}
+ */
+const globNativesPlugin = {
+    name: "glob-natives-plugin",
+    setup: build => {
+        const filter = /^~pluginNatives$/;
+        build.onResolve({ filter }, args => {
+            return {
+                namespace: "import-natives",
+                path: args.path
+            };
+        });
+
+        build.onLoad({ filter, namespace: "import-natives" }, async () => {
+            const pluginDirs = ["plugins", "userplugins"];
+            let code = "";
+            let natives = "\n";
+            let i = 0;
+            for (const dir of pluginDirs) {
+                const dirPath = join("src", dir);
+                if (!await existsAsync(dirPath)) continue;
+                const plugins = await readdir(dirPath);
+                for (const p of plugins) {
+                    if (!await existsAsync(join(dirPath, p, "native.ts"))) continue;
+
+                    const nameParts = p.split(".");
+                    const namePartsWithoutTarget = nameParts.length === 1 ? nameParts : nameParts.slice(0, -1);
+                    // pluginName.thing.desktop -> PluginName.thing
+                    const cleanPluginName = p[0].toUpperCase() + namePartsWithoutTarget.join(".").slice(1);
+
+                    const mod = `p${i}`;
+                    code += `import * as ${mod} from "./${dir}/${p}/native";\n`;
+                    natives += `${JSON.stringify(cleanPluginName)}:${mod},\n`;
+                    i++;
+                }
+            }
+            code += `export default {${natives}};`;
+            return {
+                contents: code,
+                resolveDir: "./src"
+            };
+        });
+    }
+};
+
 await Promise.all([
     // Discord Desktop main & renderer & preload
     esbuild.build({
@@ -62,7 +110,11 @@ await Promise.all([
             ...defines,
             IS_DISCORD_DESKTOP: true,
             IS_VESKTOP: false
-        }
+        },
+        plugins: [
+            ...nodeCommonOpts.plugins,
+            globNativesPlugin
+        ]
     }),
     esbuild.build({
         ...commonOpts,
@@ -107,7 +159,11 @@ await Promise.all([
             ...defines,
             IS_DISCORD_DESKTOP: false,
             IS_VESKTOP: true
-        }
+        },
+        plugins: [
+            ...nodeCommonOpts.plugins,
+            globNativesPlugin
+        ]
     }),
     esbuild.build({
         ...commonOpts,
diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
index 8efe2be60..5488b1b3b 100644
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@@ -20,8 +20,8 @@ import "../suppressExperimentalWarnings.js";
 import "../checkNodeVersion.js";
 
 import { exec, execSync } from "child_process";
-import { existsSync, readFileSync } from "fs";
-import { readdir, readFile } from "fs/promises";
+import { constants as FsConstants, readFileSync } from "fs";
+import { access, readdir, readFile } from "fs/promises";
 import { join, relative } from "path";
 import { promisify } from "util";
 
@@ -47,6 +47,12 @@ export const banner = {
 
 const isWeb = process.argv.slice(0, 2).some(f => f.endsWith("buildWeb.mjs"));
 
+export function existsAsync(path) {
+    return access(path, FsConstants.F_OK)
+        .then(() => true)
+        .catch(() => false);
+}
+
 // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
 /**
  * @type {import("esbuild").Plugin}
@@ -79,7 +85,7 @@ export const globPlugins = kind => ({
             let plugins = "\n";
             let i = 0;
             for (const dir of pluginDirs) {
-                if (!existsSync(`./src/${dir}`)) continue;
+                if (!await existsAsync(`./src/${dir}`)) continue;
                 const files = await readdir(`./src/${dir}`);
                 for (const file of files) {
                     if (file.startsWith("_") || file.startsWith(".")) continue;
diff --git a/src/VencordNative.ts b/src/VencordNative.ts
index dd97b5d26..0faa5569b 100644
--- a/src/VencordNative.ts
+++ b/src/VencordNative.ts
@@ -7,6 +7,7 @@
 import { IpcEvents } from "@utils/IpcEvents";
 import { IpcRes } from "@utils/types";
 import { ipcRenderer } from "electron";
+import { PluginIpcMappings } from "main/ipcPlugins";
 import type { UserThemeHeader } from "main/themes";
 
 function invoke<T = any>(event: IpcEvents, ...args: any[]) {
@@ -17,6 +18,16 @@ export function sendSync<T = any>(event: IpcEvents, ...args: any[]) {
     return ipcRenderer.sendSync(event, ...args) as T;
 }
 
+const PluginHelpers = {} as Record<string, Record<string, (...args: any[]) => Promise<any>>>;
+const pluginIpcMap = sendSync<PluginIpcMappings>(IpcEvents.GET_PLUGIN_IPC_METHOD_MAP);
+
+for (const [plugin, methods] of Object.entries(pluginIpcMap)) {
+    const map = PluginHelpers[plugin] = {};
+    for (const [methodName, method] of Object.entries(methods)) {
+        map[methodName] = (...args: any[]) => invoke(method as IpcEvents, ...args);
+    }
+}
+
 export default {
     themes: {
         uploadTheme: (fileName: string, fileData: string) => invoke<void>(IpcEvents.UPLOAD_THEME, fileName, fileData),
@@ -61,12 +72,5 @@ export default {
         openExternal: (url: string) => invoke<void>(IpcEvents.OPEN_EXTERNAL, url)
     },
 
-    pluginHelpers: {
-        OpenInApp: {
-            resolveRedirect: (url: string) => invoke<string>(IpcEvents.OPEN_IN_APP__RESOLVE_REDIRECT, url),
-        },
-        VoiceMessages: {
-            readRecording: (path: string) => invoke<Uint8Array | null>(IpcEvents.VOICE_MESSAGES_READ_RECORDING, path),
-        }
-    }
+    pluginHelpers: PluginHelpers
 };
diff --git a/src/main/ipcPlugins.ts b/src/main/ipcPlugins.ts
index 3034fb436..5d679fc0b 100644
--- a/src/main/ipcPlugins.ts
+++ b/src/main/ipcPlugins.ts
@@ -17,73 +17,26 @@
 */
 
 import { IpcEvents } from "@utils/IpcEvents";
-import { app, ipcMain } from "electron";
-import { readFile } from "fs/promises";
-import { request } from "https";
-import { basename, normalize } from "path";
+import { ipcMain } from "electron";
 
-import { getSettings } from "./ipcMain";
+import PluginNatives from "~pluginNatives";
 
-// FixSpotifyEmbeds
-app.on("browser-window-created", (_, win) => {
-    win.webContents.on("frame-created", (_, { frame }) => {
-        frame.once("dom-ready", () => {
-            if (frame.url.startsWith("https://open.spotify.com/embed/")) {
-                const settings = getSettings().plugins?.FixSpotifyEmbeds;
-                if (!settings?.enabled) return;
+const PluginIpcMappings = {} as Record<string, Record<string, string>>;
+export type PluginIpcMappings = typeof PluginIpcMappings;
 
-                frame.executeJavaScript(`
-                    const original = Audio.prototype.play;
-                    Audio.prototype.play = function() {
-                        this.volume = ${(settings.volume / 100) || 0.1};
-                        return original.apply(this, arguments);
-                    }
-                `);
-            }
-        });
-    });
-});
+for (const [plugin, methods] of Object.entries(PluginNatives)) {
+    const entries = Object.entries(methods);
+    if (!entries.length) continue;
 
-// #region OpenInApp
-// These links don't support CORS, so this has to be native
-const validRedirectUrls = /^https:\/\/(spotify\.link|s\.team)\/.+$/;
+    const mappings = PluginIpcMappings[plugin] = {};
 
-function getRedirect(url: string) {
-    return new Promise<string>((resolve, reject) => {
-        const req = request(new URL(url), { method: "HEAD" }, res => {
-            resolve(
-                res.headers.location
-                    ? getRedirect(res.headers.location)
-                    : url
-            );
-        });
-        req.on("error", reject);
-        req.end();
-    });
+    for (const [methodName, method] of entries) {
+        const key = `VencordPluginNative_${plugin}_${methodName}`;
+        ipcMain.handle(key, method);
+        mappings[methodName] = key;
+    }
 }
 
-ipcMain.handle(IpcEvents.OPEN_IN_APP__RESOLVE_REDIRECT, async (_, url: string) => {
-    if (!validRedirectUrls.test(url)) return url;
-
-    return getRedirect(url);
+ipcMain.on(IpcEvents.GET_PLUGIN_IPC_METHOD_MAP, e => {
+    e.returnValue = PluginIpcMappings;
 });
-// #endregion
-
-
-// #region VoiceMessages
-ipcMain.handle(IpcEvents.VOICE_MESSAGES_READ_RECORDING, async (_, filePath: string) => {
-    filePath = normalize(filePath);
-    const filename = basename(filePath);
-    const discordBaseDirWithTrailingSlash = normalize(app.getPath("userData") + "/");
-    console.log(filename, discordBaseDirWithTrailingSlash, filePath);
-    if (filename !== "recording.ogg" || !filePath.startsWith(discordBaseDirWithTrailingSlash)) return null;
-
-    try {
-        const buf = await readFile(filePath);
-        return new Uint8Array(buf.buffer);
-    } catch {
-        return null;
-    }
-});
-
-// #endregion
diff --git a/src/modules.d.ts b/src/modules.d.ts
index d75a84f74..24f34664d 100644
--- a/src/modules.d.ts
+++ b/src/modules.d.ts
@@ -24,6 +24,11 @@ declare module "~plugins" {
     export default plugins;
 }
 
+declare module "~pluginNatives" {
+    const pluginNatives: Record<string, Record<string, (event: Electron.IpcMainInvokeEvent, ...args: unknown[]) => unknown>>;
+    export default pluginNatives;
+}
+
 declare module "~git-hash" {
     const hash: string;
     export default hash;
diff --git a/src/plugins/fixSpotifyEmbeds.desktop/native.ts b/src/plugins/fixSpotifyEmbeds.desktop/native.ts
new file mode 100644
index 000000000..f779c400a
--- /dev/null
+++ b/src/plugins/fixSpotifyEmbeds.desktop/native.ts
@@ -0,0 +1,27 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { app } from "electron";
+import { getSettings } from "main/ipcMain";
+
+app.on("browser-window-created", (_, win) => {
+    win.webContents.on("frame-created", (_, { frame }) => {
+        frame.once("dom-ready", () => {
+            if (frame.url.startsWith("https://open.spotify.com/embed/")) {
+                const settings = getSettings().plugins?.FixSpotifyEmbeds;
+                if (!settings?.enabled) return;
+
+                frame.executeJavaScript(`
+                    const original = Audio.prototype.play;
+                    Audio.prototype.play = function() {
+                        this.volume = ${(settings.volume / 100) || 0.1};
+                        return original.apply(this, arguments);
+                    }
+                `);
+            }
+        });
+    });
+});
diff --git a/src/plugins/openInApp/index.ts b/src/plugins/openInApp/index.ts
index 5a2641e2a..0835c0612 100644
--- a/src/plugins/openInApp/index.ts
+++ b/src/plugins/openInApp/index.ts
@@ -18,7 +18,7 @@
 
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
+import definePlugin, { OptionType, PluginNative } from "@utils/types";
 import { showToast, Toasts } from "@webpack/common";
 import type { MouseEvent } from "react";
 
@@ -45,6 +45,8 @@ const settings = definePluginSettings({
     }
 });
 
+const Native = VencordNative.pluginHelpers.OpenInApp as PluginNative<typeof import("./native")>;
+
 export default definePlugin({
     name: "OpenInApp",
     description: "Open Spotify, Steam and Epic Games URLs in their respective apps instead of your browser",
@@ -84,7 +86,7 @@ export default definePlugin({
         if (!IS_WEB && ShortUrlMatcher.test(url)) {
             event?.preventDefault();
             // CORS jumpscare
-            url = await VencordNative.pluginHelpers.OpenInApp.resolveRedirect(url);
+            url = await Native.resolveRedirect(url);
         }
 
         spotify: {
diff --git a/src/plugins/openInApp/native.ts b/src/plugins/openInApp/native.ts
new file mode 100644
index 000000000..25637422c
--- /dev/null
+++ b/src/plugins/openInApp/native.ts
@@ -0,0 +1,31 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { IpcMainInvokeEvent } from "electron";
+import { request } from "https";
+
+// These links don't support CORS, so this has to be native
+const validRedirectUrls = /^https:\/\/(spotify\.link|s\.team)\/.+$/;
+
+function getRedirect(url: string) {
+    return new Promise<string>((resolve, reject) => {
+        const req = request(new URL(url), { method: "HEAD" }, res => {
+            resolve(
+                res.headers.location
+                    ? getRedirect(res.headers.location)
+                    : url
+            );
+        });
+        req.on("error", reject);
+        req.end();
+    });
+}
+
+export async function resolveRedirect(_: IpcMainInvokeEvent, url: string) {
+    if (!validRedirectUrls.test(url)) return url;
+
+    return getRedirect(url);
+}
diff --git a/src/plugins/voiceMessages/DesktopRecorder.tsx b/src/plugins/voiceMessages/DesktopRecorder.tsx
index 36f6a60ab..a69739a41 100644
--- a/src/plugins/voiceMessages/DesktopRecorder.tsx
+++ b/src/plugins/voiceMessages/DesktopRecorder.tsx
@@ -16,11 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { PluginNative } from "@utils/types";
 import { Button, showToast, Toasts, useState } from "@webpack/common";
 
 import type { VoiceRecorder } from ".";
 import { settings } from "./settings";
 
+const Native = VencordNative.pluginHelpers.VoiceMessages as PluginNative<typeof import("./native")>;
+
 export const VoiceRecorderDesktop: VoiceRecorder = ({ setAudioBlob, onRecordingChange }) => {
     const [recording, setRecording] = useState(false);
 
@@ -49,7 +52,7 @@ export const VoiceRecorderDesktop: VoiceRecorder = ({ setAudioBlob, onRecordingC
         } else {
             discordVoice.stopLocalAudioRecording(async (filePath: string) => {
                 if (filePath) {
-                    const buf = await VencordNative.pluginHelpers.VoiceMessages.readRecording(filePath);
+                    const buf = await Native.readRecording(filePath);
                     if (buf)
                         setAudioBlob(new Blob([buf], { type: "audio/ogg; codecs=opus" }));
                     else
diff --git a/src/plugins/voiceMessages/native.ts b/src/plugins/voiceMessages/native.ts
new file mode 100644
index 000000000..bbc19c891
--- /dev/null
+++ b/src/plugins/voiceMessages/native.ts
@@ -0,0 +1,24 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { app } from "electron";
+import { readFile } from "fs/promises";
+import { basename, normalize } from "path";
+
+export async function readRecording(_, filePath: string) {
+    filePath = normalize(filePath);
+    const filename = basename(filePath);
+    const discordBaseDirWithTrailingSlash = normalize(app.getPath("userData") + "/");
+    console.log(filename, discordBaseDirWithTrailingSlash, filePath);
+    if (filename !== "recording.ogg" || !filePath.startsWith(discordBaseDirWithTrailingSlash)) return null;
+
+    try {
+        const buf = await readFile(filePath);
+        return new Uint8Array(buf.buffer);
+    } catch {
+        return null;
+    }
+}
diff --git a/src/utils/IpcEvents.ts b/src/utils/IpcEvents.ts
index 16bcfa659..2027df9cf 100644
--- a/src/utils/IpcEvents.ts
+++ b/src/utils/IpcEvents.ts
@@ -38,6 +38,8 @@ export const enum IpcEvents {
     BUILD = "VencordBuild",
     OPEN_MONACO_EDITOR = "VencordOpenMonacoEditor",
 
+    GET_PLUGIN_IPC_METHOD_MAP = "VencordGetPluginIpcMethodMap",
+
     OPEN_IN_APP__RESOLVE_REDIRECT = "VencordOIAResolveRedirect",
     VOICE_MESSAGES_READ_RECORDING = "VencordVMReadRecording",
 }
diff --git a/src/utils/types.ts b/src/utils/types.ts
index ff2c79af3..b32b127b0 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -307,3 +307,10 @@ export type PluginOptionBoolean = PluginSettingBooleanDef & PluginSettingCommon
 export type PluginOptionSelect = PluginSettingSelectDef & PluginSettingCommon & IsDisabled & IsValid<PluginSettingSelectOption>;
 export type PluginOptionSlider = PluginSettingSliderDef & PluginSettingCommon & IsDisabled & IsValid<number>;
 export type PluginOptionComponent = PluginSettingComponentDef & PluginSettingCommon;
+
+export type PluginNative<PluginExports extends Record<string, (event: Electron.IpcMainInvokeEvent, ...args: any[]) => any>> = {
+    [key in keyof PluginExports]:
+    PluginExports[key] extends (event: Electron.IpcMainInvokeEvent, ...args: infer Args) => infer Return
+    ? (...args: Args) => Return extends Promise<any> ? Return : Promise<Return>
+    : never;
+};

From 394d2060eb90e5d7104798026fa8a18a02a24d93 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Thu, 9 Nov 2023 08:34:40 +0700
Subject: [PATCH 170/632] searchReply: fix (#1961)

---
 src/plugins/searchReply/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/searchReply/index.tsx b/src/plugins/searchReply/index.tsx
index b28ca8ec4..b151712af 100644
--- a/src/plugins/searchReply/index.tsx
+++ b/src/plugins/searchReply/index.tsx
@@ -20,12 +20,12 @@ import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCal
 import { ReplyIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { findByCodeLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { ChannelStore, i18n, Menu, PermissionsBits, PermissionStore, SelectedChannelStore } from "@webpack/common";
 import { Message } from "discord-types/general";
 
 
-const replyFn = findByCodeLazy("showMentionToggle", "TEXTAREA_FOCUS", "shiftKey");
+const messageUtils = findByPropsLazy("replyToMessage");
 
 const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { message }: { message: Message; }) => () => {
     // make sure the message is in the selected channel
@@ -43,7 +43,7 @@ const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { messag
                 id="reply"
                 label={i18n.Messages.MESSAGE_ACTION_REPLY}
                 icon={ReplyIcon}
-                action={(e: React.MouseEvent) => replyFn(channel, message, e)}
+                action={(e: React.MouseEvent) => messageUtils.replyToMessage(channel, message, e)}
             />
         ));
     }
@@ -56,7 +56,7 @@ const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { messag
                 id="reply"
                 label={i18n.Messages.MESSAGE_ACTION_REPLY}
                 icon={ReplyIcon}
-                action={(e: React.MouseEvent) => replyFn(channel, message, e)}
+                action={(e: React.MouseEvent) => messageUtils.replyToMessage(channel, message, e)}
             />
         ));
     }

From 5edc94062c2940a415edb8d66fe9fb346b9cb4fb Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 9 Nov 2023 02:42:24 +0100
Subject: [PATCH 171/632] make packageManager key less specific

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f3307d7d5..1bc2129fb 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
         "typescript": "^5.0.4",
         "zip-local": "^0.3.5"
     },
-    "packageManager": "pnpm@8.1.1",
+    "packageManager": "^pnpm@8.1.1",
     "pnpm": {
         "patchedDependencies": {
             "eslint-plugin-path-alias@1.0.0": "patches/eslint-plugin-path-alias@1.0.0.patch",

From 9bd82943e3f178324e38eebe8a683cc1c1ded94c Mon Sep 17 00:00:00 2001
From: AM <antonickadoo@gmail.com>
Date: Thu, 9 Nov 2023 03:42:35 +0000
Subject: [PATCH 172/632] [Plugin] Super Reaction Tweaks (#1958)

Co-authored-by: V <vendicated@riseup.net>
Co-authored-by: Jack Matthews <jm5112356@gmail.com>
---
 src/plugins/superReactionTweaks/README.md | 11 ++++
 src/plugins/superReactionTweaks/index.ts  | 63 +++++++++++++++++++++++
 src/utils/constants.ts                    |  4 ++
 3 files changed, 78 insertions(+)
 create mode 100644 src/plugins/superReactionTweaks/README.md
 create mode 100644 src/plugins/superReactionTweaks/index.ts

diff --git a/src/plugins/superReactionTweaks/README.md b/src/plugins/superReactionTweaks/README.md
new file mode 100644
index 000000000..624ab8669
--- /dev/null
+++ b/src/plugins/superReactionTweaks/README.md
@@ -0,0 +1,11 @@
+# Super Reaction Tweaks
+
+This plugin applies configurable various tweaks to super reactions.
+
+![Screenshot](https://user-images.githubusercontent.com/22851444/281598795-58f07116-9f95-4f64-940b-23a5499f2302.png)
+
+## Features:
+
+**Super React By Default** -  The reaction picker will default to super reactions instead of normal reactions.
+
+**Super Reaction Play Limit** - Allows you to decide how many super reaction animations can play at once, including removing the limit entirely.
diff --git a/src/plugins/superReactionTweaks/index.ts b/src/plugins/superReactionTweaks/index.ts
new file mode 100644
index 000000000..2652eef07
--- /dev/null
+++ b/src/plugins/superReactionTweaks/index.ts
@@ -0,0 +1,63 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated, ant0n, FieryFlames and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+
+export const settings = definePluginSettings({
+    superReactByDefault: {
+        type: OptionType.BOOLEAN,
+        description: "Reaction picker will default to Super Reactions",
+        default: true,
+    },
+    unlimitedSuperReactionPlaying: {
+        type: OptionType.BOOLEAN,
+        description: "Remove the limit on Super Reactions playing at once",
+        default: false,
+    },
+
+    superReactionPlayingLimit: {
+        description: "Max Super Reactions to play at once",
+        type: OptionType.SLIDER,
+        default: 20,
+        markers: [5, 10, 20, 40, 60, 80, 100],
+        stickToMarkers: true,
+    },
+}, {
+    superReactionPlayingLimit: {
+        disabled() { return this.store.unlimitedSuperReactionPlaying; },
+    }
+});
+
+export default definePlugin({
+    name: "SuperReactionTweaks",
+    description: "Customize the limit of Super Reactions playing at once, and super react by default",
+    authors: [Devs.FieryFlames, Devs.ant0n],
+    patches: [
+        {
+            find: ",BURST_REACTION_EFFECT_PLAY",
+            replacement: {
+                match: /(?<=BURST_REACTION_EFFECT_PLAY:\i=>{.{50,100})(\i\(\i,\i\))>=\d+/,
+                replace: "!$self.shouldPlayBurstReaction($1)"
+            }
+        },
+        {
+            find: ".hasAvailableBurstCurrency)",
+            replacement: {
+                match: /(?<=\.useBurstReactionsExperiment.{0,20})useState\(!1\)(?=.+?(\i===\i\.EmojiIntention.REACTION))/,
+                replace: "useState($self.settings.store.superReactByDefault && $1)"
+            }
+        }
+    ],
+    settings,
+
+    shouldPlayBurstReaction(playingCount: number) {
+        if (settings.store.unlimitedSuperReactionPlaying) return true;
+        if (playingCount <= settings.store.superReactionPlayingLimit) return true;
+        return false;
+    }
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index aeadcdbfb..3db2e64f8 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -379,6 +379,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "ProffDea",
         id: 609329952180928513n
     },
+    ant0n: {
+        name: "ant0n",
+        id: 145224646868860928n
+    },
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly

From 96126fa39f910960ec10ccc089fe17e91c1a2afe Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 9 Nov 2023 07:15:49 +0100
Subject: [PATCH 173/632] remove pipebomb from github actions (#1968)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1bc2129fb..23d9dd272 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
         "typescript": "^5.0.4",
         "zip-local": "^0.3.5"
     },
-    "packageManager": "^pnpm@8.1.1",
+    "packageManager": "pnpm@8.10.2",
     "pnpm": {
         "patchedDependencies": {
             "eslint-plugin-path-alias@1.0.0": "patches/eslint-plugin-path-alias@1.0.0.patch",

From ea11f2244fde469ce308f8a4e7224430be62f8f1 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Mon, 13 Nov 2023 01:37:15 +0100
Subject: [PATCH 174/632] README: Add sponsors

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index cd54fcdc8..177e65be6 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,14 @@ Visit https://vencord.dev/download
 
 https://discord.gg/D9uwnFnqmd
 
+## Sponsors
+
+| **Thanks a lot to all Vencord [sponsors](https://github.com/sponsors/Vendicated)!!** |
+|:--:| 
+| [![](https://meow.vendicated.dev/sponsors.png)](https://github.com/sponsors/Vendicated) |
+| *generated using [github-sponsor-graph](https://github.com/Vendicated/github-sponsor-graph)* |
+
+
 ## Star History
 
 <a href="https://star-history.com/#Vendicated/Vencord&Timeline">

From 77d08c5c28121823dd5ba85265a9d09b832a2932 Mon Sep 17 00:00:00 2001
From: megumin <megumin.bakaretsurie@gmail.com>
Date: Sat, 11 Nov 2023 00:28:09 +0000
Subject: [PATCH 175/632] feat: Add Environment variable to disable updater
 auto-patching (#1971)

---
 src/main/patchWin32Updater.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/patchWin32Updater.ts b/src/main/patchWin32Updater.ts
index ba7a9224e..96717a5ad 100644
--- a/src/main/patchWin32Updater.ts
+++ b/src/main/patchWin32Updater.ts
@@ -32,6 +32,8 @@ function isNewer($new: string, old: string) {
 }
 
 function patchLatest() {
+    if (process.env.DISABLE_UPDATER_AUTO_PATCHING) return;
+
     try {
         const currentAppPath = dirname(process.execPath);
         const currentVersion = basename(currentAppPath);

From fd25b5f2968385741e36b5a6624a80d7ef14b61f Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Sun, 12 Nov 2023 15:33:34 -0500
Subject: [PATCH 176/632] fix(dearrow): support DeArrow thumbnail submissions
 at 0 seconds (#1979)

---
 src/plugins/dearrow/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/dearrow/index.tsx b/src/plugins/dearrow/index.tsx
index f6b9ef952..52cf1d530 100644
--- a/src/plugins/dearrow/index.tsx
+++ b/src/plugins/dearrow/index.tsx
@@ -50,7 +50,7 @@ async function embedDidMount(this: Component<Props>) {
         const { titles, thumbnails } = await res.json();
 
         const hasTitle = titles[0]?.votes >= 0;
-        const hasThumb = thumbnails[0]?.votes >= 0;
+        const hasThumb = thumbnails[0]?.votes >= 0 && !thumbnails[0].original;
 
         if (!hasTitle && !hasThumb) return;
 
@@ -58,12 +58,12 @@ async function embedDidMount(this: Component<Props>) {
             enabled: true
         };
 
-        if (titles[0]?.votes >= 0) {
+        if (hasTitle) {
             embed.dearrow.oldTitle = embed.rawTitle;
             embed.rawTitle = titles[0].title;
         }
 
-        if (thumbnails[0]?.votes >= 0 && thumbnails[0].timestamp) {
+        if (hasThumb) {
             embed.dearrow.oldThumb = embed.thumbnail.proxyURL;
             embed.thumbnail.proxyURL = `https://dearrow-thumb.ajay.app/api/v1/getThumbnail?videoID=${videoId}&time=${thumbnails[0].timestamp}`;
         }

From 7b248ee30952eccd880a93dfe1209d8da188b809 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 15 Nov 2023 14:50:52 -0300
Subject: [PATCH 177/632] Fix SHC patches

---
 src/plugins/showHiddenChannels/index.tsx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 95b16d625..4e275d647 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -68,7 +68,7 @@ export default definePlugin({
     patches: [
         {
             // RenderLevel defines if a channel is hidden, collapsed in category, visible, etc
-            find: ".CannotShow=",
+            find: '"placeholder-channel-id"',
             replacement: [
                 // Remove the special logic for channels we don't have access to
                 {
@@ -82,13 +82,8 @@ export default definePlugin({
                 },
                 // Make channels we dont have access to be the same level as normal ones
                 {
-                    match: /(?<=renderLevel:(\i\(this,\i\)\?\i\.Show:\i\.WouldShowIfUncollapsed).+?renderLevel:).+?(?=,)/,
-                    replace: (_, renderLevelExpression) => renderLevelExpression
-                },
-                // Make channels we dont have access to be the same level as normal ones
-                {
-                    match: /(?<=activeJoinedRelevantThreads.+?renderLevel:.+?,threadIds:\i\(this.record.+?renderLevel:)(\i)\..+?(?=,)/,
-                    replace: (_, RenderLevels) => `${RenderLevels}.Show`
+                    match: /(activeJoinedRelevantThreads:.{0,50}VIEW_CHANNEL.+?renderLevel:(.+?),threadIds.+?renderLevel:).+?(?=,threadIds)/g,
+                    replace: (_, rest, defaultRenderLevel) => `${rest}${defaultRenderLevel}`
                 },
                 // Remove permission checking for getRenderLevel function
                 {

From af614465a49cdd70038cf089b195855a7fa1f18c Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 15 Nov 2023 14:54:48 -0300
Subject: [PATCH 178/632] Remove obsolete experiments patch

---
 src/plugins/experiments/index.tsx | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx
index 89fcf33e7..f8ea4b04a 100644
--- a/src/plugins/experiments/index.tsx
+++ b/src/plugins/experiments/index.tsx
@@ -77,15 +77,6 @@ export default definePlugin({
                 }
             ]
         },
-        // Fix search history being disabled / broken with isStaff
-        {
-            find: '("showNewSearch")',
-            predicate: () => settings.store.enableIsStaff,
-            replacement: {
-                match: /(?<=showNewSearch"\);return)\s?/,
-                replace: "!1&&"
-            }
-        },
         {
             find: 'H1,title:"Experiments"',
             replacement: {

From 3ea6a967153db9150e809f2050b40fa5b4e54a00 Mon Sep 17 00:00:00 2001
From: Jack <30497388+FieryFlames@users.noreply.github.com>
Date: Wed, 15 Nov 2023 13:01:50 -0500
Subject: [PATCH 179/632] chore: Fix PinDMs patch (#1981)

---
 src/plugins/pinDms/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index ac5957b33..792bdab6a 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -100,10 +100,10 @@ export default definePlugin({
                 },
                 {
                     // Fix getRowHeight's check for whether this is the DMs section
-                    // section === DMS
-                    match: /===\i\.DMS&&0/,
-                    // section -1 === DMS
-                    replace: "-1$&"
+                    // DMS (inlined) === section
+                    match: /(?<=getRowHeight=\(.{2,50}?)1===\i/,
+                    // DMS (inlined) === section - 1
+                    replace: "$&-1"
                 },
                 {
                     // Override scrollToChannel to properly account for pinned channels

From c080a0eaacd34e813800db4f6b632d62a9633a3b Mon Sep 17 00:00:00 2001
From: Thoth <54485853+xero-lib@users.noreply.github.com>
Date: Wed, 15 Nov 2023 12:09:26 -0600
Subject: [PATCH 180/632] shikiCodeblocks: transform lang to lower case to
 avoid failing detection (#1990)

---
 src/plugins/shikiCodeblocks.desktop/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/shikiCodeblocks.desktop/index.ts b/src/plugins/shikiCodeblocks.desktop/index.ts
index 12c8c858d..f358497d2 100644
--- a/src/plugins/shikiCodeblocks.desktop/index.ts
+++ b/src/plugins/shikiCodeblocks.desktop/index.ts
@@ -67,7 +67,7 @@ export default definePlugin({
     createHighlighter,
     renderHighlighter: ({ lang, content }: { lang: string; content: string; }) => {
         return createHighlighter({
-            lang,
+            lang: lang?.toLowerCase(),
             content,
             isPreview: false,
         });

From 6578eb487ea16e04fdf704f19a57268aa8078f11 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Thu, 16 Nov 2023 01:13:19 +0700
Subject: [PATCH 181/632] MessageLogger: fix attachment ignore (#1989)

---
 src/plugins/messageLogger/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index 36f9ab3f9..ac43a9f0c 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -302,6 +302,7 @@ export default definePlugin({
                     match: /attachments:(\i)\((\i)\)/,
                     replace:
                         "attachments: $1((() => {" +
+                        "   if ($self.shouldIgnore($2)) return $2;" +
                         "   let old = arguments[1]?.attachments;" +
                         "   if (!old) return $2;" +
                         "   let new_ = $2.attachments?.map(a => a.id) ?? [];" +

From 4a2657f928bdf88514eae707787f2b26d74da9db Mon Sep 17 00:00:00 2001
From: megumin <megumin.bakaretsurie@gmail.com>
Date: Wed, 15 Nov 2023 18:15:43 +0000
Subject: [PATCH 182/632] fix(channeltags): message author should be clyde
 (#644) (#1986)

---
 src/plugins/messageTags/index.ts | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/plugins/messageTags/index.ts b/src/plugins/messageTags/index.ts
index d65c388c3..66de9d661 100644
--- a/src/plugins/messageTags/index.ts
+++ b/src/plugins/messageTags/index.ts
@@ -25,10 +25,6 @@ import definePlugin, { OptionType } from "@utils/types";
 const EMOTE = "<:luna:1035316192220553236>";
 const DATA_KEY = "MessageTags_TAGS";
 const MessageTagsMarker = Symbol("MessageTags");
-const author = {
-    id: "821472922140803112",
-    bot: false
-};
 
 interface Tag {
     name: string;
@@ -59,14 +55,12 @@ function createTagCommand(tag: Tag) {
         execute: async (_, ctx) => {
             if (!await getTag(tag.name)) {
                 sendBotMessage(ctx.channel.id, {
-                    author,
                     content: `${EMOTE} The tag **${tag.name}** does not exist anymore! Please reload ur Discord to fix :)`
                 });
                 return { content: `/${tag.name}` };
             }
 
             if (Settings.plugins.MessageTags.clyde) sendBotMessage(ctx.channel.id, {
-                author,
                 content: `${EMOTE} The tag **${tag.name}** has been sent!`
             });
             return { content: tag.message.replaceAll("\\n", "\n") };
@@ -162,7 +156,6 @@ export default definePlugin({
 
                         if (await getTag(name))
                             return sendBotMessage(ctx.channel.id, {
-                                author,
                                 content: `${EMOTE} A Tag with the name **${name}** already exists!`
                             });
 
@@ -176,7 +169,6 @@ export default definePlugin({
                         await addTag(tag);
 
                         sendBotMessage(ctx.channel.id, {
-                            author,
                             content: `${EMOTE} Successfully created the tag **${name}**!`
                         });
                         break; // end 'create'
@@ -186,7 +178,6 @@ export default definePlugin({
 
                         if (!await getTag(name))
                             return sendBotMessage(ctx.channel.id, {
-                                author,
                                 content: `${EMOTE} A Tag with the name **${name}** does not exist!`
                             });
 
@@ -194,14 +185,12 @@ export default definePlugin({
                         await removeTag(name);
 
                         sendBotMessage(ctx.channel.id, {
-                            author,
                             content: `${EMOTE} Successfully deleted the tag **${name}**!`
                         });
                         break; // end 'delete'
                     }
                     case "list": {
                         sendBotMessage(ctx.channel.id, {
-                            author,
                             embeds: [
                                 {
                                     // @ts-ignore
@@ -224,12 +213,10 @@ export default definePlugin({
 
                         if (!tag)
                             return sendBotMessage(ctx.channel.id, {
-                                author,
                                 content: `${EMOTE} A Tag with the name **${name}** does not exist!`
                             });
 
                         sendBotMessage(ctx.channel.id, {
-                            author,
                             content: tag.message.replaceAll("\\n", "\n")
                         });
                         break; // end 'preview'
@@ -237,7 +224,6 @@ export default definePlugin({
 
                     default: {
                         sendBotMessage(ctx.channel.id, {
-                            author,
                             content: "Invalid sub-command"
                         });
                         break;

From 45aa9fbb6d1dadcc1746a5a197a6812b41e3215c Mon Sep 17 00:00:00 2001
From: Justice Almanzar <superdash993@gmail.com>
Date: Wed, 15 Nov 2023 18:30:31 +0000
Subject: [PATCH 183/632] Fix hljs find (#1983)

---
 src/webpack/common/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 04df3c07d..8376925e5 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -31,7 +31,7 @@ waitFor(["ComponentDispatch", "ComponentDispatcher"], m => ComponentDispatch = m
 export const RestAPI: t.RestAPI = findByPropsLazy("getAPIBaseURL", "get");
 export const moment: typeof import("moment") = findByPropsLazy("parseTwoDigitYear");
 
-export const hljs: typeof import("highlight.js") = findByPropsLazy("highlight");
+export const hljs: typeof import("highlight.js") = findByPropsLazy("highlight", "registerLanguage");
 
 export const lodash: typeof import("lodash") = findByPropsLazy("debounce", "cloneDeep");
 

From 77749ed5e1e913d0c5c8ce0995a9fdc12cde7ccb Mon Sep 17 00:00:00 2001
From: adryd <me@adryd.com>
Date: Wed, 15 Nov 2023 19:26:35 -0500
Subject: [PATCH 184/632] oneko: update script version (#1994)

---
 src/plugins/oneko/index.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/plugins/oneko/index.ts b/src/plugins/oneko/index.ts
index d95ba2bc9..c5de470e1 100644
--- a/src/plugins/oneko/index.ts
+++ b/src/plugins/oneko/index.ts
@@ -26,15 +26,13 @@ export default definePlugin({
     authors: [Devs.Ven, Devs.adryd],
 
     start() {
-        fetch("https://raw.githubusercontent.com/adryd325/oneko.js/5977144dce83e4d71af1de005d16e38eebeb7b72/oneko.js")
+        fetch("https://raw.githubusercontent.com/adryd325/oneko.js/8fa8a1864aa71cd7a794d58bc139e755e96a236c/oneko.js")
             .then(x => x.text())
             .then(s => s.replace("./oneko.gif", "https://raw.githubusercontent.com/adryd325/oneko.js/14bab15a755d0e35cd4ae19c931d96d306f99f42/oneko.gif"))
             .then(eval);
     },
 
     stop() {
-        clearInterval(window.onekoInterval);
-        delete window.onekoInterval;
         document.getElementById("oneko")?.remove();
     }
 });

From 4a5371a746c03125eefb8d5a35a6037ac56c0439 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 16 Nov 2023 05:40:50 +0100
Subject: [PATCH 185/632] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 177e65be6..8611babd7 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,9 @@
 
 The cutest Discord client mod
 
-![image](https://github.com/Vendicated/Vencord/assets/45497981/706722b1-32de-4d99-bee9-93993b504334)
+| ![image](https://github.com/Vendicated/Vencord/assets/45497981/706722b1-32de-4d99-bee9-93993b504334) |
+|:--:|
+| A screenshot of vencord showcasing the [vencord-theme](https://github.com/synqat/vencord-theme) |
 
 ## Features
 

From 9980c0d04f7fe5ac8002988b4ae29edb1b514b32 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 18 Nov 2023 22:53:50 -0300
Subject: [PATCH 186/632] IgnoreActivities: fix and improvements

---
 src/plugins/ignoreActivities/index.tsx | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/plugins/ignoreActivities/index.tsx b/src/plugins/ignoreActivities/index.tsx
index 0b42a8b0b..4e747f363 100644
--- a/src/plugins/ignoreActivities/index.tsx
+++ b/src/plugins/ignoreActivities/index.tsx
@@ -8,7 +8,6 @@ import * as DataStore from "@api/DataStore";
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import { useForceUpdater } from "@utils/react";
 import definePlugin from "@utils/types";
 import { findStoreLazy } from "@webpack";
 import { StatusSettingsStores, Tooltip } from "webpack/common";
@@ -27,14 +26,12 @@ interface IgnoredActivity {
 const RunningGameStore = findStoreLazy("RunningGameStore");
 
 function ToggleIcon(activity: IgnoredActivity, tooltipText: string, path: string, fill: string) {
-    const forceUpdate = useForceUpdater();
-
     return (
         <Tooltip text={tooltipText}>
             {tooltipProps => (
                 <button
                     {...tooltipProps}
-                    onClick={e => handleActivityToggle(e, activity, forceUpdate)}
+                    onClick={e => handleActivityToggle(e, activity)}
                     style={{ all: "unset", cursor: "pointer", display: "flex", justifyContent: "center", alignItems: "center" }}
                 >
                     <svg
@@ -54,11 +51,14 @@ const ToggleIconOn = (activity: IgnoredActivity, fill: string) => ToggleIcon(act
 const ToggleIconOff = (activity: IgnoredActivity, fill: string) => ToggleIcon(activity, "Enable Activity", "m644-428-58-58q9-47-27-88t-93-32l-58-58q17-8 34.5-12t37.5-4q75 0 127.5 52.5T660-500q0 20-4 37.5T644-428Zm128 126-58-56q38-29 67.5-63.5T832-500q-50-101-143.5-160.5T480-720q-29 0-57 4t-55 12l-62-62q41-17 84-25.5t90-8.5q151 0 269 83.5T920-500q-23 59-60.5 109.5T772-302Zm20 246L624-222q-35 11-70.5 16.5T480-200q-151 0-269-83.5T40-500q21-53 53-98.5t73-81.5L56-792l56-56 736 736-56 56ZM222-624q-29 26-53 57t-41 67q50 101 143.5 160.5T480-280q20 0 39-2.5t39-5.5l-36-38q-11 3-21 4.5t-21 1.5q-75 0-127.5-52.5T300-500q0-11 1.5-21t4.5-21l-84-82Zm319 93Zm-151 75Z", fill);
 
 function ToggleActivityComponent(activity: IgnoredActivity, isPlaying = false) {
-    if (getIgnoredActivities().some(act => act.id === activity.id)) return ToggleIconOff(activity, "var(--status-danger)");
+    const s = settings.use(["ignoredActivities"]);
+    const { ignoredActivities = [] } = s;
+
+    if (ignoredActivities.some(act => act.id === activity.id)) return ToggleIconOff(activity, "var(--status-danger)");
     return ToggleIconOn(activity, isPlaying ? "var(--green-300)" : "var(--primary-400)");
 }
 
-function handleActivityToggle(e: React.MouseEvent<HTMLButtonElement, MouseEvent>, activity: IgnoredActivity, forceUpdateButton: () => void) {
+function handleActivityToggle(e: React.MouseEvent<HTMLButtonElement, MouseEvent>, activity: IgnoredActivity) {
     e.stopPropagation();
 
     const ignoredActivityIndex = getIgnoredActivities().findIndex(act => act.id === activity.id);
@@ -67,7 +67,6 @@ function handleActivityToggle(e: React.MouseEvent<HTMLButtonElement, MouseEvent>
 
     // Trigger activities recalculation
     StatusSettingsStores.ShowCurrentGame.updateSetting(old => old);
-    forceUpdateButton();
 }
 
 const settings = definePluginSettings({}).withPrivateSettings<{
@@ -90,8 +89,8 @@ export default definePlugin({
             find: '.displayName="LocalActivityStore"',
             replacement: [
                 {
-                    match: /LISTENING.+?}\),(?<=(\i)\.push.+?)/,
-                    replace: (m, activities) => `${m}${activities}=${activities}.filter($self.isActivityNotIgnored),`
+                    match: /HANG_STATUS.+?(?=!\i\(\i,\i\)&&)(?<=(\i)\.push.+?)/,
+                    replace: (m, activities) => `${m}${activities}=${activities}.filter($self.isActivityNotIgnored);`
                 }
             ]
         },

From 6ab4cf0a0ba07188bbd54c3098977cff9e32290e Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Mon, 20 Nov 2023 23:16:34 -0300
Subject: [PATCH 187/632] Fix broken patches due to unread changes

---
 src/plugins/showHiddenChannels/index.tsx | 14 +++++++-------
 src/plugins/typingIndicator/index.tsx    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 4e275d647..f242146c9 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -77,7 +77,7 @@ export default definePlugin({
                 },
                 // Do not check for unreads when selecting the render level if the channel is hidden
                 {
-                    match: /(?=!1===\i.\i\.hasRelevantUnread\(this\.record\))/,
+                    match: /(?=!\(0,\i\.getHasImportantUnread\)\(this\.record\))/,
                     replace: "$self.isHiddenChannel(this.record)||"
                 },
                 // Make channels we dont have access to be the same level as normal ones
@@ -152,7 +152,7 @@ export default definePlugin({
             }
         },
         {
-            find: ".UNREAD_HIGHLIGHT",
+            find: "UNREAD_IMPORTANT:",
             predicate: () => settings.store.showMode === ShowMode.HiddenIconWithMutedStyle,
             replacement: [
                 // Make the channel appear as muted if it's hidden
@@ -173,7 +173,7 @@ export default definePlugin({
             ]
         },
         {
-            find: ".UNREAD_HIGHLIGHT",
+            find: "UNREAD_IMPORTANT:",
             replacement: [
                 {
                     // Make muted channels also appear as unread if hide unreads is false, using the HiddenIconWithMutedStyle and the channel is hidden
@@ -193,7 +193,7 @@ export default definePlugin({
             // Hide the new version of unreads box for hidden channels
             find: '.displayName="ChannelListUnreadsStore"',
             replacement: {
-                match: /(?<=if\(null==(\i))(?=.{0,160}?hasRelevantUnread\(\i\))/g, // Global because Discord has multiple methods like that in the same module
+                match: /(?<=if\(null==(\i))(?=.{0,160}?getHasImportantUnread\)\(\i\))/g, // Global because Discord has multiple methods like that in the same module
                 replace: (_, channel) => `||$self.isHiddenChannel(${channel})`
             }
         },
@@ -201,7 +201,7 @@ export default definePlugin({
             // Make the old version of unreads box not visible for hidden channels
             find: "renderBottomUnread(){",
             replacement: {
-                match: /(?=&&\i\.\i\.hasRelevantUnread\((\i\.record)\))/,
+                match: /(?=&&\(0,\i\.getHasImportantUnread\)\((\i\.record)\))/,
                 replace: "&&!$self.isHiddenChannel($1)"
             }
         },
@@ -209,7 +209,7 @@ export default definePlugin({
             // Make the state of the old version of unreads box not include hidden channels
             find: ".useFlattenedChannelIdListWithThreads)",
             replacement: {
-                match: /(?=&&\i\.\i\.hasRelevantUnread\((\i)\))/,
+                match: /(?=&&\(0,\i\.getHasImportantUnread\)\((\i)\))/,
                 replace: "&&!$self.isHiddenChannel($1)"
             }
         },
@@ -255,7 +255,7 @@ export default definePlugin({
         {
             find: '"alt+shift+down"',
             replacement: {
-                match: /(?<=getChannel\(\i\);return null!=(\i))(?=.{0,150}?hasRelevantUnread\(\i\))/,
+                match: /(?<=getChannel\(\i\);return null!=(\i))(?=.{0,150}?getHasImportantUnread\)\(\i\))/,
                 replace: (_, channel) => `&&!$self.isHiddenChannel(${channel})`
             }
         },
diff --git a/src/plugins/typingIndicator/index.tsx b/src/plugins/typingIndicator/index.tsx
index 9de76cacf..9111af44b 100644
--- a/src/plugins/typingIndicator/index.tsx
+++ b/src/plugins/typingIndicator/index.tsx
@@ -129,7 +129,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: ".UNREAD_HIGHLIGHT",
+            find: "UNREAD_IMPORTANT:",
             replacement: {
                 match: /channel:(\i).{0,100}?channelEmoji,.{0,250}?\.children.{0,50}?:null/,
                 replace: "$&,$self.TypingIndicator($1.id)"

From 18d63af241938501c64c88877c5942b39733bbf8 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Mon, 20 Nov 2023 23:26:07 -0300
Subject: [PATCH 188/632] PermViewer: Use role pill border conditionally

---
 .../permissionsViewer/components/UserPermissions.tsx        | 6 +++---
 src/plugins/permissionsViewer/index.tsx                     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/permissionsViewer/components/UserPermissions.tsx b/src/plugins/permissionsViewer/components/UserPermissions.tsx
index 37d9d0f42..aeb976645 100644
--- a/src/plugins/permissionsViewer/components/UserPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/UserPermissions.tsx
@@ -46,7 +46,7 @@ const Classes = proxyLazy(() => {
     return Object.assign({}, ...modules);
 }) as Record<"roles" | "rolePill" | "rolePillBorder" | "desaturateUserColors" | "flex" | "alignCenter" | "justifyCenter" | "svg" | "background" | "dot" | "dotBorderColor" | "roleCircle" | "dotBorderBase" | "flex" | "alignCenter" | "justifyCenter" | "wrap" | "root" | "role" | "roleRemoveButton" | "roleDot" | "roleFlowerStar" | "roleRemoveIcon" | "roleRemoveIconFocused" | "roleVerifiedIcon" | "roleName" | "roleNameOverflow" | "actionButton" | "overflowButton" | "addButton" | "addButtonIcon" | "overflowRolesPopout" | "overflowRolesPopoutArrowWrapper" | "overflowRolesPopoutArrow" | "popoutBottom" | "popoutTop" | "overflowRolesPopoutHeader" | "overflowRolesPopoutHeaderIcon" | "overflowRolesPopoutHeaderText" | "roleIcon", string>;
 
-function UserPermissionsComponent({ guild, guildMember }: { guild: Guild; guildMember: GuildMember; }) {
+function UserPermissionsComponent({ guild, guildMember, showBorder }: { guild: Guild; guildMember: GuildMember; showBorder: boolean; }) {
     const stns = settings.use(["permissionsSortOrder"]);
 
     const [rolePermissions, userPermissions] = useMemo(() => {
@@ -76,7 +76,7 @@ function UserPermissionsComponent({ guild, guildMember }: { guild: Guild; guildM
         sortUserRoles(userRoles);
 
         for (const [permission, bit] of Object.entries(PermissionsBits)) {
-            for (const { permissions, colorString, position, name } of userRoles) {
+            for (const { permissions, colorString, position } of userRoles) {
                 if ((permissions & bit) === bit) {
                     userPermissions.push({
                         permission: getPermissionString(permission),
@@ -133,7 +133,7 @@ function UserPermissionsComponent({ guild, guildMember }: { guild: Guild; guildM
             {userPermissions.length > 0 && (
                 <div className={classes(root, roles)}>
                     {userPermissions.map(({ permission, roleColor }) => (
-                        <div className={classes(role, rolePill, rolePillBorder)}>
+                        <div className={classes(role, rolePill, showBorder ? rolePillBorder : null)}>
                             <div className={roleRemoveButton}>
                                 <span
                                     className={roleCircle}
diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx
index bdfb7b13f..985b23842 100644
--- a/src/plugins/permissionsViewer/index.tsx
+++ b/src/plugins/permissionsViewer/index.tsx
@@ -163,13 +163,13 @@ export default definePlugin({
         {
             find: ".popularApplicationCommandIds,",
             replacement: {
-                match: /showBorder:.{0,60}}\),(?<=guild:(\i),guildMember:(\i),.+?)/,
-                replace: (m, guild, guildMember) => `${m}$self.UserPermissions(${guild},${guildMember}),`
+                match: /showBorder:(.{0,60})}\),(?<=guild:(\i),guildMember:(\i),.+?)/,
+                replace: (m, showBoder, guild, guildMember) => `${m}$self.UserPermissions(${guild},${guildMember},${showBoder}),`
             }
         }
     ],
 
-    UserPermissions: (guild: Guild, guildMember?: GuildMember) => !!guildMember && <UserPermissions guild={guild} guildMember={guildMember} />,
+    UserPermissions: (guild: Guild, guildMember: GuildMember | undefined, showBoder: boolean) => !!guildMember && <UserPermissions guild={guild} guildMember={guildMember} showBorder={showBoder} />,
 
     userContextMenuPatch: makeContextMenuPatch("roles", MenuItemParentType.User),
     channelContextMenuPatch: makeContextMenuPatch(["mute-channel", "unmute-channel"], MenuItemParentType.Channel),

From 2f1e86f3335160d3fa80272215bdd2778883eff5 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 21 Nov 2023 00:51:12 -0300
Subject: [PATCH 189/632] TypingIndicator: support threads

---
 src/plugins/typingIndicator/index.tsx | 34 +++++++++++++++++----------
 src/webpack/common/types/utils.d.ts   |  2 +-
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/plugins/typingIndicator/index.tsx b/src/plugins/typingIndicator/index.tsx
index 9111af44b..86bfbb4f2 100644
--- a/src/plugins/typingIndicator/index.tsx
+++ b/src/plugins/typingIndicator/index.tsx
@@ -21,8 +21,8 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { LazyComponent } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { find, findLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, GuildMemberStore, RelationshipStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
+import { find, findStoreLazy } from "@webpack";
+import { ChannelStore, GuildMemberStore, i18n, RelationshipStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
 
 import { buildSeveralUsers } from "../typingTweaks";
 
@@ -36,10 +36,9 @@ const ThreeDots = LazyComponent(() => {
 const TypingStore = findStoreLazy("TypingStore");
 const UserGuildSettingsStore = findStoreLazy("UserGuildSettingsStore");
 
-const Formatters = findLazy(m => m.Messages?.SEVERAL_USERS_TYPING);
-
 function getDisplayName(guildId: string, userId: string) {
-    return GuildMemberStore.getNick(guildId, userId) ?? UserStore.getUser(userId).username;
+    const user = UserStore.getUser(userId);
+    return GuildMemberStore.getNick(guildId, userId) ?? (user as any).globalName ?? user.username;
 }
 
 function TypingIndicator({ channelId }: { channelId: string; }) {
@@ -51,7 +50,7 @@ function TypingIndicator({ channelId }: { channelId: string; }) {
             const oldKeys = Object.keys(old);
             const currentKeys = Object.keys(current);
 
-            return oldKeys.length === currentKeys.length && JSON.stringify(oldKeys) === JSON.stringify(currentKeys);
+            return oldKeys.length === currentKeys.length && currentKeys.every(key => old[key] != null);
         }
     );
 
@@ -70,21 +69,21 @@ function TypingIndicator({ channelId }: { channelId: string; }) {
     switch (typingUsersArray.length) {
         case 0: break;
         case 1: {
-            tooltipText = Formatters.Messages.ONE_USER_TYPING.format({ a: getDisplayName(guildId, typingUsersArray[0]) });
+            tooltipText = i18n.Messages.ONE_USER_TYPING.format({ a: getDisplayName(guildId, typingUsersArray[0]) });
             break;
         }
         case 2: {
-            tooltipText = Formatters.Messages.TWO_USERS_TYPING.format({ a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]) });
+            tooltipText = i18n.Messages.TWO_USERS_TYPING.format({ a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]) });
             break;
         }
         case 3: {
-            tooltipText = Formatters.Messages.THREE_USERS_TYPING.format({ a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]), c: getDisplayName(guildId, typingUsersArray[2]) });
+            tooltipText = i18n.Messages.THREE_USERS_TYPING.format({ a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]), c: getDisplayName(guildId, typingUsersArray[2]) });
             break;
         }
         default: {
             tooltipText = Settings.plugins.TypingTweaks.enabled
                 ? buildSeveralUsers({ a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]), count: typingUsersArray.length - 2 })
-                : Formatters.Messages.SEVERAL_USERS_TYPING;
+                : i18n.Messages.SEVERAL_USERS_TYPING;
             break;
         }
     }
@@ -92,11 +91,10 @@ function TypingIndicator({ channelId }: { channelId: string; }) {
     if (typingUsersArray.length > 0) {
         return (
             <Tooltip text={tooltipText!}>
-                {({ onMouseLeave, onMouseEnter }) => (
+                {props => (
                     <div
+                        {...props}
                         style={{ marginLeft: 6, height: 16, display: "flex", alignItems: "center", zIndex: 0, cursor: "pointer" }}
-                        onMouseLeave={onMouseLeave}
-                        onMouseEnter={onMouseEnter}
                     >
                         <ThreeDots dotRadius={3} themed={true} />
                     </div>
@@ -128,12 +126,22 @@ export default definePlugin({
     settings,
 
     patches: [
+        // Normal channel
         {
             find: "UNREAD_IMPORTANT:",
             replacement: {
                 match: /channel:(\i).{0,100}?channelEmoji,.{0,250}?\.children.{0,50}?:null/,
                 replace: "$&,$self.TypingIndicator($1.id)"
             }
+        },
+        // Theads
+        {
+            // This is the thread "spine" that shows in the left
+            find: "M11 9H4C2.89543 9 2 8.10457 2 7V1C2 0.447715 1.55228 0 1 0C0.447715 0 0 0.447715 0 1V7C0 9.20914 1.79086 11 4 11H11C11.5523 11 12 10.5523 12 10C12 9.44771 11.5523 9 11 9Z",
+            replacement: {
+                match: /mentionsCount:\i.+?null(?<=channel:(\i).+?)/,
+                replace: "$&,$self.TypingIndicator($1.id)"
+            }
         }
     ],
 
diff --git a/src/webpack/common/types/utils.d.ts b/src/webpack/common/types/utils.d.ts
index 7eb5711ae..64a68f2c2 100644
--- a/src/webpack/common/types/utils.d.ts
+++ b/src/webpack/common/types/utils.d.ts
@@ -159,5 +159,5 @@ export interface i18n {
 
     loadPromise: Promise<void>;
 
-    Messages: Record<i18nMessages, string>;
+    Messages: Record<i18nMessages, any>;
 }

From 6face7f8ef857edcb2ff12cf4b9701323a869db3 Mon Sep 17 00:00:00 2001
From: CodeF53 <37855219+CodeF53@users.noreply.github.com>
Date: Tue, 21 Nov 2023 12:30:29 -0700
Subject: [PATCH 190/632] feat(plugin): ClientTheme (#807)

---
 src/plugins/clientTheme/clientTheme.css |  24 +++
 src/plugins/clientTheme/index.tsx       | 228 ++++++++++++++++++++++++
 src/utils/constants.ts                  |   4 +
 3 files changed, 256 insertions(+)
 create mode 100644 src/plugins/clientTheme/clientTheme.css
 create mode 100644 src/plugins/clientTheme/index.tsx

diff --git a/src/plugins/clientTheme/clientTheme.css b/src/plugins/clientTheme/clientTheme.css
new file mode 100644
index 000000000..023f88bd2
--- /dev/null
+++ b/src/plugins/clientTheme/clientTheme.css
@@ -0,0 +1,24 @@
+.client-theme-settings {
+    display: flex;
+    flex-direction: column;
+}
+
+.client-theme-container {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+
+.client-theme-settings-labels {
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+}
+
+.client-theme-container > [class^="colorSwatch"] > [class^="swatch"] {
+    border: thin solid var(--background-modifier-accent) !important;
+}
+
+.client-theme-warning {
+    color: var(--text-danger);
+}
diff --git a/src/plugins/clientTheme/index.tsx b/src/plugins/clientTheme/index.tsx
new file mode 100644
index 000000000..3e07b15fd
--- /dev/null
+++ b/src/plugins/clientTheme/index.tsx
@@ -0,0 +1,228 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./clientTheme.css";
+
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import { getTheme, Theme } from "@utils/discord";
+import { Margins } from "@utils/margins";
+import { classes } from "@utils/misc";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByCodeLazy } from "@webpack";
+import { Button, Forms } from "@webpack/common";
+
+const ColorPicker = findByCodeLazy(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR");
+
+const colorPresets = [
+    "#1E1514", "#172019", "#13171B", "#1C1C28", "#402D2D",
+    "#3A483D", "#344242", "#313D4B", "#2D2F47", "#322B42",
+    "#3C2E42", "#422938"
+];
+
+function onPickColor(color: number) {
+    let hexColor = color.toString(16);
+
+    while (hexColor.length < 6) {
+        hexColor = "0" + hexColor;
+    }
+
+    settings.store.color = hexColor;
+    updateColorVars(hexColor);
+}
+
+function ThemeSettings() {
+    const lightnessWarning = hexToLightness(settings.store.color) > 45;
+    const lightModeWarning = getTheme() === Theme.Light;
+
+    return (
+        <div className="client-theme-settings">
+            <div className="client-theme-container">
+                <div className="client-theme-settings-labels">
+                    <Forms.FormTitle tag="h3">Theme Color</Forms.FormTitle>
+                    <Forms.FormText>Add a color to your Discord client theme</Forms.FormText>
+                </div>
+                <ColorPicker
+                    color={parseInt(settings.store.color, 16)}
+                    onChange={onPickColor}
+                    showEyeDropper={false}
+                    suggestedColors={colorPresets}
+                />
+            </div>
+            {lightnessWarning || lightModeWarning
+                ? <div>
+                    <Forms.FormDivider className={classes(Margins.top8, Margins.bottom8)} />
+                    <Forms.FormText className="client-theme-warning">Your theme won't look good:</Forms.FormText>
+                    {lightnessWarning && <Forms.FormText className="client-theme-warning">Selected color is very light</Forms.FormText>}
+                    {lightModeWarning && <Forms.FormText className="client-theme-warning">Light mode isn't supported</Forms.FormText>}
+                </div>
+                : null}
+        </div>
+    );
+}
+
+const settings = definePluginSettings({
+    color: {
+        description: "Color your Discord client theme will be based around. Light mode isn't supported",
+        type: OptionType.COMPONENT,
+        default: "313338",
+        component: () => <ThemeSettings />
+    },
+    resetColor: {
+        description: "Reset Theme Color",
+        type: OptionType.COMPONENT,
+        default: "313338",
+        component: () => (
+            <Button onClick={() => onPickColor(0x313338)}>
+                Reset Theme Color
+            </Button>
+        )
+    }
+});
+
+export default definePlugin({
+    name: "ClientTheme",
+    authors: [Devs.F53],
+    description: "Recreation of the old client theme experiment. Add a color to your Discord client theme",
+    settings,
+
+    patches: [
+        {
+            find: "Could not find app-mount",
+            replacement: {
+                match: /(?<=Could not find app-mount"\))/,
+                replace: ",$self.addThemeInitializer()"
+            }
+        }
+    ],
+
+    addThemeInitializer() {
+        document.addEventListener("DOMContentLoaded", this.themeInitializer = () => {
+            updateColorVars(settings.store.color);
+            generateColorOffsets();
+        });
+    },
+
+    stop() {
+        document.removeEventListener("DOMContentLoaded", this.themeInitializer);
+        document.getElementById("clientThemeVars")?.remove();
+        document.getElementById("clientThemeOffsets")?.remove();
+    }
+});
+
+async function generateColorOffsets() {
+    const variableRegex = /(--primary-[5-9]\d{2}-hsl):.*?(\S*)%;/g;
+
+    const styleLinkNodes = document.querySelectorAll('link[rel="stylesheet"]');
+    const variableLightness = {} as Record<string, number>;
+
+    // Search all stylesheets for color variables
+    for (const styleLinkNode of styleLinkNodes) {
+        const cssLink = styleLinkNode.getAttribute("href");
+        if (!cssLink) continue;
+
+        const res = await fetch(cssLink);
+        const cssString = await res.text();
+
+        // Get lightness values of --primary variables >=500
+        let variableMatch = variableRegex.exec(cssString);
+        while (variableMatch !== null) {
+            const [, variable, lightness] = variableMatch;
+            variableLightness[variable] = parseFloat(lightness);
+            variableMatch = variableRegex.exec(cssString);
+        }
+    }
+
+    // Generate offsets
+    const lightnessOffsets = Object.entries(variableLightness)
+        .map(([key, lightness]) => {
+            const lightnessOffset = lightness - variableLightness["--primary-600-hsl"];
+            const plusOrMinus = lightnessOffset >= 0 ? "+" : "-";
+            return `${key}: var(--theme-h) var(--theme-s) calc(var(--theme-l) ${plusOrMinus} ${Math.abs(lightnessOffset).toFixed(2)}%);`;
+        })
+        .join("\n");
+
+    const style = document.createElement("style");
+    style.setAttribute("id", "clientThemeOffsets");
+    style.textContent = `:root:root {
+        ${lightnessOffsets}
+    }`;
+    document.head.appendChild(style);
+}
+
+function updateColorVars(color: string) {
+    const { hue, saturation, lightness } = hexToHSL(color);
+
+    let style = document.getElementById("clientThemeVars");
+    if (!style) {
+        style = document.createElement("style");
+        style.setAttribute("id", "clientThemeVars");
+        document.head.appendChild(style);
+    }
+
+    style.textContent = `:root {
+        --theme-h: ${hue};
+        --theme-s: ${saturation}%;
+        --theme-l: ${lightness}%;
+    }`;
+}
+
+// https://css-tricks.com/converting-color-spaces-in-javascript/
+function hexToHSL(hexCode: string) {
+    // Hex => RGB normalized to 0-1
+    const r = parseInt(hexCode.substring(0, 2), 16) / 255;
+    const g = parseInt(hexCode.substring(2, 4), 16) / 255;
+    const b = parseInt(hexCode.substring(4, 6), 16) / 255;
+
+    // RGB => HSL
+    const cMax = Math.max(r, g, b);
+    const cMin = Math.min(r, g, b);
+    const delta = cMax - cMin;
+
+    let hue: number, saturation: number, lightness: number;
+
+    lightness = (cMax + cMin) / 2;
+
+    if (delta === 0) {
+        // If r=g=b then the only thing that matters is lightness
+        hue = 0;
+        saturation = 0;
+    } else {
+        // Magic
+        saturation = delta / (1 - Math.abs(2 * lightness - 1));
+
+        if (cMax === r)
+            hue = ((g - b) / delta) % 6;
+        else if (cMax === g)
+            hue = (b - r) / delta + 2;
+        else
+            hue = (r - g) / delta + 4;
+        hue *= 60;
+        if (hue < 0)
+            hue += 360;
+    }
+
+    // Move saturation and lightness from 0-1 to 0-100
+    saturation *= 100;
+    lightness *= 100;
+
+    return { hue, saturation, lightness };
+}
+
+// Minimized math just for lightness, lowers lag when changing colors
+function hexToLightness(hexCode) {
+    // Hex => RGB normalized to 0-1
+    const r = parseInt(hexCode.substring(0, 2), 16) / 255;
+    const g = parseInt(hexCode.substring(2, 4), 16) / 255;
+    const b = parseInt(hexCode.substring(4, 6), 16) / 255;
+
+    const cMax = Math.max(r, g, b);
+    const cMin = Math.min(r, g, b);
+
+    const lightness = 100 * ((cMax + cMin) / 2);
+
+    return lightness;
+}
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 3db2e64f8..7f555d322 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -267,6 +267,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Dziurwa",
         id: 1001086404203389018n
     },
+    F53: {
+        name: "F53",
+        id: 280411966126948353n
+    },
     AutumnVN: {
         name: "AutumnVN",
         id: 393694671383166998n

From 074ebae3343170c19ca128ed76b0732375ea36bf Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Wed, 22 Nov 2023 01:57:00 +0100
Subject: [PATCH 191/632] ClientTheme fixes

---
 src/plugins/clientTheme/README.md |  7 +++++++
 src/plugins/clientTheme/index.tsx | 21 ++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 src/plugins/clientTheme/README.md

diff --git a/src/plugins/clientTheme/README.md b/src/plugins/clientTheme/README.md
new file mode 100644
index 000000000..4b40148c5
--- /dev/null
+++ b/src/plugins/clientTheme/README.md
@@ -0,0 +1,7 @@
+# Classic Client Theme
+
+Revival of the old client theme experiment (The one that came before the sucky one that we actually got)
+
+![the ClientTheme theme colour picker](https://user-images.githubusercontent.com/37855219/230238053-e90b7098-373a-459a-bb8c-c24e82f69270.png)
+
+https://github.com/Vendicated/Vencord/assets/45497981/6c1bcb3b-e0c7-4a02-b0b8-c4c5cd954f38
diff --git a/src/plugins/clientTheme/index.tsx b/src/plugins/clientTheme/index.tsx
index 3e07b15fd..d0026c759 100644
--- a/src/plugins/clientTheme/index.tsx
+++ b/src/plugins/clientTheme/index.tsx
@@ -11,11 +11,12 @@ import { Devs } from "@utils/constants";
 import { getTheme, Theme } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
+import { LazyComponent } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy } from "@webpack";
+import { findByCode } from "@webpack";
 import { Button, Forms } from "@webpack/common";
 
-const ColorPicker = findByCodeLazy(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR");
+const ColorPicker = LazyComponent(() => findByCode(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR"));
 
 const colorPresets = [
     "#1E1514", "#172019", "#13171B", "#1C1C28", "#402D2D",
@@ -24,11 +25,7 @@ const colorPresets = [
 ];
 
 function onPickColor(color: number) {
-    let hexColor = color.toString(16);
-
-    while (hexColor.length < 6) {
-        hexColor = "0" + hexColor;
-    }
+    const hexColor = color.toString(16).padStart(6, "0");
 
     settings.store.color = hexColor;
     updateColorVars(hexColor);
@@ -59,7 +56,8 @@ function ThemeSettings() {
                     {lightnessWarning && <Forms.FormText className="client-theme-warning">Selected color is very light</Forms.FormText>}
                     {lightModeWarning && <Forms.FormText className="client-theme-warning">Light mode isn't supported</Forms.FormText>}
                 </div>
-                : null}
+                : null
+            }
         </div>
     );
 }
@@ -85,7 +83,7 @@ const settings = definePluginSettings({
 
 export default definePlugin({
     name: "ClientTheme",
-    authors: [Devs.F53],
+    authors: [Devs.F53, Devs.Nuckyz],
     description: "Recreation of the old client theme experiment. Add a color to your Discord client theme",
     settings,
 
@@ -113,8 +111,9 @@ export default definePlugin({
     }
 });
 
+const variableRegex = /(--primary-[5-9]\d{2}-hsl):.*?(\S*)%;/g;
+
 async function generateColorOffsets() {
-    const variableRegex = /(--primary-[5-9]\d{2}-hsl):.*?(\S*)%;/g;
 
     const styleLinkNodes = document.querySelectorAll('link[rel="stylesheet"]');
     const variableLightness = {} as Record<string, number>;
@@ -213,7 +212,7 @@ function hexToHSL(hexCode: string) {
 }
 
 // Minimized math just for lightness, lowers lag when changing colors
-function hexToLightness(hexCode) {
+function hexToLightness(hexCode: string) {
     // Hex => RGB normalized to 0-1
     const r = parseInt(hexCode.substring(0, 2), 16) / 255;
     const g = parseInt(hexCode.substring(2, 4), 16) / 255;

From 371b5b0be8a6a6fab64ecb2d03c760f85820a063 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Wed, 22 Nov 2023 06:14:16 +0100
Subject: [PATCH 192/632] allow plugins to specify how soon their start()
 method is called

---
 src/Vencord.ts                    | 16 +++++++++++-----
 src/plugins/clientTheme/index.tsx | 22 +++++-----------------
 src/plugins/index.ts              | 10 ++++++++--
 src/utils/types.ts                | 14 ++++++++++++++
 4 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/Vencord.ts b/src/Vencord.ts
index 83c69e738..a106a0b7d 100644
--- a/src/Vencord.ts
+++ b/src/Vencord.ts
@@ -27,6 +27,8 @@ export { PlainSettings, Settings };
 import "./utils/quickCss";
 import "./webpack/patchWebpack";
 
+import { StartAt } from "@utils/types";
+
 import { get as dsGet } from "./api/DataStore";
 import { showNotification } from "./api/Notifications";
 import { PlainSettings, Settings } from "./api/Settings";
@@ -79,7 +81,7 @@ async function syncSettings() {
 
 async function init() {
     await onceReady;
-    startAllPlugins();
+    startAllPlugins(StartAt.WebpackReady);
 
     syncSettings();
 
@@ -130,13 +132,17 @@ async function init() {
     }
 }
 
+startAllPlugins(StartAt.Init);
 init();
 
-if (IS_DISCORD_DESKTOP && Settings.winNativeTitleBar && navigator.platform.toLowerCase().startsWith("win")) {
-    document.addEventListener("DOMContentLoaded", () => {
+document.addEventListener("DOMContentLoaded", () => {
+    startAllPlugins(StartAt.DOMContentLoaded);
+
+    if (IS_DISCORD_DESKTOP && Settings.winNativeTitleBar && navigator.platform.toLowerCase().startsWith("win")) {
         document.head.append(Object.assign(document.createElement("style"), {
             id: "vencord-native-titlebar-style",
             textContent: "[class*=titleBar]{display: none!important}"
         }));
-    }, { once: true });
-}
+    }
+}, { once: true });
+
diff --git a/src/plugins/clientTheme/index.tsx b/src/plugins/clientTheme/index.tsx
index d0026c759..7cda33e25 100644
--- a/src/plugins/clientTheme/index.tsx
+++ b/src/plugins/clientTheme/index.tsx
@@ -12,7 +12,7 @@ import { getTheme, Theme } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
 import { LazyComponent } from "@utils/react";
-import definePlugin, { OptionType } from "@utils/types";
+import definePlugin, { OptionType, StartAt } from "@utils/types";
 import { findByCode } from "@webpack";
 import { Button, Forms } from "@webpack/common";
 
@@ -87,25 +87,13 @@ export default definePlugin({
     description: "Recreation of the old client theme experiment. Add a color to your Discord client theme",
     settings,
 
-    patches: [
-        {
-            find: "Could not find app-mount",
-            replacement: {
-                match: /(?<=Could not find app-mount"\))/,
-                replace: ",$self.addThemeInitializer()"
-            }
-        }
-    ],
-
-    addThemeInitializer() {
-        document.addEventListener("DOMContentLoaded", this.themeInitializer = () => {
-            updateColorVars(settings.store.color);
-            generateColorOffsets();
-        });
+    startAt: StartAt.DOMContentLoaded,
+    start() {
+        updateColorVars(settings.store.color);
+        generateColorOffsets();
     },
 
     stop() {
-        document.removeEventListener("DOMContentLoaded", this.themeInitializer);
         document.getElementById("clientThemeVars")?.remove();
         document.getElementById("clientThemeOffsets")?.remove();
     }
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index f6d577269..234838606 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -19,7 +19,7 @@
 import { registerCommand, unregisterCommand } from "@api/Commands";
 import { Settings } from "@api/Settings";
 import { Logger } from "@utils/Logger";
-import { Patch, Plugin } from "@utils/types";
+import { Patch, Plugin, StartAt } from "@utils/types";
 import { FluxDispatcher } from "@webpack/common";
 import { FluxEvents } from "@webpack/types";
 
@@ -85,9 +85,15 @@ for (const p of pluginsValues) {
     }
 }
 
-export const startAllPlugins = traceFunction("startAllPlugins", function startAllPlugins() {
+export const startAllPlugins = traceFunction("startAllPlugins", function startAllPlugins(target: StartAt) {
+    logger.info(`Starting plugins (stage ${target})`);
     for (const name in Plugins)
         if (isPluginEnabled(name)) {
+            const p = Plugins[name];
+
+            const startAt = p.startAt ?? StartAt.WebpackReady;
+            if (startAt !== target) continue;
+
             startPlugin(Plugins[name]);
         }
 });
diff --git a/src/utils/types.ts b/src/utils/types.ts
index b32b127b0..7305cd01a 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -80,6 +80,11 @@ export interface PluginDef {
      * Whether this plugin should be enabled by default, but can be disabled
      */
     enabledByDefault?: boolean;
+    /**
+     * When to call the start() method
+     * @default StartAt.WebpackReady
+     */
+    startAt?: StartAt,
     /**
      * Optionally provide settings that the user can configure in the Plugins tab of settings.
      * @deprecated Use `settings` instead
@@ -117,6 +122,15 @@ export interface PluginDef {
     tags?: string[];
 }
 
+export const enum StartAt {
+    /** Right away, as soon as Vencord initialised */
+    Init = "Init",
+    /** On the DOMContentLoaded event, so once the document is ready */
+    DOMContentLoaded = "DOMContentLoaded",
+    /** Once Discord's core webpack modules have finished loading, so as soon as things like react and flux are available */
+    WebpackReady = "WebpackReady"
+}
+
 export const enum OptionType {
     STRING,
     NUMBER,

From ffe6512693c7828c1d3c3bb36db69d69a93abe3f Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 22 Nov 2023 02:49:08 -0300
Subject: [PATCH 193/632] Improve component finding api and migrate plugins to
 use them

---
 src/components/PluginSettings/PluginModal.tsx |  6 +-
 src/plugins/betterFolders/FolderSideBar.tsx   |  6 +-
 src/plugins/clientTheme/index.tsx             |  5 +-
 src/plugins/customRPC/index.tsx               |  6 +-
 src/plugins/gameActivityToggle/index.tsx      |  4 +-
 src/plugins/messageLinkEmbeds/index.tsx       | 10 +--
 .../serverProfile/GuildProfileModal.tsx       |  6 +-
 src/plugins/showConnections/VerifiedIcon.tsx  |  6 +-
 src/plugins/showConnections/index.tsx         |  6 +-
 .../components/HiddenChannelLockScreen.tsx    | 10 +--
 src/plugins/voiceMessages/VoicePreview.tsx    |  5 +-
 src/plugins/whoReacted/index.tsx              |  6 +-
 src/utils/react.tsx                           | 68 ++++++++++++++-----
 src/webpack/webpack.ts                        |  2 +-
 14 files changed, 89 insertions(+), 57 deletions(-)

diff --git a/src/components/PluginSettings/PluginModal.tsx b/src/components/PluginSettings/PluginModal.tsx
index 03789ac6c..7d5750dfa 100644
--- a/src/components/PluginSettings/PluginModal.tsx
+++ b/src/components/PluginSettings/PluginModal.tsx
@@ -24,9 +24,9 @@ import { proxyLazy } from "@utils/lazy";
 import { Margins } from "@utils/margins";
 import { classes, isObjectEmpty } from "@utils/misc";
 import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize } from "@utils/modal";
-import { LazyComponent } from "@utils/react";
+import { findComponentByCodeLazy } from "@utils/react";
 import { OptionType, Plugin } from "@utils/types";
-import { findByCode, findByPropsLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { Button, Clickable, FluxDispatcher, Forms, React, Text, Tooltip, UserStore, UserUtils } from "@webpack/common";
 import { User } from "discord-types/general";
 import { Constructor } from "type-fest";
@@ -42,7 +42,7 @@ import {
 } from "./components";
 import { openContributorModal } from "./ContributorModal";
 
-const UserSummaryItem = LazyComponent(() => findByCode("defaultRenderUser", "showDefaultAvatarsForNullUsers"));
+const UserSummaryItem = findComponentByCodeLazy("defaultRenderUser", "showDefaultAvatarsForNullUsers");
 const AvatarStyles = findByPropsLazy("moreUsers", "emptyUser", "avatarContainer", "clickableAvatar");
 const UserRecord: Constructor<Partial<User>> = proxyLazy(() => UserStore.getCurrentUser().constructor) as any;
 
diff --git a/src/plugins/betterFolders/FolderSideBar.tsx b/src/plugins/betterFolders/FolderSideBar.tsx
index 97959873f..13dd9ac88 100644
--- a/src/plugins/betterFolders/FolderSideBar.tsx
+++ b/src/plugins/betterFolders/FolderSideBar.tsx
@@ -17,8 +17,8 @@
 */
 
 import ErrorBoundary from "@components/ErrorBoundary";
-import { LazyComponent } from "@utils/react";
-import { find, findByPropsLazy, findStoreLazy } from "@webpack";
+import { findComponentByCodeLazy } from "@utils/react";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
 import { useStateFromStores } from "@webpack/common";
 import type { CSSProperties } from "react";
 
@@ -26,7 +26,7 @@ import { ExpandedGuildFolderStore, settings } from ".";
 
 const ChannelRTCStore = findStoreLazy("ChannelRTCStore");
 const Animations = findByPropsLazy("a", "animated", "useTransition");
-const GuildsBar = LazyComponent(() => find(m => m.type?.toString().includes('("guildsnav")')));
+const GuildsBar = findComponentByCodeLazy('("guildsnav")');
 
 export default ErrorBoundary.wrap(guildsBarProps => {
     const expandedFolders = useStateFromStores([ExpandedGuildFolderStore], () => ExpandedGuildFolderStore.getExpandedFolders());
diff --git a/src/plugins/clientTheme/index.tsx b/src/plugins/clientTheme/index.tsx
index 7cda33e25..e5de67e40 100644
--- a/src/plugins/clientTheme/index.tsx
+++ b/src/plugins/clientTheme/index.tsx
@@ -11,12 +11,11 @@ import { Devs } from "@utils/constants";
 import { getTheme, Theme } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
-import { LazyComponent } from "@utils/react";
+import { findComponentByCodeLazy } from "@utils/react";
 import definePlugin, { OptionType, StartAt } from "@utils/types";
-import { findByCode } from "@webpack";
 import { Button, Forms } from "@webpack/common";
 
-const ColorPicker = LazyComponent(() => findByCode(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR"));
+const ColorPicker = findComponentByCodeLazy(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR");
 
 const colorPresets = [
     "#1E1514", "#172019", "#13171B", "#1C1C28", "#402D2D",
diff --git a/src/plugins/customRPC/index.tsx b/src/plugins/customRPC/index.tsx
index feed52fde..64bfd4609 100644
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@@ -20,12 +20,12 @@ import { definePluginSettings, Settings } from "@api/Settings";
 import { Link } from "@components/Link";
 import { Devs } from "@utils/constants";
 import { isTruthy } from "@utils/guards";
-import { useAwaiter } from "@utils/react";
+import { findComponentByCodeLazy, useAwaiter } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { ApplicationAssetUtils, FluxDispatcher, Forms, GuildStore, React, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common";
 
-const ActivityComponent = findByCodeLazy("onOpenGameProfile");
+const ActivityComponent = findComponentByCodeLazy("onOpenGameProfile");
 const ActivityClassName = findByPropsLazy("activity", "buttonColor");
 const Colors = findByPropsLazy("profileColors");
 
diff --git a/src/plugins/gameActivityToggle/index.tsx b/src/plugins/gameActivityToggle/index.tsx
index 735f124c5..cc68d55b1 100644
--- a/src/plugins/gameActivityToggle/index.tsx
+++ b/src/plugins/gameActivityToggle/index.tsx
@@ -19,13 +19,13 @@
 import { disableStyle, enableStyle } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
+import { findComponentByCodeLazy } from "@utils/react";
 import definePlugin from "@utils/types";
-import { findByCodeLazy } from "@webpack";
 import { StatusSettingsStores } from "@webpack/common";
 
 import style from "./style.css?managed";
 
-const Button = findByCodeLazy("Button.Sizes.NONE,disabled:");
+const Button = findComponentByCodeLazy("Button.Sizes.NONE,disabled:");
 
 function makeIcon(showCurrentGame?: boolean) {
     return function () {
diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index e600d737d..d8c3c99f9 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -22,9 +22,9 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants.js";
 import { classes } from "@utils/misc";
 import { Queue } from "@utils/Queue";
-import { LazyComponent } from "@utils/react";
+import { findComponentByCodeLazy } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { find, findByCode, findByPropsLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import {
     Button,
     ChannelStore,
@@ -45,9 +45,9 @@ const messageCache = new Map<string, {
     fetched: boolean;
 }>();
 
-const Embed = LazyComponent(() => findByCode(".inlineMediaEmbed"));
-const AutoModEmbed = LazyComponent(() => findByCode(".withFooter]:", "childrenMessageContent:"));
-const ChannelMessage = LazyComponent(() => find(m => m.type?.toString()?.includes("renderSimpleAccessories)")));
+const Embed = findComponentByCodeLazy(".inlineMediaEmbed");
+const AutoModEmbed = findComponentByCodeLazy(".withFooter]:", "childrenMessageContent:");
+const ChannelMessage = findComponentByCodeLazy("renderSimpleAccessories)");
 
 const SearchResultClasses = findByPropsLazy("message", "searchResult");
 
diff --git a/src/plugins/serverProfile/GuildProfileModal.tsx b/src/plugins/serverProfile/GuildProfileModal.tsx
index 80f0842bb..9def7bf99 100644
--- a/src/plugins/serverProfile/GuildProfileModal.tsx
+++ b/src/plugins/serverProfile/GuildProfileModal.tsx
@@ -10,14 +10,14 @@ import { classNameFactory } from "@api/Styles";
 import { openImageModal, openUserProfile } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { LazyComponent, useAwaiter } from "@utils/react";
-import { findByProps, findByPropsLazy } from "@webpack";
+import { findExportedComponentLazy, useAwaiter } from "@utils/react";
+import { findByPropsLazy } from "@webpack";
 import { FluxDispatcher, Forms, GuildChannelStore, GuildMemberStore, moment, Parser, PresenceStore, RelationshipStore, ScrollerThin, SnowflakeUtils, TabBar, Timestamp, useEffect, UserStore, UserUtils, useState, useStateFromStores } from "@webpack/common";
 import { Guild, User } from "discord-types/general";
 
 const IconUtils = findByPropsLazy("getGuildBannerURL");
 const IconClasses = findByPropsLazy("icon", "acronym", "childWrapper");
-const FriendRow = LazyComponent(() => findByProps("FriendRow").FriendRow);
+const FriendRow = findExportedComponentLazy("FriendRow");
 
 const cl = classNameFactory("vc-gp-");
 
diff --git a/src/plugins/showConnections/VerifiedIcon.tsx b/src/plugins/showConnections/VerifiedIcon.tsx
index 79e27c455..200050694 100644
--- a/src/plugins/showConnections/VerifiedIcon.tsx
+++ b/src/plugins/showConnections/VerifiedIcon.tsx
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { LazyComponent } from "@utils/react";
-import { findByCode, findLazy } from "@webpack";
+import { findComponentByCodeLazy } from "@utils/react";
+import { findLazy } from "@webpack";
 import { i18n, useToken } from "@webpack/common";
 
 const ColorMap = findLazy(m => m.colors?.INTERACTIVE_MUTED?.css);
-const VerifiedIconComponent = LazyComponent(() => findByCode(".CONNECTIONS_ROLE_OFFICIAL_ICON_TOOLTIP"));
+const VerifiedIconComponent = findComponentByCodeLazy(".CONNECTIONS_ROLE_OFFICIAL_ICON_TOOLTIP");
 
 export function VerifiedIcon() {
     const color = useToken(ColorMap.colors.INTERACTIVE_MUTED).hex();
diff --git a/src/plugins/showConnections/index.tsx b/src/plugins/showConnections/index.tsx
index 948bdb83b..2d2122d60 100644
--- a/src/plugins/showConnections/index.tsx
+++ b/src/plugins/showConnections/index.tsx
@@ -24,15 +24,15 @@ import { Flex } from "@components/Flex";
 import { CopyIcon, LinkIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { copyWithToast } from "@utils/misc";
-import { LazyComponent } from "@utils/react";
+import { findComponentByCodeLazy } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCode, findByCodeLazy, findByPropsLazy, findStoreLazy } from "@webpack";
+import { findByCodeLazy, findByPropsLazy, findStoreLazy } from "@webpack";
 import { Text, Tooltip, UserProfileStore } from "@webpack/common";
 import { User } from "discord-types/general";
 
 import { VerifiedIcon } from "./VerifiedIcon";
 
-const Section = LazyComponent(() => findByCode(".lastSection]:"));
+const Section = findComponentByCodeLazy(".lastSection]: ");
 const ThemeStore = findStoreLazy("ThemeStore");
 const platforms: { get(type: string): ConnectionPlatform; } = findByPropsLazy("isSupported", "getByUrl");
 const getTheme: (user: User, displayProfile: any) => any = findByCodeLazy(',"--profile-gradient-primary-color"');
diff --git a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
index 26efce1d8..5231fe8e7 100644
--- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
+++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
@@ -18,9 +18,9 @@
 
 import { Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { LazyComponent } from "@utils/react";
+import { findComponentByCodeLazy, findComponentLazy } from "@utils/react";
 import { formatDuration } from "@utils/text";
-import { find, findByCode, findByPropsLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { EmojiStore, FluxDispatcher, GuildMemberStore, GuildStore, moment, Parser, PermissionsBits, PermissionStore, SnowflakeUtils, Text, Timestamp, Tooltip, useEffect, useState } from "@webpack/common";
 import type { Channel } from "discord-types/general";
 
@@ -81,14 +81,14 @@ const enum ChannelFlags {
 
 const ChatScrollClasses = findByPropsLazy("auto", "content", "scrollerBase");
 const ChatClasses = findByPropsLazy("chat", "content", "noChat", "chatContent");
-const ChannelBeginHeader = LazyComponent(() => findByCode(".Messages.ROLE_REQUIRED_SINGLE_USER_MESSAGE"));
-const TagComponent = LazyComponent(() => find(m => {
+const ChannelBeginHeader = findComponentByCodeLazy(".Messages.ROLE_REQUIRED_SINGLE_USER_MESSAGE");
+const TagComponent = findComponentLazy(m => {
     if (typeof m !== "function") return false;
 
     const code = Function.prototype.toString.call(m);
     // Get the component which doesn't include increasedActivity
     return code.includes(".Messages.FORUM_TAG_A11Y_FILTER_BY_TAG") && !code.includes("increasedActivityPill");
-}));
+});
 
 const EmojiParser = findByPropsLazy("convertSurrogateToName");
 const EmojiUtils = findByPropsLazy("getURL", "buildEmojiReactionColorsPlatformed");
diff --git a/src/plugins/voiceMessages/VoicePreview.tsx b/src/plugins/voiceMessages/VoicePreview.tsx
index 912c55ae0..d2c62336b 100644
--- a/src/plugins/voiceMessages/VoicePreview.tsx
+++ b/src/plugins/voiceMessages/VoicePreview.tsx
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { LazyComponent, useTimer } from "@utils/react";
-import { find } from "@webpack";
+import { findComponentByCodeLazy, useTimer } from "@utils/react";
 
 import { cl } from "./utils";
 
@@ -25,7 +24,7 @@ interface VoiceMessageProps {
     src: string;
     waveform: string;
 }
-const VoiceMessage = LazyComponent<VoiceMessageProps>(() => find(m => m.type?.toString().includes("waveform:")));
+const VoiceMessage = findComponentByCodeLazy<VoiceMessageProps>("waveform:");
 
 export type VoicePreviewOptions = {
     src?: string;
diff --git a/src/plugins/whoReacted/index.tsx b/src/plugins/whoReacted/index.tsx
index fb84c155a..15395a1f3 100644
--- a/src/plugins/whoReacted/index.tsx
+++ b/src/plugins/whoReacted/index.tsx
@@ -20,14 +20,14 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { sleep } from "@utils/misc";
 import { Queue } from "@utils/Queue";
-import { LazyComponent, useForceUpdater } from "@utils/react";
+import { findComponentByCodeLazy, useForceUpdater } from "@utils/react";
 import definePlugin from "@utils/types";
-import { findByCode, findByPropsLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { ChannelStore, FluxDispatcher, React, RestAPI, Tooltip } from "@webpack/common";
 import { CustomEmoji } from "@webpack/types";
 import { Message, ReactionEmoji, User } from "discord-types/general";
 
-const UserSummaryItem = LazyComponent(() => findByCode("defaultRenderUser", "showDefaultAvatarsForNullUsers"));
+const UserSummaryItem = findComponentByCodeLazy("defaultRenderUser", "showDefaultAvatarsForNullUsers");
 const AvatarStyles = findByPropsLazy("moreUsers", "emptyUser", "avatarContainer", "clickableAvatar");
 
 const queue = new Queue();
diff --git a/src/utils/react.tsx b/src/utils/react.tsx
index 0181c95b8..2e3352bcc 100644
--- a/src/utils/react.tsx
+++ b/src/utils/react.tsx
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { FilterFn, filters, find, findByProps } from "@webpack";
 import { React, useEffect, useMemo, useReducer, useState } from "@webpack/common";
 
 import { makeLazy } from "./lazy";
@@ -77,7 +78,6 @@ interface AwaiterOpts<T> {
  * @param fallbackValue The fallback value that will be used until the promise resolved
  * @returns [value, error, isPending]
  */
-
 export function useAwaiter<T>(factory: () => Promise<T>): AwaiterRes<T | null>;
 export function useAwaiter<T>(factory: () => Promise<T>, providedOpts: AwaiterOpts<T>): AwaiterRes<T>;
 export function useAwaiter<T>(factory: () => Promise<T>, providedOpts?: AwaiterOpts<T | null>): AwaiterRes<T | null> {
@@ -113,31 +113,16 @@ export function useAwaiter<T>(factory: () => Promise<T>, providedOpts?: AwaiterO
 
     return [state.value, state.error, state.pending];
 }
+
 /**
  * Returns a function that can be used to force rerender react components
  */
-
 export function useForceUpdater(): () => void;
 export function useForceUpdater(withDep: true): [unknown, () => void];
 export function useForceUpdater(withDep?: true) {
     const r = useReducer(x => x + 1, 0);
     return withDep ? r : r[1];
 }
-/**
- * A lazy component. The factory method is called on first render. For example useful
- * for const Component = LazyComponent(() => findByDisplayName("...").default)
- * @param factory Function returning a Component
- * @param attempts How many times to try to get the component before giving up
- * @returns Result of factory function
- */
-
-export function LazyComponent<T extends object = any>(factory: () => React.ComponentType<T>, attempts = 5) {
-    const get = makeLazy(factory, attempts);
-    return (props: T) => {
-        const Component = get() ?? NoopComponent;
-        return <Component {...props} />;
-    };
-}
 
 interface TimerOpts {
     interval?: number;
@@ -159,3 +144,52 @@ export function useTimer({ interval = 1000, deps = [] }: TimerOpts) {
 
     return time;
 }
+
+/**
+ * Finds the component which includes all the given code. Checks for plain components, memos and forwardRefs
+ */
+export function findComponentByCode(...code: string[]) {
+    const filter = filters.byCode(...code);
+    return find(m => {
+        if (filter(m)) return true;
+        if (!m.$$typeof) return false;
+        if (m.type) return filter(m.type); // memos
+        if (m.render) return filter(m.render); // forwardRefs
+        return false;
+    }) ?? NoopComponent;
+}
+
+/**
+ * Finds the first component that matches the filter, lazily.
+ */
+export function findComponentLazy<T extends object = any>(filter: FilterFn) {
+    return LazyComponent<T>(() => find(filter));
+}
+
+/**
+ * Finds the first component that includes all the given code, lazily
+ */
+export function findComponentByCodeLazy<T extends object = any>(...code: string[]) {
+    return LazyComponent<T>(() => findComponentByCode(...code));
+}
+
+/**
+ * Finds the first component that is exported by the first prop name, lazily
+ */
+export function findExportedComponentLazy<T extends object = any>(...props: string[]) {
+    return LazyComponent<T>(() => findByProps(...props)?.[props[0]]);
+}
+
+/**
+ * A lazy component. The factory method is called on first render.
+ * @param factory Function returning a Component
+ * @param attempts How many times to try to get the component before giving up
+ * @returns Result of factory function
+ */
+export function LazyComponent<T extends object = any>(factory: () => React.ComponentType<T>, attempts = 5) {
+    const get = makeLazy(factory, attempts);
+    return (props: T) => {
+        const Component = get() ?? NoopComponent;
+        return <Component {...props} />;
+    };
+}
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 3ef5ac80a..4fb940561 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -386,7 +386,7 @@ export function findStore(name: string) {
 }
 
 /**
- * findByDisplayName but lazy
+ * findStore but lazy
  */
 export function findStoreLazy(name: string) {
     return proxyLazy(() => findStore(name));

From b21b6d7e5dae67537864274bd9e9f58c1f827b8f Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Wed, 22 Nov 2023 06:48:59 +0100
Subject: [PATCH 194/632] Make it possible to destructure lazy webpack finds

---
 src/plugins/betterFolders/index.tsx      |  5 ++---
 src/plugins/greetStickerPicker/index.tsx |  5 ++---
 src/utils/lazy.ts                        | 25 +++++++++++++++++++++---
 src/webpack/common/stores.ts             | 19 +++++++++---------
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/plugins/betterFolders/index.tsx b/src/plugins/betterFolders/index.tsx
index 8f40d90ff..68c50bcfd 100644
--- a/src/plugins/betterFolders/index.tsx
+++ b/src/plugins/betterFolders/index.tsx
@@ -18,9 +18,8 @@
 
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import { proxyLazy } from "@utils/lazy";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByProps, findByPropsLazy, findStoreLazy } from "@webpack";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
 import { FluxDispatcher, i18n } from "@webpack/common";
 
 import FolderSideBar from "./FolderSideBar";
@@ -31,7 +30,7 @@ enum FolderIconDisplay {
     MoreThanOneFolderExpanded
 }
 
-const GuildsTree = proxyLazy(() => findByProps("GuildsTree").GuildsTree);
+const { GuildsTree } = findByPropsLazy("GuildsTree");
 const SortedGuildStore = findStoreLazy("SortedGuildStore");
 export const ExpandedGuildFolderStore = findStoreLazy("ExpandedGuildFolderStore");
 const FolderUtils = findByPropsLazy("move", "toggleGuildFolderExpand");
diff --git a/src/plugins/greetStickerPicker/index.tsx b/src/plugins/greetStickerPicker/index.tsx
index 2c8f33799..845c7a1b8 100644
--- a/src/plugins/greetStickerPicker/index.tsx
+++ b/src/plugins/greetStickerPicker/index.tsx
@@ -18,9 +18,8 @@
 
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import { proxyLazy } from "@utils/lazy";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByProps, findByPropsLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { ContextMenu, FluxDispatcher, Menu } from "@webpack/common";
 import { Channel, Message } from "discord-types/general";
 
@@ -51,7 +50,7 @@ const settings = definePluginSettings({
 }>();
 
 const MessageActions = findByPropsLazy("sendGreetMessage");
-const WELCOME_STICKERS = proxyLazy(() => findByProps("WELCOME_STICKERS")?.WELCOME_STICKERS);
+const { WELCOME_STICKERS } = findByPropsLazy("WELCOME_STICKERS");
 
 function greet(channel: Channel, message: Message, stickers: string[]) {
     const options = MessageActions.getSendMessageOptionsForReply({
diff --git a/src/utils/lazy.ts b/src/utils/lazy.ts
index 4bac45bc2..1c89d5110 100644
--- a/src/utils/lazy.ts
+++ b/src/utils/lazy.ts
@@ -43,7 +43,6 @@ for (const method of [
     "construct",
     "defineProperty",
     "deleteProperty",
-    "get",
     "getOwnPropertyDescriptor",
     "getPrototypeOf",
     "has",
@@ -86,7 +85,11 @@ handler.getOwnPropertyDescriptor = (target, p) => {
  * Note that the example below exists already as an api, see {@link findByPropsLazy}
  * @example const mod = proxyLazy(() => findByProps("blah")); console.log(mod.blah);
  */
-export function proxyLazy<T>(factory: () => T, attempts = 5): T {
+export function proxyLazy<T>(factory: () => T, attempts = 5, isChild = false): T {
+    let isSameTick = true;
+    if (!isChild)
+        setTimeout(() => isSameTick = false, 0);
+
     let tries = 0;
     const proxyDummy = Object.assign(function () { }, {
         [kCACHE]: void 0 as T | undefined,
@@ -100,5 +103,21 @@ export function proxyLazy<T>(factory: () => T, attempts = 5): T {
         }
     });
 
-    return new Proxy(proxyDummy, handler) as any;
+    return new Proxy(proxyDummy, {
+        ...handler,
+        get(target, p, receiver) {
+            // if we're still in the same tick, it means the lazy was immediately used.
+            // thus, we lazy proxy the get access to make things like destructuring work as expected
+            // meow here will also be a lazy
+            // `const { meow } = findByPropsLazy("meow");`
+            if (!isChild && isSameTick)
+                return proxyLazy(
+                    () => Reflect.get(target[kGET](), p, receiver),
+                    attempts,
+                    true
+                );
+
+            return Reflect.get(target[kGET](), p, receiver);
+        }
+    }) as any;
 }
diff --git a/src/webpack/common/stores.ts b/src/webpack/common/stores.ts
index d10b18664..1b00180fc 100644
--- a/src/webpack/common/stores.ts
+++ b/src/webpack/common/stores.ts
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { proxyLazy } from "@utils/lazy";
 import type * as Stores from "discord-types/stores";
 
 // eslint-disable-next-line path-alias/no-relative
-import { filters, findByProps, findByPropsLazy, mapMangledModuleLazy } from "../webpack";
+import { filters, findByPropsLazy, mapMangledModuleLazy } from "../webpack";
 import { waitForStore } from "./internal";
 import * as t from "./types/stores";
 
@@ -78,13 +77,15 @@ export const MaskedLinkStore = mapMangledModuleLazy('"MaskedLinkStore"', {
  *
  * @example const user = useStateFromStores([UserStore], () => UserStore.getCurrentUser(), null, (old, current) => old.id === current.id);
  */
-export const useStateFromStores: <T>(
-    stores: t.FluxStore[],
-    mapper: () => T,
-    idk?: any,
-    isEqual?: (old: T, newer: T) => boolean
-) => T
-    = proxyLazy(() => findByProps("useStateFromStores").useStateFromStores);
+export const { useStateFromStores }: {
+    useStateFromStores: <T>(
+        stores: t.FluxStore[],
+        mapper: () => T,
+        idk?: any,
+        isEqual?: (old: T, newer: T) => boolean
+    ) => T;
+}
+    = findByPropsLazy("useStateFromStores");
 
 waitForStore("DraftStore", s => DraftStore = s);
 waitForStore("UserStore", s => UserStore = s);

From 7b24c8ac69b194783caaeb79ea04668554c4bec4 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Wed, 22 Nov 2023 07:04:17 +0100
Subject: [PATCH 195/632] move new webpack methods to more appropriate file

---
 src/components/PluginSettings/PluginModal.tsx |  3 +-
 src/plugins/betterFolders/FolderSideBar.tsx   |  3 +-
 src/plugins/clientTheme/index.tsx             |  2 +-
 src/plugins/customRPC/index.tsx               |  4 +--
 src/plugins/gameActivityToggle/index.tsx      |  2 +-
 src/plugins/messageLinkEmbeds/index.tsx       |  3 +-
 .../serverProfile/GuildProfileModal.tsx       |  4 +--
 src/plugins/showConnections/VerifiedIcon.tsx  |  3 +-
 src/plugins/showConnections/index.tsx         |  3 +-
 .../components/HiddenChannelLockScreen.tsx    |  3 +-
 src/plugins/voiceMessages/VoicePreview.tsx    |  3 +-
 src/plugins/whoReacted/index.tsx              |  4 +--
 src/utils/react.tsx                           | 36 -------------------
 src/webpack/webpack.ts                        | 36 +++++++++++++++++++
 14 files changed, 52 insertions(+), 57 deletions(-)

diff --git a/src/components/PluginSettings/PluginModal.tsx b/src/components/PluginSettings/PluginModal.tsx
index 7d5750dfa..34de43c2d 100644
--- a/src/components/PluginSettings/PluginModal.tsx
+++ b/src/components/PluginSettings/PluginModal.tsx
@@ -24,9 +24,8 @@ import { proxyLazy } from "@utils/lazy";
 import { Margins } from "@utils/margins";
 import { classes, isObjectEmpty } from "@utils/misc";
 import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize } from "@utils/modal";
-import { findComponentByCodeLazy } from "@utils/react";
 import { OptionType, Plugin } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import { Button, Clickable, FluxDispatcher, Forms, React, Text, Tooltip, UserStore, UserUtils } from "@webpack/common";
 import { User } from "discord-types/general";
 import { Constructor } from "type-fest";
diff --git a/src/plugins/betterFolders/FolderSideBar.tsx b/src/plugins/betterFolders/FolderSideBar.tsx
index 13dd9ac88..53d24ed93 100644
--- a/src/plugins/betterFolders/FolderSideBar.tsx
+++ b/src/plugins/betterFolders/FolderSideBar.tsx
@@ -17,8 +17,7 @@
 */
 
 import ErrorBoundary from "@components/ErrorBoundary";
-import { findComponentByCodeLazy } from "@utils/react";
-import { findByPropsLazy, findStoreLazy } from "@webpack";
+import { findByPropsLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack";
 import { useStateFromStores } from "@webpack/common";
 import type { CSSProperties } from "react";
 
diff --git a/src/plugins/clientTheme/index.tsx b/src/plugins/clientTheme/index.tsx
index e5de67e40..7b30863e7 100644
--- a/src/plugins/clientTheme/index.tsx
+++ b/src/plugins/clientTheme/index.tsx
@@ -11,8 +11,8 @@ import { Devs } from "@utils/constants";
 import { getTheme, Theme } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
-import { findComponentByCodeLazy } from "@utils/react";
 import definePlugin, { OptionType, StartAt } from "@utils/types";
+import { findComponentByCodeLazy } from "@webpack";
 import { Button, Forms } from "@webpack/common";
 
 const ColorPicker = findComponentByCodeLazy(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR");
diff --git a/src/plugins/customRPC/index.tsx b/src/plugins/customRPC/index.tsx
index 64bfd4609..3653a0776 100644
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@@ -20,9 +20,9 @@ import { definePluginSettings, Settings } from "@api/Settings";
 import { Link } from "@components/Link";
 import { Devs } from "@utils/constants";
 import { isTruthy } from "@utils/guards";
-import { findComponentByCodeLazy, useAwaiter } from "@utils/react";
+import { useAwaiter } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import { ApplicationAssetUtils, FluxDispatcher, Forms, GuildStore, React, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common";
 
 const ActivityComponent = findComponentByCodeLazy("onOpenGameProfile");
diff --git a/src/plugins/gameActivityToggle/index.tsx b/src/plugins/gameActivityToggle/index.tsx
index cc68d55b1..2b84d26f1 100644
--- a/src/plugins/gameActivityToggle/index.tsx
+++ b/src/plugins/gameActivityToggle/index.tsx
@@ -19,8 +19,8 @@
 import { disableStyle, enableStyle } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import { findComponentByCodeLazy } from "@utils/react";
 import definePlugin from "@utils/types";
+import { findComponentByCodeLazy } from "@webpack";
 import { StatusSettingsStores } from "@webpack/common";
 
 import style from "./style.css?managed";
diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index d8c3c99f9..762829992 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -22,9 +22,8 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants.js";
 import { classes } from "@utils/misc";
 import { Queue } from "@utils/Queue";
-import { findComponentByCodeLazy } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import {
     Button,
     ChannelStore,
diff --git a/src/plugins/serverProfile/GuildProfileModal.tsx b/src/plugins/serverProfile/GuildProfileModal.tsx
index 9def7bf99..97b40b764 100644
--- a/src/plugins/serverProfile/GuildProfileModal.tsx
+++ b/src/plugins/serverProfile/GuildProfileModal.tsx
@@ -10,8 +10,8 @@ import { classNameFactory } from "@api/Styles";
 import { openImageModal, openUserProfile } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { findExportedComponentLazy, useAwaiter } from "@utils/react";
-import { findByPropsLazy } from "@webpack";
+import { useAwaiter } from "@utils/react";
+import { findByPropsLazy, findExportedComponentLazy } from "@webpack";
 import { FluxDispatcher, Forms, GuildChannelStore, GuildMemberStore, moment, Parser, PresenceStore, RelationshipStore, ScrollerThin, SnowflakeUtils, TabBar, Timestamp, useEffect, UserStore, UserUtils, useState, useStateFromStores } from "@webpack/common";
 import { Guild, User } from "discord-types/general";
 
diff --git a/src/plugins/showConnections/VerifiedIcon.tsx b/src/plugins/showConnections/VerifiedIcon.tsx
index 200050694..ffdf21e63 100644
--- a/src/plugins/showConnections/VerifiedIcon.tsx
+++ b/src/plugins/showConnections/VerifiedIcon.tsx
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { findComponentByCodeLazy } from "@utils/react";
-import { findLazy } from "@webpack";
+import { findComponentByCodeLazy, findLazy } from "@webpack";
 import { i18n, useToken } from "@webpack/common";
 
 const ColorMap = findLazy(m => m.colors?.INTERACTIVE_MUTED?.css);
diff --git a/src/plugins/showConnections/index.tsx b/src/plugins/showConnections/index.tsx
index 2d2122d60..67fcc968d 100644
--- a/src/plugins/showConnections/index.tsx
+++ b/src/plugins/showConnections/index.tsx
@@ -24,9 +24,8 @@ import { Flex } from "@components/Flex";
 import { CopyIcon, LinkIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { copyWithToast } from "@utils/misc";
-import { findComponentByCodeLazy } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy, findByPropsLazy, findStoreLazy } from "@webpack";
+import { findByCodeLazy, findByPropsLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack";
 import { Text, Tooltip, UserProfileStore } from "@webpack/common";
 import { User } from "discord-types/general";
 
diff --git a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
index 5231fe8e7..649e87aa8 100644
--- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
+++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
@@ -18,9 +18,8 @@
 
 import { Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { findComponentByCodeLazy, findComponentLazy } from "@utils/react";
 import { formatDuration } from "@utils/text";
-import { findByPropsLazy } from "@webpack";
+import { findByPropsLazy, findComponentByCodeLazy, findComponentLazy } from "@webpack";
 import { EmojiStore, FluxDispatcher, GuildMemberStore, GuildStore, moment, Parser, PermissionsBits, PermissionStore, SnowflakeUtils, Text, Timestamp, Tooltip, useEffect, useState } from "@webpack/common";
 import type { Channel } from "discord-types/general";
 
diff --git a/src/plugins/voiceMessages/VoicePreview.tsx b/src/plugins/voiceMessages/VoicePreview.tsx
index d2c62336b..0976f7946 100644
--- a/src/plugins/voiceMessages/VoicePreview.tsx
+++ b/src/plugins/voiceMessages/VoicePreview.tsx
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { findComponentByCodeLazy, useTimer } from "@utils/react";
+import { useTimer } from "@utils/react";
+import { findComponentByCodeLazy } from "@webpack";
 
 import { cl } from "./utils";
 
diff --git a/src/plugins/whoReacted/index.tsx b/src/plugins/whoReacted/index.tsx
index 15395a1f3..4a2bdeeda 100644
--- a/src/plugins/whoReacted/index.tsx
+++ b/src/plugins/whoReacted/index.tsx
@@ -20,9 +20,9 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { sleep } from "@utils/misc";
 import { Queue } from "@utils/Queue";
-import { findComponentByCodeLazy, useForceUpdater } from "@utils/react";
+import { useForceUpdater } from "@utils/react";
 import definePlugin from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import { ChannelStore, FluxDispatcher, React, RestAPI, Tooltip } from "@webpack/common";
 import { CustomEmoji } from "@webpack/types";
 import { Message, ReactionEmoji, User } from "discord-types/general";
diff --git a/src/utils/react.tsx b/src/utils/react.tsx
index 2e3352bcc..2d2bac39d 100644
--- a/src/utils/react.tsx
+++ b/src/utils/react.tsx
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { FilterFn, filters, find, findByProps } from "@webpack";
 import { React, useEffect, useMemo, useReducer, useState } from "@webpack/common";
 
 import { makeLazy } from "./lazy";
@@ -145,41 +144,6 @@ export function useTimer({ interval = 1000, deps = [] }: TimerOpts) {
     return time;
 }
 
-/**
- * Finds the component which includes all the given code. Checks for plain components, memos and forwardRefs
- */
-export function findComponentByCode(...code: string[]) {
-    const filter = filters.byCode(...code);
-    return find(m => {
-        if (filter(m)) return true;
-        if (!m.$$typeof) return false;
-        if (m.type) return filter(m.type); // memos
-        if (m.render) return filter(m.render); // forwardRefs
-        return false;
-    }) ?? NoopComponent;
-}
-
-/**
- * Finds the first component that matches the filter, lazily.
- */
-export function findComponentLazy<T extends object = any>(filter: FilterFn) {
-    return LazyComponent<T>(() => find(filter));
-}
-
-/**
- * Finds the first component that includes all the given code, lazily
- */
-export function findComponentByCodeLazy<T extends object = any>(...code: string[]) {
-    return LazyComponent<T>(() => findComponentByCode(...code));
-}
-
-/**
- * Finds the first component that is exported by the first prop name, lazily
- */
-export function findExportedComponentLazy<T extends object = any>(...props: string[]) {
-    return LazyComponent<T>(() => findByProps(...props)?.[props[0]]);
-}
-
 /**
  * A lazy component. The factory method is called on first render.
  * @param factory Function returning a Component
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 4fb940561..9e3a0aab3 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -18,6 +18,7 @@
 
 import { proxyLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
+import { LazyComponent, NoopComponent } from "@utils/react";
 import type { WebpackInstance } from "discord-types/other";
 
 import { traceFunction } from "../debug/Tracer";
@@ -392,6 +393,41 @@ export function findStoreLazy(name: string) {
     return proxyLazy(() => findStore(name));
 }
 
+/**
+ * Finds the component which includes all the given code. Checks for plain components, memos and forwardRefs
+ */
+export function findComponentByCode(...code: string[]) {
+    const filter = filters.byCode(...code);
+    return find(m => {
+        if (filter(m)) return true;
+        if (!m.$$typeof) return false;
+        if (m.type) return filter(m.type); // memos
+        if (m.render) return filter(m.render); // forwardRefs
+        return false;
+    }) ?? NoopComponent;
+}
+
+/**
+ * Finds the first component that matches the filter, lazily.
+ */
+export function findComponentLazy<T extends object = any>(filter: FilterFn) {
+    return LazyComponent<T>(() => find(filter));
+}
+
+/**
+ * Finds the first component that includes all the given code, lazily
+ */
+export function findComponentByCodeLazy<T extends object = any>(...code: string[]) {
+    return LazyComponent<T>(() => findComponentByCode(...code));
+}
+
+/**
+ * Finds the first component that is exported by the first prop name, lazily
+ */
+export function findExportedComponentLazy<T extends object = any>(...props: string[]) {
+    return LazyComponent<T>(() => findByProps(...props)?.[props[0]]);
+}
+
 /**
  * Wait for a module that matches the provided filter to be registered,
  * then call the callback with the module as the first argument

From 93a95b6d565d7d6bb501b2776d641f6e25cac542 Mon Sep 17 00:00:00 2001
From: Jack <30497388+FieryFlames@users.noreply.github.com>
Date: Wed, 22 Nov 2023 01:23:21 -0500
Subject: [PATCH 196/632] feat(patcher): Grouped replacements (#2009)

Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Co-authored-by: V <vendicated@riseup.net>
---
 src/utils/types.ts          |  2 ++
 src/webpack/patchWebpack.ts | 33 +++++++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/utils/types.ts b/src/utils/types.ts
index 7305cd01a..16867a43c 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -41,6 +41,8 @@ export interface Patch {
     all?: boolean;
     /** Do not warn if this patch did no changes */
     noWarn?: boolean;
+    /** Only apply this set of replacements if all of them succeed. Use this if your replacements depend on each other */
+    group?: boolean;
     predicate?(): boolean;
 }
 
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index b81415e61..82648f62b 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -204,6 +204,9 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
             if (code.includes(patch.find)) {
                 patchedBy.add(patch.plugin);
 
+                const previousMod = mod;
+                const previousCode = code;
+
                 // we change all patch.replacement to array in plugins/index
                 for (const replacement of patch.replacement as PatchReplacement[]) {
                     if (replacement.predicate && !replacement.predicate()) continue;
@@ -214,11 +217,21 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
 
                     try {
                         const newCode = executePatch(replacement.match, replacement.replace as string);
-                        if (newCode === code && !patch.noWarn) {
-                            (window.explosivePlugins ??= new Set<string>()).add(patch.plugin);
-                            logger.warn(`Patch by ${patch.plugin} had no effect (Module id is ${id}): ${replacement.match}`);
-                            if (IS_DEV) {
-                                logger.debug("Function Source:\n", code);
+                        if (newCode === code) {
+                            if (!patch.noWarn) {
+                                (window.explosivePlugins ??= new Set<string>()).add(patch.plugin);
+                                logger.warn(`Patch by ${patch.plugin} had no effect (Module id is ${id}): ${replacement.match}`);
+                                if (IS_DEV) {
+                                    logger.debug("Function Source:\n", code);
+                                }
+                            }
+
+                            if (patch.group) {
+                                logger.warn(`Undoing patch ${patch.find} by ${patch.plugin} because replacement ${replacement.match} had no effect`);
+                                code = previousCode;
+                                mod = previousMod;
+                                patchedBy.delete(patch.plugin);
+                                break;
                             }
                         } else {
                             code = newCode;
@@ -259,9 +272,17 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
                             const [titleFmt, ...titleElements] = Logger.makeTitle("white", "Diff");
                             logger.errorCustomFmt(titleFmt + fmt, ...titleElements, ...elements);
                         }
+
+                        patchedBy.delete(patch.plugin);
+                        if (patch.group) {
+                            logger.warn(`Undoing patch ${patch.find} by ${patch.plugin} because replacement ${replacement.match} errored`);
+                            code = previousCode;
+                            mod = previousMod;
+                            break;
+                        }
+
                         code = lastCode;
                         mod = lastMod;
-                        patchedBy.delete(patch.plugin);
                     }
                 }
 

From a2560ede1c15896664d9c9b6301817ae96249c86 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 23 Nov 2023 02:20:02 +0100
Subject: [PATCH 197/632] fix showConnections & better webpack errors

---
 src/plugins/showConnections/index.tsx |  2 +-
 src/webpack/webpack.ts                | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/plugins/showConnections/index.tsx b/src/plugins/showConnections/index.tsx
index 67fcc968d..d4d59465e 100644
--- a/src/plugins/showConnections/index.tsx
+++ b/src/plugins/showConnections/index.tsx
@@ -31,7 +31,7 @@ import { User } from "discord-types/general";
 
 import { VerifiedIcon } from "./VerifiedIcon";
 
-const Section = findComponentByCodeLazy(".lastSection]: ");
+const Section = findComponentByCodeLazy(".lastSection", "children:");
 const ThemeStore = findStoreLazy("ThemeStore");
 const platforms: { get(type: string): ConnectionPlatform; } = findByPropsLazy("isSupported", "getByUrl");
 const getTheme: (user: User, displayProfile: any) => any = findByCodeLazy(',"--profile-gradient-primary-color"');
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 9e3a0aab3..d8743e308 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -18,7 +18,7 @@
 
 import { proxyLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
-import { LazyComponent, NoopComponent } from "@utils/react";
+import { LazyComponent } from "@utils/react";
 import type { WebpackInstance } from "discord-types/other";
 
 import { traceFunction } from "../debug/Tracer";
@@ -398,13 +398,18 @@ export function findStoreLazy(name: string) {
  */
 export function findComponentByCode(...code: string[]) {
     const filter = filters.byCode(...code);
-    return find(m => {
+    const res = find(m => {
         if (filter(m)) return true;
         if (!m.$$typeof) return false;
         if (m.type) return filter(m.type); // memos
         if (m.render) return filter(m.render); // forwardRefs
         return false;
-    }) ?? NoopComponent;
+    }, { isIndirect: true });
+
+    if (!res)
+        handleModuleNotFound("findComponentByCode", ...code);
+
+    return res;
 }
 
 /**

From 6869705673de48d1f1463b851308c975c010a1f5 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 23 Nov 2023 02:44:04 +0100
Subject: [PATCH 198/632] beef up ConsoleShortcuts

---
 src/plugins/consoleShortcuts/index.ts | 30 +++++++++++++++++++++++----
 src/webpack/webpack.ts                | 24 +++++++++++----------
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/plugins/consoleShortcuts/index.ts b/src/plugins/consoleShortcuts/index.ts
index 1c23d60e7..10853f25a 100644
--- a/src/plugins/consoleShortcuts/index.ts
+++ b/src/plugins/consoleShortcuts/index.ts
@@ -62,23 +62,27 @@ export default definePlugin({
         }
 
         let fakeRenderWin: WeakRef<Window> | undefined;
+        const find = newFindWrapper(f => f);
         return {
+            ...Vencord.Webpack.Common,
             wp: Vencord.Webpack,
             wpc: Webpack.wreq.c,
             wreq: Webpack.wreq,
             wpsearch: search,
             wpex: extract,
-            wpexs: (code: string) => Vencord.Webpack.extract(Vencord.Webpack.findModuleId(code)!),
-            find: newFindWrapper(f => f),
+            wpexs: (code: string) => extract(Webpack.findModuleId(code)!),
+            find,
             findAll,
             findByProps: newFindWrapper(filters.byProps),
             findAllByProps: (...props: string[]) => findAll(filters.byProps(...props)),
             findByCode: newFindWrapper(filters.byCode),
             findAllByCode: (code: string) => findAll(filters.byCode(code)),
+            findComponentByCode: newFindWrapper(filters.componentByCode),
+            findAllComponentsByCode: (...code: string[]) => findAll(filters.componentByCode(...code)),
+            findExportedComponent: (...props: string[]) => find(...props)[props[0]],
             findStore: newFindWrapper(filters.byStoreName),
             PluginsApi: Vencord.Plugins,
             plugins: Vencord.Plugins.plugins,
-            React,
             Settings: Vencord.Settings,
             Api: Vencord.Api,
             reload: () => location.reload(),
@@ -92,7 +96,25 @@ export default definePlugin({
                 fakeRenderWin = new WeakRef(win);
                 win.focus();
 
-                ReactDOM.render(React.createElement(component, props), win.document.body);
+                const doc = win.document;
+                doc.body.style.margin = "1em";
+
+                if (!win.prepared) {
+                    win.prepared = true;
+
+                    [...document.querySelectorAll("style"), ...document.querySelectorAll("link[rel=stylesheet]")].forEach(s => {
+                        const n = s.cloneNode(true) as HTMLStyleElement | HTMLLinkElement;
+
+                        if (s.parentElement?.tagName === "HEAD")
+                            doc.head.append(n);
+                        else if (n.id?.startsWith("vencord-") || n.id?.startsWith("vcd-"))
+                            doc.documentElement.append(n);
+                        else
+                            doc.body.append(n);
+                    });
+                }
+
+                ReactDOM.render(React.createElement(component, props), doc.body.appendChild(document.createElement("div")));
             }
         };
     },
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index d8743e308..c7be62da0 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -52,7 +52,18 @@ export const filters = {
         return true;
     },
     byStoreName: (name: string): FilterFn => m =>
-        m.constructor?.displayName === name
+        m.constructor?.displayName === name,
+
+    componentByCode: (...code: string[]): FilterFn => {
+        const filter = filters.byCode(...code);
+        return m => {
+            if (filter(m)) return true;
+            if (!m.$$typeof) return false;
+            if (m.type) return filter(m.type); // memos
+            if (m.render) return filter(m.render); // forwardRefs
+            return false;
+        };
+    }
 };
 
 export const subscriptions = new Map<FilterFn, CallbackFn>();
@@ -397,18 +408,9 @@ export function findStoreLazy(name: string) {
  * Finds the component which includes all the given code. Checks for plain components, memos and forwardRefs
  */
 export function findComponentByCode(...code: string[]) {
-    const filter = filters.byCode(...code);
-    const res = find(m => {
-        if (filter(m)) return true;
-        if (!m.$$typeof) return false;
-        if (m.type) return filter(m.type); // memos
-        if (m.render) return filter(m.render); // forwardRefs
-        return false;
-    }, { isIndirect: true });
-
+    const res = find(filters.componentByCode(...code), { isIndirect: true });
     if (!res)
         handleModuleNotFound("findComponentByCode", ...code);
-
     return res;
 }
 

From 63451bad25c9f246e6d458f0472e2b57d696a581 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 23 Nov 2023 03:11:17 +0100
Subject: [PATCH 199/632] Remove obsolete mapMangledModule ~ modules are no
 longer mangled

---
 src/plugins/gifPaste/index.ts                 |  8 ++--
 src/plugins/greetStickerPicker/index.tsx      |  4 +-
 src/plugins/imageZoom/index.tsx               |  6 +--
 .../components/RolesAndUsersPermissions.tsx   |  6 +--
 .../spotifyControls/PlayerComponent.tsx       |  6 +--
 src/utils/modal.tsx                           | 10 +----
 src/webpack/common/menu.ts                    |  8 +---
 src/webpack/common/stores.ts                  |  6 +--
 src/webpack/common/types/menu.d.ts            |  6 +--
 src/webpack/common/types/utils.d.ts           | 21 ++++++++++
 src/webpack/common/utils.ts                   | 14 ++-----
 src/webpack/webpack.ts                        | 41 -------------------
 12 files changed, 46 insertions(+), 90 deletions(-)

diff --git a/src/plugins/gifPaste/index.ts b/src/plugins/gifPaste/index.ts
index 9ce88f9d2..3e864b31a 100644
--- a/src/plugins/gifPaste/index.ts
+++ b/src/plugins/gifPaste/index.ts
@@ -19,11 +19,9 @@
 import { Devs } from "@utils/constants";
 import { insertTextIntoChatInputBox } from "@utils/discord";
 import definePlugin from "@utils/types";
-import { filters, mapMangledModuleLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 
-const ExpressionPickerState = mapMangledModuleLazy('name:"expression-picker-last-active-view"', {
-    close: filters.byCode("activeView:null", "setState")
-});
+const { closeExpressionPicker } = findByPropsLazy("closeExpressionPicker");
 
 export default definePlugin({
     name: "GifPaste",
@@ -41,7 +39,7 @@ export default definePlugin({
     handleSelect(gif?: { url: string; }) {
         if (gif) {
             insertTextIntoChatInputBox(gif.url + " ");
-            ExpressionPickerState.close();
+            closeExpressionPicker();
         }
     }
 });
diff --git a/src/plugins/greetStickerPicker/index.tsx b/src/plugins/greetStickerPicker/index.tsx
index 845c7a1b8..9623d422e 100644
--- a/src/plugins/greetStickerPicker/index.tsx
+++ b/src/plugins/greetStickerPicker/index.tsx
@@ -20,7 +20,7 @@ import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { ContextMenu, FluxDispatcher, Menu } from "@webpack/common";
+import { ContextMenuApi, FluxDispatcher, Menu } from "@webpack/common";
 import { Channel, Message } from "discord-types/general";
 
 interface Sticker {
@@ -183,6 +183,6 @@ export default definePlugin({
         }
     ) {
         if (!(props.message as any).deleted)
-            ContextMenu.open(event, () => <GreetMenu {...props} />);
+            ContextMenuApi.openContextMenu(event, () => <GreetMenu {...props} />);
     }
 });
diff --git a/src/plugins/imageZoom/index.tsx b/src/plugins/imageZoom/index.tsx
index 75c944ebd..c14754c87 100644
--- a/src/plugins/imageZoom/index.tsx
+++ b/src/plugins/imageZoom/index.tsx
@@ -23,7 +23,7 @@ import { makeRange } from "@components/PluginSettings/components";
 import { Devs } from "@utils/constants";
 import { debounce } from "@utils/debounce";
 import definePlugin, { OptionType } from "@utils/types";
-import { ContextMenu, Menu, React, ReactDOM } from "@webpack/common";
+import { ContextMenuApi, Menu, React, ReactDOM } from "@webpack/common";
 import type { Root } from "react-dom/client";
 
 import { Magnifier, MagnifierProps } from "./components/Magnifier";
@@ -89,7 +89,7 @@ const imageContextMenuPatch: NavContextMenuPatchCallback = children => () => {
                 checked={settings.store.square}
                 action={() => {
                     settings.store.square = !settings.store.square;
-                    ContextMenu.close();
+                    ContextMenuApi.closeContextMenu();
                 }}
             />
             <Menu.MenuCheckboxItem
@@ -98,7 +98,7 @@ const imageContextMenuPatch: NavContextMenuPatchCallback = children => () => {
                 checked={settings.store.nearestNeighbour}
                 action={() => {
                     settings.store.nearestNeighbour = !settings.store.nearestNeighbour;
-                    ContextMenu.close();
+                    ContextMenuApi.closeContextMenu();
                 }}
             />
             <Menu.MenuControlItem
diff --git a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
index 629880467..e0d25c7ab 100644
--- a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
@@ -21,7 +21,7 @@ import { Flex } from "@components/Flex";
 import { InfoIcon, OwnerCrownIcon } from "@components/Icons";
 import { getUniqueUsername } from "@utils/discord";
 import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { ContextMenu, FluxDispatcher, GuildMemberStore, Menu, PermissionsBits, Text, Tooltip, useEffect, UserStore, useState, useStateFromStores } from "@webpack/common";
+import { ContextMenuApi, FluxDispatcher, GuildMemberStore, Menu, PermissionsBits, Text, Tooltip, useEffect, UserStore, useState, useStateFromStores } from "@webpack/common";
 import type { Guild } from "discord-types/general";
 
 import { settings } from "..";
@@ -111,7 +111,7 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
                                             className={cl("perms-list-item", { "perms-list-item-active": selectedItemIndex === index })}
                                             onContextMenu={e => {
                                                 if ((settings.store as any).unsafeViewAsRole && permission.type === PermissionType.Role)
-                                                    ContextMenu.open(e, () => (
+                                                    ContextMenuApi.openContextMenu(e, () => (
                                                         <RoleContextMenu
                                                             guild={guild}
                                                             roleId={permission.id!}
@@ -194,7 +194,7 @@ function RoleContextMenu({ guild, roleId, onClose }: { guild: Guild; roleId: str
     return (
         <Menu.Menu
             navId={cl("role-context-menu")}
-            onClose={ContextMenu.close}
+            onClose={ContextMenuApi.closeContextMenu}
             aria-label="Role Options"
         >
             <Menu.MenuItem
diff --git a/src/plugins/spotifyControls/PlayerComponent.tsx b/src/plugins/spotifyControls/PlayerComponent.tsx
index 43c499ab7..f2370906b 100644
--- a/src/plugins/spotifyControls/PlayerComponent.tsx
+++ b/src/plugins/spotifyControls/PlayerComponent.tsx
@@ -24,7 +24,7 @@ import { ImageIcon, LinkIcon, OpenExternalIcon } from "@components/Icons";
 import { debounce } from "@utils/debounce";
 import { openImageModal } from "@utils/discord";
 import { classes, copyWithToast } from "@utils/misc";
-import { ContextMenu, FluxDispatcher, Forms, Menu, React, useEffect, useState, useStateFromStores } from "@webpack/common";
+import { ContextMenuApi, FluxDispatcher, Forms, Menu, React, useEffect, useState, useStateFromStores } from "@webpack/common";
 
 import { SpotifyStore, Track } from "./SpotifyStore";
 
@@ -104,7 +104,7 @@ function CopyContextMenu({ name, path }: { name: string; path: string; }) {
 
 function makeContextMenu(name: string, path: string) {
     return (e: React.MouseEvent<HTMLElement, MouseEvent>) =>
-        ContextMenu.open(e, () => <CopyContextMenu name={name} path={path} />);
+        ContextMenuApi.openContextMenu(e, () => <CopyContextMenu name={name} path={path} />);
 }
 
 function Controls() {
@@ -277,7 +277,7 @@ function Info({ track }: { track: Track; }) {
                     alt="Album Image"
                     onClick={() => setCoverExpanded(!coverExpanded)}
                     onContextMenu={e => {
-                        ContextMenu.open(e, () => <AlbumContextMenu track={track} />);
+                        ContextMenuApi.openContextMenu(e, () => <AlbumContextMenu track={track} />);
                     }}
                 />
             )}
diff --git a/src/utils/modal.tsx b/src/utils/modal.tsx
index 1efb9cdd8..6758a1a1a 100644
--- a/src/utils/modal.tsx
+++ b/src/utils/modal.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { filters, findByProps, findByPropsLazy, mapMangledModuleLazy } from "@webpack";
+import { findByProps, findByPropsLazy } from "@webpack";
 import type { ComponentType, PropsWithChildren, ReactNode, Ref } from "react";
 
 import { LazyComponent } from "./react";
@@ -49,13 +49,7 @@ export interface ModalOptions {
 
 type RenderFunction = (props: ModalProps) => ReactNode;
 
-export const Modals = mapMangledModuleLazy(".closeWithCircleBackground", {
-    ModalRoot: filters.byCode(".root"),
-    ModalHeader: filters.byCode(".header"),
-    ModalContent: filters.byCode(".content"),
-    ModalFooter: filters.byCode(".footerSeparator"),
-    ModalCloseButton: filters.byCode(".closeWithCircleBackground"),
-}) as {
+export const Modals = findByPropsLazy("ModalRoot", "ModalCloseButton") as {
     ModalRoot: ComponentType<PropsWithChildren<{
         transitionState: ModalTransitionState;
         size?: ModalSize;
diff --git a/src/webpack/common/menu.ts b/src/webpack/common/menu.ts
index c0d9c5f9d..9a4a3a799 100644
--- a/src/webpack/common/menu.ts
+++ b/src/webpack/common/menu.ts
@@ -17,16 +17,12 @@
 */
 
 // eslint-disable-next-line path-alias/no-relative
-import { filters, mapMangledModuleLazy, waitFor } from "../webpack";
+import { findByPropsLazy, waitFor } from "../webpack";
 import type * as t from "./types/menu";
 
 export let Menu = {} as t.Menu;
 
 waitFor(["MenuItem", "MenuSliderControl"], m => Menu = m);
 
-export const ContextMenu: t.ContextMenuApi = mapMangledModuleLazy('type:"CONTEXT_MENU_OPEN"', {
-    open: filters.byCode("stopPropagation"),
-    openLazy: m => m.toString().length < 50,
-    close: filters.byCode("CONTEXT_MENU_CLOSE")
-});
+export const ContextMenuApi: t.ContextMenuApi = findByPropsLazy("closeContextMenu", "openContextMenu");
 
diff --git a/src/webpack/common/stores.ts b/src/webpack/common/stores.ts
index 1b00180fc..0c470d6a6 100644
--- a/src/webpack/common/stores.ts
+++ b/src/webpack/common/stores.ts
@@ -19,7 +19,7 @@
 import type * as Stores from "discord-types/stores";
 
 // eslint-disable-next-line path-alias/no-relative
-import { filters, findByPropsLazy, mapMangledModuleLazy } from "../webpack";
+import { findByPropsLazy } from "../webpack";
 import { waitForStore } from "./internal";
 import * as t from "./types/stores";
 
@@ -62,10 +62,6 @@ export let EmojiStore: t.EmojiStore;
 export let WindowStore: t.WindowStore;
 export let DraftStore: t.DraftStore;
 
-export const MaskedLinkStore = mapMangledModuleLazy('"MaskedLinkStore"', {
-    openUntrustedLink: filters.byCode(".apply(this,arguments)")
-});
-
 /**
  * React hook that returns stateful data for one or more stores
  * You might need a custom comparator (4th argument) if your store data is an object
diff --git a/src/webpack/common/types/menu.d.ts b/src/webpack/common/types/menu.d.ts
index 29f3ffaee..0b8ab5c66 100644
--- a/src/webpack/common/types/menu.d.ts
+++ b/src/webpack/common/types/menu.d.ts
@@ -75,14 +75,14 @@ export interface Menu {
 }
 
 export interface ContextMenuApi {
-    close(): void;
-    open(
+    closeContextMenu(): void;
+    openContextMenu(
         event: UIEvent,
         render?: Menu["Menu"],
         options?: { enableSpellCheck?: boolean; },
         renderLazy?: () => Promise<Menu["Menu"]>
     ): void;
-    openLazy(
+    openContextMenuLazy(
         event: UIEvent,
         renderLazy?: () => Promise<Menu["Menu"]>,
         options?: { enableSpellCheck?: boolean; }
diff --git a/src/webpack/common/types/utils.d.ts b/src/webpack/common/types/utils.d.ts
index 64a68f2c2..246659146 100644
--- a/src/webpack/common/types/utils.d.ts
+++ b/src/webpack/common/types/utils.d.ts
@@ -161,3 +161,24 @@ export interface i18n {
 
     Messages: Record<i18nMessages, any>;
 }
+
+export interface Clipboard {
+    copy(text: string): void;
+    SUPPORTS_COPY: boolean;
+}
+
+export interface NavigationRouter {
+    back(): void;
+    forward(): void;
+    hasNavigated(): boolean;
+    getHistory(): {
+        action: string;
+        length: 50;
+        [key: string]: any;
+    };
+    transitionTo(path: string, ...args: unknown[]): void;
+    transitionToGuild(guildId: string, ...args: unknown[]): void;
+    replaceWith(...args: unknown[]): void;
+    getLastRouteChangeSource(): any;
+    getLastRouteChangeSourceLocationStack(): any;
+}
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 8376925e5..2a3d4e677 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -20,7 +20,7 @@ import { proxyLazy } from "@utils/lazy";
 import type { Channel, User } from "discord-types/general";
 
 // eslint-disable-next-line path-alias/no-relative
-import { _resolveReady, filters, find, findByPropsLazy, findLazy, mapMangledModuleLazy, waitFor } from "../webpack";
+import { _resolveReady, find, findByPropsLazy, findLazy, waitFor } from "../webpack";
 import type * as t from "./types/utils";
 
 export let FluxDispatcher: t.FluxDispatcher;
@@ -102,17 +102,9 @@ export const ApplicationAssetUtils = findByPropsLazy("fetchAssetIds", "getAssetI
     fetchAssetIds: (applicationId: string, e: string[]) => Promise<string[]>;
 };
 
-export const Clipboard = mapMangledModuleLazy('document.queryCommandEnabled("copy")||document.queryCommandSupported("copy")', {
-    copy: filters.byCode(".copy("),
-    SUPPORTS_COPY: x => typeof x === "boolean",
-});
+export const Clipboard: t.Clipboard = findByPropsLazy("SUPPORTS_COPY", "copy");
 
-export const NavigationRouter = mapMangledModuleLazy("transitionToGuild - ", {
-    transitionTo: filters.byCode("transitionTo -"),
-    transitionToGuild: filters.byCode("transitionToGuild -"),
-    goBack: filters.byCode("goBack()"),
-    goForward: filters.byCode("goForward()"),
-});
+export const NavigationRouter: t.NavigationRouter = findByPropsLazy("transitionTo", "replaceWith", "transitionToGuild");
 
 waitFor(["dispatch", "subscribe"], m => {
     FluxDispatcher = m;
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index c7be62da0..b9c67e8fc 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -312,47 +312,6 @@ export const findModuleId = traceFunction("findModuleId", function findModuleId(
     return null;
 });
 
-/**
- * Finds a mangled module by the provided code "code" (must be unique and can be anywhere in the module)
- * then maps it into an easily usable module via the specified mappers
- * @param code Code snippet
- * @param mappers Mappers to create the non mangled exports
- * @returns Unmangled exports as specified in mappers
- *
- * @example mapMangledModule("headerIdIsManaged:", {
- *             openModal: filters.byCode("headerIdIsManaged:"),
- *             closeModal: filters.byCode("key==")
- *          })
- */
-export const mapMangledModule = traceFunction("mapMangledModule", function mapMangledModule<S extends string>(code: string, mappers: Record<S, FilterFn>): Record<S, any> {
-    const exports = {} as Record<S, any>;
-
-    const id = findModuleId(code);
-    if (id === null)
-        return exports;
-
-    const mod = wreq(id);
-    outer:
-    for (const key in mod) {
-        const member = mod[key];
-        for (const newName in mappers) {
-            // if the current mapper matches this module
-            if (mappers[newName](member)) {
-                exports[newName] = member;
-                continue outer;
-            }
-        }
-    }
-    return exports;
-});
-
-/**
- * Same as {@link mapMangledModule} but lazy
- */
-export function mapMangledModuleLazy<S extends string>(code: string, mappers: Record<S, FilterFn>): Record<S, any> {
-    return proxyLazy(() => mapMangledModule(code, mappers));
-}
-
 /**
  * Find the first module that has the specified properties
  */

From 9efc0ff5797cfdd346d0a1951db4d3480137f72d Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 23 Nov 2023 03:21:58 +0100
Subject: [PATCH 200/632] Remove obsolete nested webpack search

---
 src/webpack/patchWebpack.ts | 15 ++------
 src/webpack/webpack.ts      | 68 -------------------------------------
 2 files changed, 3 insertions(+), 80 deletions(-)

diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index 82648f62b..0311e171c 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -170,18 +170,9 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
                     if (filter(exports)) {
                         subscriptions.delete(filter);
                         callback(exports, numberId);
-                    } else if (typeof exports === "object") {
-                        if (exports.default && filter(exports.default)) {
-                            subscriptions.delete(filter);
-                            callback(exports.default, numberId);
-                        }
-
-                        for (const nested in exports) if (nested.length <= 3) {
-                            if (exports[nested] && filter(exports[nested])) {
-                                subscriptions.delete(filter);
-                                callback(exports[nested], numberId);
-                            }
-                        }
+                    } else if (exports.default && filter(exports.default)) {
+                        subscriptions.delete(filter);
+                        callback(exports.default, numberId);
                     }
                 } catch (err) {
                     logger.error("Error while firing callback for webpack chunk", err);
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index b9c67e8fc..2c55fd367 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -79,44 +79,6 @@ export function _initWebpack(instance: typeof window.webpackChunkdiscord_app) {
     if (!wreq) return false;
 
     cache = wreq.c;
-
-    for (const id in cache) {
-        const { exports } = cache[id];
-        if (!exports) continue;
-
-        const numberId = Number(id);
-
-        for (const callback of listeners) {
-            try {
-                callback(exports, numberId);
-            } catch (err) {
-                logger.error("Error in webpack listener", err);
-            }
-        }
-
-        for (const [filter, callback] of subscriptions) {
-            try {
-                if (filter(exports)) {
-                    subscriptions.delete(filter);
-                    callback(exports, numberId);
-                } else if (typeof exports === "object") {
-                    if (exports.default && filter(exports.default)) {
-                        subscriptions.delete(filter);
-                        callback(exports.default, numberId);
-                    }
-
-                    for (const nested in exports) if (nested.length <= 3) {
-                        if (exports[nested] && filter(exports[nested])) {
-                            subscriptions.delete(filter);
-                            callback(exports[nested], numberId);
-                        }
-                    }
-                }
-            } catch (err) {
-                logger.error("Error while firing callback for webpack chunk", err);
-            }
-        }
-    }
     return true;
 }
 
@@ -152,20 +114,10 @@ export const find = traceFunction("find", function find(filter: FilterFn, { isIn
             return isWaitFor ? [mod.exports, Number(key)] : mod.exports;
         }
 
-        if (typeof mod.exports !== "object") continue;
-
         if (mod.exports.default && filter(mod.exports.default)) {
             const found = mod.exports.default;
             return isWaitFor ? [found, Number(key)] : found;
         }
-
-        // the length check makes search about 20% faster
-        for (const nestedMod in mod.exports) if (nestedMod.length <= 3) {
-            const nested = mod.exports[nestedMod];
-            if (nested && filter(nested)) {
-                return isWaitFor ? [nested, Number(key)] : nested;
-            }
-        }
     }
 
     if (!isIndirect) {
@@ -193,15 +145,9 @@ export function findAll(filter: FilterFn) {
 
         if (filter(mod.exports))
             ret.push(mod.exports);
-        else if (typeof mod.exports !== "object")
-            continue;
 
         if (mod.exports.default && filter(mod.exports.default))
             ret.push(mod.exports.default);
-        else for (const nestedMod in mod.exports) if (nestedMod.length <= 3) {
-            const nested = mod.exports[nestedMod];
-            if (nested && filter(nested)) ret.push(nested);
-        }
     }
 
     return ret;
@@ -251,26 +197,12 @@ export const findBulk = traceFunction("findBulk", function findBulk(...filterFns
                 break;
             }
 
-            if (typeof mod.exports !== "object")
-                continue;
-
             if (mod.exports.default && filter(mod.exports.default)) {
                 results[j] = mod.exports.default;
                 filters[j] = undefined;
                 if (++found === length) break outer;
                 break;
             }
-
-            for (const nestedMod in mod.exports)
-                if (nestedMod.length <= 3) {
-                    const nested = mod.exports[nestedMod];
-                    if (nested && filter(nested)) {
-                        results[j] = nested;
-                        filters[j] = undefined;
-                        if (++found === length) break outer;
-                        continue outer;
-                    }
-                }
         }
     }
 

From 6f05612e34deb07721d857b7e7c216a428da9dda Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 23 Nov 2023 03:41:09 +0100
Subject: [PATCH 201/632] Remove obsolete webpack hacks

---
 src/webpack/patchWebpack.ts | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index 0311e171c..b992cfdea 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -119,12 +119,9 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
         // Additionally, `[actual newline]` is one less char than "\n", so if Discord
         // ever targets newer browsers, the minifier could potentially use this trick and
         // cause issues.
-        let code: string = mod.toString().replaceAll("\n", "");
-        // a very small minority of modules use function() instead of arrow functions,
-        // but, unnamed toplevel functions aren't valid. However 0, function() makes it a statement
-        if (code.startsWith("function(")) {
-            code = "0," + code;
-        }
+        //
+        // 0, prefix is to turn it into an expression: 0,function(){} would be invalid syntax without the 0,
+        let code: string = "0," + mod.toString().replaceAll("\n", "");
         const originalMod = mod;
         const patchedBy = new Set();
 
@@ -182,10 +179,8 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
 
         // for some reason throws some error on which calling .toString() leads to infinite recursion
         // when you force load all chunks???
-        try {
-            factory.toString = () => mod.toString();
-            factory.original = originalMod;
-        } catch { }
+        factory.toString = () => mod.toString();
+        factory.original = originalMod;
 
         for (let i = 0; i < patches.length; i++) {
             const patch = patches[i];
@@ -210,7 +205,6 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
                         const newCode = executePatch(replacement.match, replacement.replace as string);
                         if (newCode === code) {
                             if (!patch.noWarn) {
-                                (window.explosivePlugins ??= new Set<string>()).add(patch.plugin);
                                 logger.warn(`Patch by ${patch.plugin} had no effect (Module id is ${id}): ${replacement.match}`);
                                 if (IS_DEV) {
                                     logger.debug("Function Source:\n", code);

From 4832a9433fe6575d4a15cd733246cbc1498666c4 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 23 Nov 2023 06:18:34 +0100
Subject: [PATCH 202/632] fix broken webpack finds

---
 src/plugins/friendInvites/index.ts       | 4 ++--
 src/plugins/webContextMenus.web/index.ts | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/plugins/friendInvites/index.ts b/src/plugins/friendInvites/index.ts
index 92209986d..e5ff447ed 100644
--- a/src/plugins/friendInvites/index.ts
+++ b/src/plugins/friendInvites/index.ts
@@ -23,7 +23,7 @@ import { findByPropsLazy } from "@webpack";
 import { RestAPI, UserStore } from "@webpack/common";
 
 const FriendInvites = findByPropsLazy("createFriendInvite");
-const uuid = findByPropsLazy("v4", "v1");
+const { uuid4 } = findByPropsLazy("uuid4");
 
 export default definePlugin({
     name: "FriendInvites",
@@ -56,7 +56,7 @@ export default definePlugin({
 
                 let invite: any;
                 if (uses === 1) {
-                    const random = uuid.v4();
+                    const random = uuid4();
                     const { body: { invite_suggestions } } = await RestAPI.post({
                         url: "/friend-finder/find-friends",
                         body: {
diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index bbfaa6747..9c4dd67c4 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -20,8 +20,8 @@ import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { saveFile } from "@utils/web";
-import { findByProps, findLazy } from "@webpack";
-import { Clipboard } from "@webpack/common";
+import { findByProps } from "@webpack";
+import { Clipboard, ComponentDispatch } from "@webpack/common";
 
 async function fetchImage(url: string) {
     const res = await fetch(url);
@@ -30,7 +30,6 @@ async function fetchImage(url: string) {
     return await res.blob();
 }
 
-const MiniDispatcher = findLazy(m => m.emitter?._events?.INSERT_TEXT);
 
 const settings = definePluginSettings({
     // This needs to be all in one setting because to enable any of these, we need to make Discord use their desktop context
@@ -213,7 +212,7 @@ export default definePlugin({
 
     cut() {
         this.copy();
-        MiniDispatcher.dispatch("INSERT_TEXT", { rawText: "" });
+        ComponentDispatch.dispatch("INSERT_TEXT", { rawText: "" });
     },
 
     async paste() {

From 0f74817e255727ad7b1fa6a6d963f42115e29070 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 23 Nov 2023 02:21:59 -0300
Subject: [PATCH 203/632] Fix broken SHC find

---
 .../showHiddenChannels/components/HiddenChannelLockScreen.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
index 649e87aa8..87946110d 100644
--- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
+++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
@@ -90,7 +90,7 @@ const TagComponent = findComponentLazy(m => {
 });
 
 const EmojiParser = findByPropsLazy("convertSurrogateToName");
-const EmojiUtils = findByPropsLazy("getURL", "buildEmojiReactionColorsPlatformed");
+const EmojiUtils = findByPropsLazy("getURL", "getEmojiColors");
 
 const ChannelTypesToChannelNames = {
     [ChannelTypes.GUILD_TEXT]: "text",

From f39f16d34bd12a19c4c06b2ac4d7ba4010c1dcef Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 23 Nov 2023 06:43:22 +0100
Subject: [PATCH 204/632] fix circular import bricking browser version

---
 src/utils/lazyReact.tsx | 23 +++++++++++++++++++++++
 src/utils/react.tsx     | 17 ++---------------
 src/webpack/webpack.ts  |  5 +----
 3 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 src/utils/lazyReact.tsx

diff --git a/src/utils/lazyReact.tsx b/src/utils/lazyReact.tsx
new file mode 100644
index 000000000..abd300a97
--- /dev/null
+++ b/src/utils/lazyReact.tsx
@@ -0,0 +1,23 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { makeLazy } from "./lazy";
+
+const NoopComponent = () => null;
+
+/**
+ * A lazy component. The factory method is called on first render.
+ * @param factory Function returning a Component
+ * @param attempts How many times to try to get the component before giving up
+ * @returns Result of factory function
+ */
+export function LazyComponent<T extends object = any>(factory: () => React.ComponentType<T>, attempts = 5) {
+    const get = makeLazy(factory, attempts);
+    return (props: T) => {
+        const Component = get() ?? NoopComponent;
+        return <Component {...props} />;
+    };
+}
diff --git a/src/utils/react.tsx b/src/utils/react.tsx
index 2d2bac39d..f31549f19 100644
--- a/src/utils/react.tsx
+++ b/src/utils/react.tsx
@@ -18,9 +18,10 @@
 
 import { React, useEffect, useMemo, useReducer, useState } from "@webpack/common";
 
-import { makeLazy } from "./lazy";
 import { checkIntersecting } from "./misc";
 
+export * from "./lazyReact";
+
 export const NoopComponent = () => null;
 
 /**
@@ -143,17 +144,3 @@ export function useTimer({ interval = 1000, deps = [] }: TimerOpts) {
 
     return time;
 }
-
-/**
- * A lazy component. The factory method is called on first render.
- * @param factory Function returning a Component
- * @param attempts How many times to try to get the component before giving up
- * @returns Result of factory function
- */
-export function LazyComponent<T extends object = any>(factory: () => React.ComponentType<T>, attempts = 5) {
-    const get = makeLazy(factory, attempts);
-    return (props: T) => {
-        const Component = get() ?? NoopComponent;
-        return <Component {...props} />;
-    };
-}
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 2c55fd367..b4fdb4e10 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -17,8 +17,8 @@
 */
 
 import { proxyLazy } from "@utils/lazy";
+import { LazyComponent } from "@utils/lazyReact";
 import { Logger } from "@utils/Logger";
-import { LazyComponent } from "@utils/react";
 import type { WebpackInstance } from "discord-types/other";
 
 import { traceFunction } from "../debug/Tracer";
@@ -338,9 +338,6 @@ export function waitFor(filter: string | string[] | FilterFn, callback: Callback
     else if (typeof filter !== "function")
         throw new Error("filter must be a string, string[] or function, got " + typeof filter);
 
-    const [existing, id] = find(filter!, { isIndirect: true, isWaitFor: true });
-    if (existing) return void callback(existing, id);
-
     subscriptions.set(filter, callback);
 }
 

From 81fb7c6322f4fd5f56ea95b268597f5365af6f39 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 23 Nov 2023 06:45:01 +0100
Subject: [PATCH 205/632] add back code that got lost

---
 src/webpack/webpack.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index b4fdb4e10..980288e9e 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -338,6 +338,9 @@ export function waitFor(filter: string | string[] | FilterFn, callback: Callback
     else if (typeof filter !== "function")
         throw new Error("filter must be a string, string[] or function, got " + typeof filter);
 
+    const [existing, id] = find(filter!, { isIndirect: true, isWaitFor: true });
+    if (existing) return void callback(existing, id);
+
     subscriptions.set(filter, callback);
 }
 

From e14fba28a51981e76f23dad9b9145b49421dac07 Mon Sep 17 00:00:00 2001
From: cat <101748822+capillarys@users.noreply.github.com>
Date: Thu, 23 Nov 2023 17:31:25 +0000
Subject: [PATCH 206/632] ClearURLS for x.com links (#2005)

---
 src/plugins/clearURLs/defaultRules.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/plugins/clearURLs/defaultRules.ts b/src/plugins/clearURLs/defaultRules.ts
index d6914b905..e7c3ecbeb 100644
--- a/src/plugins/clearURLs/defaultRules.ts
+++ b/src/plugins/clearURLs/defaultRules.ts
@@ -121,6 +121,9 @@ export const defaultRules = [
     "t@*.twitter.com",
     "s@*.twitter.com",
     "ref_*@*.twitter.com",
+    "t@*.x.com",
+    "s@*.x.com",
+    "ref_*@*.x.com",
     "tt_medium",
     "tt_content",
     "lr@yandex.*",

From fdddfdb05b339a7c677044756b75cdff43f45e16 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 24 Nov 2023 16:32:30 -0300
Subject: [PATCH 207/632] feat(plugins): FixImagesQuality

---
 src/plugins/fixImagesQuality/index.ts | 35 +++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/plugins/fixImagesQuality/index.ts

diff --git a/src/plugins/fixImagesQuality/index.ts b/src/plugins/fixImagesQuality/index.ts
new file mode 100644
index 000000000..e0dfcb6d4
--- /dev/null
+++ b/src/plugins/fixImagesQuality/index.ts
@@ -0,0 +1,35 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "FixImagesQuality",
+    description: "Fixes the quality of images in the chat being horrible.",
+    authors: [Devs.Nuckyz],
+    patches: [
+        {
+            find: "handleImageLoad=",
+            replacement: {
+                match: /(?<=getSrc\(\i\){.+?format:)\i/,
+                replace: "null"
+            }
+        }
+    ]
+});

From 3e8e106be7f010a87871a44f75446053aae3b6be Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 24 Nov 2023 16:49:19 -0300
Subject: [PATCH 208/632] Fix broken patches

---
 src/plugins/fixImagesQuality/index.ts    | 20 +++------------
 src/plugins/sortFriendRequests/index.tsx | 31 ++++++++++++------------
 src/plugins/webContextMenus.web/index.ts |  6 ++---
 3 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/src/plugins/fixImagesQuality/index.ts b/src/plugins/fixImagesQuality/index.ts
index e0dfcb6d4..d94c8e3b2 100644
--- a/src/plugins/fixImagesQuality/index.ts
+++ b/src/plugins/fixImagesQuality/index.ts
@@ -1,20 +1,8 @@
 /*
- * 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/>.
-*/
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
diff --git a/src/plugins/sortFriendRequests/index.tsx b/src/plugins/sortFriendRequests/index.tsx
index 3698379c8..c40a18140 100644
--- a/src/plugins/sortFriendRequests/index.tsx
+++ b/src/plugins/sortFriendRequests/index.tsx
@@ -16,17 +16,27 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { definePluginSettings } from "@api/Settings";
 import { Flex } from "@components/Flex";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { RelationshipStore } from "@webpack/common";
 import { User } from "discord-types/general";
-import { Settings } from "Vencord";
+
+const settings = definePluginSettings({
+    showDates: {
+        type: OptionType.BOOLEAN,
+        description: "Show dates on friend requests",
+        default: false,
+        restartNeeded: true
+    }
+});
 
 export default definePlugin({
     name: "SortFriendRequests",
     authors: [Devs.Megu],
     description: "Sorts friend requests by date of receipt",
+    settings,
 
     patches: [{
         find: "getRelationshipCounts(){",
@@ -35,13 +45,11 @@ export default definePlugin({
             replace: ".sortBy((row) => $self.sortList(row))"
         }
     }, {
-        find: "RelationshipTypes.PENDING_INCOMING?",
+        find: ".Messages.FRIEND_REQUEST_CANCEL",
         replacement: {
-            predicate: () => Settings.plugins.SortFriendRequests.showDates,
-            match: /(user:(\i),.{10,50}),subText:(\i),(className:\i\.userInfo}\))/,
-            replace: (_, pre, user, subtext, post) => `${pre},
-                    subText: $self.makeSubtext(${subtext}, ${user}),
-                    ${post}`
+            predicate: () => settings.store.showDates,
+            match: /subText:(\i)(?=,className:\i\.userInfo}\))(?<=user:(\i).+?)/,
+            replace: (_, subtext, user) => `subText:$self.makeSubtext(${subtext},${user})`
         }
     }],
 
@@ -63,14 +71,5 @@ export default definePlugin({
                 {!isNaN(since.getTime()) && <span>Received &mdash; {since.toDateString()}</span>}
             </Flex>
         );
-    },
-
-    options: {
-        showDates: {
-            type: OptionType.BOOLEAN,
-            description: "Show dates on friend requests",
-            default: false,
-            restartNeeded: true
-        }
     }
 });
diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index 9c4dd67c4..aa575bfd2 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -120,9 +120,9 @@ export default definePlugin({
             find: 'navId:"image-context"',
             predicate: () => settings.store.addBack,
             replacement: {
-                // return IS_DESKTOP ? React.createElement(Menu, ...)
-                match: /return \i\.\i\?/,
-                replace: "return true?"
+                // return IS_DESKTOP && null != ... ? React.createElement(Menu, ...)
+                match: /return \i\.\i(?=&&null)/,
+                replace: "return true"
             }
         },
 

From 534565db256e9aaf47f3b3092cbe6f4e0bc982be Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sat, 25 Nov 2023 01:32:21 +0100
Subject: [PATCH 209/632] Add webpack find testing (#2016)

Co-authored-by: V <vendicated@riseup.net>
Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
---
 .github/workflows/reportBrokenPlugins.yml     |   2 +-
 scripts/build/build.mjs                       |   4 +-
 scripts/build/buildWeb.mjs                    |   4 +-
 scripts/build/common.mjs                      |   1 +
 scripts/generateReport.ts                     | 212 +++++++++++++++---
 src/plugins/fakeNitro/index.ts                |   9 +-
 .../components/UserPermissions.tsx            |   5 +-
 src/plugins/spotifyControls/SpotifyStore.ts   |   9 +-
 src/plugins/typingIndicator/index.tsx         |   5 +-
 src/plugins/vencordToolbox/index.tsx          |   7 +-
 src/utils/lazy.ts                             |   2 +-
 src/utils/lazyReact.tsx                       |   6 +-
 src/webpack/common/internal.tsx               |  10 +-
 src/webpack/common/utils.ts                   |  44 ++--
 src/webpack/webpack.ts                        |  66 +++++-
 15 files changed, 289 insertions(+), 97 deletions(-)

diff --git a/.github/workflows/reportBrokenPlugins.yml b/.github/workflows/reportBrokenPlugins.yml
index 8bc936183..132022008 100644
--- a/.github/workflows/reportBrokenPlugins.yml
+++ b/.github/workflows/reportBrokenPlugins.yml
@@ -29,7 +29,7 @@ jobs:
                   sudo apt-get install -y chromium-browser
 
             - name: Build web
-              run: pnpm buildWeb --standalone
+              run: pnpm buildWeb --standalone --dev
 
             - name: Create Report
               timeout-minutes: 10
diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs
index 89cca7e47..a2e0e0024 100755
--- a/scripts/build/build.mjs
+++ b/scripts/build/build.mjs
@@ -21,11 +21,11 @@ import esbuild from "esbuild";
 import { readdir } from "fs/promises";
 import { join } from "path";
 
-import { BUILD_TIMESTAMP, commonOpts, existsAsync, globPlugins, isStandalone, updaterDisabled, VERSION, watch } from "./common.mjs";
+import { BUILD_TIMESTAMP, commonOpts, existsAsync, globPlugins, isDev, isStandalone, updaterDisabled, VERSION, watch } from "./common.mjs";
 
 const defines = {
     IS_STANDALONE: isStandalone,
-    IS_DEV: JSON.stringify(watch),
+    IS_DEV: JSON.stringify(isDev),
     IS_UPDATER_DISABLED: updaterDisabled,
     IS_WEB: false,
     IS_EXTENSION: false,
diff --git a/scripts/build/buildWeb.mjs b/scripts/build/buildWeb.mjs
index 353f4e060..b4c726064 100644
--- a/scripts/build/buildWeb.mjs
+++ b/scripts/build/buildWeb.mjs
@@ -23,7 +23,7 @@ import { appendFile, mkdir, readdir, readFile, rm, writeFile } from "fs/promises
 import { join } from "path";
 import Zip from "zip-local";
 
-import { BUILD_TIMESTAMP, commonOpts, globPlugins, VERSION, watch } from "./common.mjs";
+import { BUILD_TIMESTAMP, commonOpts, globPlugins, isDev, VERSION } from "./common.mjs";
 
 /**
  * @type {esbuild.BuildOptions}
@@ -43,7 +43,7 @@ const commonOptions = {
         IS_WEB: "true",
         IS_EXTENSION: "false",
         IS_STANDALONE: "true",
-        IS_DEV: JSON.stringify(watch),
+        IS_DEV: JSON.stringify(isDev),
         IS_DISCORD_DESKTOP: "false",
         IS_VESKTOP: "false",
         IS_UPDATER_DISABLED: "true",
diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
index 5488b1b3b..5c34ad038 100644
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@@ -33,6 +33,7 @@ export const VERSION = PackageJSON.version;
 // https://reproducible-builds.org/docs/source-date-epoch/
 export const BUILD_TIMESTAMP = Number(process.env.SOURCE_DATE_EPOCH) || Date.now();
 export const watch = process.argv.includes("--watch");
+export const isDev = watch || process.argv.includes("--dev");
 export const isStandalone = JSON.stringify(process.argv.includes("--standalone"));
 export const updaterDisabled = JSON.stringify(process.argv.includes("--disable-updater"));
 export const gitHash = process.env.VENCORD_HASH || execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim();
diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 4e044c94b..cadf0c2af 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -34,7 +34,7 @@ for (const variable of ["DISCORD_TOKEN", "CHROMIUM_BIN"]) {
 const CANARY = process.env.USE_CANARY === "true";
 
 const browser = await pup.launch({
-    headless: true,
+    headless: "new",
     executablePath: process.env.CHROMIUM_BIN
 });
 
@@ -58,14 +58,16 @@ const report = {
         plugin: string;
         error: string;
     }[],
-    otherErrors: [] as string[]
+    otherErrors: [] as string[],
+    badWebpackFinds: [] as string[]
 };
 
 const IGNORED_DISCORD_ERRORS = [
     "KeybindStore: Looking for callback action",
     "Unable to process domain list delta: Client revision number is null",
     "Downloading the full bad domains file",
-    /\[GatewaySocket\].{0,110}Cannot access '/
+    /\[GatewaySocket\].{0,110}Cannot access '/,
+    "search for 'name' in undefined"
 ] as Array<string | RegExp>;
 
 function toCodeBlock(s: string) {
@@ -74,7 +76,10 @@ function toCodeBlock(s: string) {
 }
 
 async function printReport() {
+    console.log();
+
     console.log("# Vencord Report" + (CANARY ? " (Canary)" : ""));
+
     console.log();
 
     console.log("## Bad Patches");
@@ -87,12 +92,19 @@ async function printReport() {
 
     console.log();
 
+    console.log("## Bad Webpack Finds");
+    report.badWebpackFinds.forEach(p => console.log("- " + p));
+
+    console.log();
+
     console.log("## Bad Starts");
     report.badStarts.forEach(p => {
         console.log(`- ${p.plugin}`);
         console.log(`  - Error: ${toCodeBlock(p.error)}`);
     });
 
+    console.log();
+
     report.otherErrors = report.otherErrors.filter(e => !IGNORED_DISCORD_ERRORS.some(regex => e.match(regex)));
 
     console.log("## Discord Errors");
@@ -100,8 +112,9 @@ async function printReport() {
         console.log(`- ${toCodeBlock(e)}`);
     });
 
+    console.log();
+
     if (process.env.DISCORD_WEBHOOK) {
-        // this code was written almost entirely by Copilot xD
         await fetch(process.env.DISCORD_WEBHOOK, {
             method: "POST",
             headers: {
@@ -110,7 +123,7 @@ async function printReport() {
             body: JSON.stringify({
                 description: "Here's the latest Vencord Report!",
                 username: "Vencord Reporter" + (CANARY ? " (Canary)" : ""),
-                avatar_url: "https://cdn.discordapp.com/icons/1015060230222131221/f0204a918c6c9c9a43195997e97d8adf.webp",
+                avatar_url: "https://cdn.discordapp.com/icons/1015060230222131221/6101cff21e241cebb60c4a01563d0c01.webp?size=512",
                 embeds: [
                     {
                         title: "Bad Patches",
@@ -125,6 +138,11 @@ async function printReport() {
                         }).join("\n\n") || "None",
                         color: report.badPatches.length ? 0xff0000 : 0x00ff00
                     },
+                    {
+                        title: "Bad Webpack Finds",
+                        description: report.badWebpackFinds.map(toCodeBlock).join("\n") || "None",
+                        color: report.badWebpackFinds.length ? 0xff0000 : 0x00ff00
+                    },
                     {
                         title: "Bad Starts",
                         description: report.badStarts.map(p => {
@@ -153,29 +171,35 @@ async function printReport() {
 
 page.on("console", async e => {
     const level = e.type();
-    const args = e.args();
+    const rawArgs = e.args();
 
-    const firstArg = (await args[0]?.jsonValue());
-    if (firstArg === "PUPPETEER_TEST_DONE_SIGNAL") {
+    const firstArg = await rawArgs[0]?.jsonValue();
+    if (firstArg === "[PUPPETEER_TEST_DONE_SIGNAL]") {
         await browser.close();
         await printReport();
         process.exit();
     }
 
-    const isVencord = (await args[0]?.jsonValue()) === "[Vencord]";
-    const isDebug = (await args[0]?.jsonValue()) === "[PUP_DEBUG]";
+    const isVencord = firstArg === "[Vencord]";
+    const isDebug = firstArg === "[PUP_DEBUG]";
+    const isWebpackFindFail = firstArg === "[PUP_WEBPACK_FIND_FAIL]";
+
+    if (isWebpackFindFail) {
+        process.exitCode = 1;
+        report.badWebpackFinds.push(await rawArgs[1].jsonValue() as string);
+    }
 
     if (isVencord) {
-        // make ci fail
-        process.exitCode = 1;
+        const args = await Promise.all(e.args().map(a => a.jsonValue()));
 
-        const jsonArgs = await Promise.all(args.map(a => a.jsonValue()));
-        const [, tag, message] = jsonArgs;
-        const cause = await maybeGetError(args[3]);
+        const [, tag, message] = args as Array<string>;
+        const cause = await maybeGetError(e.args()[3]);
 
         switch (tag) {
             case "WebpackInterceptor:":
-                const [, plugin, type, id, regex] = (message as string).match(/Patch by (.+?) (had no effect|errored|found no module) \(Module id is (.+?)\): (.+)/)!;
+                process.exitCode = 1;
+
+                const [, plugin, type, id, regex] = message.match(/Patch by (.+?) (had no effect|errored|found no module) \(Module id is (.+?)\): (.+)/)!;
                 report.badPatches.push({
                     plugin,
                     type,
@@ -183,17 +207,26 @@ page.on("console", async e => {
                     match: regex.replace(/\[A-Za-z_\$\]\[\\w\$\]\*/g, "\\i"),
                     error: cause
                 });
+
                 break;
             case "PluginManager:":
-                const [, name] = (message as string).match(/Failed to start (.+)/)!;
+                const failedToStartMatch = message.match(/Failed to start (.+)/);
+                if (!failedToStartMatch) break;
+
+                process.exitCode = 1;
+
+                const [, name] = failedToStartMatch;
                 report.badStarts.push({
                     plugin: name,
                     error: cause
                 });
+
                 break;
         }
-    } else if (isDebug) {
-        console.error(e.text());
+    }
+
+    if (isDebug) {
+        console.log(e.text());
     } else if (level === "error") {
         const text = await Promise.all(
             e.args().map(async a => {
@@ -206,8 +239,8 @@ page.on("console", async e => {
         ).then(a => a.join(" ").trim());
 
 
-        if (text.length && !text.startsWith("Failed to load resource: the server responded with a status of")) {
-            console.error("Got unexpected error", text);
+        if (text.length && !text.startsWith("Failed to load resource: the server responded with a status of") && !text.includes("found no module Filter:")) {
+            console.error("[Unexpected Error]", text);
             report.otherErrors.push(text);
         }
     }
@@ -219,17 +252,16 @@ page.on("pageerror", e => console.error("[Page Error]", e));
 await page.setBypassCSP(true);
 
 function runTime(token: string) {
-    console.error("[PUP_DEBUG]", "Starting test...");
+    console.log("[PUP_DEBUG]", "Starting test...");
 
     try {
-        // spoof languages to not be suspicious
+        // Spoof languages to not be suspicious
         Object.defineProperty(navigator, "languages", {
             get: function () {
                 return ["en-US", "en"];
             },
         });
 
-
         // Monkey patch Logger to not log with custom css
         // @ts-ignore
         Vencord.Util.Logger.prototype._log = function (level, levelColor, args) {
@@ -237,7 +269,7 @@ function runTime(token: string) {
                 console[level]("[Vencord]", this.name + ":", ...args);
         };
 
-        // force enable all plugins and patches
+        // Force enable all plugins and patches
         Vencord.Plugins.patches.length = 0;
         Object.values(Vencord.Plugins.plugins).forEach(p => {
             // Needs native server to run
@@ -247,8 +279,14 @@ function runTime(token: string) {
             p.patches?.forEach(patch => {
                 patch.plugin = p.name;
                 delete patch.predicate;
+
                 if (!Array.isArray(patch.replacement))
                     patch.replacement = [patch.replacement];
+
+                patch.replacement.forEach(r => {
+                    delete r.predicate;
+                });
+
                 Vencord.Plugins.patches.push(patch);
             });
         });
@@ -256,41 +294,141 @@ function runTime(token: string) {
         Vencord.Webpack.waitFor(
             "loginToken",
             m => {
-                console.error("[PUP_DEBUG]", "Logging in with token...");
+                console.log("[PUP_DEBUG]", "Logging in with token...");
                 m.loginToken(token);
             }
         );
 
-        // force load all chunks
+        // Force load all chunks
         Vencord.Webpack.onceReady.then(() => setTimeout(async () => {
-            console.error("[PUP_DEBUG]", "Webpack is ready!");
+            console.log("[PUP_DEBUG]", "Webpack is ready!");
 
             const { wreq } = Vencord.Webpack;
 
-            console.error("[PUP_DEBUG]", "Loading all chunks...");
-            const ids = Function("return" + wreq.u.toString().match(/(?<=\()\{.+?\}/s)![0])();
-            for (const id in ids) {
+            console.log("[PUP_DEBUG]", "Loading all chunks...");
+
+            let chunks = null as Record<number, string[]> | null;
+            const sym = Symbol("Vencord.chunksExtract");
+
+            Object.defineProperty(Object.prototype, sym, {
+                get() {
+                    chunks = this;
+                },
+                set() { },
+                configurable: true,
+            });
+
+            await (wreq as any).el(sym);
+            delete Object.prototype[sym];
+
+            const validChunksEntryPoints = [] as string[];
+            const validChunks = [] as string[];
+            const invalidChunks = [] as string[];
+
+            if (!chunks) throw new Error("Failed to get chunks");
+
+            chunksLoop:
+            for (const entryPoint in chunks) {
+                const chunkIds = chunks[entryPoint];
+
+                for (const id of chunkIds) {
+                    if (!wreq.u(id)) continue;
+
+                    const isWasm = await fetch(wreq.p + wreq.u(id))
+                        .then(r => r.text())
+                        .then(t => t.includes(".module.wasm") || !t.includes("(this.webpackChunkdiscord_app=this.webpackChunkdiscord_app||[]).push"));
+
+                    await new Promise(r => setTimeout(r, 150));
+
+                    if (isWasm) {
+                        invalidChunks.push(id);
+                        continue chunksLoop;
+                    }
+
+                    validChunks.push(id);
+                }
+
+                validChunksEntryPoints.push(entryPoint);
+            }
+
+            for (const entryPoint of validChunksEntryPoints) {
+                try {
+                    // Loads all chunks required for an entry point
+                    await (wreq as any).el(entryPoint);
+                } catch (err) { }
+            }
+
+            const allChunks = Function("return " + (wreq.u.toString().match(/(?<=\()\{.+?\}/s)?.[0] ?? "null"))() as Record<string | number, string[]> | null;
+            if (!allChunks) throw new Error("Failed to get all chunks");
+            const chunksLeft = Object.keys(allChunks).filter(id => {
+                return !(validChunks.includes(id) || invalidChunks.includes(id));
+            });
+
+            for (const id of chunksLeft) {
                 const isWasm = await fetch(wreq.p + wreq.u(id))
                     .then(r => r.text())
                     .then(t => t.includes(".module.wasm") || !t.includes("(this.webpackChunkdiscord_app=this.webpackChunkdiscord_app||[]).push"));
 
-                if (!isWasm)
-                    await wreq.e(id as any);
+                // Loads a chunk
+                if (!isWasm) await wreq.e(id as any);
 
                 await new Promise(r => setTimeout(r, 150));
             }
-            console.error("[PUP_DEBUG]", "Finished loading chunks!");
+
+            // Make sure every chunk has finished loading
+            await new Promise(r => setTimeout(r, 1000));
+
+            for (const entryPoint of validChunksEntryPoints) {
+                try {
+                    if (wreq.m[entryPoint]) wreq(entryPoint as any);
+                } catch (err) {
+                    console.error(err);
+                }
+            }
+
+            console.log("[PUP_DEBUG]", "Finished loading all chunks!");
 
             for (const patch of Vencord.Plugins.patches) {
                 if (!patch.all) {
                     new Vencord.Util.Logger("WebpackInterceptor").warn(`Patch by ${patch.plugin} found no module (Module id is -): ${patch.find}`);
                 }
             }
-            setTimeout(() => console.log("PUPPETEER_TEST_DONE_SIGNAL"), 1000);
+
+            for (const [searchType, args] of Vencord.Webpack.lazyWebpackSearchHistory) {
+                let method = searchType;
+
+                if (searchType === "findComponent") method = "find";
+                if (searchType === "findExportedComponent") method = "findByProps";
+                if (searchType === "waitFor" || searchType === "waitForComponent" || searchType === "waitForStore") {
+                    if (typeof args[0] === "string") method = "findByProps";
+                    else method = "find";
+                }
+
+                try {
+                    let result: any;
+
+                    if (method === "proxyLazyWebpack" || method === "LazyComponentWebpack") {
+                        const [factory] = args;
+                        result = factory();
+                    } else {
+                        // @ts-ignore
+                        result = Vencord.Webpack[method](...args);
+                    }
+
+                    if (result == null || ("$$get" in result && result.$$get() == null)) throw "a rock at ben shapiro";
+                } catch (e) {
+                    let logMessage = searchType;
+                    if (method === "find" || method === "proxyLazyWebpack" || method === "LazyComponentWebpack") logMessage += `(${args[0].toString().slice(0, 147)}...)`;
+                    else logMessage += `(${args.map(arg => `"${arg}"`).join(", ")})`;
+
+                    console.log("[PUP_WEBPACK_FIND_FAIL]", logMessage);
+                }
+            }
+
+            setTimeout(() => console.log("[PUPPETEER_TEST_DONE_SIGNAL]"), 1000);
         }, 1000));
     } catch (e) {
-        console.error("[PUP_DEBUG]", "A fatal error occurred");
-        console.error("[PUP_DEBUG]", e);
+        console.log("[PUP_DEBUG]", "A fatal error occurred:", e);
         process.exit(1);
     }
 }
diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index 4d6b7957b..3ac755567 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -21,10 +21,9 @@ import { definePluginSettings, Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import { ApngBlendOp, ApngDisposeOp, importApngJs } from "@utils/dependencies";
 import { getCurrentGuild } from "@utils/discord";
-import { proxyLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findStoreLazy } from "@webpack";
+import { findByPropsLazy, findStoreLazy, proxyLazyWebpack } from "@webpack";
 import { ChannelStore, EmojiStore, FluxDispatcher, lodash, Parser, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
 import type { Message } from "discord-types/general";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
@@ -48,9 +47,9 @@ function searchProtoClassField(localName: string, protoClass: any) {
     return fieldGetter?.();
 }
 
-const PreloadedUserSettingsActionCreators = proxyLazy(() => UserSettingsActionCreators.PreloadedUserSettingsActionCreators);
-const AppearanceSettingsActionCreators = proxyLazy(() => searchProtoClassField("appearance", PreloadedUserSettingsActionCreators.ProtoClass));
-const ClientThemeSettingsActionsCreators = proxyLazy(() => searchProtoClassField("clientThemeSettings", AppearanceSettingsActionCreators));
+const PreloadedUserSettingsActionCreators = proxyLazyWebpack(() => UserSettingsActionCreators.PreloadedUserSettingsActionCreators);
+const AppearanceSettingsActionCreators = proxyLazyWebpack(() => searchProtoClassField("appearance", PreloadedUserSettingsActionCreators.ProtoClass));
+const ClientThemeSettingsActionsCreators = proxyLazyWebpack(() => searchProtoClassField("clientThemeSettings", AppearanceSettingsActionCreators));
 
 const USE_EXTERNAL_EMOJIS = 1n << 18n;
 const USE_EXTERNAL_STICKERS = 1n << 37n;
diff --git a/src/plugins/permissionsViewer/components/UserPermissions.tsx b/src/plugins/permissionsViewer/components/UserPermissions.tsx
index aeb976645..b75bafdcb 100644
--- a/src/plugins/permissionsViewer/components/UserPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/UserPermissions.tsx
@@ -18,9 +18,8 @@
 
 import ErrorBoundary from "@components/ErrorBoundary";
 import ExpandableHeader from "@components/ExpandableHeader";
-import { proxyLazy } from "@utils/lazy";
 import { classes } from "@utils/misc";
-import { filters, findBulk } from "@webpack";
+import { filters, findBulk, proxyLazyWebpack } from "@webpack";
 import { i18n, PermissionsBits, Text, Tooltip, useMemo, UserStore } from "@webpack/common";
 import type { Guild, GuildMember } from "discord-types/general";
 
@@ -36,7 +35,7 @@ interface UserPermission {
 
 type UserPermissions = Array<UserPermission>;
 
-const Classes = proxyLazy(() => {
+const Classes = proxyLazyWebpack(() => {
     const modules = findBulk(
         filters.byProps("roles", "rolePill", "rolePillBorder"),
         filters.byProps("roleCircle", "dotBorderBase", "dotBorderColor"),
diff --git a/src/plugins/spotifyControls/SpotifyStore.ts b/src/plugins/spotifyControls/SpotifyStore.ts
index f940d8d57..b3cd0b282 100644
--- a/src/plugins/spotifyControls/SpotifyStore.ts
+++ b/src/plugins/spotifyControls/SpotifyStore.ts
@@ -17,8 +17,7 @@
 */
 
 import { Settings } from "@api/Settings";
-import { proxyLazy } from "@utils/lazy";
-import { findByPropsLazy } from "@webpack";
+import { findByProps, proxyLazyWebpack } from "@webpack";
 import { Flux, FluxDispatcher } from "@webpack/common";
 
 export interface Track {
@@ -66,12 +65,12 @@ interface Device {
 type Repeat = "off" | "track" | "context";
 
 // Don't wanna run before Flux and Dispatcher are ready!
-export const SpotifyStore = proxyLazy(() => {
+export const SpotifyStore = proxyLazyWebpack(() => {
     // For some reason ts hates extends Flux.Store
     const { Store } = Flux;
 
-    const SpotifySocket = findByPropsLazy("getActiveSocketAndDevice");
-    const SpotifyUtils = findByPropsLazy("SpotifyAPI");
+    const SpotifySocket = findByProps("getActiveSocketAndDevice");
+    const SpotifyUtils = findByProps("SpotifyAPI");
 
     const API_BASE = "https://api.spotify.com/v1/me/player";
 
diff --git a/src/plugins/typingIndicator/index.tsx b/src/plugins/typingIndicator/index.tsx
index 86bfbb4f2..e35eb9b6e 100644
--- a/src/plugins/typingIndicator/index.tsx
+++ b/src/plugins/typingIndicator/index.tsx
@@ -19,14 +19,13 @@
 import { definePluginSettings, Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import { LazyComponent } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { find, findStoreLazy } from "@webpack";
+import { find, findStoreLazy, LazyComponentWebpack } from "@webpack";
 import { ChannelStore, GuildMemberStore, i18n, RelationshipStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
 
 import { buildSeveralUsers } from "../typingTweaks";
 
-const ThreeDots = LazyComponent(() => {
+const ThreeDots = LazyComponentWebpack(() => {
     // This doesn't really need to explicitly find Dots' own module, but it's fine
     const res = find(m => m.Dots && !m.Menu);
 
diff --git a/src/plugins/vencordToolbox/index.tsx b/src/plugins/vencordToolbox/index.tsx
index cd266c6f2..bb63a86b8 100644
--- a/src/plugins/vencordToolbox/index.tsx
+++ b/src/plugins/vencordToolbox/index.tsx
@@ -22,15 +22,14 @@ import { openNotificationLogModal } from "@api/Notifications/notificationLog";
 import { Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import { LazyComponent } from "@utils/react";
 import definePlugin from "@utils/types";
-import { filters, find } from "@webpack";
+import { filters, find, LazyComponentWebpack } from "@webpack";
 import { Menu, Popout, useState } from "@webpack/common";
 import type { ReactNode } from "react";
 
-const HeaderBarIcon = LazyComponent(() => {
+const HeaderBarIcon = LazyComponentWebpack(() => {
     const filter = filters.byCode(".HEADER_BAR_BADGE");
-    return find(m => m.Icon && filter(m.Icon)).Icon;
+    return find(m => m.Icon && filter(m.Icon))?.Icon;
 });
 
 function VencordPopout(onClose: () => void) {
diff --git a/src/utils/lazy.ts b/src/utils/lazy.ts
index 1c89d5110..32336fb40 100644
--- a/src/utils/lazy.ts
+++ b/src/utils/lazy.ts
@@ -76,7 +76,7 @@ handler.getOwnPropertyDescriptor = (target, p) => {
 };
 
 /**
- * Wraps the result of {@see makeLazy} in a Proxy you can consume as if it wasn't lazy.
+ * Wraps the result of {@link makeLazy} in a Proxy you can consume as if it wasn't lazy.
  * On first property access, the lazy is evaluated
  * @param factory lazy factory
  * @param attempts how many times to try to evaluate the lazy before giving up
diff --git a/src/utils/lazyReact.tsx b/src/utils/lazyReact.tsx
index abd300a97..e45ca0792 100644
--- a/src/utils/lazyReact.tsx
+++ b/src/utils/lazyReact.tsx
@@ -16,8 +16,12 @@ const NoopComponent = () => null;
  */
 export function LazyComponent<T extends object = any>(factory: () => React.ComponentType<T>, attempts = 5) {
     const get = makeLazy(factory, attempts);
-    return (props: T) => {
+    const LazyComponent = (props: T) => {
         const Component = get() ?? NoopComponent;
         return <Component {...props} />;
     };
+
+    LazyComponent.$$get = get;
+
+    return LazyComponent;
 }
diff --git a/src/webpack/common/internal.tsx b/src/webpack/common/internal.tsx
index 66c52de00..9a89af362 100644
--- a/src/webpack/common/internal.tsx
+++ b/src/webpack/common/internal.tsx
@@ -19,9 +19,11 @@
 import { LazyComponent } from "@utils/react";
 
 // eslint-disable-next-line path-alias/no-relative
-import { FilterFn, filters, waitFor } from "../webpack";
+import { FilterFn, filters, lazyWebpackSearchHistory, waitFor } from "../webpack";
 
 export function waitForComponent<T extends React.ComponentType<any> = React.ComponentType<any> & Record<string, any>>(name: string, filter: FilterFn | string | string[]): T {
+    if (IS_DEV) lazyWebpackSearchHistory.push(["waitForComponent", Array.isArray(filter) ? filter : [filter]]);
+
     let myValue: T = function () {
         throw new Error(`Vencord could not find the ${name} Component`);
     } as any;
@@ -30,11 +32,13 @@ export function waitForComponent<T extends React.ComponentType<any> = React.Comp
     waitFor(filter, (v: any) => {
         myValue = v;
         Object.assign(lazyComponent, v);
-    });
+    }, { isIndirect: true });
 
     return lazyComponent;
 }
 
 export function waitForStore(name: string, cb: (v: any) => void) {
-    waitFor(filters.byStoreName(name), cb);
+    if (IS_DEV) lazyWebpackSearchHistory.push(["waitForStore", [name]]);
+
+    waitFor(filters.byStoreName(name), cb, { isIndirect: true });
 }
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 2a3d4e677..cef4d51d6 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -16,14 +16,23 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { proxyLazy } from "@utils/lazy";
 import type { Channel, User } from "discord-types/general";
 
 // eslint-disable-next-line path-alias/no-relative
-import { _resolveReady, find, findByPropsLazy, findLazy, waitFor } from "../webpack";
+import { _resolveReady, findByPropsLazy, findLazy, waitFor } from "../webpack";
 import type * as t from "./types/utils";
 
 export let FluxDispatcher: t.FluxDispatcher;
+
+waitFor(["dispatch", "subscribe"], m => {
+    FluxDispatcher = m;
+    const cb = () => {
+        m.unsubscribe("CONNECTION_OPEN", cb);
+        _resolveReady();
+    };
+    m.subscribe("CONNECTION_OPEN", cb);
+});
+
 export let ComponentDispatch;
 waitFor(["ComponentDispatch", "ComponentDispatcher"], m => ComponentDispatch = m.ComponentDispatch);
 
@@ -41,7 +50,9 @@ export let SnowflakeUtils: t.SnowflakeUtils;
 waitFor(["fromTimestamp", "extractTimestamp"], m => SnowflakeUtils = m);
 
 export let Parser: t.Parser;
+waitFor("parseTopic", m => Parser = m);
 export let Alerts: t.Alerts;
+waitFor(["show", "close"], m => Alerts = m);
 
 const ToastType = {
     MESSAGE: 0,
@@ -82,6 +93,13 @@ export const Toasts = {
     }
 };
 
+// This is the same module but this is easier
+waitFor("showToast", m => {
+    Toasts.show = m.showToast;
+    Toasts.pop = m.popToast;
+});
+
+
 /**
  * Show a simple toast. If you need more options, use Toasts.show manually
  */
@@ -106,26 +124,8 @@ export const Clipboard: t.Clipboard = findByPropsLazy("SUPPORTS_COPY", "copy");
 
 export const NavigationRouter: t.NavigationRouter = findByPropsLazy("transitionTo", "replaceWith", "transitionToGuild");
 
-waitFor(["dispatch", "subscribe"], m => {
-    FluxDispatcher = m;
-    const cb = () => {
-        m.unsubscribe("CONNECTION_OPEN", cb);
-        _resolveReady();
-    };
-    m.subscribe("CONNECTION_OPEN", cb);
-});
-
-
-// This is the same module but this is easier
-waitFor("showToast", m => {
-    Toasts.show = m.showToast;
-    Toasts.pop = m.popToast;
-});
-
-waitFor(["show", "close"], m => Alerts = m);
-waitFor("parseTopic", m => Parser = m);
-
 export let SettingsRouter: any;
 waitFor(["open", "saveAccountChanges"], m => SettingsRouter = m);
 
-export const PermissionsBits: t.PermissionsBits = proxyLazy(() => find(m => typeof m.Permissions?.ADMINISTRATOR === "bigint").Permissions);
+const { Permissions } = findLazy(m => typeof m.Permissions?.ADMINISTRATOR === "bigint") as { Permissions: t.PermissionsBits; };
+export { Permissions as PermissionsBits };
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 980288e9e..4bdec7075 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -127,13 +127,6 @@ export const find = traceFunction("find", function find(filter: FilterFn, { isIn
     return isWaitFor ? [null, null] : null;
 });
 
-/**
- * find but lazy
- */
-export function findLazy(filter: FilterFn) {
-    return proxyLazy(() => find(filter));
-}
-
 export function findAll(filter: FilterFn) {
     if (typeof filter !== "function")
         throw new Error("Invalid filter. Expected a function got " + typeof filter);
@@ -244,6 +237,49 @@ export const findModuleId = traceFunction("findModuleId", function findModuleId(
     return null;
 });
 
+export const lazyWebpackSearchHistory = [] as Array<["find" | "findByProps" | "findByCode" | "findStore" | "findComponent" | "findComponentByCode" | "findExportedComponent" | "waitFor" | "waitForComponent" | "waitForStore" | "proxyLazyWebpack" | "LazyComponentWebpack", any[]]>;
+
+/**
+ * This is just a wrapper around {@link proxyLazy} to make our reporter test for your webpack finds.
+ *
+ * Wraps the result of {@link makeLazy} in a Proxy you can consume as if it wasn't lazy.
+ * On first property access, the lazy is evaluated
+ * @param factory lazy factory
+ * @param attempts how many times to try to evaluate the lazy before giving up
+ * @returns Proxy
+ *
+ * Note that the example below exists already as an api, see {@link findByPropsLazy}
+ * @example const mod = proxyLazy(() => findByProps("blah")); console.log(mod.blah);
+ */
+export function proxyLazyWebpack<T = any>(factory: () => any, attempts?: number) {
+    if (IS_DEV) lazyWebpackSearchHistory.push(["proxyLazyWebpack", [factory]]);
+
+    return proxyLazy<T>(factory, attempts);
+}
+
+/**
+ * This is just a wrapper around {@link LazyComponent} to make our reporter test for your webpack finds.
+ *
+ * A lazy component. The factory method is called on first render.
+ * @param factory Function returning a Component
+ * @param attempts How many times to try to get the component before giving up
+ * @returns Result of factory function
+ */
+export function LazyComponentWebpack<T extends object = any>(factory: () => any, attempts?: number) {
+    if (IS_DEV) lazyWebpackSearchHistory.push(["LazyComponentWebpack", [factory]]);
+
+    return LazyComponent<T>(factory, attempts);
+}
+
+/**
+ * find but lazy
+ */
+export function findLazy(filter: FilterFn) {
+    if (IS_DEV) lazyWebpackSearchHistory.push(["find", [filter]]);
+
+    return proxyLazy(() => find(filter));
+}
+
 /**
  * Find the first module that has the specified properties
  */
@@ -258,6 +294,8 @@ export function findByProps(...props: string[]) {
  * findByProps but lazy
  */
 export function findByPropsLazy(...props: string[]) {
+    if (IS_DEV) lazyWebpackSearchHistory.push(["findByProps", props]);
+
     return proxyLazy(() => findByProps(...props));
 }
 
@@ -275,6 +313,8 @@ export function findByCode(...code: string[]) {
  * findByCode but lazy
  */
 export function findByCodeLazy(...code: string[]) {
+    if (IS_DEV) lazyWebpackSearchHistory.push(["findByCode", code]);
+
     return proxyLazy(() => findByCode(...code));
 }
 
@@ -292,6 +332,8 @@ export function findStore(name: string) {
  * findStore but lazy
  */
 export function findStoreLazy(name: string) {
+    if (IS_DEV) lazyWebpackSearchHistory.push(["findStore", [name]]);
+
     return proxyLazy(() => findStore(name));
 }
 
@@ -309,6 +351,8 @@ export function findComponentByCode(...code: string[]) {
  * Finds the first component that matches the filter, lazily.
  */
 export function findComponentLazy<T extends object = any>(filter: FilterFn) {
+    if (IS_DEV) lazyWebpackSearchHistory.push(["findComponent", [filter]]);
+
     return LazyComponent<T>(() => find(filter));
 }
 
@@ -316,6 +360,8 @@ export function findComponentLazy<T extends object = any>(filter: FilterFn) {
  * Finds the first component that includes all the given code, lazily
  */
 export function findComponentByCodeLazy<T extends object = any>(...code: string[]) {
+    if (IS_DEV) lazyWebpackSearchHistory.push(["findComponentByCode", code]);
+
     return LazyComponent<T>(() => findComponentByCode(...code));
 }
 
@@ -323,6 +369,8 @@ export function findComponentByCodeLazy<T extends object = any>(...code: string[
  * Finds the first component that is exported by the first prop name, lazily
  */
 export function findExportedComponentLazy<T extends object = any>(...props: string[]) {
+    if (IS_DEV) lazyWebpackSearchHistory.push(["findExportedComponent", props]);
+
     return LazyComponent<T>(() => findByProps(...props)?.[props[0]]);
 }
 
@@ -330,7 +378,9 @@ export function findExportedComponentLazy<T extends object = any>(...props: stri
  * Wait for a module that matches the provided filter to be registered,
  * then call the callback with the module as the first argument
  */
-export function waitFor(filter: string | string[] | FilterFn, callback: CallbackFn) {
+export function waitFor(filter: string | string[] | FilterFn, callback: CallbackFn, { isIndirect = false }: { isIndirect?: boolean; } = {}) {
+    if (IS_DEV && !isIndirect) lazyWebpackSearchHistory.push(["waitFor", Array.isArray(filter) ? filter : [filter]]);
+
     if (typeof filter === "string")
         filter = filters.byProps(filter);
     else if (Array.isArray(filter))

From 598ffe6368bf454b65c522d4dfbca8a1afc9a05c Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sat, 25 Nov 2023 01:51:50 +0100
Subject: [PATCH 210/632] reporter: remove sleeps

---
 scripts/generateReport.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index cadf0c2af..3cbab55e6 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -338,8 +338,6 @@ function runTime(token: string) {
                         .then(r => r.text())
                         .then(t => t.includes(".module.wasm") || !t.includes("(this.webpackChunkdiscord_app=this.webpackChunkdiscord_app||[]).push"));
 
-                    await new Promise(r => setTimeout(r, 150));
-
                     if (isWasm) {
                         invalidChunks.push(id);
                         continue chunksLoop;
@@ -371,8 +369,6 @@ function runTime(token: string) {
 
                 // Loads a chunk
                 if (!isWasm) await wreq.e(id as any);
-
-                await new Promise(r => setTimeout(r, 150));
             }
 
             // Make sure every chunk has finished loading

From 68fca7854179222ba29cb7428f34874f3576fe05 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sat, 25 Nov 2023 01:56:29 +0100
Subject: [PATCH 211/632] reporter: test dev instead of main

---
 .github/workflows/reportBrokenPlugins.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/reportBrokenPlugins.yml b/.github/workflows/reportBrokenPlugins.yml
index 132022008..4b09463e0 100644
--- a/.github/workflows/reportBrokenPlugins.yml
+++ b/.github/workflows/reportBrokenPlugins.yml
@@ -12,6 +12,12 @@ jobs:
 
         steps:
             - uses: actions/checkout@v3
+              if: ${{ github.event_name == 'schedule' }}
+              with:
+                  ref: dev
+
+            - uses: actions/checkout@v3
+              if: ${{ github.event_name == 'workflow_dispatch' }}
 
             - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
 

From 7c3b247d84c01882830e754e0e2995c36e4a2a33 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sat, 25 Nov 2023 02:43:29 +0100
Subject: [PATCH 212/632] fix WebContextMenus

---
 src/plugins/webContextMenus.web/index.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index aa575bfd2..cf50bb86e 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -118,10 +118,11 @@ export default definePlugin({
         // Add back image context menu
         {
             find: 'navId:"image-context"',
+            all: true,
             predicate: () => settings.store.addBack,
             replacement: {
-                // return IS_DESKTOP && null != ... ? React.createElement(Menu, ...)
-                match: /return \i\.\i(?=&&null)/,
+                // return IS_DESKTOP ? React.createElement(Menu, ...)
+                match: /return \i\.\i(?=\?|&&)/,
                 replace: "return true"
             }
         },

From 604cf002116e4172058b2f1c8a6df4a187cf61ab Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sat, 25 Nov 2023 02:51:19 +0100
Subject: [PATCH 213/632] reporter: fix markdown output

---
 scripts/generateReport.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 3cbab55e6..540976714 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -226,7 +226,7 @@ page.on("console", async e => {
     }
 
     if (isDebug) {
-        console.log(e.text());
+        console.error(e.text());
     } else if (level === "error") {
         const text = await Promise.all(
             e.args().map(async a => {

From 6bbf562ab6b92ad7cc267cfa53aec6a88b7c006d Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sat, 25 Nov 2023 02:51:58 +0100
Subject: [PATCH 214/632] bump to v1.6.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 23d9dd272..4d0dd262a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.6.3",
+    "version": "1.6.4",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From ec16fd874189411479890e00d93770001f9d09ab Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sat, 25 Nov 2023 02:55:59 +0100
Subject: [PATCH 215/632] fix ci

---
 .github/workflows/test.yml | 2 ++
 src/utils/lazyReact.tsx    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 46d564184..a756681c2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,9 +3,11 @@ on:
     push:
         branches:
             - main
+            - dev
     pull_request:
         branches:
             - main
+            - dev
 jobs:
     test:
         runs-on: ubuntu-latest
diff --git a/src/utils/lazyReact.tsx b/src/utils/lazyReact.tsx
index e45ca0792..da36d4e79 100644
--- a/src/utils/lazyReact.tsx
+++ b/src/utils/lazyReact.tsx
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { ComponentType } from "react";
+
 import { makeLazy } from "./lazy";
 
 const NoopComponent = () => null;
@@ -23,5 +25,5 @@ export function LazyComponent<T extends object = any>(factory: () => React.Compo
 
     LazyComponent.$$get = get;
 
-    return LazyComponent;
+    return LazyComponent as ComponentType<T>;
 }

From 6573c4757cc1b2e3847c037d254cbdd11653b579 Mon Sep 17 00:00:00 2001
From: Korbo <korbin.m.marshall@gmail.com>
Date: Tue, 28 Nov 2023 12:32:29 -0600
Subject: [PATCH 216/632] fix: strikethrough in SilentMessageToggle's disabled
 SVG (#2004)

---
 src/plugins/silentMessageToggle/index.tsx | 19 +++++++++----------
 src/utils/constants.ts                    |  4 ++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/plugins/silentMessageToggle/index.tsx b/src/plugins/silentMessageToggle/index.tsx
index a1ee8de89..b7b33826d 100644
--- a/src/plugins/silentMessageToggle/index.tsx
+++ b/src/plugins/silentMessageToggle/index.tsx
@@ -80,16 +80,15 @@ function SilentMessageToggle(chatBoxProps: {
                         style={{ padding: "0 6px" }}
                     >
                         <div className={ButtonWrapperClasses.buttonWrapper}>
-                            <svg
-                                width="24"
-                                height="24"
-                                viewBox="0 0 24 24"
-                            >
-                                <g fill="currentColor">
-                                    <path d="M18 10.7101C15.1085 9.84957 13 7.17102 13 4C13 3.69264 13.0198 3.3899 13.0582 3.093C12.7147 3.03189 12.3611 3 12 3C8.686 3 6 5.686 6 9V14C6 15.657 4.656 17 3 17V18H21V17C19.344 17 18 15.657 18 14V10.7101ZM8.55493 19C9.24793 20.19 10.5239 21 11.9999 21C13.4759 21 14.7519 20.19 15.4449 19H8.55493Z" />
-                                    <path d="M18.2624 5.50209L21 2.5V1H16.0349V2.49791H18.476L16 5.61088V7H21V5.50209H18.2624Z" />
-                                    {!enabled && <line x1="22" y1="2" x2="2" y2="22" stroke="var(--red-500)" stroke-width="2.5" />}
-                                </g>
+                            <svg width="24" height="24" viewBox="0 0 24 24">
+                                <path fill="currentColor" mask="url(#_)" d="M18 10.7101C15.1085 9.84957 13 7.17102 13 4c0-.30736.0198-.6101.0582-.907C12.7147 3.03189 12.3611 3 12 3 8.686 3 6 5.686 6 9v5c0 1.657-1.344 3-3 3v1h18v-1c-1.656 0-3-1.343-3-3v-3.2899ZM8.55493 19c.693 1.19 1.96897 2 3.44497 2s2.752-.81 3.445-2H8.55493ZM18.2624 5.50209 21 2.5V1h-4.9651v1.49791h2.4411L16 5.61088V7h5V5.50209h-2.7376Z" />
+                                {!enabled && <>
+                                    <mask id="_">
+                                        <path fill="#fff" d="M0 0h24v24H0Z" />
+                                        <path stroke="#000" stroke-width="5.99068" d="M0 24 24 0" />
+                                    </mask>
+                                    <path fill="var(--status-danger)" d="m21.178 1.70703 1.414 1.414L4.12103 21.593l-1.414-1.415L21.178 1.70703Z" />
+                                </>}
                             </svg>
                         </div>
                     </Button>
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 7f555d322..0ff7da72a 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -387,6 +387,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "ant0n",
         id: 145224646868860928n
     },
+    Korbo: {
+        name: "Korbo",
+        id: 455856406420258827n
+    },
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly

From 1b179f3c6d2b109251a9abcedfa90666ba0989dd Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 24 Nov 2023 23:14:18 -0300
Subject: [PATCH 217/632] Simplify some components finds; Make undo of patch
 groups more clear

---
 src/plugins/typingIndicator/index.tsx | 9 ++-------
 src/plugins/vencordToolbox/index.tsx  | 7 ++-----
 src/webpack/patchWebpack.ts           | 4 ++--
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/plugins/typingIndicator/index.tsx b/src/plugins/typingIndicator/index.tsx
index e35eb9b6e..c5cf5a9d0 100644
--- a/src/plugins/typingIndicator/index.tsx
+++ b/src/plugins/typingIndicator/index.tsx
@@ -20,17 +20,12 @@ import { definePluginSettings, Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { find, findStoreLazy, LazyComponentWebpack } from "@webpack";
+import { findExportedComponentLazy, findStoreLazy } from "@webpack";
 import { ChannelStore, GuildMemberStore, i18n, RelationshipStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
 
 import { buildSeveralUsers } from "../typingTweaks";
 
-const ThreeDots = LazyComponentWebpack(() => {
-    // This doesn't really need to explicitly find Dots' own module, but it's fine
-    const res = find(m => m.Dots && !m.Menu);
-
-    return res?.Dots;
-});
+const ThreeDots = findExportedComponentLazy("Dots", "AnimatedDots");
 
 const TypingStore = findStoreLazy("TypingStore");
 const UserGuildSettingsStore = findStoreLazy("UserGuildSettingsStore");
diff --git a/src/plugins/vencordToolbox/index.tsx b/src/plugins/vencordToolbox/index.tsx
index bb63a86b8..2b0ce14e6 100644
--- a/src/plugins/vencordToolbox/index.tsx
+++ b/src/plugins/vencordToolbox/index.tsx
@@ -23,14 +23,11 @@ import { Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { filters, find, LazyComponentWebpack } from "@webpack";
+import { findExportedComponentLazy } from "@webpack";
 import { Menu, Popout, useState } from "@webpack/common";
 import type { ReactNode } from "react";
 
-const HeaderBarIcon = LazyComponentWebpack(() => {
-    const filter = filters.byCode(".HEADER_BAR_BADGE");
-    return find(m => m.Icon && filter(m.Icon))?.Icon;
-});
+const HeaderBarIcon = findExportedComponentLazy("Icon", "Divider");
 
 function VencordPopout(onClose: () => void) {
     const pluginEntries = [] as ReactNode[];
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index b992cfdea..76a9fb0f5 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -212,7 +212,7 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
                             }
 
                             if (patch.group) {
-                                logger.warn(`Undoing patch ${patch.find} by ${patch.plugin} because replacement ${replacement.match} had no effect`);
+                                logger.warn(`Undoing patch group ${patch.find} by ${patch.plugin} because replacement ${replacement.match} had no effect`);
                                 code = previousCode;
                                 mod = previousMod;
                                 patchedBy.delete(patch.plugin);
@@ -260,7 +260,7 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
 
                         patchedBy.delete(patch.plugin);
                         if (patch.group) {
-                            logger.warn(`Undoing patch ${patch.find} by ${patch.plugin} because replacement ${replacement.match} errored`);
+                            logger.warn(`Undoing patch group ${patch.find} by ${patch.plugin} because replacement ${replacement.match} errored`);
                             code = previousCode;
                             mod = previousMod;
                             break;

From 1619ee404a11bab2caf8988e0d122acc64bd7ccb Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Mon, 27 Nov 2023 02:56:57 -0300
Subject: [PATCH 218/632] Utility function for loading Discord chunks (#2017)

---
 scripts/generateReport.ts   |   8 ++-
 src/utils/lazyReact.tsx     |   2 +-
 src/webpack/patchWebpack.ts |   8 +--
 src/webpack/webpack.ts      | 127 ++++++++++++++++++++++++++++++------
 4 files changed, 118 insertions(+), 27 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 540976714..719a84568 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -406,15 +406,21 @@ function runTime(token: string) {
                     if (method === "proxyLazyWebpack" || method === "LazyComponentWebpack") {
                         const [factory] = args;
                         result = factory();
+                    } else if (method === "extractAndLoadChunks") {
+                        const [code, matcher] = args;
+
+                        const module = Vencord.Webpack.findModuleFactory(...code);
+                        if (module) result = module.toString().match(matcher);
                     } else {
                         // @ts-ignore
                         result = Vencord.Webpack[method](...args);
                     }
 
-                    if (result == null || ("$$get" in result && result.$$get() == null)) throw "a rock at ben shapiro";
+                    if (result == null || ("$$vencordInternal" in result && result.$$vencordInternal() == null)) throw "a rock at ben shapiro";
                 } catch (e) {
                     let logMessage = searchType;
                     if (method === "find" || method === "proxyLazyWebpack" || method === "LazyComponentWebpack") logMessage += `(${args[0].toString().slice(0, 147)}...)`;
+                    else if (method === "extractAndLoadChunks") logMessage += `([${args[0].map(arg => `"${arg}"`).join(", ")}], ${args[1].toString()})`;
                     else logMessage += `(${args.map(arg => `"${arg}"`).join(", ")})`;
 
                     console.log("[PUP_WEBPACK_FIND_FAIL]", logMessage);
diff --git a/src/utils/lazyReact.tsx b/src/utils/lazyReact.tsx
index da36d4e79..4896a0581 100644
--- a/src/utils/lazyReact.tsx
+++ b/src/utils/lazyReact.tsx
@@ -23,7 +23,7 @@ export function LazyComponent<T extends object = any>(factory: () => React.Compo
         return <Component {...props} />;
     };
 
-    LazyComponent.$$get = get;
+    LazyComponent.$$vencordInternal = get;
 
     return LazyComponent as ComponentType<T>;
 }
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index 76a9fb0f5..f131471bf 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -152,11 +152,9 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
                 return;
             }
 
-            const numberId = Number(id);
-
             for (const callback of listeners) {
                 try {
-                    callback(exports, numberId);
+                    callback(exports, id);
                 } catch (err) {
                     logger.error("Error in webpack listener", err);
                 }
@@ -166,10 +164,10 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
                 try {
                     if (filter(exports)) {
                         subscriptions.delete(filter);
-                        callback(exports, numberId);
+                        callback(exports, id);
                     } else if (exports.default && filter(exports.default)) {
                         subscriptions.delete(filter);
-                        callback(exports.default, numberId);
+                        callback(exports.default, id);
                     }
                 } catch (err) {
                     logger.error("Error while firing callback for webpack chunk", err);
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 4bdec7075..d65f57fcb 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -19,6 +19,7 @@
 import { proxyLazy } from "@utils/lazy";
 import { LazyComponent } from "@utils/lazyReact";
 import { Logger } from "@utils/Logger";
+import { canonicalizeMatch } from "@utils/patches";
 import type { WebpackInstance } from "discord-types/other";
 
 import { traceFunction } from "../debug/Tracer";
@@ -69,7 +70,7 @@ export const filters = {
 export const subscriptions = new Map<FilterFn, CallbackFn>();
 export const listeners = new Set<CallbackFn>();
 
-export type CallbackFn = (mod: any, id: number) => void;
+export type CallbackFn = (mod: any, id: string) => void;
 
 export function _initWebpack(instance: typeof window.webpackChunkdiscord_app) {
     if (cache !== void 0) throw "no.";
@@ -111,12 +112,12 @@ export const find = traceFunction("find", function find(filter: FilterFn, { isIn
         if (!mod?.exports) continue;
 
         if (filter(mod.exports)) {
-            return isWaitFor ? [mod.exports, Number(key)] : mod.exports;
+            return isWaitFor ? [mod.exports, key] : mod.exports;
         }
 
         if (mod.exports.default && filter(mod.exports.default)) {
             const found = mod.exports.default;
-            return isWaitFor ? [found, Number(key)] : found;
+            return isWaitFor ? [found, key] : found;
         }
     }
 
@@ -214,18 +215,21 @@ export const findBulk = traceFunction("findBulk", function findBulk(...filterFns
 });
 
 /**
- * Find the id of a module by its code
- * @param code Code
- * @returns number or null
+ * Find the id of the first module factory that includes all the given code
+ * @returns string or null
  */
-export const findModuleId = traceFunction("findModuleId", function findModuleId(code: string) {
+export const findModuleId = traceFunction("findModuleId", function findModuleId(...code: string[]) {
+    outer:
     for (const id in wreq.m) {
-        if (wreq.m[id].toString().includes(code)) {
-            return Number(id);
+        const str = wreq.m[id].toString();
+
+        for (const c of code) {
+            if (!str.includes(c)) continue outer;
         }
+        return id;
     }
 
-    const err = new Error("Didn't find module with code:\n" + code);
+    const err = new Error("Didn't find module with code(s):\n" + code.join("\n"));
     if (IS_DEV) {
         if (!devToolsOpen)
             // Strict behaviour in DevBuilds to fail early and make sure the issue is found
@@ -237,7 +241,18 @@ export const findModuleId = traceFunction("findModuleId", function findModuleId(
     return null;
 });
 
-export const lazyWebpackSearchHistory = [] as Array<["find" | "findByProps" | "findByCode" | "findStore" | "findComponent" | "findComponentByCode" | "findExportedComponent" | "waitFor" | "waitForComponent" | "waitForStore" | "proxyLazyWebpack" | "LazyComponentWebpack", any[]]>;
+/**
+ * Find the first module factory that includes all the given code
+ * @returns The module factory or null
+ */
+export function findModuleFactory(...code: string[]) {
+    const id = findModuleId(...code);
+    if (!id) return null;
+
+    return wreq.m[id];
+}
+
+export const lazyWebpackSearchHistory = [] as Array<["find" | "findByProps" | "findByCode" | "findStore" | "findComponent" | "findComponentByCode" | "findExportedComponent" | "waitFor" | "waitForComponent" | "waitForStore" | "proxyLazyWebpack" | "LazyComponentWebpack" | "extractAndLoadChunks", any[]]>;
 
 /**
  * This is just a wrapper around {@link proxyLazy} to make our reporter test for your webpack finds.
@@ -272,7 +287,7 @@ export function LazyComponentWebpack<T extends object = any>(factory: () => any,
 }
 
 /**
- * find but lazy
+ * Find the first module that matches the filter, lazily
  */
 export function findLazy(filter: FilterFn) {
     if (IS_DEV) lazyWebpackSearchHistory.push(["find", [filter]]);
@@ -291,7 +306,7 @@ export function findByProps(...props: string[]) {
 }
 
 /**
- * findByProps but lazy
+ * Find the first module that has the specified properties, lazily
  */
 export function findByPropsLazy(...props: string[]) {
     if (IS_DEV) lazyWebpackSearchHistory.push(["findByProps", props]);
@@ -300,7 +315,7 @@ export function findByPropsLazy(...props: string[]) {
 }
 
 /**
- * Find a function by its code
+ * Find the first function that includes all the given code
  */
 export function findByCode(...code: string[]) {
     const res = find(filters.byCode(...code), { isIndirect: true });
@@ -310,7 +325,7 @@ export function findByCode(...code: string[]) {
 }
 
 /**
- * findByCode but lazy
+ * Find the first function that includes all the given code, lazily
  */
 export function findByCodeLazy(...code: string[]) {
     if (IS_DEV) lazyWebpackSearchHistory.push(["findByCode", code]);
@@ -329,7 +344,7 @@ export function findStore(name: string) {
 }
 
 /**
- * findStore but lazy
+ * Find a store by its displayName, lazily
  */
 export function findStoreLazy(name: string) {
     if (IS_DEV) lazyWebpackSearchHistory.push(["findStore", [name]]);
@@ -353,7 +368,13 @@ export function findComponentByCode(...code: string[]) {
 export function findComponentLazy<T extends object = any>(filter: FilterFn) {
     if (IS_DEV) lazyWebpackSearchHistory.push(["findComponent", [filter]]);
 
-    return LazyComponent<T>(() => find(filter));
+
+    return LazyComponent<T>(() => {
+        const res = find(filter, { isIndirect: true });
+        if (!res)
+            handleModuleNotFound("findComponent", filter);
+        return res;
+    });
 }
 
 /**
@@ -362,7 +383,12 @@ export function findComponentLazy<T extends object = any>(filter: FilterFn) {
 export function findComponentByCodeLazy<T extends object = any>(...code: string[]) {
     if (IS_DEV) lazyWebpackSearchHistory.push(["findComponentByCode", code]);
 
-    return LazyComponent<T>(() => findComponentByCode(...code));
+    return LazyComponent<T>(() => {
+        const res = find(filters.componentByCode(...code), { isIndirect: true });
+        if (!res)
+            handleModuleNotFound("findComponentByCode", ...code);
+        return res;
+    });
 }
 
 /**
@@ -371,7 +397,68 @@ export function findComponentByCodeLazy<T extends object = any>(...code: string[
 export function findExportedComponentLazy<T extends object = any>(...props: string[]) {
     if (IS_DEV) lazyWebpackSearchHistory.push(["findExportedComponent", props]);
 
-    return LazyComponent<T>(() => findByProps(...props)?.[props[0]]);
+    return LazyComponent<T>(() => {
+        const res = find(filters.byProps(...props), { isIndirect: true });
+        if (!res)
+            handleModuleNotFound("findExportedComponent", ...props);
+        return res[props[0]];
+    });
+}
+
+/**
+ * Extract and load chunks using their entry point
+ * @param code An array of all the code the module factory containing the entry point (as of using it to load chunks) must include
+ * @param matcher A RegExp that returns the entry point id as the first capture group. Defaults to a matcher that captures the first entry point found in the module factory
+ */
+export async function extractAndLoadChunks(code: string[], matcher: RegExp = /\.el\("(.+?)"\)(?<=(\i)\.el.+?)\.then\(\2\.bind\(\2,"\1"\)\)/) {
+    const module = findModuleFactory(...code);
+    if (!module) {
+        const err = new Error("extractAndLoadChunks: Couldn't find module factory");
+        logger.warn(err, "Code:", code, "Matcher:", matcher);
+
+        return;
+    }
+
+    const match = module.toString().match(canonicalizeMatch(matcher));
+    if (!match) {
+        const err = new Error("extractAndLoadChunks: Couldn't find entry point id in module factory code");
+        logger.warn(err, "Code:", code, "Matcher:", matcher);
+
+        // Strict behaviour in DevBuilds to fail early and make sure the issue is found
+        if (IS_DEV && !devToolsOpen)
+            throw err;
+
+        return;
+    }
+
+    const [, id] = match;
+    if (!id || !Number(id)) {
+        const err = new Error("extractAndLoadChunks: Matcher didn't return a capturing group with the entry point, or the entry point returned wasn't a number");
+        logger.warn(err, "Code:", code, "Matcher:", matcher);
+
+        // Strict behaviour in DevBuilds to fail early and make sure the issue is found
+        if (IS_DEV && !devToolsOpen)
+            throw err;
+
+        return;
+    }
+
+    await (wreq as any).el(id);
+    return wreq(id as any);
+}
+
+/**
+ * This is just a wrapper around {@link extractAndLoadChunks} to make our reporter test for your webpack finds.
+ *
+ * Extract and load chunks using their entry point
+ * @param code An array of all the code the module factory containing the entry point (as of using it to load chunks) must include
+ * @param matcher A RegExp that returns the entry point id as the first capture group. Defaults to a matcher that captures the first entry point found in the module factory
+ * @returns A function that loads the chunks on first call
+ */
+export function extractAndLoadChunksLazy(code: string[], matcher: RegExp = /\.el\("(.+?)"\)(?<=(\i)\.el.+?)\.then\(\2\.bind\(\2,"\1"\)\)/) {
+    if (IS_DEV) lazyWebpackSearchHistory.push(["extractAndLoadChunks", [code, matcher]]);
+
+    return () => extractAndLoadChunks(code, matcher);
 }
 
 /**
@@ -433,7 +520,7 @@ export function search(...filters: Array<string | RegExp>) {
  * so putting breakpoints or similar will have no effect.
  * @param id The id of the module to extract
  */
-export function extract(id: number) {
+export function extract(id: string | number) {
     const mod = wreq.m[id] as Function;
     if (!mod) return null;
 

From f814eeb74c3a562b0ad632c808f63dfddd53f59b Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Mon, 27 Nov 2023 16:05:25 +0100
Subject: [PATCH 219/632] VoiceMessages: fix preview being blank

---
 src/plugins/voiceMessages/VoicePreview.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/voiceMessages/VoicePreview.tsx b/src/plugins/voiceMessages/VoicePreview.tsx
index 0976f7946..9c77d8329 100644
--- a/src/plugins/voiceMessages/VoicePreview.tsx
+++ b/src/plugins/voiceMessages/VoicePreview.tsx
@@ -25,7 +25,7 @@ interface VoiceMessageProps {
     src: string;
     waveform: string;
 }
-const VoiceMessage = findComponentByCodeLazy<VoiceMessageProps>("waveform:");
+const VoiceMessage = findComponentByCodeLazy<VoiceMessageProps>("waveform:", "onVolumeChange");
 
 export type VoicePreviewOptions = {
     src?: string;

From 597a74ff6c740e0ff26ca53a56f175b6d06e2e47 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 28 Nov 2023 17:05:11 -0300
Subject: [PATCH 220/632] ClientTheme: make color picker finder more specific

---
 src/plugins/clientTheme/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/clientTheme/index.tsx b/src/plugins/clientTheme/index.tsx
index 7b30863e7..d75929961 100644
--- a/src/plugins/clientTheme/index.tsx
+++ b/src/plugins/clientTheme/index.tsx
@@ -15,7 +15,7 @@ import definePlugin, { OptionType, StartAt } from "@utils/types";
 import { findComponentByCodeLazy } from "@webpack";
 import { Button, Forms } from "@webpack/common";
 
-const ColorPicker = findComponentByCodeLazy(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR");
+const ColorPicker = findComponentByCodeLazy(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)");
 
 const colorPresets = [
     "#1E1514", "#172019", "#13171B", "#1C1C28", "#402D2D",

From 9b6308a8355910f5911c1202e6a409636cb9e553 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 28 Nov 2023 22:12:00 -0300
Subject: [PATCH 221/632] Fix a console shortcut and
 suppressExperimentalWarnings on more scripts

---
 package.json                          | 4 ++--
 src/plugins/consoleShortcuts/index.ts | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 4d0dd262a..d035dcb6a 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
         "doc": "docs"
     },
     "scripts": {
-        "build": "node scripts/build/build.mjs",
+        "build": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/build.mjs",
         "buildWeb": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/buildWeb.mjs",
         "generatePluginJson": "tsx scripts/generatePluginList.ts",
         "inject": "node scripts/runInstaller.mjs",
@@ -28,7 +28,7 @@
         "testWeb": "pnpm lint && pnpm buildWeb && pnpm testTsc",
         "testTsc": "tsc --noEmit",
         "uninject": "node scripts/runInstaller.mjs",
-        "watch": "node scripts/build/build.mjs --watch"
+        "watch": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/build.mjs --watch"
     },
     "dependencies": {
         "@sapphi-red/web-noise-suppressor": "0.3.3",
diff --git a/src/plugins/consoleShortcuts/index.ts b/src/plugins/consoleShortcuts/index.ts
index 10853f25a..e25e7cb30 100644
--- a/src/plugins/consoleShortcuts/index.ts
+++ b/src/plugins/consoleShortcuts/index.ts
@@ -63,6 +63,7 @@ export default definePlugin({
 
         let fakeRenderWin: WeakRef<Window> | undefined;
         const find = newFindWrapper(f => f);
+        const findByProps = newFindWrapper(filters.byProps);
         return {
             ...Vencord.Webpack.Common,
             wp: Vencord.Webpack,
@@ -73,13 +74,13 @@ export default definePlugin({
             wpexs: (code: string) => extract(Webpack.findModuleId(code)!),
             find,
             findAll,
-            findByProps: newFindWrapper(filters.byProps),
+            findByProps,
             findAllByProps: (...props: string[]) => findAll(filters.byProps(...props)),
             findByCode: newFindWrapper(filters.byCode),
             findAllByCode: (code: string) => findAll(filters.byCode(code)),
             findComponentByCode: newFindWrapper(filters.componentByCode),
             findAllComponentsByCode: (...code: string[]) => findAll(filters.componentByCode(...code)),
-            findExportedComponent: (...props: string[]) => find(...props)[props[0]],
+            findExportedComponent: (...props: string[]) => findByProps(...props)[props[0]],
             findStore: newFindWrapper(filters.byStoreName),
             PluginsApi: Vencord.Plugins,
             plugins: Vencord.Plugins.plugins,

From 091d29bf5e89f1a41f5528c520bb6cfac654b3e4 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 29 Nov 2023 16:14:05 -0300
Subject: [PATCH 222/632] CrashHandler: attempt to prevent more crashes

---
 src/plugins/crashHandler/index.ts | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/plugins/crashHandler/index.ts b/src/plugins/crashHandler/index.ts
index a1ba01c3d..202cac04a 100644
--- a/src/plugins/crashHandler/index.ts
+++ b/src/plugins/crashHandler/index.ts
@@ -24,11 +24,14 @@ import { closeAllModals } from "@utils/modal";
 import definePlugin, { OptionType } from "@utils/types";
 import { maybePromptToUpdate } from "@utils/updater";
 import { findByPropsLazy } from "@webpack";
-import { FluxDispatcher, NavigationRouter } from "@webpack/common";
+import { FluxDispatcher, NavigationRouter, SelectedChannelStore } from "@webpack/common";
 import type { ReactElement } from "react";
 
 const CrashHandlerLogger = new Logger("CrashHandler");
 const ModalStack = findByPropsLazy("pushLazy", "popAll");
+const DraftManager = findByPropsLazy("clearDraft", "saveDraft");
+const { DraftType } = findByPropsLazy("DraftType");
+const { closeExpressionPicker } = findByPropsLazy("closeExpressionPicker", "openExpressionPicker");
 
 const settings = definePluginSettings({
     attemptToPreventCrashes: {
@@ -115,6 +118,20 @@ export default definePlugin({
             } catch { }
         }
 
+        try {
+            const channelId = SelectedChannelStore.getChannelId();
+
+            DraftManager.clearDraft(channelId, DraftType.ChannelMessage);
+            DraftManager.clearDraft(channelId, DraftType.FirstThreadMessage);
+        } catch (err) {
+            CrashHandlerLogger.debug("Failed to clear drafts.", err);
+        }
+        try {
+            closeExpressionPicker();
+        }
+        catch (err) {
+            CrashHandlerLogger.debug("Failed to close expression picker.", err);
+        }
         try {
             FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" });
         } catch (err) {

From 9945219de70fb70f43577c7df2c231d5b82a23de Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 29 Nov 2023 23:14:52 -0300
Subject: [PATCH 223/632] openInviteModal utility

Co-authored-by: AutumnVN <autumnvnchino@gmail.com>
---
 src/api/Commands/commandHelpers.ts        |  4 ++--
 src/plugins/greetStickerPicker/index.tsx  |  2 +-
 src/plugins/spotifyShareCommands/index.ts |  4 ++--
 src/plugins/voiceMessages/index.tsx       |  4 ++--
 src/utils/discord.tsx                     | 17 +++++++++++++++--
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/api/Commands/commandHelpers.ts b/src/api/Commands/commandHelpers.ts
index 2fd189032..ebcc4e2fa 100644
--- a/src/api/Commands/commandHelpers.ts
+++ b/src/api/Commands/commandHelpers.ts
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { MessageActions } from "@utils/discord";
 import { mergeDefaults } from "@utils/misc";
 import { findByPropsLazy } from "@webpack";
 import { SnowflakeUtils } from "@webpack/common";
@@ -24,7 +25,6 @@ import type { PartialDeep } from "type-fest";
 
 import { Argument } from "./types";
 
-const MessageCreator = findByPropsLazy("createBotMessage");
 const MessageSender = findByPropsLazy("receiveMessage");
 
 export function generateId() {
@@ -38,7 +38,7 @@ export function generateId() {
  * @returns {Message}
  */
 export function sendBotMessage(channelId: string, message: PartialDeep<Message>): Message {
-    const botMessage = MessageCreator.createBotMessage({ channelId, content: "", embeds: [] });
+    const botMessage = MessageActions.createBotMessage({ channelId, content: "", embeds: [] });
 
     MessageSender.receiveMessage(channelId, mergeDefaults(message, botMessage));
 
diff --git a/src/plugins/greetStickerPicker/index.tsx b/src/plugins/greetStickerPicker/index.tsx
index 9623d422e..c2104af4e 100644
--- a/src/plugins/greetStickerPicker/index.tsx
+++ b/src/plugins/greetStickerPicker/index.tsx
@@ -18,6 +18,7 @@
 
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
+import { MessageActions } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { ContextMenuApi, FluxDispatcher, Menu } from "@webpack/common";
@@ -49,7 +50,6 @@ const settings = definePluginSettings({
     unholyMultiGreetEnabled?: boolean;
 }>();
 
-const MessageActions = findByPropsLazy("sendGreetMessage");
 const { WELCOME_STICKERS } = findByPropsLazy("WELCOME_STICKERS");
 
 function greet(channel: Channel, message: Message, stickers: string[]) {
diff --git a/src/plugins/spotifyShareCommands/index.ts b/src/plugins/spotifyShareCommands/index.ts
index 7634e9d57..3569dd288 100644
--- a/src/plugins/spotifyShareCommands/index.ts
+++ b/src/plugins/spotifyShareCommands/index.ts
@@ -18,6 +18,7 @@
 
 import { ApplicationCommandInputType, sendBotMessage } from "@api/Commands";
 import { Devs } from "@utils/constants";
+import { MessageActions } from "@utils/discord";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { FluxDispatcher } from "@webpack/common";
@@ -53,7 +54,6 @@ interface Track {
 }
 
 const Spotify = findByPropsLazy("getPlayerState");
-const MessageCreator = findByPropsLazy("getSendMessageOptionsForReply", "sendMessage");
 const PendingReplyStore = findByPropsLazy("getPendingReply");
 
 function sendMessage(channelId, message) {
@@ -65,7 +65,7 @@ function sendMessage(channelId, message) {
         ...message
     };
     const reply = PendingReplyStore.getPendingReply(channelId);
-    MessageCreator.sendMessage(channelId, message, void 0, MessageCreator.getSendMessageOptionsForReply(reply))
+    MessageActions.sendMessage(channelId, message, void 0, MessageActions.getSendMessageOptionsForReply(reply))
         .then(() => {
             if (reply) {
                 FluxDispatcher.dispatch({ type: "DELETE_PENDING_REPLY", channelId });
diff --git a/src/plugins/voiceMessages/index.tsx b/src/plugins/voiceMessages/index.tsx
index 7c8a06943..17e10a4b8 100644
--- a/src/plugins/voiceMessages/index.tsx
+++ b/src/plugins/voiceMessages/index.tsx
@@ -21,6 +21,7 @@ import "./styles.css";
 import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
 import { Microphone } from "@components/Icons";
 import { Devs } from "@utils/constants";
+import { MessageActions } from "@utils/discord";
 import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModal } from "@utils/modal";
 import { useAwaiter } from "@utils/react";
 import definePlugin from "@utils/types";
@@ -36,7 +37,6 @@ import { VoicePreview } from "./VoicePreview";
 import { VoiceRecorderWeb } from "./WebRecorder";
 
 const CloudUtils = findByPropsLazy("CloudUpload");
-const MessageCreator = findByPropsLazy("getSendMessageOptionsForReply", "sendMessage");
 const PendingReplyStore = findStoreLazy("PendingReplyStore");
 const OptionClasses = findByPropsLazy("optionName", "optionIcon", "optionLabel");
 
@@ -100,7 +100,7 @@ function sendAudio(blob: Blob, meta: AudioMetadata) {
                     waveform: meta.waveform,
                     duration_secs: meta.duration,
                 }],
-                message_reference: reply ? MessageCreator.getSendMessageOptionsForReply(reply)?.messageReference : null,
+                message_reference: reply ? MessageActions.getSendMessageOptionsForReply(reply)?.messageReference : null,
             }
         });
     });
diff --git a/src/utils/discord.tsx b/src/utils/discord.tsx
index 96193f219..41e18f9d3 100644
--- a/src/utils/discord.tsx
+++ b/src/utils/discord.tsx
@@ -23,8 +23,21 @@ import { Guild, Message, User } from "discord-types/general";
 
 import { ImageModal, ModalRoot, ModalSize, openModal } from "./modal";
 
-const MessageActions = findByPropsLazy("editMessage", "sendMessage");
-const UserProfileActions = findByPropsLazy("openUserProfileModal", "closeUserProfileModal");
+export const MessageActions = findByPropsLazy("editMessage", "sendMessage");
+export const UserProfileActions = findByPropsLazy("openUserProfileModal", "closeUserProfileModal");
+export const InviteActions = findByPropsLazy("resolveInvite");
+
+export async function openInviteModal(code: string) {
+    const { invite } = await InviteActions.resolveInvite(code, "Desktop Modal");
+    if (!invite) throw new Error("Invalid invite: " + code);
+
+    FluxDispatcher.dispatch({
+        type: "INVITE_MODAL_OPEN",
+        invite,
+        code,
+        context: "APP"
+    });
+}
 
 export function getCurrentChannel() {
     return ChannelStore.getChannel(SelectedChannelStore.getChannelId());

From 8ef1882d4375c18b485d5afa0432b938e04d27e6 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 30 Nov 2023 00:43:23 -0300
Subject: [PATCH 224/632] use findBulk on CrashHandler and cleaups

---
 src/plugins/crashHandler/index.ts             | 23 ++++++++++++++-----
 .../components/UserPermissions.tsx            | 10 ++++----
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/plugins/crashHandler/index.ts b/src/plugins/crashHandler/index.ts
index 202cac04a..9d38b7d17 100644
--- a/src/plugins/crashHandler/index.ts
+++ b/src/plugins/crashHandler/index.ts
@@ -23,15 +23,26 @@ import { Logger } from "@utils/Logger";
 import { closeAllModals } from "@utils/modal";
 import definePlugin, { OptionType } from "@utils/types";
 import { maybePromptToUpdate } from "@utils/updater";
-import { findByPropsLazy } from "@webpack";
+import { filters, findBulk, proxyLazyWebpack } from "@webpack";
 import { FluxDispatcher, NavigationRouter, SelectedChannelStore } from "@webpack/common";
 import type { ReactElement } from "react";
 
 const CrashHandlerLogger = new Logger("CrashHandler");
-const ModalStack = findByPropsLazy("pushLazy", "popAll");
-const DraftManager = findByPropsLazy("clearDraft", "saveDraft");
-const { DraftType } = findByPropsLazy("DraftType");
-const { closeExpressionPicker } = findByPropsLazy("closeExpressionPicker", "openExpressionPicker");
+const { ModalStack, DraftManager, DraftType, closeExpressionPicker } = proxyLazyWebpack(() => {
+    const modules = findBulk(
+        filters.byProps("pushLazy", "popAll"),
+        filters.byProps("clearDraft", "saveDraft"),
+        filters.byProps("DraftType"),
+        filters.byProps("closeExpressionPicker", "openExpressionPicker"),
+    );
+
+    return {
+        ModalStack: modules[0],
+        DraftManager: modules[1],
+        DraftType: modules[2]?.DraftType,
+        closeExpressionPicker: modules[3]?.closeExpressionPicker,
+    };
+});
 
 const settings = definePluginSettings({
     attemptToPreventCrashes: {
@@ -138,7 +149,7 @@ export default definePlugin({
             CrashHandlerLogger.debug("Failed to close open context menu.", err);
         }
         try {
-            ModalStack?.popAll();
+            ModalStack.popAll();
         } catch (err) {
             CrashHandlerLogger.debug("Failed to close old modals.", err);
         }
diff --git a/src/plugins/permissionsViewer/components/UserPermissions.tsx b/src/plugins/permissionsViewer/components/UserPermissions.tsx
index b75bafdcb..3c6767713 100644
--- a/src/plugins/permissionsViewer/components/UserPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/UserPermissions.tsx
@@ -35,15 +35,13 @@ interface UserPermission {
 
 type UserPermissions = Array<UserPermission>;
 
-const Classes = proxyLazyWebpack(() => {
-    const modules = findBulk(
+const Classes = proxyLazyWebpack(() =>
+    Object.assign({}, ...findBulk(
         filters.byProps("roles", "rolePill", "rolePillBorder"),
         filters.byProps("roleCircle", "dotBorderBase", "dotBorderColor"),
         filters.byProps("roleNameOverflow", "root", "roleName", "roleRemoveButton")
-    );
-
-    return Object.assign({}, ...modules);
-}) as Record<"roles" | "rolePill" | "rolePillBorder" | "desaturateUserColors" | "flex" | "alignCenter" | "justifyCenter" | "svg" | "background" | "dot" | "dotBorderColor" | "roleCircle" | "dotBorderBase" | "flex" | "alignCenter" | "justifyCenter" | "wrap" | "root" | "role" | "roleRemoveButton" | "roleDot" | "roleFlowerStar" | "roleRemoveIcon" | "roleRemoveIconFocused" | "roleVerifiedIcon" | "roleName" | "roleNameOverflow" | "actionButton" | "overflowButton" | "addButton" | "addButtonIcon" | "overflowRolesPopout" | "overflowRolesPopoutArrowWrapper" | "overflowRolesPopoutArrow" | "popoutBottom" | "popoutTop" | "overflowRolesPopoutHeader" | "overflowRolesPopoutHeaderIcon" | "overflowRolesPopoutHeaderText" | "roleIcon", string>;
+    ))
+) as Record<"roles" | "rolePill" | "rolePillBorder" | "desaturateUserColors" | "flex" | "alignCenter" | "justifyCenter" | "svg" | "background" | "dot" | "dotBorderColor" | "roleCircle" | "dotBorderBase" | "flex" | "alignCenter" | "justifyCenter" | "wrap" | "root" | "role" | "roleRemoveButton" | "roleDot" | "roleFlowerStar" | "roleRemoveIcon" | "roleRemoveIconFocused" | "roleVerifiedIcon" | "roleName" | "roleNameOverflow" | "actionButton" | "overflowButton" | "addButton" | "addButtonIcon" | "overflowRolesPopout" | "overflowRolesPopoutArrowWrapper" | "overflowRolesPopoutArrow" | "popoutBottom" | "popoutTop" | "overflowRolesPopoutHeader" | "overflowRolesPopoutHeaderIcon" | "overflowRolesPopoutHeaderText" | "roleIcon", string>;
 
 function UserPermissionsComponent({ guild, guildMember, showBorder }: { guild: Guild; guildMember: GuildMember; showBorder: boolean; }) {
     const stns = settings.use(["permissionsSortOrder"]);

From b47a5f569e3684857048207f0da0d7f6de80c78a Mon Sep 17 00:00:00 2001
From: Jack <30497388+FieryFlames@users.noreply.github.com>
Date: Thu, 30 Nov 2023 00:10:50 -0500
Subject: [PATCH 225/632] feat: Add Decor plugin (#910)

---
 package.json                                  |   3 +-
 pnpm-lock.yaml                                |  21 +-
 src/components/Icons.tsx                      |  35 +++
 src/plugins/decor/README.md                   |  17 ++
 src/plugins/decor/index.tsx                   | 168 +++++++++++
 src/plugins/decor/lib/api.ts                  |  83 ++++++
 src/plugins/decor/lib/constants.ts            |  16 ++
 .../decor/lib/stores/AuthorizationStore.tsx   | 102 +++++++
 .../lib/stores/CurrentUserDecorationsStore.ts |  56 ++++
 .../decor/lib/stores/UsersDecorationsStore.ts | 118 ++++++++
 src/plugins/decor/lib/utils/decoration.ts     |  17 ++
 .../DecorDecorationGridDecoration.tsx         |  35 +++
 .../decor/ui/components/DecorSection.tsx      |  59 ++++
 .../ui/components/DecorationContextMenu.tsx   |  47 +++
 .../ui/components/DecorationGridCreate.tsx    |  30 ++
 .../ui/components/DecorationGridNone.tsx      |  30 ++
 src/plugins/decor/ui/components/Grid.tsx      |  28 ++
 .../decor/ui/components/SectionedGridList.tsx |  38 +++
 src/plugins/decor/ui/components/index.ts      |  33 +++
 src/plugins/decor/ui/index.ts                 |  13 +
 .../decor/ui/modals/ChangeDecorationModal.tsx | 270 ++++++++++++++++++
 .../decor/ui/modals/CreateDecorationModal.tsx | 163 +++++++++++
 src/plugins/decor/ui/styles.css               |  80 ++++++
 src/utils/cloud.tsx                           |   5 +-
 src/utils/discord.tsx                         |  24 +-
 src/webpack/common/components.ts              |   4 +-
 src/webpack/common/types/components.d.ts      |   1 +
 src/webpack/common/utils.ts                   |  10 +-
 tsconfig.json                                 |   1 +
 29 files changed, 1493 insertions(+), 14 deletions(-)
 create mode 100644 src/plugins/decor/README.md
 create mode 100644 src/plugins/decor/index.tsx
 create mode 100644 src/plugins/decor/lib/api.ts
 create mode 100644 src/plugins/decor/lib/constants.ts
 create mode 100644 src/plugins/decor/lib/stores/AuthorizationStore.tsx
 create mode 100644 src/plugins/decor/lib/stores/CurrentUserDecorationsStore.ts
 create mode 100644 src/plugins/decor/lib/stores/UsersDecorationsStore.ts
 create mode 100644 src/plugins/decor/lib/utils/decoration.ts
 create mode 100644 src/plugins/decor/ui/components/DecorDecorationGridDecoration.tsx
 create mode 100644 src/plugins/decor/ui/components/DecorSection.tsx
 create mode 100644 src/plugins/decor/ui/components/DecorationContextMenu.tsx
 create mode 100644 src/plugins/decor/ui/components/DecorationGridCreate.tsx
 create mode 100644 src/plugins/decor/ui/components/DecorationGridNone.tsx
 create mode 100644 src/plugins/decor/ui/components/Grid.tsx
 create mode 100644 src/plugins/decor/ui/components/SectionedGridList.tsx
 create mode 100644 src/plugins/decor/ui/components/index.ts
 create mode 100644 src/plugins/decor/ui/index.ts
 create mode 100644 src/plugins/decor/ui/modals/ChangeDecorationModal.tsx
 create mode 100644 src/plugins/decor/ui/modals/CreateDecorationModal.tsx
 create mode 100644 src/plugins/decor/ui/styles.css

diff --git a/package.json b/package.json
index d035dcb6a..af4720937 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,8 @@
         "tsx": "^3.12.7",
         "type-fest": "^3.9.0",
         "typescript": "^5.0.4",
-        "zip-local": "^0.3.5"
+        "zip-local": "^0.3.5",
+        "zustand": "^3.7.2"
     },
     "packageManager": "pnpm@8.10.2",
     "pnpm": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index be7befab3..43866f50b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,9 +1,5 @@
 lockfileVersion: '6.0'
 
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
 patchedDependencies:
   eslint-plugin-path-alias@1.0.0:
     hash: m6sma4g6bh67km3q6igf6uxaja
@@ -123,6 +119,9 @@ devDependencies:
   zip-local:
     specifier: ^0.3.5
     version: 0.3.5
+  zustand:
+    specifier: ^3.7.2
+    version: 3.7.2
 
 packages:
 
@@ -3450,8 +3449,22 @@ packages:
       q: 1.5.1
     dev: true
 
+  /zustand@3.7.2:
+    resolution: {integrity: sha512-PIJDIZKtokhof+9+60cpockVOq05sJzHCriyvaLBmEJixseQ1a5Kdov6fWZfWOu5SK9c+FhH1jU0tntLxRJYMA==}
+    engines: {node: '>=12.7.0'}
+    peerDependencies:
+      react: '>=16.8'
+    peerDependenciesMeta:
+      react:
+        optional: true
+    dev: true
+
   github.com/mattdesl/gifenc/64842fca317b112a8590f8fef2bf3825da8f6fe3:
     resolution: {tarball: https://codeload.github.com/mattdesl/gifenc/tar.gz/64842fca317b112a8590f8fef2bf3825da8f6fe3}
     name: gifenc
     version: 1.0.3
     dev: false
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
diff --git a/src/components/Icons.tsx b/src/components/Icons.tsx
index 93b1323e7..2eb83d4ef 100644
--- a/src/components/Icons.tsx
+++ b/src/components/Icons.tsx
@@ -255,3 +255,38 @@ export function DeleteIcon(props: IconProps) {
         </Icon>
     );
 }
+
+export function PlusIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            className={classes(props.className, "vc-plus-icon")}
+            viewBox="0 0 18 18"
+        >
+            <polygon
+                fill-rule="nonzero"
+                fill="currentColor"
+                points="15 10 10 10 10 15 8 15 8 10 3 10 3 8 8 8 8 3 10 3 10 8 15 8"
+            />
+        </Icon>
+    );
+}
+
+export function NoEntrySignIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            className={classes(props.className, "vc-no-entry-sign-icon")}
+            viewBox="0 0 24 24"
+        >
+            <path
+                d="M0 0h24v24H0z"
+                fill="none"
+            />
+            <path
+                fill="currentColor"
+                d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8 0-1.85.63-3.55 1.69-4.9L16.9 18.31C15.55 19.37 13.85 20 12 20zm6.31-3.1L7.1 5.69C8.45 4.63 10.15 4 12 4c4.42 0 8 3.58 8 8 0 1.85-.63 3.55-1.69 4.9z"
+            />
+        </Icon>
+    );
+}
diff --git a/src/plugins/decor/README.md b/src/plugins/decor/README.md
new file mode 100644
index 000000000..467a61457
--- /dev/null
+++ b/src/plugins/decor/README.md
@@ -0,0 +1,17 @@
+# Decor
+
+Custom avatar decorations!
+
+![Custom decorations in chat](https://github.com/Vendicated/Vencord/assets/30497388/b0c4c4c8-8723-42a8-b50f-195ad4e26136)
+
+Create and use your own custom avatar decorations, or pick your favorite from the presets.
+
+You'll be able to see the custom avatar decorations of other users of this plugin, and they'll be able to see your custom avatar decoration.
+
+You can select and manage your custom avatar decorations under the "Profiles" page in settings, or in the plugin settings.
+
+![Custom decorations management](https://github.com/Vendicated/Vencord/assets/30497388/74fe8a9e-a2a2-4b29-bc10-9eaa58208ad4)
+
+Review the [guidelines](https://github.com/decor-discord/.github/blob/main/GUIDELINES.md) before creating your own custom avatar decoration.
+
+Join the [Discord server](https://discord.gg/dXp2SdxDcP) for support and notifications on your decoration's review.
diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx
new file mode 100644
index 000000000..4dd7aa0c9
--- /dev/null
+++ b/src/plugins/decor/index.tsx
@@ -0,0 +1,168 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated, FieryFlames and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./ui/styles.css";
+
+import { definePluginSettings } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Link } from "@components/Link";
+import { Devs } from "@utils/constants";
+import { Margins } from "@utils/margins";
+import { classes } from "@utils/misc";
+import { closeAllModals } from "@utils/modal";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+import { FluxDispatcher, Forms, UserStore } from "@webpack/common";
+
+import { CDN_URL, RAW_SKU_ID, SKU_ID } from "./lib/constants";
+import { useAuthorizationStore } from "./lib/stores/AuthorizationStore";
+import { useCurrentUserDecorationsStore } from "./lib/stores/CurrentUserDecorationsStore";
+import { useUserDecorAvatarDecoration, useUsersDecorationsStore } from "./lib/stores/UsersDecorationsStore";
+import { setDecorationGridDecoration, setDecorationGridItem } from "./ui/components";
+import DecorSection from "./ui/components/DecorSection";
+
+const { isAnimatedAvatarDecoration } = findByPropsLazy("isAnimatedAvatarDecoration");
+export interface AvatarDecoration {
+    asset: string;
+    skuId: string;
+}
+
+const settings = definePluginSettings({
+    changeDecoration: {
+        type: OptionType.COMPONENT,
+        description: "Change your avatar decoration",
+        component() {
+            return <div>
+                <DecorSection hideTitle hideDivider noMargin />
+                <Forms.FormText type="description" className={classes(Margins.top8, Margins.bottom8)}>
+                    You can also access Decor decorations from the <Link
+                        href="/settings/profile-customization"
+                        onClick={e => {
+                            e.preventDefault();
+                            closeAllModals();
+                            FluxDispatcher.dispatch({ type: "USER_SETTINGS_MODAL_SET_SECTION", section: "Profile Customization" });
+                        }}
+                    >Profiles</Link> page.
+                </Forms.FormText>
+            </div>;
+        }
+    }
+});
+export default definePlugin({
+    name: "Decor",
+    description: "Create and use your own custom avatar decorations, or pick your favorite from the presets.",
+    authors: [Devs.FieryFlames],
+    patches: [
+        // Patch MediaResolver to return correct URL for Decor avatar decorations
+        {
+            find: "getAvatarDecorationURL:",
+            replacement: {
+                match: /(?<=function \i\(\i\){)(?=let{avatarDecoration)/,
+                replace: "const vcDecorDecoration=$self.getDecorAvatarDecorationURL(arguments[0]);if(vcDecorDecoration)return vcDecorDecoration;"
+            }
+        },
+        // Patch profile customization settings to include Decor section
+        {
+            find: "DefaultCustomizationSections",
+            replacement: {
+                match: /(?<={user:\i},"decoration"\),)/,
+                replace: "$self.DecorSection(),"
+            }
+        },
+        // Decoration modal module
+        {
+            find: ".decorationGridItem",
+            replacement: [
+                {
+                    match: /(?<==)\i=>{let{children.{20,100}decorationGridItem/,
+                    replace: "$self.DecorationGridItem=$&"
+                },
+                {
+                    match: /(?<==)\i=>{let{user:\i,avatarDecoration.{300,600}decorationGridItemChurned/,
+                    replace: "$self.DecorationGridDecoration=$&"
+                },
+                // Remove NEW label from decor avatar decorations
+                {
+                    match: /(?<=\.Section\.PREMIUM_PURCHASE&&\i;if\()(?<=avatarDecoration:(\i).+?)/,
+                    replace: "$1.skuId===$self.SKU_ID||"
+                }
+            ]
+        },
+        {
+            find: "isAvatarDecorationAnimating:",
+            group: true,
+            replacement: [
+                // Add Decor avatar decoration hook to avatar decoration hook
+                {
+                    match: /(?<=TryItOut:\i}\),)(?<=user:(\i).+?)/,
+                    replace: "vcDecorAvatarDecoration=$self.useUserDecorAvatarDecoration($1),"
+                },
+                // Use added hook
+                {
+                    match: /(?<={avatarDecoration:).{1,20}?(?=,)(?<=avatarDecorationOverride:(\i).+?)/,
+                    replace: "$1??vcDecorAvatarDecoration??($&)"
+                },
+                // Make memo depend on added hook
+                {
+                    match: /(?<=size:\i}\),\[)/,
+                    replace: "vcDecorAvatarDecoration,"
+                }
+            ]
+        },
+        // Current user area, at bottom of channels/dm list
+        {
+            find: "renderAvatarWithPopout(){",
+            replacement: [
+                // Use Decor avatar decoration hook
+                {
+                    match: /(?<=getAvatarDecorationURL\)\({avatarDecoration:)(\i).avatarDecoration(?=,)/,
+                    replace: "$self.useUserDecorAvatarDecoration($1)??$&"
+                }
+            ]
+        }
+    ],
+    settings,
+
+    flux: {
+        CONNECTION_OPEN: () => {
+            useAuthorizationStore.getState().init();
+            useCurrentUserDecorationsStore.getState().clear();
+            useUsersDecorationsStore.getState().fetch(UserStore.getCurrentUser().id, true);
+        },
+        USER_PROFILE_MODAL_OPEN: data => {
+            useUsersDecorationsStore.getState().fetch(data.userId, true);
+        },
+    },
+
+    set DecorationGridItem(e: any) {
+        setDecorationGridItem(e);
+    },
+
+    set DecorationGridDecoration(e: any) {
+        setDecorationGridDecoration(e);
+    },
+
+    SKU_ID,
+
+    useUserDecorAvatarDecoration,
+
+    async start() {
+        useUsersDecorationsStore.getState().fetch(UserStore.getCurrentUser().id, true);
+    },
+
+    getDecorAvatarDecorationURL({ avatarDecoration, canAnimate }: { avatarDecoration: AvatarDecoration | null; canAnimate?: boolean; }) {
+        // Only Decor avatar decorations have this SKU ID
+        if (avatarDecoration?.skuId === SKU_ID) {
+            const url = new URL(`${CDN_URL}/${avatarDecoration.asset}.png`);
+            url.searchParams.set("animate", (!!canAnimate && isAnimatedAvatarDecoration(avatarDecoration.asset)).toString());
+            return url.toString();
+        } else if (avatarDecoration?.skuId === RAW_SKU_ID) {
+            return avatarDecoration.asset;
+        }
+    },
+
+    DecorSection: ErrorBoundary.wrap(DecorSection)
+});
diff --git a/src/plugins/decor/lib/api.ts b/src/plugins/decor/lib/api.ts
new file mode 100644
index 000000000..3719cf245
--- /dev/null
+++ b/src/plugins/decor/lib/api.ts
@@ -0,0 +1,83 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { API_URL } from "./constants";
+import { useAuthorizationStore } from "./stores/AuthorizationStore";
+
+export interface Preset {
+    id: string;
+    name: string;
+    description: string | null;
+    decorations: Decoration[];
+    authorIds: string[];
+}
+
+export interface Decoration {
+    hash: string;
+    animated: boolean;
+    alt: string | null;
+    authorId: string | null;
+    reviewed: boolean | null;
+    presetId: string | null;
+}
+
+export interface NewDecoration {
+    file: File;
+    alt: string | null;
+}
+
+export async function fetchApi(url: RequestInfo, options?: RequestInit) {
+    const res = await fetch(url, {
+        ...options,
+        headers: {
+            ...options?.headers,
+            Authorization: `Bearer ${useAuthorizationStore.getState().token}`
+        }
+    });
+
+    if (res.ok) return res;
+    else throw new Error(await res.text());
+}
+
+export const getUsersDecorations = async (ids?: string[]): Promise<Record<string, string | null>> => {
+    if (ids?.length === 0) return {};
+
+    const url = new URL(API_URL + "/users");
+    if (ids && ids.length !== 0) url.searchParams.set("ids", JSON.stringify(ids));
+
+    return await fetch(url).then(c => c.json());
+};
+
+export const getUserDecorations = async (id: string = "@me"): Promise<Decoration[]> =>
+    fetchApi(API_URL + `/users/${id}/decorations`).then(c => c.json());
+
+export const getUserDecoration = async (id: string = "@me"): Promise<Decoration | null> =>
+    fetchApi(API_URL + `/users/${id}/decoration`).then(c => c.json());
+
+export const setUserDecoration = async (decoration: Decoration | NewDecoration | null, id: string = "@me"): Promise<string | Decoration> => {
+    const formData = new FormData();
+
+    if (!decoration) {
+        formData.append("hash", "null");
+    } else if ("hash" in decoration) {
+        formData.append("hash", decoration.hash);
+    } else if ("file" in decoration) {
+        formData.append("image", decoration.file);
+        formData.append("alt", decoration.alt ?? "null");
+    }
+
+    return fetchApi(API_URL + `/users/${id}/decoration`, { method: "PUT", body: formData }).then(c =>
+        decoration && "file" in decoration ? c.json() : c.text()
+    );
+};
+
+export const getDecoration = async (hash: string): Promise<Decoration> => fetch(API_URL + `/decorations/${hash}`).then(c => c.json());
+
+export const deleteDecoration = async (hash: string): Promise<void> => {
+    await fetchApi(API_URL + `/decorations/${hash}`, { method: "DELETE" });
+};
+
+export const getPresets = async (): Promise<Preset[]> => fetch(API_URL + "/decorations/presets").then(c => c.json());
diff --git a/src/plugins/decor/lib/constants.ts b/src/plugins/decor/lib/constants.ts
new file mode 100644
index 000000000..ce0b59798
--- /dev/null
+++ b/src/plugins/decor/lib/constants.ts
@@ -0,0 +1,16 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+export const BASE_URL = "https://decor.fieryflames.dev";
+export const API_URL = BASE_URL + "/api";
+export const AUTHORIZE_URL = API_URL + "/authorize";
+export const CDN_URL = "https://ugc.decor.fieryflames.dev";
+export const CLIENT_ID = "1096966363416899624";
+export const SKU_ID = "100101099111114"; // decor in ascii numbers
+export const RAW_SKU_ID = "11497119"; // raw in ascii numbers
+export const GUILD_ID = "1096357702931841148";
+export const INVITE_KEY = "dXp2SdxDcP";
+export const DECORATION_FETCH_COOLDOWN = 1000 * 60 * 60 * 4; // 4 hours
diff --git a/src/plugins/decor/lib/stores/AuthorizationStore.tsx b/src/plugins/decor/lib/stores/AuthorizationStore.tsx
new file mode 100644
index 000000000..e31b1f43c
--- /dev/null
+++ b/src/plugins/decor/lib/stores/AuthorizationStore.tsx
@@ -0,0 +1,102 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { DataStore } from "@api/index";
+import { proxyLazy } from "@utils/lazy";
+import { Logger } from "@utils/Logger";
+import { openModal } from "@utils/modal";
+import { OAuth2AuthorizeModal, showToast, Toasts, UserStore, zustandCreate, zustandPersist } from "@webpack/common";
+import type { StateStorage } from "zustand/middleware";
+
+import { AUTHORIZE_URL, CLIENT_ID } from "../constants";
+
+interface AuthorizationState {
+    token: string | null;
+    tokens: Record<string, string>;
+    init: () => void;
+    authorize: () => Promise<void>;
+    setToken: (token: string) => void;
+    remove: (id: string) => void;
+    isAuthorized: () => boolean;
+}
+
+const indexedDBStorage: StateStorage = {
+    async getItem(name: string): Promise<string | null> {
+        return DataStore.get(name).then(v => v ?? null);
+    },
+    async setItem(name: string, value: string): Promise<void> {
+        await DataStore.set(name, value);
+    },
+    async removeItem(name: string): Promise<void> {
+        await DataStore.del(name);
+    },
+};
+
+// TODO: Move switching accounts subscription inside the store?
+export const useAuthorizationStore = proxyLazy(() => zustandCreate<AuthorizationState>(
+    zustandPersist(
+        (set, get) => ({
+            token: null,
+            tokens: {},
+            init: () => { set({ token: get().tokens[UserStore.getCurrentUser().id] ?? null }); },
+            setToken: (token: string) => set({ token, tokens: { ...get().tokens, [UserStore.getCurrentUser().id]: token } }),
+            remove: (id: string) => {
+                const { tokens, init } = get();
+                const newTokens = { ...tokens };
+                delete newTokens[id];
+                set({ tokens: newTokens });
+
+                init();
+            },
+            async authorize() {
+                return new Promise((resolve, reject) => openModal(props =>
+                    <OAuth2AuthorizeModal
+                        {...props}
+                        scopes={["identify"]}
+                        responseType="code"
+                        redirectUri={AUTHORIZE_URL}
+                        permissions={0n}
+                        clientId={CLIENT_ID}
+                        cancelCompletesFlow={false}
+                        callback={async (response: any) => {
+                            try {
+                                const url = new URL(response.location);
+                                url.searchParams.append("client", "vencord");
+
+                                const req = await fetch(url);
+
+                                if (req?.ok) {
+                                    const token = await req.text();
+                                    get().setToken(token);
+                                } else {
+                                    throw new Error("Request not OK");
+                                }
+                                resolve(void 0);
+                            } catch (e) {
+                                if (e instanceof Error) {
+                                    showToast(`Failed to authorize: ${e.message}`, Toasts.Type.FAILURE);
+                                    new Logger("Decor").error("Failed to authorize", e);
+                                    reject(e);
+                                }
+                            }
+                        }}
+                    />, {
+                    onCloseCallback() {
+                        reject(new Error("Authorization cancelled"));
+                    },
+                }
+                ));
+            },
+            isAuthorized: () => !!get().token,
+        }),
+        {
+            name: "decor-auth",
+            getStorage: () => indexedDBStorage,
+            partialize: state => ({ tokens: state.tokens }),
+            onRehydrateStorage: () => state => state?.init()
+        }
+    )
+));
diff --git a/src/plugins/decor/lib/stores/CurrentUserDecorationsStore.ts b/src/plugins/decor/lib/stores/CurrentUserDecorationsStore.ts
new file mode 100644
index 000000000..1485a7438
--- /dev/null
+++ b/src/plugins/decor/lib/stores/CurrentUserDecorationsStore.ts
@@ -0,0 +1,56 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { proxyLazy } from "@utils/lazy";
+import { UserStore, zustandCreate } from "@webpack/common";
+
+import { Decoration, deleteDecoration, getUserDecoration, getUserDecorations, NewDecoration, setUserDecoration } from "../api";
+import { decorationToAsset } from "../utils/decoration";
+import { useUsersDecorationsStore } from "./UsersDecorationsStore";
+
+interface UserDecorationsState {
+    decorations: Decoration[];
+    selectedDecoration: Decoration | null;
+    fetch: () => Promise<void>;
+    delete: (decoration: Decoration | string) => Promise<void>;
+    create: (decoration: NewDecoration) => Promise<void>;
+    select: (decoration: Decoration | null) => Promise<void>;
+    clear: () => void;
+}
+
+export const useCurrentUserDecorationsStore = proxyLazy(() => zustandCreate<UserDecorationsState>((set, get) => ({
+    decorations: [],
+    selectedDecoration: null,
+    async fetch() {
+        const decorations = await getUserDecorations();
+        const selectedDecoration = await getUserDecoration();
+
+        set({ decorations, selectedDecoration });
+    },
+    async create(newDecoration: NewDecoration) {
+        const decoration = (await setUserDecoration(newDecoration)) as Decoration;
+        set({ decorations: [...get().decorations, decoration] });
+    },
+    async delete(decoration: Decoration | string) {
+        const hash = typeof decoration === "object" ? decoration.hash : decoration;
+        await deleteDecoration(hash);
+
+        const { selectedDecoration, decorations } = get();
+        const newState = {
+            decorations: decorations.filter(d => d.hash !== hash),
+            selectedDecoration: selectedDecoration?.hash === hash ? null : selectedDecoration
+        };
+
+        set(newState);
+    },
+    async select(decoration: Decoration | null) {
+        if (get().selectedDecoration === decoration) return;
+        set({ selectedDecoration: decoration });
+        setUserDecoration(decoration);
+        useUsersDecorationsStore.getState().set(UserStore.getCurrentUser().id, decoration ? decorationToAsset(decoration) : null);
+    },
+    clear: () => set({ decorations: [], selectedDecoration: null })
+})));
diff --git a/src/plugins/decor/lib/stores/UsersDecorationsStore.ts b/src/plugins/decor/lib/stores/UsersDecorationsStore.ts
new file mode 100644
index 000000000..7295a3b17
--- /dev/null
+++ b/src/plugins/decor/lib/stores/UsersDecorationsStore.ts
@@ -0,0 +1,118 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { debounce } from "@utils/debounce";
+import { proxyLazy } from "@utils/lazy";
+import { useEffect, useState, zustandCreate } from "@webpack/common";
+import { User } from "discord-types/general";
+
+import { AvatarDecoration } from "../../";
+import { getUsersDecorations } from "../api";
+import { DECORATION_FETCH_COOLDOWN, SKU_ID } from "../constants";
+
+interface UserDecorationData {
+    asset: string | null;
+    fetchedAt: Date;
+}
+
+interface UsersDecorationsState {
+    usersDecorations: Map<string, UserDecorationData>;
+    fetchQueue: Set<string>;
+    bulkFetch: () => Promise<void>;
+    fetch: (userId: string, force?: boolean) => Promise<void>;
+    fetchMany: (userIds: string[]) => Promise<void>;
+    get: (userId: string) => UserDecorationData | undefined;
+    getAsset: (userId: string) => string | null | undefined;
+    has: (userId: string) => boolean;
+    set: (userId: string, decoration: string | null) => void;
+}
+
+export const useUsersDecorationsStore = proxyLazy(() => zustandCreate<UsersDecorationsState>((set, get) => ({
+    usersDecorations: new Map<string, UserDecorationData>(),
+    fetchQueue: new Set(),
+    bulkFetch: debounce(async () => {
+        const { fetchQueue, usersDecorations } = get();
+
+        if (fetchQueue.size === 0) return;
+
+        set({ fetchQueue: new Set() });
+
+        const fetchIds = Array.from(fetchQueue);
+        const fetchedUsersDecorations = await getUsersDecorations(fetchIds);
+
+        const newUsersDecorations = new Map(usersDecorations);
+
+        const now = new Date();
+        for (const fetchId of fetchIds) {
+            const newDecoration = fetchedUsersDecorations[fetchId] ?? null;
+            newUsersDecorations.set(fetchId, { asset: newDecoration, fetchedAt: now });
+        }
+
+        set({ usersDecorations: newUsersDecorations });
+    }),
+    async fetch(userId: string, force: boolean = false) {
+        const { usersDecorations, fetchQueue, bulkFetch } = get();
+
+        const { fetchedAt } = usersDecorations.get(userId) ?? {};
+        if (fetchedAt) {
+            if (!force && Date.now() - fetchedAt.getTime() < DECORATION_FETCH_COOLDOWN) return;
+        }
+
+        set({ fetchQueue: new Set(fetchQueue).add(userId) });
+        bulkFetch();
+    },
+    async fetchMany(userIds) {
+        if (!userIds.length) return;
+        const { usersDecorations, fetchQueue, bulkFetch } = get();
+
+        const newFetchQueue = new Set(fetchQueue);
+
+        const now = Date.now();
+        for (const userId of userIds) {
+            const { fetchedAt } = usersDecorations.get(userId) ?? {};
+            if (fetchedAt) {
+                if (now - fetchedAt.getTime() < DECORATION_FETCH_COOLDOWN) continue;
+            }
+            newFetchQueue.add(userId);
+        }
+
+        set({ fetchQueue: newFetchQueue });
+        bulkFetch();
+    },
+    get(userId: string) { return get().usersDecorations.get(userId); },
+    getAsset(userId: string) { return get().usersDecorations.get(userId)?.asset; },
+    has(userId: string) { return get().usersDecorations.has(userId); },
+    set(userId: string, decoration: string | null) {
+        const { usersDecorations } = get();
+        const newUsersDecorations = new Map(usersDecorations);
+
+        newUsersDecorations.set(userId, { asset: decoration, fetchedAt: new Date() });
+        set({ usersDecorations: newUsersDecorations });
+    }
+})));
+
+export function useUserDecorAvatarDecoration(user?: User): AvatarDecoration | null | undefined {
+    const [decorAvatarDecoration, setDecorAvatarDecoration] = useState<string | null>(user ? useUsersDecorationsStore.getState().getAsset(user.id) ?? null : null);
+
+    useEffect(() => {
+        const destructor = useUsersDecorationsStore.subscribe(
+            state => {
+                if (!user) return;
+                const newDecorAvatarDecoration = state.getAsset(user.id);
+                if (!newDecorAvatarDecoration) return;
+                if (decorAvatarDecoration !== newDecorAvatarDecoration) setDecorAvatarDecoration(newDecorAvatarDecoration);
+            }
+        );
+
+        if (user) {
+            const { fetch: fetchUserDecorAvatarDecoration } = useUsersDecorationsStore.getState();
+            fetchUserDecorAvatarDecoration(user.id);
+        }
+        return destructor;
+    }, []);
+
+    return decorAvatarDecoration ? { asset: decorAvatarDecoration, skuId: SKU_ID } : null;
+}
diff --git a/src/plugins/decor/lib/utils/decoration.ts b/src/plugins/decor/lib/utils/decoration.ts
new file mode 100644
index 000000000..176507ef8
--- /dev/null
+++ b/src/plugins/decor/lib/utils/decoration.ts
@@ -0,0 +1,17 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { AvatarDecoration } from "../../";
+import { Decoration } from "../api";
+import { SKU_ID } from "../constants";
+
+export function decorationToAsset(decoration: Decoration) {
+    return `${decoration.animated ? "a_" : ""}${decoration.hash}`;
+}
+
+export function decorationToAvatarDecoration(decoration: Decoration): AvatarDecoration {
+    return { asset: decorationToAsset(decoration), skuId: SKU_ID };
+}
diff --git a/src/plugins/decor/ui/components/DecorDecorationGridDecoration.tsx b/src/plugins/decor/ui/components/DecorDecorationGridDecoration.tsx
new file mode 100644
index 000000000..deaeef630
--- /dev/null
+++ b/src/plugins/decor/ui/components/DecorDecorationGridDecoration.tsx
@@ -0,0 +1,35 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { ContextMenuApi } from "@webpack/common";
+import type { HTMLProps } from "react";
+
+import { Decoration } from "../../lib/api";
+import { decorationToAvatarDecoration } from "../../lib/utils/decoration";
+import { DecorationGridDecoration } from ".";
+import DecorationContextMenu from "./DecorationContextMenu";
+
+interface DecorDecorationGridDecorationProps extends HTMLProps<HTMLDivElement> {
+    decoration: Decoration;
+    isSelected: boolean;
+    onSelect: () => void;
+}
+
+export default function DecorDecorationGridDecoration(props: DecorDecorationGridDecorationProps) {
+    const { decoration } = props;
+
+    return <DecorationGridDecoration
+        {...props}
+        onContextMenu={e => {
+            ContextMenuApi.openContextMenu(e, () => (
+                <DecorationContextMenu
+                    decoration={decoration}
+                />
+            ));
+        }}
+        avatarDecoration={decorationToAvatarDecoration(decoration)}
+    />;
+}
diff --git a/src/plugins/decor/ui/components/DecorSection.tsx b/src/plugins/decor/ui/components/DecorSection.tsx
new file mode 100644
index 000000000..f11a87a53
--- /dev/null
+++ b/src/plugins/decor/ui/components/DecorSection.tsx
@@ -0,0 +1,59 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Flex } from "@components/Flex";
+import { findByCodeLazy } from "@webpack";
+import { Button, useEffect } from "@webpack/common";
+
+import { useAuthorizationStore } from "../../lib/stores/AuthorizationStore";
+import { useCurrentUserDecorationsStore } from "../../lib/stores/CurrentUserDecorationsStore";
+import { cl } from "../";
+import { openChangeDecorationModal } from "../modals/ChangeDecorationModal";
+
+const CustomizationSection = findByCodeLazy(".customizationSectionBackground");
+
+interface DecorSectionProps {
+    hideTitle?: boolean;
+    hideDivider?: boolean;
+    noMargin?: boolean;
+}
+
+export default function DecorSection({ hideTitle = false, hideDivider = false, noMargin = false }: DecorSectionProps) {
+    const authorization = useAuthorizationStore();
+    const { selectedDecoration, select: selectDecoration, fetch: fetchDecorations } = useCurrentUserDecorationsStore();
+
+    useEffect(() => {
+        if (authorization.isAuthorized()) fetchDecorations();
+    }, [authorization.token]);
+
+    return <CustomizationSection
+        title={!hideTitle && "Decor"}
+        hasBackground={true}
+        hideDivider={hideDivider}
+        className={noMargin && cl("section-remove-margin")}
+    >
+        <Flex>
+            <Button
+                onClick={() => {
+                    if (!authorization.isAuthorized()) {
+                        authorization.authorize().then(openChangeDecorationModal).catch(() => { });
+                    } else openChangeDecorationModal();
+                }}
+                size={Button.Sizes.SMALL}
+            >
+                Change Decoration
+            </Button>
+            {selectedDecoration && authorization.isAuthorized() && <Button
+                onClick={() => selectDecoration(null)}
+                color={Button.Colors.PRIMARY}
+                size={Button.Sizes.SMALL}
+                look={Button.Looks.LINK}
+            >
+                Remove Decoration
+            </Button>}
+        </Flex>
+    </CustomizationSection>;
+}
diff --git a/src/plugins/decor/ui/components/DecorationContextMenu.tsx b/src/plugins/decor/ui/components/DecorationContextMenu.tsx
new file mode 100644
index 000000000..7451bb229
--- /dev/null
+++ b/src/plugins/decor/ui/components/DecorationContextMenu.tsx
@@ -0,0 +1,47 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { CopyIcon, DeleteIcon } from "@components/Icons";
+import { Alerts, Clipboard, ContextMenuApi, Menu, UserStore } from "webpack/common";
+
+import { Decoration } from "../../lib/api";
+import { useCurrentUserDecorationsStore } from "../../lib/stores/CurrentUserDecorationsStore";
+import { cl } from "../";
+
+export default function DecorationContextMenu({ decoration }: { decoration: Decoration; }) {
+    const { delete: deleteDecoration } = useCurrentUserDecorationsStore();
+
+    return <Menu.Menu
+        navId={cl("decoration-context-menu")}
+        onClose={ContextMenuApi.closeContextMenu}
+        aria-label="Decoration Options"
+    >
+        <Menu.MenuItem
+            id={cl("decoration-context-menu-copy-hash")}
+            label="Copy Decoration Hash"
+            icon={CopyIcon}
+            action={() => Clipboard.copy(decoration.hash)}
+        />
+        {decoration.authorId === UserStore.getCurrentUser().id &&
+            <Menu.MenuItem
+                id={cl("decoration-context-menu-delete")}
+                label="Delete Decoration"
+                color="danger"
+                icon={DeleteIcon}
+                action={() => Alerts.show({
+                    title: "Delete Decoration",
+                    body: `Are you sure you want to delete ${decoration.alt}?`,
+                    confirmText: "Delete",
+                    confirmColor: cl("danger-btn"),
+                    cancelText: "Cancel",
+                    onConfirm() {
+                        deleteDecoration(decoration);
+                    }
+                })}
+            />
+        }
+    </Menu.Menu>;
+}
diff --git a/src/plugins/decor/ui/components/DecorationGridCreate.tsx b/src/plugins/decor/ui/components/DecorationGridCreate.tsx
new file mode 100644
index 000000000..7699b23d9
--- /dev/null
+++ b/src/plugins/decor/ui/components/DecorationGridCreate.tsx
@@ -0,0 +1,30 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { PlusIcon } from "@components/Icons";
+import { i18n, Text } from "@webpack/common";
+import { HTMLProps } from "react";
+
+import { DecorationGridItem } from ".";
+
+type DecorationGridCreateProps = HTMLProps<HTMLDivElement> & {
+    onSelect: () => void;
+};
+
+export default function DecorationGridCreate(props: DecorationGridCreateProps) {
+    return <DecorationGridItem
+        {...props}
+        isSelected={false}
+    >
+        <PlusIcon />
+        <Text
+            variant="text-xs/normal"
+            color="header-primary"
+        >
+            {i18n.Messages.CREATE}
+        </Text>
+    </DecorationGridItem >;
+}
diff --git a/src/plugins/decor/ui/components/DecorationGridNone.tsx b/src/plugins/decor/ui/components/DecorationGridNone.tsx
new file mode 100644
index 000000000..b6114c674
--- /dev/null
+++ b/src/plugins/decor/ui/components/DecorationGridNone.tsx
@@ -0,0 +1,30 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { NoEntrySignIcon } from "@components/Icons";
+import { i18n, Text } from "@webpack/common";
+import { HTMLProps } from "react";
+
+import { DecorationGridItem } from ".";
+
+type DecorationGridNoneProps = HTMLProps<HTMLDivElement> & {
+    isSelected: boolean;
+    onSelect: () => void;
+};
+
+export default function DecorationGridNone(props: DecorationGridNoneProps) {
+    return <DecorationGridItem
+        {...props}
+    >
+        <NoEntrySignIcon />
+        <Text
+            variant="text-xs/normal"
+            color="header-primary"
+        >
+            {i18n.Messages.NONE}
+        </Text>
+    </DecorationGridItem >;
+}
diff --git a/src/plugins/decor/ui/components/Grid.tsx b/src/plugins/decor/ui/components/Grid.tsx
new file mode 100644
index 000000000..401802481
--- /dev/null
+++ b/src/plugins/decor/ui/components/Grid.tsx
@@ -0,0 +1,28 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { React } from "@webpack/common";
+
+import { cl } from "../";
+
+export interface GridProps<ItemT> {
+    renderItem: (item: ItemT) => JSX.Element;
+    getItemKey: (item: ItemT) => string;
+    itemKeyPrefix?: string;
+    items: Array<ItemT>;
+}
+
+export default function Grid<ItemT,>({ renderItem, getItemKey, itemKeyPrefix: ikp, items }: GridProps<ItemT>) {
+    return <div className={cl("sectioned-grid-list-grid")}>
+        {items.map(item =>
+            <React.Fragment
+                key={`${ikp ? `${ikp}-` : ""}${getItemKey(item)}`}
+            >
+                {renderItem(item)}
+            </React.Fragment>
+        )}
+    </div>;
+}
diff --git a/src/plugins/decor/ui/components/SectionedGridList.tsx b/src/plugins/decor/ui/components/SectionedGridList.tsx
new file mode 100644
index 000000000..9a6ec1b8d
--- /dev/null
+++ b/src/plugins/decor/ui/components/SectionedGridList.tsx
@@ -0,0 +1,38 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { classes } from "@utils/misc";
+import { findByPropsLazy } from "@webpack";
+import { React } from "@webpack/common";
+
+import { cl } from "../";
+import Grid, { GridProps } from "./Grid";
+
+const ScrollerClasses = findByPropsLazy("managedReactiveScroller");
+
+type Section<SectionT, ItemT> = SectionT & {
+    items: Array<ItemT>;
+};
+
+interface SectionedGridListProps<ItemT, SectionT, SectionU = Section<SectionT, ItemT>> extends Omit<GridProps<ItemT>, "items"> {
+    renderSectionHeader: (section: SectionU) => JSX.Element;
+    getSectionKey: (section: SectionU) => string;
+    sections: SectionU[];
+}
+
+export default function SectionedGridList<ItemT, SectionU,>(props: SectionedGridListProps<ItemT, SectionU>) {
+    return <div className={classes(cl("sectioned-grid-list-container"), ScrollerClasses.thin)}>
+        {props.sections.map(section => <div key={props.getSectionKey(section)} className={cl("sectioned-grid-list-section")}>
+            {props.renderSectionHeader(section)}
+            <Grid
+                renderItem={props.renderItem}
+                getItemKey={props.getItemKey}
+                itemKeyPrefix={props.getSectionKey(section)}
+                items={section.items}
+            />
+        </div>)}
+    </div>;
+}
diff --git a/src/plugins/decor/ui/components/index.ts b/src/plugins/decor/ui/components/index.ts
new file mode 100644
index 000000000..8f39a10ee
--- /dev/null
+++ b/src/plugins/decor/ui/components/index.ts
@@ -0,0 +1,33 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { findComponentByCode, LazyComponentWebpack } from "@webpack";
+import { React } from "@webpack/common";
+import type { ComponentType, HTMLProps, PropsWithChildren } from "react";
+
+import { AvatarDecoration } from "../..";
+
+type DecorationGridItemComponent = ComponentType<PropsWithChildren<HTMLProps<HTMLDivElement>> & {
+    onSelect: () => void,
+    isSelected: boolean,
+}>;
+
+export let DecorationGridItem: DecorationGridItemComponent;
+export const setDecorationGridItem = v => DecorationGridItem = v;
+
+export const AvatarDecorationModalPreview = LazyComponentWebpack(() => {
+    const component = findComponentByCode("AvatarDecorationModalPreview");
+    return React.memo(component);
+});
+
+type DecorationGridDecorationComponent = React.ComponentType<HTMLProps<HTMLDivElement> & {
+    avatarDecoration: AvatarDecoration;
+    onSelect: () => void,
+    isSelected: boolean,
+}>;
+
+export let DecorationGridDecoration: DecorationGridDecorationComponent;
+export const setDecorationGridDecoration = v => DecorationGridDecoration = v;
diff --git a/src/plugins/decor/ui/index.ts b/src/plugins/decor/ui/index.ts
new file mode 100644
index 000000000..52b169d77
--- /dev/null
+++ b/src/plugins/decor/ui/index.ts
@@ -0,0 +1,13 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { classNameFactory } from "@api/Styles";
+import { extractAndLoadChunksLazy } from "@webpack";
+
+export const cl = classNameFactory("vc-decor-");
+
+export const requireAvatarDecorationModal = extractAndLoadChunksLazy(["openAvatarDecorationModal:"]);
+export const requireCreateStickerModal = extractAndLoadChunksLazy(["stickerInspected]:"]);
diff --git a/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx b/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx
new file mode 100644
index 000000000..bed007174
--- /dev/null
+++ b/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx
@@ -0,0 +1,270 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Flex } from "@components/Flex";
+import { openInviteModal } from "@utils/discord";
+import { Margins } from "@utils/margins";
+import { classes } from "@utils/misc";
+import { closeAllModals, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
+import { Alerts, Button, FluxDispatcher, Forms, GuildStore, NavigationRouter, Parser, Text, Tooltip, useEffect, UserStore, UserUtils, useState } from "@webpack/common";
+import { User } from "discord-types/general";
+
+import { Decoration, getPresets, Preset } from "../../lib/api";
+import { GUILD_ID, INVITE_KEY } from "../../lib/constants";
+import { useAuthorizationStore } from "../../lib/stores/AuthorizationStore";
+import { useCurrentUserDecorationsStore } from "../../lib/stores/CurrentUserDecorationsStore";
+import { decorationToAvatarDecoration } from "../../lib/utils/decoration";
+import { cl, requireAvatarDecorationModal } from "../";
+import { AvatarDecorationModalPreview } from "../components";
+import DecorationGridCreate from "../components/DecorationGridCreate";
+import DecorationGridNone from "../components/DecorationGridNone";
+import DecorDecorationGridDecoration from "../components/DecorDecorationGridDecoration";
+import SectionedGridList from "../components/SectionedGridList";
+import { openCreateDecorationModal } from "./CreateDecorationModal";
+
+const UserSummaryItem = findComponentByCodeLazy("defaultRenderUser", "showDefaultAvatarsForNullUsers");
+const DecorationModalStyles = findByPropsLazy("modalFooterShopButton");
+
+function usePresets() {
+    const [presets, setPresets] = useState<Preset[]>([]);
+    useEffect(() => { getPresets().then(setPresets); }, []);
+    return presets;
+}
+
+interface Section {
+    title: string;
+    subtitle?: string;
+    sectionKey: string;
+    items: ("none" | "create" | Decoration)[];
+    authorIds?: string[];
+}
+
+function SectionHeader({ section }: { section: Section; }) {
+    const hasSubtitle = typeof section.subtitle !== "undefined";
+    const hasAuthorIds = typeof section.authorIds !== "undefined";
+
+    const [authors, setAuthors] = useState<User[]>([]);
+
+    useEffect(() => {
+        (async () => {
+            if (!section.authorIds) return;
+
+            for (const authorId of section.authorIds) {
+                const author = UserStore.getUser(authorId) ?? await UserUtils.getUser(authorId);
+                setAuthors(authors => [...authors, author]);
+            }
+        })();
+    }, [section.authorIds]);
+
+    return <div>
+        <Flex>
+            <Forms.FormTitle style={{ flexGrow: 1 }}>{section.title}</Forms.FormTitle>
+            {hasAuthorIds && <UserSummaryItem
+                users={authors}
+                guildId={undefined}
+                renderIcon={false}
+                max={5}
+                showDefaultAvatarsForNullUsers
+                size={16}
+                showUserPopout
+                className={Margins.bottom8}
+            />
+            }
+        </Flex>
+        {hasSubtitle &&
+            <Forms.FormText type="description" className={Margins.bottom8}>
+                {section.subtitle}
+            </Forms.FormText>
+        }
+    </div>;
+}
+
+export default function ChangeDecorationModal(props: any) {
+    // undefined = not trying, null = none, Decoration = selected
+    const [tryingDecoration, setTryingDecoration] = useState<Decoration | null | undefined>(undefined);
+    const isTryingDecoration = typeof tryingDecoration !== "undefined";
+
+    const avatarDecorationOverride = tryingDecoration != null ? decorationToAvatarDecoration(tryingDecoration) : tryingDecoration;
+
+    const {
+        decorations,
+        selectedDecoration,
+        fetch: fetchUserDecorations,
+        select: selectDecoration
+    } = useCurrentUserDecorationsStore();
+
+    useEffect(() => {
+        fetchUserDecorations();
+    }, []);
+
+    const activeSelectedDecoration = isTryingDecoration ? tryingDecoration : selectedDecoration;
+    const activeDecorationHasAuthor = typeof activeSelectedDecoration?.authorId !== "undefined";
+    const hasDecorationPendingReview = decorations.some(d => d.reviewed === false);
+
+    const presets = usePresets();
+    const presetDecorations = presets.flatMap(preset => preset.decorations);
+
+    const activeDecorationPreset = presets.find(preset => preset.id === activeSelectedDecoration?.presetId);
+    const isActiveDecorationPreset = typeof activeDecorationPreset !== "undefined";
+
+    const ownDecorations = decorations.filter(d => !presetDecorations.some(p => p.hash === d.hash));
+
+    const data = [
+        {
+            title: "Your Decorations",
+            sectionKey: "ownDecorations",
+            items: ["none", ...ownDecorations, "create"]
+        },
+        ...presets.map(preset => ({
+            title: preset.name,
+            subtitle: preset.description || undefined,
+            sectionKey: `preset-${preset.id}`,
+            items: preset.decorations,
+            authorIds: preset.authorIds
+        }))
+    ] as Section[];
+
+    return <ModalRoot
+        {...props}
+        size={ModalSize.DYNAMIC}
+        className={DecorationModalStyles.modal}
+    >
+        <ModalHeader separator={false} className={cl("modal-header")}>
+            <Text
+                color="header-primary"
+                variant="heading-lg/semibold"
+                tag="h1"
+                style={{ flexGrow: 1 }}
+            >
+                Change Decoration
+            </Text>
+            <ModalCloseButton onClick={props.onClose} />
+        </ModalHeader>
+        <ModalContent
+            className={cl("change-decoration-modal-content")}
+            scrollbarType="none"
+        >
+            <SectionedGridList
+                renderItem={item => {
+                    if (typeof item === "string") {
+                        switch (item) {
+                            case "none":
+                                return <DecorationGridNone
+                                    className={cl("change-decoration-modal-decoration")}
+                                    isSelected={activeSelectedDecoration === null}
+                                    onSelect={() => setTryingDecoration(null)}
+                                />;
+                            case "create":
+                                return <Tooltip text="You already have a decoration pending review" shouldShow={hasDecorationPendingReview}>
+                                    {tooltipProps => <DecorationGridCreate
+                                        className={cl("change-decoration-modal-decoration")}
+                                        {...tooltipProps}
+                                        onSelect={!hasDecorationPendingReview ? openCreateDecorationModal : () => { }}
+                                    />}
+                                </Tooltip>;
+                        }
+                    } else {
+                        return <Tooltip text={"Pending review"} shouldShow={item.reviewed === false}>
+                            {tooltipProps => (
+                                <DecorDecorationGridDecoration
+                                    {...tooltipProps}
+                                    className={cl("change-decoration-modal-decoration")}
+                                    onSelect={item.reviewed !== false ? () => setTryingDecoration(item) : () => { }}
+                                    isSelected={activeSelectedDecoration?.hash === item.hash}
+                                    decoration={item}
+                                />
+                            )}
+                        </Tooltip>;
+                    }
+                }}
+                getItemKey={item => typeof item === "string" ? item : item.hash}
+                getSectionKey={section => section.sectionKey}
+                renderSectionHeader={section => <SectionHeader section={section} />}
+                sections={data}
+            />
+            <div className={cl("change-decoration-modal-preview")}>
+                <AvatarDecorationModalPreview
+                    avatarDecorationOverride={avatarDecorationOverride}
+                    user={UserStore.getCurrentUser()}
+                />
+                {isActiveDecorationPreset && <Forms.FormTitle className="">Part of the {activeDecorationPreset.name} Preset</Forms.FormTitle>}
+                {typeof activeSelectedDecoration === "object" &&
+                    <Text
+                        variant="text-sm/semibold"
+                        color="header-primary"
+                    >
+                        {activeSelectedDecoration?.alt}
+                    </Text>
+                }
+                {activeDecorationHasAuthor && <Text key={`createdBy-${activeSelectedDecoration.authorId}`}>Created by {Parser.parse(`<@${activeSelectedDecoration.authorId}>`)}</Text>}
+            </div>
+        </ModalContent>
+        <ModalFooter className={classes(cl("change-decoration-modal-footer", cl("modal-footer")))}>
+            <div className={cl("change-decoration-modal-footer-btn-container")}>
+                <Button
+                    onClick={() => {
+                        selectDecoration(tryingDecoration!).then(props.onClose);
+                    }}
+                    disabled={!isTryingDecoration}
+                >
+                    Apply
+                </Button>
+                <Button
+                    onClick={props.onClose}
+                    color={Button.Colors.PRIMARY}
+                    look={Button.Looks.LINK}
+                >
+                    Cancel
+                </Button>
+            </div>
+            <div className={cl("change-decoration-modal-footer-btn-container")}>
+                <Button
+                    onClick={() => Alerts.show({
+                        title: "Log Out",
+                        body: "Are you sure you want to log out of Decor?",
+                        confirmText: "Log Out",
+                        confirmColor: cl("danger-btn"),
+                        cancelText: "Cancel",
+                        onConfirm() {
+                            useAuthorizationStore.getState().remove(UserStore.getCurrentUser().id);
+                            props.onClose();
+                        }
+                    })}
+                    color={Button.Colors.PRIMARY}
+                    look={Button.Looks.LINK}
+                >
+                    Log Out
+                </Button>
+                <Tooltip text="Join Decor's Discord Server for notifications on your decoration's review, and when new presets are released">
+                    {tooltipProps => <Button
+                        {...tooltipProps}
+                        onClick={async () => {
+                            if (!GuildStore.getGuild(GUILD_ID)) {
+                                const inviteAccepted = await openInviteModal(INVITE_KEY);
+                                if (inviteAccepted) {
+                                    closeAllModals();
+                                    FluxDispatcher.dispatch({ type: "LAYER_POP_ALL" });
+                                }
+                            } else {
+                                props.onClose();
+                                FluxDispatcher.dispatch({ type: "LAYER_POP_ALL" });
+                                NavigationRouter.transitionToGuild(GUILD_ID);
+                            }
+                        }}
+                        color={Button.Colors.PRIMARY}
+                        look={Button.Looks.LINK}
+                    >
+                        Discord Server
+                    </Button>}
+                </Tooltip>
+            </div>
+        </ModalFooter>
+    </ModalRoot>;
+}
+
+export const openChangeDecorationModal = () =>
+    requireAvatarDecorationModal().then(() => openModal(props => <ChangeDecorationModal {...props} />));
diff --git a/src/plugins/decor/ui/modals/CreateDecorationModal.tsx b/src/plugins/decor/ui/modals/CreateDecorationModal.tsx
new file mode 100644
index 000000000..a5937b0dd
--- /dev/null
+++ b/src/plugins/decor/ui/modals/CreateDecorationModal.tsx
@@ -0,0 +1,163 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Link } from "@components/Link";
+import { openInviteModal } from "@utils/discord";
+import { Margins } from "@utils/margins";
+import { closeAllModals, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
+import { Button, FluxDispatcher, Forms, GuildStore, NavigationRouter, Text, TextInput, useEffect, useMemo, UserStore, useState } from "@webpack/common";
+
+import { GUILD_ID, INVITE_KEY, RAW_SKU_ID } from "../../lib/constants";
+import { useCurrentUserDecorationsStore } from "../../lib/stores/CurrentUserDecorationsStore";
+import { cl, requireAvatarDecorationModal, requireCreateStickerModal } from "../";
+import { AvatarDecorationModalPreview } from "../components";
+
+
+const DecorationModalStyles = findByPropsLazy("modalFooterShopButton");
+
+const FileUpload = findComponentByCodeLazy("fileUploadInput,");
+
+function useObjectURL(object: Blob | MediaSource | null) {
+    const [url, setUrl] = useState<string | null>(null);
+
+    useEffect(() => {
+        if (!object) return;
+
+        const objectUrl = URL.createObjectURL(object);
+        setUrl(objectUrl);
+
+        return () => {
+            URL.revokeObjectURL(objectUrl);
+            setUrl(null);
+        };
+    }, [object]);
+
+    return url;
+}
+
+export default function CreateDecorationModal(props) {
+    const [name, setName] = useState("");
+    const [file, setFile] = useState<File | null>(null);
+    const [submitting, setSubmitting] = useState(false);
+    const [error, setError] = useState<Error | null>(null);
+
+    useEffect(() => {
+        if (error) setError(null);
+    }, [file]);
+
+    const { create: createDecoration } = useCurrentUserDecorationsStore();
+
+    const fileUrl = useObjectURL(file);
+
+    const decoration = useMemo(() => fileUrl ? { asset: fileUrl, skuId: RAW_SKU_ID } : null, [fileUrl]);
+
+    return <ModalRoot
+        {...props}
+        size={ModalSize.MEDIUM}
+        className={DecorationModalStyles.modal}
+    >
+        <ModalHeader separator={false} className={cl("modal-header")}>
+            <Text
+                color="header-primary"
+                variant="heading-lg/semibold"
+                tag="h1"
+                style={{ flexGrow: 1 }}
+            >
+                Create Decoration
+            </Text>
+            <ModalCloseButton onClick={props.onClose} />
+        </ModalHeader>
+        <ModalContent
+            className={cl("create-decoration-modal-content")}
+            scrollbarType="none"
+        >
+            <div className={cl("create-decoration-modal-form-preview-container")}>
+                <div className={cl("create-decoration-modal-form")}>
+                    {error !== null && <Text color="text-danger" variant="text-xs/normal">{error.message}</Text>}
+                    <Forms.FormSection title="File">
+                        <FileUpload
+                            filename={file?.name}
+                            placeholder="Choose a file"
+                            buttonText="Browse"
+                            filters={[{ name: "Decoration file", extensions: ["png", "apng"] }]}
+                            onFileSelect={setFile}
+                        />
+                        <Forms.FormText type="description" className={Margins.top8}>
+                            File should be APNG or PNG.
+                        </Forms.FormText>
+                    </Forms.FormSection>
+                    <Forms.FormSection title="Name">
+                        <TextInput
+                            placeholder="Companion Cube"
+                            value={name}
+                            onChange={setName}
+                        />
+                        <Forms.FormText type="description" className={Margins.top8}>
+                            This name will be used when referring to this decoration.
+                        </Forms.FormText>
+                    </Forms.FormSection>
+                </div>
+                <div>
+                    <AvatarDecorationModalPreview
+                        avatarDecorationOverride={decoration}
+                        user={UserStore.getCurrentUser()}
+                    />
+                </div>
+            </div>
+            <Forms.FormText type="description" className={Margins.bottom16}>
+                Make sure your decoration does not violate <Link
+                    href="https://github.com/decor-discord/.github/blob/main/GUIDELINES.md"
+                >
+                    the guidelines
+                </Link> before creating your decoration.
+                <br />You can receive updates on your decoration's review by joining <Link
+                    href={`https://discord.gg/${INVITE_KEY}`}
+                    onClick={async e => {
+                        e.preventDefault();
+                        if (!GuildStore.getGuild(GUILD_ID)) {
+                            const inviteAccepted = await openInviteModal(INVITE_KEY);
+                            if (inviteAccepted) {
+                                closeAllModals();
+                                FluxDispatcher.dispatch({ type: "LAYER_POP_ALL" });
+                            }
+                        } else {
+                            closeAllModals();
+                            FluxDispatcher.dispatch({ type: "LAYER_POP_ALL" });
+                            NavigationRouter.transitionToGuild(GUILD_ID);
+                        }
+                    }}
+                >
+                    Decor's Discord server
+                </Link>.
+            </Forms.FormText>
+        </ModalContent>
+        <ModalFooter className={cl("modal-footer")}>
+            <Button
+                onClick={() => {
+                    setSubmitting(true);
+                    createDecoration({ alt: name, file: file! })
+                        .then(props.onClose).catch(e => { setSubmitting(false); setError(e); });
+                }}
+                disabled={!file || !name}
+                submitting={submitting}
+            >
+                Create
+            </Button>
+            <Button
+                onClick={props.onClose}
+                color={Button.Colors.PRIMARY}
+                look={Button.Looks.LINK}
+            >
+                Cancel
+            </Button>
+        </ModalFooter>
+    </ModalRoot>;
+}
+
+export const openCreateDecorationModal = () =>
+    Promise.all([requireAvatarDecorationModal(), requireCreateStickerModal()])
+        .then(() => openModal(props => <CreateDecorationModal {...props} />));
diff --git a/src/plugins/decor/ui/styles.css b/src/plugins/decor/ui/styles.css
new file mode 100644
index 000000000..ff10c82fa
--- /dev/null
+++ b/src/plugins/decor/ui/styles.css
@@ -0,0 +1,80 @@
+.vc-decor-danger-btn {
+    color: var(--white-500);
+    background-color: var(--button-danger-background);
+}
+
+.vc-decor-change-decoration-modal-content {
+    position: relative;
+    display: flex;
+    border-radius: 5px 5px 0 0;
+    padding: 0 16px;
+    gap: 4px
+}
+
+.vc-decor-change-decoration-modal-preview {
+    display: flex;
+    flex-direction: column;
+    margin-top: 24px;
+    gap: 8px;
+    max-width: 280px;
+}
+
+.vc-decor-change-decoration-modal-decoration {
+    width: 80px;
+    height: 80px;
+}
+
+.vc-decor-change-decoration-modal-footer {
+    justify-content: space-between;
+}
+
+.vc-decor-change-decoration-modal-footer-btn-container {
+    display: flex;
+    flex-direction: row-reverse;
+}
+
+.vc-decor-create-decoration-modal-content {
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+    padding: 0 16px;
+}
+
+.vc-decor-create-decoration-modal-form-preview-container {
+    display: flex;
+    gap: 16px;
+}
+
+.vc-decor-modal-header {
+    padding: 16px;
+}
+
+.vc-decor-modal-footer {
+    padding: 16px;
+}
+
+.vc-decor-create-decoration-modal-form {
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    gap: 16px;
+}
+
+.vc-decor-sectioned-grid-list-container {
+    display: flex;
+    flex-direction: column;
+    overflow: hidden scroll;
+    max-height: 512px;
+    width: 352px; /* ((80 + 8 (grid gap)) * desired columns) (scrolled takes the extra 8 padding off conveniently) */
+    gap: 12px;
+}
+
+.vc-decor-sectioned-grid-list-grid {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px
+}
+
+.vc-decor-section-remove-margin {
+    margin-bottom: 0;
+}
diff --git a/src/utils/cloud.tsx b/src/utils/cloud.tsx
index 029306227..f56c78dc5 100644
--- a/src/utils/cloud.tsx
+++ b/src/utils/cloud.tsx
@@ -19,8 +19,7 @@
 import * as DataStore from "@api/DataStore";
 import { showNotification } from "@api/Notifications";
 import { Settings } from "@api/Settings";
-import { findByProps } from "@webpack";
-import { UserStore } from "@webpack/common";
+import { OAuth2AuthorizeModal, UserStore } from "@webpack/common";
 
 import { Logger } from "./Logger";
 import { openModal } from "./modal";
@@ -91,8 +90,6 @@ export async function authorizeCloud() {
         return;
     }
 
-    const { OAuth2AuthorizeModal } = findByProps("OAuth2AuthorizeModal");
-
     openModal((props: any) => <OAuth2AuthorizeModal
         {...props}
         scopes={["identify"]}
diff --git a/src/utils/discord.tsx b/src/utils/discord.tsx
index 41e18f9d3..788f0add7 100644
--- a/src/utils/discord.tsx
+++ b/src/utils/discord.tsx
@@ -17,7 +17,7 @@
 */
 
 import { MessageObject } from "@api/MessageEvents";
-import { findByPropsLazy } from "@webpack";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
 import { ChannelStore, ComponentDispatch, FluxDispatcher, GuildStore, MaskedLink, ModalImageClasses, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
 import { Guild, Message, User } from "discord-types/general";
 
@@ -27,6 +27,13 @@ export const MessageActions = findByPropsLazy("editMessage", "sendMessage");
 export const UserProfileActions = findByPropsLazy("openUserProfileModal", "closeUserProfileModal");
 export const InviteActions = findByPropsLazy("resolveInvite");
 
+const InviteModalStore = findStoreLazy("InviteModalStore");
+
+/**
+ * Open the invite modal
+ * @param code The invite code
+ * @returns Whether the invite was accepted
+ */
 export async function openInviteModal(code: string) {
     const { invite } = await InviteActions.resolveInvite(code, "Desktop Modal");
     if (!invite) throw new Error("Invalid invite: " + code);
@@ -37,6 +44,21 @@ export async function openInviteModal(code: string) {
         code,
         context: "APP"
     });
+
+    return new Promise<boolean>(r => {
+        let onClose: () => void, onAccept: () => void;
+        let inviteAccepted = false;
+
+        FluxDispatcher.subscribe("INVITE_ACCEPT", onAccept = () => {
+            inviteAccepted = true;
+        });
+
+        FluxDispatcher.subscribe("INVITE_MODAL_CLOSE", onClose = () => {
+            FluxDispatcher.unsubscribe("INVITE_MODAL_CLOSE", onClose);
+            FluxDispatcher.unsubscribe("INVITE_ACCEPT", onAccept);
+            r(inviteAccepted);
+        });
+    });
 }
 
 export function getCurrentChannel() {
diff --git a/src/webpack/common/components.ts b/src/webpack/common/components.ts
index e44b1c9f6..d7bb5d759 100644
--- a/src/webpack/common/components.ts
+++ b/src/webpack/common/components.ts
@@ -17,7 +17,7 @@
 */
 
 // eslint-disable-next-line path-alias/no-relative
-import { filters, waitFor } from "@webpack";
+import { filters, findByPropsLazy, waitFor } from "@webpack";
 
 import { waitForComponent } from "./internal";
 import * as t from "./types/components";
@@ -55,6 +55,8 @@ export const MaskedLink = waitForComponent<t.MaskedLink>("MaskedLink", m => m?.t
 export const Timestamp = waitForComponent<t.Timestamp>("Timestamp", filters.byCode(".Messages.MESSAGE_EDITED_TIMESTAMP_A11Y_LABEL.format"));
 export const Flex = waitForComponent<t.Flex>("Flex", ["Justify", "Align", "Wrap"]);
 
+export const { OAuth2AuthorizeModal } = findByPropsLazy("OAuth2AuthorizeModal");
+
 waitFor(["FormItem", "Button"], m => {
     ({ useToken, Card, Button, FormSwitch: Switch, Tooltip, TextInput, TextArea, Text, Select, SearchableSelect, Slider, ButtonLooks, TabBar, Popout, Dialog, Paginator, ScrollerThin, Clickable, Avatar } = m);
     Forms = m;
diff --git a/src/webpack/common/types/components.d.ts b/src/webpack/common/types/components.d.ts
index 5d5424fe2..b9bc434c6 100644
--- a/src/webpack/common/types/components.d.ts
+++ b/src/webpack/common/types/components.d.ts
@@ -126,6 +126,7 @@ export type Button = ComponentType<PropsWithChildren<Omit<HTMLProps<HTMLButtonEl
 
     buttonRef?: Ref<HTMLButtonElement>;
     focusProps?: any;
+    submitting?: boolean;
 
     submittingStartedLabel?: string;
     submittingFinishedLabel?: string;
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index cef4d51d6..f5d2a9666 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -19,7 +19,7 @@
 import type { Channel, User } from "discord-types/general";
 
 // eslint-disable-next-line path-alias/no-relative
-import { _resolveReady, findByPropsLazy, findLazy, waitFor } from "../webpack";
+import { _resolveReady, filters, findByCodeLazy, findByPropsLazy, findLazy, waitFor } from "../webpack";
 import type * as t from "./types/utils";
 
 export let FluxDispatcher: t.FluxDispatcher;
@@ -127,5 +127,9 @@ export const NavigationRouter: t.NavigationRouter = findByPropsLazy("transitionT
 export let SettingsRouter: any;
 waitFor(["open", "saveAccountChanges"], m => SettingsRouter = m);
 
-const { Permissions } = findLazy(m => typeof m.Permissions?.ADMINISTRATOR === "bigint") as { Permissions: t.PermissionsBits; };
-export { Permissions as PermissionsBits };
+export const { Permissions: PermissionsBits } = findLazy(m => typeof m.Permissions?.ADMINISTRATOR === "bigint") as { Permissions: t.PermissionsBits; };
+
+export const zustandCreate: typeof import("zustand").default = findByCodeLazy("will be removed in v4");
+
+const persistFilter = filters.byCode("[zustand persist middleware]");
+export const { persist: zustandPersist }: typeof import("zustand/middleware") = findLazy(m => m.persist && persistFilter(m.persist));
diff --git a/tsconfig.json b/tsconfig.json
index db5407455..4563f3f86 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,6 +2,7 @@
     "compilerOptions": {
         "allowSyntheticDefaultImports": true,
         "esModuleInterop": true,
+        "skipLibCheck": true,
         "lib": [
             "DOM",
             "DOM.Iterable",

From 66dbe7ef07c69f8c9963c947c5f1eac03b0e1222 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 30 Nov 2023 02:26:18 -0300
Subject: [PATCH 226/632] Fix reporter testing for extractAndLoadChunks

---
 scripts/generateReport.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 719a84568..c1a4f711e 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -410,7 +410,7 @@ function runTime(token: string) {
                         const [code, matcher] = args;
 
                         const module = Vencord.Webpack.findModuleFactory(...code);
-                        if (module) result = module.toString().match(matcher);
+                        if (module) result = module.toString().match(Vencord.Util.canonicalizeMatch(matcher));
                     } else {
                         // @ts-ignore
                         result = Vencord.Webpack[method](...args);

From 8e1546be000748ac647d5a1950e9c5750a016b27 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 30 Nov 2023 02:38:12 -0300
Subject: [PATCH 227/632] Include ignored Discord errors in summary

---
 scripts/generateReport.ts | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index c1a4f711e..a75a5985f 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -105,7 +105,14 @@ async function printReport() {
 
     console.log();
 
-    report.otherErrors = report.otherErrors.filter(e => !IGNORED_DISCORD_ERRORS.some(regex => e.match(regex)));
+    const ignoredErrors = [] as string[];
+    report.otherErrors = report.otherErrors.filter(e => {
+        if (IGNORED_DISCORD_ERRORS.some(regex => e.match(regex))) {
+            ignoredErrors.push(e);
+            return false;
+        }
+        return true;
+    });
 
     console.log("## Discord Errors");
     report.otherErrors.forEach(e => {
@@ -114,6 +121,13 @@ async function printReport() {
 
     console.log();
 
+    console.log("## Ignored Discord Errors");
+    ignoredErrors.forEach(e => {
+        console.log(`- ${toCodeBlock(e)}`);
+    });
+
+    console.log();
+
     if (process.env.DISCORD_WEBHOOK) {
         await fetch(process.env.DISCORD_WEBHOOK, {
             method: "POST",

From fccdd3dc08fb45fb9dad79d2dc8a0ac5ddb120f9 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 30 Nov 2023 17:28:53 +0100
Subject: [PATCH 228/632] migrate to new badge api

we used to store badges on the discord cdn.
since discord is now making
it harder to use their cdn for such purposes (due to expiring links), we
are forced to stop using it
thus, badges are now stored on our server, accessible via
https://badges.vencord.dev. The full list of badges is now at https://badges.vencord.dev/badges.json
---
 src/plugins/_api/badges.tsx | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/plugins/_api/badges.tsx b/src/plugins/_api/badges.tsx
index 11e843db4..16b244a19 100644
--- a/src/plugins/_api/badges.tsx
+++ b/src/plugins/_api/badges.tsx
@@ -22,14 +22,13 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { Heart } from "@components/Heart";
 import { Devs } from "@utils/constants";
-import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
 import { isPluginDev } from "@utils/misc";
 import { closeModal, Modals, openModal } from "@utils/modal";
 import definePlugin from "@utils/types";
 import { Forms, Toasts } from "@webpack/common";
 
-const CONTRIBUTOR_BADGE = "https://cdn.discordapp.com/attachments/1033680203433660458/1092089947126780035/favicon.png";
+const CONTRIBUTOR_BADGE = "https://vencord.dev/assets/favicon.png";
 
 const ContributorBadge: ProfileBadge = {
     description: "Vencord Contributor",
@@ -45,7 +44,7 @@ const ContributorBadge: ProfileBadge = {
     link: "https://github.com/Vendicated/Vencord"
 };
 
-let DonorBadges = {} as Record<string, Pick<ProfileBadge, "image" | "description">[]>;
+let DonorBadges = {} as Record<string, Array<Record<"tooltip" | "badge", string>>>;
 
 async function loadBadges(noCache = false) {
     DonorBadges = {};
@@ -54,19 +53,8 @@ async function loadBadges(noCache = false) {
     if (noCache)
         init.cache = "no-cache";
 
-    const badges = await fetch("https://gist.githubusercontent.com/Vendicated/51a3dd775f6920429ec6e9b735ca7f01/raw/badges.csv", init)
-        .then(r => r.text());
-
-    const lines = badges.trim().split("\n");
-    if (lines.shift() !== "id,tooltip,image") {
-        new Logger("BadgeAPI").error("Invalid badges.csv file!");
-        return;
-    }
-
-    for (const line of lines) {
-        const [id, description, image] = line.split(",");
-        (DonorBadges[id] ??= []).push({ image, description });
-    }
+    DonorBadges = await fetch("https://badges.vencord.dev/badges.json", init)
+        .then(r => r.json());
 }
 
 export default definePlugin({
@@ -127,7 +115,8 @@ export default definePlugin({
 
     getDonorBadges(userId: string) {
         return DonorBadges[userId]?.map(badge => ({
-            ...badge,
+            image: badge.badge,
+            description: badge.tooltip,
             position: BadgePosition.START,
             props: {
                 style: {

From 3e7d9462961ba2d1291cb68b9d5618c46c568451 Mon Sep 17 00:00:00 2001
From: megumin <megumin.bakaretsurie@gmail.com>
Date: Thu, 30 Nov 2023 19:32:48 +0000
Subject: [PATCH 229/632] fix(SpotifyControls): Requests double-sending when
 using Spotify Connect (#2023)

---
 src/plugins/spotifyControls/index.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/plugins/spotifyControls/index.tsx b/src/plugins/spotifyControls/index.tsx
index 829f7850a..cfb352efe 100644
--- a/src/plugins/spotifyControls/index.tsx
+++ b/src/plugins/spotifyControls/index.tsx
@@ -55,13 +55,19 @@ export default definePlugin({
                 replace: "return [$self.renderPlayer(),$1]"
             }
         },
-        // Adds POST and a Marker to the SpotifyAPI (so we can easily find it)
         {
             find: ".PLAYER_DEVICES",
-            replacement: {
+            replacement: [{
+                // Adds POST and a Marker to the SpotifyAPI (so we can easily find it)
                 match: /get:(\i)\.bind\(null,(\i\.\i)\.get\)/,
                 replace: "post:$1.bind(null,$2.post),$&"
-            }
+            },
+            {
+                // Spotify Connect API returns status 202 instead of 204 when skipping tracks.
+                // Discord rejects 202 which causes the request to send twice. This patch prevents this.
+                match: /202===\i\.status/,
+                replace: "false",
+            }]
         },
         // Discord doesn't give you the repeat kind, only a boolean
         {

From 80016180b612718e7a73b6a24169e8ccfec5e166 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 1 Dec 2023 16:39:15 -0300
Subject: [PATCH 230/632] FixImagesQuality: no longer make gifs play when
 autoplay is off

---
 src/plugins/fixImagesQuality/index.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/fixImagesQuality/index.ts b/src/plugins/fixImagesQuality/index.ts
index d94c8e3b2..4acd9a921 100644
--- a/src/plugins/fixImagesQuality/index.ts
+++ b/src/plugins/fixImagesQuality/index.ts
@@ -14,10 +14,12 @@ export default definePlugin({
     patches: [
         {
             find: "handleImageLoad=",
-            replacement: {
-                match: /(?<=getSrc\(\i\){.+?format:)\i/,
-                replace: "null"
-            }
+            replacement: [
+                {
+                    match: /(?<=getSrc\(\i\){.+?return )\i\.SUPPORTS_WEBP.+?:(?=\i&&\(\i="png"\))/,
+                    replace: ""
+                }
+            ]
         }
     ]
 });

From 9dd00fb766f6fdf74b037a76a16b43a0edf8866a Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 1 Dec 2023 23:06:18 -0300
Subject: [PATCH 231/632] Fix SuperReactionTweaks patch

---
 src/plugins/superReactionTweaks/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/superReactionTweaks/index.ts b/src/plugins/superReactionTweaks/index.ts
index 2652eef07..0e58eb0a8 100644
--- a/src/plugins/superReactionTweaks/index.ts
+++ b/src/plugins/superReactionTweaks/index.ts
@@ -46,10 +46,10 @@ export default definePlugin({
             }
         },
         {
-            find: ".hasAvailableBurstCurrency)",
+            find: ".trackEmojiSearchEmpty,200",
             replacement: {
-                match: /(?<=\.useBurstReactionsExperiment.{0,20})useState\(!1\)(?=.+?(\i===\i\.EmojiIntention.REACTION))/,
-                replace: "useState($self.settings.store.superReactByDefault && $1)"
+                match: /(\.trackEmojiSearchEmpty,200(?=.+?isBurstReaction:(\i).+?(\i===\i\.EmojiIntention.REACTION)).+?\[\2,\i\]=\i\.useState\().+?\)/,
+                replace: (_, rest, isBurstReactionVariable, isReactionIntention) => `${rest}$self.settings.store.superReactByDefault&&${isReactionIntention})`
             }
         }
     ],

From 08036f7af28dba4978abed93f9a7b6af5cf979cb Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 6 Dec 2023 01:37:42 -0300
Subject: [PATCH 232/632] convert non lazy finds to test with reporter

---
 src/plugins/muteNewGuild/index.tsx       | 6 ++++--
 src/plugins/webContextMenus.web/index.ts | 6 +++---
 src/utils/modal.tsx                      | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/plugins/muteNewGuild/index.tsx b/src/plugins/muteNewGuild/index.tsx
index 7586830bb..08c558a95 100644
--- a/src/plugins/muteNewGuild/index.tsx
+++ b/src/plugins/muteNewGuild/index.tsx
@@ -19,7 +19,9 @@
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByProps } from "@webpack";
+import { findByPropsLazy } from "@webpack";
+
+const { updateGuildNotificationSettings } = findByPropsLazy("updateGuildNotificationSettings");
 
 const settings = definePluginSettings({
     guild: {
@@ -63,7 +65,7 @@ export default definePlugin({
 
     handleMute(guildId: string | null) {
         if (guildId === "@me" || guildId === "null" || guildId == null) return;
-        findByProps("updateGuildNotificationSettings").updateGuildNotificationSettings(guildId,
+        updateGuildNotificationSettings(guildId,
             {
                 muted: settings.store.guild,
                 suppress_everyone: settings.store.everyone,
diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index cf50bb86e..eb076dfd0 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -20,9 +20,11 @@ import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { saveFile } from "@utils/web";
-import { findByProps } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { Clipboard, ComponentDispatch } from "@webpack/common";
 
+const ctxMenuCallbacks = findByPropsLazy("contextMenuCallbackNative");
+
 async function fetchImage(url: string) {
     const res = await fetch(url);
     if (res.status !== 200) return;
@@ -55,7 +57,6 @@ export default definePlugin({
 
     start() {
         if (settings.store.addBack) {
-            const ctxMenuCallbacks = findByProps("contextMenuCallbackNative");
             window.removeEventListener("contextmenu", ctxMenuCallbacks.contextMenuCallbackWeb);
             window.addEventListener("contextmenu", ctxMenuCallbacks.contextMenuCallbackNative);
             this.changedListeners = true;
@@ -64,7 +65,6 @@ export default definePlugin({
 
     stop() {
         if (this.changedListeners) {
-            const ctxMenuCallbacks = findByProps("contextMenuCallbackNative");
             window.removeEventListener("contextmenu", ctxMenuCallbacks.contextMenuCallbackNative);
             window.addEventListener("contextmenu", ctxMenuCallbacks.contextMenuCallbackWeb);
         }
diff --git a/src/utils/modal.tsx b/src/utils/modal.tsx
index 6758a1a1a..b4d0f59fb 100644
--- a/src/utils/modal.tsx
+++ b/src/utils/modal.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { findByProps, findByPropsLazy } from "@webpack";
+import { findByPropsLazy, findExportedComponentLazy } from "@webpack";
 import type { ComponentType, PropsWithChildren, ReactNode, Ref } from "react";
 
 import { LazyComponent } from "./react";
@@ -118,7 +118,7 @@ export type ImageModal = ComponentType<{
     shouldHideMediaOptions?: boolean;
 }>;
 
-export const ImageModal = LazyComponent(() => findByProps("ImageModal").ImageModal as ImageModal);
+export const ImageModal = findExportedComponentLazy("ImageModal") as ImageModal;
 
 export const ModalRoot = LazyComponent(() => Modals.ModalRoot);
 export const ModalHeader = LazyComponent(() => Modals.ModalHeader);

From cf7028331c152da10d64e810238157bf6b267ec4 Mon Sep 17 00:00:00 2001
From: Syncx <47534062+Syncxv@users.noreply.github.com>
Date: Thu, 7 Dec 2023 02:55:29 +0530
Subject: [PATCH 233/632] Native Folder Support (#2031)

---
 scripts/build/build.mjs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs
index a2e0e0024..0c2a930a0 100755
--- a/scripts/build/build.mjs
+++ b/scripts/build/build.mjs
@@ -76,7 +76,11 @@ const globNativesPlugin = {
                 if (!await existsAsync(dirPath)) continue;
                 const plugins = await readdir(dirPath);
                 for (const p of plugins) {
-                    if (!await existsAsync(join(dirPath, p, "native.ts"))) continue;
+                    const nativePath = join(dirPath, p, "native.ts");
+                    const indexNativePath = join(dirPath, p, "native/index.ts");
+
+                    if (!(await existsAsync(nativePath)) && !(await existsAsync(indexNativePath)))
+                        continue;
 
                     const nameParts = p.split(".");
                     const namePartsWithoutTarget = nameParts.length === 1 ? nameParts : nameParts.slice(0, -1);

From 3453d0c97c880a9f12d757d1fb07c72efc077e2a Mon Sep 17 00:00:00 2001
From: Carter <me@fyko.net>
Date: Wed, 6 Dec 2023 14:25:53 -0700
Subject: [PATCH 234/632] feat(clearUrls): moar twitter rules (#2029)

---
 src/plugins/clearURLs/defaultRules.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/plugins/clearURLs/defaultRules.ts b/src/plugins/clearURLs/defaultRules.ts
index e7c3ecbeb..0633b717d 100644
--- a/src/plugins/clearURLs/defaultRules.ts
+++ b/src/plugins/clearURLs/defaultRules.ts
@@ -124,6 +124,18 @@ export const defaultRules = [
     "t@*.x.com",
     "s@*.x.com",
     "ref_*@*.x.com",
+    "t@*.fixupx.com",
+    "s@*.fixupx.com",
+    "ref_*@*.fixupx.com",
+    "t@*.fxtwitter.com",
+    "s@*.fxtwitter.com",
+    "ref_*@*.fxtwitter.com",
+    "t@*.twittpr.com",
+    "s@*.twittpr.com",
+    "ref_*@*.twittpr.com",
+    "t@*.fixvx.com",
+    "s@*.fixvx.com",
+    "ref_*@*.fixvx.com",
     "tt_medium",
     "tt_content",
     "lr@yandex.*",

From c0b6d8f1c4a6c103f0a5ff4af2fad246f8d035b6 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Thu, 7 Dec 2023 04:27:06 +0700
Subject: [PATCH 235/632] devCompanion: add findComponentByCode (#2026)

---
 src/plugins/devCompanion.dev/index.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/plugins/devCompanion.dev/index.tsx b/src/plugins/devCompanion.dev/index.tsx
index 2fa01f257..25fd563e4 100644
--- a/src/plugins/devCompanion.dev/index.tsx
+++ b/src/plugins/devCompanion.dev/index.tsx
@@ -215,6 +215,9 @@ function initWs(isManual = false) {
                         case "ModuleId":
                             results = Object.keys(search(parsedArgs[0]));
                             break;
+                        case "ComponentByCode":
+                            results = findAll(filters.componentByCode(...parsedArgs));
+                            break;
                         default:
                             return reply("Unknown Find Type " + type);
                     }

From 9a89f7b3b228a3a0ed9c4a0ac42d03e87a6aa3c8 Mon Sep 17 00:00:00 2001
From: nya <24845294+nyakowint@users.noreply.github.com>
Date: Wed, 6 Dec 2023 16:31:22 -0500
Subject: [PATCH 236/632] feat(plugin): XSOverlay (#1901)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/iLoveSpam/index.ts          |   2 +-
 src/plugins/xsOverlay.desktop/README.md |  15 ++
 src/plugins/xsOverlay.desktop/index.ts  | 288 ++++++++++++++++++++++++
 src/plugins/xsOverlay.desktop/native.ts |  16 ++
 src/utils/constants.ts                  |   4 +-
 5 files changed, 322 insertions(+), 3 deletions(-)
 create mode 100644 src/plugins/xsOverlay.desktop/README.md
 create mode 100644 src/plugins/xsOverlay.desktop/index.ts
 create mode 100644 src/plugins/xsOverlay.desktop/native.ts

diff --git a/src/plugins/iLoveSpam/index.ts b/src/plugins/iLoveSpam/index.ts
index 8556de426..bb0b20539 100644
--- a/src/plugins/iLoveSpam/index.ts
+++ b/src/plugins/iLoveSpam/index.ts
@@ -22,7 +22,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "iLoveSpam",
     description: "Do not hide messages from 'likely spammers'",
-    authors: [Devs.botato, Devs.Animal],
+    authors: [Devs.botato, Devs.Nyako],
     patches: [
         {
             find: "hasFlag:{writable",
diff --git a/src/plugins/xsOverlay.desktop/README.md b/src/plugins/xsOverlay.desktop/README.md
new file mode 100644
index 000000000..477e30bf3
--- /dev/null
+++ b/src/plugins/xsOverlay.desktop/README.md
@@ -0,0 +1,15 @@
+# XSOverlay Notifier
+
+Sends Discord messages to [XSOverlay](https://store.steampowered.com/app/1173510/XSOverlay/) for easier viewing while using VR.
+
+## Preview
+
+![](https://github.com/Vendicated/Vencord/assets/24845294/205d2055-bb4a-44e4-b7e3-265391bccd40)
+
+![](https://github.com/Vendicated/Vencord/assets/24845294/f15eff61-2d52-4620-bcab-808ecb1606d2)
+
+## Usage
+- Enable this plugin
+- Set plugin settings as desired
+- Open XSOverlay
+- get ping spammed
diff --git a/src/plugins/xsOverlay.desktop/index.ts b/src/plugins/xsOverlay.desktop/index.ts
new file mode 100644
index 000000000..5461696ec
--- /dev/null
+++ b/src/plugins/xsOverlay.desktop/index.ts
@@ -0,0 +1,288 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { makeRange } from "@components/PluginSettings/components";
+import { Devs } from "@utils/constants";
+import { Logger } from "@utils/Logger";
+import definePlugin, { OptionType, PluginNative } from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+import { ChannelStore, GuildStore, UserStore } from "@webpack/common";
+import type { Channel, Embed, GuildMember, MessageAttachment, User } from "discord-types/general";
+
+const enum ChannelTypes {
+    DM = 1,
+    GROUP_DM = 3
+}
+
+interface Message {
+    guild_id: string,
+    attachments: MessageAttachment[],
+    author: User,
+    channel_id: string,
+    components: any[],
+    content: string,
+    edited_timestamp: string,
+    embeds: Embed[],
+    sticker_items?: Sticker[],
+    flags: number,
+    id: string,
+    member: GuildMember,
+    mention_everyone: boolean,
+    mention_roles: string[],
+    mentions: Mention[],
+    nonce: string,
+    pinned: false,
+    referenced_message: any,
+    timestamp: string,
+    tts: boolean,
+    type: number;
+}
+
+interface Mention {
+    avatar: string,
+    avatar_decoration_data: any,
+    discriminator: string,
+    global_name: string,
+    id: string,
+    public_flags: number,
+    username: string;
+}
+
+interface Sticker {
+    t: "Sticker";
+    description: string;
+    format_type: number;
+    guild_id: string;
+    id: string;
+    name: string;
+    tags: string;
+    type: number;
+}
+
+interface Call {
+    channel_id: string,
+    guild_id: string,
+    message_id: string,
+    region: string,
+    ringing: string[];
+}
+
+const MuteStore = findByPropsLazy("isSuppressEveryoneEnabled");
+const XSLog = new Logger("XSOverlay");
+
+const settings = definePluginSettings({
+    ignoreBots: {
+        type: OptionType.BOOLEAN,
+        description: "Ignore messages from bots",
+        default: false
+    },
+    pingColor: {
+        type: OptionType.STRING,
+        description: "User mention color",
+        default: "#7289da"
+    },
+    channelPingColor: {
+        type: OptionType.STRING,
+        description: "Channel mention color",
+        default: "#8a2be2"
+    },
+    soundPath: {
+        type: OptionType.STRING,
+        description: "Notification sound (default/warning/error)",
+        default: "default"
+    },
+    timeout: {
+        type: OptionType.NUMBER,
+        description: "Notif duration (secs)",
+        default: 1.0,
+    },
+    opacity: {
+        type: OptionType.SLIDER,
+        description: "Notif opacity",
+        default: 1,
+        markers: makeRange(0, 1, 0.1)
+    },
+    volume: {
+        type: OptionType.SLIDER,
+        description: "Volume",
+        default: 0.2,
+        markers: makeRange(0, 1, 0.1)
+    },
+});
+
+const Native = VencordNative.pluginHelpers.XsOverlay as PluginNative<typeof import("./native")>;
+
+export default definePlugin({
+    name: "XSOverlay",
+    description: "Forwards discord notifications to XSOverlay, for easy viewing in VR",
+    authors: [Devs.Nyako],
+    tags: ["vr", "notify"],
+    settings,
+    flux: {
+        CALL_UPDATE({ call }: { call: Call; }) {
+            if (call?.ringing?.includes(UserStore.getCurrentUser().id)) {
+                const channel = ChannelStore.getChannel(call.channel_id);
+                sendOtherNotif("Incoming call", `${channel.name} is calling you...`);
+            }
+        },
+        MESSAGE_CREATE({ message, optimistic }: { message: Message; optimistic: boolean; }) {
+            // Apparently without this try/catch, discord's socket connection dies if any part of this errors
+            try {
+                if (optimistic) return;
+                const channel = ChannelStore.getChannel(message.channel_id);
+                if (!shouldNotify(message, channel)) return;
+
+                const pingColor = settings.store.pingColor.replaceAll("#", "").trim();
+                const channelPingColor = settings.store.channelPingColor.replaceAll("#", "").trim();
+                let finalMsg = message.content;
+                let titleString = "";
+
+                if (channel.guild_id) {
+                    const guild = GuildStore.getGuild(channel.guild_id);
+                    titleString = `${message.author.username} (${guild.name}, #${channel.name})`;
+                }
+
+
+                switch (channel.type) {
+                    case ChannelTypes.DM:
+                        titleString = message.author.username.trim();
+                        break;
+                    case ChannelTypes.GROUP_DM:
+                        const channelName = channel.name.trim() ?? channel.rawRecipients.map(e => e.username).join(", ");
+                        titleString = `${message.author.username} (${channelName})`;
+                        break;
+                }
+
+                if (message.referenced_message) {
+                    titleString += " (reply)";
+                }
+
+                if (message.embeds.length > 0) {
+                    finalMsg += " [embed] ";
+                    if (message.content === "") {
+                        finalMsg = "sent message embed(s)";
+                    }
+                }
+
+                if (message.sticker_items) {
+                    finalMsg += " [sticker] ";
+                    if (message.content === "") {
+                        finalMsg = "sent a sticker";
+                    }
+                }
+
+                const images = message.attachments.filter(e =>
+                    typeof e?.content_type === "string"
+                    && e?.content_type.startsWith("image")
+                );
+
+
+                images.forEach(img => {
+                    finalMsg += ` [image: ${img.filename}] `;
+                });
+
+                message.attachments.filter(a => a && !a.content_type?.startsWith("image")).forEach(a => {
+                    finalMsg += ` [attachment: ${a.filename}] `;
+                });
+
+                // make mentions readable
+                if (message.mentions.length > 0) {
+                    finalMsg = finalMsg.replace(/<@!?(\d{17,20})>/g, (_, id) => `<color=#${pingColor}><b>@${UserStore.getUser(id)?.username || "unknown-user"}</color></b>`);
+                }
+
+                if (message.mention_roles.length > 0) {
+                    for (const roleId of message.mention_roles) {
+                        const role = GuildStore.getGuild(channel.guild_id).roles[roleId];
+                        if (!role) continue;
+                        const roleColor = role.colorString ?? `#${pingColor}`;
+                        finalMsg = finalMsg.replace(`<@&${roleId}>`, `<b><color=${roleColor}>@${role.name}</color></b>`);
+                    }
+                }
+
+                // make emotes and channel mentions readable
+                const emoteMatches = finalMsg.match(new RegExp("(<a?:\\w+:\\d+>)", "g"));
+                const channelMatches = finalMsg.match(new RegExp("<(#\\d+)>", "g"));
+
+                if (emoteMatches) {
+                    for (const eMatch of emoteMatches) {
+                        finalMsg = finalMsg.replace(new RegExp(`${eMatch}`, "g"), `:${eMatch.split(":")[1]}:`);
+                    }
+                }
+
+                if (channelMatches) {
+                    for (const cMatch of channelMatches) {
+                        let channelId = cMatch.split("<#")[1];
+                        channelId = channelId.substring(0, channelId.length - 1);
+                        finalMsg = finalMsg.replace(new RegExp(`${cMatch}`, "g"), `<b><color=#${channelPingColor}>#${ChannelStore.getChannel(channelId).name}</color></b>`);
+                    }
+                }
+
+                sendMsgNotif(titleString, finalMsg, message);
+            } catch (err) {
+                XSLog.error(`Failed to catch MESSAGE_CREATE: ${err}`);
+            }
+        }
+    }
+});
+
+function sendMsgNotif(titleString: string, content: string, message: Message) {
+    fetch(`https://cdn.discordapp.com/avatars/${message.author.id}/${message.author.avatar}.png?size=128`).then(response => response.arrayBuffer()).then(result => {
+        const msgData = {
+            messageType: 1,
+            index: 0,
+            timeout: settings.store.timeout,
+            height: calculateHeight(cleanMessage(content)),
+            opacity: settings.store.opacity,
+            volume: settings.store.volume,
+            audioPath: settings.store.soundPath,
+            title: titleString,
+            content: content,
+            useBase64Icon: true,
+            icon: result,
+            sourceApp: "Vencord"
+        };
+        Native.sendToOverlay(msgData);
+    });
+}
+
+function sendOtherNotif(content: string, titleString: string) {
+    const msgData = {
+        messageType: 1,
+        index: 0,
+        timeout: settings.store.timeout,
+        height: calculateHeight(cleanMessage(content)),
+        opacity: settings.store.opacity,
+        volume: settings.store.volume,
+        audioPath: settings.store.soundPath,
+        title: titleString,
+        content: content,
+        useBase64Icon: false,
+        icon: null,
+        sourceApp: "Vencord"
+    };
+    Native.sendToOverlay(msgData);
+}
+
+function shouldNotify(message: Message, channel: Channel) {
+    const currentUser = UserStore.getCurrentUser();
+    if (message.author.id === currentUser.id) return false;
+    if (message.author.bot && settings.store.ignoreBots) return false;
+    if (MuteStore.allowAllMessages(channel) || message.mention_everyone && !MuteStore.isSuppressEveryoneEnabled(message.guild_id)) return true;
+
+    return message.mentions.some(m => m.id === currentUser.id);
+}
+
+function calculateHeight(content: string) {
+    if (content.length <= 100) return 100;
+    if (content.length <= 200) return 150;
+    if (content.length <= 300) return 200;
+    return 250;
+}
+
+function cleanMessage(content: string) {
+    return content.replace(new RegExp("<[^>]*>", "g"), "");
+}
diff --git a/src/plugins/xsOverlay.desktop/native.ts b/src/plugins/xsOverlay.desktop/native.ts
new file mode 100644
index 000000000..82809383a
--- /dev/null
+++ b/src/plugins/xsOverlay.desktop/native.ts
@@ -0,0 +1,16 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { createSocket, Socket } from "dgram";
+
+let xsoSocket: Socket;
+
+export function sendToOverlay(_, data: any) {
+    data.icon = Buffer.from(data.icon).toString("base64");
+    const json = JSON.stringify(data);
+    xsoSocket ??= createSocket("udp4");
+    xsoSocket.send(json, 42069, "127.0.0.1");
+}
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 0ff7da72a..daa4a74dc 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -78,8 +78,8 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Samu",
         id: 702973430449832038n,
     },
-    Animal: {
-        name: "Animal",
+    Nyako: {
+        name: "nyako",
         id: 118437263754395652n
     },
     MaiKokain: {

From 613b2dc5f61fcdd6b03d1e66da89f7c8062d118b Mon Sep 17 00:00:00 2001
From: fres621 <126067139+fres621@users.noreply.github.com>
Date: Wed, 6 Dec 2023 21:54:23 +0000
Subject: [PATCH 237/632] Fix QuickMention not working in DMs (#2028)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/quickMention/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/quickMention/index.tsx b/src/plugins/quickMention/index.tsx
index 9720c7d33..df86e9b70 100644
--- a/src/plugins/quickMention/index.tsx
+++ b/src/plugins/quickMention/index.tsx
@@ -31,7 +31,7 @@ export default definePlugin({
     start() {
         addButton("QuickMention", msg => {
             const channel = ChannelStore.getChannel(msg.channel_id);
-            if (!PermissionStore.can(PermissionsBits.SEND_MESSAGES, channel)) return null;
+            if (channel.guild_id && !PermissionStore.can(PermissionsBits.SEND_MESSAGES, channel)) return null;
 
             return {
                 label: "Quick Mention",

From 9faa1331da67b76a50697d61c00f72f5601b8b4a Mon Sep 17 00:00:00 2001
From: philipbry <81459908+philipbry@users.noreply.github.com>
Date: Wed, 6 Dec 2023 23:15:34 +0100
Subject: [PATCH 238/632] new plugin: notificationVolume (#1992)

Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/notificationVolume/README.md |  3 ++
 src/plugins/notificationVolume/index.ts  | 35 ++++++++++++++++++++++++
 src/utils/constants.ts                   |  4 +++
 3 files changed, 42 insertions(+)
 create mode 100644 src/plugins/notificationVolume/README.md
 create mode 100644 src/plugins/notificationVolume/index.ts

diff --git a/src/plugins/notificationVolume/README.md b/src/plugins/notificationVolume/README.md
new file mode 100644
index 000000000..05e5af4e2
--- /dev/null
+++ b/src/plugins/notificationVolume/README.md
@@ -0,0 +1,3 @@
+# NotificationVolume
+
+Set a separate volume for notifications and in-app sounds (e.g. messages, call sound, mute/unmute) helping your ears stay healthy for many years to come.
diff --git a/src/plugins/notificationVolume/index.ts b/src/plugins/notificationVolume/index.ts
new file mode 100644
index 000000000..50eabee73
--- /dev/null
+++ b/src/plugins/notificationVolume/index.ts
@@ -0,0 +1,35 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+
+const settings = definePluginSettings({
+    notificationVolume: {
+        type: OptionType.SLIDER,
+        description: "Notification volume",
+        markers: [0, 25, 50, 75, 100],
+        default: 100,
+        stickToMarkers: false
+    }
+});
+
+export default definePlugin({
+    name: "NotificationVolume",
+    description: "Save your ears and set a separate volume for notifications and in-app sounds",
+    authors: [Devs.philipbry],
+    settings,
+    patches: [
+        {
+            find: "_ensureAudio(){",
+            replacement: {
+                match: /onloadeddata=\(\)=>\{.\.volume=/,
+                replace: "$&$self.settings.store.notificationVolume/100*"
+            },
+        },
+    ],
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index daa4a74dc..1c477b124 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -387,6 +387,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "ant0n",
         id: 145224646868860928n
     },
+    philipbry: {
+        name: "philipbry",
+        id: 554994003318276106n
+    },
     Korbo: {
         name: "Korbo",
         id: 455856406420258827n

From e4942397dc0a536fcdc08f060977188d1376268b Mon Sep 17 00:00:00 2001
From: Nickyux <30734036+nmsturcke@users.noreply.github.com>
Date: Wed, 6 Dec 2023 23:18:03 +0100
Subject: [PATCH 239/632] MessageClickActions: Ignore Ephemeral & Deleted
 Messages (#1972)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/messageClickActions/index.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/plugins/messageClickActions/index.ts b/src/plugins/messageClickActions/index.ts
index 08cee4c9f..052c33f61 100644
--- a/src/plugins/messageClickActions/index.ts
+++ b/src/plugins/messageClickActions/index.ts
@@ -72,6 +72,7 @@ export default definePlugin({
                 if (event.detail < 2) return;
                 if (settings.store.requireModifier && !event.ctrlKey && !event.shiftKey) return;
                 if (channel.guild_id && !PermissionStore.can(PermissionsBits.SEND_MESSAGES, channel)) return;
+                if (msg.deleted === true) return;
 
                 if (isMe) {
                     if (!settings.store.enableDoubleClickToEdit || EditStore.isEditing(channel.id, msg.id)) return;
@@ -81,6 +82,9 @@ export default definePlugin({
                 } else {
                     if (!settings.store.enableDoubleClickToReply) return;
 
+                    const EPHEMERAL = 64;
+                    if (msg.hasFlag(EPHEMERAL)) return;
+
                     FluxDispatcher.dispatch({
                         type: "CREATE_PENDING_REPLY",
                         channel,

From 920252956f60377b8aa593c217830391dfa344ff Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Thu, 7 Dec 2023 05:42:40 +0700
Subject: [PATCH 240/632] shikiCodeBlocks: support file preview (#1977)

---
 src/plugins/shikiCodeblocks.desktop/index.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/plugins/shikiCodeblocks.desktop/index.ts b/src/plugins/shikiCodeblocks.desktop/index.ts
index f358497d2..ef1b5d3df 100644
--- a/src/plugins/shikiCodeblocks.desktop/index.ts
+++ b/src/plugins/shikiCodeblocks.desktop/index.ts
@@ -42,6 +42,13 @@ export default definePlugin({
                 match: /codeBlock:\{react\((\i),(\i),(\i)\)\{/,
                 replace: "$&return $self.renderHighlighter($1,$2,$3);"
             }
+        },
+        {
+            find: ".PREVIEW_NUM_LINES",
+            replacement: {
+                match: /(?<=function \i\((\i)\)\{)(?=let\{text:\i,language:)/,
+                replace: "return $self.renderHighlighter({lang:$1.language,content:$1.text});"
+            }
         }
     ],
     start: async () => {

From fd9c675942e727570776b4018c26674d21ecc6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Han=20Seung=20Min=20-=20=ED=95=9C=EC=8A=B9=EB=AF=BC?=
 <hanseungmin.ar@gmail.com>
Date: Thu, 7 Dec 2023 08:25:13 +0900
Subject: [PATCH 241/632] fix: patch helper overflow (#2007)

---
 src/components/VencordSettings/PatchHelperTab.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VencordSettings/PatchHelperTab.tsx b/src/components/VencordSettings/PatchHelperTab.tsx
index 0b869a518..35f46ef50 100644
--- a/src/components/VencordSettings/PatchHelperTab.tsx
+++ b/src/components/VencordSettings/PatchHelperTab.tsx
@@ -108,7 +108,7 @@ function ReplacementComponent({ module, match, replacement, setReplacementError
     function renderDiff() {
         return diff?.map(p => {
             const color = p.added ? "lime" : p.removed ? "red" : "grey";
-            return <div style={{ color, userSelect: "text" }}>{p.value}</div>;
+            return <div style={{ color, userSelect: "text", wordBreak: "break-all", lineBreak: "anywhere" }}>{p.value}</div>;
         });
     }
 

From 6ee50d30f6b0886aa03a2829618205f0f53542db Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Wed, 6 Dec 2023 18:26:08 -0500
Subject: [PATCH 242/632] fix(dearrow): remove > from DeArrow titles (#1999)

---
 src/plugins/dearrow/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/dearrow/index.tsx b/src/plugins/dearrow/index.tsx
index 52cf1d530..80eb84aa7 100644
--- a/src/plugins/dearrow/index.tsx
+++ b/src/plugins/dearrow/index.tsx
@@ -60,7 +60,7 @@ async function embedDidMount(this: Component<Props>) {
 
         if (hasTitle) {
             embed.dearrow.oldTitle = embed.rawTitle;
-            embed.rawTitle = titles[0].title;
+            embed.rawTitle = titles[0].title.replace(/ >(\S)/g, " $1");
         }
 
         if (hasThumb) {

From 34cbb22efe82484ca7fa5e655411679f9c82422a Mon Sep 17 00:00:00 2001
From: Damien Erambert <damien@erambert.me>
Date: Wed, 6 Dec 2023 15:30:41 -0800
Subject: [PATCH 243/632] feat: add dropdown to choose vibrancy value on macOS
 (#1941)

Co-authored-by: V <vendicated@riseup.net>
---
 src/api/Settings.ts                           | 20 ++++-
 src/components/VencordSettings/VencordTab.tsx | 79 +++++++++++++++++--
 src/main/patcher.ts                           | 10 ++-
 3 files changed, 100 insertions(+), 9 deletions(-)

diff --git a/src/api/Settings.ts b/src/api/Settings.ts
index 368f88f7a..004a8988b 100644
--- a/src/api/Settings.ts
+++ b/src/api/Settings.ts
@@ -38,7 +38,21 @@ export interface Settings {
     frameless: boolean;
     transparent: boolean;
     winCtrlQ: boolean;
-    macosTranslucency: boolean;
+    macosVibrancyStyle:
+    | "content"
+    | "fullscreen-ui"
+    | "header"
+    | "hud"
+    | "menu"
+    | "popover"
+    | "selection"
+    | "sidebar"
+    | "titlebar"
+    | "tooltip"
+    | "under-page"
+    | "window"
+    | undefined;
+    macosTranslucency: boolean | undefined;
     disableMinSize: boolean;
     winNativeTitleBar: boolean;
     plugins: {
@@ -74,7 +88,9 @@ const DefaultSettings: Settings = {
     frameless: false,
     transparent: false,
     winCtrlQ: false,
-    macosTranslucency: false,
+    // Replaced by macosVibrancyStyle
+    macosTranslucency: undefined,
+    macosVibrancyStyle: undefined,
     disableMinSize: false,
     winNativeTitleBar: false,
     plugins: {},
diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx
index a8e9ea5b0..07d777eb3 100644
--- a/src/components/VencordSettings/VencordTab.tsx
+++ b/src/components/VencordSettings/VencordTab.tsx
@@ -48,6 +48,15 @@ function VencordSettings() {
 
     const isWindows = navigator.platform.toLowerCase().startsWith("win");
     const isMac = navigator.platform.toLowerCase().startsWith("mac");
+    const needsVibrancySettings = IS_DISCORD_DESKTOP && isMac;
+
+    // One-time migration of the old setting to the new one if necessary.
+    React.useEffect(() => {
+        if (settings.macosTranslucency === true && !settings.macosVibrancyStyle) {
+            settings.macosVibrancyStyle = "sidebar";
+            settings.macosTranslucency = undefined;
+        }
+    }, []);
 
     const Switches: Array<false | {
         key: KeysOfType<typeof settings, boolean>;
@@ -89,11 +98,6 @@ function VencordSettings() {
                 title: "Disable minimum window size",
                 note: "Requires a full restart"
             },
-            IS_DISCORD_DESKTOP && isMac && {
-                key: "macosTranslucency",
-                title: "Enable translucent window",
-                note: "Requires a full restart"
-            }
         ];
 
     return (
@@ -152,6 +156,71 @@ function VencordSettings() {
             </Forms.FormSection>
 
 
+            {needsVibrancySettings && <>
+                <Forms.FormTitle tag="h5">Window vibrancy style (requires restart)</Forms.FormTitle>
+                <Select
+                    className={Margins.bottom20}
+                    placeholder="Window vibrancy style"
+                    options={[
+                        // Sorted from most opaque to most transparent
+                        {
+                            label: "No vibrancy", default: !settings.macosTranslucency, value: undefined
+                        },
+                        {
+                            label: "Under Page (window tinting)",
+                            value: "under-page"
+                        },
+                        {
+                            label: "Content",
+                            value: "content"
+                        },
+                        {
+                            label: "Window",
+                            value: "window"
+                        },
+                        {
+                            label: "Selection",
+                            value: "selection"
+                        },
+                        {
+                            label: "Titlebar",
+                            value: "titlebar"
+                        },
+                        {
+                            label: "Header",
+                            value: "header"
+                        },
+                        {
+                            label: "Sidebar (old value for transparent windows)",
+                            value: "sidebar",
+                            default: settings.macosTranslucency
+                        },
+                        {
+                            label: "Tooltip",
+                            value: "tooltip"
+                        },
+                        {
+                            label: "Menu",
+                            value: "menu"
+                        },
+                        {
+                            label: "Popover",
+                            value: "popover"
+                        },
+                        {
+                            label: "Fullscreen UI (transparent but slightly muted)",
+                            value: "fullscreen-ui"
+                        },
+                        {
+                            label: "HUD (Most transparent)",
+                            value: "hud"
+                        },
+                    ]}
+                    select={v => settings.macosVibrancyStyle = v}
+                    isSelected={v => settings.macosVibrancyStyle === v}
+                    serialize={identity} />
+            </>}
+
             {typeof Notification !== "undefined" && <NotificationSection settings={settings.notifications} />}
         </SettingsTab>
     );
diff --git a/src/main/patcher.ts b/src/main/patcher.ts
index 2259b2000..0cc92550c 100644
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@@ -85,9 +85,15 @@ if (!IS_VANILLA) {
                     options.backgroundColor = "#00000000";
                 }
 
-                if (settings.macosTranslucency && process.platform === "darwin") {
+                const needsVibrancy = process.platform === "darwin" || (settings.macosVibrancyStyle || settings.macosTranslucency);
+
+                if (needsVibrancy) {
                     options.backgroundColor = "#00000000";
-                    options.vibrancy = "sidebar";
+                    if (settings.macosTranslucency) {
+                        options.vibrancy = "sidebar";
+                    } else if (settings.macosVibrancyStyle) {
+                        options.vibrancy = settings.macosVibrancyStyle;
+                    }
                 }
 
                 process.env.DISCORD_PRELOAD = original;

From d629281e7271062f0275b33b26469557860f9cb8 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 7 Dec 2023 00:35:05 +0100
Subject: [PATCH 244/632] bump to v1.6.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index af4720937..b59fbafe7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.6.4",
+    "version": "1.6.5",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 534ca1e28d702141b6c1bf480e655a44299456a9 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Thu, 7 Dec 2023 08:44:14 +0700
Subject: [PATCH 245/632] fix: createBotMessage (#2033)

---
 src/api/Commands/commandHelpers.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/Commands/commandHelpers.ts b/src/api/Commands/commandHelpers.ts
index ebcc4e2fa..2fd189032 100644
--- a/src/api/Commands/commandHelpers.ts
+++ b/src/api/Commands/commandHelpers.ts
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { MessageActions } from "@utils/discord";
 import { mergeDefaults } from "@utils/misc";
 import { findByPropsLazy } from "@webpack";
 import { SnowflakeUtils } from "@webpack/common";
@@ -25,6 +24,7 @@ import type { PartialDeep } from "type-fest";
 
 import { Argument } from "./types";
 
+const MessageCreator = findByPropsLazy("createBotMessage");
 const MessageSender = findByPropsLazy("receiveMessage");
 
 export function generateId() {
@@ -38,7 +38,7 @@ export function generateId() {
  * @returns {Message}
  */
 export function sendBotMessage(channelId: string, message: PartialDeep<Message>): Message {
-    const botMessage = MessageActions.createBotMessage({ channelId, content: "", embeds: [] });
+    const botMessage = MessageCreator.createBotMessage({ channelId, content: "", embeds: [] });
 
     MessageSender.receiveMessage(channelId, mergeDefaults(message, botMessage));
 

From 510bfb8fa32ca3b94bd17e57d57b4d658838adde Mon Sep 17 00:00:00 2001
From: maisy <maisymoe@riseup.net>
Date: Sat, 9 Dec 2023 20:36:58 +0000
Subject: [PATCH 246/632] ReactErrorDecoder: fix using wrong react version's
 error map (#2040)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/reactErrorDecoder/index.ts | 9 +++++----
 src/utils/constants.ts                 | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/plugins/reactErrorDecoder/index.ts b/src/plugins/reactErrorDecoder/index.ts
index 2332d457c..9e2e5dc50 100644
--- a/src/plugins/reactErrorDecoder/index.ts
+++ b/src/plugins/reactErrorDecoder/index.ts
@@ -18,27 +18,28 @@
 
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
+import { React } from "@webpack/common";
 
 let ERROR_CODES: any;
-const CODES_URL =
-    "https://raw.githubusercontent.com/facebook/react/17.0.2/scripts/error-codes/codes.json";
 
 export default definePlugin({
     name: "ReactErrorDecoder",
     description: 'Replaces "Minifed React Error" with the actual error.',
-    authors: [Devs.Cyn],
+    authors: [Devs.Cyn, Devs.maisymoe],
     patches: [
         {
             find: '"https://reactjs.org/docs/error-decoder.html?invariant="',
             replacement: {
                 match: /(function .\(.\)){(for\(var .="https:\/\/reactjs\.org\/docs\/error-decoder\.html\?invariant="\+.,.=1;.<arguments\.length;.\+\+\).\+="&args\[\]="\+encodeURIComponent\(arguments\[.\]\);return"Minified React error #"\+.\+"; visit "\+.\+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings.")}/,
                 replace: (_, func, original) =>
-                    `${func}{var decoded=Vencord.Plugins.plugins.ReactErrorDecoder.decodeError.apply(null, arguments);if(decoded)return decoded;${original}}`,
+                    `${func}{var decoded=$self.decodeError.apply(null, arguments);if(decoded)return decoded;${original}}`,
             },
         },
     ],
 
     async start() {
+        const CODES_URL = `https://raw.githubusercontent.com/facebook/react/v${React.version}/scripts/error-codes/codes.json`;
+
         ERROR_CODES = await fetch(CODES_URL)
             .then(res => res.json())
             .catch(e => console.error("[ReactErrorDecoder] Failed to fetch React error codes\n", e));
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 1c477b124..2962df06f 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -395,6 +395,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Korbo",
         id: 455856406420258827n
     },
+    maisymoe: {
+        name: "maisy",
+        id: 257109471589957632n,
+    },
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly

From 799e6e7292c9ce2e5c678c0efeda1eadab2721be Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Sun, 10 Dec 2023 03:37:24 +0700
Subject: [PATCH 247/632] platformIndicators: fix (#2038)

---
 src/plugins/platformIndicators/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/platformIndicators/index.tsx b/src/plugins/platformIndicators/index.tsx
index 2972b4a46..9fae9adfa 100644
--- a/src/plugins/platformIndicators/index.tsx
+++ b/src/plugins/platformIndicators/index.tsx
@@ -55,13 +55,13 @@ const Icons = {
 };
 type Platform = keyof typeof Icons;
 
-const StatusUtils = findByPropsLazy("getStatusColor", "StatusTypes");
+const StatusUtils = findByPropsLazy("useStatusFillColor", "StatusTypes");
 
 const PlatformIcon = ({ platform, status, small }: { platform: Platform, status: string; small: boolean; }) => {
     const tooltip = platform[0].toUpperCase() + platform.slice(1);
     const Icon = Icons[platform] ?? Icons.desktop;
 
-    return <Icon color={`var(--${StatusUtils.getStatusColor(status)}`} tooltip={tooltip} small={small} />;
+    return <Icon color={StatusUtils.useStatusFillColor(status)} tooltip={tooltip} small={small} />;
 };
 
 const getStatus = (id: string): Record<Platform, string> => PresenceStore.getState()?.clientStatuses?.[id];

From 539e538d87034b93d06100f2c60a851b12fea694 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 7 Dec 2023 03:28:07 -0300
Subject: [PATCH 248/632] commandHelpers: use MessageActions import

---
 src/api/Commands/commandHelpers.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/Commands/commandHelpers.ts b/src/api/Commands/commandHelpers.ts
index 2fd189032..8f4a88e4b 100644
--- a/src/api/Commands/commandHelpers.ts
+++ b/src/api/Commands/commandHelpers.ts
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { MessageActions } from "@utils/discord";
 import { mergeDefaults } from "@utils/misc";
 import { findByPropsLazy } from "@webpack";
 import { SnowflakeUtils } from "@webpack/common";
@@ -25,7 +26,6 @@ import type { PartialDeep } from "type-fest";
 import { Argument } from "./types";
 
 const MessageCreator = findByPropsLazy("createBotMessage");
-const MessageSender = findByPropsLazy("receiveMessage");
 
 export function generateId() {
     return `-${SnowflakeUtils.fromTimestamp(Date.now())}`;
@@ -40,7 +40,7 @@ export function generateId() {
 export function sendBotMessage(channelId: string, message: PartialDeep<Message>): Message {
     const botMessage = MessageCreator.createBotMessage({ channelId, content: "", embeds: [] });
 
-    MessageSender.receiveMessage(channelId, mergeDefaults(message, botMessage));
+    MessageActions.receiveMessage(channelId, mergeDefaults(message, botMessage));
 
     return message as Message;
 }

From a9568bc0552ef0cac57c24da453af4033e692bcb Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 6 Dec 2023 21:15:29 -0300
Subject: [PATCH 249/632] reporter: fix bad logic

---
 scripts/generateReport.ts | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index a75a5985f..54db96e66 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -335,15 +335,15 @@ function runTime(token: string) {
             await (wreq as any).el(sym);
             delete Object.prototype[sym];
 
-            const validChunksEntryPoints = [] as string[];
-            const validChunks = [] as string[];
-            const invalidChunks = [] as string[];
+            const validChunksEntryPoints = new Set<string>();
+            const validChunks = new Set<string>();
+            const invalidChunks = new Set<string>();
 
             if (!chunks) throw new Error("Failed to get chunks");
 
-            chunksLoop:
             for (const entryPoint in chunks) {
                 const chunkIds = chunks[entryPoint];
+                let invalidEntryPoint = false;
 
                 for (const id of chunkIds) {
                     if (!wreq.u(id)) continue;
@@ -353,14 +353,16 @@ function runTime(token: string) {
                         .then(t => t.includes(".module.wasm") || !t.includes("(this.webpackChunkdiscord_app=this.webpackChunkdiscord_app||[]).push"));
 
                     if (isWasm) {
-                        invalidChunks.push(id);
-                        continue chunksLoop;
+                        invalidChunks.add(id);
+                        invalidEntryPoint = true;
+                        continue;
                     }
 
-                    validChunks.push(id);
+                    validChunks.add(id);
                 }
 
-                validChunksEntryPoints.push(entryPoint);
+                if (!invalidEntryPoint)
+                    validChunksEntryPoints.add(entryPoint);
             }
 
             for (const entryPoint of validChunksEntryPoints) {
@@ -373,7 +375,7 @@ function runTime(token: string) {
             const allChunks = Function("return " + (wreq.u.toString().match(/(?<=\()\{.+?\}/s)?.[0] ?? "null"))() as Record<string | number, string[]> | null;
             if (!allChunks) throw new Error("Failed to get all chunks");
             const chunksLeft = Object.keys(allChunks).filter(id => {
-                return !(validChunks.includes(id) || invalidChunks.includes(id));
+                return !(validChunks.has(id) || invalidChunks.has(id));
             });
 
             for (const id of chunksLeft) {

From c9f7cf75405bc08f660d3879ed5af7f0b4e1cf68 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 9 Dec 2023 18:34:58 -0300
Subject: [PATCH 250/632] ci: test all branches

---
 .github/workflows/test.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a756681c2..d4746d673 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,9 +1,6 @@
 name: test
 on:
     push:
-        branches:
-            - main
-            - dev
     pull_request:
         branches:
             - main

From 6d911790e97f948e6357bb02c17ee4ee73fa5ff1 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Sun, 10 Dec 2023 08:05:40 +0700
Subject: [PATCH 251/632] oneko: allow oneko in reduced motion (#2018)

---
 src/plugins/oneko/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/oneko/index.ts b/src/plugins/oneko/index.ts
index c5de470e1..90a3901a7 100644
--- a/src/plugins/oneko/index.ts
+++ b/src/plugins/oneko/index.ts
@@ -28,7 +28,8 @@ export default definePlugin({
     start() {
         fetch("https://raw.githubusercontent.com/adryd325/oneko.js/8fa8a1864aa71cd7a794d58bc139e755e96a236c/oneko.js")
             .then(x => x.text())
-            .then(s => s.replace("./oneko.gif", "https://raw.githubusercontent.com/adryd325/oneko.js/14bab15a755d0e35cd4ae19c931d96d306f99f42/oneko.gif"))
+            .then(s => s.replace("./oneko.gif", "https://raw.githubusercontent.com/adryd325/oneko.js/14bab15a755d0e35cd4ae19c931d96d306f99f42/oneko.gif")
+                .replace("(isReducedMotion)", "(false)"))
             .then(eval);
     },
 

From 1df0b571af6c2c122033fa75889caff1f9193889 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 12 Dec 2023 22:56:01 -0300
Subject: [PATCH 252/632] Fix broken patches

---
 src/plugins/fakeNitro/index.ts           | 2 +-
 src/plugins/showHiddenChannels/index.tsx | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index 3ac755567..957771887 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -359,7 +359,7 @@ export default definePlugin({
         },
         // Separate patch for allowing using custom app icons
         {
-            find: "location:\"AppIconHome\"",
+            find: ".FreemiumAppIconIds.DEFAULT&&(",
             replacement: {
                 match: /\i\.\i\.isPremium\(\i\.\i\.getCurrentUser\(\)\)/,
                 replace: "true"
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index f242146c9..906bed504 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -77,7 +77,7 @@ export default definePlugin({
                 },
                 // Do not check for unreads when selecting the render level if the channel is hidden
                 {
-                    match: /(?=!\(0,\i\.getHasImportantUnread\)\(this\.record\))/,
+                    match: /(?<=&&)(?=!\i\.\i\.hasUnread\(this\.record\.id\))/,
                     replace: "$self.isHiddenChannel(this.record)||"
                 },
                 // Make channels we dont have access to be the same level as normal ones
@@ -334,12 +334,12 @@ export default definePlugin({
             replacement: [
                 {
                     // Remove the divider and the open chat button for the HiddenChannelLockScreen
-                    match: /"more-options-popout"\)\),(?<=let{channel:(\i).+?inCall:(\i).+?)/,
+                    match: /"more-options-popout"\)\),(?<=channel:(\i).+?inCall:(\i).+?)/,
                     replace: (m, channel, inCall) => `${m}${inCall}||!$self.isHiddenChannel(${channel},true)&&`
                 },
                 {
                     // Remove invite users button for the HiddenChannelLockScreen
-                    match: /"popup".{0,100}?if\((?<=let{channel:(\i).+?inCall:(\i).+?)/,
+                    match: /"popup".{0,100}?if\((?<=channel:(\i).+?inCall:(\i).+?)/,
                     replace: (m, channel, inCall) => `${m}(${inCall}||!$self.isHiddenChannel(${channel},true))&&`
                 },
             ]

From c86de3299ec780b4139b3eeb749673e2f3e7380a Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 12 Dec 2023 23:26:17 -0300
Subject: [PATCH 253/632] fixAll.eslint: `true` -> `"explicit"`

---
 .vscode/settings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 426ff6801..fa543b38c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": "explicit"
     },
     "[typescript]": {
         "editor.defaultFormatter": "vscode.typescript-language-features"

From 817cb9b60bff2fc2c84e8ba27408f698a34e3e9b Mon Sep 17 00:00:00 2001
From: ruukulada <126130342+ruukulada@users.noreply.github.com>
Date: Tue, 12 Dec 2023 21:40:13 -0500
Subject: [PATCH 254/632] GameActivityToggle: Icon cleanup (#2041)

---
 src/plugins/gameActivityToggle/index.tsx | 27 ++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/plugins/gameActivityToggle/index.tsx b/src/plugins/gameActivityToggle/index.tsx
index 2b84d26f1..99cee5b1c 100644
--- a/src/plugins/gameActivityToggle/index.tsx
+++ b/src/plugins/gameActivityToggle/index.tsx
@@ -28,21 +28,22 @@ import style from "./style.css?managed";
 const Button = findComponentByCodeLazy("Button.Sizes.NONE,disabled:");
 
 function makeIcon(showCurrentGame?: boolean) {
+    const controllerIcon = "M3.06 20.4q-1.53 0-2.37-1.065T.06 16.74l1.26-9q.27-1.8 1.605-2.97T6.06 3.6h11.88q1.8 0 3.135 1.17t1.605 2.97l1.26 9q.21 1.53-.63 2.595T20.94 20.4q-.63 0-1.17-.225T18.78 19.5l-2.7-2.7H7.92l-2.7 2.7q-.45.45-.99.675t-1.17.225Zm14.94-7.2q.51 0 .855-.345T19.2 12q0-.51-.345-.855T18 10.8q-.51 0-.855.345T16.8 12q0 .51.345 .855T18 13.2Zm-2.4-3.6q.51 0 .855-.345T16.8 8.4q0-.51-.345-.855T15.6 7.2q-.51 0-.855.345T14.4 8.4q0 .51.345 .855T15.6 9.6ZM6.9 13.2h1.8v-2.1h2.1v-1.8h-2.1v-2.1h-1.8v2.1h-2.1v1.8h2.1v2.1Z";
     return function () {
         return (
-            <svg
-                width="20"
-                height="20"
-                viewBox="0 0 24 24"
-            >
-                <path fill="currentColor" mask="url(#gameActivityMask)" d="M3.06 20.4q-1.53 0-2.37-1.065T.06 16.74l1.26-9q.27-1.8 1.605-2.97T6.06 3.6h11.88q1.8 0 3.135 1.17t1.605 2.97l1.26 9q.21 1.53-.63 2.595T20.94 20.4q-.63 0-1.17-.225T18.78 19.5l-2.7-2.7H7.92l-2.7 2.7q-.45.45-.99.675t-1.17.225Zm14.94-7.2q.51 0 .855-.345T19.2 12q0-.51-.345-.855T18 10.8q-.51 0-.855.345T16.8 12q0 .51.345 .855T18 13.2Zm-2.4-3.6q.51 0 .855-.345T16.8 8.4q0-.51-.345-.855T15.6 7.2q-.51 0-.855.345T14.4 8.4q0 .51.345 .855T15.6 9.6ZM6.9 13.2h1.8v-2.1h2.1v-1.8h-2.1v-2.1h-1.8v2.1h-2.1v1.8h2.1v2.1Z" />
-                {!showCurrentGame && <>
-                    <mask id="gameActivityMask" >
-                        <rect fill="white" x="0" y="0" width="24" height="24" />
-                        <path fill="black" d="M23.27 4.54 19.46.73 .73 19.46 4.54 23.27 23.27 4.54Z" />
-                    </mask>
-                    <path fill="var(--status-danger)" d="M23 2.27 21.73 1 1 21.73 2.27 23 23 2.27Z" />
-                </>}
+            <svg width="20" height="20" viewBox="0 0 24 24">
+                {showCurrentGame ? (
+                    <path fill="currentColor" d={controllerIcon} />
+                ) : (
+                    <>
+                        <mask id="gameActivityMask" >
+                            <rect fill="white" x="0" y="0" width="24" height="24" />
+                            <path fill="black" d="M23.27 4.73 19.27 .73 -.27 20.27 3.73 24.27Z" />
+                        </mask>
+                        <path fill="var(--status-danger)" mask="url(#gameActivityMask)" d={controllerIcon} />
+                        <path fill="var(--status-danger)" d="M22.7 2.7a1 1 0 0 0-1.4-1.4l-20 20a1 1 0 1 0 1.4 1.4Z" />
+                    </>
+                )}
             </svg>
         );
     };

From 40b3ec57ce87752d7d2ed09f4fc36e423207ec7e Mon Sep 17 00:00:00 2001
From: sappho <sappho@sappho.io>
Date: Wed, 13 Dec 2023 04:37:31 -0500
Subject: [PATCH 255/632] FakeNitro: fix non apng gif stickers being sent as
 images (#2050)

---
 src/plugins/fakeNitro/index.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index 957771887..6107df00e 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -787,7 +787,14 @@ export default definePlugin({
                 if (sticker.available !== false && (canUseStickers || sticker.guild_id === guildId))
                     break stickerBypass;
 
-                const link = this.getStickerLink(sticker.id);
+                // [12/12/2023]
+                // Work around an annoying bug where getStickerLink will return StickerType.GIF,
+                // but will give us a normal non animated png for no reason
+                // TODO: Remove this workaround when it's not needed anymore
+                let link = this.getStickerLink(sticker.id);
+                if (sticker.format_type === StickerType.GIF && link.includes(".png")) {
+                    link = link.replace(".png", ".gif");
+                }
                 if (sticker.format_type === StickerType.APNG) {
                     this.sendAnimatedSticker(link, sticker.id, channelId);
                     return { cancel: true };

From 2cf52d0775106dc46d09dc145c8bb30ea9cd05d7 Mon Sep 17 00:00:00 2001
From: zImPatrick <23613354+zImPatrick@users.noreply.github.com>
Date: Wed, 13 Dec 2023 21:41:50 +0100
Subject: [PATCH 256/632] AlwaysAnimate: Add guild banner (#2036)

---
 src/plugins/alwaysAnimate/index.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/plugins/alwaysAnimate/index.ts b/src/plugins/alwaysAnimate/index.ts
index d53e51452..eae5a5d3d 100644
--- a/src/plugins/alwaysAnimate/index.ts
+++ b/src/plugins/alwaysAnimate/index.ts
@@ -46,6 +46,13 @@ export default definePlugin({
                 match: /(?<=\.activityEmoji,.+?animate:)\i/,
                 replace: "!0"
             }
+        },
+        {
+            find: ".animatedBannerHoverLayer,onMouseEnter:",
+            replacement: {
+                match: /(?<=guildBanner:\i,animate:)\i/,
+                replace: "!0"
+            }
         }
     ]
 });

From b32959126e506c886d45fad2abb48a66d0554e4c Mon Sep 17 00:00:00 2001
From: Andrew Grant <agrantnmac@gmail.com>
Date: Wed, 13 Dec 2023 17:54:09 -0500
Subject: [PATCH 257/632] TypingIndicator: setting to disable for current
 channel (#2043)

---
 src/plugins/typingIndicator/index.tsx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/plugins/typingIndicator/index.tsx b/src/plugins/typingIndicator/index.tsx
index c5cf5a9d0..171c560d8 100644
--- a/src/plugins/typingIndicator/index.tsx
+++ b/src/plugins/typingIndicator/index.tsx
@@ -21,7 +21,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findExportedComponentLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, GuildMemberStore, i18n, RelationshipStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
+import { ChannelStore, GuildMemberStore, i18n, RelationshipStore, SelectedChannelStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
 
 import { buildSeveralUsers } from "../typingTweaks";
 
@@ -47,7 +47,7 @@ function TypingIndicator({ channelId }: { channelId: string; }) {
             return oldKeys.length === currentKeys.length && currentKeys.every(key => old[key] != null);
         }
     );
-
+    const currentChannelId: string = useStateFromStores([SelectedChannelStore], () => SelectedChannelStore.getChannelId());
     const guildId = ChannelStore.getChannel(channelId).guild_id;
 
     if (!settings.store.includeMutedChannels) {
@@ -55,6 +55,10 @@ function TypingIndicator({ channelId }: { channelId: string; }) {
         if (isChannelMuted) return null;
     }
 
+    if (!settings.store.includeCurrentChannel) {
+        if (currentChannelId === channelId) return null;
+    }
+
     const myId = UserStore.getCurrentUser()?.id;
 
     const typingUsersArray = Object.keys(typingUsers).filter(id => id !== myId && !(RelationshipStore.isBlocked(id) && !settings.store.includeBlockedUsers));
@@ -101,6 +105,11 @@ function TypingIndicator({ channelId }: { channelId: string; }) {
 }
 
 const settings = definePluginSettings({
+    includeCurrentChannel: {
+        type: OptionType.BOOLEAN,
+        description: "Whether to show the typing indicator for the currently selected channel",
+        default: true
+    },
     includeMutedChannels: {
         type: OptionType.BOOLEAN,
         description: "Whether to show the typing indicator for muted channels.",

From a8b0ce6f0353f5c6642c26afe8e0e8e371a5766a Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 14 Dec 2023 01:29:57 +0100
Subject: [PATCH 258/632] fix(notrack): murder sentry

---
 src/webpack/patchWebpack.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index f131471bf..db47c875a 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -58,6 +58,9 @@ if (window[WEBPACK_CHUNK]) {
     // normally, this is populated via webpackGlobal.push, which we patch below.
     // However, Discord has their .m prepopulated.
     // Thus, we use this hack to immediately access their wreq.m and patch all already existing factories
+    //
+    // Update: Discord now has TWO webpack instances. Their normal one and sentry
+    // Sentry does not push chunks to the global at all, so this same patch now also handles their sentry modules
     Object.defineProperty(Function.prototype, "m", {
         set(v: any) {
             // When using react devtools or other extensions, we may also catch their webpack here.
@@ -65,8 +68,6 @@ if (window[WEBPACK_CHUNK]) {
             if (new Error().stack?.includes("discord.com")) {
                 logger.info("Found webpack module factory");
                 patchFactories(v);
-
-                delete (Function.prototype as any).m;
             }
 
             Object.defineProperty(this, "m", {
@@ -142,7 +143,7 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
 
             // There are (at the time of writing) 11 modules exporting the window
             // Make these non enumerable to improve webpack search performance
-            if (exports === window) {
+            if (exports === window && require.c) {
                 Object.defineProperty(require.c, id, {
                     value: require.c[id],
                     enumerable: false,

From a5442d87d505fdc15c923a74324b0f4e9abec765 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 13 Dec 2023 21:41:09 -0300
Subject: [PATCH 259/632] Fix reporter and AlwaysAnimate patch

---
 scripts/generateReport.ts          | 8 ++++++--
 src/plugins/alwaysAnimate/index.ts | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 54db96e66..a91e81877 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -211,9 +211,12 @@ page.on("console", async e => {
 
         switch (tag) {
             case "WebpackInterceptor:":
+                const patchFailMatch = message.match(/Patch by (.+?) (had no effect|errored|found no module) \(Module id is (.+?)\): (.+)/)!;
+                if (!patchFailMatch) break;
+
                 process.exitCode = 1;
 
-                const [, plugin, type, id, regex] = message.match(/Patch by (.+?) (had no effect|errored|found no module) \(Module id is (.+?)\): (.+)/)!;
+                const [, plugin, type, id, regex] = patchFailMatch;
                 report.badPatches.push({
                     plugin,
                     type,
@@ -253,7 +256,7 @@ page.on("console", async e => {
         ).then(a => a.join(" ").trim());
 
 
-        if (text.length && !text.startsWith("Failed to load resource: the server responded with a status of") && !text.includes("found no module Filter:")) {
+        if (text.length && !text.startsWith("Failed to load resource: the server responded with a status of") && !text.includes("Webpack")) {
             console.error("[Unexpected Error]", text);
             report.otherErrors.push(text);
         }
@@ -293,6 +296,7 @@ function runTime(token: string) {
             p.patches?.forEach(patch => {
                 patch.plugin = p.name;
                 delete patch.predicate;
+                delete patch.group;
 
                 if (!Array.isArray(patch.replacement))
                     patch.replacement = [patch.replacement];
diff --git a/src/plugins/alwaysAnimate/index.ts b/src/plugins/alwaysAnimate/index.ts
index eae5a5d3d..dbec3b4e3 100644
--- a/src/plugins/alwaysAnimate/index.ts
+++ b/src/plugins/alwaysAnimate/index.ts
@@ -48,9 +48,10 @@ export default definePlugin({
             }
         },
         {
+            // Guild Banner
             find: ".animatedBannerHoverLayer,onMouseEnter:",
             replacement: {
-                match: /(?<=guildBanner:\i,animate:)\i/,
+                match: /(?<=guildBanner:\i,animate:)\i(?=}\))/,
                 replace: "!0"
             }
         }

From 2f1dc2c704d3ee284719576bbd9153266e41087c Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 13 Dec 2023 21:46:51 -0300
Subject: [PATCH 260/632] reporter: fix icon

---
 scripts/generateReport.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index a91e81877..b4033ecb3 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -137,7 +137,7 @@ async function printReport() {
             body: JSON.stringify({
                 description: "Here's the latest Vencord Report!",
                 username: "Vencord Reporter" + (CANARY ? " (Canary)" : ""),
-                avatar_url: "https://cdn.discordapp.com/icons/1015060230222131221/6101cff21e241cebb60c4a01563d0c01.webp?size=512",
+                avatar_url: "https://cdn.discordapp.com/avatars/1017176847865352332/c312b6b44179ae6817de7e4b09e9c6af.webp?size=512",
                 embeds: [
                     {
                         title: "Bad Patches",

From 2cd82944e360a5b045b5c28a3fac139eb9a00598 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 13 Dec 2023 22:01:07 -0300
Subject: [PATCH 261/632] Move commons from discord utils; Make ThemesTab use
 invite modal util

---
 src/api/Commands/commandHelpers.ts           |  3 +--
 src/components/VencordSettings/ThemesTab.tsx | 13 +++----------
 src/plugins/greetStickerPicker/index.tsx     |  3 +--
 src/plugins/spotifyShareCommands/index.ts    |  3 +--
 src/plugins/voiceMessages/index.tsx          |  3 +--
 src/utils/discord.tsx                        |  9 +--------
 src/webpack/common/utils.ts                  |  4 ++++
 7 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/src/api/Commands/commandHelpers.ts b/src/api/Commands/commandHelpers.ts
index 8f4a88e4b..dc5ecfd67 100644
--- a/src/api/Commands/commandHelpers.ts
+++ b/src/api/Commands/commandHelpers.ts
@@ -16,10 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { MessageActions } from "@utils/discord";
 import { mergeDefaults } from "@utils/misc";
 import { findByPropsLazy } from "@webpack";
-import { SnowflakeUtils } from "@webpack/common";
+import { MessageActions, SnowflakeUtils } from "@webpack/common";
 import { Message } from "discord-types/general";
 import type { PartialDeep } from "type-fest";
 
diff --git a/src/components/VencordSettings/ThemesTab.tsx b/src/components/VencordSettings/ThemesTab.tsx
index e65de2192..2808494a1 100644
--- a/src/components/VencordSettings/ThemesTab.tsx
+++ b/src/components/VencordSettings/ThemesTab.tsx
@@ -21,12 +21,13 @@ import { classNameFactory } from "@api/Styles";
 import { Flex } from "@components/Flex";
 import { DeleteIcon } from "@components/Icons";
 import { Link } from "@components/Link";
+import { openInviteModal } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
 import { showItemInFolder } from "@utils/native";
 import { useAwaiter } from "@utils/react";
 import { findByPropsLazy, findLazy } from "@webpack";
-import { Button, Card, FluxDispatcher, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
+import { Button, Card, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
 import { UserThemeHeader } from "main/themes";
 import type { ComponentType, Ref, SyntheticEvent } from "react";
 
@@ -125,15 +126,7 @@ function ThemeCard({ theme, enabled, onChange, onDelete }: ThemeCardProps) {
                             href={`https://discord.gg/${theme.invite}`}
                             onClick={async e => {
                                 e.preventDefault();
-                                const { invite } = await InviteActions.resolveInvite(theme.invite, "Desktop Modal");
-                                if (!invite) return showToast("Invalid or expired invite");
-
-                                FluxDispatcher.dispatch({
-                                    type: "INVITE_MODAL_OPEN",
-                                    invite,
-                                    code: theme.invite,
-                                    context: "APP"
-                                });
+                                theme.invite != null && openInviteModal(theme.invite).catch(() => showToast("Invalid or expired invite"));
                             }}
                         >
                             Discord Server
diff --git a/src/plugins/greetStickerPicker/index.tsx b/src/plugins/greetStickerPicker/index.tsx
index c2104af4e..73bb5125e 100644
--- a/src/plugins/greetStickerPicker/index.tsx
+++ b/src/plugins/greetStickerPicker/index.tsx
@@ -18,10 +18,9 @@
 
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import { MessageActions } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { ContextMenuApi, FluxDispatcher, Menu } from "@webpack/common";
+import { ContextMenuApi, FluxDispatcher, Menu, MessageActions } from "@webpack/common";
 import { Channel, Message } from "discord-types/general";
 
 interface Sticker {
diff --git a/src/plugins/spotifyShareCommands/index.ts b/src/plugins/spotifyShareCommands/index.ts
index 3569dd288..a3b82dc20 100644
--- a/src/plugins/spotifyShareCommands/index.ts
+++ b/src/plugins/spotifyShareCommands/index.ts
@@ -18,10 +18,9 @@
 
 import { ApplicationCommandInputType, sendBotMessage } from "@api/Commands";
 import { Devs } from "@utils/constants";
-import { MessageActions } from "@utils/discord";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { FluxDispatcher } from "@webpack/common";
+import { FluxDispatcher, MessageActions } from "@webpack/common";
 
 interface Album {
     id: string;
diff --git a/src/plugins/voiceMessages/index.tsx b/src/plugins/voiceMessages/index.tsx
index 17e10a4b8..f4898de68 100644
--- a/src/plugins/voiceMessages/index.tsx
+++ b/src/plugins/voiceMessages/index.tsx
@@ -21,13 +21,12 @@ import "./styles.css";
 import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
 import { Microphone } from "@components/Icons";
 import { Devs } from "@utils/constants";
-import { MessageActions } from "@utils/discord";
 import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModal } from "@utils/modal";
 import { useAwaiter } from "@utils/react";
 import definePlugin from "@utils/types";
 import { chooseFile } from "@utils/web";
 import { findByPropsLazy, findStoreLazy } from "@webpack";
-import { Button, FluxDispatcher, Forms, lodash, Menu, PermissionsBits, PermissionStore, RestAPI, SelectedChannelStore, showToast, SnowflakeUtils, Toasts, useEffect, useState } from "@webpack/common";
+import { Button, FluxDispatcher, Forms, lodash, Menu, MessageActions, PermissionsBits, PermissionStore, RestAPI, SelectedChannelStore, showToast, SnowflakeUtils, Toasts, useEffect, useState } from "@webpack/common";
 import { ComponentType } from "react";
 
 import { VoiceRecorderDesktop } from "./DesktopRecorder";
diff --git a/src/utils/discord.tsx b/src/utils/discord.tsx
index 788f0add7..74e1aefe8 100644
--- a/src/utils/discord.tsx
+++ b/src/utils/discord.tsx
@@ -17,18 +17,11 @@
 */
 
 import { MessageObject } from "@api/MessageEvents";
-import { findByPropsLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, ComponentDispatch, FluxDispatcher, GuildStore, MaskedLink, ModalImageClasses, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
+import { ChannelStore, ComponentDispatch, FluxDispatcher, GuildStore, InviteActions, MaskedLink, MessageActions, ModalImageClasses, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileActions, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
 import { Guild, Message, User } from "discord-types/general";
 
 import { ImageModal, ModalRoot, ModalSize, openModal } from "./modal";
 
-export const MessageActions = findByPropsLazy("editMessage", "sendMessage");
-export const UserProfileActions = findByPropsLazy("openUserProfileModal", "closeUserProfileModal");
-export const InviteActions = findByPropsLazy("resolveInvite");
-
-const InviteModalStore = findStoreLazy("InviteModalStore");
-
 /**
  * Open the invite modal
  * @param code The invite code
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index f5d2a9666..c62f745a9 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -133,3 +133,7 @@ export const zustandCreate: typeof import("zustand").default = findByCodeLazy("w
 
 const persistFilter = filters.byCode("[zustand persist middleware]");
 export const { persist: zustandPersist }: typeof import("zustand/middleware") = findLazy(m => m.persist && persistFilter(m.persist));
+
+export const MessageActions = findByPropsLazy("editMessage", "sendMessage");
+export const UserProfileActions = findByPropsLazy("openUserProfileModal", "closeUserProfileModal");
+export const InviteActions = findByPropsLazy("resolveInvite");

From 467c5e0c4c00b021ec8ae8ecf0ee929630ec7f31 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 17 Dec 2023 17:40:59 -0300
Subject: [PATCH 262/632] Delete FixImagesQuality

Discord fixed their issue with images getting converted to webp losing quality. In the future this plugin can be re-purposed to keep images format as the original, but that requires more than just removing part of the Discord code, and a bit of study to make sure it does not cause issues.
---
 src/plugins/fixImagesQuality/index.ts | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 src/plugins/fixImagesQuality/index.ts

diff --git a/src/plugins/fixImagesQuality/index.ts b/src/plugins/fixImagesQuality/index.ts
deleted file mode 100644
index 4acd9a921..000000000
--- a/src/plugins/fixImagesQuality/index.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-
-export default definePlugin({
-    name: "FixImagesQuality",
-    description: "Fixes the quality of images in the chat being horrible.",
-    authors: [Devs.Nuckyz],
-    patches: [
-        {
-            find: "handleImageLoad=",
-            replacement: [
-                {
-                    match: /(?<=getSrc\(\i\){.+?return )\i\.SUPPORTS_WEBP.+?:(?=\i&&\(\i="png"\))/,
-                    replace: ""
-                }
-            ]
-        }
-    ]
-});

From 9950bf00b276b69819cdb41d570877662c66e511 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 17 Dec 2023 18:06:16 -0300
Subject: [PATCH 263/632] GameActivityToggle: option to use old icon

---
 src/plugins/gameActivityToggle/index.tsx | 47 +++++++++++++++++-------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/plugins/gameActivityToggle/index.tsx b/src/plugins/gameActivityToggle/index.tsx
index 99cee5b1c..51feb9165 100644
--- a/src/plugins/gameActivityToggle/index.tsx
+++ b/src/plugins/gameActivityToggle/index.tsx
@@ -16,10 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { definePluginSettings } from "@api/Settings";
 import { disableStyle, enableStyle } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 import { findComponentByCodeLazy } from "@webpack";
 import { StatusSettingsStores } from "@webpack/common";
 
@@ -28,22 +29,31 @@ import style from "./style.css?managed";
 const Button = findComponentByCodeLazy("Button.Sizes.NONE,disabled:");
 
 function makeIcon(showCurrentGame?: boolean) {
-    const controllerIcon = "M3.06 20.4q-1.53 0-2.37-1.065T.06 16.74l1.26-9q.27-1.8 1.605-2.97T6.06 3.6h11.88q1.8 0 3.135 1.17t1.605 2.97l1.26 9q.21 1.53-.63 2.595T20.94 20.4q-.63 0-1.17-.225T18.78 19.5l-2.7-2.7H7.92l-2.7 2.7q-.45.45-.99.675t-1.17.225Zm14.94-7.2q.51 0 .855-.345T19.2 12q0-.51-.345-.855T18 10.8q-.51 0-.855.345T16.8 12q0 .51.345 .855T18 13.2Zm-2.4-3.6q.51 0 .855-.345T16.8 8.4q0-.51-.345-.855T15.6 7.2q-.51 0-.855.345T14.4 8.4q0 .51.345 .855T15.6 9.6ZM6.9 13.2h1.8v-2.1h2.1v-1.8h-2.1v-2.1h-1.8v2.1h-2.1v1.8h2.1v2.1Z";
+    const { oldIcon } = settings.use(["oldIcon"]);
+
+    const redLinePath = !oldIcon
+        ? "M22.7 2.7a1 1 0 0 0-1.4-1.4l-20 20a1 1 0 1 0 1.4 1.4Z"
+        : "M23 2.27 21.73 1 1 21.73 2.27 23 23 2.27Z";
+
+    const maskBlackPath = !oldIcon
+        ? "M23.27 4.73 19.27 .73 -.27 20.27 3.73 24.27Z"
+        : "M23.27 4.54 19.46.73 .73 19.46 4.54 23.27 23.27 4.54Z";
+
     return function () {
         return (
             <svg width="20" height="20" viewBox="0 0 24 24">
-                {showCurrentGame ? (
-                    <path fill="currentColor" d={controllerIcon} />
-                ) : (
-                    <>
-                        <mask id="gameActivityMask" >
-                            <rect fill="white" x="0" y="0" width="24" height="24" />
-                            <path fill="black" d="M23.27 4.73 19.27 .73 -.27 20.27 3.73 24.27Z" />
-                        </mask>
-                        <path fill="var(--status-danger)" mask="url(#gameActivityMask)" d={controllerIcon} />
-                        <path fill="var(--status-danger)" d="M22.7 2.7a1 1 0 0 0-1.4-1.4l-20 20a1 1 0 1 0 1.4 1.4Z" />
-                    </>
-                )}
+                <path
+                    fill={!showCurrentGame && !oldIcon ? "var(--status-danger)" : "currentColor"}
+                    mask={!showCurrentGame ? "url(#gameActivityMask)" : void 0}
+                    d="M3.06 20.4q-1.53 0-2.37-1.065T.06 16.74l1.26-9q.27-1.8 1.605-2.97T6.06 3.6h11.88q1.8 0 3.135 1.17t1.605 2.97l1.26 9q.21 1.53-.63 2.595T20.94 20.4q-.63 0-1.17-.225T18.78 19.5l-2.7-2.7H7.92l-2.7 2.7q-.45.45-.99.675t-1.17.225Zm14.94-7.2q.51 0 .855-.345T19.2 12q0-.51-.345-.855T18 10.8q-.51 0-.855.345T16.8 12q0 .51.345 .855T18 13.2Zm-2.4-3.6q.51 0 .855-.345T16.8 8.4q0-.51-.345-.855T15.6 7.2q-.51 0-.855.345T14.4 8.4q0 .51.345 .855T15.6 9.6ZM6.9 13.2h1.8v-2.1h2.1v-1.8h-2.1v-2.1h-1.8v2.1h-2.1v1.8h2.1v2.1Z"
+                />
+                {!showCurrentGame && <>
+                    <path fill="var(--status-danger)" d={redLinePath} />
+                    <mask id="gameActivityMask">
+                        <rect fill="white" x="0" y="0" width="24" height="24" />
+                        <path fill="black" d={maskBlackPath} />
+                    </mask>
+                </>}
             </svg>
         );
     };
@@ -63,10 +73,19 @@ function GameActivityToggleButton() {
     );
 }
 
+const settings = definePluginSettings({
+    oldIcon: {
+        type: OptionType.BOOLEAN,
+        description: "Use the old icon style before Discord icon redesign",
+        default: false
+    }
+});
+
 export default definePlugin({
     name: "GameActivityToggle",
     description: "Adds a button next to the mic and deafen button to toggle game activity.",
     authors: [Devs.Nuckyz, Devs.RuukuLada],
+    settings,
 
     patches: [
         {

From 2e04b3d1ef34a21fb2c897bef8e4ea908c2de9c4 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Sun, 17 Dec 2023 21:12:42 +0000
Subject: [PATCH 264/632] Implement Twitter easter egg for ShowConnections
 (#2062)

---
 src/plugins/showConnections/index.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/showConnections/index.tsx b/src/plugins/showConnections/index.tsx
index d4d59465e..83600e867 100644
--- a/src/plugins/showConnections/index.tsx
+++ b/src/plugins/showConnections/index.tsx
@@ -33,6 +33,7 @@ import { VerifiedIcon } from "./VerifiedIcon";
 
 const Section = findComponentByCodeLazy(".lastSection", "children:");
 const ThemeStore = findStoreLazy("ThemeStore");
+const platformHooks: { useLegacyPlatformType(platform: string): string; } = findByPropsLazy("useLegacyPlatformType");
 const platforms: { get(type: string): ConnectionPlatform; } = findByPropsLazy("isSupported", "getByUrl");
 const getTheme: (user: User, displayProfile: any) => any = findByCodeLazy(',"--profile-gradient-primary-color"');
 
@@ -111,7 +112,7 @@ function ConnectionsComponent({ id, theme }: { id: string, theme: string; }) {
 }
 
 function CompactConnectionComponent({ connection, theme }: { connection: Connection, theme: string; }) {
-    const platform = platforms.get(connection.type);
+    const platform = platforms.get(platformHooks.useLegacyPlatformType(connection.type));
     const url = platform.getPlatformUserUrl?.(connection);
 
     const img = (

From fdf3480b278536bb85759345279715575480dce0 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 20 Dec 2023 01:33:40 -0300
Subject: [PATCH 265/632] Fix DeArrow patch

---
 src/plugins/dearrow/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/dearrow/index.tsx b/src/plugins/dearrow/index.tsx
index 80eb84aa7..b02c80d3d 100644
--- a/src/plugins/dearrow/index.tsx
+++ b/src/plugins/dearrow/index.tsx
@@ -147,7 +147,7 @@ export default definePlugin({
         replacement: [
             // patch componentDidMount to replace embed thumbnail and title
             {
-                match: /render\(\)\{let\{embed:/,
+                match: /render\(\)\{.{0,30}let\{embed:/,
                 replace: "componentDidMount=$self.embedDidMount;$&"
             },
 

From 686f2d925f5d3f238b813481f827b7cd9ce2e0eb Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 21 Dec 2023 23:41:12 +0100
Subject: [PATCH 266/632] fix canary crashing

---
 src/plugins/blurNsfw/index.ts       | 4 ++--
 src/plugins/messageLogger/index.tsx | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/blurNsfw/index.ts b/src/plugins/blurNsfw/index.ts
index cb6be54c9..a80f9f260 100644
--- a/src/plugins/blurNsfw/index.ts
+++ b/src/plugins/blurNsfw/index.ts
@@ -45,8 +45,8 @@ export default definePlugin({
         {
             find: ".embedWrapper,embed",
             replacement: [{
-                match: /\.embedWrapper/g,
-                replace: "$&+(this.props.channel.nsfw?' vc-nsfw-img':'')"
+                match: /\.embedWrapper(?=.+?channel_id:(\i)\.id)/g,
+                replace: "$&+($1.nsfw?' vc-nsfw-img':'')"
             }]
         }
     ],
diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index ac43a9f0c..ef0aa03bb 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -328,6 +328,7 @@ export default definePlugin({
             // Attachment renderer
             // Module 96063
             find: ".removeAttachmentHoverButton",
+            group: true,
             replacement: [
                 {
                     match: /(className:\i,attachment:\i),/,

From 109d842e29476b140293ac4c3103a3ffa4dd3953 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 21 Dec 2023 21:46:22 -0300
Subject: [PATCH 267/632] Fix NSFWGateBypass possibly Vencord

---
 src/plugins/nsfwGateBypass/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/nsfwGateBypass/index.ts b/src/plugins/nsfwGateBypass/index.ts
index 3c5dbb4ca..b6f0f3e86 100644
--- a/src/plugins/nsfwGateBypass/index.ts
+++ b/src/plugins/nsfwGateBypass/index.ts
@@ -27,8 +27,8 @@ export default definePlugin({
         {
             find: ".nsfwAllowed=null",
             replacement: {
-                match: /(\w+)\.nsfwAllowed=/,
-                replace: "$1.nsfwAllowed=true;",
+                match: /(?<=\.nsfwAllowed=)null!==.+?(?=[,;])/,
+                replace: "!0",
             },
         },
     ],

From 5dee2e8549de195f7bdb213ce7bb7f6dde840811 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 21 Dec 2023 21:46:34 -0300
Subject: [PATCH 268/632] Future proof reporter to work in latest canary

---
 scripts/generateReport.ts | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index b4033ecb3..0a17e8d7e 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -350,7 +350,7 @@ function runTime(token: string) {
                 let invalidEntryPoint = false;
 
                 for (const id of chunkIds) {
-                    if (!wreq.u(id)) continue;
+                    if (wreq.u(id) == null || wreq.u(id) === "undefined.js") continue;
 
                     const isWasm = await fetch(wreq.p + wreq.u(id))
                         .then(r => r.text())
@@ -376,9 +376,22 @@ function runTime(token: string) {
                 } catch (err) { }
             }
 
-            const allChunks = Function("return " + (wreq.u.toString().match(/(?<=\()\{.+?\}/s)?.[0] ?? "null"))() as Record<string | number, string[]> | null;
-            if (!allChunks) throw new Error("Failed to get all chunks");
-            const chunksLeft = Object.keys(allChunks).filter(id => {
+            // Matches "id" or id:
+            const chunkIdRegex = /(?:"(\d+?)")|(?:(\d+?):)/g;
+            const wreqU = wreq.u.toString();
+
+            const allChunks = [] as string[];
+            let currentMatch: RegExpExecArray | null;
+
+            while ((currentMatch = chunkIdRegex.exec(wreqU)) != null) {
+                const id = currentMatch[1] ?? currentMatch[2];
+                if (id == null) continue;
+
+                allChunks.push(id);
+            }
+
+            if (allChunks.length === 0) throw new Error("Failed to get all chunks");
+            const chunksLeft = allChunks.filter(id => {
                 return !(validChunks.has(id) || invalidChunks.has(id));
             });
 

From 30bc979c8ddcb0da04fd494fdf2b8631183e3731 Mon Sep 17 00:00:00 2001
From: jd <28711824+jewdev@users.noreply.github.com>
Date: Sun, 31 Dec 2023 02:06:19 +0200
Subject: [PATCH 269/632] feat(Urban Dictionary): Chooses top rated definition
 & more results. (#2080)

---
 src/plugins/urbanDictionary/README.md | 13 +++++++++++++
 src/plugins/urbanDictionary/index.ts  | 22 ++++++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 src/plugins/urbanDictionary/README.md

diff --git a/src/plugins/urbanDictionary/README.md b/src/plugins/urbanDictionary/README.md
new file mode 100644
index 000000000..e065456a3
--- /dev/null
+++ b/src/plugins/urbanDictionary/README.md
@@ -0,0 +1,13 @@
+# Urban Dictionary
+
+Use /urban slash command to search for a definition for a word on [Urban Dictionary](https://www.urbandictionary.com/).
+
+## Preview
+
+![preview](https://i.imgur.com/1zwzj38.png)
+
+## Usage
+
+- Enable this plugin
+- Set plugin settings as desired
+- Type /urban and start getting definitions right into your Discord client.
diff --git a/src/plugins/urbanDictionary/index.ts b/src/plugins/urbanDictionary/index.ts
index 840fe5cb6..89dcdcba4 100644
--- a/src/plugins/urbanDictionary/index.ts
+++ b/src/plugins/urbanDictionary/index.ts
@@ -18,14 +18,24 @@
 
 import { ApplicationCommandOptionType, sendBotMessage } from "@api/Commands";
 import { ApplicationCommandInputType } from "@api/Commands/types";
+import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
+
+const settings = definePluginSettings({
+    resultsAmount: {
+        type: OptionType.NUMBER,
+        description: "The amount of results you want to get (more gives better results, but is slower)",
+        default: 10
+    }
+});
 
 export default definePlugin({
     name: "UrbanDictionary",
     description: "Search for a word on Urban Dictionary via /urban slash command",
     authors: [Devs.jewdev],
     dependencies: ["CommandsAPI"],
+    settings,
     commands: [
         {
             name: "urban",
@@ -41,12 +51,16 @@ export default definePlugin({
             ],
             execute: async (args, ctx) => {
                 try {
-                    const query = encodeURIComponent(args[0].value);
-                    const { list: [definition] } = await (await fetch(`https://api.urbandictionary.com/v0/define?term=${query}`)).json();
+                    const query: string = encodeURIComponent(args[0].value);
+                    const { list } = await fetch(`https://api.urbandictionary.com/v0/define?term=${query}&per_page=${settings.store.resultsAmount}`).then(response => response.json());
 
-                    if (!definition)
+                    if (!list.length)
                         return void sendBotMessage(ctx.channel.id, { content: "No results found." });
 
+                    const definition = list.reduce((prev, curr) => {
+                        return prev.thumbs_up > curr.thumbs_up ? prev : curr;
+                    });
+
                     const linkify = (text: string) => text
                         .replaceAll("\r\n", "\n")
                         .replace(/([*>_`~\\])/gsi, "\\$1")

From 7e395fc6968aced5d45fae55db646def1d555c49 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sun, 31 Dec 2023 05:02:05 +0100
Subject: [PATCH 270/632] Update codeburger mirror

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8611babd7..a43c9f834 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Vencord
 
-[![Codeberg Mirror](https://img.shields.io/static/v1?style=for-the-badge&label=Codeberg%20Mirror&message=codeberg.org/Ven/cord&color=2185D0&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABmJLR0QA/wD/AP+gvaeTAAAKbUlEQVR4nNVae3AV5RX/nW/3Pva+b24e5HHzIICQKGoiYiW8NFBFgohaa6ctglpbFSujSGurzUinohWsOij/gGX6R2fqOK0d1FYTEZXaTrWCBbEikJCEyCvkeXNvkrunf+zdkJDkPnex/c3cmd29+53v/M6e73znnF2Cydj4Tntldzi6qrN/qKqzf2jy6b7BnL4B1dI7oMp9AyoRAIdVsNMqhlxWMZjtspzyK/Jhr036OMsm//bh2vzPzNSPzBD6xFutd7R0Dq758ky4orkjYuc05RCAkixbeEq2/UCJ1/LczxcX/c5IPfU5DMHmxpbCpu7o1k/b+xc1n43YjJI7EqV+W2RmvuPt0oDjB2vn5bQbITNjAzzdeKK8qTO0bU9T77zucNQUjzofHrvENWWu3aUBZfW6+ZOOZiIrbYXrmUXo9daX3v6i667O/iGRiRLpwqtIvKDc+0efJ3hb/UIaSkdGWgZ4sqGt9r2m3lc/P9HvSWe80ZiRp3TPL/UsX1+bvyvVsSkb4NE3WjbuPNj5SM8Fcvdk4bAKrqvwv7DxhuCPUxmXNIn6XSy3nWr6R8OhrqrU1btwqJ3m/bgwu/SqZJdEUgbYsuuka09b9/4Pm3tLMlPvwuAbpe6m+RcplfdcURBKdG9CA2zZddLV2Nx1+JO2vlxj1LswqCpynlxc6SxLZIS40bueWfy9vXvv/xt5APhXa1/u7v+EPqvfxXK8++IaoO2Vpn9+cLS33FjVLhw+bOotOX7q6N/i3TOhAX7y+rHN/+sBLxm8fah71k93tjw/0f/jGuDJxtZrdh7setA8tS4sdn7eef+v3mmfP95/Ywxw6x9Yev9I35/6Iubv83WVfl5a6Uu3VkoavZEo7TnS/Vo98xi+Yy6UKC3bDp7sd5ut1OWFDjyzNMib6oq5Oug0ezp8dqLfG3r92Nbzr48ywNONJ8obDnV/z2xlAk4ZW1aUqhaJIAvCb5YVqwFn3GBtCBoO9dz5TOPxUbnMKAM0dYa2d5lc2AgCNi8r5klui3aBgWynjE11QZbI3FV3NjQkjnYNbB+lj36wubGlcE9T71xTNQDw0Px8nlvmHl73GmfCrKCL19Tkmh4P9jT1LHz2vVP5+vmwAZq71a1m1/PXTPXwD68eS5KIEVUZd1yZwwumeEw1Qld/lJrPhF7Sz4cNsO+rUK2ZExd6rfj10iCPZ2GJCCoAZuCJxQUc9FvNVAX72kPX6ccC0Hp4zR0Ru1kT2mTCSzeXqn5l/EAniMAqoDLDYZWwqa5EVSzmhaKmsxHbLxvbbgdiBmjpHFxj2mwANlxXxBdPUib8nwgQgqAyEFUZxT4L1i/MN3UpHDsTWQvEDHDoTLjCrIluuyzAt8zMSkhGFhp5hrYUFk3z8IqZftOMcKRj4GIAEM80tFccM8n9Z+Qq+MXigqRIWCQCMzQvYIbKwH1X53FFnjkr88iZsLKpoXWa6BiIrjbDzF67hK23lKp2Obm1LAstPEZVjTwDkAio/2ZQ9dolw/VjAB0DfKfoCg9WGy2cADy1NMhBX2rR3CIRGICq8rAhAg4Jj9UWsDBhg+4MR6vF2VC0zGjB99fk8eJp3pQdyyrRMHF9KURVxswCB6+alWO4o3b2RyeLU32D2UYKnVPm5gfm5qWlrF0Wo4hzbCmoDNw0089XlboNNcLpvsFc0RtRDXuNle+x4Lkbi9PO6WWJIBFGEY+qjGjswtq5eVzosRilLnoiUavoH1INiTCyIDy/vETNcmRW1dl0L4gRVxmx3YFhlwnrry1QrZIxASE0yJIIDaiGSHt8UQFXF2Ve1zusYgzxkXGhyGvFvePUE+mgfyAqhGqAqKWVPv5udbYhSjmtkpYWq6OJqzFjqCpjTpmbl1Rk3klSGRBWmTISNC3Hjo1LgoYFJ0GA1aIVR+cTVxlQoS2Pb18a4PLszMKXzSJYuCySmq4Al03CiytKVYfBhYvLKk1IXE+XLRLhwZp81WlNf26HTFHhd0jhdAYTgKduCPLkgPHfQjitYkLiAIEZBDBlu2R6aF7euCV2Mgg45bDw2qWOdAavnp3D109PPdlJBvpTnYg4kVY3MDMuylVw62WJi63x4LHLZ0TAIR9OdWBVodPUclUQwWmT4hLXfgCIUDfDi6oiR8rzBJzyl8LnkD9KZVCOU8aLN5eoshnJ+Qh4bFJC4gztmEjgrtk5anaKnWWfXfpIuBTLjmSpSILw/E0laq7LuGxsIngVCYmIa96hLRG3TaZ1C/KTfjAEQLFIO8TPFk7aH/RZI8kMWrdgEs8udqXLKSUoMkEW4ETEQTRsoHyPlVZfmVw+Uuy3hR9bVHBQAMD0XPu/Ew24dqqH777K/La1DiKCxyYlRRzQymgG4+oyDxZOTdxZnp5r3wvEWmJ5btuL8W4uzbJh87LitLebdOFVpKSJx4IlwIzbL81CcYLO8iSX/IImGQCYae6Wg/2tXQNjNnW7LPDKyilqZd7ETU2zEBlifNTSS4i9PNFIx44x4jh2nZlBsUr0dN8QP/6XVhEaHJvnlfhtkXd/NF0BUextKRFXFznfGk+JDdcX8tdBHtDa6YpFsB4I9ac88omf8wbEgqa2XAIOme6bM35foqrQ+QZIKwGG80ifVbrXZZNGDfhOVYBvviS9JMMoaP3AEcQpPnHdOxiMGXkKbrx4dGfZY5c4T8H9+vmwAeqXFLXOKXW9r59fWuDA44sKv1byAOBzyCkTH+kdS2f4MLPgXJI0p9T17vrFxcf181GVxEUB+0qfIqt+RcKWFSWGNR4ygd4RTpW4HiCJgFWzstmnSPA7ZLU827pypPwxDB/687GXl1X6Vs6bbGz/LRN80hZCT+yLFZ0cgHED4egACeiXm89GsP9EePuzy4rvGil7jAGYmQDsBjDHUBYZ4GhHBMfORigd4rpnyIS9u6d4rqgnGrUtjCmmSYuOqwB0GcwjbWh9xviurpNnxnDA1IspMPe6bOL755MHJvhKjIgOA7jbJD4pw22Thj+kSIW47h2KRaydVezeP57sCdspRPQqgGeNJJIuBAE+ReJUiOv32mXaXjPZs21C2QnmXgdghyEsMoRfkVMiDgCywF/by9z3xJMb1wCxeHAPgDczZpAh/Iq+HSYmDjCsstgThmf5t4ii8eQm7CgS0SCA5QBezoRApnBaBSyCEhIHCLJEb4ZUd+2SqZSwzE+qpUpEQ9CC4qb01M8cRIQsh8zxiKsMtsn08nvlnrpkyAPj5AGJwMw3AtgGwJ/q2ExxvHsQB74KxfKBMblAyGmTHq4pc4/5GjQeUm6qE9FrAK4E8H6ie41GlkN/jTk6F5Ak2ueUpNmpkgfSMAAAENERAAsB3AHgZDoy0oFdFnBYpXPEBfU4beLRD6Z4qmumug+kIzPjaoeZfQDWAHgAQFam8hLh4MkwWjsHemyS2OF08IYrCjynzZ4zKTCzi5nXMvOnzBw16bevIxR95JOj7DNKb1PqXWa+HMDtAGoBXII0lxq0N2OfAmgA8Hsi2muMhudgesHPzNkA5gKoADADwFRoS8UHQO+x9wLoBNAB4AsAnwM4AOADIjLVxf8L9kdXUOE0IskAAAAASUVORK5CYII=)](https://codeberg.org/Ven/cord)
+[![Codeberg Mirror](https://img.shields.io/static/v1?style=for-the-badge&label=Codeberg%20Mirror&message=codeberg.org/Vee/cord&color=2185D0&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABmJLR0QA/wD/AP+gvaeTAAAKbUlEQVR4nNVae3AV5RX/nW/3Pva+b24e5HHzIICQKGoiYiW8NFBFgohaa6ctglpbFSujSGurzUinohWsOij/gGX6R2fqOK0d1FYTEZXaTrWCBbEikJCEyCvkeXNvkrunf+zdkJDkPnex/c3cmd29+53v/M6e73znnF2Cydj4Tntldzi6qrN/qKqzf2jy6b7BnL4B1dI7oMp9AyoRAIdVsNMqhlxWMZjtspzyK/Jhr036OMsm//bh2vzPzNSPzBD6xFutd7R0Dq758ky4orkjYuc05RCAkixbeEq2/UCJ1/LczxcX/c5IPfU5DMHmxpbCpu7o1k/b+xc1n43YjJI7EqV+W2RmvuPt0oDjB2vn5bQbITNjAzzdeKK8qTO0bU9T77zucNQUjzofHrvENWWu3aUBZfW6+ZOOZiIrbYXrmUXo9daX3v6i667O/iGRiRLpwqtIvKDc+0efJ3hb/UIaSkdGWgZ4sqGt9r2m3lc/P9HvSWe80ZiRp3TPL/UsX1+bvyvVsSkb4NE3WjbuPNj5SM8Fcvdk4bAKrqvwv7DxhuCPUxmXNIn6XSy3nWr6R8OhrqrU1btwqJ3m/bgwu/SqZJdEUgbYsuuka09b9/4Pm3tLMlPvwuAbpe6m+RcplfdcURBKdG9CA2zZddLV2Nx1+JO2vlxj1LswqCpynlxc6SxLZIS40bueWfy9vXvv/xt5APhXa1/u7v+EPqvfxXK8++IaoO2Vpn9+cLS33FjVLhw+bOotOX7q6N/i3TOhAX7y+rHN/+sBLxm8fah71k93tjw/0f/jGuDJxtZrdh7setA8tS4sdn7eef+v3mmfP95/Ywxw6x9Yev9I35/6Iubv83WVfl5a6Uu3VkoavZEo7TnS/Vo98xi+Yy6UKC3bDp7sd5ut1OWFDjyzNMib6oq5Oug0ezp8dqLfG3r92Nbzr48ywNONJ8obDnV/z2xlAk4ZW1aUqhaJIAvCb5YVqwFn3GBtCBoO9dz5TOPxUbnMKAM0dYa2d5lc2AgCNi8r5klui3aBgWynjE11QZbI3FV3NjQkjnYNbB+lj36wubGlcE9T71xTNQDw0Px8nlvmHl73GmfCrKCL19Tkmh4P9jT1LHz2vVP5+vmwAZq71a1m1/PXTPXwD68eS5KIEVUZd1yZwwumeEw1Qld/lJrPhF7Sz4cNsO+rUK2ZExd6rfj10iCPZ2GJCCoAZuCJxQUc9FvNVAX72kPX6ccC0Hp4zR0Ru1kT2mTCSzeXqn5l/EAniMAqoDLDYZWwqa5EVSzmhaKmsxHbLxvbbgdiBmjpHFxj2mwANlxXxBdPUib8nwgQgqAyEFUZxT4L1i/MN3UpHDsTWQvEDHDoTLjCrIluuyzAt8zMSkhGFhp5hrYUFk3z8IqZftOMcKRj4GIAEM80tFccM8n9Z+Qq+MXigqRIWCQCMzQvYIbKwH1X53FFnjkr88iZsLKpoXWa6BiIrjbDzF67hK23lKp2Obm1LAstPEZVjTwDkAio/2ZQ9dolw/VjAB0DfKfoCg9WGy2cADy1NMhBX2rR3CIRGICq8rAhAg4Jj9UWsDBhg+4MR6vF2VC0zGjB99fk8eJp3pQdyyrRMHF9KURVxswCB6+alWO4o3b2RyeLU32D2UYKnVPm5gfm5qWlrF0Wo4hzbCmoDNw0089XlboNNcLpvsFc0RtRDXuNle+x4Lkbi9PO6WWJIBFGEY+qjGjswtq5eVzosRilLnoiUavoH1INiTCyIDy/vETNcmRW1dl0L4gRVxmx3YFhlwnrry1QrZIxASE0yJIIDaiGSHt8UQFXF2Ve1zusYgzxkXGhyGvFvePUE+mgfyAqhGqAqKWVPv5udbYhSjmtkpYWq6OJqzFjqCpjTpmbl1Rk3klSGRBWmTISNC3Hjo1LgoYFJ0GA1aIVR+cTVxlQoS2Pb18a4PLszMKXzSJYuCySmq4Al03CiytKVYfBhYvLKk1IXE+XLRLhwZp81WlNf26HTFHhd0jhdAYTgKduCPLkgPHfQjitYkLiAIEZBDBlu2R6aF7euCV2Mgg45bDw2qWOdAavnp3D109PPdlJBvpTnYg4kVY3MDMuylVw62WJi63x4LHLZ0TAIR9OdWBVodPUclUQwWmT4hLXfgCIUDfDi6oiR8rzBJzyl8LnkD9KZVCOU8aLN5eoshnJ+Qh4bFJC4gztmEjgrtk5anaKnWWfXfpIuBTLjmSpSILw/E0laq7LuGxsIngVCYmIa96hLRG3TaZ1C/KTfjAEQLFIO8TPFk7aH/RZI8kMWrdgEs8udqXLKSUoMkEW4ETEQTRsoHyPlVZfmVw+Uuy3hR9bVHBQAMD0XPu/Ew24dqqH777K/La1DiKCxyYlRRzQymgG4+oyDxZOTdxZnp5r3wvEWmJ5btuL8W4uzbJh87LitLebdOFVpKSJx4IlwIzbL81CcYLO8iSX/IImGQCYae6Wg/2tXQNjNnW7LPDKyilqZd7ETU2zEBlifNTSS4i9PNFIx44x4jh2nZlBsUr0dN8QP/6XVhEaHJvnlfhtkXd/NF0BUextKRFXFznfGk+JDdcX8tdBHtDa6YpFsB4I9ac88omf8wbEgqa2XAIOme6bM35foqrQ+QZIKwGG80ifVbrXZZNGDfhOVYBvviS9JMMoaP3AEcQpPnHdOxiMGXkKbrx4dGfZY5c4T8H9+vmwAeqXFLXOKXW9r59fWuDA44sKv1byAOBzyCkTH+kdS2f4MLPgXJI0p9T17vrFxcf181GVxEUB+0qfIqt+RcKWFSWGNR4ygd4RTpW4HiCJgFWzstmnSPA7ZLU827pypPwxDB/687GXl1X6Vs6bbGz/LRN80hZCT+yLFZ0cgHED4egACeiXm89GsP9EePuzy4rvGil7jAGYmQDsBjDHUBYZ4GhHBMfORigd4rpnyIS9u6d4rqgnGrUtjCmmSYuOqwB0GcwjbWh9xviurpNnxnDA1IspMPe6bOL755MHJvhKjIgOA7jbJD4pw22Thj+kSIW47h2KRaydVezeP57sCdspRPQqgGeNJJIuBAE+ReJUiOv32mXaXjPZs21C2QnmXgdghyEsMoRfkVMiDgCywF/by9z3xJMb1wCxeHAPgDczZpAh/Iq+HSYmDjCsstgThmf5t4ii8eQm7CgS0SCA5QBezoRApnBaBSyCEhIHCLJEb4ZUd+2SqZSwzE+qpUpEQ9CC4qb01M8cRIQsh8zxiKsMtsn08nvlnrpkyAPj5AGJwMw3AtgGwJ/q2ExxvHsQB74KxfKBMblAyGmTHq4pc4/5GjQeUm6qE9FrAK4E8H6ie41GlkN/jTk6F5Ak2ueUpNmpkgfSMAAAENERAAsB3AHgZDoy0oFdFnBYpXPEBfU4beLRD6Z4qmumug+kIzPjaoeZfQDWAHgAQFam8hLh4MkwWjsHemyS2OF08IYrCjynzZ4zKTCzi5nXMvOnzBw16bevIxR95JOj7DNKb1PqXWa+HMDtAGoBXII0lxq0N2OfAmgA8Hsi2muMhudgesHPzNkA5gKoADADwFRoS8UHQO+x9wLoBNAB4AsAnwM4AOADIjLVxf8L9kdXUOE0IskAAAAASUVORK5CYII=)](https://codeberg.org/Vee/cord)
 
 The cutest Discord client mod
 

From d0dfdbbd5fc263ab105fb9d9f1c2f1295a4c8c7e Mon Sep 17 00:00:00 2001
From: Lewis Crichton <lewi@lewisakura.moe>
Date: Thu, 28 Dec 2023 02:02:49 +0000
Subject: [PATCH 271/632] fix: Vencord_cloudSecret check (#2077)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

finally got around to fixing it - `null` is never a valid return value,
it's `undefined` 🤦
---
 src/Vencord.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Vencord.ts b/src/Vencord.ts
index a106a0b7d..29e965fa0 100644
--- a/src/Vencord.ts
+++ b/src/Vencord.ts
@@ -44,7 +44,7 @@ async function syncSettings() {
     // pre-check for local shared settings
     if (
         Settings.cloud.authenticated &&
-        await dsGet("Vencord_cloudSecret") === null // this has been enabled due to local settings share or some other bug
+        !await dsGet("Vencord_cloudSecret") // this has been enabled due to local settings share or some other bug
     ) {
         // show a notification letting them know and tell them how to fix it
         showNotification({
@@ -145,4 +145,3 @@ document.addEventListener("DOMContentLoaded", () => {
         }));
     }
 }, { once: true });
-

From a963a19bdc67400a024253fd8285bf7677be7db1 Mon Sep 17 00:00:00 2001
From: Jack <30497388+FieryFlames@users.noreply.github.com>
Date: Wed, 3 Jan 2024 07:37:56 -0500
Subject: [PATCH 272/632] fix(Decor): Fix AvatarDecorationModalPreview find
 (#2089)

---
 src/plugins/decor/ui/components/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/decor/ui/components/index.ts b/src/plugins/decor/ui/components/index.ts
index 8f39a10ee..8fe41fc92 100644
--- a/src/plugins/decor/ui/components/index.ts
+++ b/src/plugins/decor/ui/components/index.ts
@@ -19,7 +19,7 @@ export let DecorationGridItem: DecorationGridItemComponent;
 export const setDecorationGridItem = v => DecorationGridItem = v;
 
 export const AvatarDecorationModalPreview = LazyComponentWebpack(() => {
-    const component = findComponentByCode("AvatarDecorationModalPreview");
+    const component = findComponentByCode(".shopPreviewBanner");
     return React.memo(component);
 });
 

From 1eb2510353cf3ffac9eb746aba8e08d01a54ac06 Mon Sep 17 00:00:00 2001
From: nexpid <60316309+nexpid@users.noreply.github.com>
Date: Wed, 3 Jan 2024 13:49:03 +0100
Subject: [PATCH 273/632] feat(Decor): Enforce guidelines more (#2035)

---
 src/plugins/decor/index.tsx                   |  31 +----
 src/plugins/decor/settings.tsx                |  47 +++++++
 .../decor/ui/modals/ChangeDecorationModal.tsx | 110 ++++++++--------
 .../decor/ui/modals/CreateDecorationModal.tsx | 121 +++++++++---------
 .../decor/ui/modals/GuidelinesModal.tsx       |  68 ++++++++++
 src/plugins/decor/ui/styles.css               |   4 +-
 6 files changed, 242 insertions(+), 139 deletions(-)
 create mode 100644 src/plugins/decor/settings.tsx
 create mode 100644 src/plugins/decor/ui/modals/GuidelinesModal.tsx

diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx
index 4dd7aa0c9..ce546d309 100644
--- a/src/plugins/decor/index.tsx
+++ b/src/plugins/decor/index.tsx
@@ -6,21 +6,17 @@
 
 import "./ui/styles.css";
 
-import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { Link } from "@components/Link";
 import { Devs } from "@utils/constants";
-import { Margins } from "@utils/margins";
-import { classes } from "@utils/misc";
-import { closeAllModals } from "@utils/modal";
-import definePlugin, { OptionType } from "@utils/types";
+import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { FluxDispatcher, Forms, UserStore } from "@webpack/common";
+import { UserStore } from "@webpack/common";
 
 import { CDN_URL, RAW_SKU_ID, SKU_ID } from "./lib/constants";
 import { useAuthorizationStore } from "./lib/stores/AuthorizationStore";
 import { useCurrentUserDecorationsStore } from "./lib/stores/CurrentUserDecorationsStore";
 import { useUserDecorAvatarDecoration, useUsersDecorationsStore } from "./lib/stores/UsersDecorationsStore";
+import { settings } from "./settings";
 import { setDecorationGridDecoration, setDecorationGridItem } from "./ui/components";
 import DecorSection from "./ui/components/DecorSection";
 
@@ -30,27 +26,6 @@ export interface AvatarDecoration {
     skuId: string;
 }
 
-const settings = definePluginSettings({
-    changeDecoration: {
-        type: OptionType.COMPONENT,
-        description: "Change your avatar decoration",
-        component() {
-            return <div>
-                <DecorSection hideTitle hideDivider noMargin />
-                <Forms.FormText type="description" className={classes(Margins.top8, Margins.bottom8)}>
-                    You can also access Decor decorations from the <Link
-                        href="/settings/profile-customization"
-                        onClick={e => {
-                            e.preventDefault();
-                            closeAllModals();
-                            FluxDispatcher.dispatch({ type: "USER_SETTINGS_MODAL_SET_SECTION", section: "Profile Customization" });
-                        }}
-                    >Profiles</Link> page.
-                </Forms.FormText>
-            </div>;
-        }
-    }
-});
 export default definePlugin({
     name: "Decor",
     description: "Create and use your own custom avatar decorations, or pick your favorite from the presets.",
diff --git a/src/plugins/decor/settings.tsx b/src/plugins/decor/settings.tsx
new file mode 100644
index 000000000..0d3628cc6
--- /dev/null
+++ b/src/plugins/decor/settings.tsx
@@ -0,0 +1,47 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { Link } from "@components/Link";
+import { Margins } from "@utils/margins";
+import { classes } from "@utils/misc";
+import { closeAllModals } from "@utils/modal";
+import { OptionType } from "@utils/types";
+import { FluxDispatcher, Forms } from "@webpack/common";
+
+import DecorSection from "./ui/components/DecorSection";
+
+export const settings = definePluginSettings({
+    changeDecoration: {
+        type: OptionType.COMPONENT,
+        description: "Change your avatar decoration",
+        component() {
+            if (!Vencord.Plugins.plugins.Decor.started) return <Forms.FormText>
+                Enable Decor and restart your client to change your avatar decoration.
+            </Forms.FormText>;
+
+            return <div>
+                <DecorSection hideTitle hideDivider noMargin />
+                <Forms.FormText type="description" className={classes(Margins.top8, Margins.bottom8)}>
+                    You can also access Decor decorations from the <Link
+                        href="/settings/profile-customization"
+                        onClick={e => {
+                            e.preventDefault();
+                            closeAllModals();
+                            FluxDispatcher.dispatch({ type: "USER_SETTINGS_MODAL_SET_SECTION", section: "Profile Customization" });
+                        }}
+                    >Profiles</Link> page.
+                </Forms.FormText>
+            </div>;
+        }
+    },
+    agreedToGuidelines: {
+        type: OptionType.BOOLEAN,
+        description: "Agreed to guidelines",
+        hidden: true,
+        default: false
+    }
+});
diff --git a/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx b/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx
index bed007174..f2a482818 100644
--- a/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx
+++ b/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { openInviteModal } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
-import { closeAllModals, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { closeAllModals, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import { Alerts, Button, FluxDispatcher, Forms, GuildStore, NavigationRouter, Parser, Text, Tooltip, useEffect, UserStore, UserUtils, useState } from "@webpack/common";
 import { User } from "discord-types/general";
@@ -18,6 +19,7 @@ import { GUILD_ID, INVITE_KEY } from "../../lib/constants";
 import { useAuthorizationStore } from "../../lib/stores/AuthorizationStore";
 import { useCurrentUserDecorationsStore } from "../../lib/stores/CurrentUserDecorationsStore";
 import { decorationToAvatarDecoration } from "../../lib/utils/decoration";
+import { settings } from "../../settings";
 import { cl, requireAvatarDecorationModal } from "../";
 import { AvatarDecorationModalPreview } from "../components";
 import DecorationGridCreate from "../components/DecorationGridCreate";
@@ -25,6 +27,7 @@ import DecorationGridNone from "../components/DecorationGridNone";
 import DecorDecorationGridDecoration from "../components/DecorDecorationGridDecoration";
 import SectionedGridList from "../components/SectionedGridList";
 import { openCreateDecorationModal } from "./CreateDecorationModal";
+import { openGuidelinesModal } from "./GuidelinesModal";
 
 const UserSummaryItem = findComponentByCodeLazy("defaultRenderUser", "showDefaultAvatarsForNullUsers");
 const DecorationModalStyles = findByPropsLazy("modalFooterShopButton");
@@ -83,7 +86,7 @@ function SectionHeader({ section }: { section: Section; }) {
     </div>;
 }
 
-export default function ChangeDecorationModal(props: any) {
+function ChangeDecorationModal(props: ModalProps) {
     // undefined = not trying, null = none, Decoration = selected
     const [tryingDecoration, setTryingDecoration] = useState<Decoration | null | undefined>(undefined);
     const isTryingDecoration = typeof tryingDecoration !== "undefined";
@@ -116,6 +119,7 @@ export default function ChangeDecorationModal(props: any) {
     const data = [
         {
             title: "Your Decorations",
+            subtitle: "You can delete your own decorations by right clicking on them.",
             sectionKey: "ownDecorations",
             items: ["none", ...ownDecorations, "create"]
         },
@@ -148,60 +152,62 @@ export default function ChangeDecorationModal(props: any) {
             className={cl("change-decoration-modal-content")}
             scrollbarType="none"
         >
-            <SectionedGridList
-                renderItem={item => {
-                    if (typeof item === "string") {
-                        switch (item) {
-                            case "none":
-                                return <DecorationGridNone
-                                    className={cl("change-decoration-modal-decoration")}
-                                    isSelected={activeSelectedDecoration === null}
-                                    onSelect={() => setTryingDecoration(null)}
-                                />;
-                            case "create":
-                                return <Tooltip text="You already have a decoration pending review" shouldShow={hasDecorationPendingReview}>
-                                    {tooltipProps => <DecorationGridCreate
+            <ErrorBoundary>
+                <SectionedGridList
+                    renderItem={item => {
+                        if (typeof item === "string") {
+                            switch (item) {
+                                case "none":
+                                    return <DecorationGridNone
                                         className={cl("change-decoration-modal-decoration")}
+                                        isSelected={activeSelectedDecoration === null}
+                                        onSelect={() => setTryingDecoration(null)}
+                                    />;
+                                case "create":
+                                    return <Tooltip text="You already have a decoration pending review" shouldShow={hasDecorationPendingReview}>
+                                        {tooltipProps => <DecorationGridCreate
+                                            className={cl("change-decoration-modal-decoration")}
+                                            {...tooltipProps}
+                                            onSelect={!hasDecorationPendingReview ? (settings.store.agreedToGuidelines ? openCreateDecorationModal : openGuidelinesModal) : () => { }}
+                                        />}
+                                    </Tooltip>;
+                            }
+                        } else {
+                            return <Tooltip text={"Pending review"} shouldShow={item.reviewed === false}>
+                                {tooltipProps => (
+                                    <DecorDecorationGridDecoration
                                         {...tooltipProps}
-                                        onSelect={!hasDecorationPendingReview ? openCreateDecorationModal : () => { }}
-                                    />}
-                                </Tooltip>;
+                                        className={cl("change-decoration-modal-decoration")}
+                                        onSelect={item.reviewed !== false ? () => setTryingDecoration(item) : () => { }}
+                                        isSelected={activeSelectedDecoration?.hash === item.hash}
+                                        decoration={item}
+                                    />
+                                )}
+                            </Tooltip>;
                         }
-                    } else {
-                        return <Tooltip text={"Pending review"} shouldShow={item.reviewed === false}>
-                            {tooltipProps => (
-                                <DecorDecorationGridDecoration
-                                    {...tooltipProps}
-                                    className={cl("change-decoration-modal-decoration")}
-                                    onSelect={item.reviewed !== false ? () => setTryingDecoration(item) : () => { }}
-                                    isSelected={activeSelectedDecoration?.hash === item.hash}
-                                    decoration={item}
-                                />
-                            )}
-                        </Tooltip>;
-                    }
-                }}
-                getItemKey={item => typeof item === "string" ? item : item.hash}
-                getSectionKey={section => section.sectionKey}
-                renderSectionHeader={section => <SectionHeader section={section} />}
-                sections={data}
-            />
-            <div className={cl("change-decoration-modal-preview")}>
-                <AvatarDecorationModalPreview
-                    avatarDecorationOverride={avatarDecorationOverride}
-                    user={UserStore.getCurrentUser()}
+                    }}
+                    getItemKey={item => typeof item === "string" ? item : item.hash}
+                    getSectionKey={section => section.sectionKey}
+                    renderSectionHeader={section => <SectionHeader section={section} />}
+                    sections={data}
                 />
-                {isActiveDecorationPreset && <Forms.FormTitle className="">Part of the {activeDecorationPreset.name} Preset</Forms.FormTitle>}
-                {typeof activeSelectedDecoration === "object" &&
-                    <Text
-                        variant="text-sm/semibold"
-                        color="header-primary"
-                    >
-                        {activeSelectedDecoration?.alt}
-                    </Text>
-                }
-                {activeDecorationHasAuthor && <Text key={`createdBy-${activeSelectedDecoration.authorId}`}>Created by {Parser.parse(`<@${activeSelectedDecoration.authorId}>`)}</Text>}
-            </div>
+                <div className={cl("change-decoration-modal-preview")}>
+                    <AvatarDecorationModalPreview
+                        avatarDecorationOverride={avatarDecorationOverride}
+                        user={UserStore.getCurrentUser()}
+                    />
+                    {isActiveDecorationPreset && <Forms.FormTitle className="">Part of the {activeDecorationPreset.name} Preset</Forms.FormTitle>}
+                    {typeof activeSelectedDecoration === "object" &&
+                        <Text
+                            variant="text-sm/semibold"
+                            color="header-primary"
+                        >
+                            {activeSelectedDecoration?.alt}
+                        </Text>
+                    }
+                    {activeDecorationHasAuthor && <Text key={`createdBy-${activeSelectedDecoration.authorId}`}>Created by {Parser.parse(`<@${activeSelectedDecoration.authorId}>`)}</Text>}
+                </div>
+            </ErrorBoundary>
         </ModalContent>
         <ModalFooter className={classes(cl("change-decoration-modal-footer", cl("modal-footer")))}>
             <div className={cl("change-decoration-modal-footer-btn-container")}>
diff --git a/src/plugins/decor/ui/modals/CreateDecorationModal.tsx b/src/plugins/decor/ui/modals/CreateDecorationModal.tsx
index a5937b0dd..eea79d86e 100644
--- a/src/plugins/decor/ui/modals/CreateDecorationModal.tsx
+++ b/src/plugins/decor/ui/modals/CreateDecorationModal.tsx
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Link } from "@components/Link";
 import { openInviteModal } from "@utils/discord";
 import { Margins } from "@utils/margins";
-import { closeAllModals, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { closeAllModals, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import { Button, FluxDispatcher, Forms, GuildStore, NavigationRouter, Text, TextInput, useEffect, useMemo, UserStore, useState } from "@webpack/common";
 
@@ -21,6 +22,8 @@ const DecorationModalStyles = findByPropsLazy("modalFooterShopButton");
 
 const FileUpload = findComponentByCodeLazy("fileUploadInput,");
 
+const { default: HelpMessage, HelpMessageTypes } = findByPropsLazy("HelpMessageTypes");
+
 function useObjectURL(object: Blob | MediaSource | null) {
     const [url, setUrl] = useState<string | null>(null);
 
@@ -39,7 +42,7 @@ function useObjectURL(object: Blob | MediaSource | null) {
     return url;
 }
 
-export default function CreateDecorationModal(props) {
+function CreateDecorationModal(props: ModalProps) {
     const [name, setName] = useState("");
     const [file, setFile] = useState<File | null>(null);
     const [submitting, setSubmitting] = useState(false);
@@ -75,65 +78,69 @@ export default function CreateDecorationModal(props) {
             className={cl("create-decoration-modal-content")}
             scrollbarType="none"
         >
-            <div className={cl("create-decoration-modal-form-preview-container")}>
-                <div className={cl("create-decoration-modal-form")}>
-                    {error !== null && <Text color="text-danger" variant="text-xs/normal">{error.message}</Text>}
-                    <Forms.FormSection title="File">
-                        <FileUpload
-                            filename={file?.name}
-                            placeholder="Choose a file"
-                            buttonText="Browse"
-                            filters={[{ name: "Decoration file", extensions: ["png", "apng"] }]}
-                            onFileSelect={setFile}
+            <ErrorBoundary>
+                <HelpMessage messageType={HelpMessageTypes.WARNING}>
+                    Make sure your decoration does not violate <Link
+                        href="https://github.com/decor-discord/.github/blob/main/GUIDELINES.md"
+                    >
+                        the guidelines
+                    </Link> before submitting it.
+                </HelpMessage>
+                <div className={cl("create-decoration-modal-form-preview-container")}>
+                    <div className={cl("create-decoration-modal-form")}>
+                        {error !== null && <Text color="text-danger" variant="text-xs/normal">{error.message}</Text>}
+                        <Forms.FormSection title="File">
+                            <FileUpload
+                                filename={file?.name}
+                                placeholder="Choose a file"
+                                buttonText="Browse"
+                                filters={[{ name: "Decoration file", extensions: ["png", "apng"] }]}
+                                onFileSelect={setFile}
+                            />
+                            <Forms.FormText type="description" className={Margins.top8}>
+                                File should be APNG or PNG.
+                            </Forms.FormText>
+                        </Forms.FormSection>
+                        <Forms.FormSection title="Name">
+                            <TextInput
+                                placeholder="Companion Cube"
+                                value={name}
+                                onChange={setName}
+                            />
+                            <Forms.FormText type="description" className={Margins.top8}>
+                                This name will be used when referring to this decoration.
+                            </Forms.FormText>
+                        </Forms.FormSection>
+                    </div>
+                    <div>
+                        <AvatarDecorationModalPreview
+                            avatarDecorationOverride={decoration}
+                            user={UserStore.getCurrentUser()}
                         />
-                        <Forms.FormText type="description" className={Margins.top8}>
-                            File should be APNG or PNG.
-                        </Forms.FormText>
-                    </Forms.FormSection>
-                    <Forms.FormSection title="Name">
-                        <TextInput
-                            placeholder="Companion Cube"
-                            value={name}
-                            onChange={setName}
-                        />
-                        <Forms.FormText type="description" className={Margins.top8}>
-                            This name will be used when referring to this decoration.
-                        </Forms.FormText>
-                    </Forms.FormSection>
+                    </div>
                 </div>
-                <div>
-                    <AvatarDecorationModalPreview
-                        avatarDecorationOverride={decoration}
-                        user={UserStore.getCurrentUser()}
-                    />
-                </div>
-            </div>
-            <Forms.FormText type="description" className={Margins.bottom16}>
-                Make sure your decoration does not violate <Link
-                    href="https://github.com/decor-discord/.github/blob/main/GUIDELINES.md"
-                >
-                    the guidelines
-                </Link> before creating your decoration.
-                <br />You can receive updates on your decoration's review by joining <Link
-                    href={`https://discord.gg/${INVITE_KEY}`}
-                    onClick={async e => {
-                        e.preventDefault();
-                        if (!GuildStore.getGuild(GUILD_ID)) {
-                            const inviteAccepted = await openInviteModal(INVITE_KEY);
-                            if (inviteAccepted) {
+                <Forms.FormText type="description" className={Margins.bottom16}>
+                    <br />You can receive updates on your decoration's review by joining <Link
+                        href={`https://discord.gg/${INVITE_KEY}`}
+                        onClick={async e => {
+                            e.preventDefault();
+                            if (!GuildStore.getGuild(GUILD_ID)) {
+                                const inviteAccepted = await openInviteModal(INVITE_KEY);
+                                if (inviteAccepted) {
+                                    closeAllModals();
+                                    FluxDispatcher.dispatch({ type: "LAYER_POP_ALL" });
+                                }
+                            } else {
                                 closeAllModals();
                                 FluxDispatcher.dispatch({ type: "LAYER_POP_ALL" });
+                                NavigationRouter.transitionToGuild(GUILD_ID);
                             }
-                        } else {
-                            closeAllModals();
-                            FluxDispatcher.dispatch({ type: "LAYER_POP_ALL" });
-                            NavigationRouter.transitionToGuild(GUILD_ID);
-                        }
-                    }}
-                >
-                    Decor's Discord server
-                </Link>.
-            </Forms.FormText>
+                        }}
+                    >
+                        Decor's Discord server
+                    </Link>.
+                </Forms.FormText>
+            </ErrorBoundary>
         </ModalContent>
         <ModalFooter className={cl("modal-footer")}>
             <Button
@@ -145,7 +152,7 @@ export default function CreateDecorationModal(props) {
                 disabled={!file || !name}
                 submitting={submitting}
             >
-                Create
+                Submit for Review
             </Button>
             <Button
                 onClick={props.onClose}
diff --git a/src/plugins/decor/ui/modals/GuidelinesModal.tsx b/src/plugins/decor/ui/modals/GuidelinesModal.tsx
new file mode 100644
index 000000000..ab1bf441e
--- /dev/null
+++ b/src/plugins/decor/ui/modals/GuidelinesModal.tsx
@@ -0,0 +1,68 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Link } from "@components/Link";
+import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { findByPropsLazy } from "@webpack";
+import { Button, Forms, Text } from "@webpack/common";
+
+import { settings } from "../../settings";
+import { cl, requireAvatarDecorationModal } from "../";
+import { openCreateDecorationModal } from "./CreateDecorationModal";
+
+const DecorationModalStyles = findByPropsLazy("modalFooterShopButton");
+
+function GuidelinesModal(props: ModalProps) {
+    return <ModalRoot
+        {...props}
+        size={ModalSize.SMALL}
+        className={DecorationModalStyles.modal}
+    >
+        <ModalHeader separator={false} className={cl("modal-header")}>
+            <Text
+                color="header-primary"
+                variant="heading-lg/semibold"
+                tag="h1"
+                style={{ flexGrow: 1 }}
+            >
+                Hold on
+            </Text>
+            <ModalCloseButton onClick={props.onClose} />
+        </ModalHeader>
+        <ModalContent
+            scrollbarType="none"
+        >
+            <Forms.FormText>
+                By submitting a decoration, you agree to <Link
+                    href="https://github.com/decor-discord/.github/blob/main/GUIDELINES.md"
+                >
+                    the guidelines
+                </Link>. Not reading these guidelines may get your account suspended from creating more decorations in the future.
+            </Forms.FormText>
+        </ModalContent>
+        <ModalFooter className={cl("modal-footer")}>
+            <Button
+                onClick={() => {
+                    settings.store.agreedToGuidelines = true;
+                    props.onClose();
+                    openCreateDecorationModal();
+                }}
+            >
+                Continue
+            </Button>
+            <Button
+                onClick={props.onClose}
+                color={Button.Colors.PRIMARY}
+                look={Button.Looks.LINK}
+            >
+                Go Back
+            </Button>
+        </ModalFooter>
+    </ModalRoot>;
+}
+
+export const openGuidelinesModal = () =>
+    requireAvatarDecorationModal().then(() => openModal(props => <GuidelinesModal {...props} />));
diff --git a/src/plugins/decor/ui/styles.css b/src/plugins/decor/ui/styles.css
index ff10c82fa..9730efb7e 100644
--- a/src/plugins/decor/ui/styles.css
+++ b/src/plugins/decor/ui/styles.css
@@ -8,7 +8,7 @@
     display: flex;
     border-radius: 5px 5px 0 0;
     padding: 0 16px;
-    gap: 4px
+    gap: 4px;
 }
 
 .vc-decor-change-decoration-modal-preview {
@@ -72,7 +72,7 @@
 .vc-decor-sectioned-grid-list-grid {
     display: flex;
     flex-wrap: wrap;
-    gap: 8px
+    gap: 8px;
 }
 
 .vc-decor-section-remove-margin {

From 4a1c85c8adc04e4874b73b32924d24bd0839aab9 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 3 Jan 2024 09:58:09 -0300
Subject: [PATCH 274/632] Decor: only search for DecorationModalStyles once

---
 src/plugins/decor/ui/index.ts                         | 3 ++-
 src/plugins/decor/ui/modals/ChangeDecorationModal.tsx | 5 ++---
 src/plugins/decor/ui/modals/CreateDecorationModal.tsx | 5 +----
 src/plugins/decor/ui/modals/GuidelinesModal.tsx       | 5 +----
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/plugins/decor/ui/index.ts b/src/plugins/decor/ui/index.ts
index 52b169d77..0ead602e2 100644
--- a/src/plugins/decor/ui/index.ts
+++ b/src/plugins/decor/ui/index.ts
@@ -5,9 +5,10 @@
  */
 
 import { classNameFactory } from "@api/Styles";
-import { extractAndLoadChunksLazy } from "@webpack";
+import { extractAndLoadChunksLazy, findByPropsLazy } from "@webpack";
 
 export const cl = classNameFactory("vc-decor-");
+export const DecorationModalStyles = findByPropsLazy("modalFooterShopButton");
 
 export const requireAvatarDecorationModal = extractAndLoadChunksLazy(["openAvatarDecorationModal:"]);
 export const requireCreateStickerModal = extractAndLoadChunksLazy(["stickerInspected]:"]);
diff --git a/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx b/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx
index f2a482818..5fbe165ce 100644
--- a/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx
+++ b/src/plugins/decor/ui/modals/ChangeDecorationModal.tsx
@@ -10,7 +10,7 @@ import { openInviteModal } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
 import { closeAllModals, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
+import { findComponentByCodeLazy } from "@webpack";
 import { Alerts, Button, FluxDispatcher, Forms, GuildStore, NavigationRouter, Parser, Text, Tooltip, useEffect, UserStore, UserUtils, useState } from "@webpack/common";
 import { User } from "discord-types/general";
 
@@ -20,7 +20,7 @@ import { useAuthorizationStore } from "../../lib/stores/AuthorizationStore";
 import { useCurrentUserDecorationsStore } from "../../lib/stores/CurrentUserDecorationsStore";
 import { decorationToAvatarDecoration } from "../../lib/utils/decoration";
 import { settings } from "../../settings";
-import { cl, requireAvatarDecorationModal } from "../";
+import { cl, DecorationModalStyles, requireAvatarDecorationModal } from "../";
 import { AvatarDecorationModalPreview } from "../components";
 import DecorationGridCreate from "../components/DecorationGridCreate";
 import DecorationGridNone from "../components/DecorationGridNone";
@@ -30,7 +30,6 @@ import { openCreateDecorationModal } from "./CreateDecorationModal";
 import { openGuidelinesModal } from "./GuidelinesModal";
 
 const UserSummaryItem = findComponentByCodeLazy("defaultRenderUser", "showDefaultAvatarsForNullUsers");
-const DecorationModalStyles = findByPropsLazy("modalFooterShopButton");
 
 function usePresets() {
     const [presets, setPresets] = useState<Preset[]>([]);
diff --git a/src/plugins/decor/ui/modals/CreateDecorationModal.tsx b/src/plugins/decor/ui/modals/CreateDecorationModal.tsx
index eea79d86e..0dcf855ef 100644
--- a/src/plugins/decor/ui/modals/CreateDecorationModal.tsx
+++ b/src/plugins/decor/ui/modals/CreateDecorationModal.tsx
@@ -14,12 +14,9 @@ import { Button, FluxDispatcher, Forms, GuildStore, NavigationRouter, Text, Text
 
 import { GUILD_ID, INVITE_KEY, RAW_SKU_ID } from "../../lib/constants";
 import { useCurrentUserDecorationsStore } from "../../lib/stores/CurrentUserDecorationsStore";
-import { cl, requireAvatarDecorationModal, requireCreateStickerModal } from "../";
+import { cl, DecorationModalStyles, requireAvatarDecorationModal, requireCreateStickerModal } from "../";
 import { AvatarDecorationModalPreview } from "../components";
 
-
-const DecorationModalStyles = findByPropsLazy("modalFooterShopButton");
-
 const FileUpload = findComponentByCodeLazy("fileUploadInput,");
 
 const { default: HelpMessage, HelpMessageTypes } = findByPropsLazy("HelpMessageTypes");
diff --git a/src/plugins/decor/ui/modals/GuidelinesModal.tsx b/src/plugins/decor/ui/modals/GuidelinesModal.tsx
index ab1bf441e..716aea6bd 100644
--- a/src/plugins/decor/ui/modals/GuidelinesModal.tsx
+++ b/src/plugins/decor/ui/modals/GuidelinesModal.tsx
@@ -6,15 +6,12 @@
 
 import { Link } from "@components/Link";
 import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { findByPropsLazy } from "@webpack";
 import { Button, Forms, Text } from "@webpack/common";
 
 import { settings } from "../../settings";
-import { cl, requireAvatarDecorationModal } from "../";
+import { cl, DecorationModalStyles, requireAvatarDecorationModal } from "../";
 import { openCreateDecorationModal } from "./CreateDecorationModal";
 
-const DecorationModalStyles = findByPropsLazy("modalFooterShopButton");
-
 function GuidelinesModal(props: ModalProps) {
     return <ModalRoot
         {...props}

From 9e810e5511136951a02326620c5c90dcedc81941 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 5 Jan 2024 22:07:00 +0100
Subject: [PATCH 275/632] fix cobu sync

---
 .github/workflows/codeberg-mirror.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeberg-mirror.yml b/.github/workflows/codeberg-mirror.yml
index 647a43135..1b2266ee7 100644
--- a/.github/workflows/codeberg-mirror.yml
+++ b/.github/workflows/codeberg-mirror.yml
@@ -18,5 +18,5 @@ jobs:
                   fetch-depth: 0
             - uses: pixta-dev/repository-mirroring-action@674e65a7d483ca28dafaacba0d07351bdcc8bd75 # v1.1.1
               with:
-                  target_repo_url: "git@codeberg.org:Ven/cord.git"
+                  target_repo_url: "git@codeberg.org:Vee/cord.git"
                   ssh_private_key: ${{ secrets.CODEBERG_SSH_PRIVATE_KEY }}

From 88fc15752d95881f2ba90d935c7dc5404649c806 Mon Sep 17 00:00:00 2001
From: sunnie <78964224+sunnniee@users.noreply.github.com>
Date: Fri, 5 Jan 2024 23:12:13 +0200
Subject: [PATCH 276/632] webContextMenus: add Show My Camera item (#2086)

---
 src/plugins/webContextMenus.web/index.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index eb076dfd0..50a1b90a7 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -169,6 +169,15 @@ export default definePlugin({
                 match: /let\{text:\i=""/,
                 replace: "return [null,null];$&"
             }
+        },
+
+        // Add back "Show My Camera" context menu
+        {
+            find: '.default("MediaEngineWebRTC");',
+            replacement: {
+                match: /supports\(\i\)\{switch\(\i\)\{case (\i).Features/,
+                replace: "$&.DISABLE_VIDEO:return true;case $1.Features"
+            }
         }
     ],
 

From 3eada99ad623ae783a39eb2c8238ac66ed371132 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 5 Jan 2024 22:15:54 +0100
Subject: [PATCH 277/632] fix(ToolBox): don't add entries of disabled plugins

---
 src/plugins/vencordToolbox/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/vencordToolbox/index.tsx b/src/plugins/vencordToolbox/index.tsx
index 2b0ce14e6..0a805a0d2 100644
--- a/src/plugins/vencordToolbox/index.tsx
+++ b/src/plugins/vencordToolbox/index.tsx
@@ -33,7 +33,7 @@ function VencordPopout(onClose: () => void) {
     const pluginEntries = [] as ReactNode[];
 
     for (const plugin of Object.values(Vencord.Plugins.plugins)) {
-        if (plugin.toolboxActions) {
+        if (plugin.toolboxActions && Vencord.Plugins.isPluginEnabled(plugin.name)) {
             pluginEntries.push(
                 <Menu.MenuGroup
                     label={plugin.name}

From 4d198e46bc7dc5fa15adab7f488b707fefe7d338 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 5 Jan 2024 23:31:09 +0100
Subject: [PATCH 278/632] fix wrongly patching 'Events' context menu

---
 src/plugins/biggerStreamPreview/index.tsx | 2 +-
 src/plugins/copyUserURLs/index.tsx        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/biggerStreamPreview/index.tsx b/src/plugins/biggerStreamPreview/index.tsx
index acad564da..40bbe30a8 100644
--- a/src/plugins/biggerStreamPreview/index.tsx
+++ b/src/plugins/biggerStreamPreview/index.tsx
@@ -82,7 +82,7 @@ export const streamContextPatch: NavContextMenuPatchCallback = (children, { stre
 };
 
 export const userContextPatch: NavContextMenuPatchCallback = (children, { user }: UserContextProps) => {
-    return addViewStreamContext(children, { userId: user.id });
+    if (user) return addViewStreamContext(children, { userId: user.id });
 };
 
 export default definePlugin({
diff --git a/src/plugins/copyUserURLs/index.tsx b/src/plugins/copyUserURLs/index.tsx
index e3c336fb2..9f69674cf 100644
--- a/src/plugins/copyUserURLs/index.tsx
+++ b/src/plugins/copyUserURLs/index.tsx
@@ -30,6 +30,8 @@ interface UserContextProps {
 }
 
 const UserContextMenuPatch: NavContextMenuPatchCallback = (children, { user }: UserContextProps) => () => {
+    if (!user) return;
+
     children.push(
         <Menu.MenuItem
             id="vc-copy-user-url"

From 13961a4ba561119edbcc7b317376d87527cc450a Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 5 Jan 2024 23:51:49 +0100
Subject: [PATCH 279/632] ReverseImageSearch: add support for image modal

---
 src/plugins/reverseImageSearch/index.tsx | 116 ++++++++++++-----------
 1 file changed, 62 insertions(+), 54 deletions(-)

diff --git a/src/plugins/reverseImageSearch/index.tsx b/src/plugins/reverseImageSearch/index.tsx
index 811e7ff08..6c5f3e729 100644
--- a/src/plugins/reverseImageSearch/index.tsx
+++ b/src/plugins/reverseImageSearch/index.tsx
@@ -36,62 +36,68 @@ function search(src: string, engine: string) {
     open(engine + encodeURIComponent(src), "_blank");
 }
 
-const imageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => () => {
-    if (!props) return;
-    const { reverseImageSearchType, itemHref, itemSrc } = props;
+function makeSearchItem(src: string) {
+    return (
+        <Menu.MenuItem
+            label="Search Image"
+            key="search-image"
+            id="search-image"
+        >
+            {Object.keys(Engines).map((engine, i) => {
+                const key = "search-image-" + engine;
+                return (
+                    <Menu.MenuItem
+                        key={key}
+                        id={key}
+                        label={
+                            <Flex style={{ alignItems: "center", gap: "0.5em" }}>
+                                <img
+                                    style={{
+                                        borderRadius: i >= 3 // Do not round Google, Yandex & SauceNAO
+                                            ? "50%"
+                                            : void 0
+                                    }}
+                                    aria-hidden="true"
+                                    height={16}
+                                    width={16}
+                                    src={new URL("/favicon.ico", Engines[engine]).toString().replace("lens.", "")}
+                                />
+                                {engine}
+                            </Flex>
+                        }
+                        action={() => search(src, Engines[engine])}
+                    />
+                );
+            })}
+            <Menu.MenuItem
+                key="search-image-all"
+                id="search-image-all"
+                label={
+                    <Flex style={{ alignItems: "center", gap: "0.5em" }}>
+                        <OpenExternalIcon height={16} width={16} />
+                        All
+                    </Flex>
+                }
+                action={() => Object.values(Engines).forEach(e => search(src, e))}
+            />
+        </Menu.MenuItem>
+    );
+}
 
-    if (!reverseImageSearchType || reverseImageSearchType !== "img") return;
+const messageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => () => {
+    if (props?.reverseImageSearchType !== "img") return;
 
-    const src = itemHref ?? itemSrc;
+    const src = props.itemHref ?? props.itemSrc;
 
     const group = findGroupChildrenByChildId("copy-link", children);
-    if (group) {
-        group.push((
-            <Menu.MenuItem
-                label="Search Image"
-                key="search-image"
-                id="search-image"
-            >
-                {Object.keys(Engines).map((engine, i) => {
-                    const key = "search-image-" + engine;
-                    return (
-                        <Menu.MenuItem
-                            key={key}
-                            id={key}
-                            label={
-                                <Flex style={{ alignItems: "center", gap: "0.5em" }}>
-                                    <img
-                                        style={{
-                                            borderRadius: i >= 3 // Do not round Google, Yandex & SauceNAO
-                                                ? "50%"
-                                                : void 0
-                                        }}
-                                        aria-hidden="true"
-                                        height={16}
-                                        width={16}
-                                        src={new URL("/favicon.ico", Engines[engine]).toString().replace("lens.", "")}
-                                    />
-                                    {engine}
-                                </Flex>
-                            }
-                            action={() => search(src, Engines[engine])}
-                        />
-                    );
-                })}
-                <Menu.MenuItem
-                    key="search-image-all"
-                    id="search-image-all"
-                    label={
-                        <Flex style={{ alignItems: "center", gap: "0.5em" }}>
-                            <OpenExternalIcon height={16} width={16} />
-                            All
-                        </Flex>
-                    }
-                    action={() => Object.values(Engines).forEach(e => search(src, e))}
-                />
-            </Menu.MenuItem>
-        ));
-    }
+    group?.push(makeSearchItem(src));
+};
+
+const imageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => () => {
+    if (!props?.src) return;
+
+    const group = findGroupChildrenByChildId("copy-native-link", children) ?? children;
+    group.push(makeSearchItem(props.src));
 };
 
 export default definePlugin({
@@ -111,10 +117,12 @@ export default definePlugin({
     ],
 
     start() {
-        addContextMenuPatch("message", imageContextMenuPatch);
+        addContextMenuPatch("message", messageContextMenuPatch);
+        addContextMenuPatch("image-context", imageContextMenuPatch);
     },
 
     stop() {
-        removeContextMenuPatch("message", imageContextMenuPatch);
+        removeContextMenuPatch("message", messageContextMenuPatch);
+        removeContextMenuPatch("image-context", imageContextMenuPatch);
     }
 });

From 6530526fb2eff5881fe677c6437ba73cc31597b0 Mon Sep 17 00:00:00 2001
From: Moxie <124418090+moxie-coder@users.noreply.github.com>
Date: Fri, 5 Jan 2024 18:10:16 -0500
Subject: [PATCH 280/632] Updater: Fix grammar (1 Updates => 1 Update) (#2084)

Co-authored-by: V <vendicated@riseup.net>
---
 src/components/VencordSettings/UpdaterTab.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VencordSettings/UpdaterTab.tsx b/src/components/VencordSettings/UpdaterTab.tsx
index 81433960f..a221bb38b 100644
--- a/src/components/VencordSettings/UpdaterTab.tsx
+++ b/src/components/VencordSettings/UpdaterTab.tsx
@@ -113,7 +113,7 @@ function Updatable(props: CommonProps) {
                 </>
             ) : (
                 <Forms.FormText className={Margins.bottom8}>
-                    {isOutdated ? `There are ${updates.length} Updates` : "Up to Date!"}
+                    {isOutdated ? (updates.length === 1 ? "There is 1 Update" : `There are ${updates.length} Updates`) : "Up to Date!"}
                 </Forms.FormText>
             )}
 

From be9ec3b7ac79334e5c753d6377894496006f5fdf Mon Sep 17 00:00:00 2001
From: Grzesiek11 <grzesiek11@stary.pc.pl>
Date: Sat, 6 Jan 2024 00:23:09 +0100
Subject: [PATCH 281/632] SendTimestamps: add setting to disable message
 replacement (#2076)

---
 src/plugins/sendTimestamps/index.tsx | 19 ++++++++++++++++---
 src/utils/constants.ts               |  4 ++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/plugins/sendTimestamps/index.tsx b/src/plugins/sendTimestamps/index.tsx
index 7904545c8..6d488add6 100644
--- a/src/plugins/sendTimestamps/index.tsx
+++ b/src/plugins/sendTimestamps/index.tsx
@@ -19,14 +19,23 @@
 import "./styles.css";
 
 import { addPreSendListener, removePreSendListener } from "@api/MessageEvents";
+import { definePluginSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import { Devs } from "@utils/constants";
 import { getTheme, insertTextIntoChatInputBox, Theme } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import { closeModal, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModal } from "@utils/modal";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 import { Button, ButtonLooks, ButtonWrapperClasses, Forms, Parser, Select, Tooltip, useMemo, useState } from "@webpack/common";
 
+const settings = definePluginSettings({
+    replaceMessageContents: {
+        description: "Replace timestamps in message contents",
+        type: OptionType.BOOLEAN,
+        default: true,
+    },
+});
+
 function parseTime(time: string) {
     const cleanTime = time.slice(1, -1).replace(/(\d)(AM|PM)$/i, "$1 $2");
 
@@ -116,9 +125,11 @@ function PickerModal({ rootProps, close }: { rootProps: ModalProps, close(): voi
 export default definePlugin({
     name: "SendTimestamps",
     description: "Send timestamps easily via chat box button & text shortcuts. Read the extended description!",
-    authors: [Devs.Ven, Devs.Tyler],
+    authors: [Devs.Ven, Devs.Tyler, Devs.Grzesiek11],
     dependencies: ["MessageEventsAPI"],
 
+    settings: settings,
+
     patches: [
         {
             find: "ChannelTextAreaButtons",
@@ -131,7 +142,9 @@ export default definePlugin({
 
     start() {
         this.listener = addPreSendListener((_, msg) => {
-            msg.content = msg.content.replace(/`\d{1,2}:\d{2} ?(?:AM|PM)?`/gi, parseTime);
+            if (settings.store.replaceMessageContents) {
+                msg.content = msg.content.replace(/`\d{1,2}:\d{2} ?(?:AM|PM)?`/gi, parseTime);
+            }
         });
     },
 
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 2962df06f..a94ba0fc3 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -399,6 +399,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "maisy",
         id: 257109471589957632n,
     },
+    Grzesiek11: {
+        name: "Grzesiek11",
+        id: 368475654662127616n,
+    },
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly

From d5c58ab2b3fa24b00ab310fa7152174f2d235267 Mon Sep 17 00:00:00 2001
From: Hari Rana <theevilskeleton@riseup.net>
Date: Fri, 5 Jan 2024 18:55:14 -0500
Subject: [PATCH 282/632] updater: Add top and bottom margins between commits
 (#2042)

Co-authored-by: V <vendicated@riseup.net>
---
 src/components/VencordSettings/UpdaterTab.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/VencordSettings/UpdaterTab.tsx b/src/components/VencordSettings/UpdaterTab.tsx
index a221bb38b..0a5d1f149 100644
--- a/src/components/VencordSettings/UpdaterTab.tsx
+++ b/src/components/VencordSettings/UpdaterTab.tsx
@@ -81,9 +81,12 @@ function HashLink({ repo, hash, disabled = false }: { repo: string, hash: string
 
 function Changes({ updates, repo, repoPending }: CommonProps & { updates: typeof changes; }) {
     return (
-        <Card style={{ padding: ".5em" }}>
+        <Card style={{ padding: "0 0.5em" }}>
             {updates.map(({ hash, author, message }) => (
-                <div>
+                <div style={{
+                    marginTop: "0.5em",
+                    marginBottom: "0.5em"
+                }}>
                     <code><HashLink {...{ repo, hash }} disabled={repoPending} /></code>
                     <span style={{
                         marginLeft: "0.5em",

From 0d6bb35075d75a327102c4ab3af1437b3cc77f56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?effct=20=E2=80=A2=20Lia=20Aaron=20Thoma?=
 <at.github@athoma.net>
Date: Sat, 6 Jan 2024 01:02:09 +0100
Subject: [PATCH 283/632] TextReplace: allow replacing with nothing (#1933)

---
 src/plugins/textReplace/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/textReplace/index.tsx b/src/plugins/textReplace/index.tsx
index 5d66d2265..416ce83fb 100644
--- a/src/plugins/textReplace/index.tsx
+++ b/src/plugins/textReplace/index.tsx
@@ -213,7 +213,7 @@ function applyRules(content: string): string {
 
     if (stringRules) {
         for (const rule of stringRules) {
-            if (!rule.find || !rule.replace) continue;
+            if (!rule.find) continue;
             if (rule.onlyIfIncludes && !content.includes(rule.onlyIfIncludes)) continue;
 
             content = ` ${content} `.replaceAll(rule.find, rule.replace.replaceAll("\\n", "\n")).replace(/^\s|\s$/g, "");
@@ -222,7 +222,7 @@ function applyRules(content: string): string {
 
     if (regexRules) {
         for (const rule of regexRules) {
-            if (!rule.find || !rule.replace) continue;
+            if (!rule.find) continue;
             if (rule.onlyIfIncludes && !content.includes(rule.onlyIfIncludes)) continue;
 
             try {

From d73790efb392b09371f0a0e7120098ee23e86a58 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 6 Jan 2024 01:22:04 +0100
Subject: [PATCH 284/632] bump to v1.6.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b59fbafe7..0b373008e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.6.5",
+    "version": "1.6.6",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From ba2695b499d511124fbc16e511ceab06c8ec1b78 Mon Sep 17 00:00:00 2001
From: Grzesiek11 <grzesiek11@stary.pc.pl>
Date: Sat, 6 Jan 2024 03:05:23 +0100
Subject: [PATCH 285/632] Add FixCodeblockGap plugin (#2064)

---
 src/plugins/fixCodeblockGap/index.ts | 35 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/plugins/fixCodeblockGap/index.ts

diff --git a/src/plugins/fixCodeblockGap/index.ts b/src/plugins/fixCodeblockGap/index.ts
new file mode 100644
index 000000000..133409959
--- /dev/null
+++ b/src/plugins/fixCodeblockGap/index.ts
@@ -0,0 +1,35 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "FixCodeblockGap",
+    description: "Removes the gap between codeblocks and text below it",
+    authors: [Devs.Grzesiek11],
+    patches: [
+        {
+            find: ".default.Messages.DELETED_ROLE_PLACEHOLDER",
+            replacement: {
+                match: String.raw`/^${"```"}(?:([a-z0-9_+\-.#]+?)\n)?\n*([^\n][^]*?)\n*${"```"}`,
+                replace: "$&\\n?",
+            },
+        },
+    ],
+});

From ba6d23a31f61841e190e771b1ccc4d5d18e666db Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 9 Jan 2024 17:39:38 +0100
Subject: [PATCH 286/632] fix adding View Raw to undesired channel context
 menus

---
 src/plugins/permissionsViewer/index.tsx |  4 +++-
 src/plugins/viewRaw/index.tsx           | 12 ++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx
index 985b23842..9e0131e64 100644
--- a/src/plugins/permissionsViewer/index.tsx
+++ b/src/plugins/permissionsViewer/index.tsx
@@ -126,7 +126,9 @@ function MenuItem(guildId: string, id?: string, type?: MenuItemParentType) {
 
 function makeContextMenuPatch(childId: string | string[], type?: MenuItemParentType): NavContextMenuPatchCallback {
     return (children, props) => () => {
-        if (!props || (type === MenuItemParentType.User && !props.user) || (type === MenuItemParentType.Guild && !props.guild)) return children;
+        if (!props) return;
+        if ((type === MenuItemParentType.User && !props.user) || (type === MenuItemParentType.Guild && !props.guild) || (type === MenuItemParentType.Channel && (!props.channel || !props.guild)))
+            return children;
 
         const group = findGroupChildrenByChildId(childId, children);
 
diff --git a/src/plugins/viewRaw/index.tsx b/src/plugins/viewRaw/index.tsx
index f516b5d7a..187dbc4e3 100644
--- a/src/plugins/viewRaw/index.tsx
+++ b/src/plugins/viewRaw/index.tsx
@@ -117,22 +117,26 @@ const settings = definePluginSettings({
     }
 });
 
-function MakeContextCallback(name: string) {
+function MakeContextCallback(name: "Guild" | "User" | "Channel") {
     const callback: NavContextMenuPatchCallback = (children, props) => () => {
-        if ((name === "Guild" && !props.guild) || (name === "User" && !props.user)) return;
+        const value = props[name.toLowerCase()];
+        if (!value) return;
+        if (props.label === "Channel Actions") return; // random shit like notification settings
+
         const lastChild = children.at(-1);
         if (lastChild?.key === "developer-actions") {
             const p = lastChild.props;
             if (!Array.isArray(p.children))
                 p.children = [p.children];
-            ({ children } = p);
+
+            children = p.children;
         }
 
         children.splice(-1, 0,
             <Menu.MenuItem
                 id={`vc-view-${name.toLowerCase()}-raw`}
                 label="View Raw"
-                action={() => openViewRawModal(JSON.stringify(props[name.toLowerCase()], null, 4), name)}
+                action={() => openViewRawModal(JSON.stringify(value, null, 4), name)}
                 icon={CopyIcon}
             />
         );

From 8c890028672be7623949ab1aa45bc5796c773a48 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 9 Jan 2024 17:44:18 +0100
Subject: [PATCH 287/632] forgor not everyone uses enlgihs

---
 src/plugins/viewRaw/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/viewRaw/index.tsx b/src/plugins/viewRaw/index.tsx
index 187dbc4e3..08acdc4c5 100644
--- a/src/plugins/viewRaw/index.tsx
+++ b/src/plugins/viewRaw/index.tsx
@@ -27,7 +27,7 @@ import { Margins } from "@utils/margins";
 import { copyWithToast } from "@utils/misc";
 import { closeModal, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import definePlugin, { OptionType } from "@utils/types";
-import { Button, ChannelStore, Forms, Menu, Text } from "@webpack/common";
+import { Button, ChannelStore, Forms, i18n, Menu, Text } from "@webpack/common";
 import { Message } from "discord-types/general";
 
 
@@ -121,7 +121,7 @@ function MakeContextCallback(name: "Guild" | "User" | "Channel") {
     const callback: NavContextMenuPatchCallback = (children, props) => () => {
         const value = props[name.toLowerCase()];
         if (!value) return;
-        if (props.label === "Channel Actions") return; // random shit like notification settings
+        if (props.label === i18n.Messages.CHANNEL_ACTIONS_MENU_LABEL) return; // random shit like notification settings
 
         const lastChild = children.at(-1);
         if (lastChild?.key === "developer-actions") {

From cb7045c00bb7bbeba4b70d3a1806069878a456f3 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 13 Jan 2024 19:05:01 +0100
Subject: [PATCH 288/632] WebContextMenus: use vesktop native clipboard - fixes
 some permission issues

---
 src/plugins/webContextMenus.web/index.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index 50a1b90a7..bb98c61d7 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -182,6 +182,12 @@ export default definePlugin({
     ],
 
     async copyImage(url: string) {
+        if (IS_VESKTOP && VesktopNative.clipboard) {
+            const data = await fetch(url).then(r => r.arrayBuffer());
+            VesktopNative.clipboard.copyImage(data, url);
+            return;
+        }
+
         // Clipboard only supports image/png, jpeg and similar won't work. Thus, we need to convert it to png
         // via canvas first
         const img = new Image();

From 69a4d2734efcfd4e1ceed18b61e56d91ec446876 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 13 Jan 2024 19:08:11 +0100
Subject: [PATCH 289/632] fix(git updater): correctly persist isDev switch

---
 src/main/updater/git.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts
index e96026443..2ff3ba512 100644
--- a/src/main/updater/git.ts
+++ b/src/main/updater/git.ts
@@ -73,6 +73,8 @@ async function build() {
     const command = isFlatpak ? "flatpak-spawn" : "node";
     const args = isFlatpak ? ["--host", "node", "scripts/build/build.mjs"] : ["scripts/build/build.mjs"];
 
+    if (IS_DEV) args.push("--dev");
+
     const res = await execFile(command, args, opts);
 
     return !res.stderr.includes("Build failed");

From 2ab1c50c7355849e42ad81afcfef3d008b459247 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 13 Jan 2024 19:27:41 +0100
Subject: [PATCH 290/632] QuickCss: reopen existing window instead of new one

---
 src/main/ipcMain.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/ipcMain.ts b/src/main/ipcMain.ts
index 6254bc826..47d400eb6 100644
--- a/src/main/ipcMain.ts
+++ b/src/main/ipcMain.ts
@@ -139,8 +139,15 @@ export function initIpc(mainWindow: BrowserWindow) {
 }
 
 ipcMain.handle(IpcEvents.OPEN_MONACO_EDITOR, async () => {
+    const title = "Vencord QuickCSS Editor";
+    const existingWindow = BrowserWindow.getAllWindows().find(w => w.title === title);
+    if (existingWindow && !existingWindow.isDestroyed()) {
+        existingWindow.focus();
+        return;
+    }
+
     const win = new BrowserWindow({
-        title: "Vencord QuickCSS Editor",
+        title,
         autoHideMenuBar: true,
         darkTheme: true,
         webPreferences: {

From 8bd54173dbb1af446e1d710dd65dd3d67f68fc0e Mon Sep 17 00:00:00 2001
From: Manti <67705577+mantikafasi@users.noreply.github.com>
Date: Mon, 15 Jan 2024 00:46:24 +0300
Subject: [PATCH 291/632] Bring back ReviewDB (#2097)

Changes from old version:
- You can now delete reviews on your own profile
- You can now block up to 50 users. This will prevent them from leaving reviews on your profile

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/reviewDB/auth.tsx                 |  78 +++++++
 .../reviewDB/components/BlockedUserModal.tsx  |  99 +++++++++
 .../reviewDB/components/MessageButton.tsx     |  85 ++++++++
 .../reviewDB/components/ReviewBadge.tsx       |  50 +++++
 .../reviewDB/components/ReviewComponent.tsx   | 188 ++++++++++++++++
 .../reviewDB/components/ReviewModal.tsx       | 105 +++++++++
 .../reviewDB/components/ReviewsView.tsx       | 200 ++++++++++++++++++
 src/plugins/reviewDB/entities.ts              | 100 +++++++++
 src/plugins/reviewDB/index.tsx                | 157 ++++++++++++++
 src/plugins/reviewDB/reviewDbApi.ts           | 197 +++++++++++++++++
 src/plugins/reviewDB/settings.tsx             |  93 ++++++++
 src/plugins/reviewDB/style.css                | 121 +++++++++++
 src/plugins/reviewDB/utils.tsx                |  43 ++++
 13 files changed, 1516 insertions(+)
 create mode 100644 src/plugins/reviewDB/auth.tsx
 create mode 100644 src/plugins/reviewDB/components/BlockedUserModal.tsx
 create mode 100644 src/plugins/reviewDB/components/MessageButton.tsx
 create mode 100644 src/plugins/reviewDB/components/ReviewBadge.tsx
 create mode 100644 src/plugins/reviewDB/components/ReviewComponent.tsx
 create mode 100644 src/plugins/reviewDB/components/ReviewModal.tsx
 create mode 100644 src/plugins/reviewDB/components/ReviewsView.tsx
 create mode 100644 src/plugins/reviewDB/entities.ts
 create mode 100644 src/plugins/reviewDB/index.tsx
 create mode 100644 src/plugins/reviewDB/reviewDbApi.ts
 create mode 100644 src/plugins/reviewDB/settings.tsx
 create mode 100644 src/plugins/reviewDB/style.css
 create mode 100644 src/plugins/reviewDB/utils.tsx

diff --git a/src/plugins/reviewDB/auth.tsx b/src/plugins/reviewDB/auth.tsx
new file mode 100644
index 000000000..1d95e47dd
--- /dev/null
+++ b/src/plugins/reviewDB/auth.tsx
@@ -0,0 +1,78 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { DataStore } from "@api/index";
+import { Logger } from "@utils/Logger";
+import { openModal } from "@utils/modal";
+import { findByPropsLazy } from "@webpack";
+import { showToast, Toasts, UserStore } from "@webpack/common";
+
+import { ReviewDBAuth } from "./entities";
+
+const DATA_STORE_KEY = "rdb-auth";
+
+const OAuth = findByPropsLazy("OAuth2AuthorizeModal");
+
+export let Auth: ReviewDBAuth = {};
+
+export async function initAuth() {
+    Auth = await getAuth() ?? {};
+}
+
+export async function getAuth(): Promise<ReviewDBAuth | undefined> {
+    const auth = await DataStore.get(DATA_STORE_KEY);
+    return auth?.[UserStore.getCurrentUser()?.id];
+}
+
+export async function getToken() {
+    const auth = await getAuth();
+    return auth?.token;
+}
+
+export async function updateAuth(newAuth: ReviewDBAuth) {
+    return DataStore.update(DATA_STORE_KEY, auth => {
+        auth ??= {};
+        Auth = auth[UserStore.getCurrentUser().id] ??= {};
+
+        if (newAuth.token) Auth.token = newAuth.token;
+        if (newAuth.user) Auth.user = newAuth.user;
+
+        return auth;
+    });
+}
+
+export function authorize(callback?: any) {
+    openModal(props =>
+        <OAuth.OAuth2AuthorizeModal
+            {...props}
+            scopes={["identify"]}
+            responseType="code"
+            redirectUri="https://manti.vendicated.dev/api/reviewdb/auth"
+            permissions={0n}
+            clientId="915703782174752809"
+            cancelCompletesFlow={false}
+            callback={async (response: any) => {
+                try {
+                    const url = new URL(response.location);
+                    url.searchParams.append("clientMod", "vencord");
+                    const res = await fetch(url, {
+                        headers: new Headers({ Accept: "application/json" })
+                    });
+                    const { token, success } = await res.json();
+                    if (success) {
+                        updateAuth({ token });
+                        showToast("Successfully logged in!");
+                        callback?.();
+                    } else if (res.status === 1) {
+                        showToast("An Error occurred while logging in.", Toasts.Type.FAILURE);
+                    }
+                } catch (e) {
+                    new Logger("ReviewDB").error("Failed to authorize", e);
+                }
+            }}
+        />
+    );
+}
diff --git a/src/plugins/reviewDB/components/BlockedUserModal.tsx b/src/plugins/reviewDB/components/BlockedUserModal.tsx
new file mode 100644
index 000000000..43c81eb52
--- /dev/null
+++ b/src/plugins/reviewDB/components/BlockedUserModal.tsx
@@ -0,0 +1,99 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Logger } from "@utils/Logger";
+import { ModalCloseButton, ModalContent, ModalHeader, ModalRoot, openModal } from "@utils/modal";
+import { useAwaiter } from "@utils/react";
+import { Forms, Tooltip, useState } from "@webpack/common";
+
+import { Auth } from "../auth";
+import { ReviewDBUser } from "../entities";
+import { fetchBlocks, unblockUser } from "../reviewDbApi";
+import { cl } from "../utils";
+
+function UnblockButton(props: { onClick?(): void; }) {
+    return (
+        <Tooltip text="Unblock user">
+            {tooltipProps => (
+                <div
+                    {...tooltipProps}
+                    role="button"
+                    onClick={props.onClick}
+                    className={cl("block-modal-unblock")}
+                >
+                    <svg height="20" viewBox="0 -960 960 960" width="20" fill="var(--status-danger)">
+                        <path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q54 0 104-17.5t92-50.5L228-676q-33 42-50.5 92T160-480q0 134 93 227t227 93Zm252-124q33-42 50.5-92T800-480q0-134-93-227t-227-93q-54 0-104 17.5T284-732l448 448Z" />
+                    </svg>
+                </div>
+            )}
+        </Tooltip>
+    );
+}
+
+function BlockedUser({ user, isBusy, setIsBusy }: { user: ReviewDBUser; isBusy: boolean; setIsBusy(v: boolean): void; }) {
+    const [gone, setGone] = useState(false);
+    if (gone) return null;
+
+    return (
+        <div className={cl("block-modal-row")}>
+            <img src={user.profilePhoto} alt="" />
+            <Forms.FormText className={cl("block-modal-username")}>{user.username}</Forms.FormText>
+            <UnblockButton
+                onClick={isBusy ? undefined : async () => {
+                    setIsBusy(true);
+                    try {
+                        await unblockUser(user.discordID);
+                        setGone(true);
+                    } finally {
+                        setIsBusy(false);
+                    }
+                }}
+            />
+        </div>
+    );
+}
+
+function Modal() {
+    const [isBusy, setIsBusy] = useState(false);
+    const [blocks, error, pending] = useAwaiter(fetchBlocks, {
+        onError: e => new Logger("ReviewDB").error("Failed to fetch blocks", e),
+        fallbackValue: [],
+    });
+
+    if (pending)
+        return null;
+    if (error)
+        return <Forms.FormText>Failed to fetch blocks: ${String(error)}</Forms.FormText>;
+    if (!blocks.length)
+        return <Forms.FormText>No blocked users.</Forms.FormText>;
+
+    return (
+        <>
+            {blocks.map(b => (
+                <BlockedUser
+                    key={b.discordID}
+                    user={b}
+                    isBusy={isBusy}
+                    setIsBusy={setIsBusy}
+                />
+            ))}
+        </>
+    );
+}
+
+export function openBlockModal() {
+    openModal(modalProps => (
+        <ModalRoot {...modalProps}>
+            <ModalHeader className={cl("block-modal-header")}>
+                <Forms.FormTitle style={{ margin: 0 }}>Blocked Users</Forms.FormTitle>
+                <ModalCloseButton onClick={modalProps.onClose} />
+            </ModalHeader>
+            <ModalContent className={cl("block-modal")}>
+                {Auth.token ? <Modal /> : <Forms.FormText>You are not logged into ReviewDB!</Forms.FormText>}
+            </ModalContent>
+        </ModalRoot>
+    ));
+}
diff --git a/src/plugins/reviewDB/components/MessageButton.tsx b/src/plugins/reviewDB/components/MessageButton.tsx
new file mode 100644
index 000000000..9b0b4be1a
--- /dev/null
+++ b/src/plugins/reviewDB/components/MessageButton.tsx
@@ -0,0 +1,85 @@
+/*
+ * 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 { DeleteIcon } from "@components/Icons";
+import { classes } from "@utils/misc";
+import { findByPropsLazy } from "@webpack";
+import { Tooltip } from "@webpack/common";
+
+const iconClasses = findByPropsLazy("button", "wrapper", "disabled", "separator");
+
+export function DeleteButton({ onClick }: { onClick(): void; }) {
+    return (
+        <Tooltip text="Delete Review">
+            {props => (
+                <div
+                    {...props}
+                    className={classes(iconClasses.button, iconClasses.dangerous)}
+                    onClick={onClick}
+                    role="button"
+                >
+                    <DeleteIcon width="20" height="20" />
+                </div>
+            )}
+        </Tooltip>
+    );
+}
+
+export function ReportButton({ onClick }: { onClick(): void; }) {
+    return (
+        <Tooltip text="Report Review">
+            {props => (
+                <div
+                    {...props}
+                    className={iconClasses.button}
+                    onClick={onClick}
+                    role="button"
+                >
+                    <svg width="20" height="20" viewBox="0 0 24 24">
+                        <path
+                            fill="currentColor"
+                            d="M20,6.002H14V3.002C14,2.45 13.553,2.002 13,2.002H4C3.447,2.002 3,2.45 3,3.002V22.002H5V14.002H10.586L8.293,16.295C8.007,16.581 7.922,17.011 8.076,17.385C8.23,17.759 8.596,18.002 9,18.002H20C20.553,18.002 21,17.554 21,17.002V7.002C21,6.45 20.553,6.002 20,6.002Z"
+                        />
+                    </svg>
+                </div>
+            )}
+        </Tooltip>
+    );
+}
+
+export function BlockButton({ onClick, isBlocked }: { onClick(): void; isBlocked: boolean; }) {
+    return (
+        <Tooltip text={`${isBlocked ? "Unblock" : "Block"} user`}>
+            {props => (
+                <div
+                    {...props}
+                    className={iconClasses.button}
+                    onClick={onClick}
+                    role="button"
+                >
+                    <svg height="20" viewBox="0 -960 960 960" width="20" fill="currentColor">
+                        {isBlocked
+                            ? <path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" />
+                            : <path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q54 0 104-17.5t92-50.5L228-676q-33 42-50.5 92T160-480q0 134 93 227t227 93Zm252-124q33-42 50.5-92T800-480q0-134-93-227t-227-93q-54 0-104 17.5T284-732l448 448Z" />
+                        }
+                    </svg>
+                </div>
+            )}
+        </Tooltip>
+    );
+}
diff --git a/src/plugins/reviewDB/components/ReviewBadge.tsx b/src/plugins/reviewDB/components/ReviewBadge.tsx
new file mode 100644
index 000000000..665b9bb09
--- /dev/null
+++ b/src/plugins/reviewDB/components/ReviewBadge.tsx
@@ -0,0 +1,50 @@
+/*
+ * 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 { MaskedLink, React, Tooltip } from "@webpack/common";
+import { HTMLAttributes } from "react";
+
+import { Badge } from "../entities";
+import { cl } from "../utils";
+
+export default function ReviewBadge(badge: Badge & { onClick?(): void; }) {
+    const Wrapper = badge.redirectURL
+        ? MaskedLink
+        : (props: HTMLAttributes<HTMLDivElement>) => (
+            <span {...props} role="button">{props.children}</span>
+        );
+
+    return (
+        <Tooltip
+            text={badge.name}>
+            {({ onMouseEnter, onMouseLeave }) => (
+                <Wrapper className={cl("blocked-badge")} href={badge.redirectURL!} onClick={badge.onClick}>
+                    <img
+                        className={cl("badge")}
+                        width="22px"
+                        height="22px"
+                        onMouseEnter={onMouseEnter}
+                        onMouseLeave={onMouseLeave}
+                        src={badge.icon}
+                        alt={badge.description}
+                    />
+                </Wrapper>
+            )}
+        </Tooltip>
+    );
+}
diff --git a/src/plugins/reviewDB/components/ReviewComponent.tsx b/src/plugins/reviewDB/components/ReviewComponent.tsx
new file mode 100644
index 000000000..5f3d135b4
--- /dev/null
+++ b/src/plugins/reviewDB/components/ReviewComponent.tsx
@@ -0,0 +1,188 @@
+/*
+ * 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 { openUserProfile } from "@utils/discord";
+import { classes } from "@utils/misc";
+import { LazyComponent } from "@utils/react";
+import { filters, findBulk } from "@webpack";
+import { Alerts, moment, Parser, showToast, Timestamp } from "@webpack/common";
+
+import { Auth, getToken } from "../auth";
+import { Review, ReviewType } from "../entities";
+import { blockUser, deleteReview, reportReview, unblockUser } from "../reviewDbApi";
+import { settings } from "../settings";
+import { canBlockReviewAuthor, canDeleteReview, canReportReview, cl } from "../utils";
+import { openBlockModal } from "./BlockedUserModal";
+import { BlockButton, DeleteButton, ReportButton } from "./MessageButton";
+import ReviewBadge from "./ReviewBadge";
+
+export default LazyComponent(() => {
+    // this is terrible, blame ven
+    const p = filters.byProps;
+    const [
+        { cozyMessage, buttons, message, buttonsInner, groupStart },
+        { container, isHeader },
+        { avatar, clickable, username, wrapper, cozy },
+        buttonClasses,
+        botTag
+    ] = findBulk(
+        p("cozyMessage"),
+        p("container", "isHeader"),
+        p("avatar", "zalgo"),
+        p("button", "wrapper", "selected"),
+        p("botTag", "botTagRegular")
+    );
+
+    const dateFormat = new Intl.DateTimeFormat();
+
+    return function ReviewComponent({ review, refetch, profileId }: { review: Review; refetch(): void; profileId: string; }) {
+        function openModal() {
+            openUserProfile(review.sender.discordID);
+        }
+
+        function delReview() {
+            Alerts.show({
+                title: "Are you sure?",
+                body: "Do you really want to delete this review?",
+                confirmText: "Delete",
+                cancelText: "Nevermind",
+                onConfirm: async () => {
+                    if (!(await getToken())) {
+                        return showToast("You must be logged in to delete reviews.");
+                    } else {
+                        deleteReview(review.id).then(res => {
+                            if (res.success) {
+                                refetch();
+                            }
+                            showToast(res.message);
+                        });
+                    }
+                }
+            });
+        }
+
+        function reportRev() {
+            Alerts.show({
+                title: "Are you sure?",
+                body: "Do you really you want to report this review?",
+                confirmText: "Report",
+                cancelText: "Nevermind",
+                // confirmColor: "red", this just adds a class name and breaks the submit button guh
+                onConfirm: async () => {
+                    if (!(await getToken())) {
+                        return showToast("You must be logged in to report reviews.");
+                    } else {
+                        reportReview(review.id);
+                    }
+                }
+            });
+        }
+
+        const isAuthorBlocked = Auth?.user?.blockedUsers?.includes(review.sender.discordID) ?? false;
+
+        function blockReviewSender() {
+            if (isAuthorBlocked)
+                return unblockUser(review.sender.discordID);
+
+            Alerts.show({
+                title: "Are you sure?",
+                body: "Do you really you want to block this user? They will be unable to leave further reviews on your profile. You can unblock users in the plugin settings.",
+                confirmText: "Block",
+                cancelText: "Nevermind",
+                // confirmColor: "red", this just adds a class name and breaks the submit button guh
+                onConfirm: async () => {
+                    if (!(await getToken())) {
+                        return showToast("You must be logged in to block users.");
+                    } else {
+                        blockUser(review.sender.discordID);
+                    }
+                }
+            });
+        }
+
+        return (
+            <div className={classes(cozyMessage, wrapper, message, groupStart, cozy, cl("review"))} style={
+                {
+                    marginLeft: "0px",
+                    paddingLeft: "52px", // wth is this
+                    paddingRight: "16px"
+                }
+            }>
+
+                <img
+                    className={classes(avatar, clickable)}
+                    onClick={openModal}
+                    src={review.sender.profilePhoto || "/assets/1f0bfc0865d324c2587920a7d80c609b.png?size=128"}
+                    style={{ left: "0px", zIndex: 0 }}
+                />
+                <div style={{ display: "inline-flex", justifyContent: "center", alignItems: "center" }}>
+                    <span
+                        className={classes(clickable, username)}
+                        style={{ color: "var(--channels-default)", fontSize: "14px" }}
+                        onClick={() => openModal()}
+                    >
+                        {review.sender.username}
+                    </span>
+
+                    {review.type === ReviewType.System && (
+                        <span
+                            className={classes(botTag.botTagVerified, botTag.botTagRegular, botTag.botTag, botTag.px, botTag.rem)}
+                            style={{ marginLeft: "4px" }}>
+                            <span className={botTag.botText}>
+                                System
+                            </span>
+                        </span>
+                    )}
+                </div>
+                {isAuthorBlocked && (
+                    <ReviewBadge
+                        name="You have blocked this user"
+                        description="You have blocked this user"
+                        icon="/assets/aaee57e0090991557b66.svg"
+                        type={0}
+                        onClick={() => openBlockModal()}
+                    />
+                )}
+                {review.sender.badges.map(badge => <ReviewBadge {...badge} />)}
+
+                {
+                    !settings.store.hideTimestamps && review.type !== ReviewType.System && (
+                        <Timestamp timestamp={moment(review.timestamp * 1000)} >
+                            {dateFormat.format(review.timestamp * 1000)}
+                        </Timestamp>)
+                }
+
+                <div className={cl("review-comment")}>
+                    {Parser.parseGuildEventDescription(review.comment)}
+                </div>
+
+                {review.id !== 0 && (
+                    <div className={classes(container, isHeader, buttons)} style={{
+                        padding: "0px",
+                    }}>
+                        <div className={classes(buttonClasses.wrapper, buttonsInner)} >
+                            {canReportReview(review) && <ReportButton onClick={reportRev} />}
+                            {canBlockReviewAuthor(profileId, review) && <BlockButton isBlocked={isAuthorBlocked} onClick={blockReviewSender} />}
+                            {canDeleteReview(profileId, review) && <DeleteButton onClick={delReview} />}
+                        </div>
+                    </div>
+                )}
+            </div>
+        );
+    };
+});
diff --git a/src/plugins/reviewDB/components/ReviewModal.tsx b/src/plugins/reviewDB/components/ReviewModal.tsx
new file mode 100644
index 000000000..9669a2b32
--- /dev/null
+++ b/src/plugins/reviewDB/components/ReviewModal.tsx
@@ -0,0 +1,105 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import ErrorBoundary from "@components/ErrorBoundary";
+import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { useForceUpdater } from "@utils/react";
+import { Paginator, Text, useRef, useState } from "@webpack/common";
+
+import { Auth } from "../auth";
+import { Response, REVIEWS_PER_PAGE } from "../reviewDbApi";
+import { cl } from "../utils";
+import ReviewComponent from "./ReviewComponent";
+import ReviewsView, { ReviewsInputComponent } from "./ReviewsView";
+
+function Modal({ modalProps, discordId, name }: { modalProps: any; discordId: string; name: string; }) {
+    const [data, setData] = useState<Response>();
+    const [signal, refetch] = useForceUpdater(true);
+    const [page, setPage] = useState(1);
+
+    const ref = useRef<HTMLDivElement>(null);
+
+    const reviewCount = data?.reviewCount;
+    const ownReview = data?.reviews.find(r => r.sender.discordID === Auth.user?.discordID);
+
+    return (
+        <ErrorBoundary>
+            <ModalRoot {...modalProps} size={ModalSize.MEDIUM}>
+                <ModalHeader>
+                    <Text variant="heading-lg/semibold" className={cl("modal-header")}>
+                        {name}'s Reviews
+                        {!!reviewCount && <span> ({reviewCount} Reviews)</span>}
+                    </Text>
+                    <ModalCloseButton onClick={modalProps.onClose} />
+                </ModalHeader>
+
+                <ModalContent scrollerRef={ref}>
+                    <div className={cl("modal-reviews")}>
+                        <ReviewsView
+                            discordId={discordId}
+                            name={name}
+                            page={page}
+                            refetchSignal={signal}
+                            onFetchReviews={setData}
+                            scrollToTop={() => ref.current?.scrollTo({ top: 0, behavior: "smooth" })}
+                            hideOwnReview
+                        />
+                    </div>
+                </ModalContent>
+
+                <ModalFooter className={cl("modal-footer")}>
+                    <div>
+                        {ownReview && (
+                            <ReviewComponent
+                                refetch={refetch}
+                                review={ownReview}
+                                profileId={discordId}
+                            />
+                        )}
+                        <ReviewsInputComponent
+                            isAuthor={ownReview != null}
+                            discordId={discordId}
+                            name={name}
+                            refetch={refetch}
+                        />
+
+                        {!!reviewCount && (
+                            <Paginator
+                                currentPage={page}
+                                maxVisiblePages={5}
+                                pageSize={REVIEWS_PER_PAGE}
+                                totalCount={reviewCount}
+                                onPageChange={setPage}
+                            />
+                        )}
+                    </div>
+                </ModalFooter>
+            </ModalRoot>
+        </ErrorBoundary>
+    );
+}
+
+export function openReviewsModal(discordId: string, name: string) {
+    openModal(props => (
+        <Modal
+            modalProps={props}
+            discordId={discordId}
+            name={name}
+        />
+    ));
+}
diff --git a/src/plugins/reviewDB/components/ReviewsView.tsx b/src/plugins/reviewDB/components/ReviewsView.tsx
new file mode 100644
index 000000000..abb856b99
--- /dev/null
+++ b/src/plugins/reviewDB/components/ReviewsView.tsx
@@ -0,0 +1,200 @@
+/*
+ * 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 { LazyComponent, useAwaiter, useForceUpdater } from "@utils/react";
+import { find, findByPropsLazy } from "@webpack";
+import { Forms, React, RelationshipStore, showToast, useRef, UserStore } from "@webpack/common";
+
+import { Auth, authorize } from "../auth";
+import { Review } from "../entities";
+import { addReview, getReviews, Response, REVIEWS_PER_PAGE } from "../reviewDbApi";
+import { settings } from "../settings";
+import { cl } from "../utils";
+import ReviewComponent from "./ReviewComponent";
+
+
+const Slate = findByPropsLazy("Editor", "Transforms");
+const InputTypes = findByPropsLazy("ChatInputTypes");
+
+const InputComponent = LazyComponent(() => find(m => m.default?.type?.render?.toString().includes("default.CHANNEL_TEXT_AREA")).default);
+
+interface UserProps {
+    discordId: string;
+    name: string;
+}
+
+interface Props extends UserProps {
+    onFetchReviews(data: Response): void;
+    refetchSignal?: unknown;
+    showInput?: boolean;
+    page?: number;
+    scrollToTop?(): void;
+    hideOwnReview?: boolean;
+}
+
+export default function ReviewsView({
+    discordId,
+    name,
+    onFetchReviews,
+    refetchSignal,
+    scrollToTop,
+    page = 1,
+    showInput = false,
+    hideOwnReview = false,
+}: Props) {
+    const [signal, refetch] = useForceUpdater(true);
+
+    const [reviewData] = useAwaiter(() => getReviews(discordId, (page - 1) * REVIEWS_PER_PAGE), {
+        fallbackValue: null,
+        deps: [refetchSignal, signal, page],
+        onSuccess: data => {
+            if (settings.store.hideBlockedUsers)
+                data!.reviews = data!.reviews?.filter(r => !RelationshipStore.isBlocked(r.sender.discordID));
+
+            scrollToTop?.();
+            onFetchReviews(data!);
+        }
+    });
+
+    if (!reviewData) return null;
+
+    return (
+        <>
+            <ReviewList
+                refetch={refetch}
+                reviews={reviewData!.reviews}
+                hideOwnReview={hideOwnReview}
+                profileId={discordId}
+            />
+
+            {showInput && (
+                <ReviewsInputComponent
+                    name={name}
+                    discordId={discordId}
+                    refetch={refetch}
+                    isAuthor={reviewData!.reviews?.some(r => r.sender.discordID === UserStore.getCurrentUser().id)}
+                />
+            )}
+        </>
+    );
+}
+
+function ReviewList({ refetch, reviews, hideOwnReview, profileId }: { refetch(): void; reviews: Review[]; hideOwnReview: boolean; profileId: string; }) {
+    const myId = UserStore.getCurrentUser().id;
+
+    return (
+        <div className={cl("view")}>
+            {reviews?.map(review =>
+                (review.sender.discordID !== myId || !hideOwnReview) &&
+                <ReviewComponent
+                    key={review.id}
+                    review={review}
+                    refetch={refetch}
+                    profileId={profileId}
+                />
+            )}
+
+            {reviews?.length === 0 && (
+                <Forms.FormText className={cl("placeholder")}>
+                    Looks like nobody reviewed this user yet. You could be the first!
+                </Forms.FormText>
+            )}
+        </div>
+    );
+}
+
+
+export function ReviewsInputComponent({ discordId, isAuthor, refetch, name }: { discordId: string, name: string; isAuthor: boolean; refetch(): void; }) {
+    const { token } = Auth;
+    const editorRef = useRef<any>(null);
+    const inputType = InputTypes.ChatInputTypes.FORM;
+    inputType.disableAutoFocus = true;
+
+    const channel = {
+        flags_: 256,
+        guild_id_: null,
+        id: "0",
+        getGuildId: () => null,
+        isPrivate: () => true,
+        isActiveThread: () => false,
+        isArchivedLockedThread: () => false,
+        isDM: () => true,
+        roles: { "0": { permissions: 0n } },
+        getRecipientId: () => "0",
+        hasFlag: () => false,
+    };
+
+    return (
+        <>
+            <div onClick={() => {
+                if (!token) {
+                    showToast("Opening authorization window...");
+                    authorize();
+                }
+            }}>
+                <InputComponent
+                    className={cl("input")}
+                    channel={channel}
+                    placeholder={
+                        !token
+                            ? "You need to authorize to review users!"
+                            : isAuthor
+                                ? `Update review for @${name}`
+                                : `Review @${name}`
+                    }
+                    type={inputType}
+                    disableThemedBackground={true}
+                    setEditorRef={ref => editorRef.current = ref}
+                    textValue=""
+                    onSubmit={
+                        async res => {
+                            const response = await addReview({
+                                userid: discordId,
+                                comment: res.value,
+                            });
+
+                            if (response?.success) {
+                                refetch();
+
+                                const slateEditor = editorRef.current.ref.current.getSlateEditor();
+                                const { Editor, Transform } = Slate;
+
+                                // clear editor
+                                Transform.delete(slateEditor, {
+                                    at: {
+                                        anchor: Editor.start(slateEditor, []),
+                                        focus: Editor.end(slateEditor, []),
+                                    }
+                                });
+                            } else if (response?.message) {
+                                showToast(response.message);
+                            }
+
+                            // even tho we need to return this, it doesnt do anything
+                            return {
+                                shouldClear: false,
+                                shouldRefocus: true,
+                            };
+                        }
+                    }
+                />
+            </div>
+
+        </>
+    );
+}
diff --git a/src/plugins/reviewDB/entities.ts b/src/plugins/reviewDB/entities.ts
new file mode 100644
index 000000000..a871d90f2
--- /dev/null
+++ b/src/plugins/reviewDB/entities.ts
@@ -0,0 +1,100 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+export const enum UserType {
+    Banned = -1,
+    Normal = 0,
+    Admin = 1
+}
+
+export const enum ReviewType {
+    User = 0,
+    Server = 1,
+    Support = 2,
+    System = 3
+}
+
+export const enum NotificationType {
+    Info = 0,
+    Ban = 1,
+    Unban = 2,
+    Warning = 3
+}
+
+export interface ReviewDBAuth {
+    token?: string;
+    user?: ReviewDBCurrentUser;
+}
+
+export interface Badge {
+    name: string;
+    description: string;
+    icon: string;
+    redirectURL?: string;
+    type: number;
+}
+
+export interface BanInfo {
+    id: string;
+    discordID: string;
+    reviewID: number;
+    reviewContent: string;
+    banEndDate: number;
+}
+
+export interface Notification {
+    id: number;
+    title: string;
+    content: string;
+    type: NotificationType;
+}
+
+export interface ReviewDBUser {
+    ID: number;
+    discordID: string;
+    username: string;
+    type: UserType;
+    profilePhoto: string;
+    badges: any[];
+}
+
+export interface ReviewDBCurrentUser extends ReviewDBUser {
+    warningCount: number;
+    clientMod: string;
+    banInfo: BanInfo | null;
+    notification: Notification | null;
+    lastReviewID: number;
+    blockedUsers?: string[];
+}
+
+export interface ReviewAuthor {
+    id: number,
+    discordID: string,
+    username: string,
+    profilePhoto: string,
+    badges: Badge[];
+}
+
+export interface Review {
+    comment: string,
+    id: number,
+    star: number,
+    sender: ReviewAuthor,
+    timestamp: number;
+    type?: ReviewType;
+}
diff --git a/src/plugins/reviewDB/index.tsx b/src/plugins/reviewDB/index.tsx
new file mode 100644
index 000000000..d8357faf2
--- /dev/null
+++ b/src/plugins/reviewDB/index.tsx
@@ -0,0 +1,157 @@
+/*
+ * 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 "./style.css";
+
+import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import ErrorBoundary from "@components/ErrorBoundary";
+import ExpandableHeader from "@components/ExpandableHeader";
+import { OpenExternalIcon } from "@components/Icons";
+import { Devs } from "@utils/constants";
+import { Logger } from "@utils/Logger";
+import definePlugin from "@utils/types";
+import { Alerts, Menu, Parser, showToast, useState } from "@webpack/common";
+import { Guild, User } from "discord-types/general";
+
+import { Auth, initAuth, updateAuth } from "./auth";
+import { openReviewsModal } from "./components/ReviewModal";
+import ReviewsView from "./components/ReviewsView";
+import { NotificationType } from "./entities";
+import { getCurrentUserInfo, readNotification } from "./reviewDbApi";
+import { settings } from "./settings";
+
+const guildPopoutPatch: NavContextMenuPatchCallback = (children, props: { guild: Guild, onClose(): void; }) => () => {
+    children.push(
+        <Menu.MenuItem
+            label="View Reviews"
+            id="vc-rdb-server-reviews"
+            icon={OpenExternalIcon}
+            action={() => openReviewsModal(props.guild.id, props.guild.name)}
+        />
+    );
+};
+
+export default definePlugin({
+    name: "ReviewDB",
+    description: "Review other users (Adds a new settings to profiles)",
+    authors: [Devs.mantikafasi, Devs.Ven],
+
+    settings,
+
+    patches: [
+        {
+            find: "showBorder:null",
+            replacement: {
+                match: /user:(\i),setNote:\i,canDM.+?\}\)/,
+                replace: "$&,$self.getReviewsComponent($1)"
+            }
+        }
+    ],
+
+    flux: {
+        CONNECTION_OPEN: initAuth,
+    },
+
+    async start() {
+        addContextMenuPatch("guild-header-popout", guildPopoutPatch);
+
+        const s = settings.store;
+        const { lastReviewId, notifyReviews } = s;
+
+        const legacy = s as any as { token?: string; };
+        if (legacy.token) {
+            await updateAuth({ token: legacy.token });
+            legacy.token = undefined;
+            new Logger("ReviewDB").info("Migrated legacy settings");
+        }
+
+        await initAuth();
+
+        setTimeout(async () => {
+            if (!Auth.token) return;
+
+            const user = await getCurrentUserInfo(Auth.token);
+            updateAuth({ user });
+
+            if (notifyReviews) {
+                if (lastReviewId && lastReviewId < user.lastReviewID) {
+                    s.lastReviewId = user.lastReviewID;
+                    if (user.lastReviewID !== 0)
+                        showToast("You have new reviews on your profile!");
+                }
+            }
+
+            if (user.notification) {
+                const props = user.notification.type === NotificationType.Ban ? {
+                    cancelText: "Appeal",
+                    confirmText: "Ok",
+                    onCancel: async () =>
+                        VencordNative.native.openExternal(
+                            "https://reviewdb.mantikafasi.dev/api/redirect?"
+                            + new URLSearchParams({
+                                token: Auth.token!,
+                                page: "dashboard/appeal"
+                            })
+                        )
+                } : {};
+
+                Alerts.show({
+                    title: user.notification.title,
+                    body: (
+                        Parser.parse(
+                            user.notification.content,
+                            false
+                        )
+                    ),
+                    ...props
+                });
+
+                readNotification(user.notification.id);
+            }
+        }, 4000);
+    },
+
+    stop() {
+        removeContextMenuPatch("guild-header-popout", guildPopoutPatch);
+    },
+
+    getReviewsComponent: ErrorBoundary.wrap((user: User) => {
+        const [reviewCount, setReviewCount] = useState<number>();
+
+        return (
+            <ExpandableHeader
+                headerText="User Reviews"
+                onMoreClick={() => openReviewsModal(user.id, user.username)}
+                moreTooltipText={
+                    reviewCount && reviewCount > 50
+                        ? `View all ${reviewCount} reviews`
+                        : "Open Review Modal"
+                }
+                onDropDownClick={state => settings.store.reviewsDropdownState = !state}
+                defaultState={settings.store.reviewsDropdownState}
+            >
+                <ReviewsView
+                    discordId={user.id}
+                    name={user.username}
+                    onFetchReviews={r => setReviewCount(r.reviewCount)}
+                    showInput
+                />
+            </ExpandableHeader>
+        );
+    }, { message: "Failed to render Reviews" })
+});
diff --git a/src/plugins/reviewDB/reviewDbApi.ts b/src/plugins/reviewDB/reviewDbApi.ts
new file mode 100644
index 000000000..a87fbcb8f
--- /dev/null
+++ b/src/plugins/reviewDB/reviewDbApi.ts
@@ -0,0 +1,197 @@
+/*
+ * 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 { showToast, Toasts } from "@webpack/common";
+
+import { Auth, authorize, getToken, updateAuth } from "./auth";
+import { Review, ReviewDBCurrentUser, ReviewDBUser } from "./entities";
+import { settings } from "./settings";
+
+const API_URL = "https://manti.vendicated.dev";
+
+export const REVIEWS_PER_PAGE = 50;
+
+export interface Response {
+    success: boolean,
+    message: string;
+    reviews: Review[];
+    updated: boolean;
+    hasNextPage: boolean;
+    reviewCount: number;
+}
+
+const WarningFlag = 0b00000010;
+
+export async function getReviews(id: string, offset = 0): Promise<Response> {
+    let flags = 0;
+    if (!settings.store.showWarning) flags |= WarningFlag;
+
+    const params = new URLSearchParams({
+        flags: String(flags),
+        offset: String(offset)
+    });
+    const req = await fetch(`${API_URL}/api/reviewdb/users/${id}/reviews?${params}`);
+
+    const res = (req.status === 200)
+        ? await req.json() as Response
+        : {
+            success: false,
+            message: "An Error occured while fetching reviews. Please try again later.",
+            reviews: [],
+            updated: false,
+            hasNextPage: false,
+            reviewCount: 0
+        };
+
+    if (!res.success) {
+        showToast(res.message, Toasts.Type.FAILURE);
+        return {
+            ...res,
+            reviews: [
+                {
+                    id: 0,
+                    comment: "An Error occured while fetching reviews. Please try again later.",
+                    star: 0,
+                    timestamp: 0,
+                    sender: {
+                        id: 0,
+                        username: "Error",
+                        profilePhoto: "https://cdn.discordapp.com/attachments/1045394533384462377/1084900598035513447/646808599204593683.png?size=128",
+                        discordID: "0",
+                        badges: []
+                    }
+                }
+            ]
+        };
+    }
+
+    return res;
+}
+
+export async function addReview(review: any): Promise<Response | null> {
+    review.token = await getToken();
+
+    if (!review.token) {
+        showToast("Please authorize to add a review.");
+        authorize();
+        return null;
+    }
+
+    return fetch(API_URL + `/api/reviewdb/users/${review.userid}/reviews`, {
+        method: "PUT",
+        body: JSON.stringify(review),
+        headers: {
+            "Content-Type": "application/json",
+        }
+    })
+        .then(r => r.json())
+        .then(res => {
+            showToast(res.message);
+            return res ?? null;
+        });
+}
+
+export async function deleteReview(id: number): Promise<Response> {
+    return fetch(API_URL + `/api/reviewdb/users/${id}/reviews`, {
+        method: "DELETE",
+        headers: new Headers({
+            "Content-Type": "application/json",
+            Accept: "application/json",
+        }),
+        body: JSON.stringify({
+            token: await getToken(),
+            reviewid: id
+        })
+    }).then(r => r.json());
+}
+
+export async function reportReview(id: number) {
+    const res = await fetch(API_URL + "/api/reviewdb/reports", {
+        method: "PUT",
+        headers: new Headers({
+            "Content-Type": "application/json",
+            Accept: "application/json",
+        }),
+        body: JSON.stringify({
+            reviewid: id,
+            token: await getToken()
+        })
+    }).then(r => r.json()) as Response;
+
+    showToast(res.message);
+}
+
+async function patchBlock(action: "block" | "unblock", userId: string) {
+    const res = await fetch(API_URL + "/api/reviewdb/blocks", {
+        method: "PATCH",
+        headers: new Headers({
+            "Content-Type": "application/json",
+            Accept: "application/json",
+            Authorization: await getToken() || ""
+        }),
+        body: JSON.stringify({
+            action: action,
+            discordId: userId
+        })
+    });
+
+    if (!res.ok) {
+        showToast(`Failed to ${action} user`, Toasts.Type.FAILURE);
+    } else {
+        showToast(`Successfully ${action}ed user`, Toasts.Type.SUCCESS);
+
+        if (Auth?.user?.blockedUsers) {
+            const newBlockedUsers = action === "block"
+                ? [...Auth.user.blockedUsers, userId]
+                : Auth.user.blockedUsers.filter(id => id !== userId);
+            updateAuth({ user: { ...Auth.user, blockedUsers: newBlockedUsers } });
+        }
+    }
+}
+
+export const blockUser = (userId: string) => patchBlock("block", userId);
+export const unblockUser = (userId: string) => patchBlock("unblock", userId);
+
+export async function fetchBlocks(): Promise<ReviewDBUser[]> {
+    const res = await fetch(API_URL + "/api/reviewdb/blocks", {
+        method: "GET",
+        headers: new Headers({
+            Accept: "application/json",
+            Authorization: await getToken() || ""
+        })
+    });
+
+    if (!res.ok) throw new Error(`${res.status}: ${res.statusText}`);
+    return res.json();
+}
+
+export function getCurrentUserInfo(token: string): Promise<ReviewDBCurrentUser> {
+    return fetch(API_URL + "/api/reviewdb/users", {
+        body: JSON.stringify({ token }),
+        method: "POST",
+    }).then(r => r.json());
+}
+
+export async function readNotification(id: number) {
+    return fetch(API_URL + `/api/reviewdb/notifications?id=${id}`, {
+        method: "PATCH",
+        headers: {
+            "Authorization": await getToken() || "",
+        },
+    });
+}
diff --git a/src/plugins/reviewDB/settings.tsx b/src/plugins/reviewDB/settings.tsx
new file mode 100644
index 000000000..efcb80588
--- /dev/null
+++ b/src/plugins/reviewDB/settings.tsx
@@ -0,0 +1,93 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { definePluginSettings } from "@api/Settings";
+import { OptionType } from "@utils/types";
+import { Button } from "@webpack/common";
+
+import { authorize, getToken } from "./auth";
+import { openBlockModal } from "./components/BlockedUserModal";
+
+export const settings = definePluginSettings({
+    authorize: {
+        type: OptionType.COMPONENT,
+        description: "Authorize with ReviewDB",
+        component: () => (
+            <Button onClick={authorize}>
+                Authorize with ReviewDB
+            </Button>
+        )
+    },
+    notifyReviews: {
+        type: OptionType.BOOLEAN,
+        description: "Notify about new reviews on startup",
+        default: true,
+    },
+    showWarning: {
+        type: OptionType.BOOLEAN,
+        description: "Display warning to be respectful at the top of the reviews list",
+        default: true,
+    },
+    hideTimestamps: {
+        type: OptionType.BOOLEAN,
+        description: "Hide timestamps on reviews",
+        default: false,
+    },
+    hideBlockedUsers: {
+        type: OptionType.BOOLEAN,
+        description: "Hide reviews from blocked users",
+        default: true,
+    },
+    manageBlocks: {
+        type: OptionType.COMPONENT,
+        description: "Manage Blocked Users",
+        component: () => (
+            <Button onClick={openBlockModal}>Manage Blocked Users</Button>
+        )
+    },
+    website: {
+        type: OptionType.COMPONENT,
+        description: "ReviewDB website",
+        component: () => (
+            <Button onClick={async () => {
+                let url = "https://reviewdb.mantikafasi.dev/";
+                const token = await getToken();
+                if (token)
+                    url += "/api/redirect?token=" + encodeURIComponent(token);
+
+                VencordNative.native.openExternal(url);
+            }}>
+                ReviewDB website
+            </Button>
+        )
+    },
+    supportServer: {
+        type: OptionType.COMPONENT,
+        description: "ReviewDB Support Server",
+        component: () => (
+            <Button onClick={() => {
+                VencordNative.native.openExternal("https://discord.gg/eWPBSbvznt");
+            }}>
+                ReviewDB Support Server
+            </Button>
+        )
+    }
+}).withPrivateSettings<{
+    lastReviewId?: number;
+    reviewsDropdownState?: boolean;
+}>();
diff --git a/src/plugins/reviewDB/style.css b/src/plugins/reviewDB/style.css
new file mode 100644
index 000000000..a812ecaf2
--- /dev/null
+++ b/src/plugins/reviewDB/style.css
@@ -0,0 +1,121 @@
+[class|="section"]:not([class|="lastSection"]) + .vc-rdb-view {
+    margin-top: 12px;
+}
+
+.vc-rdb-badge {
+    vertical-align: middle;
+    margin-left: 4px;
+}
+
+.vc-rdb-input {
+    margin-top: 6px;
+    margin-bottom: 12px;
+    resize: none;
+    overflow: hidden;
+    background: transparent;
+    border: 1px solid var(--profile-message-input-border-color);
+}
+
+.vc-rdb-modal-footer > div {
+    width: 100%;
+    margin: 6px 16px;
+}
+
+/* When input becomes disabled(while sending review), input adds unneccesary padding to left, this prevents it */
+.vc-rdb-input > div > div {
+    padding-left: 0 !important;
+}
+
+.vc-rdb-placeholder {
+    margin-bottom: 4px;
+    font-weight: bold;
+    font-style: italic;
+    color: var(--text-muted);
+}
+
+.vc-rdb-input * {
+    font-size: 14px;
+}
+
+.vc-rdb-modal-footer {
+    padding: 0;
+}
+
+.vc-rdb-modal-footer .vc-rdb-input {
+    margin-bottom: 0;
+    background: var(--input-background);
+}
+
+.vc-rdb-modal-footer [class|="pageControlContainer"] {
+    margin-top: 0;
+}
+
+.vc-rdb-modal-header {
+    flex-grow: 1;
+}
+
+.vc-rdb-modal-reviews {
+    margin-top: 16px;
+}
+
+.vc-rdb-review {
+    margin-top: 8px;
+    margin-bottom: 8px;
+}
+
+.vc-rdb-review-comment img {
+    vertical-align: text-top;
+}
+
+.vc-rdb-review-comment {
+    overflow-y: hidden;
+    margin-top: 1px;
+    margin-bottom: 8px;
+    color: var(--text-normal);
+    font-size: 15px;
+}
+
+.vc-rdb-blocked-badge {
+    cursor: pointer;
+}
+
+.vc-rdb-block-modal-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.vc-rdb-block-modal {
+    padding: 1em;
+    display: grid;
+    gap: 0.75em;
+}
+
+.vc-rdb-block-modal-row {
+    display: flex;
+    height: 2em;
+    gap: 0.5em;
+    align-items: center;
+}
+
+.vc-rdb-block-modal-row img {
+    border-radius: 50%;
+    height: 2em;
+    width: 2em;
+}
+
+.vc-rdb-block-modal img::before {
+    content: "";
+    display: block;
+    width: 100%;
+    height: 100%;
+    background-color: var(--background-modifier-accent);
+}
+
+.vc-rdb-block-modal-username {
+    flex-grow: 1;
+}
+
+.vc-rdb-block-modal-unblock {
+    cursor: pointer;
+}
diff --git a/src/plugins/reviewDB/utils.tsx b/src/plugins/reviewDB/utils.tsx
new file mode 100644
index 000000000..eeaca1204
--- /dev/null
+++ b/src/plugins/reviewDB/utils.tsx
@@ -0,0 +1,43 @@
+/*
+ * 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 { classNameFactory } from "@api/Styles";
+import { UserStore } from "@webpack/common";
+
+import { Auth } from "./auth";
+import { Review, UserType } from "./entities";
+
+export const cl = classNameFactory("vc-rdb-");
+
+export function canDeleteReview(profileId: string, review: Review) {
+    const myId = UserStore.getCurrentUser().id;
+    return (
+        myId === profileId
+        || review.sender.discordID === myId
+        || Auth.user?.type === UserType.Admin
+    );
+}
+
+export function canBlockReviewAuthor(profileId: string, review: Review) {
+    const myId = UserStore.getCurrentUser().id;
+    return profileId === myId && review.sender.discordID !== myId;
+}
+
+export function canReportReview(review: Review) {
+    return review.sender.discordID !== UserStore.getCurrentUser().id;
+}

From a171b35e97c8931e2466a414a65463f349fb7b11 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Mon, 15 Jan 2024 17:36:24 +0100
Subject: [PATCH 292/632] ReviewDB fixes

---
 src/plugins/reviewDB/auth.tsx                 |  6 ++--
 .../reviewDB/components/ReviewComponent.tsx   |  2 +-
 .../reviewDB/components/ReviewsView.tsx       |  9 +++---
 src/plugins/reviewDB/reviewDbApi.ts           | 31 ++++++++++---------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/plugins/reviewDB/auth.tsx b/src/plugins/reviewDB/auth.tsx
index 1d95e47dd..e7a369217 100644
--- a/src/plugins/reviewDB/auth.tsx
+++ b/src/plugins/reviewDB/auth.tsx
@@ -14,7 +14,7 @@ import { ReviewDBAuth } from "./entities";
 
 const DATA_STORE_KEY = "rdb-auth";
 
-const OAuth = findByPropsLazy("OAuth2AuthorizeModal");
+const { OAuth2AuthorizeModal } = findByPropsLazy("OAuth2AuthorizeModal");
 
 export let Auth: ReviewDBAuth = {};
 
@@ -46,7 +46,7 @@ export async function updateAuth(newAuth: ReviewDBAuth) {
 
 export function authorize(callback?: any) {
     openModal(props =>
-        <OAuth.OAuth2AuthorizeModal
+        <OAuth2AuthorizeModal
             {...props}
             scopes={["identify"]}
             responseType="code"
@@ -64,7 +64,7 @@ export function authorize(callback?: any) {
                     const { token, success } = await res.json();
                     if (success) {
                         updateAuth({ token });
-                        showToast("Successfully logged in!");
+                        showToast("Successfully logged in!", Toasts.Type.SUCCESS);
                         callback?.();
                     } else if (res.status === 1) {
                         showToast("An Error occurred while logging in.", Toasts.Type.FAILURE);
diff --git a/src/plugins/reviewDB/components/ReviewComponent.tsx b/src/plugins/reviewDB/components/ReviewComponent.tsx
index 5f3d135b4..13b0f167f 100644
--- a/src/plugins/reviewDB/components/ReviewComponent.tsx
+++ b/src/plugins/reviewDB/components/ReviewComponent.tsx
@@ -32,7 +32,7 @@ import { BlockButton, DeleteButton, ReportButton } from "./MessageButton";
 import ReviewBadge from "./ReviewBadge";
 
 export default LazyComponent(() => {
-    // this is terrible, blame ven
+    // this is terrible, blame mantika
     const p = filters.byProps;
     const [
         { cozyMessage, buttons, message, buttonsInner, groupStart },
diff --git a/src/plugins/reviewDB/components/ReviewsView.tsx b/src/plugins/reviewDB/components/ReviewsView.tsx
index abb856b99..cfd5477db 100644
--- a/src/plugins/reviewDB/components/ReviewsView.tsx
+++ b/src/plugins/reviewDB/components/ReviewsView.tsx
@@ -28,8 +28,8 @@ import { cl } from "../utils";
 import ReviewComponent from "./ReviewComponent";
 
 
-const Slate = findByPropsLazy("Editor", "Transforms");
-const InputTypes = findByPropsLazy("ChatInputTypes");
+const { Editor, Transforms } = findByPropsLazy("Editor", "Transforms");
+const { ChatInputTypes } = findByPropsLazy("ChatInputTypes");
 
 const InputComponent = LazyComponent(() => find(m => m.default?.type?.render?.toString().includes("default.CHANNEL_TEXT_AREA")).default);
 
@@ -122,7 +122,7 @@ function ReviewList({ refetch, reviews, hideOwnReview, profileId }: { refetch():
 export function ReviewsInputComponent({ discordId, isAuthor, refetch, name }: { discordId: string, name: string; isAuthor: boolean; refetch(): void; }) {
     const { token } = Auth;
     const editorRef = useRef<any>(null);
-    const inputType = InputTypes.ChatInputTypes.FORM;
+    const inputType = ChatInputTypes.FORM;
     inputType.disableAutoFocus = true;
 
     const channel = {
@@ -172,10 +172,9 @@ export function ReviewsInputComponent({ discordId, isAuthor, refetch, name }: {
                                 refetch();
 
                                 const slateEditor = editorRef.current.ref.current.getSlateEditor();
-                                const { Editor, Transform } = Slate;
 
                                 // clear editor
-                                Transform.delete(slateEditor, {
+                                Transforms.delete(slateEditor, {
                                     at: {
                                         anchor: Editor.start(slateEditor, []),
                                         focus: Editor.end(slateEditor, []),
diff --git a/src/plugins/reviewDB/reviewDbApi.ts b/src/plugins/reviewDB/reviewDbApi.ts
index a87fbcb8f..657e9c475 100644
--- a/src/plugins/reviewDB/reviewDbApi.ts
+++ b/src/plugins/reviewDB/reviewDbApi.ts
@@ -19,10 +19,10 @@
 import { showToast, Toasts } from "@webpack/common";
 
 import { Auth, authorize, getToken, updateAuth } from "./auth";
-import { Review, ReviewDBCurrentUser, ReviewDBUser } from "./entities";
+import { Review, ReviewDBCurrentUser, ReviewDBUser, ReviewType } from "./entities";
 import { settings } from "./settings";
 
-const API_URL = "https://manti.vendicated.dev";
+const API_URL = "https://manti.vendicated.dev/api/reviewdb";
 
 export const REVIEWS_PER_PAGE = 50;
 
@@ -45,13 +45,13 @@ export async function getReviews(id: string, offset = 0): Promise<Response> {
         flags: String(flags),
         offset: String(offset)
     });
-    const req = await fetch(`${API_URL}/api/reviewdb/users/${id}/reviews?${params}`);
+    const req = await fetch(`${API_URL}/users/${id}/reviews?${params}`);
 
     const res = (req.status === 200)
         ? await req.json() as Response
         : {
             success: false,
-            message: "An Error occured while fetching reviews. Please try again later.",
+            message: req.status === 429 ? "You are sending requests too fast. Wait a few seconds and try again." : "An Error occured while fetching reviews. Please try again later.",
             reviews: [],
             updated: false,
             hasNextPage: false,
@@ -65,14 +65,15 @@ export async function getReviews(id: string, offset = 0): Promise<Response> {
             reviews: [
                 {
                     id: 0,
-                    comment: "An Error occured while fetching reviews. Please try again later.",
+                    comment: res.message,
                     star: 0,
                     timestamp: 0,
+                    type: ReviewType.System,
                     sender: {
                         id: 0,
-                        username: "Error",
-                        profilePhoto: "https://cdn.discordapp.com/attachments/1045394533384462377/1084900598035513447/646808599204593683.png?size=128",
-                        discordID: "0",
+                        username: "ReviewDB",
+                        profilePhoto: "https://cdn.discordapp.com/avatars/1134864775000629298/3f87ad315b32ee464d84f1270c8d1b37.png?size=256&format=webp&quality=lossless",
+                        discordID: "1134864775000629298",
                         badges: []
                     }
                 }
@@ -92,7 +93,7 @@ export async function addReview(review: any): Promise<Response | null> {
         return null;
     }
 
-    return fetch(API_URL + `/api/reviewdb/users/${review.userid}/reviews`, {
+    return fetch(API_URL + `/users/${review.userid}/reviews`, {
         method: "PUT",
         body: JSON.stringify(review),
         headers: {
@@ -107,7 +108,7 @@ export async function addReview(review: any): Promise<Response | null> {
 }
 
 export async function deleteReview(id: number): Promise<Response> {
-    return fetch(API_URL + `/api/reviewdb/users/${id}/reviews`, {
+    return fetch(API_URL + `/users/${id}/reviews`, {
         method: "DELETE",
         headers: new Headers({
             "Content-Type": "application/json",
@@ -121,7 +122,7 @@ export async function deleteReview(id: number): Promise<Response> {
 }
 
 export async function reportReview(id: number) {
-    const res = await fetch(API_URL + "/api/reviewdb/reports", {
+    const res = await fetch(API_URL + "/reports", {
         method: "PUT",
         headers: new Headers({
             "Content-Type": "application/json",
@@ -137,7 +138,7 @@ export async function reportReview(id: number) {
 }
 
 async function patchBlock(action: "block" | "unblock", userId: string) {
-    const res = await fetch(API_URL + "/api/reviewdb/blocks", {
+    const res = await fetch(API_URL + "/blocks", {
         method: "PATCH",
         headers: new Headers({
             "Content-Type": "application/json",
@@ -168,7 +169,7 @@ export const blockUser = (userId: string) => patchBlock("block", userId);
 export const unblockUser = (userId: string) => patchBlock("unblock", userId);
 
 export async function fetchBlocks(): Promise<ReviewDBUser[]> {
-    const res = await fetch(API_URL + "/api/reviewdb/blocks", {
+    const res = await fetch(API_URL + "/blocks", {
         method: "GET",
         headers: new Headers({
             Accept: "application/json",
@@ -181,14 +182,14 @@ export async function fetchBlocks(): Promise<ReviewDBUser[]> {
 }
 
 export function getCurrentUserInfo(token: string): Promise<ReviewDBCurrentUser> {
-    return fetch(API_URL + "/api/reviewdb/users", {
+    return fetch(API_URL + "/users", {
         body: JSON.stringify({ token }),
         method: "POST",
     }).then(r => r.json());
 }
 
 export async function readNotification(id: number) {
-    return fetch(API_URL + `/api/reviewdb/notifications?id=${id}`, {
+    return fetch(API_URL + `/notifications?id=${id}`, {
         method: "PATCH",
         headers: {
             "Authorization": await getToken() || "",

From 1a982ae9aa51081f12c34c5dd68857bfbb4f312e Mon Sep 17 00:00:00 2001
From: rini <nil@dissoc.cc>
Date: Mon, 15 Jan 2024 23:51:12 -0300
Subject: [PATCH 293/632] feat(anonymisefilenames): add icon to toggle
 anonymising (#2087)

Co-authored-by: V <vendicated@riseup.net>
Co-authored-by: fawn <fawn@rinici.de>
---
 src/plugins/anonymiseFileNames/index.ts  |  94 ----------------
 src/plugins/anonymiseFileNames/index.tsx | 130 +++++++++++++++++++++++
 2 files changed, 130 insertions(+), 94 deletions(-)
 delete mode 100644 src/plugins/anonymiseFileNames/index.ts
 create mode 100644 src/plugins/anonymiseFileNames/index.tsx

diff --git a/src/plugins/anonymiseFileNames/index.ts b/src/plugins/anonymiseFileNames/index.ts
deleted file mode 100644
index 9e69d7a93..000000000
--- a/src/plugins/anonymiseFileNames/index.ts
+++ /dev/null
@@ -1,94 +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";
-
-const enum Methods {
-    Random,
-    Consistent,
-    Timestamp,
-}
-
-const tarExtMatcher = /\.tar\.\w+$/;
-
-export default definePlugin({
-    name: "AnonymiseFileNames",
-    authors: [Devs.obscurity],
-    description: "Anonymise uploaded file names",
-    patches: [
-        {
-            find: "instantBatchUpload:function",
-            replacement: {
-                match: /uploadFiles:(.{1,2}),/,
-                replace:
-                    "uploadFiles:(...args)=>(args[0].uploads.forEach(f=>f.filename=$self.anonymise(f.filename)),$1(...args)),",
-            },
-        },
-    ],
-
-    options: {
-        method: {
-            description: "Anonymising method",
-            type: OptionType.SELECT,
-            options: [
-                { label: "Random Characters", value: Methods.Random, default: true },
-                { label: "Consistent", value: Methods.Consistent },
-                { label: "Timestamp (4chan-like)", value: Methods.Timestamp },
-            ],
-        },
-        randomisedLength: {
-            description: "Random characters length",
-            type: OptionType.NUMBER,
-            default: 7,
-            disabled: () => Settings.plugins.AnonymiseFileNames.method !== Methods.Random,
-        },
-        consistent: {
-            description: "Consistent filename",
-            type: OptionType.STRING,
-            default: "image",
-            disabled: () => Settings.plugins.AnonymiseFileNames.method !== Methods.Consistent,
-        },
-    },
-
-    anonymise(file: string) {
-        let name = "image";
-        const tarMatch = tarExtMatcher.exec(file);
-        const extIdx = tarMatch?.index ?? file.lastIndexOf(".");
-        const ext = extIdx !== -1 ? file.slice(extIdx) : "";
-
-        switch (Settings.plugins.AnonymiseFileNames.method) {
-            case Methods.Random:
-                const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-                name = Array.from(
-                    { length: Settings.plugins.AnonymiseFileNames.randomisedLength },
-                    () => chars[Math.floor(Math.random() * chars.length)]
-                ).join("");
-                break;
-            case Methods.Consistent:
-                name = Settings.plugins.AnonymiseFileNames.consistent;
-                break;
-            case Methods.Timestamp:
-                // UNIX timestamp in nanos, i could not find a better dependency-less way
-                name = `${Math.floor(Date.now() / 1000)}${Math.floor(window.performance.now())}`;
-                break;
-        }
-        return name + ext;
-    },
-});
diff --git a/src/plugins/anonymiseFileNames/index.tsx b/src/plugins/anonymiseFileNames/index.tsx
new file mode 100644
index 000000000..845aa756d
--- /dev/null
+++ b/src/plugins/anonymiseFileNames/index.tsx
@@ -0,0 +1,130 @@
+/*
+ * 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 { Upload } from "@api/MessageEvents";
+import { definePluginSettings } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByCodeLazy, findByPropsLazy } from "@webpack";
+
+type AnonUpload = Upload & { anonymise?: boolean; };
+
+const ActionBarIcon = findByCodeLazy(".actionBarIcon)");
+const UploadDraft = findByPropsLazy("popFirstFile", "update");
+
+const enum Methods {
+    Random,
+    Consistent,
+    Timestamp,
+}
+
+const tarExtMatcher = /\.tar\.\w+$/;
+
+const settings = definePluginSettings({
+    anonymiseByDefault: {
+        description: "Whether to anonymise file names by default",
+        type: OptionType.BOOLEAN,
+        default: true,
+    },
+    method: {
+        description: "Anonymising method",
+        type: OptionType.SELECT,
+        options: [
+            { label: "Random Characters", value: Methods.Random, default: true },
+            { label: "Consistent", value: Methods.Consistent },
+            { label: "Timestamp", value: Methods.Timestamp },
+        ],
+    },
+    randomisedLength: {
+        description: "Random characters length",
+        type: OptionType.NUMBER,
+        default: 7,
+        disabled: () => settings.store.method !== Methods.Random,
+    },
+    consistent: {
+        description: "Consistent filename",
+        type: OptionType.STRING,
+        default: "image",
+        disabled: () => settings.store.method !== Methods.Consistent,
+    },
+});
+
+export default definePlugin({
+    name: "AnonymiseFileNames",
+    authors: [Devs.obscurity],
+    description: "Anonymise uploaded file names",
+    patches: [
+        {
+            find: "instantBatchUpload:function",
+            replacement: {
+                match: /uploadFiles:(.{1,2}),/,
+                replace:
+                    "uploadFiles:(...args)=>(args[0].uploads.forEach(f=>f.filename=$self.anonymise(f)),$1(...args)),",
+            },
+        },
+        {
+            find: ".Messages.ATTACHMENT_UTILITIES_SPOILER",
+            replacement: {
+                match: /(?<=children:\[)(?=.{10,80}tooltip:\i\.\i\.Messages\.ATTACHMENT_UTILITIES_SPOILER)/,
+                replace: "arguments[0].canEdit!==false?$self.renderIcon(arguments[0]):null,"
+            },
+        },
+    ],
+    settings,
+
+    renderIcon: ErrorBoundary.wrap(({ upload, channelId, draftType }: { upload: AnonUpload; draftType: unknown; channelId: string; }) => {
+        const anonymise = upload.anonymise ?? settings.store.anonymiseByDefault;
+        return (
+            <ActionBarIcon
+                tooltip={anonymise ? "Using anonymous file name" : "Using normal file name"}
+                onClick={() => {
+                    upload.anonymise = !anonymise;
+                    UploadDraft.update(channelId, upload.id, draftType, {}); // dummy update so component rerenders
+                }}
+            >
+                {anonymise
+                    ? <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="currentColor" d="M17.06 13C15.2 13 13.64 14.33 13.24 16.1C12.29 15.69 11.42 15.8 10.76 16.09C10.35 14.31 8.79 13 6.94 13C4.77 13 3 14.79 3 17C3 19.21 4.77 21 6.94 21C9 21 10.68 19.38 10.84 17.32C11.18 17.08 12.07 16.63 13.16 17.34C13.34 19.39 15 21 17.06 21C19.23 21 21 19.21 21 17C21 14.79 19.23 13 17.06 13M6.94 19.86C5.38 19.86 4.13 18.58 4.13 17S5.39 14.14 6.94 14.14C8.5 14.14 9.75 15.42 9.75 17S8.5 19.86 6.94 19.86M17.06 19.86C15.5 19.86 14.25 18.58 14.25 17S15.5 14.14 17.06 14.14C18.62 14.14 19.88 15.42 19.88 17S18.61 19.86 17.06 19.86M22 10.5H2V12H22V10.5M15.53 2.63C15.31 2.14 14.75 1.88 14.22 2.05L12 2.79L9.77 2.05L9.72 2.04C9.19 1.89 8.63 2.17 8.43 2.68L6 9H18L15.56 2.68L15.53 2.63Z" /></svg>
+                    : <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" style={{ transform: "scale(-1,1)" }}><path fill="currentColor" d="M22.11 21.46L2.39 1.73L1.11 3L6.31 8.2L6 9H7.11L8.61 10.5H2V12H10.11L13.5 15.37C13.38 15.61 13.3 15.85 13.24 16.1C12.29 15.69 11.41 15.8 10.76 16.09C10.35 14.31 8.79 13 6.94 13C4.77 13 3 14.79 3 17C3 19.21 4.77 21 6.94 21C9 21 10.68 19.38 10.84 17.32C11.18 17.08 12.07 16.63 13.16 17.34C13.34 19.39 15 21 17.06 21C17.66 21 18.22 20.86 18.72 20.61L20.84 22.73L22.11 21.46M6.94 19.86C5.38 19.86 4.13 18.58 4.13 17C4.13 15.42 5.39 14.14 6.94 14.14C8.5 14.14 9.75 15.42 9.75 17C9.75 18.58 8.5 19.86 6.94 19.86M17.06 19.86C15.5 19.86 14.25 18.58 14.25 17C14.25 16.74 14.29 16.5 14.36 16.25L17.84 19.73C17.59 19.81 17.34 19.86 17.06 19.86M22 12H15.2L13.7 10.5H22V12M17.06 13C19.23 13 21 14.79 21 17C21 17.25 20.97 17.5 20.93 17.73L19.84 16.64C19.68 15.34 18.66 14.32 17.38 14.17L16.29 13.09C16.54 13.03 16.8 13 17.06 13M12.2 9L7.72 4.5L8.43 2.68C8.63 2.17 9.19 1.89 9.72 2.04L9.77 2.05L12 2.79L14.22 2.05C14.75 1.88 15.32 2.14 15.54 2.63L15.56 2.68L18 9H12.2Z" /></svg>
+                }
+            </ActionBarIcon>
+        );
+    }, { noop: true }),
+
+    anonymise(upload: AnonUpload) {
+        if ((upload.anonymise ?? settings.store.anonymiseByDefault) === false) return upload.filename;
+
+        const file = upload.filename;
+        const tarMatch = tarExtMatcher.exec(file);
+        const extIdx = tarMatch?.index ?? file.lastIndexOf(".");
+        const ext = extIdx !== -1 ? file.slice(extIdx) : "";
+
+        switch (settings.store.method) {
+            case Methods.Random:
+                const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+                return Array.from(
+                    { length: settings.store.randomisedLength },
+                    () => chars[Math.floor(Math.random() * chars.length)]
+                ).join("") + ext;
+            case Methods.Consistent:
+                return settings.store.consistent + ext;
+            case Methods.Timestamp:
+                return Date.now() + ext;
+        }
+    },
+});

From f14001b531d4adc6cc97d382c481b14de274b234 Mon Sep 17 00:00:00 2001
From: CodeF53 <37855219+CodeF53@users.noreply.github.com>
Date: Mon, 15 Jan 2024 19:53:27 -0700
Subject: [PATCH 294/632] ClientTheme light mode support, shortcut buttons
 (#2010)

Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Co-authored-by: V <vendicated@riseup.net>
---
 src/components/VencordSettings/ThemesTab.tsx |  17 ++
 src/plugins/clientTheme/clientTheme.css      |  12 +-
 src/plugins/clientTheme/index.tsx            | 209 +++++++++++++------
 3 files changed, 173 insertions(+), 65 deletions(-)

diff --git a/src/components/VencordSettings/ThemesTab.tsx b/src/components/VencordSettings/ThemesTab.tsx
index 2808494a1..8abaaba4f 100644
--- a/src/components/VencordSettings/ThemesTab.tsx
+++ b/src/components/VencordSettings/ThemesTab.tsx
@@ -21,9 +21,11 @@ import { classNameFactory } from "@api/Styles";
 import { Flex } from "@components/Flex";
 import { DeleteIcon } from "@components/Icons";
 import { Link } from "@components/Link";
+import PluginModal from "@components/PluginSettings/PluginModal";
 import { openInviteModal } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
+import { openModal } from "@utils/modal";
 import { showItemInFolder } from "@utils/native";
 import { useAwaiter } from "@utils/react";
 import { findByPropsLazy, findLazy } from "@webpack";
@@ -248,6 +250,21 @@ function ThemesTab() {
                             >
                                 Edit QuickCSS
                             </Button>
+
+                            {Vencord.Settings.plugins.ClientTheme.enabled && (
+                                <Button
+                                    onClick={() => openModal(modalProps => (
+                                        <PluginModal
+                                            {...modalProps}
+                                            plugin={Vencord.Plugins.plugins.ClientTheme}
+                                            onRestartNeeded={() => { }}
+                                        />
+                                    ))}
+                                    size={Button.Sizes.SMALL}
+                                >
+                                    Edit ClientTheme
+                                </Button>
+                            )}
                         </>
                     </Card>
 
diff --git a/src/plugins/clientTheme/clientTheme.css b/src/plugins/clientTheme/clientTheme.css
index 023f88bd2..64aefdcf5 100644
--- a/src/plugins/clientTheme/clientTheme.css
+++ b/src/plugins/clientTheme/clientTheme.css
@@ -19,6 +19,16 @@
     border: thin solid var(--background-modifier-accent) !important;
 }
 
-.client-theme-warning {
+.client-theme-warning * {
     color: var(--text-danger);
 }
+
+.client-theme-contrast-warning {
+    background-color: var(--background-primary);
+    padding: 0.5rem;
+    border-radius: .5rem;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+}
diff --git a/src/plugins/clientTheme/index.tsx b/src/plugins/clientTheme/index.tsx
index d75929961..5d8cd4dc0 100644
--- a/src/plugins/clientTheme/index.tsx
+++ b/src/plugins/clientTheme/index.tsx
@@ -8,19 +8,19 @@ import "./clientTheme.css";
 
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import { getTheme, Theme } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
 import definePlugin, { OptionType, StartAt } from "@utils/types";
-import { findComponentByCodeLazy } from "@webpack";
-import { Button, Forms } from "@webpack/common";
+import { findByPropsLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack";
+import { Button, Forms, lodash as _, useStateFromStores } from "@webpack/common";
 
 const ColorPicker = findComponentByCodeLazy(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)");
 
 const colorPresets = [
     "#1E1514", "#172019", "#13171B", "#1C1C28", "#402D2D",
     "#3A483D", "#344242", "#313D4B", "#2D2F47", "#322B42",
-    "#3C2E42", "#422938"
+    "#3C2E42", "#422938", "#b6908f", "#bfa088", "#d3c77d",
+    "#86ac86", "#88aab3", "#8693b5", "#8a89ba", "#ad94bb",
 ];
 
 function onPickColor(color: number) {
@@ -30,9 +30,35 @@ function onPickColor(color: number) {
     updateColorVars(hexColor);
 }
 
+const { saveClientTheme } = findByPropsLazy("saveClientTheme");
+
+function setTheme(theme: string) {
+    saveClientTheme({ theme });
+}
+
+const ThemeStore = findStoreLazy("ThemeStore");
+const NitroThemeStore = findStoreLazy("ClientThemesBackgroundStore");
+
 function ThemeSettings() {
-    const lightnessWarning = hexToLightness(settings.store.color) > 45;
-    const lightModeWarning = getTheme() === Theme.Light;
+    const theme = useStateFromStores([ThemeStore], () => ThemeStore.theme);
+    const isLightTheme = theme === "light";
+    const oppositeTheme = isLightTheme ? "dark" : "light";
+
+    const nitroTheme = useStateFromStores([NitroThemeStore], () => NitroThemeStore.gradientPreset);
+    const nitroThemeEnabled = nitroTheme !== undefined;
+
+    const selectedLuminance = relativeLuminance(settings.store.color);
+
+    let contrastWarning = false, fixableContrast = true;
+    if ((isLightTheme && selectedLuminance < 0.26) || !isLightTheme && selectedLuminance > 0.12)
+        contrastWarning = true;
+    if (selectedLuminance < 0.26 && selectedLuminance > 0.12)
+        fixableContrast = false;
+    // light mode with values greater than 65 leads to background colors getting crushed together and poor text contrast for muted channels
+    if (isLightTheme && selectedLuminance > 0.65) {
+        contrastWarning = true;
+        fixableContrast = false;
+    }
 
     return (
         <div className="client-theme-settings">
@@ -48,15 +74,18 @@ function ThemeSettings() {
                     suggestedColors={colorPresets}
                 />
             </div>
-            {lightnessWarning || lightModeWarning
-                ? <div>
-                    <Forms.FormDivider className={classes(Margins.top8, Margins.bottom8)} />
-                    <Forms.FormText className="client-theme-warning">Your theme won't look good:</Forms.FormText>
-                    {lightnessWarning && <Forms.FormText className="client-theme-warning">Selected color is very light</Forms.FormText>}
-                    {lightModeWarning && <Forms.FormText className="client-theme-warning">Light mode isn't supported</Forms.FormText>}
+            {(contrastWarning || nitroThemeEnabled) && (<>
+                <Forms.FormDivider className={classes(Margins.top8, Margins.bottom8)} />
+                <div className={`client-theme-contrast-warning ${contrastWarning ? (isLightTheme ? "theme-dark" : "theme-light") : ""}`}>
+                    <div className="client-theme-warning">
+                        <Forms.FormText>Warning, your theme won't look good:</Forms.FormText>
+                        {contrastWarning && <Forms.FormText>Selected color won't contrast well with text</Forms.FormText>}
+                        {nitroThemeEnabled && <Forms.FormText>Nitro themes aren't supported</Forms.FormText>}
+                    </div>
+                    {(contrastWarning && fixableContrast) && <Button onClick={() => setTheme(oppositeTheme)} color={Button.Colors.RED}>Switch to {oppositeTheme} mode</Button>}
+                    {(nitroThemeEnabled) && <Button onClick={() => setTheme(theme)} color={Button.Colors.RED}>Disable Nitro Theme</Button>}
                 </div>
-                : null
-            }
+            </>)}
         </div>
     );
 }
@@ -87,9 +116,12 @@ export default definePlugin({
     settings,
 
     startAt: StartAt.DOMContentLoaded,
-    start() {
+    async start() {
         updateColorVars(settings.store.color);
-        generateColorOffsets();
+
+        const styles = await getStyles();
+        generateColorOffsets(styles);
+        generateLightModeFixes(styles);
     },
 
     stop() {
@@ -98,56 +130,86 @@ export default definePlugin({
     }
 });
 
-const variableRegex = /(--primary-[5-9]\d{2}-hsl):.*?(\S*)%;/g;
+const variableRegex = /(--primary-\d{3}-hsl):.*?(\S*)%;/g;
+const lightVariableRegex = /^--primary-[1-5]\d{2}-hsl/g;
+const darkVariableRegex = /^--primary-[5-9]\d{2}-hsl/g;
 
-async function generateColorOffsets() {
-
-    const styleLinkNodes = document.querySelectorAll('link[rel="stylesheet"]');
-    const variableLightness = {} as Record<string, number>;
-
-    // Search all stylesheets for color variables
-    for (const styleLinkNode of styleLinkNodes) {
-        const cssLink = styleLinkNode.getAttribute("href");
-        if (!cssLink) continue;
-
-        const res = await fetch(cssLink);
-        const cssString = await res.text();
-
-        // Get lightness values of --primary variables >=500
-        let variableMatch = variableRegex.exec(cssString);
-        while (variableMatch !== null) {
-            const [, variable, lightness] = variableMatch;
-            variableLightness[variable] = parseFloat(lightness);
-            variableMatch = variableRegex.exec(cssString);
-        }
-    }
-
-    // Generate offsets
-    const lightnessOffsets = Object.entries(variableLightness)
+// generates variables per theme by:
+// - matching regex (so we can limit what variables are included in light/dark theme, otherwise text becomes unreadable)
+// - offset from specified center (light/dark theme get different offsets because light uses 100 for background-primary, while dark uses 600)
+function genThemeSpecificOffsets(variableLightness: Record<string, number>, regex: RegExp, centerVariable: string): string {
+    return Object.entries(variableLightness).filter(([key]) => key.search(regex) > -1)
         .map(([key, lightness]) => {
-            const lightnessOffset = lightness - variableLightness["--primary-600-hsl"];
+            const lightnessOffset = lightness - variableLightness[centerVariable];
             const plusOrMinus = lightnessOffset >= 0 ? "+" : "-";
             return `${key}: var(--theme-h) var(--theme-s) calc(var(--theme-l) ${plusOrMinus} ${Math.abs(lightnessOffset).toFixed(2)}%);`;
         })
         .join("\n");
+}
 
-    const style = document.createElement("style");
-    style.setAttribute("id", "clientThemeOffsets");
-    style.textContent = `:root:root {
-        ${lightnessOffsets}
-    }`;
-    document.head.appendChild(style);
+
+function generateColorOffsets(styles) {
+    const variableLightness = {} as Record<string, number>;
+
+    // Get lightness values of --primary variables
+    let variableMatch = variableRegex.exec(styles);
+    while (variableMatch !== null) {
+        const [, variable, lightness] = variableMatch;
+        variableLightness[variable] = parseFloat(lightness);
+        variableMatch = variableRegex.exec(styles);
+    }
+
+    createStyleSheet("clientThemeOffsets", [
+        `.theme-light {\n ${genThemeSpecificOffsets(variableLightness, lightVariableRegex, "--primary-345-hsl")} \n}`,
+        `.theme-dark {\n ${genThemeSpecificOffsets(variableLightness, darkVariableRegex, "--primary-600-hsl")} \n}`,
+    ].join("\n\n"));
+}
+
+function generateLightModeFixes(styles) {
+    const groupLightUsesW500Regex = /\.theme-light[^{]*\{[^}]*var\(--white-500\)[^}]*}/gm;
+    // get light capturing groups that mention --white-500
+    const relevantStyles = [...styles.matchAll(groupLightUsesW500Regex)].flat();
+
+    const groupBackgroundRegex = /^([^{]*)\{background:var\(--white-500\)/m;
+    const groupBackgroundColorRegex = /^([^{]*)\{background-color:var\(--white-500\)/m;
+    // find all capturing groups that assign background or background-color directly to w500
+    const backgroundGroups = mapReject(relevantStyles, entry => captureOne(entry, groupBackgroundRegex)).join(",\n");
+    const backgroundColorGroups = mapReject(relevantStyles, entry => captureOne(entry, groupBackgroundColorRegex)).join(",\n");
+    // create css to reassign them to --primary-100
+    const reassignBackgrounds = `${backgroundGroups} {\n background: var(--primary-100) \n}`;
+    const reassignBackgroundColors = `${backgroundColorGroups} {\n background-color: var(--primary-100) \n}`;
+
+    const groupBgVarRegex = /\.theme-light\{([^}]*--[^:}]*(?:background|bg)[^:}]*:var\(--white-500\)[^}]*)\}/m;
+    const bgVarRegex = /^(--[^:]*(?:background|bg)[^:]*):var\(--white-500\)/m;
+    // get all global variables used for backgrounds
+    const lightVars = mapReject(relevantStyles, style => captureOne(style, groupBgVarRegex)) // get the insides of capture groups that have at least one background var with w500
+        .map(str => str.split(";")).flat(); // captureGroupInsides[] -> cssRule[]
+    const lightBgVars = mapReject(lightVars, variable => captureOne(variable, bgVarRegex)); // remove vars that aren't for backgrounds or w500
+    // create css to reassign every var
+    const reassignVariables = `.theme-light {\n ${lightBgVars.map(variable => `${variable}: var(--primary-100);`).join("\n")} \n}`;
+
+    createStyleSheet("clientThemeLightModeFixes", [
+        reassignBackgrounds,
+        reassignBackgroundColors,
+        reassignVariables,
+    ].join("\n\n"));
+}
+
+function captureOne(str, regex) {
+    const result = str.match(regex);
+    return (result === null) ? null : result[1];
+}
+
+function mapReject(arr, mapFunc, rejectFunc = _.isNull) {
+    return _.reject(arr.map(mapFunc), rejectFunc);
 }
 
 function updateColorVars(color: string) {
     const { hue, saturation, lightness } = hexToHSL(color);
 
     let style = document.getElementById("clientThemeVars");
-    if (!style) {
-        style = document.createElement("style");
-        style.setAttribute("id", "clientThemeVars");
-        document.head.appendChild(style);
-    }
+    if (!style)
+        style = createStyleSheet("clientThemeVars");
 
     style.textContent = `:root {
         --theme-h: ${hue};
@@ -156,6 +218,28 @@ function updateColorVars(color: string) {
     }`;
 }
 
+function createStyleSheet(id, content = "") {
+    const style = document.createElement("style");
+    style.setAttribute("id", id);
+    style.textContent = content.split("\n").map(line => line.trim()).join("\n");
+    document.body.appendChild(style);
+    return style;
+}
+
+// returns all of discord's native styles in a single string
+async function getStyles(): Promise<string> {
+    let out = "";
+    const styleLinkNodes = document.querySelectorAll('link[rel="stylesheet"]');
+    for (const styleLinkNode of styleLinkNodes) {
+        const cssLink = styleLinkNode.getAttribute("href");
+        if (!cssLink) continue;
+
+        const res = await fetch(cssLink);
+        out += await res.text();
+    }
+    return out;
+}
+
 // https://css-tricks.com/converting-color-spaces-in-javascript/
 function hexToHSL(hexCode: string) {
     // Hex => RGB normalized to 0-1
@@ -198,17 +282,14 @@ function hexToHSL(hexCode: string) {
     return { hue, saturation, lightness };
 }
 
-// Minimized math just for lightness, lowers lag when changing colors
-function hexToLightness(hexCode: string) {
-    // Hex => RGB normalized to 0-1
-    const r = parseInt(hexCode.substring(0, 2), 16) / 255;
-    const g = parseInt(hexCode.substring(2, 4), 16) / 255;
-    const b = parseInt(hexCode.substring(4, 6), 16) / 255;
+// https://www.w3.org/TR/WCAG21/#dfn-relative-luminance
+function relativeLuminance(hexCode: string) {
+    const normalize = (x: number) =>
+        x <= 0.03928 ? x / 12.92 : ((x + 0.055) / 1.055) ** 2.4;
 
-    const cMax = Math.max(r, g, b);
-    const cMin = Math.min(r, g, b);
+    const r = normalize(parseInt(hexCode.substring(0, 2), 16) / 255);
+    const g = normalize(parseInt(hexCode.substring(2, 4), 16) / 255);
+    const b = normalize(parseInt(hexCode.substring(4, 6), 16) / 255);
 
-    const lightness = 100 * ((cMax + cMin) / 2);
-
-    return lightness;
+    return r * 0.2126 + g * 0.7152 + b * 0.0722;
 }

From 60bc823eab8876a63f8b3d192a703c99ace8921a Mon Sep 17 00:00:00 2001
From: Sam <149597648+cheesesamwich@users.noreply.github.com>
Date: Tue, 16 Jan 2024 03:00:41 +0000
Subject: [PATCH 295/632] new plugin: BetterGifPicker (#2108)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/betterGifPicker/index.ts | 23 +++++++++++++++++++++++
 src/utils/constants.ts               |  4 ++++
 2 files changed, 27 insertions(+)
 create mode 100644 src/plugins/betterGifPicker/index.ts

diff --git a/src/plugins/betterGifPicker/index.ts b/src/plugins/betterGifPicker/index.ts
new file mode 100644
index 000000000..09bb570d7
--- /dev/null
+++ b/src/plugins/betterGifPicker/index.ts
@@ -0,0 +1,23 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "BetterGifPicker",
+    description: "Makes the gif picker open the favourite category by default",
+    authors: [Devs.Samwich],
+    patches: [
+        {
+            find: ".GIFPickerResultTypes.SEARCH",
+            replacement: [{
+                match: "this.state={resultType:null}",
+                replace: 'this.state={resultType:"Favorites"}'
+            }]
+        }
+    ]
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index a94ba0fc3..699c40b90 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -403,6 +403,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Grzesiek11",
         id: 368475654662127616n,
     },
+    Samwich: {
+        name: "Samwich",
+        id: 976176454511509554n,
+    },
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly

From 11d3165009d0a5d8a2f2594a88f60317f239b8a8 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Tue, 16 Jan 2024 10:00:53 +0700
Subject: [PATCH 296/632] roleColorEverywhere: thread role color (again)
 (#2098)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/roleColorEverywhere/index.tsx | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index d718f4027..968027163 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -72,10 +72,6 @@ export default definePlugin({
         {
             find: 'tutorialId:"whos-online',
             replacement: [
-                {
-                    match: /\i.roleIcon,\.\.\.\i/,
-                    replace: "$&,color:$self.roleGroupColor(arguments[0])"
-                },
                 {
                     match: /null,\i," — ",\i\]/,
                     replace: "null,$self.roleGroupColor(arguments[0])]"
@@ -83,6 +79,16 @@ export default definePlugin({
             ],
             predicate: () => settings.store.memberList,
         },
+        {
+            find: ".Messages.THREAD_BROWSER_PRIVATE",
+            replacement: [
+                {
+                    match: /children:\[\i," — ",\i\]/,
+                    replace: "children:[$self.roleGroupColor(arguments[0])]"
+                },
+            ],
+            predicate: () => settings.store.memberList,
+        },
         {
             find: "renderPrioritySpeaker",
             replacement: [

From e8e09c17e9bb60b5c26ae862394d39faf5f6cd3b Mon Sep 17 00:00:00 2001
From: Bloofield <64427742+Bloofield@users.noreply.github.com>
Date: Tue, 16 Jan 2024 14:07:05 +1100
Subject: [PATCH 297/632] ClearURLs: Add igsh (#2103)

---
 src/plugins/clearURLs/defaultRules.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/clearURLs/defaultRules.ts b/src/plugins/clearURLs/defaultRules.ts
index 0633b717d..95a59c037 100644
--- a/src/plugins/clearURLs/defaultRules.ts
+++ b/src/plugins/clearURLs/defaultRules.ts
@@ -153,5 +153,6 @@ export const defaultRules = [
     "utm_term",
     "si@open.spotify.com",
     "igshid",
+    "igsh",
     "share_id@reddit.com",
 ];

From 8a168bd18571a08143bebb2bcd9c3807d19fc6d7 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 16 Jan 2024 04:12:15 +0100
Subject: [PATCH 298/632] bump to v1.6.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0b373008e..076b2999d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.6.6",
+    "version": "1.6.7",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 3d64f3da410153447bc2fd49af2d7799af993e51 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 18 Jan 2024 00:39:34 +0100
Subject: [PATCH 299/632] WebContextMenus: fix copying images

---
 src/plugins/webContextMenus.web/index.ts | 67 ++++++++++++++++--------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index bb98c61d7..ec3070b11 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -46,6 +46,21 @@ const settings = definePluginSettings({
     }
 });
 
+const MEDIA_PROXY_URL = "https://media.discordapp.net";
+const CDN_URL = "https://cdn.discordapp.com";
+
+function fixImageUrl(urlString: string) {
+    const url = new URL(urlString);
+    if (url.origin === CDN_URL) return urlString;
+    if (url.origin === MEDIA_PROXY_URL) return CDN_URL + url.pathname;
+
+    url.searchParams.delete("width");
+    url.searchParams.delete("height");
+    url.searchParams.set("quality", "lossless");
+    if (url.searchParams.get("format") === "webp") url.searchParams.set("format", "png");
+    return url.toString();
+}
+
 export default definePlugin({
     name: "WebContextMenus",
     description: "Re-adds context menus missing in the web version of Discord: Links & Images (Copy/Open Link/Image), Text Area (Copy, Cut, Paste, SpellCheck)",
@@ -182,34 +197,40 @@ export default definePlugin({
     ],
 
     async copyImage(url: string) {
-        if (IS_VESKTOP && VesktopNative.clipboard) {
-            const data = await fetch(url).then(r => r.arrayBuffer());
-            VesktopNative.clipboard.copyImage(data, url);
-            return;
+        url = fixImageUrl(url);
+
+        let imageData = await fetch(url).then(r => r.blob());
+        if (imageData.type !== "image/png") {
+            const bitmap = await createImageBitmap(imageData);
+
+            const canvas = document.createElement("canvas");
+            canvas.width = bitmap.width;
+            canvas.height = bitmap.height;
+            canvas.getContext("2d")!.drawImage(bitmap, 0, 0);
+
+            await new Promise<void>(done => {
+                canvas.toBlob(data => {
+                    imageData = data!;
+                    done();
+                }, "image/png");
+            });
         }
 
-        // Clipboard only supports image/png, jpeg and similar won't work. Thus, we need to convert it to png
-        // via canvas first
-        const img = new Image();
-        img.onload = () => {
-            const canvas = document.createElement("canvas");
-            canvas.width = img.naturalWidth;
-            canvas.height = img.naturalHeight;
-            canvas.getContext("2d")!.drawImage(img, 0, 0);
-
-            canvas.toBlob(data => {
-                navigator.clipboard.write([
-                    new ClipboardItem({
-                        "image/png": data!
-                    })
-                ]);
-            }, "image/png");
-        };
-        img.crossOrigin = "anonymous";
-        img.src = url;
+        if (IS_VESKTOP && VesktopNative.clipboard) {
+            VesktopNative.clipboard.copyImage(await imageData.arrayBuffer(), url);
+            return;
+        } else {
+            navigator.clipboard.write([
+                new ClipboardItem({
+                    "image/png": imageData
+                })
+            ]);
+        }
     },
 
     async saveImage(url: string) {
+        url = fixImageUrl(url);
+
         const data = await fetchImage(url);
         if (!data) return;
 

From 74300e0a6963dec7f83dc9f21f93736be9990b59 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 18 Jan 2024 00:58:40 +0100
Subject: [PATCH 300/632] WebContextMenus: only force png on copy image, not
 save image

---
 src/plugins/webContextMenus.web/index.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index ec3070b11..5f6beca2c 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -49,7 +49,7 @@ const settings = definePluginSettings({
 const MEDIA_PROXY_URL = "https://media.discordapp.net";
 const CDN_URL = "https://cdn.discordapp.com";
 
-function fixImageUrl(urlString: string) {
+function fixImageUrl(urlString: string, explodeWebp: boolean) {
     const url = new URL(urlString);
     if (url.origin === CDN_URL) return urlString;
     if (url.origin === MEDIA_PROXY_URL) return CDN_URL + url.pathname;
@@ -57,7 +57,9 @@ function fixImageUrl(urlString: string) {
     url.searchParams.delete("width");
     url.searchParams.delete("height");
     url.searchParams.set("quality", "lossless");
-    if (url.searchParams.get("format") === "webp") url.searchParams.set("format", "png");
+    if (explodeWebp && url.searchParams.get("format") === "webp")
+        url.searchParams.set("format", "png");
+
     return url.toString();
 }
 
@@ -197,7 +199,7 @@ export default definePlugin({
     ],
 
     async copyImage(url: string) {
-        url = fixImageUrl(url);
+        url = fixImageUrl(url, true);
 
         let imageData = await fetch(url).then(r => r.blob());
         if (imageData.type !== "image/png") {
@@ -229,7 +231,7 @@ export default definePlugin({
     },
 
     async saveImage(url: string) {
-        url = fixImageUrl(url);
+        url = fixImageUrl(url, false);
 
         const data = await fetchImage(url);
         if (!data) return;

From 988435714e8b1de6e7e95885cbb5222113fb039c Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 19 Jan 2024 01:08:25 +0100
Subject: [PATCH 301/632] Add back transparency option

---
 src/components/VencordSettings/VencordTab.tsx | 6 +++---
 src/main/patcher.ts                           | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx
index 07d777eb3..ab910ea2a 100644
--- a/src/components/VencordSettings/VencordTab.tsx
+++ b/src/components/VencordSettings/VencordTab.tsx
@@ -83,10 +83,10 @@ function VencordSettings() {
                 title: "Use Windows' native title bar instead of Discord's custom one",
                 note: "Requires a full restart"
             }),
-            !IS_WEB && false /* This causes electron to freeze / white screen for some people */ && {
+            !IS_WEB && {
                 key: "transparent",
-                title: "Enable window transparency",
-                note: "Requires a full restart"
+                title: "Enable window transparency.",
+                note: "You need a theme that supports transparency or this will do nothing. Will stop the window from being resizable. Requires a full restart"
             },
             !IS_WEB && isWindows && {
                 key: "winCtrlQ",
diff --git a/src/main/patcher.ts b/src/main/patcher.ts
index 0cc92550c..76d1ccaf3 100644
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@@ -79,8 +79,7 @@ if (!IS_VANILLA) {
                     delete options.frame;
                 }
 
-                // This causes electron to freeze / white screen for some people
-                if ((settings as any).transparentUNSAFE_USE_AT_OWN_RISK) {
+                if (settings.transparent) {
                     options.transparent = true;
                     options.backgroundColor = "#00000000";
                 }

From 16707334582151df832743042ba6189936048ee7 Mon Sep 17 00:00:00 2001
From: ~coolelectronics <me@coolelectronics.me>
Date: Thu, 18 Jan 2024 20:07:35 -0500
Subject: [PATCH 302/632] feat(plugin): FixYoutubeEmbeds - fix UMG blocked
 embeds (#2116)

Co-authored-by: V <vendicated@riseup.net>
---
 .../fixYoutubeEmbeds.desktop/README.md        |  5 ++++
 src/plugins/fixYoutubeEmbeds.desktop/index.ts | 14 ++++++++++
 .../fixYoutubeEmbeds.desktop/native.ts        | 26 +++++++++++++++++++
 src/utils/constants.ts                        |  4 +++
 4 files changed, 49 insertions(+)
 create mode 100644 src/plugins/fixYoutubeEmbeds.desktop/README.md
 create mode 100644 src/plugins/fixYoutubeEmbeds.desktop/index.ts
 create mode 100644 src/plugins/fixYoutubeEmbeds.desktop/native.ts

diff --git a/src/plugins/fixYoutubeEmbeds.desktop/README.md b/src/plugins/fixYoutubeEmbeds.desktop/README.md
new file mode 100644
index 000000000..875de9e28
--- /dev/null
+++ b/src/plugins/fixYoutubeEmbeds.desktop/README.md
@@ -0,0 +1,5 @@
+# FixYoutubeEmbeds
+
+Bypasses youtube videos being blocked from display on Discord (for example by UMG)
+
+![](https://github.com/Vendicated/Vencord/assets/45497981/7a5fdcaa-217c-4c63-acae-f0d6af2f79be)
diff --git a/src/plugins/fixYoutubeEmbeds.desktop/index.ts b/src/plugins/fixYoutubeEmbeds.desktop/index.ts
new file mode 100644
index 000000000..55486d763
--- /dev/null
+++ b/src/plugins/fixYoutubeEmbeds.desktop/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "FixYoutubeEmbeds",
+    description: "Bypasses youtube videos being blocked from display on Discord (for example by UMG)",
+    authors: [Devs.coolelectronics]
+});
diff --git a/src/plugins/fixYoutubeEmbeds.desktop/native.ts b/src/plugins/fixYoutubeEmbeds.desktop/native.ts
new file mode 100644
index 000000000..5a3ef2c62
--- /dev/null
+++ b/src/plugins/fixYoutubeEmbeds.desktop/native.ts
@@ -0,0 +1,26 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { app } from "electron";
+import { getSettings } from "main/ipcMain";
+
+app.on("browser-window-created", (_, win) => {
+    win.webContents.on("frame-created", (_, { frame }) => {
+        frame.once("dom-ready", () => {
+            if (frame.url.startsWith("https://www.youtube.com/")) {
+                const settings = getSettings().plugins?.FixYoutubeEmbeds;
+                if (!settings?.enabled) return;
+
+                frame.executeJavaScript(`
+                new MutationObserver(() => {
+                    let err = document.querySelector(".ytp-error-content-wrap-subreason span")?.textContent;
+                    if (err && err.includes("blocked it from display")) window.location.reload()
+                }).observe(document.body, { childList: true, subtree:true });
+                `);
+            }
+        });
+    });
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 699c40b90..899936128 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -407,6 +407,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Samwich",
         id: 976176454511509554n,
     },
+    coolelectronics: {
+        name: "coolelectronics",
+        id: 696392247205298207n,
+    }
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly

From e707538b73ee8e2430c09a476904ea41ab1b7979 Mon Sep 17 00:00:00 2001
From: Manti <67705577+mantikafasi@users.noreply.github.com>
Date: Mon, 22 Jan 2024 03:18:48 +0300
Subject: [PATCH 303/632] [ReviewDB] update for new api changes; some fixes
 (#2120)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/reviewDB/auth.tsx                 | 17 +++--
 .../reviewDB/components/ReviewComponent.tsx   | 17 +++--
 .../reviewDB/components/ReviewsView.tsx       |  8 +--
 src/plugins/reviewDB/index.tsx                |  3 +-
 src/plugins/reviewDB/reviewDbApi.ts           | 66 ++++++++++---------
 src/plugins/reviewDB/settings.tsx             | 63 +++++++++---------
 src/plugins/reviewDB/style.css                | 23 ++++++-
 src/plugins/reviewDB/utils.tsx                | 13 +++-
 8 files changed, 126 insertions(+), 84 deletions(-)

diff --git a/src/plugins/reviewDB/auth.tsx b/src/plugins/reviewDB/auth.tsx
index e7a369217..136001b2d 100644
--- a/src/plugins/reviewDB/auth.tsx
+++ b/src/plugins/reviewDB/auth.tsx
@@ -61,14 +61,17 @@ export function authorize(callback?: any) {
                     const res = await fetch(url, {
                         headers: new Headers({ Accept: "application/json" })
                     });
-                    const { token, success } = await res.json();
-                    if (success) {
-                        updateAuth({ token });
-                        showToast("Successfully logged in!", Toasts.Type.SUCCESS);
-                        callback?.();
-                    } else if (res.status === 1) {
-                        showToast("An Error occurred while logging in.", Toasts.Type.FAILURE);
+
+                    if (!res.ok) {
+                        const { message } = await res.json();
+                        showToast(message || "An error occured while authorizing", Toasts.Type.FAILURE);
+                        return;
                     }
+
+                    const { token } = await res.json();
+                    updateAuth({ token });
+                    showToast("Successfully logged in!", Toasts.Type.SUCCESS);
+                    callback?.();
                 } catch (e) {
                     new Logger("ReviewDB").error("Failed to authorize", e);
                 }
diff --git a/src/plugins/reviewDB/components/ReviewComponent.tsx b/src/plugins/reviewDB/components/ReviewComponent.tsx
index 13b0f167f..977745a25 100644
--- a/src/plugins/reviewDB/components/ReviewComponent.tsx
+++ b/src/plugins/reviewDB/components/ReviewComponent.tsx
@@ -20,13 +20,13 @@ import { openUserProfile } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { LazyComponent } from "@utils/react";
 import { filters, findBulk } from "@webpack";
-import { Alerts, moment, Parser, showToast, Timestamp } from "@webpack/common";
+import { Alerts, moment, Parser, Timestamp, useState } from "@webpack/common";
 
 import { Auth, getToken } from "../auth";
 import { Review, ReviewType } from "../entities";
 import { blockUser, deleteReview, reportReview, unblockUser } from "../reviewDbApi";
 import { settings } from "../settings";
-import { canBlockReviewAuthor, canDeleteReview, canReportReview, cl } from "../utils";
+import { canBlockReviewAuthor, canDeleteReview, canReportReview, cl, showToast } from "../utils";
 import { openBlockModal } from "./BlockedUserModal";
 import { BlockButton, DeleteButton, ReportButton } from "./MessageButton";
 import ReviewBadge from "./ReviewBadge";
@@ -51,6 +51,8 @@ export default LazyComponent(() => {
     const dateFormat = new Intl.DateTimeFormat();
 
     return function ReviewComponent({ review, refetch, profileId }: { review: Review; refetch(): void; profileId: string; }) {
+        const [showAll, setShowAll] = useState(false);
+
         function openModal() {
             openUserProfile(review.sender.discordID);
         }
@@ -66,10 +68,9 @@ export default LazyComponent(() => {
                         return showToast("You must be logged in to delete reviews.");
                     } else {
                         deleteReview(review.id).then(res => {
-                            if (res.success) {
+                            if (res) {
                                 refetch();
                             }
-                            showToast(res.message);
                         });
                     }
                 }
@@ -116,11 +117,11 @@ export default LazyComponent(() => {
         }
 
         return (
-            <div className={classes(cozyMessage, wrapper, message, groupStart, cozy, cl("review"))} style={
+            <div className={classes(cl("review"), cozyMessage, wrapper, message, groupStart, cozy)} style={
                 {
                     marginLeft: "0px",
                     paddingLeft: "52px", // wth is this
-                    paddingRight: "16px"
+                    // nobody knows anymore
                 }
             }>
 
@@ -168,7 +169,9 @@ export default LazyComponent(() => {
                 }
 
                 <div className={cl("review-comment")}>
-                    {Parser.parseGuildEventDescription(review.comment)}
+                    {(review.comment.length > 200 && !showAll)
+                        ? [Parser.parseGuildEventDescription(review.comment.substring(0, 200)), "...", <br />, (<a onClick={() => setShowAll(true)}>Read more</a>)]
+                        : Parser.parseGuildEventDescription(review.comment)}
                 </div>
 
                 {review.id !== 0 && (
diff --git a/src/plugins/reviewDB/components/ReviewsView.tsx b/src/plugins/reviewDB/components/ReviewsView.tsx
index cfd5477db..64cea1815 100644
--- a/src/plugins/reviewDB/components/ReviewsView.tsx
+++ b/src/plugins/reviewDB/components/ReviewsView.tsx
@@ -18,13 +18,13 @@
 
 import { LazyComponent, useAwaiter, useForceUpdater } from "@utils/react";
 import { find, findByPropsLazy } from "@webpack";
-import { Forms, React, RelationshipStore, showToast, useRef, UserStore } from "@webpack/common";
+import { Forms, React, RelationshipStore, useRef, UserStore } from "@webpack/common";
 
 import { Auth, authorize } from "../auth";
 import { Review } from "../entities";
 import { addReview, getReviews, Response, REVIEWS_PER_PAGE } from "../reviewDbApi";
 import { settings } from "../settings";
-import { cl } from "../utils";
+import { cl, showToast } from "../utils";
 import ReviewComponent from "./ReviewComponent";
 
 
@@ -168,7 +168,7 @@ export function ReviewsInputComponent({ discordId, isAuthor, refetch, name }: {
                                 comment: res.value,
                             });
 
-                            if (response?.success) {
+                            if (response) {
                                 refetch();
 
                                 const slateEditor = editorRef.current.ref.current.getSlateEditor();
@@ -180,8 +180,6 @@ export function ReviewsInputComponent({ discordId, isAuthor, refetch, name }: {
                                         focus: Editor.end(slateEditor, []),
                                     }
                                 });
-                            } else if (response?.message) {
-                                showToast(response.message);
                             }
 
                             // even tho we need to return this, it doesnt do anything
diff --git a/src/plugins/reviewDB/index.tsx b/src/plugins/reviewDB/index.tsx
index d8357faf2..50bb62184 100644
--- a/src/plugins/reviewDB/index.tsx
+++ b/src/plugins/reviewDB/index.tsx
@@ -25,7 +25,7 @@ import { OpenExternalIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { Logger } from "@utils/Logger";
 import definePlugin from "@utils/types";
-import { Alerts, Menu, Parser, showToast, useState } from "@webpack/common";
+import { Alerts, Menu, Parser, useState } from "@webpack/common";
 import { Guild, User } from "discord-types/general";
 
 import { Auth, initAuth, updateAuth } from "./auth";
@@ -34,6 +34,7 @@ import ReviewsView from "./components/ReviewsView";
 import { NotificationType } from "./entities";
 import { getCurrentUserInfo, readNotification } from "./reviewDbApi";
 import { settings } from "./settings";
+import { showToast } from "./utils";
 
 const guildPopoutPatch: NavContextMenuPatchCallback = (children, props: { guild: Guild, onClose(): void; }) => () => {
     children.push(
diff --git a/src/plugins/reviewDB/reviewDbApi.ts b/src/plugins/reviewDB/reviewDbApi.ts
index 657e9c475..ec6d9ff3b 100644
--- a/src/plugins/reviewDB/reviewDbApi.ts
+++ b/src/plugins/reviewDB/reviewDbApi.ts
@@ -16,18 +16,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { showToast, Toasts } from "@webpack/common";
+import { Toasts } from "@webpack/common";
 
 import { Auth, authorize, getToken, updateAuth } from "./auth";
 import { Review, ReviewDBCurrentUser, ReviewDBUser, ReviewType } from "./entities";
 import { settings } from "./settings";
+import { showToast } from "./utils";
 
 const API_URL = "https://manti.vendicated.dev/api/reviewdb";
 
 export const REVIEWS_PER_PAGE = 50;
 
 export interface Response {
-    success: boolean,
     message: string;
     reviews: Review[];
     updated: boolean;
@@ -37,6 +37,16 @@ export interface Response {
 
 const WarningFlag = 0b00000010;
 
+async function rdbRequest(path: string, options: RequestInit = {}) {
+    return fetch(API_URL + path, {
+        ...options,
+        headers: {
+            ...options.headers,
+            Authorization: await getToken() || "",
+        }
+    });
+}
+
 export async function getReviews(id: string, offset = 0): Promise<Response> {
     let flags = 0;
     if (!settings.store.showWarning) flags |= WarningFlag;
@@ -47,10 +57,9 @@ export async function getReviews(id: string, offset = 0): Promise<Response> {
     });
     const req = await fetch(`${API_URL}/users/${id}/reviews?${params}`);
 
-    const res = (req.status === 200)
+    const res = (req.ok)
         ? await req.json() as Response
         : {
-            success: false,
             message: req.status === 429 ? "You are sending requests too fast. Wait a few seconds and try again." : "An Error occured while fetching reviews. Please try again later.",
             reviews: [],
             updated: false,
@@ -58,7 +67,7 @@ export async function getReviews(id: string, offset = 0): Promise<Response> {
             reviewCount: 0
         };
 
-    if (!res.success) {
+    if (!req.ok) {
         showToast(res.message, Toasts.Type.FAILURE);
         return {
             ...res,
@@ -85,44 +94,46 @@ export async function getReviews(id: string, offset = 0): Promise<Response> {
 }
 
 export async function addReview(review: any): Promise<Response | null> {
-    review.token = await getToken();
 
-    if (!review.token) {
+    const token = await getToken();
+    if (!token) {
         showToast("Please authorize to add a review.");
         authorize();
         return null;
     }
 
-    return fetch(API_URL + `/users/${review.userid}/reviews`, {
+    return await rdbRequest(`/users/${review.userid}/reviews`, {
         method: "PUT",
         body: JSON.stringify(review),
         headers: {
             "Content-Type": "application/json",
         }
-    })
-        .then(r => r.json())
-        .then(res => {
-            showToast(res.message);
-            return res ?? null;
-        });
+    }).then(async r => {
+        const data = await r.json() as Response;
+        showToast(data.message);
+        return r.ok ? data : null;
+    });
 }
 
-export async function deleteReview(id: number): Promise<Response> {
-    return fetch(API_URL + `/users/${id}/reviews`, {
+export async function deleteReview(id: number): Promise<Response | null> {
+    return await rdbRequest(`/users/${id}/reviews`, {
         method: "DELETE",
         headers: new Headers({
             "Content-Type": "application/json",
             Accept: "application/json",
         }),
         body: JSON.stringify({
-            token: await getToken(),
             reviewid: id
         })
-    }).then(r => r.json());
+    }).then(async r => {
+        const data = await r.json() as Response;
+        showToast(data.message);
+        return r.ok ? data : null;
+    });
 }
 
 export async function reportReview(id: number) {
-    const res = await fetch(API_URL + "/reports", {
+    const res = await rdbRequest("/reports", {
         method: "PUT",
         headers: new Headers({
             "Content-Type": "application/json",
@@ -130,7 +141,6 @@ export async function reportReview(id: number) {
         }),
         body: JSON.stringify({
             reviewid: id,
-            token: await getToken()
         })
     }).then(r => r.json()) as Response;
 
@@ -138,12 +148,11 @@ export async function reportReview(id: number) {
 }
 
 async function patchBlock(action: "block" | "unblock", userId: string) {
-    const res = await fetch(API_URL + "/blocks", {
+    const res = await rdbRequest("/blocks", {
         method: "PATCH",
         headers: new Headers({
             "Content-Type": "application/json",
             Accept: "application/json",
-            Authorization: await getToken() || ""
         }),
         body: JSON.stringify({
             action: action,
@@ -169,11 +178,10 @@ export const blockUser = (userId: string) => patchBlock("block", userId);
 export const unblockUser = (userId: string) => patchBlock("unblock", userId);
 
 export async function fetchBlocks(): Promise<ReviewDBUser[]> {
-    const res = await fetch(API_URL + "/blocks", {
+    const res = await rdbRequest("/blocks", {
         method: "GET",
         headers: new Headers({
             Accept: "application/json",
-            Authorization: await getToken() || ""
         })
     });
 
@@ -182,17 +190,13 @@ export async function fetchBlocks(): Promise<ReviewDBUser[]> {
 }
 
 export function getCurrentUserInfo(token: string): Promise<ReviewDBCurrentUser> {
-    return fetch(API_URL + "/users", {
-        body: JSON.stringify({ token }),
+    return rdbRequest("/users", {
         method: "POST",
     }).then(r => r.json());
 }
 
 export async function readNotification(id: number) {
-    return fetch(API_URL + `/notifications?id=${id}`, {
-        method: "PATCH",
-        headers: {
-            "Authorization": await getToken() || "",
-        },
+    return rdbRequest(`/notifications?id=${id}`, {
+        method: "PATCH"
     });
 }
diff --git a/src/plugins/reviewDB/settings.tsx b/src/plugins/reviewDB/settings.tsx
index efcb80588..79cf4174e 100644
--- a/src/plugins/reviewDB/settings.tsx
+++ b/src/plugins/reviewDB/settings.tsx
@@ -22,13 +22,14 @@ import { Button } from "@webpack/common";
 
 import { authorize, getToken } from "./auth";
 import { openBlockModal } from "./components/BlockedUserModal";
+import { cl } from "./utils";
 
 export const settings = definePluginSettings({
     authorize: {
         type: OptionType.COMPONENT,
         description: "Authorize with ReviewDB",
         component: () => (
-            <Button onClick={authorize}>
+            <Button onClick={() => authorize()}>
                 Authorize with ReviewDB
             </Button>
         )
@@ -53,38 +54,40 @@ export const settings = definePluginSettings({
         description: "Hide reviews from blocked users",
         default: true,
     },
-    manageBlocks: {
+    buttons: {
         type: OptionType.COMPONENT,
-        description: "Manage Blocked Users",
+        description: "ReviewDB buttons",
         component: () => (
-            <Button onClick={openBlockModal}>Manage Blocked Users</Button>
-        )
-    },
-    website: {
-        type: OptionType.COMPONENT,
-        description: "ReviewDB website",
-        component: () => (
-            <Button onClick={async () => {
-                let url = "https://reviewdb.mantikafasi.dev/";
-                const token = await getToken();
-                if (token)
-                    url += "/api/redirect?token=" + encodeURIComponent(token);
+            <div className={cl("button-grid")} >
+                <Button onClick={openBlockModal}>Manage Blocked Users</Button>
 
-                VencordNative.native.openExternal(url);
-            }}>
-                ReviewDB website
-            </Button>
-        )
-    },
-    supportServer: {
-        type: OptionType.COMPONENT,
-        description: "ReviewDB Support Server",
-        component: () => (
-            <Button onClick={() => {
-                VencordNative.native.openExternal("https://discord.gg/eWPBSbvznt");
-            }}>
-                ReviewDB Support Server
-            </Button>
+                <Button
+                    color={Button.Colors.GREEN}
+                    onClick={() => {
+                        VencordNative.native.openExternal("https://github.com/sponsors/mantikafasi");
+                    }}
+                >
+                    Support ReviewDB development
+                </Button>
+
+                <Button onClick={async () => {
+                    let url = "https://reviewdb.mantikafasi.dev/";
+                    const token = await getToken();
+                    if (token)
+                        url += "/api/redirect?token=" + encodeURIComponent(token);
+
+                    VencordNative.native.openExternal(url);
+                }}>
+                    ReviewDB website
+                </Button>
+
+
+                <Button onClick={() => {
+                    VencordNative.native.openExternal("https://discord.gg/eWPBSbvznt");
+                }}>
+                    ReviewDB Support Server
+                </Button>
+            </div >
         )
     }
 }).withPrivateSettings<{
diff --git a/src/plugins/reviewDB/style.css b/src/plugins/reviewDB/style.css
index a812ecaf2..190b8f620 100644
--- a/src/plugins/reviewDB/style.css
+++ b/src/plugins/reviewDB/style.css
@@ -59,8 +59,14 @@
 }
 
 .vc-rdb-review {
-    margin-top: 8px;
-    margin-bottom: 8px;
+    padding-top: 8px !important;
+    padding-bottom: 8px !important;
+    padding-right: 32px !important;
+}
+
+.vc-rdb-review:hover {
+    background: var(--background-message-hover) !important;
+    border-radius: 8px;
 }
 
 .vc-rdb-review-comment img {
@@ -91,6 +97,19 @@
     gap: 0.75em;
 }
 
+.vc-rdb-button-grid {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 10px;
+}
+
+/* stylelint-disable-next-line media-feature-range-notation */
+@media (max-width: 600px) {
+    .vc-rdb-button-grid {
+        grid-template-columns: 1fr;
+    }
+}
+
 .vc-rdb-block-modal-row {
     display: flex;
     height: 2em;
diff --git a/src/plugins/reviewDB/utils.tsx b/src/plugins/reviewDB/utils.tsx
index eeaca1204..916adc45e 100644
--- a/src/plugins/reviewDB/utils.tsx
+++ b/src/plugins/reviewDB/utils.tsx
@@ -17,7 +17,7 @@
 */
 
 import { classNameFactory } from "@api/Styles";
-import { UserStore } from "@webpack/common";
+import { Toasts, UserStore } from "@webpack/common";
 
 import { Auth } from "./auth";
 import { Review, UserType } from "./entities";
@@ -41,3 +41,14 @@ export function canBlockReviewAuthor(profileId: string, review: Review) {
 export function canReportReview(review: Review) {
     return review.sender.discordID !== UserStore.getCurrentUser().id;
 }
+
+export function showToast(message: string, type = Toasts.Type.MESSAGE) {
+    Toasts.show({
+        id: Toasts.genId(),
+        message,
+        type,
+        options: {
+            position: Toasts.Position.BOTTOM, // NOBODY LIKES TOASTS AT THE TOP
+        },
+    });
+}

From 4bb0db506682bf03b66366e70ae249979b95f695 Mon Sep 17 00:00:00 2001
From: EdVraz <88881326+EdVraz@users.noreply.github.com>
Date: Mon, 22 Jan 2024 01:21:10 +0100
Subject: [PATCH 304/632] fix anonymiseFileNames (#2125)

---
 src/plugins/anonymiseFileNames/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/anonymiseFileNames/index.tsx b/src/plugins/anonymiseFileNames/index.tsx
index 845aa756d..0382b65c2 100644
--- a/src/plugins/anonymiseFileNames/index.tsx
+++ b/src/plugins/anonymiseFileNames/index.tsx
@@ -81,7 +81,7 @@ export default definePlugin({
         {
             find: ".Messages.ATTACHMENT_UTILITIES_SPOILER",
             replacement: {
-                match: /(?<=children:\[)(?=.{10,80}tooltip:\i\.\i\.Messages\.ATTACHMENT_UTILITIES_SPOILER)/,
+                match: /(?<=children:\[)(?=.{10,80}tooltip:.{0,100}\i\.\i\.Messages\.ATTACHMENT_UTILITIES_SPOILER)/,
                 replace: "arguments[0].canEdit!==false?$self.renderIcon(arguments[0]):null,"
             },
         },

From 620c127b58e94ce4bf0b78d7e55fbce8e4f376e2 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Thu, 25 Jan 2024 07:22:34 +0100
Subject: [PATCH 305/632] [skip ci] fix pnpm inject

---
 scripts/runInstaller.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/runInstaller.mjs b/scripts/runInstaller.mjs
index b35039f8a..8b2510b2e 100644
--- a/scripts/runInstaller.mjs
+++ b/scripts/runInstaller.mjs
@@ -35,11 +35,11 @@ const ETAG_FILE = join(FILE_DIR, "etag.txt");
 function getFilename() {
     switch (process.platform) {
         case "win32":
-            return "VencordInstaller.exe";
+            return "VencordInstallerCli.exe";
         case "darwin":
             return "VencordInstaller.MacOS.zip";
         case "linux":
-            return "VencordInstaller-" + (process.env.WAYLAND_DISPLAY ? "wayland" : "x11");
+            return "VencordInstallerCli-linux";
         default:
             throw new Error("Unsupported platform: " + process.platform);
     }

From cc885b5bb367add1c4e831ab1a4ab6145f6b0f5c Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 3 Feb 2024 02:11:59 +0100
Subject: [PATCH 306/632] remove lumap

---
 src/plugins/pictureInPicture/index.tsx | 2 +-
 src/utils/constants.ts                 | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/pictureInPicture/index.tsx b/src/plugins/pictureInPicture/index.tsx
index ba4aa8387..ca766affc 100644
--- a/src/plugins/pictureInPicture/index.tsx
+++ b/src/plugins/pictureInPicture/index.tsx
@@ -24,7 +24,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "PictureInPicture",
     description: "Adds picture in picture to videos (next to the Download button)",
-    authors: [Devs.Lumap],
+    authors: [Devs.Nobody],
     settings,
     patches: [
         {
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 899936128..55af93605 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -42,6 +42,10 @@ export interface Dev {
  * If you are fine with attribution but don't want the badge, add badge: false
  */
 export const Devs = /* #__PURE__*/ Object.freeze({
+    Nobody: {
+        name: "Nobody",
+        id: 0n,
+    },
     Ven: {
         name: "Vendicated",
         id: 343383572805058560n
@@ -359,10 +363,6 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "bb010g",
         id: 72791153467990016n,
     },
-    Lumap: {
-        name: "lumap",
-        id: 635383782576357407n
-    },
     Dolfies: {
         name: "Dolfies",
         id: 852892297661906993n,

From 8938f4a3cf9a36aa490703651934acccbd07bdf9 Mon Sep 17 00:00:00 2001
From: EdVraz <88881326+EdVraz@users.noreply.github.com>
Date: Sun, 4 Feb 2024 01:50:51 +0100
Subject: [PATCH 307/632] fix moreUserTags (#2146)

---
 src/plugins/moreUserTags/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/moreUserTags/index.tsx b/src/plugins/moreUserTags/index.tsx
index 9921bca8e..d1ad941b0 100644
--- a/src/plugins/moreUserTags/index.tsx
+++ b/src/plugins/moreUserTags/index.tsx
@@ -198,7 +198,7 @@ export default definePlugin({
             replacement: [
                 // make the tag show the right text
                 {
-                    match: /(switch\((\i)\){.+?)case (\i(?:\.\i)?)\.BOT:default:(\i)=(\i\.\i\.Messages)\.BOT_TAG_BOT/,
+                    match: /(switch\((\i)\){.+?)case (\i(?:\.\i)?)\.BOT:default:(\i)=.{0,40}(\i\.\i\.Messages)\.BOT_TAG_BOT/,
                     replace: (_, origSwitch, variant, tags, displayedText, strings) =>
                         `${origSwitch}default:{${displayedText} = $self.getTagText(${tags}[${variant}], ${strings})}`
                 },

From bf977e0047141dd479b26f66cc848923310bcb6b Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 6 Feb 2024 16:29:47 +0100
Subject: [PATCH 308/632] Add chat bar button api ~ fixes buttons for russian
 users

---
 src/api/ChatButtons.tsx                     | 123 ++++++++++++++++++++
 src/api/index.ts                            |   6 +
 src/plugins/_api/chatButtons.ts             |  22 ++++
 src/plugins/invisibleChat.desktop/index.tsx |  88 +++++---------
 src/plugins/previewMessage/index.tsx        |  74 +++++-------
 src/plugins/sendTimestamps/index.tsx        | 101 +++++++---------
 src/plugins/silentMessageToggle/index.tsx   |  78 +++++--------
 src/plugins/silentTyping/index.tsx          |  66 ++++-------
 src/plugins/translate/TranslateIcon.tsx     |  52 ++++-----
 src/plugins/translate/index.tsx             |  22 +---
 10 files changed, 325 insertions(+), 307 deletions(-)
 create mode 100644 src/api/ChatButtons.tsx
 create mode 100644 src/plugins/_api/chatButtons.ts

diff --git a/src/api/ChatButtons.tsx b/src/api/ChatButtons.tsx
new file mode 100644
index 000000000..0350965af
--- /dev/null
+++ b/src/api/ChatButtons.tsx
@@ -0,0 +1,123 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Logger } from "@utils/Logger";
+import { Button, ButtonLooks, ButtonWrapperClasses, Tooltip } from "@webpack/common";
+import { Channel } from "discord-types/general";
+import { HTMLProps, MouseEventHandler, ReactNode } from "react";
+
+export interface ChatBarProps {
+    channel: Channel;
+    disabled: boolean;
+    isEmpty: boolean;
+    type: {
+        analyticsName: string;
+        attachments: boolean;
+        autocomplete: {
+            addReactionShortcut: boolean,
+            forceChatLayer: boolean,
+            reactions: boolean;
+        },
+        commands: {
+            enabled: boolean;
+        },
+        drafts: {
+            type: number,
+            commandType: number,
+            autoSave: boolean;
+        },
+        emojis: {
+            button: boolean;
+        },
+        gifs: {
+            button: boolean,
+            allowSending: boolean;
+        },
+        gifts: {
+            button: boolean;
+        },
+        permissions: {
+            requireSendMessages: boolean;
+        },
+        showThreadPromptOnReply: boolean,
+        stickers: {
+            button: boolean,
+            allowSending: boolean,
+            autoSuggest: boolean;
+        },
+        users: {
+            allowMentioning: boolean;
+        },
+        submit: {
+            button: boolean,
+            ignorePreference: boolean,
+            disableEnterToSubmit: boolean,
+            clearOnSubmit: boolean,
+            useDisabledStylesOnSubmit: boolean;
+        },
+        uploadLongMessages: boolean,
+        upsellLongMessages: {
+            iconOnly: boolean;
+        },
+        showCharacterCount: boolean,
+        sedReplace: boolean;
+    };
+}
+
+export type ChatBarButton = (props: ChatBarProps, isMainChat: boolean) => ReactNode;
+
+const buttonFactories = new Map<string, ChatBarButton>();
+const logger = new Logger("ChatButtons");
+
+export function _injectButtons(buttons: ReactNode[], props: ChatBarProps) {
+    if (props.type.analyticsName !== "normal") return;
+
+    for (const [key, makeButton] of buttonFactories) {
+        try {
+            const res = makeButton(props, props.type.analyticsName === "normal");
+            if (res) buttons.push(res);
+        } catch (e) {
+            logger.error(`Failed to render button ${key}`, e);
+        }
+    }
+}
+
+export const addChatBarButton = (id: string, button: ChatBarButton) => buttonFactories.set(id, button);
+export const removeChatBarButton = (id: string) => buttonFactories.delete(id);
+
+export interface ChatBarButtonProps {
+    children: ReactNode;
+    tooltip: string;
+    onClick: MouseEventHandler<HTMLButtonElement>;
+    onContextMenu?: MouseEventHandler<HTMLButtonElement>;
+    buttonProps?: Omit<HTMLProps<HTMLButtonElement>, "size" | "onClick" | "onContextMenu">;
+}
+export const ChatBarButton = ErrorBoundary.wrap((props: ChatBarButtonProps) => {
+    return (
+        <Tooltip text={props.tooltip}>
+            {({ onMouseEnter, onMouseLeave }) => (
+                <div style={{ display: "flex" }}>
+                    <Button
+                        aria-label={props.tooltip}
+                        size=""
+                        look={ButtonLooks.BLANK}
+                        onMouseEnter={onMouseEnter}
+                        onMouseLeave={onMouseLeave}
+                        innerClassName={ButtonWrapperClasses.button}
+                        onClick={props.onClick}
+                        onContextMenu={props.onContextMenu}
+                        {...props.buttonProps}
+                    >
+                        <div className={ButtonWrapperClasses.buttonWrapper}>
+                            {props.children}
+                        </div>
+                    </Button>
+                </div>
+            )}
+        </Tooltip>
+    );
+}, { noop: true });
diff --git a/src/api/index.ts b/src/api/index.ts
index 08f238104..5dca63105 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -17,6 +17,7 @@
 */
 
 import * as $Badges from "./Badges";
+import * as $ChatButtons from "./ChatButtons";
 import * as $Commands from "./Commands";
 import * as $ContextMenu from "./ContextMenu";
 import * as $DataStore from "./DataStore";
@@ -104,3 +105,8 @@ export const Notifications = $Notifications;
  * An api allowing you to patch and add/remove items to/from context menus
  */
 export const ContextMenu = $ContextMenu;
+
+/**
+ * An API allowing you to add buttons to the chat input
+ */
+export const ChatButtons = $ChatButtons;
diff --git a/src/plugins/_api/chatButtons.ts b/src/plugins/_api/chatButtons.ts
new file mode 100644
index 000000000..ca85964c0
--- /dev/null
+++ b/src/plugins/_api/chatButtons.ts
@@ -0,0 +1,22 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "ChatInputButtonAPI",
+    description: "API to add buttons to the chat input",
+    authors: [Devs.Ven],
+
+    patches: [{
+        find: 'location:"ChannelTextAreaButtons"',
+        replacement: {
+            match: /if\(!\i\.isMobile\)\{(?=.+?&&(\i)\.push\(.{0,50}"gift")/,
+            replace: "$&Vencord.Api.ChatButtons._injectButtons($1,arguments[0]);"
+        }
+    }]
+});
diff --git a/src/plugins/invisibleChat.desktop/index.tsx b/src/plugins/invisibleChat.desktop/index.tsx
index c80c4ce54..3184e025d 100644
--- a/src/plugins/invisibleChat.desktop/index.tsx
+++ b/src/plugins/invisibleChat.desktop/index.tsx
@@ -16,13 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { addChatBarButton, ChatBarButton } from "@api/ChatButtons";
 import { addButton, removeButton } from "@api/MessagePopover";
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { getStegCloak } from "@utils/dependencies";
 import definePlugin, { OptionType } from "@utils/types";
-import { Button, ButtonLooks, ButtonWrapperClasses, ChannelStore, FluxDispatcher, RestAPI, Tooltip } from "@webpack/common";
+import { ChannelStore, FluxDispatcher, RestAPI, Tooltip } from "@webpack/common";
 import { Message } from "discord-types/general";
 
 import { buildDecModal } from "./components/DecryptionModal";
@@ -64,54 +65,32 @@ function Indicator() {
 
 }
 
-function ChatBarIcon(chatBoxProps: {
-    type: {
-        analyticsName: string;
-    };
-}) {
-    if (chatBoxProps.type.analyticsName !== "normal") return null;
+const ChatBarIcon: ChatBarButton = (_, isMainChat) => {
+    if (!isMainChat) return null;
 
     return (
-        <Tooltip text="Encrypt Message">
-            {({ onMouseEnter, onMouseLeave }) => (
-                // size="" = Button.Sizes.NONE
-                /*
-                    many themes set "> button" to display: none, as the gift button is
-                    the only directly descending button (all the other elements are divs.)
-                    Thus, wrap in a div here to avoid getting hidden by that.
-                    flex is for some reason necessary as otherwise the button goes flying off
-                */
-                <div style={{ display: "flex" }}>
-                    <Button
-                        aria-haspopup="dialog"
-                        aria-label="Encrypt Message"
-                        size=""
-                        look={ButtonLooks.BLANK}
-                        onMouseEnter={onMouseEnter}
-                        onMouseLeave={onMouseLeave}
-                        innerClassName={ButtonWrapperClasses.button}
-                        onClick={() => buildEncModal()}
-                        style={{ padding: "0 2px", scale: "0.9" }}
-                    >
-                        <div className={ButtonWrapperClasses.buttonWrapper}>
-                            <svg
-                                aria-hidden
-                                role="img"
-                                width="32"
-                                height="32"
-                                viewBox={"0 0 64 64"}
-                                style={{ scale: "1.1" }}
-                            >
-                                <path fill="currentColor" d="M 32 9 C 24.832 9 19 14.832 19 22 L 19 27.347656 C 16.670659 28.171862 15 30.388126 15 33 L 15 49 C 15 52.314 17.686 55 21 55 L 43 55 C 46.314 55 49 52.314 49 49 L 49 33 C 49 30.388126 47.329341 28.171862 45 27.347656 L 45 22 C 45 14.832 39.168 9 32 9 z M 32 13 C 36.963 13 41 17.038 41 22 L 41 27 L 23 27 L 23 22 C 23 17.038 27.037 13 32 13 z" />
-                            </svg>
-                        </div>
-                    </Button>
-                </div>
-            )
-            }
-        </Tooltip >
+        <ChatBarButton
+            tooltip="Encrypt Message"
+            onClick={() => buildEncModal()}
+
+            buttonProps={{
+                "aria-haspopup": "dialog",
+                style: { padding: "0 2px", scale: "0.9" }
+            }}
+        >
+            <svg
+                aria-hidden
+                role="img"
+                width="32"
+                height="32"
+                viewBox={"0 0 64 64"}
+                style={{ scale: "1.1" }}
+            >
+                <path fill="currentColor" d="M 32 9 C 24.832 9 19 14.832 19 22 L 19 27.347656 C 16.670659 28.171862 15 30.388126 15 33 L 15 49 C 15 52.314 17.686 55 21 55 L 43 55 C 46.314 55 49 52.314 49 49 L 49 33 C 49 30.388126 47.329341 28.171862 45 27.347656 L 45 22 C 45 14.832 39.168 9 32 9 z M 32 13 C 36.963 13 41 17.038 41 22 L 41 27 L 23 27 L 23 22 C 23 17.038 27.037 13 32 13 z" />
+            </svg>
+        </ChatBarButton>
     );
-}
+};
 
 const settings = definePluginSettings({
     savedPasswords: {
@@ -125,7 +104,7 @@ export default definePlugin({
     name: "InvisibleChat",
     description: "Encrypt your Messages in a non-suspicious way!",
     authors: [Devs.SammCheese],
-    dependencies: ["MessagePopoverAPI"],
+    dependencies: ["MessagePopoverAPI", "ChatInputButtonAPI"],
     patches: [
         {
             // Indicator
@@ -135,13 +114,6 @@ export default definePlugin({
                 replace: "try {$1 && $self.INV_REGEX.test($1.message.content) ? $1.content.push($self.indicator()) : null } catch {};$&"
             }
         },
-        {
-            find: "ChannelTextAreaButtons",
-            replacement: {
-                match: /(\i)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
-                replace: "$&,(()=>{try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}})()",
-            }
-        },
     ],
 
     EMBED_API_URL: "https://embed.sammcheese.net",
@@ -154,7 +126,7 @@ export default definePlugin({
         const { default: StegCloak } = await getStegCloak();
         steggo = new StegCloak(true, false);
 
-        addButton("invDecrypt", message => {
+        addButton("InvisibleChat", message => {
             return this.INV_REGEX.test(message?.content)
                 ? {
                     label: "Decrypt Message",
@@ -170,10 +142,13 @@ export default definePlugin({
                 }
                 : null;
         });
+
+        addChatBarButton("InvisibleChat", ChatBarIcon);
     },
 
     stop() {
-        removeButton("invDecrypt");
+        removeButton("InvisibleChat");
+        removeButton("InvisibleChat");
     },
 
     // Gets the Embed of a Link
@@ -216,7 +191,6 @@ export default definePlugin({
         });
     },
 
-    chatBarIcon: ErrorBoundary.wrap(ChatBarIcon, { noop: true }),
     popOverIcon: () => <PopOverIcon />,
     indicator: ErrorBoundary.wrap(Indicator, { noop: true })
 });
diff --git a/src/plugins/previewMessage/index.tsx b/src/plugins/previewMessage/index.tsx
index f2634ae6b..1d8b769d5 100644
--- a/src/plugins/previewMessage/index.tsx
+++ b/src/plugins/previewMessage/index.tsx
@@ -16,22 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { addChatBarButton, ChatBarButton, removeChatBarButton } from "@api/ChatButtons";
 import { generateId, sendBotMessage } from "@api/Commands";
-import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { Button, ButtonLooks, ButtonWrapperClasses, DraftStore, DraftType, SelectedChannelStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
+import { DraftStore, DraftType, SelectedChannelStore, UserStore, useStateFromStores } from "@webpack/common";
 import { MessageAttachment } from "discord-types/general";
 
-interface Props {
-    type: {
-        analyticsName: string;
-        isEmpty: boolean;
-        attachments: boolean;
-    };
-}
-
 const UploadStore = findByPropsLazy("getUploads");
 
 const getDraft = (channelId: string) => DraftStore.getDraft(channelId, DraftType.ChannelMessage);
@@ -81,13 +73,13 @@ const getAttachments = async (channelId: string) =>
     );
 
 
-export function PreviewButton(chatBoxProps: Props) {
-    const { isEmpty, attachments } = chatBoxProps.type;
+const PreviewButton: ChatBarButton = (props, isMainChat) => {
+    const { isEmpty, type: { attachments } } = props;
 
     const channelId = SelectedChannelStore.getChannelId();
     const draft = useStateFromStores([DraftStore], () => getDraft(channelId));
 
-    if (chatBoxProps.type.analyticsName !== "normal") return null;
+    if (!isMainChat) return null;
 
     const hasAttachments = attachments && UploadStore.getUploads(channelId, DraftType.ChannelMessage).length > 0;
     const hasContent = !isEmpty && draft?.length > 0;
@@ -95,47 +87,33 @@ export function PreviewButton(chatBoxProps: Props) {
     if (!hasContent && !hasAttachments) return null;
 
     return (
-        <Tooltip text="Preview Message">
-            {tooltipProps => (
-                <Button
-                    {...tooltipProps}
-                    onClick={async () =>
-                        sendBotMessage(
-                            channelId,
-                            {
-                                content: getDraft(channelId),
-                                author: UserStore.getCurrentUser(),
-                                attachments: hasAttachments ? await getAttachments(channelId) : undefined,
-                            }
-                        )}
-                    size=""
-                    look={ButtonLooks.BLANK}
-                    innerClassName={ButtonWrapperClasses.button}
-                    style={{ padding: "0 2px", height: "100%" }}
-                >
-                    <div className={ButtonWrapperClasses.buttonWrapper}>
-                        <img width={24} height={24} src="https://discord.com/assets/4c5a77a89716352686f590a6f014770c.svg" />
-                    </div>
-                </Button>
-            )}
-        </Tooltip>
+        <ChatBarButton
+            tooltip="Preview Message"
+            onClick={async () =>
+                sendBotMessage(
+                    channelId,
+                    {
+                        content: getDraft(channelId),
+                        author: UserStore.getCurrentUser(),
+                        attachments: hasAttachments ? await getAttachments(channelId) : undefined,
+                    }
+                )}
+            buttonProps={{
+                style: { padding: "0 2px", height: "100%" }
+            }}
+        >
+            <img width={24} height={24} src="https://discord.com/assets/4c5a77a89716352686f590a6f014770c.svg" />
+        </ChatBarButton>
     );
 
-}
+};
 
 export default definePlugin({
     name: "PreviewMessage",
     description: "Lets you preview your message before sending it.",
     authors: [Devs.Aria],
-    patches: [
-        {
-            find: "ChannelTextAreaButtons",
-            replacement: {
-                match: /(\i)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
-                replace: "$&,(()=>{try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}})()",
-            }
-        },
-    ],
+    dependencies: ["ChatInputButtonAPI"],
 
-    chatBarIcon: ErrorBoundary.wrap(PreviewButton, { noop: true }),
+    start: () => addChatBarButton("previewMessage", PreviewButton),
+    stop: () => removeChatBarButton("previewMessage"),
 });
diff --git a/src/plugins/sendTimestamps/index.tsx b/src/plugins/sendTimestamps/index.tsx
index 6d488add6..bd888a82b 100644
--- a/src/plugins/sendTimestamps/index.tsx
+++ b/src/plugins/sendTimestamps/index.tsx
@@ -18,6 +18,7 @@
 
 import "./styles.css";
 
+import { addChatBarButton, ChatBarButton, removeChatBarButton } from "@api/ChatButtons";
 import { addPreSendListener, removePreSendListener } from "@api/MessageEvents";
 import { definePluginSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
@@ -26,7 +27,7 @@ import { getTheme, insertTextIntoChatInputBox, Theme } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import { closeModal, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModal } from "@utils/modal";
 import definePlugin, { OptionType } from "@utils/types";
-import { Button, ButtonLooks, ButtonWrapperClasses, Forms, Parser, Select, Tooltip, useMemo, useState } from "@webpack/common";
+import { Button, Forms, Parser, Select, useMemo, useState } from "@webpack/common";
 
 const settings = definePluginSettings({
     replaceMessageContents: {
@@ -122,25 +123,51 @@ function PickerModal({ rootProps, close }: { rootProps: ModalProps, close(): voi
     );
 }
 
+const ChatBarIcon: ChatBarButton = (_, isMainChat) => {
+    if (!isMainChat) return null;
+
+    return (
+        <ChatBarButton
+            tooltip="Insert Timestamp"
+            onClick={() => {
+                const key = openModal(props => (
+                    <PickerModal
+                        rootProps={props}
+                        close={() => closeModal(key)}
+                    />
+                ));
+            }}
+            buttonProps={{
+                "aria-haspopup": "dialog",
+                className: cl("button")
+            }}
+        >
+            <svg
+                aria-hidden="true"
+                role="img"
+                width="24"
+                height="24"
+                viewBox="0 0 24 24"
+            >
+                <g fill="none" fill-rule="evenodd">
+                    <path fill="currentColor" d="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99.9-1.99 2L3 19a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7v-5z" />
+                    <rect width="24" height="24" />
+                </g>
+            </svg>
+        </ChatBarButton>
+    );
+};
+
 export default definePlugin({
     name: "SendTimestamps",
     description: "Send timestamps easily via chat box button & text shortcuts. Read the extended description!",
     authors: [Devs.Ven, Devs.Tyler, Devs.Grzesiek11],
-    dependencies: ["MessageEventsAPI"],
+    dependencies: ["MessageEventsAPI", "ChatInputButtonAPI"],
 
-    settings: settings,
-
-    patches: [
-        {
-            find: "ChannelTextAreaButtons",
-            replacement: {
-                match: /(\i)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
-                replace: "$&,(()=>{try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}})()",
-            }
-        },
-    ],
+    settings,
 
     start() {
+        addChatBarButton("SendTimestamps", ChatBarIcon);
         this.listener = addPreSendListener((_, msg) => {
             if (settings.store.replaceMessageContents) {
                 msg.content = msg.content.replace(/`\d{1,2}:\d{2} ?(?:AM|PM)?`/gi, parseTime);
@@ -149,56 +176,10 @@ export default definePlugin({
     },
 
     stop() {
+        removeChatBarButton("SendTimestamps");
         removePreSendListener(this.listener);
     },
 
-    chatBarIcon(chatBoxProps: { type: { analyticsName: string; }; }) {
-        if (chatBoxProps.type.analyticsName !== "normal") return null;
-
-        return (
-            <Tooltip text="Insert Timestamp">
-                {({ onMouseEnter, onMouseLeave }) => (
-                    <div style={{ display: "flex" }}>
-                        <Button
-                            aria-haspopup="dialog"
-                            aria-label="Insert Timestamp"
-                            size=""
-                            look={ButtonLooks.BLANK}
-                            onMouseEnter={onMouseEnter}
-                            onMouseLeave={onMouseLeave}
-                            innerClassName={ButtonWrapperClasses.button}
-                            onClick={() => {
-                                const key = openModal(props => (
-                                    <PickerModal
-                                        rootProps={props}
-                                        close={() => closeModal(key)}
-                                    />
-                                ));
-                            }}
-                            className={cl("button")}
-                        >
-                            <div className={ButtonWrapperClasses.buttonWrapper}>
-                                <svg
-                                    aria-hidden="true"
-                                    role="img"
-                                    width="24"
-                                    height="24"
-                                    viewBox="0 0 24 24"
-                                >
-                                    <g fill="none" fill-rule="evenodd">
-                                        <path fill="currentColor" d="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99.9-1.99 2L3 19a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7v-5z" />
-                                        <rect width="24" height="24" />
-                                    </g>
-                                </svg>
-                            </div>
-                        </Button>
-                    </div>
-                )
-                }
-            </Tooltip >
-        );
-    },
-
     settingsAboutComponent() {
         const samples = [
             "12:00",
diff --git a/src/plugins/silentMessageToggle/index.tsx b/src/plugins/silentMessageToggle/index.tsx
index b7b33826d..6c7d179be 100644
--- a/src/plugins/silentMessageToggle/index.tsx
+++ b/src/plugins/silentMessageToggle/index.tsx
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { addChatBarButton, ChatBarButton, removeChatBarButton } from "@api/ChatButtons";
 import { addPreSendListener, removePreSendListener, SendListener } from "@api/MessageEvents";
 import { definePluginSettings } from "@api/Settings";
-import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { Button, ButtonLooks, ButtonWrapperClasses, React, Tooltip } from "@webpack/common";
+import { React, useEffect, useState } from "@webpack/common";
 
 let lastState = false;
 
@@ -41,19 +41,15 @@ const settings = definePluginSettings({
     }
 });
 
-function SilentMessageToggle(chatBoxProps: {
-    type: {
-        analyticsName: string;
-    };
-}) {
-    const [enabled, setEnabled] = React.useState(lastState);
+const SilentMessageToggle: ChatBarButton = (_, isMainChat) => {
+    const [enabled, setEnabled] = useState(lastState);
 
     function setEnabledValue(value: boolean) {
         if (settings.store.persistState) lastState = value;
         setEnabled(value);
     }
 
-    React.useEffect(() => {
+    useEffect(() => {
         const listener: SendListener = (_, message) => {
             if (enabled) {
                 if (settings.store.autoDisable) setEnabledValue(false);
@@ -65,55 +61,37 @@ function SilentMessageToggle(chatBoxProps: {
         return () => void removePreSendListener(listener);
     }, [enabled]);
 
-    if (chatBoxProps.type.analyticsName !== "normal") return null;
+    if (!isMainChat) return null;
 
     return (
-        <Tooltip text={enabled ? "Disable Silent Message" : "Enable Silent Message"}>
-            {tooltipProps => (
-                <div style={{ display: "flex" }}>
-                    <Button
-                        {...tooltipProps}
-                        onClick={() => setEnabledValue(!enabled)}
-                        size=""
-                        look={ButtonLooks.BLANK}
-                        innerClassName={ButtonWrapperClasses.button}
-                        style={{ padding: "0 6px" }}
-                    >
-                        <div className={ButtonWrapperClasses.buttonWrapper}>
-                            <svg width="24" height="24" viewBox="0 0 24 24">
-                                <path fill="currentColor" mask="url(#_)" d="M18 10.7101C15.1085 9.84957 13 7.17102 13 4c0-.30736.0198-.6101.0582-.907C12.7147 3.03189 12.3611 3 12 3 8.686 3 6 5.686 6 9v5c0 1.657-1.344 3-3 3v1h18v-1c-1.656 0-3-1.343-3-3v-3.2899ZM8.55493 19c.693 1.19 1.96897 2 3.44497 2s2.752-.81 3.445-2H8.55493ZM18.2624 5.50209 21 2.5V1h-4.9651v1.49791h2.4411L16 5.61088V7h5V5.50209h-2.7376Z" />
-                                {!enabled && <>
-                                    <mask id="_">
-                                        <path fill="#fff" d="M0 0h24v24H0Z" />
-                                        <path stroke="#000" stroke-width="5.99068" d="M0 24 24 0" />
-                                    </mask>
-                                    <path fill="var(--status-danger)" d="m21.178 1.70703 1.414 1.414L4.12103 21.593l-1.414-1.415L21.178 1.70703Z" />
-                                </>}
-                            </svg>
-                        </div>
-                    </Button>
-                </div>
-            )}
-        </Tooltip>
+        <ChatBarButton
+            tooltip={enabled ? "Disable Silent Message" : "Enable Silent Message"}
+            onClick={() => setEnabledValue(!enabled)}
+            buttonProps={{
+                style: { padding: "0 6px" }
+            }}
+        >
+            <svg width="24" height="24" viewBox="0 0 24 24">
+                <path fill="currentColor" mask="url(#_)" d="M18 10.7101C15.1085 9.84957 13 7.17102 13 4c0-.30736.0198-.6101.0582-.907C12.7147 3.03189 12.3611 3 12 3 8.686 3 6 5.686 6 9v5c0 1.657-1.344 3-3 3v1h18v-1c-1.656 0-3-1.343-3-3v-3.2899ZM8.55493 19c.693 1.19 1.96897 2 3.44497 2s2.752-.81 3.445-2H8.55493ZM18.2624 5.50209 21 2.5V1h-4.9651v1.49791h2.4411L16 5.61088V7h5V5.50209h-2.7376Z" />
+                {!enabled && <>
+                    <mask id="_">
+                        <path fill="#fff" d="M0 0h24v24H0Z" />
+                        <path stroke="#000" stroke-width="5.99068" d="M0 24 24 0" />
+                    </mask>
+                    <path fill="var(--status-danger)" d="m21.178 1.70703 1.414 1.414L4.12103 21.593l-1.414-1.415L21.178 1.70703Z" />
+                </>}
+            </svg>
+        </ChatBarButton>
     );
-}
+};
 
 export default definePlugin({
     name: "SilentMessageToggle",
     authors: [Devs.Nuckyz, Devs.CatNoir],
     description: "Adds a button to the chat bar to toggle sending a silent message.",
-    dependencies: ["MessageEventsAPI"],
-
+    dependencies: ["MessageEventsAPI", "ChatInputButtonAPI"],
     settings,
-    patches: [
-        {
-            find: "ChannelTextAreaButtons",
-            replacement: {
-                match: /(\i)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
-                replace: "$&,(()=>{try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}})()",
-            }
-        },
-    ],
 
-    chatBarIcon: ErrorBoundary.wrap(SilentMessageToggle, { noop: true }),
+    start: () => addChatBarButton("SilentMessageToggle", SilentMessageToggle),
+    stop: () => removeChatBarButton("SilentMessageToggle")
 });
diff --git a/src/plugins/silentTyping/index.tsx b/src/plugins/silentTyping/index.tsx
index dae7ad4c9..1d336b477 100644
--- a/src/plugins/silentTyping/index.tsx
+++ b/src/plugins/silentTyping/index.tsx
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { addChatBarButton, ChatBarButton, removeChatBarButton } from "@api/ChatButtons";
 import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, sendBotMessage } from "@api/Commands";
 import { definePluginSettings } from "@api/Settings";
-import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { Button, ButtonLooks, ButtonWrapperClasses, FluxDispatcher, React, Tooltip } from "@webpack/common";
+import { FluxDispatcher, React } from "@webpack/common";
 
 const settings = definePluginSettings({
     showIcon: {
@@ -37,45 +37,35 @@ const settings = definePluginSettings({
     }
 });
 
-function SilentTypingToggle(chatBoxProps: {
-    type: {
-        analyticsName: string;
-    };
-}) {
-    const { isEnabled } = settings.use(["isEnabled"]);
+const SilentTypingToggle: ChatBarButton = (_, isMainChat) => {
+    const { isEnabled, showIcon } = settings.use(["isEnabled", "showIcon"]);
     const toggle = () => settings.store.isEnabled = !settings.store.isEnabled;
 
-    if (chatBoxProps.type.analyticsName !== "normal") return null;
+    if (!isMainChat || !showIcon) return null;
 
     return (
-        <Tooltip text={isEnabled ? "Disable Silent Typing" : "Enable Silent Typing"}>
-            {(tooltipProps: any) => (
-                <div style={{ display: "flex" }}>
-                    <Button
-                        {...tooltipProps}
-                        onClick={toggle}
-                        size=""
-                        look={ButtonLooks.BLANK}
-                        innerClassName={ButtonWrapperClasses.button}
-                        style={{ padding: "0 6px" }}
-                    >
-                        <div className={ButtonWrapperClasses.buttonWrapper}>
-                            <svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
-                                <path fill="currentColor" d="M528 448H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h480c26.51 0 48 21.49 48 48v288c0 26.51-21.49 48-48 48zM128 180v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm288 0v-40c0-6.627-5.373-12-12-12H172c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h232c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12z" />
-                                {isEnabled && <path d="M13 432L590 48" stroke="var(--red-500)" stroke-width="72" stroke-linecap="round" />}
-                            </svg>
-                        </div>
-                    </Button>
-                </div>
-            )}
-        </Tooltip>
+        <ChatBarButton
+            tooltip={isEnabled ? "Disable Silent Typing" : "Enable Silent Typing"}
+            onClick={toggle}
+            buttonProps={{
+                style: { padding: "0 6px" }
+            }}
+        >
+            <svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
+                <path fill="currentColor" d="M528 448H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h480c26.51 0 48 21.49 48 48v288c0 26.51-21.49 48-48 48zM128 180v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm288 0v-40c0-6.627-5.373-12-12-12H172c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h232c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12z" />
+                {isEnabled && <path d="M13 432L590 48" stroke="var(--red-500)" stroke-width="72" stroke-linecap="round" />}
+            </svg>
+        </ChatBarButton>
     );
-}
+};
 
 export default definePlugin({
     name: "SilentTyping",
     authors: [Devs.Ven, Devs.Rini],
     description: "Hide that you are typing",
+    dependencies: ["CommandsAPI", "ChatInputButtonAPI"],
+    settings,
+
     patches: [
         {
             find: '.dispatch({type:"TYPING_START_LOCAL"',
@@ -84,17 +74,8 @@ export default definePlugin({
                 replace: "startTyping:$self.startTyping,stop"
             }
         },
-        {
-            find: "ChannelTextAreaButtons",
-            predicate: () => settings.store.showIcon,
-            replacement: {
-                match: /(\i)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
-                replace: "$&,(()=>{try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}})()",
-            }
-        },
     ],
-    dependencies: ["CommandsAPI"],
-    settings,
+
     commands: [{
         name: "silenttype",
         description: "Toggle whether you're hiding that you're typing or not.",
@@ -120,5 +101,6 @@ export default definePlugin({
         FluxDispatcher.dispatch({ type: "TYPING_START_LOCAL", channelId });
     },
 
-    chatBarIcon: ErrorBoundary.wrap(SilentTypingToggle, { noop: true }),
+    start: () => addChatBarButton("SilentTyping", SilentTypingToggle),
+    stop: () => removeChatBarButton("SilentTyping"),
 });
diff --git a/src/plugins/translate/TranslateIcon.tsx b/src/plugins/translate/TranslateIcon.tsx
index 649589435..a7d789279 100644
--- a/src/plugins/translate/TranslateIcon.tsx
+++ b/src/plugins/translate/TranslateIcon.tsx
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { ChatBarButton } from "@api/ChatButtons";
 import { classes } from "@utils/misc";
 import { openModal } from "@utils/modal";
-import { Button, ButtonLooks, ButtonWrapperClasses, Tooltip } from "@webpack/common";
 
 import { settings } from "./settings";
 import { TranslateModal } from "./TranslateModal";
@@ -37,42 +37,30 @@ export function TranslateIcon({ height = 24, width = 24, className }: { height?:
     );
 }
 
-export function TranslateChatBarIcon({ slateProps }: { slateProps: { type: { analyticsName: string; }; }; }) {
+export const TranslateChatBarIcon: ChatBarButton = (props, isMainChat) => {
     const { autoTranslate } = settings.use(["autoTranslate"]);
 
-    if (slateProps.type.analyticsName !== "normal")
-        return null;
+    if (!isMainChat) return null;
 
     const toggle = () => settings.store.autoTranslate = !autoTranslate;
 
     return (
-        <Tooltip text="Open Translate Modal">
-            {({ onMouseEnter, onMouseLeave }) => (
-                <div style={{ display: "flex" }}>
-                    <Button
-                        aria-haspopup="dialog"
-                        aria-label="Open Translate Modal"
-                        size=""
-                        look={ButtonLooks.BLANK}
-                        onMouseEnter={onMouseEnter}
-                        onMouseLeave={onMouseLeave}
-                        innerClassName={ButtonWrapperClasses.button}
-                        onClick={e => {
-                            if (e.shiftKey) return toggle();
+        <ChatBarButton
+            tooltip="Open Translate Modal"
+            onClick={e => {
+                if (e.shiftKey) return toggle();
 
-                            openModal(props => (
-                                <TranslateModal rootProps={props} />
-                            ));
-                        }}
-                        onContextMenu={() => toggle()}
-                        style={{ padding: "0 4px" }}
-                    >
-                        <div className={ButtonWrapperClasses.buttonWrapper}>
-                            <TranslateIcon className={cl({ "auto-translate": autoTranslate })} />
-                        </div>
-                    </Button>
-                </div>
-            )}
-        </Tooltip>
+                openModal(props => (
+                    <TranslateModal rootProps={props} />
+                ));
+            }}
+            onContextMenu={() => toggle()}
+            buttonProps={{
+                "aria-haspopup": "dialog",
+                style: { padding: "0 4px" }
+            }}
+        >
+            <TranslateIcon className={cl({ "auto-translate": autoTranslate })} />
+        </ChatBarButton>
     );
-}
+};
diff --git a/src/plugins/translate/index.tsx b/src/plugins/translate/index.tsx
index 3b067c634..702e60cf7 100644
--- a/src/plugins/translate/index.tsx
+++ b/src/plugins/translate/index.tsx
@@ -18,11 +18,11 @@
 
 import "./styles.css";
 
+import { addChatBarButton, removeChatBarButton } from "@api/ChatButtons";
 import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
 import { addAccessory, removeAccessory } from "@api/MessageAccessories";
 import { addPreSendListener, removePreSendListener } from "@api/MessageEvents";
 import { addButton, removeButton } from "@api/MessagePopover";
-import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { ChannelStore, Menu } from "@webpack/common";
@@ -55,25 +55,16 @@ export default definePlugin({
     name: "Translate",
     description: "Translate messages with Google Translate",
     authors: [Devs.Ven],
-    dependencies: ["MessageAccessoriesAPI", "MessagePopoverAPI", "MessageEventsAPI"],
+    dependencies: ["MessageAccessoriesAPI", "MessagePopoverAPI", "MessageEventsAPI", "ChatInputButtonAPI"],
     settings,
     // not used, just here in case some other plugin wants it or w/e
     translate,
 
-    patches: [
-        {
-            find: "ChannelTextAreaButtons",
-            replacement: {
-                match: /(\i)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
-                replace: "$&,(()=>{try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}})()",
-            }
-        },
-    ],
-
     start() {
         addAccessory("vc-translation", props => <TranslationAccessory message={props.message} />);
 
         addContextMenuPatch("message", messageCtxPatch);
+        addChatBarButton("vc-translate", TranslateChatBarIcon);
 
         addButton("vc-translate", message => {
             if (!message.content) return null;
@@ -101,13 +92,8 @@ export default definePlugin({
     stop() {
         removePreSendListener(this.preSend);
         removeContextMenuPatch("message", messageCtxPatch);
+        removeChatBarButton("vc-translate");
         removeButton("vc-translate");
         removeAccessory("vc-translation");
     },
-
-    chatBarIcon: (slateProps: any) => (
-        <ErrorBoundary noop>
-            <TranslateChatBarIcon slateProps={slateProps} />
-        </ErrorBoundary>
-    )
 });

From 2c198e547ce2424ada0c8e2c067b2d2c7b435c7a Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 6 Feb 2024 16:50:21 +0100
Subject: [PATCH 309/632] Fix PreviewMessage icon being offcentre

---
 src/api/ChatButton.css                      |  4 ++++
 src/api/ChatButtons.tsx                     |  8 +++++++-
 src/plugins/invisibleChat.desktop/index.tsx |  6 +++---
 src/plugins/previewMessage/index.tsx        | 10 ++++++++--
 4 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 src/api/ChatButton.css

diff --git a/src/api/ChatButton.css b/src/api/ChatButton.css
new file mode 100644
index 000000000..30869a846
--- /dev/null
+++ b/src/api/ChatButton.css
@@ -0,0 +1,4 @@
+.vc-chatbar-button {
+    display: flex;
+    align-items: center;
+}
diff --git a/src/api/ChatButtons.tsx b/src/api/ChatButtons.tsx
index 0350965af..c995033b1 100644
--- a/src/api/ChatButtons.tsx
+++ b/src/api/ChatButtons.tsx
@@ -4,12 +4,18 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import "./ChatButton.css";
+
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Logger } from "@utils/Logger";
+import { waitFor } from "@webpack";
 import { Button, ButtonLooks, ButtonWrapperClasses, Tooltip } from "@webpack/common";
 import { Channel } from "discord-types/general";
 import { HTMLProps, MouseEventHandler, ReactNode } from "react";
 
+let CssClasses: { buttonContainer: string; };
+waitFor(["buttonContainer", "channelTextArea"], m => CssClasses = m);
+
 export interface ChatBarProps {
     channel: Channel;
     disabled: boolean;
@@ -100,7 +106,7 @@ export const ChatBarButton = ErrorBoundary.wrap((props: ChatBarButtonProps) => {
     return (
         <Tooltip text={props.tooltip}>
             {({ onMouseEnter, onMouseLeave }) => (
-                <div style={{ display: "flex" }}>
+                <div className={`expression-picker-chat-input-button ${CssClasses?.buttonContainer ?? ""} vc-chatbar-button`}>
                     <Button
                         aria-label={props.tooltip}
                         size=""
diff --git a/src/plugins/invisibleChat.desktop/index.tsx b/src/plugins/invisibleChat.desktop/index.tsx
index 3184e025d..4f974a893 100644
--- a/src/plugins/invisibleChat.desktop/index.tsx
+++ b/src/plugins/invisibleChat.desktop/index.tsx
@@ -123,9 +123,6 @@ export default definePlugin({
     ),
     settings,
     async start() {
-        const { default: StegCloak } = await getStegCloak();
-        steggo = new StegCloak(true, false);
-
         addButton("InvisibleChat", message => {
             return this.INV_REGEX.test(message?.content)
                 ? {
@@ -144,6 +141,9 @@ export default definePlugin({
         });
 
         addChatBarButton("InvisibleChat", ChatBarIcon);
+
+        const { default: StegCloak } = await getStegCloak();
+        steggo = new StegCloak(true, false);
     },
 
     stop() {
diff --git a/src/plugins/previewMessage/index.tsx b/src/plugins/previewMessage/index.tsx
index 1d8b769d5..7d3cae599 100644
--- a/src/plugins/previewMessage/index.tsx
+++ b/src/plugins/previewMessage/index.tsx
@@ -19,7 +19,7 @@
 import { addChatBarButton, ChatBarButton, removeChatBarButton } from "@api/ChatButtons";
 import { generateId, sendBotMessage } from "@api/Commands";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import definePlugin, { StartAt } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { DraftStore, DraftType, SelectedChannelStore, UserStore, useStateFromStores } from "@webpack/common";
 import { MessageAttachment } from "discord-types/general";
@@ -99,7 +99,10 @@ const PreviewButton: ChatBarButton = (props, isMainChat) => {
                     }
                 )}
             buttonProps={{
-                style: { padding: "0 2px", height: "100%" }
+                style: {
+                    padding: "0 6px",
+                    translate: "0 2px"
+                }
             }}
         >
             <img width={24} height={24} src="https://discord.com/assets/4c5a77a89716352686f590a6f014770c.svg" />
@@ -113,6 +116,9 @@ export default definePlugin({
     description: "Lets you preview your message before sending it.",
     authors: [Devs.Aria],
     dependencies: ["ChatInputButtonAPI"],
+    // start early to ensure we're the first plugin to add our button
+    // This makes the popping in less awkward
+    startAt: StartAt.Init,
 
     start: () => addChatBarButton("previewMessage", PreviewButton),
     stop: () => removeChatBarButton("previewMessage"),

From e58aa5dbab5dd1fdf911a3e8619905cd0df7654a Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 6 Feb 2024 17:04:01 +0100
Subject: [PATCH 310/632] Translate: Add auto translate enable alert

somehow people accidently enable it then get confused why vencord has "auto correct". this should hopefully solve the issue
---
 src/api/ChatButtons.tsx                 |  2 --
 src/plugins/translate/TranslateIcon.tsx | 24 +++++++++++++++++++++++-
 src/plugins/translate/settings.ts       |  4 +++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/api/ChatButtons.tsx b/src/api/ChatButtons.tsx
index c995033b1..3cef250b3 100644
--- a/src/api/ChatButtons.tsx
+++ b/src/api/ChatButtons.tsx
@@ -80,8 +80,6 @@ const buttonFactories = new Map<string, ChatBarButton>();
 const logger = new Logger("ChatButtons");
 
 export function _injectButtons(buttons: ReactNode[], props: ChatBarProps) {
-    if (props.type.analyticsName !== "normal") return;
-
     for (const [key, makeButton] of buttonFactories) {
         try {
             const res = makeButton(props, props.type.analyticsName === "normal");
diff --git a/src/plugins/translate/TranslateIcon.tsx b/src/plugins/translate/TranslateIcon.tsx
index a7d789279..7371f78bf 100644
--- a/src/plugins/translate/TranslateIcon.tsx
+++ b/src/plugins/translate/TranslateIcon.tsx
@@ -17,8 +17,10 @@
 */
 
 import { ChatBarButton } from "@api/ChatButtons";
+import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
 import { openModal } from "@utils/modal";
+import { Alerts, Forms } from "@webpack/common";
 
 import { settings } from "./settings";
 import { TranslateModal } from "./TranslateModal";
@@ -42,7 +44,27 @@ export const TranslateChatBarIcon: ChatBarButton = (props, isMainChat) => {
 
     if (!isMainChat) return null;
 
-    const toggle = () => settings.store.autoTranslate = !autoTranslate;
+    const toggle = () => {
+        const newState = !autoTranslate;
+        settings.store.autoTranslate = newState;
+        if (newState && settings.store.showAutoTranslateAlert !== false)
+            Alerts.show({
+                title: "Vencord Auto-Translate Enabled",
+                body: <>
+                    <Forms.FormText>
+                        You just enabled auto translate (by right clicking the Translate icon). Any message you send will automatically be translated before being sent.
+                    </Forms.FormText>
+                    <Forms.FormText className={Margins.top16}>
+                        If this was an accident, disable it again, or it will change your message content before sending.
+                    </Forms.FormText>
+                </>,
+                cancelText: "Disable Auto-Translate",
+                confirmText: "Got it",
+                secondaryConfirmText: "Don't show again",
+                onConfirmSecondary: () => settings.store.showAutoTranslateAlert = false,
+                onCancel: () => settings.store.autoTranslate = false
+            });
+    };
 
     return (
         <ChatBarButton
diff --git a/src/plugins/translate/settings.ts b/src/plugins/translate/settings.ts
index aa4f633a7..cef003a83 100644
--- a/src/plugins/translate/settings.ts
+++ b/src/plugins/translate/settings.ts
@@ -49,4 +49,6 @@ export const settings = definePluginSettings({
         description: "Automatically translate your messages before sending. You can also shift/right click the translate button to toggle this",
         default: false
     }
-});
+}).withPrivateSettings<{
+    showAutoTranslateAlert: boolean;
+}>();

From 64fa2f8652c9ae926c2510c050ca27099154485c Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 6 Feb 2024 17:06:26 +0100
Subject: [PATCH 311/632] ChatButtonApi: do not add buttons if you can't send
 messages

---
 src/api/ChatButtons.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/api/ChatButtons.tsx b/src/api/ChatButtons.tsx
index 3cef250b3..84cca227f 100644
--- a/src/api/ChatButtons.tsx
+++ b/src/api/ChatButtons.tsx
@@ -80,6 +80,8 @@ const buttonFactories = new Map<string, ChatBarButton>();
 const logger = new Logger("ChatButtons");
 
 export function _injectButtons(buttons: ReactNode[], props: ChatBarProps) {
+    if (props.disabled) return;
+
     for (const [key, makeButton] of buttonFactories) {
         try {
             const res = makeButton(props, props.type.analyticsName === "normal");

From ec53b0230f8d75005c5eb2593837623b127f5800 Mon Sep 17 00:00:00 2001
From: sunnie <78964224+sunnniee@users.noreply.github.com>
Date: Tue, 6 Feb 2024 18:12:26 +0200
Subject: [PATCH 312/632] readAllNotificationsButton: also mark voice channels
 as read (#2140)

---
 .../readAllNotificationsButton/index.tsx        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/plugins/readAllNotificationsButton/index.tsx b/src/plugins/readAllNotificationsButton/index.tsx
index b5b0b5f82..0e08edb6d 100644
--- a/src/plugins/readAllNotificationsButton/index.tsx
+++ b/src/plugins/readAllNotificationsButton/index.tsx
@@ -25,16 +25,17 @@ function onClick() {
     const channels: Array<any> = [];
 
     Object.values(GuildStore.getGuilds()).forEach(guild => {
-        GuildChannelStore.getChannels(guild.id).SELECTABLE.forEach((c: { channel: { id: string; }; }) => {
-            if (!ReadStateStore.hasUnread(c.channel.id)) return;
+        GuildChannelStore.getChannels(guild.id).SELECTABLE
+            .concat(GuildChannelStore.getChannels(guild.id).VOCAL)
+            .forEach((c: { channel: { id: string; }; }) => {
+                if (!ReadStateStore.hasUnread(c.channel.id)) return;
 
-            channels.push({
-                channelId: c.channel.id,
-                // messageId: c.channel?.lastMessageId,
-                messageId: ReadStateStore.lastMessageId(c.channel.id),
-                readStateType: 0
+                channels.push({
+                    channelId: c.channel.id,
+                    messageId: ReadStateStore.lastMessageId(c.channel.id),
+                    readStateType: 0
+                });
             });
-        });
     });
 
     FluxDispatcher.dispatch({

From 115da04724dab13bb7ac190d995a5076c8899b03 Mon Sep 17 00:00:00 2001
From: ssranked <92183497+gorgulenkozxc@users.noreply.github.com>
Date: Tue, 6 Feb 2024 17:13:43 +0100
Subject: [PATCH 313/632] clearURLs: add music.youtube.com (#2118)

Co-authored-by: ssranked <ssrankedghoul@gmail.com>
---
 src/plugins/clearURLs/defaultRules.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/clearURLs/defaultRules.ts b/src/plugins/clearURLs/defaultRules.ts
index 95a59c037..b5aae5ff3 100644
--- a/src/plugins/clearURLs/defaultRules.ts
+++ b/src/plugins/clearURLs/defaultRules.ts
@@ -140,11 +140,11 @@ export const defaultRules = [
     "tt_content",
     "lr@yandex.*",
     "redircnt@yandex.*",
-    "feature@youtube.com",
-    "kw@youtube.com",
-    "si@youtube.com",
-    "pp@youtube.com",
-    "si@youtu.be",
+    "feature@*.youtube.com",
+    "kw@*.youtube.com",
+    "si@*.youtube.com",
+    "pp@*.youtube.com",
+    "si@*.youtu.be",
     "wt_zmc",
     "utm_source",
     "utm_content",

From 8b3189f1edfb8ad71267e51ee55a73c8e85044dd Mon Sep 17 00:00:00 2001
From: "Kuba (kb)" <pojg77g1@kbb.anonaddy.me>
Date: Tue, 6 Feb 2024 17:18:49 +0100
Subject: [PATCH 314/632] fixYoutubeEmbeds - Support locales other than english
 (#2128)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/fixYoutubeEmbeds.desktop/native.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/fixYoutubeEmbeds.desktop/native.ts b/src/plugins/fixYoutubeEmbeds.desktop/native.ts
index 5a3ef2c62..5419d4ad8 100644
--- a/src/plugins/fixYoutubeEmbeds.desktop/native.ts
+++ b/src/plugins/fixYoutubeEmbeds.desktop/native.ts
@@ -16,8 +16,9 @@ app.on("browser-window-created", (_, win) => {
 
                 frame.executeJavaScript(`
                 new MutationObserver(() => {
-                    let err = document.querySelector(".ytp-error-content-wrap-subreason span")?.textContent;
-                    if (err && err.includes("blocked it from display")) window.location.reload()
+                    if(
+                        document.querySelector('div.ytp-error-content-wrap-subreason a[href^="https://www.youtube.com/watch?v="]')
+                    ) location.reload()
                 }).observe(document.body, { childList: true, subtree:true });
                 `);
             }

From 7592b5c172ddd31bf8a73fb52fd0736183479ba6 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 6 Feb 2024 13:31:02 -0300
Subject: [PATCH 315/632] Fix devtools context menus on canary

---
 src/main/patcher.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/patcher.ts b/src/main/patcher.ts
index 76d1ccaf3..3ee44d92c 100644
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@@ -129,6 +129,15 @@ if (!IS_VANILLA) {
     });
 
     process.env.DATA_DIR = join(app.getPath("userData"), "..", "Vencord");
+
+    // Monkey patch commandLine to disable WidgetLayering: Fix DevTools context menus https://github.com/electron/electron/issues/38790
+    const originalAppend = app.commandLine.appendSwitch;
+    app.commandLine.appendSwitch = function (...args) {
+        if (args[0] === "disable-features" && !args[1]?.includes("WidgetLayering")) {
+            args[1] += ",WidgetLayering";
+        }
+        return originalAppend.apply(this, args);
+    };
 } else {
     console.log("[Vencord] Running in vanilla mode. Not loading Vencord");
 }

From 685b6f2fa799123273581fef52316a9136ffd1c4 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 6 Feb 2024 17:50:45 +0100
Subject: [PATCH 316/632] Improve PreviewMessage icon; make button
 padding/margin more consistent

Co-authored-by: Andrew Grant <andrew.grant@mail.rit.edu>
---
 src/api/ChatButtons.tsx                     |  8 ++++----
 src/plugins/invisibleChat.desktop/index.tsx |  7 +++----
 src/plugins/previewMessage/index.tsx        | 12 ++++++++++--
 src/plugins/sendTimestamps/index.tsx        |  6 ++----
 src/plugins/sendTimestamps/styles.css       |  4 ----
 src/plugins/silentMessageToggle/index.tsx   | 10 ++++++----
 src/plugins/silentTyping/index.tsx          |  3 ---
 src/plugins/translate/TranslateIcon.tsx     |  5 ++---
 src/plugins/translate/styles.css            |  4 ++++
 9 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/api/ChatButtons.tsx b/src/api/ChatButtons.tsx
index 84cca227f..c2194dd70 100644
--- a/src/api/ChatButtons.tsx
+++ b/src/api/ChatButtons.tsx
@@ -13,8 +13,8 @@ import { Button, ButtonLooks, ButtonWrapperClasses, Tooltip } from "@webpack/com
 import { Channel } from "discord-types/general";
 import { HTMLProps, MouseEventHandler, ReactNode } from "react";
 
-let CssClasses: { buttonContainer: string; };
-waitFor(["buttonContainer", "channelTextArea"], m => CssClasses = m);
+let ChannelTextAreaClasses: Record<"button" | "buttonContainer", string>;
+waitFor(["buttonContainer", "channelTextArea"], m => ChannelTextAreaClasses = m);
 
 export interface ChatBarProps {
     channel: Channel;
@@ -106,14 +106,14 @@ export const ChatBarButton = ErrorBoundary.wrap((props: ChatBarButtonProps) => {
     return (
         <Tooltip text={props.tooltip}>
             {({ onMouseEnter, onMouseLeave }) => (
-                <div className={`expression-picker-chat-input-button ${CssClasses?.buttonContainer ?? ""} vc-chatbar-button`}>
+                <div className={`expression-picker-chat-input-button ${ChannelTextAreaClasses?.buttonContainer ?? ""} vc-chatbar-button`}>
                     <Button
                         aria-label={props.tooltip}
                         size=""
                         look={ButtonLooks.BLANK}
                         onMouseEnter={onMouseEnter}
                         onMouseLeave={onMouseLeave}
-                        innerClassName={ButtonWrapperClasses.button}
+                        innerClassName={`${ButtonWrapperClasses.button} ${ChannelTextAreaClasses?.button}`}
                         onClick={props.onClick}
                         onContextMenu={props.onContextMenu}
                         {...props.buttonProps}
diff --git a/src/plugins/invisibleChat.desktop/index.tsx b/src/plugins/invisibleChat.desktop/index.tsx
index 4f974a893..aa55a9d1e 100644
--- a/src/plugins/invisibleChat.desktop/index.tsx
+++ b/src/plugins/invisibleChat.desktop/index.tsx
@@ -75,16 +75,15 @@ const ChatBarIcon: ChatBarButton = (_, isMainChat) => {
 
             buttonProps={{
                 "aria-haspopup": "dialog",
-                style: { padding: "0 2px", scale: "0.9" }
             }}
         >
             <svg
                 aria-hidden
                 role="img"
-                width="32"
-                height="32"
+                width="24"
+                height="24"
                 viewBox={"0 0 64 64"}
-                style={{ scale: "1.1" }}
+                style={{ scale: "1.39", translate: "0 -1px" }}
             >
                 <path fill="currentColor" d="M 32 9 C 24.832 9 19 14.832 19 22 L 19 27.347656 C 16.670659 28.171862 15 30.388126 15 33 L 15 49 C 15 52.314 17.686 55 21 55 L 43 55 C 46.314 55 49 52.314 49 49 L 49 33 C 49 30.388126 47.329341 28.171862 45 27.347656 L 45 22 C 45 14.832 39.168 9 32 9 z M 32 13 C 36.963 13 41 17.038 41 22 L 41 27 L 23 27 L 23 22 C 23 17.038 27.037 13 32 13 z" />
             </svg>
diff --git a/src/plugins/previewMessage/index.tsx b/src/plugins/previewMessage/index.tsx
index 7d3cae599..214493d26 100644
--- a/src/plugins/previewMessage/index.tsx
+++ b/src/plugins/previewMessage/index.tsx
@@ -100,12 +100,20 @@ const PreviewButton: ChatBarButton = (props, isMainChat) => {
                 )}
             buttonProps={{
                 style: {
-                    padding: "0 6px",
                     translate: "0 2px"
                 }
             }}
         >
-            <img width={24} height={24} src="https://discord.com/assets/4c5a77a89716352686f590a6f014770c.svg" />
+            <svg
+                fill="currentColor"
+                fillRule="evenodd"
+                width="24"
+                height="24"
+                viewBox="0 0 24 24"
+                style={{ scale: "1.096", translate: "0 -1px" }}
+            >
+                <path d="M22.89 11.7c.07.2.07.4 0 .6C22.27 13.9 19.1 21 12 21c-7.11 0-10.27-7.11-10.89-8.7a.83.83 0 0 1 0-.6C1.73 10.1 4.9 3 12 3c7.11 0 10.27 7.11 10.89 8.7Zm-4.5-3.62A15.11 15.11 0 0 1 20.85 12c-.38.88-1.18 2.47-2.46 3.92C16.87 17.62 14.8 19 12 19c-2.8 0-4.87-1.38-6.39-3.08A15.11 15.11 0 0 1 3.15 12c.38-.88 1.18-2.47 2.46-3.92C7.13 6.38 9.2 5 12 5c2.8 0 4.87 1.38 6.39 3.08ZM15.56 11.77c.2-.1.44.02.44.23a4 4 0 1 1-4-4c.21 0 .33.25.23.44a2.5 2.5 0 0 0 3.32 3.32Z" />
+            </svg>
         </ChatBarButton>
     );
 
diff --git a/src/plugins/sendTimestamps/index.tsx b/src/plugins/sendTimestamps/index.tsx
index bd888a82b..86cdd8fa4 100644
--- a/src/plugins/sendTimestamps/index.tsx
+++ b/src/plugins/sendTimestamps/index.tsx
@@ -137,10 +137,7 @@ const ChatBarIcon: ChatBarButton = (_, isMainChat) => {
                     />
                 ));
             }}
-            buttonProps={{
-                "aria-haspopup": "dialog",
-                className: cl("button")
-            }}
+            buttonProps={{ "aria-haspopup": "dialog" }}
         >
             <svg
                 aria-hidden="true"
@@ -148,6 +145,7 @@ const ChatBarIcon: ChatBarButton = (_, isMainChat) => {
                 width="24"
                 height="24"
                 viewBox="0 0 24 24"
+                style={{ scale: "1.2" }}
             >
                 <g fill="none" fill-rule="evenodd">
                     <path fill="currentColor" d="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99.9-1.99 2L3 19a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7v-5z" />
diff --git a/src/plugins/sendTimestamps/styles.css b/src/plugins/sendTimestamps/styles.css
index 75c3f16bd..34a856a60 100644
--- a/src/plugins/sendTimestamps/styles.css
+++ b/src/plugins/sendTimestamps/styles.css
@@ -42,10 +42,6 @@
     margin-bottom: 1em;
 }
 
-.vc-st-button {
-    padding: 0 6px;
-}
-
 .vc-st-button svg {
     transform: scale(1.1) translateY(1px);
 }
diff --git a/src/plugins/silentMessageToggle/index.tsx b/src/plugins/silentMessageToggle/index.tsx
index 6c7d179be..4eed1f50c 100644
--- a/src/plugins/silentMessageToggle/index.tsx
+++ b/src/plugins/silentMessageToggle/index.tsx
@@ -67,11 +67,13 @@ const SilentMessageToggle: ChatBarButton = (_, isMainChat) => {
         <ChatBarButton
             tooltip={enabled ? "Disable Silent Message" : "Enable Silent Message"}
             onClick={() => setEnabledValue(!enabled)}
-            buttonProps={{
-                style: { padding: "0 6px" }
-            }}
         >
-            <svg width="24" height="24" viewBox="0 0 24 24">
+            <svg
+                width="24"
+                height="24"
+                viewBox="0 0 24 24"
+                style={{ scale: "1.2" }}
+            >
                 <path fill="currentColor" mask="url(#_)" d="M18 10.7101C15.1085 9.84957 13 7.17102 13 4c0-.30736.0198-.6101.0582-.907C12.7147 3.03189 12.3611 3 12 3 8.686 3 6 5.686 6 9v5c0 1.657-1.344 3-3 3v1h18v-1c-1.656 0-3-1.343-3-3v-3.2899ZM8.55493 19c.693 1.19 1.96897 2 3.44497 2s2.752-.81 3.445-2H8.55493ZM18.2624 5.50209 21 2.5V1h-4.9651v1.49791h2.4411L16 5.61088V7h5V5.50209h-2.7376Z" />
                 {!enabled && <>
                     <mask id="_">
diff --git a/src/plugins/silentTyping/index.tsx b/src/plugins/silentTyping/index.tsx
index 1d336b477..769836899 100644
--- a/src/plugins/silentTyping/index.tsx
+++ b/src/plugins/silentTyping/index.tsx
@@ -47,9 +47,6 @@ const SilentTypingToggle: ChatBarButton = (_, isMainChat) => {
         <ChatBarButton
             tooltip={isEnabled ? "Disable Silent Typing" : "Enable Silent Typing"}
             onClick={toggle}
-            buttonProps={{
-                style: { padding: "0 6px" }
-            }}
         >
             <svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
                 <path fill="currentColor" d="M528 448H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h480c26.51 0 48 21.49 48 48v288c0 26.51-21.49 48-48 48zM128 180v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm288 0v-40c0-6.627-5.373-12-12-12H172c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h232c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12z" />
diff --git a/src/plugins/translate/TranslateIcon.tsx b/src/plugins/translate/TranslateIcon.tsx
index 7371f78bf..5da8b1c11 100644
--- a/src/plugins/translate/TranslateIcon.tsx
+++ b/src/plugins/translate/TranslateIcon.tsx
@@ -78,11 +78,10 @@ export const TranslateChatBarIcon: ChatBarButton = (props, isMainChat) => {
             }}
             onContextMenu={() => toggle()}
             buttonProps={{
-                "aria-haspopup": "dialog",
-                style: { padding: "0 4px" }
+                "aria-haspopup": "dialog"
             }}
         >
-            <TranslateIcon className={cl({ "auto-translate": autoTranslate })} />
+            <TranslateIcon className={cl({ "auto-translate": autoTranslate, "chat-button": true })} />
         </ChatBarButton>
     );
 };
diff --git a/src/plugins/translate/styles.css b/src/plugins/translate/styles.css
index b6d2223a5..e9085b4ee 100644
--- a/src/plugins/translate/styles.css
+++ b/src/plugins/translate/styles.css
@@ -35,3 +35,7 @@
 .vc-trans-auto-translate {
     color: var(--green-360);
 }
+
+.vc-trans-chat-button {
+    scale: 1.085;
+}

From de570a4800cd6e10cd7a445a960e651a706837f4 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 6 Feb 2024 17:59:44 +0100
Subject: [PATCH 317/632] inject: suppress ugly node error

---
 scripts/runInstaller.mjs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/scripts/runInstaller.mjs b/scripts/runInstaller.mjs
index 8b2510b2e..145ea5a5e 100644
--- a/scripts/runInstaller.mjs
+++ b/scripts/runInstaller.mjs
@@ -118,11 +118,15 @@ const installerBin = await ensureBinary();
 
 console.log("Now running Installer...");
 
-execFileSync(installerBin, {
-    stdio: "inherit",
-    env: {
-        ...process.env,
-        VENCORD_USER_DATA_DIR: BASE_DIR,
-        VENCORD_DEV_INSTALL: "1"
-    }
-});
+try {
+    execFileSync(installerBin, {
+        stdio: "inherit",
+        env: {
+            ...process.env,
+            VENCORD_USER_DATA_DIR: BASE_DIR,
+            VENCORD_DEV_INSTALL: "1"
+        }
+    });
+} catch {
+    console.error("Something went wrong. Please check the logs above.");
+}

From 377def4a3373e1f59377c1d358644aac0c086f14 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 6 Feb 2024 18:12:09 +0100
Subject: [PATCH 318/632] Fix crash when toggling chat button plugins without
 restart

---
 src/api/ChatButtons.tsx                     | 15 +++++++--------
 src/plugins/invisibleChat.desktop/index.tsx |  2 +-
 src/plugins/previewMessage/index.tsx        |  4 +---
 src/plugins/sendTimestamps/index.tsx        |  2 +-
 src/plugins/silentMessageToggle/index.tsx   |  2 +-
 src/plugins/silentTyping/index.tsx          |  2 +-
 src/plugins/translate/TranslateIcon.tsx     |  2 +-
 7 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/api/ChatButtons.tsx b/src/api/ChatButtons.tsx
index c2194dd70..fcb76fffc 100644
--- a/src/api/ChatButtons.tsx
+++ b/src/api/ChatButtons.tsx
@@ -74,7 +74,7 @@ export interface ChatBarProps {
     };
 }
 
-export type ChatBarButton = (props: ChatBarProps, isMainChat: boolean) => ReactNode;
+export type ChatBarButton = (props: ChatBarProps & { isMainChat: boolean; }) => JSX.Element | null;
 
 const buttonFactories = new Map<string, ChatBarButton>();
 const logger = new Logger("ChatButtons");
@@ -82,13 +82,12 @@ const logger = new Logger("ChatButtons");
 export function _injectButtons(buttons: ReactNode[], props: ChatBarProps) {
     if (props.disabled) return;
 
-    for (const [key, makeButton] of buttonFactories) {
-        try {
-            const res = makeButton(props, props.type.analyticsName === "normal");
-            if (res) buttons.push(res);
-        } catch (e) {
-            logger.error(`Failed to render button ${key}`, e);
-        }
+    for (const [key, Button] of buttonFactories) {
+        buttons.push(
+            <ErrorBoundary noop key={key} onError={e => logger.error(`Failed to render ${key}`, e.error)}>
+                <Button {...props} isMainChat={props.type.analyticsName === "normal"} />
+            </ErrorBoundary>
+        );
     }
 }
 
diff --git a/src/plugins/invisibleChat.desktop/index.tsx b/src/plugins/invisibleChat.desktop/index.tsx
index aa55a9d1e..fcb0af712 100644
--- a/src/plugins/invisibleChat.desktop/index.tsx
+++ b/src/plugins/invisibleChat.desktop/index.tsx
@@ -65,7 +65,7 @@ function Indicator() {
 
 }
 
-const ChatBarIcon: ChatBarButton = (_, isMainChat) => {
+const ChatBarIcon: ChatBarButton = ({ isMainChat }) => {
     if (!isMainChat) return null;
 
     return (
diff --git a/src/plugins/previewMessage/index.tsx b/src/plugins/previewMessage/index.tsx
index 214493d26..fe6b227a5 100644
--- a/src/plugins/previewMessage/index.tsx
+++ b/src/plugins/previewMessage/index.tsx
@@ -73,9 +73,7 @@ const getAttachments = async (channelId: string) =>
     );
 
 
-const PreviewButton: ChatBarButton = (props, isMainChat) => {
-    const { isEmpty, type: { attachments } } = props;
-
+const PreviewButton: ChatBarButton = ({ isMainChat, isEmpty, type: { attachments } }) => {
     const channelId = SelectedChannelStore.getChannelId();
     const draft = useStateFromStores([DraftStore], () => getDraft(channelId));
 
diff --git a/src/plugins/sendTimestamps/index.tsx b/src/plugins/sendTimestamps/index.tsx
index 86cdd8fa4..ac7c5edb5 100644
--- a/src/plugins/sendTimestamps/index.tsx
+++ b/src/plugins/sendTimestamps/index.tsx
@@ -123,7 +123,7 @@ function PickerModal({ rootProps, close }: { rootProps: ModalProps, close(): voi
     );
 }
 
-const ChatBarIcon: ChatBarButton = (_, isMainChat) => {
+const ChatBarIcon: ChatBarButton = ({ isMainChat }) => {
     if (!isMainChat) return null;
 
     return (
diff --git a/src/plugins/silentMessageToggle/index.tsx b/src/plugins/silentMessageToggle/index.tsx
index 4eed1f50c..d4207a68d 100644
--- a/src/plugins/silentMessageToggle/index.tsx
+++ b/src/plugins/silentMessageToggle/index.tsx
@@ -41,7 +41,7 @@ const settings = definePluginSettings({
     }
 });
 
-const SilentMessageToggle: ChatBarButton = (_, isMainChat) => {
+const SilentMessageToggle: ChatBarButton = ({ isMainChat }) => {
     const [enabled, setEnabled] = useState(lastState);
 
     function setEnabledValue(value: boolean) {
diff --git a/src/plugins/silentTyping/index.tsx b/src/plugins/silentTyping/index.tsx
index 769836899..8b59c6ace 100644
--- a/src/plugins/silentTyping/index.tsx
+++ b/src/plugins/silentTyping/index.tsx
@@ -37,7 +37,7 @@ const settings = definePluginSettings({
     }
 });
 
-const SilentTypingToggle: ChatBarButton = (_, isMainChat) => {
+const SilentTypingToggle: ChatBarButton = ({ isMainChat }) => {
     const { isEnabled, showIcon } = settings.use(["isEnabled", "showIcon"]);
     const toggle = () => settings.store.isEnabled = !settings.store.isEnabled;
 
diff --git a/src/plugins/translate/TranslateIcon.tsx b/src/plugins/translate/TranslateIcon.tsx
index 5da8b1c11..cc0ed5e93 100644
--- a/src/plugins/translate/TranslateIcon.tsx
+++ b/src/plugins/translate/TranslateIcon.tsx
@@ -39,7 +39,7 @@ export function TranslateIcon({ height = 24, width = 24, className }: { height?:
     );
 }
 
-export const TranslateChatBarIcon: ChatBarButton = (props, isMainChat) => {
+export const TranslateChatBarIcon: ChatBarButton = ({ isMainChat }) => {
     const { autoTranslate } = settings.use(["autoTranslate"]);
 
     if (!isMainChat) return null;

From 3325a8de4060d3837f1480d2aec3bdbe8208f90c Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 6 Feb 2024 21:30:07 -0300
Subject: [PATCH 319/632] Fix FakeNitro patch

---
 src/plugins/fakeNitro/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index 6107df00e..0b96412fd 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -345,7 +345,7 @@ export default definePlugin({
             predicate: () => settings.store.transformEmojis,
             replacement: {
                 // Add the fake nitro emoji notice
-                match: /(?<=isDiscoverable:\i,emojiComesFromCurrentGuild:\i,.+?}=(\i).+?;)(.+?return )(.{0,1000}\.Messages\.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION.+?)(?=},)/,
+                match: /(?<=isDiscoverable:\i,emojiComesFromCurrentGuild:\i,.+?}=(\i).+?;)(.*?return )(.{0,1000}\.Messages\.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION.+?)(?=},)/,
                 replace: (_, props, rest, reactNode) => `let{fakeNitroNode}=${props};${rest}$self.addFakeNotice(${FakeNoticeType.Emoji},${reactNode},!!fakeNitroNode?.fake)`
             }
         },

From a108448255261c9bffa0911386a35d6e2ba93117 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 7 Feb 2024 20:39:02 -0300
Subject: [PATCH 320/632] Improve DisableDMCallIdle

---
 src/plugins/disableDMCallIdle/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/disableDMCallIdle/index.ts b/src/plugins/disableDMCallIdle/index.ts
index bce119d01..5738dc238 100644
--- a/src/plugins/disableDMCallIdle/index.ts
+++ b/src/plugins/disableDMCallIdle/index.ts
@@ -27,8 +27,8 @@ export default definePlugin({
         {
             find: ".Messages.BOT_CALL_IDLE_DISCONNECT",
             replacement: {
-                match: /(?<=function \i\(\){)(?=.{1,120}\.Messages\.BOT_CALL_IDLE_DISCONNECT)/,
-                replace: "return;"
+                match: /,?(?=this\.idleTimeout=new \i\.Timeout)/,
+                replace: ";return;"
             }
         }
     ]

From 935d0a0a03a7e713014fc1019b1b36d5f1989980 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 8 Feb 2024 15:33:49 -0300
Subject: [PATCH 321/632] Fix broken patches and finds

---
 src/plugins/showHiddenChannels/index.tsx | 4 ++--
 src/plugins/typingIndicator/index.tsx    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 906bed504..919f3f3c5 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -29,7 +29,7 @@ import type { Channel, Role } from "discord-types/general";
 
 import HiddenChannelLockScreen from "./components/HiddenChannelLockScreen";
 
-const ChannelListClasses = findByPropsLazy("channelEmoji", "unread", "icon");
+const ChannelListClasses = findByPropsLazy("modeMuted", "modeSelected", "unread", "icon");
 
 const enum ShowMode {
     LockIcon,
@@ -162,7 +162,7 @@ export default definePlugin({
                 },
                 // Add the hidden eye icon if the channel is hidden
                 {
-                    match: /\i\.children.+?:null(?<=,channel:(\i).+?)/,
+                    match: /\.name\),.{0,120}\.children.+?:null(?<=,channel:(\i).+?)/,
                     replace: (m, channel) => `${m},$self.isHiddenChannel(${channel})?$self.HiddenChannelIcon():null`
                 },
                 // Make voice channels also appear as muted if they are muted
diff --git a/src/plugins/typingIndicator/index.tsx b/src/plugins/typingIndicator/index.tsx
index 171c560d8..280301480 100644
--- a/src/plugins/typingIndicator/index.tsx
+++ b/src/plugins/typingIndicator/index.tsx
@@ -133,7 +133,7 @@ export default definePlugin({
         {
             find: "UNREAD_IMPORTANT:",
             replacement: {
-                match: /channel:(\i).{0,100}?channelEmoji,.{0,250}?\.children.{0,50}?:null/,
+                match: /\.name\),.{0,120}\.children.+?:null(?<=,channel:(\i).+?)/,
                 replace: "$&,$self.TypingIndicator($1.id)"
             }
         },

From f1f0da4a9db09625a50a812285c4479d5e692036 Mon Sep 17 00:00:00 2001
From: Klen_list <49125075+klen-list@users.noreply.github.com>
Date: Thu, 8 Feb 2024 21:55:48 +0300
Subject: [PATCH 322/632] fixYoutubeEmbeds: fix when youtube decides to use
 http without s (#2155)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/fixYoutubeEmbeds.desktop/native.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/fixYoutubeEmbeds.desktop/native.ts b/src/plugins/fixYoutubeEmbeds.desktop/native.ts
index 5419d4ad8..d5c2df363 100644
--- a/src/plugins/fixYoutubeEmbeds.desktop/native.ts
+++ b/src/plugins/fixYoutubeEmbeds.desktop/native.ts
@@ -17,7 +17,7 @@ app.on("browser-window-created", (_, win) => {
                 frame.executeJavaScript(`
                 new MutationObserver(() => {
                     if(
-                        document.querySelector('div.ytp-error-content-wrap-subreason a[href^="https://www.youtube.com/watch?v="]')
+                        document.querySelector('div.ytp-error-content-wrap-subreason a[href*="www.youtube.com/watch?v="]')
                     ) location.reload()
                 }).observe(document.body, { childList: true, subtree:true });
                 `);

From b2c047390e1e383758aa6e996b5c255a1e31d003 Mon Sep 17 00:00:00 2001
From: sappho <sappho@sappho.io>
Date: Fri, 9 Feb 2024 17:31:02 -0500
Subject: [PATCH 323/632] FakeNitro: Send fake links using Discord hyperlink
 markdown feature (#2158)

---
 src/plugins/fakeNitro/index.ts | 53 ++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index 0b96412fd..2caecc45b 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -108,6 +108,7 @@ const enum FakeNoticeType {
 const fakeNitroEmojiRegex = /\/emojis\/(\d+?)\.(png|webp|gif)/;
 const fakeNitroStickerRegex = /\/stickers\/(\d+?)\./;
 const fakeNitroGifStickerRegex = /\/attachments\/\d+?\/\d+?\/(\d+?)\.gif/;
+const hyperLinkRegex = /\[.+?\]\((https?:\/\/.+?)\)/;
 
 const settings = definePluginSettings({
     enableEmojiBypass: {
@@ -447,13 +448,23 @@ export default definePlugin({
 
     trimContent(content: Array<any>) {
         const firstContent = content[0];
-        if (typeof firstContent === "string") content[0] = firstContent.trimStart();
-        if (content[0] === "") content.shift();
+        if (typeof firstContent === "string") {
+            content[0] = firstContent.trimStart();
+            content[0] || content.shift();
+        } else if (firstContent?.type === "span") {
+            firstContent.props.children = firstContent.props.children.trimStart();
+            firstContent.props.children || content.shift();
+        }
 
         const lastIndex = content.length - 1;
         const lastContent = content[lastIndex];
-        if (typeof lastContent === "string") content[lastIndex] = lastContent.trimEnd();
-        if (content[lastIndex] === "") content.pop();
+        if (typeof lastContent === "string") {
+            content[lastIndex] = lastContent.trimEnd();
+            content[lastIndex] || content.pop();
+        } else if (lastContent?.type === "span") {
+            lastContent.props.children = lastContent.props.children.trimEnd();
+            lastContent.props.children || content.pop();
+        }
     },
 
     clearEmptyArrayItems(array: Array<any>) {
@@ -465,7 +476,7 @@ export default definePlugin({
     },
 
     patchFakeNitroEmojisOrRemoveStickersLinks(content: Array<any>, inline: boolean) {
-        // If content has more than one child or it's a single ReactElement like a header or list
+        // If content has more than one child or it's a single ReactElement like a header, list or span
         if ((content.length > 1 || typeof content[0]?.type === "string") && !settings.store.transformCompoundSentence) return content;
 
         let nextIndex = content.length;
@@ -574,7 +585,7 @@ export default definePlugin({
         itemsToMaybePush.push(...message.attachments.filter(attachment => attachment.content_type === "image/gif").map(attachment => attachment.url));
 
         for (const item of itemsToMaybePush) {
-            if (!settings.store.transformCompoundSentence && !item.startsWith("http")) continue;
+            if (!settings.store.transformCompoundSentence && !item.startsWith("http") && !hyperLinkRegex.test(item)) continue;
 
             const imgMatch = item.match(fakeNitroStickerRegex);
             if (imgMatch) {
@@ -619,8 +630,7 @@ export default definePlugin({
             case "image": {
                 if (
                     !settings.store.transformCompoundSentence
-                    && !contentItems.includes(embed.url!)
-                    && !contentItems.includes(embed.image?.proxyURL!)
+                    && !contentItems.some(item => item === embed.url! || item.match(hyperLinkRegex)?.[1] === embed.url!)
                 ) return false;
 
                 if (settings.store.transformEmojis) {
@@ -795,12 +805,16 @@ export default definePlugin({
                 if (sticker.format_type === StickerType.GIF && link.includes(".png")) {
                     link = link.replace(".png", ".gif");
                 }
+
                 if (sticker.format_type === StickerType.APNG) {
                     this.sendAnimatedSticker(link, sticker.id, channelId);
                     return { cancel: true };
                 } else {
+                    const url = new URL(link);
+                    url.searchParams.set("name", sticker.name);
+
+                    messageObj.content += `${getWordBoundary(messageObj.content, messageObj.content.length - 1)}[${sticker.name}](${url})`;
                     extra.stickers!.length = 0;
-                    messageObj.content += ` ${link}&name=${encodeURIComponent(sticker.name)}`;
                 }
             }
 
@@ -813,12 +827,13 @@ export default definePlugin({
                     if (emoji.guildId === guildId && !emoji.animated) continue;
 
                     const emojiString = `<${emoji.animated ? "a" : ""}:${emoji.originalName || emoji.name}:${emoji.id}>`;
-                    const url = emoji.url.replace(/\?size=\d+/, "?" + new URLSearchParams({
-                        size: Settings.plugins.FakeNitro.emojiSize,
-                        name: encodeURIComponent(emoji.name)
-                    }));
+
+                    const url = new URL(emoji.url);
+                    url.searchParams.set("size", settings.store.emojiSize.toString());
+                    url.searchParams.set("name", emoji.name);
+
                     messageObj.content = messageObj.content.replace(emojiString, (match, offset, origStr) => {
-                        return `${getWordBoundary(origStr, offset - 1)}${url}${getWordBoundary(origStr, offset + match.length)}`;
+                        return `${getWordBoundary(origStr, offset - 1)}[:${emoji.name}:](${url})${getWordBoundary(origStr, offset + match.length)}`;
                     });
                 }
             }
@@ -840,11 +855,11 @@ export default definePlugin({
                 if (emoji.available !== false && canUseEmotes) return emojiStr;
                 if (emoji.guildId === guildId && !emoji.animated) return emojiStr;
 
-                const url = emoji.url.replace(/\?size=\d+/, "?" + new URLSearchParams({
-                    size: Settings.plugins.FakeNitro.emojiSize,
-                    name: encodeURIComponent(emoji.name)
-                }));
-                return `${getWordBoundary(origStr, offset - 1)}${url}${getWordBoundary(origStr, offset + emojiStr.length)}`;
+                const url = new URL(emoji.url);
+                url.searchParams.set("size", settings.store.emojiSize.toString());
+                url.searchParams.set("name", emoji.name);
+
+                return `${getWordBoundary(origStr, offset - 1)}[:${emoji.name}:](${url})${getWordBoundary(origStr, offset + emojiStr.length)}`;
             });
         });
     },

From 237f0804717d0fe9bef1f33c0eea9f7682dba884 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 9 Feb 2024 17:59:40 -0300
Subject: [PATCH 324/632] DisableDMCallIdle -> DisableCallIdle; add more
 functionality

---
 .../{disableDMCallIdle => disableCallIdle}/index.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
 rename src/plugins/{disableDMCallIdle => disableCallIdle}/index.ts (74%)

diff --git a/src/plugins/disableDMCallIdle/index.ts b/src/plugins/disableCallIdle/index.ts
similarity index 74%
rename from src/plugins/disableDMCallIdle/index.ts
rename to src/plugins/disableCallIdle/index.ts
index 5738dc238..904d53b03 100644
--- a/src/plugins/disableDMCallIdle/index.ts
+++ b/src/plugins/disableCallIdle/index.ts
@@ -16,12 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { migratePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 
+migratePluginSettings("DisableCallIdle", "DisableDMCallIdle");
 export default definePlugin({
-    name: "DisableDMCallIdle",
-    description: "Disables automatically getting kicked from a DM voice call after 3 minutes.",
+    name: "DisableCallIdle",
+    description: "Disables automatically getting kicked from a DM voice call after 3 minutes and being moved to an AFK voice channel.",
     authors: [Devs.Nuckyz],
     patches: [
         {
@@ -30,6 +32,13 @@ export default definePlugin({
                 match: /,?(?=this\.idleTimeout=new \i\.Timeout)/,
                 replace: ";return;"
             }
+        },
+        {
+            find: "handleIdleUpdate(){",
+            replacement: {
+                match: /(?<=_initialize\(\){)/,
+                replace: "return;"
+            }
         }
     ]
 });

From 558c2a0b2ef46cb19ecabef64e11f0b11ca9bd32 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 9 Feb 2024 19:46:10 -0300
Subject: [PATCH 325/632] Make PermissionsViewer and ShowHiddenChannels default
 dropdown change when clicked

---
 .../permissionsViewer/components/UserPermissions.tsx   |  1 +
 .../components/HiddenChannelLockScreen.tsx             | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/plugins/permissionsViewer/components/UserPermissions.tsx b/src/plugins/permissionsViewer/components/UserPermissions.tsx
index 3c6767713..bcd6bdf07 100644
--- a/src/plugins/permissionsViewer/components/UserPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/UserPermissions.tsx
@@ -104,6 +104,7 @@ function UserPermissionsComponent({ guild, guildMember, showBorder }: { guild: G
                     guildMember.nick || UserStore.getUser(guildMember.userId).username
                 )
             }
+            onDropDownClick={state => settings.store.defaultPermissionsDropdownState = !state}
             defaultState={settings.store.defaultPermissionsDropdownState}
             buttons={[
                 (<Tooltip text={`Sorting by ${stns.permissionsSortOrder === PermissionsSortOrder.HighestRole ? "Highest Role" : "Lowest Role"}`}>
diff --git a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
index 87946110d..7904cd10b 100644
--- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
+++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
@@ -120,7 +120,7 @@ const VideoQualityModesToNames = {
 const HiddenChannelLogo = "/assets/433e3ec4319a9d11b0cbe39342614982.svg";
 
 function HiddenChannelLockScreen({ channel }: { channel: ExtendedChannel; }) {
-    const [viewAllowedUsersAndRoles, setViewAllowedUsersAndRoles] = useState(settings.store.defaultAllowedUsersAndRolesDropdownState);
+    const { defaultAllowedUsersAndRolesDropdownState } = settings.use(["defaultAllowedUsersAndRolesDropdownState"]);
     const [permissions, setPermissions] = useState<RoleOrUserPermission[]>([]);
 
     const {
@@ -301,19 +301,19 @@ function HiddenChannelLockScreen({ channel }: { channel: ExtendedChannel; }) {
                             </Tooltip>
                         )}
                         <Text variant="text-lg/bold">Allowed users and roles:</Text>
-                        <Tooltip text={viewAllowedUsersAndRoles ? "Hide Allowed Users and Roles" : "View Allowed Users and Roles"}>
+                        <Tooltip text={defaultAllowedUsersAndRolesDropdownState ? "Hide Allowed Users and Roles" : "View Allowed Users and Roles"}>
                             {({ onMouseLeave, onMouseEnter }) => (
                                 <button
                                     onMouseLeave={onMouseLeave}
                                     onMouseEnter={onMouseEnter}
                                     className="shc-lock-screen-allowed-users-and-roles-container-toggle-btn"
-                                    onClick={() => setViewAllowedUsersAndRoles(v => !v)}
+                                    onClick={() => settings.store.defaultAllowedUsersAndRolesDropdownState = !defaultAllowedUsersAndRolesDropdownState}
                                 >
                                     <svg
                                         width="24"
                                         height="24"
                                         viewBox="0 0 24 24"
-                                        transform={viewAllowedUsersAndRoles ? "scale(1 -1)" : "scale(1 1)"}
+                                        transform={defaultAllowedUsersAndRolesDropdownState ? "scale(1 -1)" : "scale(1 1)"}
                                     >
                                         <path fill="currentColor" d="M16.59 8.59003L12 13.17L7.41 8.59003L6 10L12 16L18 10L16.59 8.59003Z" />
                                     </svg>
@@ -321,7 +321,7 @@ function HiddenChannelLockScreen({ channel }: { channel: ExtendedChannel; }) {
                             )}
                         </Tooltip>
                     </div>
-                    {viewAllowedUsersAndRoles && <ChannelBeginHeader channel={channel} />}
+                    {defaultAllowedUsersAndRolesDropdownState && <ChannelBeginHeader channel={channel} />}
                 </div>
             </div>
         </div>

From d3bbd2c02ebcab88f0c6a7b19e7687eca6068e1c Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 9 Feb 2024 21:00:15 -0300
Subject: [PATCH 326/632] FakeNitro: option to use hyperlinks or not

---
 src/plugins/fakeNitro/index.ts | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index 2caecc45b..ed3ec59dd 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -157,6 +157,11 @@ const settings = definePluginSettings({
         type: OptionType.BOOLEAN,
         default: true,
         restartNeeded: true
+    },
+    useHyperLinks: {
+        description: "Whether to use hyperlinks when sending fake emojis and stickers",
+        type: OptionType.BOOLEAN,
+        default: true
     }
 });
 
@@ -708,7 +713,7 @@ export default definePlugin({
     },
 
     getStickerLink(stickerId: string) {
-        return `https://media.discordapp.net/stickers/${stickerId}.png?size=${Settings.plugins.FakeNitro.stickerSize}`;
+        return `https://media.discordapp.net/stickers/${stickerId}.png?size=${settings.store.stickerSize}`;
     },
 
     async sendAnimatedSticker(stickerLink: string, stickerId: string, channelId: string) {
@@ -813,7 +818,7 @@ export default definePlugin({
                     const url = new URL(link);
                     url.searchParams.set("name", sticker.name);
 
-                    messageObj.content += `${getWordBoundary(messageObj.content, messageObj.content.length - 1)}[${sticker.name}](${url})`;
+                    messageObj.content += `${getWordBoundary(messageObj.content, messageObj.content.length - 1)}${s.useHyperLinks ? `[${sticker.name}](${url})` : url}`;
                     extra.stickers!.length = 0;
                 }
             }
@@ -829,11 +834,11 @@ export default definePlugin({
                     const emojiString = `<${emoji.animated ? "a" : ""}:${emoji.originalName || emoji.name}:${emoji.id}>`;
 
                     const url = new URL(emoji.url);
-                    url.searchParams.set("size", settings.store.emojiSize.toString());
+                    url.searchParams.set("size", s.emojiSize.toString());
                     url.searchParams.set("name", emoji.name);
 
                     messageObj.content = messageObj.content.replace(emojiString, (match, offset, origStr) => {
-                        return `${getWordBoundary(origStr, offset - 1)}[:${emoji.name}:](${url})${getWordBoundary(origStr, offset + match.length)}`;
+                        return `${getWordBoundary(origStr, offset - 1)}${s.useHyperLinks ? `[:${emoji.name}:](${url})` : url}${getWordBoundary(origStr, offset + match.length)}`;
                     });
                 }
             }
@@ -856,10 +861,10 @@ export default definePlugin({
                 if (emoji.guildId === guildId && !emoji.animated) return emojiStr;
 
                 const url = new URL(emoji.url);
-                url.searchParams.set("size", settings.store.emojiSize.toString());
+                url.searchParams.set("size", s.emojiSize.toString());
                 url.searchParams.set("name", emoji.name);
 
-                return `${getWordBoundary(origStr, offset - 1)}[:${emoji.name}:](${url})${getWordBoundary(origStr, offset + emojiStr.length)}`;
+                return `${getWordBoundary(origStr, offset - 1)}${s.useHyperLinks ? `[:${emoji.name}:](${url})` : url}${getWordBoundary(origStr, offset + emojiStr.length)}`;
             });
         });
     },

From cc0d9a90bc503f6c2055e543eb1414b92127e8b3 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 9 Feb 2024 21:27:34 -0300
Subject: [PATCH 327/632] Fix UserVoiceShow patch

---
 src/plugins/userVoiceShow/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/userVoiceShow/index.tsx b/src/plugins/userVoiceShow/index.tsx
index c95307cc4..935ff1c5d 100644
--- a/src/plugins/userVoiceShow/index.tsx
+++ b/src/plugins/userVoiceShow/index.tsx
@@ -96,7 +96,7 @@ export default definePlugin({
     patches: [
         // above message box
         {
-            find: ".lastEditedByContainer",
+            find: ".popularApplicationCommandIds,",
             replacement: {
                 match: /\(0,\i\.jsx\)\(\i\.\i,{user:\i,setNote/,
                 replace: "$self.patchPopout(arguments[0]),$&",

From 38beb93e5f2ea7f7ea0c6021ddaf0ecb8f600406 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 10 Feb 2024 13:42:31 -0300
Subject: [PATCH 328/632] Fix CrashHandler failing to recover and showing gray
 screen instead

---
 src/plugins/crashHandler/index.ts | 96 ++++++++++++++-----------------
 1 file changed, 44 insertions(+), 52 deletions(-)

diff --git a/src/plugins/crashHandler/index.ts b/src/plugins/crashHandler/index.ts
index 9d38b7d17..b73641f57 100644
--- a/src/plugins/crashHandler/index.ts
+++ b/src/plugins/crashHandler/index.ts
@@ -25,7 +25,6 @@ import definePlugin, { OptionType } from "@utils/types";
 import { maybePromptToUpdate } from "@utils/updater";
 import { filters, findBulk, proxyLazyWebpack } from "@webpack";
 import { FluxDispatcher, NavigationRouter, SelectedChannelStore } from "@webpack/common";
-import type { ReactElement } from "react";
 
 const CrashHandlerLogger = new Logger("CrashHandler");
 const { ModalStack, DraftManager, DraftType, closeExpressionPicker } = proxyLazyWebpack(() => {
@@ -57,13 +56,12 @@ const settings = definePluginSettings({
     }
 });
 
-let crashCount: number = 0;
-let lastCrashTimestamp: number = 0;
-let shouldAttemptNextHandle = false;
+let hasCrashedOnce = false;
+let shouldAttemptRecover = true;
 
 export default definePlugin({
     name: "CrashHandler",
-    description: "Utility plugin for handling and possibly recovering from Crashes without a restart",
+    description: "Utility plugin for handling and possibly recovering from crashes without a restart",
     authors: [Devs.Nuckyz],
     enabledByDefault: true,
 
@@ -74,60 +72,55 @@ export default definePlugin({
             find: ".Messages.ERRORS_UNEXPECTED_CRASH",
             replacement: {
                 match: /(?=this\.setState\()/,
-                replace: "$self.handleCrash(this)||"
+                replace: "$self.handleCrash(this);"
             }
         }
     ],
 
-    handleCrash(_this: ReactElement & { forceUpdate: () => void; }) {
-        if (Date.now() - lastCrashTimestamp <= 1_000 && !shouldAttemptNextHandle) return true;
+    handleCrash(_this: any) {
+        // 1 ms timeout to avoid react breaking when re-rendering
+        setTimeout(() => {
+            if (!shouldAttemptRecover) {
+                try {
+                    showNotification({
+                        color: "#eed202",
+                        title: "Discord has crashed!",
+                        body: "Awn :( Discord has crashed two times rapidly, not attempting to recover.",
+                        noPersist: true,
+                    });
+                } catch { }
 
-        shouldAttemptNextHandle = false;
-
-        if (++crashCount > 5) {
-            try {
-                showNotification({
-                    color: "#eed202",
-                    title: "Discord has crashed!",
-                    body: "Awn :( Discord has crashed more than five times, not attempting to recover.",
-                    noPersist: true,
-                });
-            } catch { }
-
-            lastCrashTimestamp = Date.now();
-            return false;
-        }
-
-        setTimeout(() => crashCount--, 60_000);
-
-        try {
-            if (crashCount === 1) maybePromptToUpdate("Uh oh, Discord has just crashed... but good news, there is a Vencord update available that might fix this issue! Would you like to update now?", true);
-
-            if (settings.store.attemptToPreventCrashes) {
-                this.handlePreventCrash(_this);
-                return true;
+                return;
             }
 
-            return false;
-        } catch (err) {
-            CrashHandlerLogger.error("Failed to handle crash", err);
-            return false;
-        } finally {
-            lastCrashTimestamp = Date.now();
-        }
+            shouldAttemptRecover = false;
+            // This is enough to avoid a crash loop
+            setTimeout(() => shouldAttemptRecover = true, 500);
+
+            try {
+                if (!hasCrashedOnce) {
+                    hasCrashedOnce = true;
+                    maybePromptToUpdate("Uh oh, Discord has just crashed... but good news, there is a Vencord update available that might fix this issue! Would you like to update now?", true);
+                }
+
+                if (settings.store.attemptToPreventCrashes) {
+                    this.handlePreventCrash(_this);
+                }
+            } catch (err) {
+                CrashHandlerLogger.error("Failed to handle crash", err);
+            }
+        }, 1);
     },
 
-    handlePreventCrash(_this: ReactElement & { forceUpdate: () => void; }) {
-        if (Date.now() - lastCrashTimestamp >= 1_000) {
-            try {
-                showNotification({
-                    color: "#eed202",
-                    title: "Discord has crashed!",
-                    body: "Attempting to recover...",
-                    noPersist: true,
-                });
-            } catch { }
-        }
+    handlePreventCrash(_this: any) {
+        try {
+            showNotification({
+                color: "#eed202",
+                title: "Discord has crashed!",
+                body: "Attempting to recover...",
+                noPersist: true,
+            });
+        } catch { }
 
         try {
             const channelId = SelectedChannelStore.getChannelId();
@@ -177,8 +170,7 @@ export default definePlugin({
         }
 
         try {
-            shouldAttemptNextHandle = true;
-            _this.forceUpdate();
+            _this.setState({ error: null, info: null });
         } catch (err) {
             CrashHandlerLogger.debug("Failed to update crash handler component.", err);
         }

From 8b6a40311bab1c89a11d2384508b997e99c7b59b Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 13 Feb 2024 09:04:28 +0100
Subject: [PATCH 329/632] Bump to v1.6.8

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 076b2999d..08078d3d5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.6.7",
+    "version": "1.6.8",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 0c9d2a6a21a42111465c9cecde729c878ffd1c08 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 13 Feb 2024 09:03:25 +0100
Subject: [PATCH 330/632] Fix plugins using the Timestamp component

---
 src/api/Notifications/notificationLog.tsx                   | 4 ++--
 src/plugins/reviewDB/components/ReviewComponent.tsx         | 4 ++--
 src/plugins/serverProfile/GuildProfileModal.tsx             | 4 ++--
 .../components/HiddenChannelLockScreen.tsx                  | 6 +++---
 src/webpack/common/types/components.d.ts                    | 3 +--
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/api/Notifications/notificationLog.tsx b/src/api/Notifications/notificationLog.tsx
index 9535fb62c..6f79ef70a 100644
--- a/src/api/Notifications/notificationLog.tsx
+++ b/src/api/Notifications/notificationLog.tsx
@@ -21,7 +21,7 @@ import { Settings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import { closeModal, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { useAwaiter } from "@utils/react";
-import { Alerts, Button, Forms, moment, React, Text, Timestamp, useEffect, useReducer, useState } from "@webpack/common";
+import { Alerts, Button, Forms, React, Text, Timestamp, useEffect, useReducer, useState } from "@webpack/common";
 import { nanoid } from "nanoid";
 import type { DispatchWithoutAction } from "react";
 
@@ -129,7 +129,7 @@ function NotificationEntry({ data }: { data: PersistentNotificationData; }) {
                 richBody={
                     <div className={cl("body")}>
                         {data.body}
-                        <Timestamp timestamp={moment(data.timestamp)} className={cl("timestamp")} />
+                        <Timestamp timestamp={new Date(data.timestamp)} className={cl("timestamp")} />
                     </div>
                 }
             />
diff --git a/src/plugins/reviewDB/components/ReviewComponent.tsx b/src/plugins/reviewDB/components/ReviewComponent.tsx
index 977745a25..20b298ccb 100644
--- a/src/plugins/reviewDB/components/ReviewComponent.tsx
+++ b/src/plugins/reviewDB/components/ReviewComponent.tsx
@@ -20,7 +20,7 @@ import { openUserProfile } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { LazyComponent } from "@utils/react";
 import { filters, findBulk } from "@webpack";
-import { Alerts, moment, Parser, Timestamp, useState } from "@webpack/common";
+import { Alerts, Parser, Timestamp, useState } from "@webpack/common";
 
 import { Auth, getToken } from "../auth";
 import { Review, ReviewType } from "../entities";
@@ -163,7 +163,7 @@ export default LazyComponent(() => {
 
                 {
                     !settings.store.hideTimestamps && review.type !== ReviewType.System && (
-                        <Timestamp timestamp={moment(review.timestamp * 1000)} >
+                        <Timestamp timestamp={new Date(review.timestamp * 1000)} >
                             {dateFormat.format(review.timestamp * 1000)}
                         </Timestamp>)
                 }
diff --git a/src/plugins/serverProfile/GuildProfileModal.tsx b/src/plugins/serverProfile/GuildProfileModal.tsx
index 97b40b764..be1f2cd54 100644
--- a/src/plugins/serverProfile/GuildProfileModal.tsx
+++ b/src/plugins/serverProfile/GuildProfileModal.tsx
@@ -12,7 +12,7 @@ import { classes } from "@utils/misc";
 import { ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { useAwaiter } from "@utils/react";
 import { findByPropsLazy, findExportedComponentLazy } from "@webpack";
-import { FluxDispatcher, Forms, GuildChannelStore, GuildMemberStore, moment, Parser, PresenceStore, RelationshipStore, ScrollerThin, SnowflakeUtils, TabBar, Timestamp, useEffect, UserStore, UserUtils, useState, useStateFromStores } from "@webpack/common";
+import { FluxDispatcher, Forms, GuildChannelStore, GuildMemberStore, Parser, PresenceStore, RelationshipStore, ScrollerThin, SnowflakeUtils, TabBar, Timestamp, useEffect, UserStore, UserUtils, useState, useStateFromStores } from "@webpack/common";
 import { Guild, User } from "discord-types/general";
 
 const IconUtils = findByPropsLazy("getGuildBannerURL");
@@ -50,7 +50,7 @@ const fetched = {
 
 function renderTimestamp(timestamp: number) {
     return (
-        <Timestamp timestamp={moment(timestamp)} />
+        <Timestamp timestamp={new Date(timestamp)} />
     );
 }
 
diff --git a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
index 7904cd10b..a8f5735e7 100644
--- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
+++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
@@ -20,7 +20,7 @@ import { Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { formatDuration } from "@utils/text";
 import { findByPropsLazy, findComponentByCodeLazy, findComponentLazy } from "@webpack";
-import { EmojiStore, FluxDispatcher, GuildMemberStore, GuildStore, moment, Parser, PermissionsBits, PermissionStore, SnowflakeUtils, Text, Timestamp, Tooltip, useEffect, useState } from "@webpack/common";
+import { EmojiStore, FluxDispatcher, GuildMemberStore, GuildStore, Parser, PermissionsBits, PermissionStore, SnowflakeUtils, Text, Timestamp, Tooltip, useEffect, useState } from "@webpack/common";
 import type { Channel } from "discord-types/general";
 
 import openRolesAndUsersPermissionsModal, { PermissionType, RoleOrUserPermission } from "../../permissionsViewer/components/RolesAndUsersPermissions";
@@ -216,12 +216,12 @@ function HiddenChannelLockScreen({ channel }: { channel: ExtendedChannel; }) {
                 {lastMessageId &&
                     <Text variant="text-md/normal">
                         Last {channel.isForumChannel() ? "post" : "message"} created:
-                        <Timestamp timestamp={moment(SnowflakeUtils.extractTimestamp(lastMessageId))} />
+                        <Timestamp timestamp={new Date(SnowflakeUtils.extractTimestamp(lastMessageId))} />
                     </Text>
                 }
 
                 {lastPinTimestamp &&
-                    <Text variant="text-md/normal">Last message pin: <Timestamp timestamp={moment(lastPinTimestamp)} /></Text>
+                    <Text variant="text-md/normal">Last message pin: <Timestamp timestamp={new Date(lastPinTimestamp)} /></Text>
                 }
                 {(rateLimitPerUser ?? 0) > 0 &&
                     <Text variant="text-md/normal">Slowmode: {formatDuration(rateLimitPerUser!, "seconds")}</Text>
diff --git a/src/webpack/common/types/components.d.ts b/src/webpack/common/types/components.d.ts
index b9bc434c6..72a8a69b4 100644
--- a/src/webpack/common/types/components.d.ts
+++ b/src/webpack/common/types/components.d.ts
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import type { Moment } from "moment";
 import type { ComponentType, CSSProperties, FunctionComponent, HtmlHTMLAttributes, HTMLProps, KeyboardEvent, MouseEvent, PropsWithChildren, PropsWithRef, ReactNode, Ref } from "react";
 
 export type TextVariant = "heading-sm/normal" | "heading-sm/medium" | "heading-sm/semibold" | "heading-sm/bold" | "heading-md/normal" | "heading-md/medium" | "heading-md/semibold" | "heading-md/bold" | "heading-lg/normal" | "heading-lg/medium" | "heading-lg/semibold" | "heading-lg/bold" | "heading-xl/normal" | "heading-xl/medium" | "heading-xl/bold" | "heading-xxl/normal" | "heading-xxl/medium" | "heading-xxl/bold" | "eyebrow" | "heading-deprecated-14/normal" | "heading-deprecated-14/medium" | "heading-deprecated-14/bold" | "text-xxs/normal" | "text-xxs/medium" | "text-xxs/semibold" | "text-xxs/bold" | "text-xs/normal" | "text-xs/medium" | "text-xs/semibold" | "text-xs/bold" | "text-sm/normal" | "text-sm/medium" | "text-sm/semibold" | "text-sm/bold" | "text-md/normal" | "text-md/medium" | "text-md/semibold" | "text-md/bold" | "text-lg/normal" | "text-lg/medium" | "text-lg/semibold" | "text-lg/bold" | "display-sm" | "display-md" | "display-lg" | "code";
@@ -154,7 +153,7 @@ export type Switch = ComponentType<PropsWithChildren<{
 }>>;
 
 export type Timestamp = ComponentType<PropsWithChildren<{
-    timestamp: Moment;
+    timestamp: Date;
     isEdited?: boolean;
 
     className?: string;

From 48822bdc582ac9deb6a03249f5e48f5088a002c6 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 14 Feb 2024 15:00:29 -0300
Subject: [PATCH 331/632] Attempt to fix CrashHandler odd issues

---
 src/plugins/crashHandler/index.ts | 52 ++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/plugins/crashHandler/index.ts b/src/plugins/crashHandler/index.ts
index b73641f57..f8c76d7f7 100644
--- a/src/plugins/crashHandler/index.ts
+++ b/src/plugins/crashHandler/index.ts
@@ -57,6 +57,7 @@ const settings = definePluginSettings({
 });
 
 let hasCrashedOnce = false;
+let isRecovering = false;
 let shouldAttemptRecover = true;
 
 export default definePlugin({
@@ -71,38 +72,49 @@ export default definePlugin({
         {
             find: ".Messages.ERRORS_UNEXPECTED_CRASH",
             replacement: {
-                match: /(?=this\.setState\()/,
-                replace: "$self.handleCrash(this);"
+                match: /this\.setState\((.+?)\)/,
+                replace: "$self.handleCrash(this,$1);"
             }
         }
     ],
 
-    handleCrash(_this: any) {
+    handleCrash(_this: any, errorState: any) {
+        _this.setState(errorState);
+
+        // Already recovering, prevent error which happens more than once too fast to trigger another recover
+        if (isRecovering) return;
+        isRecovering = true;
+
         // 1 ms timeout to avoid react breaking when re-rendering
         setTimeout(() => {
-            if (!shouldAttemptRecover) {
-                try {
-                    showNotification({
-                        color: "#eed202",
-                        title: "Discord has crashed!",
-                        body: "Awn :( Discord has crashed two times rapidly, not attempting to recover.",
-                        noPersist: true,
-                    });
-                } catch { }
+            try {
+                // Prevent a crash loop with an error that could not be handled
+                if (!shouldAttemptRecover) {
+                    try {
+                        showNotification({
+                            color: "#eed202",
+                            title: "Discord has crashed!",
+                            body: "Awn :( Discord has crashed two times rapidly, not attempting to recover.",
+                            noPersist: true
+                        });
+                    } catch { }
 
-                return;
-            }
+                    return;
+                }
 
-            shouldAttemptRecover = false;
-            // This is enough to avoid a crash loop
-            setTimeout(() => shouldAttemptRecover = true, 500);
+                shouldAttemptRecover = false;
+                // This is enough to avoid a crash loop
+                setTimeout(() => shouldAttemptRecover = true, 500);
+            } catch { }
 
             try {
                 if (!hasCrashedOnce) {
                     hasCrashedOnce = true;
                     maybePromptToUpdate("Uh oh, Discord has just crashed... but good news, there is a Vencord update available that might fix this issue! Would you like to update now?", true);
                 }
+            } catch { }
 
+            try {
                 if (settings.store.attemptToPreventCrashes) {
                     this.handlePreventCrash(_this);
                 }
@@ -118,7 +130,7 @@ export default definePlugin({
                 color: "#eed202",
                 title: "Discord has crashed!",
                 body: "Attempting to recover...",
-                noPersist: true,
+                noPersist: true
             });
         } catch { }
 
@@ -169,6 +181,10 @@ export default definePlugin({
             }
         }
 
+
+        // Set isRecovering to false before setting the state to allow us to handle the next crash error correcty, in case it happens
+        setImmediate(() => isRecovering = false);
+
         try {
             _this.setState({ error: null, info: null });
         } catch (err) {

From 46ee193cd0d27d6b9f861858621487ec9c78b397 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 14 Feb 2024 15:07:51 -0300
Subject: [PATCH 332/632] Fix MessageLogger edit Timestamp component

---
 src/plugins/messageLogger/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index ef0aa03bb..ef986bf87 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -26,7 +26,7 @@ import { Devs } from "@utils/constants";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { ChannelStore, FluxDispatcher, i18n, Menu, moment, Parser, Timestamp, UserStore } from "@webpack/common";
+import { ChannelStore, FluxDispatcher, i18n, Menu, Parser, Timestamp, UserStore } from "@webpack/common";
 
 import overlayStyle from "./deleteStyleOverlay.css?managed";
 import textStyle from "./deleteStyleText.css?managed";
@@ -122,7 +122,7 @@ export default definePlugin({
 
     makeEdit(newMessage: any, oldMessage: any): any {
         return {
-            timestamp: moment?.call(newMessage.edited_timestamp),
+            timestamp: new Date(newMessage.edited_timestamp),
             content: oldMessage.content
         };
     },

From 93b2095d71a0ac9d68d9f9859dd8b59687885be0 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 14 Feb 2024 15:16:31 -0300
Subject: [PATCH 333/632] Fix FakeNitro hyperlinks not working sometimes

It is caused by emoji names with conflict with default emojis, but have a letter capitalized
---
 src/plugins/fakeNitro/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.ts
index ed3ec59dd..560cae381 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.ts
@@ -838,7 +838,7 @@ export default definePlugin({
                     url.searchParams.set("name", emoji.name);
 
                     messageObj.content = messageObj.content.replace(emojiString, (match, offset, origStr) => {
-                        return `${getWordBoundary(origStr, offset - 1)}${s.useHyperLinks ? `[:${emoji.name}:](${url})` : url}${getWordBoundary(origStr, offset + match.length)}`;
+                        return `${getWordBoundary(origStr, offset - 1)}${s.useHyperLinks ? `[${emoji.name}](${url})` : url}${getWordBoundary(origStr, offset + match.length)}`;
                     });
                 }
             }
@@ -864,7 +864,7 @@ export default definePlugin({
                 url.searchParams.set("size", s.emojiSize.toString());
                 url.searchParams.set("name", emoji.name);
 
-                return `${getWordBoundary(origStr, offset - 1)}${s.useHyperLinks ? `[:${emoji.name}:](${url})` : url}${getWordBoundary(origStr, offset + emojiStr.length)}`;
+                return `${getWordBoundary(origStr, offset - 1)}${s.useHyperLinks ? `[${emoji.name}](${url})` : url}${getWordBoundary(origStr, offset + emojiStr.length)}`;
             });
         });
     },

From f1bdf385ebbd5418cf6798e599e2c1d4240ecadb Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 14 Feb 2024 15:25:10 -0300
Subject: [PATCH 334/632] Bump to 1.6.9

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 08078d3d5..5ffac7ff5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.6.8",
+    "version": "1.6.9",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 89367e3b2a9e02767f8aca56e3ac7c34ac0d285e Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 15 Feb 2024 09:20:27 +0100
Subject: [PATCH 335/632] WebContextMenus: fix copying images

it broke because of the new url expiry parameters
---
 src/plugins/webContextMenus.web/index.ts | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index 5f6beca2c..faa240783 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -47,18 +47,23 @@ const settings = definePluginSettings({
 });
 
 const MEDIA_PROXY_URL = "https://media.discordapp.net";
-const CDN_URL = "https://cdn.discordapp.com";
+const CDN_URL = "cdn.discordapp.com";
 
-function fixImageUrl(urlString: string, explodeWebp: boolean) {
+function fixImageUrl(urlString: string) {
     const url = new URL(urlString);
-    if (url.origin === CDN_URL) return urlString;
-    if (url.origin === MEDIA_PROXY_URL) return CDN_URL + url.pathname;
+    if (url.host === CDN_URL) return urlString;
 
     url.searchParams.delete("width");
     url.searchParams.delete("height");
-    url.searchParams.set("quality", "lossless");
-    if (explodeWebp && url.searchParams.get("format") === "webp")
-        url.searchParams.set("format", "png");
+
+    if (url.origin === MEDIA_PROXY_URL) {
+        url.host = CDN_URL;
+        url.searchParams.delete("size");
+        url.searchParams.delete("quality");
+        url.searchParams.delete("format");
+    } else {
+        url.searchParams.set("quality", "lossless");
+    }
 
     return url.toString();
 }
@@ -199,7 +204,7 @@ export default definePlugin({
     ],
 
     async copyImage(url: string) {
-        url = fixImageUrl(url, true);
+        url = fixImageUrl(url);
 
         let imageData = await fetch(url).then(r => r.blob());
         if (imageData.type !== "image/png") {
@@ -231,7 +236,7 @@ export default definePlugin({
     },
 
     async saveImage(url: string) {
-        url = fixImageUrl(url, false);
+        url = fixImageUrl(url);
 
         const data = await fetchImage(url);
         if (!data) return;

From bc0a55053d709533143f66a2bc4b6914326e907d Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 15 Feb 2024 10:12:33 +0100
Subject: [PATCH 336/632] MessageLinkEmbeds: fix erroring on some invalid
 message links

---
 src/plugins/messageLinkEmbeds/index.tsx | 35 ++++++++++---------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index 762829992..56facf2e7 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -31,13 +31,14 @@ import {
     GuildStore,
     MessageStore,
     Parser,
+    PermissionsBits,
     PermissionStore,
     RestAPI,
     Text,
     TextAndImagesSettingsStores,
     UserStore
 } from "@webpack/common";
-import { Channel, Guild, Message } from "discord-types/general";
+import { Channel, Message } from "discord-types/general";
 
 const messageCache = new Map<string, {
     message?: Message;
@@ -50,7 +51,7 @@ const ChannelMessage = findComponentByCodeLazy("renderSimpleAccessories)");
 
 const SearchResultClasses = findByPropsLazy("message", "searchResult");
 
-const messageLinkRegex = /(?<!<)https?:\/\/(?:\w+\.)?discord(?:app)?\.com\/channels\/(\d{17,20}|@me)\/(\d{17,20})\/(\d{17,20})/g;
+const messageLinkRegex = /(?<!<)https?:\/\/(?:\w+\.)?discord(?:app)?\.com\/channels\/(?:\d{17,20}|@me)\/(\d{17,20})\/(\d{17,20})/g;
 const tenorRegex = /^https:\/\/(?:www\.)?tenor\.com\//;
 
 interface Attachment {
@@ -63,7 +64,6 @@ interface Attachment {
 interface MessageEmbedProps {
     message: Message;
     channel: Channel;
-    guildID: string;
 }
 
 const messageFetchQueue = new Queue();
@@ -226,19 +226,19 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
 
     let match = null as RegExpMatchArray | null;
     while ((match = messageLinkRegex.exec(message.content!)) !== null) {
-        const [_, guildID, channelID, messageID] = match;
+        const [_, channelID, messageID] = match;
         if (embeddedBy.includes(messageID)) {
             continue;
         }
 
         const linkedChannel = ChannelStore.getChannel(channelID);
-        if (!linkedChannel || (guildID !== "@me" && !PermissionStore.can(1024n /* view channel */, linkedChannel))) {
+        if (!linkedChannel || (!linkedChannel.isDM() && !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, linkedChannel))) {
             continue;
         }
 
         const { listMode, idList } = settings.store;
 
-        const isListed = [guildID, channelID, message.author.id].some(id => id && idList.includes(id));
+        const isListed = [linkedChannel.guild_id, channelID, message.author.id].some(id => id && idList.includes(id));
 
         if (listMode === "blacklist" && isListed) continue;
         if (listMode === "whitelist" && !isListed) continue;
@@ -265,8 +265,7 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
 
         const messageProps: MessageEmbedProps = {
             message: withEmbeddedBy(linkedMessage, [...embeddedBy, message.id]),
-            channel: linkedChannel,
-            guildID
+            channel: linkedChannel
         };
 
         const type = settings.store.automodEmbeds;
@@ -280,10 +279,8 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
     return accessories.length ? <>{accessories}</> : null;
 }
 
-function ChannelMessageEmbedAccessory({ message, channel, guildID }: MessageEmbedProps): JSX.Element | null {
-    const isDM = guildID === "@me";
-
-    const guild = !isDM && GuildStore.getGuild(channel.guild_id);
+function ChannelMessageEmbedAccessory({ message, channel }: MessageEmbedProps): JSX.Element | null {
+    const guild = !channel.isDM() && GuildStore.getGuild(channel.guild_id);
     const dmReceiver = UserStore.getUser(ChannelStore.getChannel(channel.id).recipients?.[0]);
 
 
@@ -293,11 +290,8 @@ function ChannelMessageEmbedAccessory({ message, channel, guildID }: MessageEmbe
             color: "var(--background-secondary)",
             author: {
                 name: <Text variant="text-xs/medium" tag="span">
-                    <span>{isDM ? "Direct Message - " : (guild as Guild).name + " - "}</span>
-                    {isDM
-                        ? Parser.parse(`<@${dmReceiver.id}>`)
-                        : Parser.parse(`<#${channel.id}>`)
-                    }
+                    {channel.isDM() && <span>Direct Message - </span>}
+                    {Parser.parse(channel.isDM() ? `<@${dmReceiver.id}>` : `<#${channel.id}>`)}
                 </Text>,
                 iconProxyURL: guild
                     ? `https://${window.GLOBAL_ENV.CDN_HOST}/icons/${guild.id}/${guild.icon}.png`
@@ -318,9 +312,8 @@ function ChannelMessageEmbedAccessory({ message, channel, guildID }: MessageEmbe
 }
 
 function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
-    const { message, channel, guildID } = props;
+    const { message, channel } = props;
     const compact = TextAndImagesSettingsStores.MessageDisplayCompact.useSetting();
-    const isDM = guildID === "@me";
     const images = getImages(message);
     const { parse } = Parser;
 
@@ -328,11 +321,11 @@ function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
         channel={channel}
         childrenAccessories={
             <Text color="text-muted" variant="text-xs/medium" tag="span">
-                {isDM
+                {channel.isDM()
                     ? parse(`<@${ChannelStore.getChannel(channel.id).recipients[0]}>`)
                     : parse(`<#${channel.id}>`)
                 }
-                <span>{isDM ? " - Direct Message" : " - " + GuildStore.getGuild(channel.guild_id)?.name}</span>
+                {channel.isDM() && <span> - Direct Message</span>}
             </Text>
         }
         compact={compact}

From a501da692f5c6584ae202fade81794e9fee00ef4 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 15 Feb 2024 10:36:01 +0100
Subject: [PATCH 337/632] MessageLinkEmbeds: fix group dm support, improve ui

---
 src/plugins/messageLinkEmbeds/index.tsx       | 79 +++++++++++--------
 src/plugins/mutualGroupDMs/index.tsx          |  5 +-
 .../serverProfile/GuildProfileModal.tsx       | 12 +--
 src/plugins/viewIcons/index.tsx               | 21 ++---
 src/webpack/common/types/utils.d.ts           | 45 +++++++++++
 src/webpack/common/utils.ts                   |  2 +
 6 files changed, 107 insertions(+), 57 deletions(-)

diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index 56facf2e7..50c09ec9f 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -29,6 +29,7 @@ import {
     ChannelStore,
     FluxDispatcher,
     GuildStore,
+    IconUtils,
     MessageStore,
     Parser,
     PermissionsBits,
@@ -50,6 +51,7 @@ const AutoModEmbed = findComponentByCodeLazy(".withFooter]:", "childrenMessageCo
 const ChannelMessage = findComponentByCodeLazy("renderSimpleAccessories)");
 
 const SearchResultClasses = findByPropsLazy("message", "searchResult");
+const EmbedClasses = findByPropsLazy("embedAuthorIcon", "embedAuthor", "embedAuthor");
 
 const messageLinkRegex = /(?<!<)https?:\/\/(?:\w+\.)?discord(?:app)?\.com\/channels\/(?:\d{17,20}|@me)\/(\d{17,20})\/(\d{17,20})/g;
 const tenorRegex = /^https:\/\/(?:www\.)?tenor\.com\//;
@@ -232,7 +234,7 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
         }
 
         const linkedChannel = ChannelStore.getChannel(channelID);
-        if (!linkedChannel || (!linkedChannel.isDM() && !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, linkedChannel))) {
+        if (!linkedChannel || (!linkedChannel.isPrivate() && !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, linkedChannel))) {
             continue;
         }
 
@@ -279,36 +281,42 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
     return accessories.length ? <>{accessories}</> : null;
 }
 
+function getChannelLabelAndIconUrl(channel: Channel) {
+    if (channel.isDM()) return ["Direct Message", IconUtils.getUserAvatarURL(UserStore.getUser(channel.recipients[0]))];
+    if (channel.isGroupDM()) return ["Group DM", IconUtils.getChannelIconURL(channel)];
+    return ["Server", IconUtils.getGuildIconURL(GuildStore.getGuild(channel.guild_id))];
+}
+
 function ChannelMessageEmbedAccessory({ message, channel }: MessageEmbedProps): JSX.Element | null {
-    const guild = !channel.isDM() && GuildStore.getGuild(channel.guild_id);
     const dmReceiver = UserStore.getUser(ChannelStore.getChannel(channel.id).recipients?.[0]);
 
+    const [channelLabel, iconUrl] = getChannelLabelAndIconUrl(channel);
 
-    return <Embed
-        embed={{
-            rawDescription: "",
-            color: "var(--background-secondary)",
-            author: {
-                name: <Text variant="text-xs/medium" tag="span">
-                    {channel.isDM() && <span>Direct Message - </span>}
-                    {Parser.parse(channel.isDM() ? `<@${dmReceiver.id}>` : `<#${channel.id}>`)}
-                </Text>,
-                iconProxyURL: guild
-                    ? `https://${window.GLOBAL_ENV.CDN_HOST}/icons/${guild.id}/${guild.icon}.png`
-                    : `https://${window.GLOBAL_ENV.CDN_HOST}/avatars/${dmReceiver.id}/${dmReceiver.avatar}`
-            }
-        }}
-        renderDescription={() => (
-            <div key={message.id} className={classes(SearchResultClasses.message, settings.store.messageBackgroundColor && SearchResultClasses.searchResult)}>
-                <ChannelMessage
-                    id={`message-link-embeds-${message.id}`}
-                    message={message}
-                    channel={channel}
-                    subscribeToComponentDispatch={false}
-                />
-            </div>
-        )}
-    />;
+    return (
+        <Embed
+            embed={{
+                rawDescription: "",
+                color: "var(--background-secondary)",
+                author: {
+                    name: <Text variant="text-xs/medium" tag="span">
+                        <span>{channelLabel} - </span>
+                        {Parser.parse(channel.isDM() ? `<@${dmReceiver.id}>` : `<#${channel.id}>`)}
+                    </Text>,
+                    iconProxyURL: iconUrl
+                }
+            }}
+            renderDescription={() => (
+                <div key={message.id} className={classes(SearchResultClasses.message, settings.store.messageBackgroundColor && SearchResultClasses.searchResult)}>
+                    <ChannelMessage
+                        id={`message-link-embeds-${message.id}`}
+                        message={message}
+                        channel={channel}
+                        subscribeToComponentDispatch={false}
+                    />
+                </div>
+            )}
+        />
+    );
 }
 
 function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
@@ -317,15 +325,20 @@ function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
     const images = getImages(message);
     const { parse } = Parser;
 
+    const [channelLabel, iconUrl] = getChannelLabelAndIconUrl(channel);
+
     return <AutoModEmbed
         channel={channel}
         childrenAccessories={
-            <Text color="text-muted" variant="text-xs/medium" tag="span">
-                {channel.isDM()
-                    ? parse(`<@${ChannelStore.getChannel(channel.id).recipients[0]}>`)
-                    : parse(`<#${channel.id}>`)
-                }
-                {channel.isDM() && <span> - Direct Message</span>}
+            <Text color="text-muted" variant="text-xs/medium" tag="span" className={`${EmbedClasses.embedAuthor} ${EmbedClasses.embedMargin}`}>
+                {iconUrl && <img src={iconUrl} className={EmbedClasses.embedAuthorIcon} alt="" />}
+                <span>
+                    <span>{channelLabel} - </span>
+                    {channel.isDM()
+                        ? Parser.parse(`<@${ChannelStore.getChannel(channel.id).recipients[0]}>`)
+                        : Parser.parse(`<#${channel.id}>`)
+                    }
+                </span>
             </Text>
         }
         compact={compact}
diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx
index 226d000f1..40d5201cb 100644
--- a/src/plugins/mutualGroupDMs/index.tsx
+++ b/src/plugins/mutualGroupDMs/index.tsx
@@ -20,11 +20,10 @@ import { Devs } from "@utils/constants";
 import { isNonNullish } from "@utils/guards";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { Avatar, ChannelStore, Clickable, RelationshipStore, ScrollerThin, UserStore } from "@webpack/common";
+import { Avatar, ChannelStore, Clickable, IconUtils, RelationshipStore, ScrollerThin, UserStore } from "@webpack/common";
 import { Channel, User } from "discord-types/general";
 
 const SelectedChannelActionCreators = findByPropsLazy("selectPrivateChannel");
-const AvatarUtils = findByPropsLazy("getChannelIconURL");
 const UserUtils = findByPropsLazy("getGlobalName");
 
 const ProfileListClasses = findByPropsLazy("emptyIconFriends", "emptyIconGuilds");
@@ -71,7 +70,7 @@ export default definePlugin({
                 }}
             >
                 <Avatar
-                    src={AvatarUtils.getChannelIconURL({ id: c.id, icon: c.icon, size: 32 })}
+                    src={IconUtils.getChannelIconURL({ id: c.id, icon: c.icon, size: 32 })}
                     size="SIZE_40"
                     className={ProfileListClasses.listAvatar}
                 >
diff --git a/src/plugins/serverProfile/GuildProfileModal.tsx b/src/plugins/serverProfile/GuildProfileModal.tsx
index be1f2cd54..834367e0a 100644
--- a/src/plugins/serverProfile/GuildProfileModal.tsx
+++ b/src/plugins/serverProfile/GuildProfileModal.tsx
@@ -12,10 +12,9 @@ import { classes } from "@utils/misc";
 import { ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { useAwaiter } from "@utils/react";
 import { findByPropsLazy, findExportedComponentLazy } from "@webpack";
-import { FluxDispatcher, Forms, GuildChannelStore, GuildMemberStore, Parser, PresenceStore, RelationshipStore, ScrollerThin, SnowflakeUtils, TabBar, Timestamp, useEffect, UserStore, UserUtils, useState, useStateFromStores } from "@webpack/common";
+import { FluxDispatcher, Forms, GuildChannelStore, GuildMemberStore, IconUtils, Parser, PresenceStore, RelationshipStore, ScrollerThin, SnowflakeUtils, TabBar, Timestamp, useEffect, UserStore, UserUtils, useState, useStateFromStores } from "@webpack/common";
 import { Guild, User } from "discord-types/general";
 
-const IconUtils = findByPropsLazy("getGuildBannerURL");
 const IconClasses = findByPropsLazy("icon", "acronym", "childWrapper");
 const FriendRow = findExportedComponentLazy("FriendRow");
 
@@ -65,10 +64,7 @@ function GuildProfileModal({ guild }: GuildProps) {
 
     const [currentTab, setCurrentTab] = useState(Tabs.ServerInfo);
 
-    const bannerUrl = guild.banner && IconUtils.getGuildBannerURL({
-        id: guild.id,
-        banner: guild.banner
-    }, true).replace(/\?size=\d+$/, "?size=1024");
+    const bannerUrl = guild.banner && IconUtils.getGuildBannerURL(guild, true)!.replace(/\?size=\d+$/, "?size=1024");
 
     const iconUrl = guild.icon && IconUtils.getGuildIconURL({
         id: guild.id,
@@ -89,7 +85,7 @@ function GuildProfileModal({ guild }: GuildProps) {
             )}
 
             <div className={cl("header")}>
-                {guild.icon
+                {iconUrl
                     ? <img
                         src={iconUrl}
                         alt=""
@@ -150,7 +146,7 @@ function Owner(guildId: string, owner: User) {
                 avatar: guildAvatar,
                 guildId,
                 canAnimate: true
-            }, true)
+            })
             : IconUtils.getUserAvatarURL(owner, true);
 
     return (
diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index 2da3e21c2..0920c4185 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -22,11 +22,9 @@ import { ImageIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { openImageModal } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
-import { GuildMemberStore, Menu } from "@webpack/common";
+import { GuildMemberStore, IconUtils, Menu } from "@webpack/common";
 import type { Channel, Guild, User } from "discord-types/general";
 
-const BannerStore = findByPropsLazy("getGuildBannerURL");
 
 interface UserContextProps {
     channel: Channel;
@@ -91,19 +89,19 @@ const UserContext: NavContextMenuPatchCallback = (children, { user, guildId }: U
             <Menu.MenuItem
                 id="view-avatar"
                 label="View Avatar"
-                action={() => openImage(BannerStore.getUserAvatarURL(user, true))}
+                action={() => openImage(IconUtils.getUserAvatarURL(user, true))}
                 icon={ImageIcon}
             />
             {memberAvatar && (
                 <Menu.MenuItem
                     id="view-server-avatar"
                     label="View Server Avatar"
-                    action={() => openImage(BannerStore.getGuildMemberAvatarURLSimple({
+                    action={() => openImage(IconUtils.getGuildMemberAvatarURLSimple({
                         userId: user.id,
                         avatar: memberAvatar,
-                        guildId,
+                        guildId: guildId!,
                         canAnimate: true
-                    }, true))}
+                    }))}
                     icon={ImageIcon}
                 />
             )}
@@ -124,11 +122,11 @@ const GuildContext: NavContextMenuPatchCallback = (children, { guild }: GuildCon
                     id="view-icon"
                     label="View Icon"
                     action={() =>
-                        openImage(BannerStore.getGuildIconURL({
+                        openImage(IconUtils.getGuildIconURL({
                             id,
                             icon,
                             canAnimate: true
-                        }))
+                        })!)
                     }
                     icon={ImageIcon}
                 />
@@ -138,10 +136,7 @@ const GuildContext: NavContextMenuPatchCallback = (children, { guild }: GuildCon
                     id="view-banner"
                     label="View Banner"
                     action={() =>
-                        openImage(BannerStore.getGuildBannerURL({
-                            id,
-                            banner,
-                        }, true))
+                        openImage(IconUtils.getGuildBannerURL(guild, true)!)
                     }
                     icon={ImageIcon}
                 />
diff --git a/src/webpack/common/types/utils.d.ts b/src/webpack/common/types/utils.d.ts
index 246659146..2005581a1 100644
--- a/src/webpack/common/types/utils.d.ts
+++ b/src/webpack/common/types/utils.d.ts
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { Guild, GuildMember } from "discord-types/general";
 import type { ReactNode } from "react";
 
 import type { FluxEvents } from "./fluxEvents";
@@ -182,3 +183,47 @@ export interface NavigationRouter {
     getLastRouteChangeSource(): any;
     getLastRouteChangeSourceLocationStack(): any;
 }
+
+export interface IconUtils {
+    getUserAvatarURL(user: User, canAnimate?: boolean, size?: number, format?: string): string;
+    getDefaultAvatarURL(id: string, discriminator?: string): string;
+    getUserBannerURL(data: { id: string, banner: string, canAnimate?: boolean, size: number; }): string | undefined;
+    getAvatarDecorationURL(dara: { avatarDecoration: string, size: number; canCanimate?: boolean; }): string | undefined;
+
+    getGuildMemberAvatarURL(member: GuildMember, canAnimate?: string): string | null;
+    getGuildMemberAvatarURLSimple(data: { guildId: string, userId: string, avatar: string, canAnimate?: boolean; size?: number; }): string;
+    getGuildMemberBannerURL(data: { id: string, guildId: string, banner: string, canAnimate?: boolean, size: number; }): string | undefined;
+
+    getGuildIconURL(data: { id: string, icon?: string, size?: number, canAnimate?: boolean; }): string | undefined;
+    getGuildBannerURL(guild: Guild, canAnimate?: boolean): string | null;
+
+    getChannelIconURL(data: { id: string; icon?: string; applicationId?: string; size?: number; }): string | undefined;
+    getEmojiURL(data: { id: string, animated: boolean, size: number, forcePNG?: boolean; }): string;
+
+    hasAnimatedGuildIcon(guild: Guild): boolean;
+    isAnimatedIconHash(hash: string): boolean;
+
+    getGuildSplashURL: any;
+    getGuildDiscoverySplashURL: any;
+    getGuildHomeHeaderURL: any;
+    getResourceChannelIconURL: any;
+    getNewMemberActionIconURL: any;
+    getGuildTemplateIconURL: any;
+    getApplicationIconURL: any;
+    getGameAssetURL: any;
+    getVideoFilterAssetURL: any;
+
+    getGuildMemberAvatarSource: any;
+    getUserAvatarSource: any;
+    getGuildSplashSource: any;
+    getGuildDiscoverySplashSource: any;
+    makeSource: any;
+    getGameAssetSource: any;
+    getGuildIconSource: any;
+    getGuildTemplateIconSource: any;
+    getGuildBannerSource: any;
+    getGuildHomeHeaderSource: any;
+    getChannelIconSource: any;
+    getApplicationIconSource: any;
+    getAnimatableSourceWithFallback: any;
+}
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index c62f745a9..7060573d5 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -137,3 +137,5 @@ export const { persist: zustandPersist }: typeof import("zustand/middleware") =
 export const MessageActions = findByPropsLazy("editMessage", "sendMessage");
 export const UserProfileActions = findByPropsLazy("openUserProfileModal", "closeUserProfileModal");
 export const InviteActions = findByPropsLazy("resolveInvite");
+
+export const IconUtils: t.IconUtils = findByPropsLazy("getGuildBannerURL", "getUserAvatarURL");

From 7b960716439cba093202f9ba37dd6b258be39017 Mon Sep 17 00:00:00 2001
From: Syncx <47534062+Syncxv@users.noreply.github.com>
Date: Fri, 16 Feb 2024 17:52:09 +1100
Subject: [PATCH 338/632] fix ImageZoom patch (#2181)

---
 src/plugins/imageZoom/components/Magnifier.tsx | 11 ++++++-----
 src/plugins/imageZoom/index.tsx                |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/plugins/imageZoom/components/Magnifier.tsx b/src/plugins/imageZoom/components/Magnifier.tsx
index 6a3fc05a0..816717350 100644
--- a/src/plugins/imageZoom/components/Magnifier.tsx
+++ b/src/plugins/imageZoom/components/Magnifier.tsx
@@ -123,14 +123,13 @@ export const Magnifier: React.FC<MagnifierProps> = ({ instance, size: initialSiz
         waitFor(() => instance.state.readyState === "READY", () => {
             const elem = document.getElementById(ELEMENT_ID) as HTMLDivElement;
             element.current = elem;
-            elem.firstElementChild!.setAttribute("draggable", "false");
+            elem.querySelector("img,video")?.setAttribute("draggable", "false");
             if (instance.props.animated) {
                 originalVideoElementRef.current = elem!.querySelector("video")!;
                 originalVideoElementRef.current.addEventListener("timeupdate", syncVideos);
-                setReady(true);
-            } else {
-                setReady(true);
             }
+
+            setReady(true);
         });
         document.addEventListener("keydown", onKeyDown);
         document.addEventListener("keyup", onKeyUp);
@@ -155,7 +154,9 @@ export const Magnifier: React.FC<MagnifierProps> = ({ instance, size: initialSiz
 
     if (!ready) return null;
 
-    const box = element.current!.getBoundingClientRect();
+    const box = element.current?.getBoundingClientRect();
+
+    if (!box) return null;
 
     return (
         <div
diff --git a/src/plugins/imageZoom/index.tsx b/src/plugins/imageZoom/index.tsx
index c14754c87..8d8b6726d 100644
--- a/src/plugins/imageZoom/index.tsx
+++ b/src/plugins/imageZoom/index.tsx
@@ -171,7 +171,7 @@ export default definePlugin({
             find: "handleImageLoad=",
             replacement: [
                 {
-                    match: /showThumbhashPlaceholder:\i,/,
+                    match: /placeholderVersion:\i,/,
                     replace: "...$self.makeProps(this),$&"
                 },
 

From c3030bbad0e0c4aba3135631f363354dbaa297a8 Mon Sep 17 00:00:00 2001
From: Margot <95306417+MopigamesYT@users.noreply.github.com>
Date: Sun, 18 Feb 2024 17:42:26 +0100
Subject: [PATCH 339/632] MuteNewGuild -> NewGuildSettings; add 'show all
 channels' option (#2065)

Co-authored-by: MopigamesYT <mopigames@proton.me>
Co-authored-by: V <vendicated@riseup.net>
---
 .../index.tsx                                 | 25 +++++++++++++------
 src/utils/constants.ts                        |  4 +++
 2 files changed, 22 insertions(+), 7 deletions(-)
 rename src/plugins/{muteNewGuild => newGuildSettings}/index.tsx (72%)

diff --git a/src/plugins/muteNewGuild/index.tsx b/src/plugins/newGuildSettings/index.tsx
similarity index 72%
rename from src/plugins/muteNewGuild/index.tsx
rename to src/plugins/newGuildSettings/index.tsx
index 08c558a95..ff6f1c261 100644
--- a/src/plugins/muteNewGuild/index.tsx
+++ b/src/plugins/newGuildSettings/index.tsx
@@ -16,16 +16,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { definePluginSettings } from "@api/Settings";
+import { definePluginSettings,migratePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 
 const { updateGuildNotificationSettings } = findByPropsLazy("updateGuildNotificationSettings");
+const { toggleShowAllChannels } = findByPropsLazy("toggleShowAllChannels");
+const { isOptInEnabledForGuild } = findByPropsLazy("isOptInEnabledForGuild");
 
 const settings = definePluginSettings({
     guild: {
-        description: "Mute Guild",
+        description: "Mute Guild automatically",
         type: OptionType.BOOLEAN,
         default: true
     },
@@ -38,13 +40,20 @@ const settings = definePluginSettings({
         description: "Suppress All Role @mentions",
         type: OptionType.BOOLEAN,
         default: true
+    },
+    showAllChannels: {
+        description: "Show all channels automatically",
+        type: OptionType.BOOLEAN,
+        default: true
     }
 });
 
+migratePluginSettings("NewGuildSettings", "MuteNewGuild");
 export default definePlugin({
-    name: "MuteNewGuild",
-    description: "Mutes newly joined guilds",
-    authors: [Devs.Glitch, Devs.Nuckyz, Devs.carince],
+    name: "NewGuildSettings",
+    description: "Automatically mute new servers and change various other settings upon joining",
+    tags: ["MuteNewGuild", "mute", "server"],
+    authors: [Devs.Glitch, Devs.Nuckyz, Devs.carince, Devs.Mopi],
     patches: [
         {
             find: ",acceptInvite(",
@@ -70,7 +79,9 @@ export default definePlugin({
                 muted: settings.store.guild,
                 suppress_everyone: settings.store.everyone,
                 suppress_roles: settings.store.role
-            }
-        );
+            });
+        if (settings.store.showAllChannels && isOptInEnabledForGuild(guildId)) {
+            toggleShowAllChannels(guildId);
+        }
     }
 });
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 55af93605..4b8caf825 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -399,6 +399,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "maisy",
         id: 257109471589957632n,
     },
+    Mopi: {
+        name: "Mopi",
+        id: 1022189106614243350n
+    },
     Grzesiek11: {
         name: "Grzesiek11",
         id: 368475654662127616n,

From 604f4c49aff587a6f0d5038c50123c040d0c2527 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 18 Feb 2024 18:22:33 +0100
Subject: [PATCH 340/632] VoiceMessages: Add warning if audio file is not
 OggOpus

---
 src/plugins/voiceMessages/index.tsx | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/plugins/voiceMessages/index.tsx b/src/plugins/voiceMessages/index.tsx
index f4898de68..2393ef2b6 100644
--- a/src/plugins/voiceMessages/index.tsx
+++ b/src/plugins/voiceMessages/index.tsx
@@ -20,13 +20,15 @@ import "./styles.css";
 
 import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
 import { Microphone } from "@components/Icons";
+import { Link } from "@components/Link";
 import { Devs } from "@utils/constants";
+import { Margins } from "@utils/margins";
 import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModal } from "@utils/modal";
 import { useAwaiter } from "@utils/react";
 import definePlugin from "@utils/types";
 import { chooseFile } from "@utils/web";
 import { findByPropsLazy, findStoreLazy } from "@webpack";
-import { Button, FluxDispatcher, Forms, lodash, Menu, MessageActions, PermissionsBits, PermissionStore, RestAPI, SelectedChannelStore, showToast, SnowflakeUtils, Toasts, useEffect, useState } from "@webpack/common";
+import { Button, Card, FluxDispatcher, Forms, lodash, Menu, MessageActions, PermissionsBits, PermissionStore, RestAPI, SelectedChannelStore, showToast, SnowflakeUtils, Toasts, useEffect, useState } from "@webpack/common";
 import { ComponentType } from "react";
 
 import { VoiceRecorderDesktop } from "./DesktopRecorder";
@@ -164,6 +166,11 @@ function Modal({ modalProps }: { modalProps: ModalProps; }) {
         fallbackValue: EMPTY_META,
     });
 
+    const isUnsupportedFormat = blob && (
+        !blob.type.startsWith("audio/ogg")
+        || blob.type.includes("codecs") && !blob.type.includes("opus")
+    );
+
     return (
         <ModalRoot {...modalProps}>
             <ModalHeader>
@@ -200,6 +207,16 @@ function Modal({ modalProps }: { modalProps: ModalProps; }) {
                     recording={isRecording}
                 />
 
+                {isUnsupportedFormat && (
+                    <Card className={`vc-plugins-restart-card ${Margins.top16}`}>
+                        <Forms.FormText>Voice Messages have to be OggOpus to be playable on iOS. This file is <code>{blob.type}</code> so it will not be playable on iOS.</Forms.FormText>
+
+                        <Forms.FormText className={Margins.top8}>
+                            To fix it, first convert it to OggOpus, for example using the <Link href="https://convertio.co/mp3-opus/">convertio web converter</Link>
+                        </Forms.FormText>
+                    </Card>
+                )}
+
             </ModalContent>
 
             <ModalFooter>

From f922f0bc0d4a4da12663b7ef86bf16cd17c59ba9 Mon Sep 17 00:00:00 2001
From: Manti <67705577+mantikafasi@users.noreply.github.com>
Date: Tue, 20 Feb 2024 21:13:25 +0300
Subject: [PATCH 341/632] fix reviewdb auth not working on userscript (#2194)

---
 src/plugins/reviewDB/auth.tsx       |  2 +-
 src/plugins/reviewDB/reviewDbApi.ts | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/plugins/reviewDB/auth.tsx b/src/plugins/reviewDB/auth.tsx
index 136001b2d..4cd81f2ea 100644
--- a/src/plugins/reviewDB/auth.tsx
+++ b/src/plugins/reviewDB/auth.tsx
@@ -59,7 +59,7 @@ export function authorize(callback?: any) {
                     const url = new URL(response.location);
                     url.searchParams.append("clientMod", "vencord");
                     const res = await fetch(url, {
-                        headers: new Headers({ Accept: "application/json" })
+                        headers: { Accept: "application/json" }
                     });
 
                     if (!res.ok) {
diff --git a/src/plugins/reviewDB/reviewDbApi.ts b/src/plugins/reviewDB/reviewDbApi.ts
index ec6d9ff3b..3fe6dd061 100644
--- a/src/plugins/reviewDB/reviewDbApi.ts
+++ b/src/plugins/reviewDB/reviewDbApi.ts
@@ -118,10 +118,10 @@ export async function addReview(review: any): Promise<Response | null> {
 export async function deleteReview(id: number): Promise<Response | null> {
     return await rdbRequest(`/users/${id}/reviews`, {
         method: "DELETE",
-        headers: new Headers({
+        headers: {
             "Content-Type": "application/json",
             Accept: "application/json",
-        }),
+        },
         body: JSON.stringify({
             reviewid: id
         })
@@ -135,10 +135,10 @@ export async function deleteReview(id: number): Promise<Response | null> {
 export async function reportReview(id: number) {
     const res = await rdbRequest("/reports", {
         method: "PUT",
-        headers: new Headers({
+        headers: {
             "Content-Type": "application/json",
             Accept: "application/json",
-        }),
+        },
         body: JSON.stringify({
             reviewid: id,
         })
@@ -150,10 +150,10 @@ export async function reportReview(id: number) {
 async function patchBlock(action: "block" | "unblock", userId: string) {
     const res = await rdbRequest("/blocks", {
         method: "PATCH",
-        headers: new Headers({
+        headers: {
             "Content-Type": "application/json",
             Accept: "application/json",
-        }),
+        },
         body: JSON.stringify({
             action: action,
             discordId: userId
@@ -180,9 +180,9 @@ export const unblockUser = (userId: string) => patchBlock("unblock", userId);
 export async function fetchBlocks(): Promise<ReviewDBUser[]> {
     const res = await rdbRequest("/blocks", {
         method: "GET",
-        headers: new Headers({
+        headers: {
             Accept: "application/json",
-        })
+        }
     });
 
     if (!res.ok) throw new Error(`${res.status}: ${res.statusText}`);

From e3fd954512cb56cf05141f44465429530403a223 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 22 Feb 2024 21:31:15 -0300
Subject: [PATCH 342/632] Fix Decor patch

---
 src/plugins/decor/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx
index ce546d309..8cfd8c036 100644
--- a/src/plugins/decor/index.tsx
+++ b/src/plugins/decor/index.tsx
@@ -72,7 +72,7 @@ export default definePlugin({
             replacement: [
                 // Add Decor avatar decoration hook to avatar decoration hook
                 {
-                    match: /(?<=TryItOut:\i}\),)(?<=user:(\i).+?)/,
+                    match: /(?<=TryItOut:\i,guildId:\i}\),)(?<=user:(\i).+?)/,
                     replace: "vcDecorAvatarDecoration=$self.useUserDecorAvatarDecoration($1),"
                 },
                 // Use added hook

From 2d8715adf01890d422f3c1471ce0f34c56e5adeb Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 23 Feb 2024 13:06:03 +0100
Subject: [PATCH 343/632] SuperReactionTweaks: only super react by default if
 user has nitro

---
 src/plugins/superReactionTweaks/index.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/plugins/superReactionTweaks/index.ts b/src/plugins/superReactionTweaks/index.ts
index 0e58eb0a8..89197b4c3 100644
--- a/src/plugins/superReactionTweaks/index.ts
+++ b/src/plugins/superReactionTweaks/index.ts
@@ -7,6 +7,7 @@
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
+import { UserStore } from "@webpack/common";
 
 export const settings = definePluginSettings({
     superReactByDefault: {
@@ -49,7 +50,7 @@ export default definePlugin({
             find: ".trackEmojiSearchEmpty,200",
             replacement: {
                 match: /(\.trackEmojiSearchEmpty,200(?=.+?isBurstReaction:(\i).+?(\i===\i\.EmojiIntention.REACTION)).+?\[\2,\i\]=\i\.useState\().+?\)/,
-                replace: (_, rest, isBurstReactionVariable, isReactionIntention) => `${rest}$self.settings.store.superReactByDefault&&${isReactionIntention})`
+                replace: (_, rest, isBurstReactionVariable, isReactionIntention) => `${rest}$self.shouldSuperReactByDefault&&${isReactionIntention})`
             }
         }
     ],
@@ -59,5 +60,9 @@ export default definePlugin({
         if (settings.store.unlimitedSuperReactionPlaying) return true;
         if (playingCount <= settings.store.superReactionPlayingLimit) return true;
         return false;
+    },
+
+    get shouldSuperReactByDefault() {
+        return settings.store.superReactByDefault && UserStore.getCurrentUser().premiumType != null;
     }
 });

From 414184ef25387248e9eb810ea725dfab9d3ef82a Mon Sep 17 00:00:00 2001
From: Sqaaakoi <sqaaakoi-git@sqaaakoi.xyz>
Date: Mon, 26 Feb 2024 12:51:09 +1300
Subject: [PATCH 344/632] ImageZoom: negate the border offsetting the lens
 (#2117)

Co-authored-by: Lewis Crichton <lewi@lewisakura.moe>
---
 src/plugins/imageZoom/styles.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/plugins/imageZoom/styles.css b/src/plugins/imageZoom/styles.css
index 51e225c05..c3776d90e 100644
--- a/src/plugins/imageZoom/styles.css
+++ b/src/plugins/imageZoom/styles.css
@@ -9,6 +9,9 @@
     box-shadow: inset 0 0 10px 2px grey;
     filter: drop-shadow(0 0 2px grey);
     pointer-events: none;
+
+    /* negate the border offsetting the lens */
+    margin: -2px;
 }
 
 .vc-imgzoom-square {

From 9958f5a2ea651a7890a613a9a6661654548a0a8a Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 27 Feb 2024 05:04:54 -0300
Subject: [PATCH 345/632] Fix ReviewDB

---
 src/plugins/reviewDB/components/ReviewsView.tsx | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/plugins/reviewDB/components/ReviewsView.tsx b/src/plugins/reviewDB/components/ReviewsView.tsx
index 64cea1815..eea92bb81 100644
--- a/src/plugins/reviewDB/components/ReviewsView.tsx
+++ b/src/plugins/reviewDB/components/ReviewsView.tsx
@@ -32,6 +32,7 @@ const { Editor, Transforms } = findByPropsLazy("Editor", "Transforms");
 const { ChatInputTypes } = findByPropsLazy("ChatInputTypes");
 
 const InputComponent = LazyComponent(() => find(m => m.default?.type?.render?.toString().includes("default.CHANNEL_TEXT_AREA")).default);
+const { createChannelRecordFromServer } = findByPropsLazy("createChannelRecordFromServer");
 
 interface UserProps {
     discordId: string;
@@ -125,19 +126,7 @@ export function ReviewsInputComponent({ discordId, isAuthor, refetch, name }: {
     const inputType = ChatInputTypes.FORM;
     inputType.disableAutoFocus = true;
 
-    const channel = {
-        flags_: 256,
-        guild_id_: null,
-        id: "0",
-        getGuildId: () => null,
-        isPrivate: () => true,
-        isActiveThread: () => false,
-        isArchivedLockedThread: () => false,
-        isDM: () => true,
-        roles: { "0": { permissions: 0n } },
-        getRecipientId: () => "0",
-        hasFlag: () => false,
-    };
+    const channel = createChannelRecordFromServer({ id: "0", type: 1 });
 
     return (
         <>

From 5e7b4e9c92ac52e2a3b839390643af0db2fb919e Mon Sep 17 00:00:00 2001
From: Av32000 <59660601+Av32000@users.noreply.github.com>
Date: Tue, 27 Feb 2024 11:27:34 +0100
Subject: [PATCH 346/632] SpotifyControls: export album cover as CSS variable
 for themes (#2197)

--vc-spotify-track-image
---
 src/plugins/spotifyControls/PlayerComponent.tsx | 6 +++++-
 src/plugins/spotifyControls/index.tsx           | 2 +-
 src/utils/constants.ts                          | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/plugins/spotifyControls/PlayerComponent.tsx b/src/plugins/spotifyControls/PlayerComponent.tsx
index f2370906b..8b3f04bf2 100644
--- a/src/plugins/spotifyControls/PlayerComponent.tsx
+++ b/src/plugins/spotifyControls/PlayerComponent.tsx
@@ -371,6 +371,10 @@ export function Player() {
     if (!track || !device?.is_active || shouldHide)
         return null;
 
+    const exportTrackImageStyle = {
+        "--vc-spotify-track-image": `url(${track?.album?.image?.url || ""})`,
+    } as React.CSSProperties;
+
     return (
         <ErrorBoundary fallback={() => (
             <div className="vc-spotify-fallback">
@@ -378,7 +382,7 @@ export function Player() {
                 <p >Check the console for errors</p>
             </div>
         )}>
-            <div id={cl("player")}>
+            <div id={cl("player")} style={exportTrackImageStyle}>
                 <Info track={track} />
                 <SeekBar />
                 <Controls />
diff --git a/src/plugins/spotifyControls/index.tsx b/src/plugins/spotifyControls/index.tsx
index cfb352efe..d7e4f6454 100644
--- a/src/plugins/spotifyControls/index.tsx
+++ b/src/plugins/spotifyControls/index.tsx
@@ -31,7 +31,7 @@ function toggleHoverControls(value: boolean) {
 export default definePlugin({
     name: "SpotifyControls",
     description: "Adds a Spotify player above the account panel",
-    authors: [Devs.Ven, Devs.afn, Devs.KraXen72],
+    authors: [Devs.Ven, Devs.afn, Devs.KraXen72, Devs.Av32000],
     options: {
         hoverControls: {
             description: "Show controls on hover",
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 4b8caf825..d66bdc826 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -414,6 +414,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     coolelectronics: {
         name: "coolelectronics",
         id: 696392247205298207n,
+    },
+    Av32000: {
+        name: "Av32000",
+        id: 593436735380127770n,
     }
 } satisfies Record<string, Dev>);
 

From b9d0a1c563dfdc0a7b06da5eb7b037314c8260e1 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 27 Feb 2024 11:47:28 +0100
Subject: [PATCH 347/632] SpotifyControls: fix seekbar grabber alignment

---
 src/plugins/spotifyControls/spotifyStyles.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/plugins/spotifyControls/spotifyStyles.css b/src/plugins/spotifyControls/spotifyStyles.css
index 9e585ebec..72383c3e8 100644
--- a/src/plugins/spotifyControls/spotifyStyles.css
+++ b/src/plugins/spotifyControls/spotifyStyles.css
@@ -170,9 +170,16 @@
     /* these importants are necessary, it applies a width and height through inline styles */
     height: 10px !important;
     width: 10px !important;
+    margin-top: 4px;
     background-color: var(--interactive-normal);
     border-color: var(--interactive-normal);
     color: var(--interactive-normal);
+    opacity: 0;
+    transition: opacity 0.1s;
+}
+
+#vc-spotify-progress-bar:hover > [class^="slider"] [class^="grabber"] {
+    opacity: 1;
 }
 
 #vc-spotify-progress-text {

From 27696ed62a8744bbf3f31c02497f238946106153 Mon Sep 17 00:00:00 2001
From: WackyModer <78763021+WackyModer@users.noreply.github.com>
Date: Tue, 27 Feb 2024 03:31:51 -0800
Subject: [PATCH 348/632] whoReacted: fix reaction count being off by one
 (#2209)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/whoReacted/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/whoReacted/index.tsx b/src/plugins/whoReacted/index.tsx
index 4a2bdeeda..6d994be16 100644
--- a/src/plugins/whoReacted/index.tsx
+++ b/src/plugins/whoReacted/index.tsx
@@ -69,14 +69,14 @@ function getReactionsWithQueue(msg: Message, e: ReactionEmoji, type: number) {
 function makeRenderMoreUsers(users: User[]) {
     return function renderMoreUsers(_label: string, _count: number) {
         return (
-            <Tooltip text={users.slice(5).map(u => u.username).join(", ")} >
+            <Tooltip text={users.slice(4).map(u => u.username).join(", ")} >
                 {({ onMouseEnter, onMouseLeave }) => (
                     <div
                         className={AvatarStyles.moreUsers}
                         onMouseEnter={onMouseEnter}
                         onMouseLeave={onMouseLeave}
                     >
-                        +{users.length - 5}
+                        +{users.length - 4}
                     </div>
                 )}
             </Tooltip >

From ed5e1be7a4d50d612908fff35fa901e81330ce86 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 27 Feb 2024 09:19:05 -0300
Subject: [PATCH 349/632] Add permissions checks for FakeNitro actions (#2160)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/api/MessageEvents.ts                      |  10 +-
 src/plugins/_api/messageEvents.ts             |   9 +-
 src/plugins/fakeNitro/{index.ts => index.tsx} | 121 +++++++++++++-----
 src/webpack/common/types/utils.d.ts           |   1 +
 4 files changed, 105 insertions(+), 36 deletions(-)
 rename src/plugins/fakeNitro/{index.ts => index.tsx} (89%)

diff --git a/src/api/MessageEvents.ts b/src/api/MessageEvents.ts
index 341b4e678..d6eba748f 100644
--- a/src/api/MessageEvents.ts
+++ b/src/api/MessageEvents.ts
@@ -74,7 +74,7 @@ export interface MessageExtra {
 }
 
 export type SendListener = (channelId: string, messageObj: MessageObject, extra: MessageExtra) => Promisable<void | { cancel: boolean; }>;
-export type EditListener = (channelId: string, messageId: string, messageObj: MessageObject) => Promisable<void>;
+export type EditListener = (channelId: string, messageId: string, messageObj: MessageObject) => Promisable<void | { cancel: boolean; }>;
 
 const sendListeners = new Set<SendListener>();
 const editListeners = new Set<EditListener>();
@@ -84,7 +84,7 @@ export async function _handlePreSend(channelId: string, messageObj: MessageObjec
     for (const listener of sendListeners) {
         try {
             const result = await listener(channelId, messageObj, extra);
-            if (result && result.cancel === true) {
+            if (result?.cancel) {
                 return true;
             }
         } catch (e) {
@@ -97,11 +97,15 @@ export async function _handlePreSend(channelId: string, messageObj: MessageObjec
 export async function _handlePreEdit(channelId: string, messageId: string, messageObj: MessageObject) {
     for (const listener of editListeners) {
         try {
-            await listener(channelId, messageId, messageObj);
+            const result = await listener(channelId, messageId, messageObj);
+            if (result?.cancel) {
+                return true;
+            }
         } catch (e) {
             MessageEventsLogger.error("MessageEditHandler: Listener encountered an unknown error\n", e);
         }
     }
+    return false;
 }
 
 /**
diff --git a/src/plugins/_api/messageEvents.ts b/src/plugins/_api/messageEvents.ts
index bc5f5abf2..1b4a2d15a 100644
--- a/src/plugins/_api/messageEvents.ts
+++ b/src/plugins/_api/messageEvents.ts
@@ -25,10 +25,13 @@ export default definePlugin({
     authors: [Devs.Arjix, Devs.hunt, Devs.Ven],
     patches: [
         {
-            find: '"MessageActionCreators"',
+            find: ".Messages.EDIT_TEXTAREA_HELP",
             replacement: {
-                match: /async editMessage\(.+?\)\{/,
-                replace: "$&await Vencord.Api.MessageEvents._handlePreEdit(...arguments);"
+                match: /(?<=,channel:\i\}\)\.then\().+?(?=return \i\.content!==this\.props\.message\.content&&\i\((.+?)\))/,
+                replace: (match, args) => "" +
+                    `async ${match}` +
+                    `if(await Vencord.Api.MessageEvents._handlePreEdit(${args}))` +
+                    "return Promise.resolve({shoudClear:true,shouldRefocus:true});"
             }
         },
         {
diff --git a/src/plugins/fakeNitro/index.ts b/src/plugins/fakeNitro/index.tsx
similarity index 89%
rename from src/plugins/fakeNitro/index.ts
rename to src/plugins/fakeNitro/index.tsx
index 560cae381..b9932d291 100644
--- a/src/plugins/fakeNitro/index.ts
+++ b/src/plugins/fakeNitro/index.tsx
@@ -17,14 +17,14 @@
 */
 
 import { addPreEditListener, addPreSendListener, removePreEditListener, removePreSendListener } from "@api/MessageEvents";
-import { definePluginSettings, Settings } from "@api/Settings";
+import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import { ApngBlendOp, ApngDisposeOp, importApngJs } from "@utils/dependencies";
 import { getCurrentGuild } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy, findStoreLazy, proxyLazyWebpack } from "@webpack";
-import { ChannelStore, EmojiStore, FluxDispatcher, lodash, Parser, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
+import { Alerts, ChannelStore, EmojiStore, FluxDispatcher, Forms, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
 import type { Message } from "discord-types/general";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
 import type { ReactElement, ReactNode } from "react";
@@ -51,8 +51,6 @@ const PreloadedUserSettingsActionCreators = proxyLazyWebpack(() => UserSettingsA
 const AppearanceSettingsActionCreators = proxyLazyWebpack(() => searchProtoClassField("appearance", PreloadedUserSettingsActionCreators.ProtoClass));
 const ClientThemeSettingsActionsCreators = proxyLazyWebpack(() => searchProtoClassField("clientThemeSettings", AppearanceSettingsActionCreators));
 
-const USE_EXTERNAL_EMOJIS = 1n << 18n;
-const USE_EXTERNAL_STICKERS = 1n << 37n;
 
 const enum EmojiIntentions {
     REACTION = 0,
@@ -162,8 +160,23 @@ const settings = definePluginSettings({
         description: "Whether to use hyperlinks when sending fake emojis and stickers",
         type: OptionType.BOOLEAN,
         default: true
-    }
-});
+    },
+}).withPrivateSettings<{
+    disableEmbedPermissionCheck: boolean;
+}>();
+
+function hasPermission(channelId: string, permission: bigint) {
+    const channel = ChannelStore.getChannel(channelId);
+
+    if (!channel || channel.isPrivate()) return true;
+
+    return PermissionStore.can(permission, channel);
+}
+
+const hasExternalEmojiPerms = (channelId: string) => hasPermission(channelId, PermissionsBits.USE_EXTERNAL_EMOJIS);
+const hasExternalStickerPerms = (channelId: string) => hasPermission(channelId, PermissionsBits.USE_EXTERNAL_STICKERS);
+const hasEmbedPerms = (channelId: string) => hasPermission(channelId, PermissionsBits.EMBED_LINKS);
+const hasAttachmentPerms = (channelId: string) => hasPermission(channelId, PermissionsBits.ATTACH_FILES);
 
 export default definePlugin({
     name: "FakeNitro",
@@ -696,22 +709,6 @@ export default definePlugin({
         }
     },
 
-    hasPermissionToUseExternalEmojis(channelId: string): boolean {
-        const channel = ChannelStore.getChannel(channelId);
-
-        if (!channel || channel.isDM() || channel.isGroupDM() || channel.isMultiUserDM()) return true;
-
-        return PermissionStore.can(USE_EXTERNAL_EMOJIS, channel);
-    },
-
-    hasPermissionToUseExternalStickers(channelId: string) {
-        const channel = ChannelStore.getChannel(channelId);
-
-        if (!channel || channel.isDM() || channel.isGroupDM() || channel.isMultiUserDM()) return true;
-
-        return PermissionStore.can(USE_EXTERNAL_STICKERS, channel);
-    },
-
     getStickerLink(stickerId: string) {
         return `https://media.discordapp.net/stickers/${stickerId}.png?size=${settings.store.stickerSize}`;
     },
@@ -722,7 +719,7 @@ export default definePlugin({
         const { frames, width, height } = await parseURL(stickerLink);
 
         const gif = GIFEncoder();
-        const resolution = Settings.plugins.FakeNitro.stickerSize;
+        const resolution = settings.store.stickerSize;
 
         const canvas = document.createElement("canvas");
         canvas.width = resolution;
@@ -783,9 +780,38 @@ export default definePlugin({
             return (!origStr[offset] || /\s/.test(origStr[offset])) ? "" : " ";
         }
 
-        this.preSend = addPreSendListener((channelId, messageObj, extra) => {
+        function cannotEmbedNotice() {
+            return new Promise<boolean>(resolve => {
+                Alerts.show({
+                    title: "Hold on!",
+                    body: <div>
+                        <Forms.FormText>
+                            You are trying to send/edit a message that contains a FakeNitro emoji or sticker
+                            , however you do not have permissions to embed links in the current channel.
+                            Are you sure you want to send this message? Your FakeNitro items will appear as a link only.
+                        </Forms.FormText>
+                        <Forms.FormText type={Forms.FormText.Types.DESCRIPTION}>
+                            You can disable this notice in the plugin settings.
+                        </Forms.FormText>
+                    </div>,
+                    confirmText: "Send Anyway",
+                    cancelText: "Cancel",
+                    secondaryConfirmText: "Do not show again",
+                    onConfirm: () => resolve(true),
+                    onCloseCallback: () => setImmediate(() => resolve(false)),
+                    onConfirmSecondary() {
+                        settings.store.disableEmbedPermissionCheck = true;
+                        resolve(true);
+                    }
+                });
+            });
+        }
+
+        this.preSend = addPreSendListener(async (channelId, messageObj, extra) => {
             const { guildId } = this;
 
+            let hasBypass = false;
+
             stickerBypass: {
                 if (!s.enableStickerBypass)
                     break stickerBypass;
@@ -798,7 +824,7 @@ export default definePlugin({
                 if ("pack_id" in sticker)
                     break stickerBypass;
 
-                const canUseStickers = this.canUseStickers && this.hasPermissionToUseExternalStickers(channelId);
+                const canUseStickers = this.canUseStickers && hasExternalStickerPerms(channelId);
                 if (sticker.available !== false && (canUseStickers || sticker.guild_id === guildId))
                     break stickerBypass;
 
@@ -812,9 +838,24 @@ export default definePlugin({
                 }
 
                 if (sticker.format_type === StickerType.APNG) {
-                    this.sendAnimatedSticker(link, sticker.id, channelId);
+                    if (!hasAttachmentPerms(channelId)) {
+                        Alerts.show({
+                            title: "Hold on!",
+                            body: <div>
+                                <Forms.FormText>
+                                    You cannot send this message because it contains an animated FakeNitro sticker,
+                                    and you do not have permissions to attach files in the current channel. Please remove the sticker to proceed.
+                                </Forms.FormText>
+                            </div>
+                        });
+                    } else {
+                        this.sendAnimatedSticker(link, sticker.id, channelId);
+                    }
+
                     return { cancel: true };
                 } else {
+                    hasBypass = true;
+
                     const url = new URL(link);
                     url.searchParams.set("name", sticker.name);
 
@@ -824,13 +865,15 @@ export default definePlugin({
             }
 
             if (s.enableEmojiBypass) {
-                const canUseEmotes = this.canUseEmotes && this.hasPermissionToUseExternalEmojis(channelId);
+                const canUseEmotes = this.canUseEmotes && hasExternalEmojiPerms(channelId);
 
                 for (const emoji of messageObj.validNonShortcutEmojis) {
                     if (!emoji.require_colons) continue;
                     if (emoji.available !== false && canUseEmotes) continue;
                     if (emoji.guildId === guildId && !emoji.animated) continue;
 
+                    hasBypass = true;
+
                     const emojiString = `<${emoji.animated ? "a" : ""}:${emoji.originalName || emoji.name}:${emoji.id}>`;
 
                     const url = new URL(emoji.url);
@@ -843,16 +886,24 @@ export default definePlugin({
                 }
             }
 
+            if (hasBypass && !s.disableEmbedPermissionCheck && !hasEmbedPerms(channelId)) {
+                if (!await cannotEmbedNotice()) {
+                    return { cancel: true };
+                }
+            }
+
             return { cancel: false };
         });
 
-        this.preEdit = addPreEditListener((channelId, __, messageObj) => {
+        this.preEdit = addPreEditListener(async (channelId, __, messageObj) => {
             if (!s.enableEmojiBypass) return;
 
-            const canUseEmotes = this.canUseEmotes && this.hasPermissionToUseExternalEmojis(channelId);
-
             const { guildId } = this;
 
+            let hasBypass = false;
+
+            const canUseEmotes = this.canUseEmotes && hasExternalEmojiPerms(channelId);
+
             messageObj.content = messageObj.content.replace(/(?<!\\)<a?:(?:\w+):(\d+)>/ig, (emojiStr, emojiId, offset, origStr) => {
                 const emoji = EmojiStore.getCustomEmojiById(emojiId);
                 if (emoji == null) return emojiStr;
@@ -860,12 +911,22 @@ export default definePlugin({
                 if (emoji.available !== false && canUseEmotes) return emojiStr;
                 if (emoji.guildId === guildId && !emoji.animated) return emojiStr;
 
+                hasBypass = true;
+
                 const url = new URL(emoji.url);
                 url.searchParams.set("size", s.emojiSize.toString());
                 url.searchParams.set("name", emoji.name);
 
                 return `${getWordBoundary(origStr, offset - 1)}${s.useHyperLinks ? `[${emoji.name}](${url})` : url}${getWordBoundary(origStr, offset + emojiStr.length)}`;
             });
+
+            if (hasBypass && !s.disableEmbedPermissionCheck && !hasEmbedPerms(channelId)) {
+                if (!await cannotEmbedNotice()) {
+                    return { cancel: true };
+                }
+            }
+
+            return { cancel: false };
         });
     },
 
diff --git a/src/webpack/common/types/utils.d.ts b/src/webpack/common/types/utils.d.ts
index 2005581a1..3d1c0eea6 100644
--- a/src/webpack/common/types/utils.d.ts
+++ b/src/webpack/common/types/utils.d.ts
@@ -59,6 +59,7 @@ export interface Alerts {
         onCancel?(): void;
         onConfirm?(): void;
         onConfirmSecondary?(): void;
+        onCloseCallback?(): void;
     }): void;
     /** This is a noop, it does nothing. */
     close(): void;

From 76de8c424e13c60d63d78894c1894a0ab2390e81 Mon Sep 17 00:00:00 2001
From: Lualt <58912038+LualtOfficial@users.noreply.github.com>
Date: Tue, 27 Feb 2024 13:27:37 +0100
Subject: [PATCH 350/632] feat(plugin) FakeNitro: Allow customising hyperlink
 text (#2192)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/fakeNitro/index.tsx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index b9932d291..20125c7d1 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -161,6 +161,11 @@ const settings = definePluginSettings({
         type: OptionType.BOOLEAN,
         default: true
     },
+    hyperLinkText: {
+        description: "What text the hyperlink should use. {{NAME}} will be replaced with the emoji name.",
+        type: OptionType.STRING,
+        default: "{{NAME}}"
+    }
 }).withPrivateSettings<{
     disableEmbedPermissionCheck: boolean;
 }>();
@@ -880,8 +885,10 @@ export default definePlugin({
                     url.searchParams.set("size", s.emojiSize.toString());
                     url.searchParams.set("name", emoji.name);
 
+                    const linkText = s.hyperLinkText.replaceAll("{{NAME}}", emoji.name);
+
                     messageObj.content = messageObj.content.replace(emojiString, (match, offset, origStr) => {
-                        return `${getWordBoundary(origStr, offset - 1)}${s.useHyperLinks ? `[${emoji.name}](${url})` : url}${getWordBoundary(origStr, offset + match.length)}`;
+                        return `${getWordBoundary(origStr, offset - 1)}${s.useHyperLinks ? `[${linkText}](${url})` : url}${getWordBoundary(origStr, offset + match.length)}`;
                     });
                 }
             }
@@ -917,7 +924,9 @@ export default definePlugin({
                 url.searchParams.set("size", s.emojiSize.toString());
                 url.searchParams.set("name", emoji.name);
 
-                return `${getWordBoundary(origStr, offset - 1)}${s.useHyperLinks ? `[${emoji.name}](${url})` : url}${getWordBoundary(origStr, offset + emojiStr.length)}`;
+                const linkText = s.hyperLinkText.replaceAll("{{NAME}}", emoji.name);
+
+                return `${getWordBoundary(origStr, offset - 1)}${s.useHyperLinks ? `[${linkText}](${url})` : url}${getWordBoundary(origStr, offset + emojiStr.length)}`;
             });
 
             if (hasBypass && !s.disableEmbedPermissionCheck && !hasEmbedPerms(channelId)) {

From 1afa185f578dc54bb3a01a7fcc03d6016870971a Mon Sep 17 00:00:00 2001
From: Andrei Neacsu <58575812+prycaustic@users.noreply.github.com>
Date: Tue, 27 Feb 2024 06:30:27 -0600
Subject: [PATCH 351/632] LastfmRichPresence: Add an option to hide the Last.fm
 logo (#2189)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/lastfm/index.tsx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/plugins/lastfm/index.tsx b/src/plugins/lastfm/index.tsx
index 179b8260c..5dfec8a32 100644
--- a/src/plugins/lastfm/index.tsx
+++ b/src/plugins/lastfm/index.tsx
@@ -170,6 +170,11 @@ const settings = definePluginSettings({
             }
         ],
     },
+    showLastFmLogo: {
+        description: "show the Last.fm logo by the album cover",
+        type: OptionType.BOOLEAN,
+        default: true,
+    }
 });
 
 export default definePlugin({
@@ -276,8 +281,10 @@ export default definePlugin({
             {
                 large_image: await getApplicationAsset(largeImage),
                 large_text: trackData.album || undefined,
-                small_image: await getApplicationAsset("lastfm-small"),
-                small_text: "Last.fm",
+                ...(settings.store.showLastFmLogo && {
+                    small_image: await getApplicationAsset("lastfm-small"),
+                    small_text: "Last.fm"
+                }),
             } : {
                 large_image: await getApplicationAsset("lastfm-large"),
                 large_text: trackData.album || undefined,

From 8ccd731aee3a7c797b70a285c6023bcdc8d7d2b1 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 27 Feb 2024 13:41:55 +0100
Subject: [PATCH 352/632] bump to v1.7.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5ffac7ff5..dde55d311 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.6.9",
+    "version": "1.7.0",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From e0166ef1e6f3962c14e7f5b902cb03675919eec3 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 27 Feb 2024 23:42:57 -0300
Subject: [PATCH 353/632] Fix FakeNitro patch and message content patch error

---
 src/plugins/fakeNitro/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 20125c7d1..a864a3a67 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -369,8 +369,8 @@ export default definePlugin({
             predicate: () => settings.store.transformEmojis,
             replacement: {
                 // Add the fake nitro emoji notice
-                match: /(?<=isDiscoverable:\i,emojiComesFromCurrentGuild:\i,.+?}=(\i).+?;)(.*?return )(.{0,1000}\.Messages\.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION.+?)(?=},)/,
-                replace: (_, props, rest, reactNode) => `let{fakeNitroNode}=${props};${rest}$self.addFakeNotice(${FakeNoticeType.Emoji},${reactNode},!!fakeNitroNode?.fake)`
+                match: /(?<=emojiDescription:)(\i)(?<=\1=\i\((\i)\).+?)/,
+                replace: (_, reactNode, props) => `$self.addFakeNotice(${FakeNoticeType.Emoji},${reactNode},!!${props}?.fakeNitroNode?.fake)`
             }
         },
         // Allow using custom app icons
@@ -474,7 +474,7 @@ export default definePlugin({
         if (typeof firstContent === "string") {
             content[0] = firstContent.trimStart();
             content[0] || content.shift();
-        } else if (firstContent?.type === "span") {
+        } else if (typeof firstContent?.props.children === "string") {
             firstContent.props.children = firstContent.props.children.trimStart();
             firstContent.props.children || content.shift();
         }
@@ -484,7 +484,7 @@ export default definePlugin({
         if (typeof lastContent === "string") {
             content[lastIndex] = lastContent.trimEnd();
             content[lastIndex] || content.pop();
-        } else if (lastContent?.type === "span") {
+        } else if (typeof firstContent?.props.children === "string") {
             lastContent.props.children = lastContent.props.children.trimEnd();
             lastContent.props.children || content.pop();
         }

From 7de54a294f0e64c314c7feac087eb4fe6bd03b88 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 27 Feb 2024 23:43:03 -0300
Subject: [PATCH 354/632] Fix NotificationVolume

---
 src/plugins/notificationVolume/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/notificationVolume/index.ts b/src/plugins/notificationVolume/index.ts
index 50eabee73..bc3c7539d 100644
--- a/src/plugins/notificationVolume/index.ts
+++ b/src/plugins/notificationVolume/index.ts
@@ -27,8 +27,8 @@ export default definePlugin({
         {
             find: "_ensureAudio(){",
             replacement: {
-                match: /onloadeddata=\(\)=>\{.\.volume=/,
-                replace: "$&$self.settings.store.notificationVolume/100*"
+                match: /(?=Math\.min\(\i\.\i\.getOutputVolume\(\)\/100)/,
+                replace: "$self.settings.store.notificationVolume/100*"
             },
         },
     ],

From da50c7a19b1755c1827d4a3bb6c4651fe69551c7 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 28 Feb 2024 20:02:37 +0100
Subject: [PATCH 355/632] MemberCount: Also add to server tooltip; refactor
 code

---
 src/plugins/memberCount/MemberCount.tsx       |  66 +++++++++++
 .../memberCount/OnlineMemberCountStore.ts     |  52 +++++++++
 src/plugins/memberCount/index.tsx             | 107 +++++-------------
 src/plugins/memberCount/style.css             |  44 +++++++
 4 files changed, 189 insertions(+), 80 deletions(-)
 create mode 100644 src/plugins/memberCount/MemberCount.tsx
 create mode 100644 src/plugins/memberCount/OnlineMemberCountStore.ts
 create mode 100644 src/plugins/memberCount/style.css

diff --git a/src/plugins/memberCount/MemberCount.tsx b/src/plugins/memberCount/MemberCount.tsx
new file mode 100644
index 000000000..50665353e
--- /dev/null
+++ b/src/plugins/memberCount/MemberCount.tsx
@@ -0,0 +1,66 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { getCurrentChannel } from "@utils/discord";
+import { SelectedChannelStore, Tooltip, useEffect, useStateFromStores } from "@webpack/common";
+
+import { ChannelMemberStore, cl, GuildMemberCountStore, numberFormat } from ".";
+import { OnlineMemberCountStore } from "./OnlineMemberCountStore";
+
+export function MemberCount({ isTooltip, tooltipGuildId }: { isTooltip?: true; tooltipGuildId?: string; }) {
+    const currentChannel = useStateFromStores([SelectedChannelStore], () => getCurrentChannel());
+
+    const guildId = isTooltip ? tooltipGuildId! : currentChannel.guild_id;
+
+    const totalCount = useStateFromStores(
+        [GuildMemberCountStore],
+        () => GuildMemberCountStore.getMemberCount(guildId)
+    );
+
+    let onlineCount = useStateFromStores(
+        [OnlineMemberCountStore],
+        () => OnlineMemberCountStore.getCount(guildId)
+    );
+
+    const { groups } = useStateFromStores(
+        [ChannelMemberStore],
+        () => ChannelMemberStore.getProps(guildId, currentChannel.id)
+    );
+
+    if (!isTooltip && (groups.length >= 1 || groups[0].id !== "unknown")) {
+        onlineCount = groups.reduce((total, curr) => total + (curr.id === "offline" ? 0 : curr.count), 0);
+    }
+
+    useEffect(() => {
+        OnlineMemberCountStore.ensureCount(guildId);
+    }, [guildId]);
+
+    if (totalCount == null)
+        return null;
+
+    const formattedOnlineCount = onlineCount != null ? numberFormat(onlineCount) : "?";
+
+    return (
+        <div className={cl("widget", { tooltip: isTooltip, "member-list": !isTooltip })}>
+            <Tooltip text={`${formattedOnlineCount} online in this channel`} position="bottom">
+                {props => (
+                    <div {...props}>
+                        <span className={cl("online-dot")} />
+                        <span className={cl("online")}>{formattedOnlineCount}</span>
+                    </div>
+                )}
+            </Tooltip>
+            <Tooltip text={`${numberFormat(totalCount)} total server members`} position="bottom">
+                {props => (
+                    <div {...props}>
+                        <span className={cl("total-dot")} />
+                        <span className={cl("total")}>{numberFormat(totalCount)}</span>
+                    </div>
+                )}
+            </Tooltip>
+        </div>
+    );
+}
diff --git a/src/plugins/memberCount/OnlineMemberCountStore.ts b/src/plugins/memberCount/OnlineMemberCountStore.ts
new file mode 100644
index 000000000..8790f5e29
--- /dev/null
+++ b/src/plugins/memberCount/OnlineMemberCountStore.ts
@@ -0,0 +1,52 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { proxyLazy } from "@utils/lazy";
+import { sleep } from "@utils/misc";
+import { Queue } from "@utils/Queue";
+import { Flux, FluxDispatcher, GuildChannelStore, PrivateChannelsStore } from "@webpack/common";
+
+export const OnlineMemberCountStore = proxyLazy(() => {
+    const preloadQueue = new Queue();
+
+    const onlineMemberMap = new Map<string, number>();
+
+    class OnlineMemberCountStore extends Flux.Store {
+        getCount(guildId: string) {
+            return onlineMemberMap.get(guildId);
+        }
+
+        async _ensureCount(guildId: string) {
+            if (onlineMemberMap.has(guildId)) return;
+
+            await PrivateChannelsStore.preload(guildId, GuildChannelStore.getDefaultChannel(guildId).id);
+        }
+
+        ensureCount(guildId: string) {
+            if (onlineMemberMap.has(guildId)) return;
+
+            preloadQueue.push(() =>
+                this._ensureCount(guildId)
+                    .then(
+                        () => sleep(200),
+                        () => sleep(200)
+                    )
+            );
+        }
+    }
+
+    return new OnlineMemberCountStore(FluxDispatcher, {
+        GUILD_MEMBER_LIST_UPDATE({ guildId, groups }: { guildId: string, groups: { count: number; id: string; }[]; }) {
+            onlineMemberMap.set(
+                guildId,
+                groups.reduce((total, curr) => total + (curr.id === "offline" ? 0 : curr.count), 0)
+            );
+        },
+        ONLINE_GUILD_MEMBER_COUNT_UPDATE({ guildId, count }) {
+            onlineMemberMap.set(guildId, count);
+        }
+    });
+});
diff --git a/src/plugins/memberCount/index.tsx b/src/plugins/memberCount/index.tsx
index d9cd548e9..eb4ce372c 100644
--- a/src/plugins/memberCount/index.tsx
+++ b/src/plugins/memberCount/index.tsx
@@ -16,101 +16,48 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import "./style.css";
+
+import { classNameFactory } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { Flex } from "@components/Flex";
 import { Devs } from "@utils/constants";
-import { getCurrentChannel } from "@utils/discord";
 import definePlugin from "@utils/types";
 import { findStoreLazy } from "@webpack";
-import { SelectedChannelStore, Tooltip, useStateFromStores } from "@webpack/common";
 import { FluxStore } from "@webpack/types";
 
-const GuildMemberCountStore = findStoreLazy("GuildMemberCountStore") as FluxStore & { getMemberCount(guildId: string): number | null; };
-const ChannelMemberStore = findStoreLazy("ChannelMemberStore") as FluxStore & {
+import { MemberCount } from "./MemberCount";
+
+export const GuildMemberCountStore = findStoreLazy("GuildMemberCountStore") as FluxStore & { getMemberCount(guildId: string): number | null; };
+export const ChannelMemberStore = findStoreLazy("ChannelMemberStore") as FluxStore & {
     getProps(guildId: string, channelId: string): { groups: { count: number; id: string; }[]; };
 };
 
 const sharedIntlNumberFormat = new Intl.NumberFormat();
-const numberFormat = (value: number) => sharedIntlNumberFormat.format(value);
-
-function MemberCount() {
-    const { id: channelId, guild_id: guildId } = useStateFromStores([SelectedChannelStore], () => getCurrentChannel());
-    const { groups } = useStateFromStores(
-        [ChannelMemberStore],
-        () => ChannelMemberStore.getProps(guildId, channelId)
-    );
-    const total = useStateFromStores(
-        [GuildMemberCountStore],
-        () => GuildMemberCountStore.getMemberCount(guildId)
-    );
-
-    if (total == null)
-        return null;
-
-    const online =
-        (groups.length === 1 && groups[0].id === "unknown")
-            ? 0
-            : groups.reduce((count, curr) => count + (curr.id === "offline" ? 0 : curr.count), 0);
-
-    return (
-        <Flex id="vc-membercount" style={{
-            marginTop: "1em",
-            paddingInline: "1em",
-            justifyContent: "center",
-            alignContent: "center",
-            gap: 0
-        }}>
-            <Tooltip text={`${numberFormat(online)} online in this channel`} position="bottom">
-                {props => (
-                    <div {...props}>
-                        <span
-                            style={{
-                                backgroundColor: "var(--green-360)",
-                                width: "12px",
-                                height: "12px",
-                                borderRadius: "50%",
-                                display: "inline-block",
-                                marginRight: "0.5em"
-                            }}
-                        />
-                        <span style={{ color: "var(--green-360)" }}>{numberFormat(online)}</span>
-                    </div>
-                )}
-            </Tooltip>
-            <Tooltip text={`${numberFormat(total)} total server members`} position="bottom">
-                {props => (
-                    <div {...props}>
-                        <span
-                            style={{
-                                width: "6px",
-                                height: "6px",
-                                borderRadius: "50%",
-                                border: "3px solid var(--primary-400)",
-                                display: "inline-block",
-                                marginRight: "0.5em",
-                                marginLeft: "1em"
-                            }}
-                        />
-                        <span style={{ color: "var(--primary-400)" }}>{numberFormat(total)}</span>
-                    </div>
-                )}
-            </Tooltip>
-        </Flex>
-    );
-}
+export const numberFormat = (value: number) => sharedIntlNumberFormat.format(value);
+export const cl = classNameFactory("vc-membercount-");
 
 export default definePlugin({
     name: "MemberCount",
-    description: "Shows the amount of online & total members in the server member list",
+    description: "Shows the amount of online & total members in the server member list and tooltip",
     authors: [Devs.Ven, Devs.Commandtechno],
 
-    patches: [{
-        find: "{isSidebarVisible:",
-        replacement: {
-            match: /(?<=let\{className:(\i),.+?children):\[(\i\.useMemo[^}]+"aria-multiselectable")/,
-            replace: ":[$1?.startsWith('members')?$self.render():null,$2"
+    patches: [
+        {
+            find: "{isSidebarVisible:",
+            replacement: {
+                match: /(?<=let\{className:(\i),.+?children):\[(\i\.useMemo[^}]+"aria-multiselectable")/,
+                replace: ":[$1?.startsWith('members')?$self.render():null,$2"
+            }
+        },
+        {
+            find: ".invitesDisabledTooltip",
+            replacement: {
+                match: /(?<=\.VIEW_AS_ROLES_MENTIONS_WARNING.{0,100})]/,
+                replace: ",$self.renderTooltip(arguments[0].guild)]"
+            }
         }
-    }],
+    ],
 
-    render: ErrorBoundary.wrap(MemberCount, { noop: true })
+    render: ErrorBoundary.wrap(MemberCount, { noop: true }),
+    renderTooltip: ErrorBoundary.wrap(guild => <MemberCount isTooltip tooltipGuildId={guild.id} />, { noop: true })
 });
diff --git a/src/plugins/memberCount/style.css b/src/plugins/memberCount/style.css
new file mode 100644
index 000000000..f43bff830
--- /dev/null
+++ b/src/plugins/memberCount/style.css
@@ -0,0 +1,44 @@
+.vc-membercount-widget {
+    display: flex;
+    align-content: center;
+
+    --color-online: var(--green-360);
+    --color-total: var(--primary-400);
+}
+
+.vc-membercount-tooltip {
+    margin-top: 0.25em;
+    margin-left: 2px;
+}
+
+.vc-membercount-member-list {
+    justify-content: center;
+    margin-top: 1em;
+    padding-inline: 1em;
+}
+
+.vc-membercount-online {
+    color: var(--color-online);
+}
+
+.vc-membercount-total {
+    color: var(--color-total);
+}
+
+.vc-membercount-online-dot {
+    background-color: var(--color-online);
+    display: inline-block;
+    width: 12px;
+    height: 12px;
+    border-radius: 50%;
+    margin-right: 0.5em;
+}
+
+.vc-membercount-total-dot {
+    display: inline-block;
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    border: 3px solid var(--color-total);
+    margin: 0 0.5em 0 1em;
+}

From 3ebde1aae8d54d96a9548911f4c8ad442092ea82 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 1 Mar 2024 00:18:09 +0100
Subject: [PATCH 356/632] fix some minor bugs

---
 scripts/generateReport.ts       | 3 ++-
 src/plugins/fakeNitro/index.tsx | 4 ++--
 src/webpack/webpack.ts          | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 0a17e8d7e..33b099ef8 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -428,10 +428,11 @@ function runTime(token: string) {
 
                 if (searchType === "findComponent") method = "find";
                 if (searchType === "findExportedComponent") method = "findByProps";
-                if (searchType === "waitFor" || searchType === "waitForComponent" || searchType === "waitForStore") {
+                if (searchType === "waitFor" || searchType === "waitForComponent") {
                     if (typeof args[0] === "string") method = "findByProps";
                     else method = "find";
                 }
+                if (searchType === "waitForStore") method = "findStore";
 
                 try {
                     let result: any;
diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index a864a3a67..1cf1e536f 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -474,7 +474,7 @@ export default definePlugin({
         if (typeof firstContent === "string") {
             content[0] = firstContent.trimStart();
             content[0] || content.shift();
-        } else if (typeof firstContent?.props.children === "string") {
+        } else if (typeof firstContent?.props?.children === "string") {
             firstContent.props.children = firstContent.props.children.trimStart();
             firstContent.props.children || content.shift();
         }
@@ -484,7 +484,7 @@ export default definePlugin({
         if (typeof lastContent === "string") {
             content[lastIndex] = lastContent.trimEnd();
             content[lastIndex] || content.pop();
-        } else if (typeof firstContent?.props.children === "string") {
+        } else if (typeof lastContent?.props?.children === "string") {
             lastContent.props.children = lastContent.props.children.trimEnd();
             lastContent.props.children || content.pop();
         }
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index d65f57fcb..a68890a83 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -83,8 +83,8 @@ export function _initWebpack(instance: typeof window.webpackChunkdiscord_app) {
     return true;
 }
 
+let devToolsOpen = false;
 if (IS_DEV && IS_DISCORD_DESKTOP) {
-    var devToolsOpen = false;
     // At this point in time, DiscordNative has not been exposed yet, so setImmediate is needed
     setTimeout(() => {
         DiscordNative/* just to make sure */?.window.setDevtoolsCallbacks(() => devToolsOpen = true, () => devToolsOpen = false);

From 9179f55bf241453cca020e2d8d7e59929a2028b2 Mon Sep 17 00:00:00 2001
From: "[object Object]" <rohan@bhela.org>
Date: Thu, 29 Feb 2024 16:26:32 -0800
Subject: [PATCH 357/632] fix Vencloud not working on UserScript (#2213)

Co-authored-by: V <vendicated@riseup.net>
---
 browser/GMPolyfill.js                       |  2 +-
 src/components/VencordSettings/CloudTab.tsx |  4 +---
 src/utils/cloud.tsx                         |  2 +-
 src/utils/settingsSync.ts                   | 12 +++++-------
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/browser/GMPolyfill.js b/browser/GMPolyfill.js
index f8801551e..387389ce6 100644
--- a/browser/GMPolyfill.js
+++ b/browser/GMPolyfill.js
@@ -62,7 +62,7 @@ function GM_fetch(url, opt) {
             resp.arrayBuffer = () => blobTo("arrayBuffer", blob);
             resp.text = () => blobTo("text", blob);
             resp.json = async () => JSON.parse(await blobTo("text", blob));
-            resp.headers = new Headers(parseHeaders(resp.responseHeaders));
+            resp.headers = parseHeaders(resp.responseHeaders);
             resp.ok = resp.status >= 200 && resp.status < 300;
             resolve(resp);
         };
diff --git a/src/components/VencordSettings/CloudTab.tsx b/src/components/VencordSettings/CloudTab.tsx
index 0392a451c..080dd8dd9 100644
--- a/src/components/VencordSettings/CloudTab.tsx
+++ b/src/components/VencordSettings/CloudTab.tsx
@@ -39,9 +39,7 @@ function validateUrl(url: string) {
 async function eraseAllData() {
     const res = await fetch(new URL("/v1/", getCloudUrl()), {
         method: "DELETE",
-        headers: new Headers({
-            Authorization: await getCloudAuth()
-        })
+        headers: { Authorization: await getCloudAuth() }
     });
 
     if (!res.ok) {
diff --git a/src/utils/cloud.tsx b/src/utils/cloud.tsx
index f56c78dc5..508b1c7ef 100644
--- a/src/utils/cloud.tsx
+++ b/src/utils/cloud.tsx
@@ -106,7 +106,7 @@ export async function authorizeCloud() {
 
             try {
                 const res = await fetch(location, {
-                    headers: new Headers({ Accept: "application/json" })
+                    headers: { Accept: "application/json" }
                 });
                 const { secret } = await res.json();
                 if (secret) {
diff --git a/src/utils/settingsSync.ts b/src/utils/settingsSync.ts
index ec32e2b1e..9a0f260af 100644
--- a/src/utils/settingsSync.ts
+++ b/src/utils/settingsSync.ts
@@ -118,10 +118,10 @@ export async function putCloudSettings(manual?: boolean) {
     try {
         const res = await fetch(new URL("/v1/settings", getCloudUrl()), {
             method: "PUT",
-            headers: new Headers({
+            headers: {
                 Authorization: await getCloudAuth(),
                 "Content-Type": "application/octet-stream"
-            }),
+            },
             body: deflateSync(new TextEncoder().encode(settings))
         });
 
@@ -162,11 +162,11 @@ export async function getCloudSettings(shouldNotify = true, force = false) {
     try {
         const res = await fetch(new URL("/v1/settings", getCloudUrl()), {
             method: "GET",
-            headers: new Headers({
+            headers: {
                 Authorization: await getCloudAuth(),
                 Accept: "application/octet-stream",
                 "If-None-Match": Settings.cloud.settingsSyncVersion.toString()
-            }),
+            },
         });
 
         if (res.status === 404) {
@@ -251,9 +251,7 @@ export async function deleteCloudSettings() {
     try {
         const res = await fetch(new URL("/v1/settings", getCloudUrl()), {
             method: "DELETE",
-            headers: new Headers({
-                Authorization: await getCloudAuth()
-            }),
+            headers: { Authorization: await getCloudAuth() },
         });
 
         if (!res.ok) {

From 1a1156e1ed73f71a79cbb8444990928731dbfb44 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 1 Mar 2024 01:09:55 -0300
Subject: [PATCH 358/632] Add more settings to IgnoreActivities (#2153)

---
 src/plugins/ignoreActivities/index.tsx | 148 +++++++++++++++++++++++--
 1 file changed, 138 insertions(+), 10 deletions(-)

diff --git a/src/plugins/ignoreActivities/index.tsx b/src/plugins/ignoreActivities/index.tsx
index 4e747f363..c04ce1c56 100644
--- a/src/plugins/ignoreActivities/index.tsx
+++ b/src/plugins/ignoreActivities/index.tsx
@@ -5,12 +5,14 @@
  */
 
 import * as DataStore from "@api/DataStore";
-import { definePluginSettings } from "@api/Settings";
+import { definePluginSettings, Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
+import { Flex } from "@components/Flex";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import { Margins } from "@utils/margins";
+import definePlugin, { OptionType } from "@utils/types";
 import { findStoreLazy } from "@webpack";
-import { StatusSettingsStores, Tooltip } from "webpack/common";
+import { Button, Forms, showToast, StatusSettingsStores, TextInput, Toasts, Tooltip, useEffect, useState } from "webpack/common";
 
 const enum ActivitiesTypes {
     Game,
@@ -69,7 +71,113 @@ function handleActivityToggle(e: React.MouseEvent<HTMLButtonElement, MouseEvent>
     StatusSettingsStores.ShowCurrentGame.updateSetting(old => old);
 }
 
-const settings = definePluginSettings({}).withPrivateSettings<{
+function ImportCustomRPCComponent() {
+    return (
+        <Flex flexDirection="column">
+            <Forms.FormText type={Forms.FormText.Types.DESCRIPTION}>Import the application id of the CustomRPC plugin to the allowed list</Forms.FormText>
+            <div>
+                <Button
+                    onClick={() => {
+                        const id = Settings.plugins.CustomRPC?.appID as string | undefined;
+                        if (!id) {
+                            return showToast("CustomRPC application ID is not set.", Toasts.Type.FAILURE);
+                        }
+
+                        const isAlreadyAdded = allowedIdsPushID?.(id);
+                        if (isAlreadyAdded) {
+                            showToast("CustomRPC application ID is already added.", Toasts.Type.FAILURE);
+                        }
+                    }}
+                >
+                    Import CustomRPC ID
+                </Button>
+            </div>
+        </Flex>
+    );
+}
+
+let allowedIdsPushID: ((id: string) => boolean) | null = null;
+
+function AllowedIdsComponent(props: { setValue: (value: string) => void; }) {
+    const [allowedIds, setAllowedIds] = useState<string>(settings.store.allowedIds ?? "");
+
+    allowedIdsPushID = (id: string) => {
+        const currentIds = new Set(allowedIds.split(",").map(id => id.trim()).filter(Boolean));
+
+        const isAlreadyAdded = currentIds.has(id) || (currentIds.add(id), false);
+
+        const ids = Array.from(currentIds).join(", ");
+        setAllowedIds(ids);
+        props.setValue(ids);
+
+        return isAlreadyAdded;
+    };
+
+    useEffect(() => () => {
+        allowedIdsPushID = null;
+    }, []);
+
+    function handleChange(newValue: string) {
+        setAllowedIds(newValue);
+        props.setValue(newValue);
+    }
+
+    return (
+        <Forms.FormSection>
+            <Forms.FormTitle tag="h3">Allowed List</Forms.FormTitle>
+            <Forms.FormText className={Margins.bottom8} type={Forms.FormText.Types.DESCRIPTION}>Comma separated list of activity IDs to allow (Useful for allowing RPC activities and CustomRPC)</Forms.FormText>
+            <TextInput
+                type="text"
+                value={allowedIds}
+                onChange={handleChange}
+                placeholder="235834946571337729, 343383572805058560"
+            />
+        </Forms.FormSection>
+    );
+}
+
+const settings = definePluginSettings({
+    importCustomRPC: {
+        type: OptionType.COMPONENT,
+        description: "",
+        component: () => <ImportCustomRPCComponent />
+    },
+    allowedIds: {
+        type: OptionType.COMPONENT,
+        description: "",
+        default: "",
+        onChange(newValue: string) {
+            const ids = new Set(newValue.split(",").map(id => id.trim()).filter(Boolean));
+            settings.store.allowedIds = Array.from(ids).join(", ");
+        },
+        component: props => <AllowedIdsComponent setValue={props.setValue} />
+    },
+    ignorePlaying: {
+        type: OptionType.BOOLEAN,
+        description: "Ignore all playing activities (These are usually game and RPC activities)",
+        default: false
+    },
+    ignoreStreaming: {
+        type: OptionType.BOOLEAN,
+        description: "Ignore all streaming activities",
+        default: false
+    },
+    ignoreListening: {
+        type: OptionType.BOOLEAN,
+        description: "Ignore all listening activities (These are usually spotify activities)",
+        default: false
+    },
+    ignoreWatching: {
+        type: OptionType.BOOLEAN,
+        description: "Ignore all watching activities",
+        default: false
+    },
+    ignoreCompeting: {
+        type: OptionType.BOOLEAN,
+        description: "Ignore all competing activities (These are normally special game activities)",
+        default: false
+    }
+}).withPrivateSettings<{
     ignoredActivities: IgnoredActivity[];
 }>();
 
@@ -77,10 +185,26 @@ function getIgnoredActivities() {
     return settings.store.ignoredActivities ??= [];
 }
 
+function isActivityTypeIgnored(type: number, id?: string) {
+    if (id && settings.store.allowedIds.includes(id)) {
+        return false;
+    }
+
+    switch (type) {
+        case 0: return settings.store.ignorePlaying;
+        case 1: return settings.store.ignoreStreaming;
+        case 2: return settings.store.ignoreListening;
+        case 3: return settings.store.ignoreWatching;
+        case 5: return settings.store.ignoreCompeting;
+    }
+
+    return false;
+}
+
 export default definePlugin({
     name: "IgnoreActivities",
     authors: [Devs.Nuckyz],
-    description: "Ignore activities from showing up on your status ONLY. You can configure which ones are ignored from the Registered Games and Activities tabs.",
+    description: "Ignore activities from showing up on your status ONLY. You can configure which ones are specifically ignored from the Registered Games and Activities tabs, or use the general settings below.",
 
     settings,
 
@@ -141,13 +265,17 @@ export default definePlugin({
     },
 
     isActivityNotIgnored(props: { type: number; application_id?: string; name?: string; }) {
-        if (props.type === 0 || props.type === 3) {
-            if (props.application_id != null) return !getIgnoredActivities().some(activity => activity.id === props.application_id);
-            else {
-                const exePath = RunningGameStore.getRunningGames().find(game => game.name === props.name)?.exePath;
-                if (exePath) return !getIgnoredActivities().some(activity => activity.id === exePath);
+        if (isActivityTypeIgnored(props.type, props.application_id)) return false;
+
+        if (props.application_id != null) {
+            return !getIgnoredActivities().some(activity => activity.id === props.application_id) || settings.store.allowedIds.includes(props.application_id);
+        } else {
+            const exePath = RunningGameStore.getRunningGames().find(game => game.name === props.name)?.exePath;
+            if (exePath) {
+                return !getIgnoredActivities().some(activity => activity.id === exePath);
             }
         }
+
         return true;
     },
 

From 806960f1c640822e190e2c7f355bda38d596601b Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 29 Feb 2024 23:15:19 -0300
Subject: [PATCH 359/632] ClientTheme: do not use lodash on start method

---
 src/plugins/clientTheme/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/clientTheme/index.tsx b/src/plugins/clientTheme/index.tsx
index 5d8cd4dc0..4e07daf42 100644
--- a/src/plugins/clientTheme/index.tsx
+++ b/src/plugins/clientTheme/index.tsx
@@ -12,7 +12,7 @@ import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
 import definePlugin, { OptionType, StartAt } from "@utils/types";
 import { findByPropsLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack";
-import { Button, Forms, lodash as _, useStateFromStores } from "@webpack/common";
+import { Button, Forms, useStateFromStores } from "@webpack/common";
 
 const ColorPicker = findComponentByCodeLazy(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)");
 
@@ -200,8 +200,8 @@ function captureOne(str, regex) {
     return (result === null) ? null : result[1];
 }
 
-function mapReject(arr, mapFunc, rejectFunc = _.isNull) {
-    return _.reject(arr.map(mapFunc), rejectFunc);
+function mapReject(arr, mapFunc) {
+    return arr.map(mapFunc).filter(Boolean);
 }
 
 function updateColorVars(color: string) {

From 553a48b6ce50a107e36e16f9914e723717b82c96 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 1 Mar 2024 01:20:12 -0300
Subject: [PATCH 360/632] FakeNitro: Fix hyperlink text setting for stickers

---
 src/plugins/fakeNitro/index.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 1cf1e536f..5d662feed 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -162,7 +162,7 @@ const settings = definePluginSettings({
         default: true
     },
     hyperLinkText: {
-        description: "What text the hyperlink should use. {{NAME}} will be replaced with the emoji name.",
+        description: "What text the hyperlink should use. {{NAME}} will be replaced with the emoji/sticker name.",
         type: OptionType.STRING,
         default: "{{NAME}}"
     }
@@ -864,7 +864,9 @@ export default definePlugin({
                     const url = new URL(link);
                     url.searchParams.set("name", sticker.name);
 
-                    messageObj.content += `${getWordBoundary(messageObj.content, messageObj.content.length - 1)}${s.useHyperLinks ? `[${sticker.name}](${url})` : url}`;
+                    const linkText = s.hyperLinkText.replaceAll("{{NAME}}", sticker.name);
+
+                    messageObj.content += `${getWordBoundary(messageObj.content, messageObj.content.length - 1)}${s.useHyperLinks ? `[${linkText}](${url})` : url}`;
                     extra.stickers!.length = 0;
                 }
             }

From 23ff82fa627807fcbcdea03e88b3f21f65d007ca Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 1 Mar 2024 05:33:20 -0300
Subject: [PATCH 361/632] FakeNitro: Remove extra space in modal

---
 src/plugins/fakeNitro/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 5d662feed..8cf2492a8 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -791,8 +791,8 @@ export default definePlugin({
                     title: "Hold on!",
                     body: <div>
                         <Forms.FormText>
-                            You are trying to send/edit a message that contains a FakeNitro emoji or sticker
-                            , however you do not have permissions to embed links in the current channel.
+                            You are trying to send/edit a message that contains a FakeNitro emoji or sticker,
+                            however you do not have permissions to embed links in the current channel.
                             Are you sure you want to send this message? Your FakeNitro items will appear as a link only.
                         </Forms.FormText>
                         <Forms.FormText type={Forms.FormText.Types.DESCRIPTION}>

From 4f0c0a12dc1832fbff3a71e05b0eb503e6b9c9c2 Mon Sep 17 00:00:00 2001
From: dolfies <jeyalfie47@gmail.com>
Date: Tue, 5 Mar 2024 17:38:49 -0500
Subject: [PATCH 362/632] feat(plugin): ResurrectHome (#2232)

---
 src/plugins/resurrectHome/README.md |   5 ++
 src/plugins/resurrectHome/index.tsx | 125 ++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)
 create mode 100644 src/plugins/resurrectHome/README.md
 create mode 100644 src/plugins/resurrectHome/index.tsx

diff --git a/src/plugins/resurrectHome/README.md b/src/plugins/resurrectHome/README.md
new file mode 100644
index 000000000..215ef816c
--- /dev/null
+++ b/src/plugins/resurrectHome/README.md
@@ -0,0 +1,5 @@
+# ResurrectHome
+
+Brings back the phased out [Server Home](https://support.discord.com/hc/en-us/articles/6156116949911-Server-Home-Beta) feature!
+
+![](https://private-user-images.githubusercontent.com/47677887/309572891-a9ee7354-9e5e-4b81-8faf-304d9c44f512.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MDk0OTE5MTIsIm5iZiI6MTcwOTQ5MTYxMiwicGF0aCI6Ii80NzY3Nzg4Ny8zMDk1NzI4OTEtYTllZTczNTQtOWU1ZS00YjgxLThmYWYtMzA0ZDljNDRmNTEyLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDAzMDMlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwMzAzVDE4NDY1MlomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTBhYzUxMWY1MzQxNTA4NDE1MWU0YjAxNzM1NzI1YWJkMTNiZmNkNjRmYTRkZDg1ZDE5NzdkMjM0MGVjMDA0OWQmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.TPYWPRWHTJstfviT9HOaBWFkbBhokyxiDC-gOVL2dqs)
diff --git a/src/plugins/resurrectHome/index.tsx b/src/plugins/resurrectHome/index.tsx
new file mode 100644
index 000000000..91ed87a02
--- /dev/null
+++ b/src/plugins/resurrectHome/index.tsx
@@ -0,0 +1,125 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { ContextMenuApi, Menu } from "@webpack/common";
+
+const settings = definePluginSettings({
+    forceServerHome: {
+        type: OptionType.BOOLEAN,
+        description: "Force the Server Guide to be the Server Home tab when it is enabled.",
+        default: false
+    }
+});
+
+const contextMenuPatch: NavContextMenuPatchCallback = (children, props) => () => {
+    if (!props?.guild) return;
+
+    const group = findGroupChildrenByChildId("hide-muted-channels", children);
+
+    group?.unshift(
+        <Menu.MenuCheckboxItem
+            key="force-server-home"
+            id="force-server-home"
+            label="Force Server Home"
+            checked={settings.store.forceServerHome}
+            action={() => {
+                settings.store.forceServerHome = !settings.store.forceServerHome;
+                ContextMenuApi.closeContextMenu();
+            }}
+        />
+
+    );
+};
+
+export default definePlugin({
+    name: "ResurrectHome",
+    description: "Re-enables the Server Home tab when there isn't a Server Guide. Also has an option to force the Server Home over the Server Guide, which is accessible through right-clicking the Server Guide.",
+    authors: [Devs.Dolfies, Devs.Nuckyz],
+    settings,
+
+    patches: [
+        // Force home deprecation override
+        {
+            find: "GuildFeatures.GUILD_HOME_DEPRECATION_OVERRIDE",
+            all: true,
+            replacement: [
+                {
+                    match: /\i\.hasFeature\(\i\.GuildFeatures\.GUILD_HOME_DEPRECATION_OVERRIDE\)/g,
+                    replace: "true"
+                }
+            ],
+        },
+        // Disable feedback prompts
+        {
+            find: "GuildHomeFeedbackExperiment.definition.id",
+            replacement: [
+                {
+                    match: /return{showFeedback:\i,setOnDismissedFeedback:(\i)}/,
+                    replace: "return{showFeedback:false,setOnDismissedFeedback:$1}"
+                }
+            ]
+        },
+        // This feature was never finished, so the patch is disabled
+
+        // Enable guild feed render mode selector
+        // {
+        //     find: "2022-01_home_feed_toggle",
+        //     replacement: [
+        //         {
+        //             match: /showSelector:!1/,
+        //             replace: "showSelector:true"
+        //         }
+        //     ]
+        // },
+
+        // Fix focusMessage clearing previously cached messages and causing a loop when fetching messages around home messages
+        {
+            find: '"MessageActionCreators"',
+            replacement: {
+                match: /(?<=focusMessage\(\i\){.+?)(?=focus:{messageId:(\i)})/,
+                replace: "before:$1,"
+            }
+        },
+        // Force Server Home instead of Server Guide
+        {
+            find: "61eef9_2",
+            replacement: {
+                match: /(?<=getMutableGuildChannelsForGuild\(\i\)\);)(?=if\(null==\i\|\|)/,
+                replace: "if($self.useForceServerHome())return false;"
+            }
+        }
+    ],
+
+    start() {
+        addContextMenuPatch("guild-context", contextMenuPatch);
+    },
+
+    stop() {
+        removeContextMenuPatch("guild-context", contextMenuPatch);
+    },
+
+    useForceServerHome() {
+        const { forceServerHome } = settings.use(["forceServerHome"]);
+
+        return forceServerHome;
+    }
+});

From 612fdf8952c8b3ad80e16552a146088deadecb53 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 6 Mar 2024 07:11:14 -0300
Subject: [PATCH 363/632] FakeNitro: Fix trimming wrong content

---
 src/plugins/fakeNitro/index.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 8cf2492a8..68560817c 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -585,13 +585,15 @@ export default definePlugin({
             for (const [index, child] of children.entries()) children[index] = modifyChild(child);
 
             children = this.clearEmptyArrayItems(children);
-            this.trimContent(children);
 
             return children;
         };
 
         try {
-            return modifyChildren(lodash.cloneDeep(content));
+            const newContent = modifyChildren(lodash.cloneDeep(content));
+            this.trimContent(newContent);
+
+            return newContent;
         } catch (err) {
             new Logger("FakeNitro").error(err);
             return content;

From 42a9fa2d47d2e0d0e4233436086e93f0b3dcb1af Mon Sep 17 00:00:00 2001
From: Kyuuhachi <1547062+Kyuuhachi@users.noreply.github.com>
Date: Thu, 7 Mar 2024 11:06:24 +0100
Subject: [PATCH 364/632] Refactor ContextMenuAPI (#2236)

---
 src/api/ContextMenu.ts                    | 53 ++++++++++++++++-------
 src/plugins/_api/contextMenu.ts           |  6 +--
 src/plugins/_core/settings.tsx            | 12 ++---
 src/plugins/biggerStreamPreview/index.tsx | 14 +++---
 src/plugins/copyUserURLs/index.tsx        | 15 +++----
 src/plugins/emoteCloner/index.tsx         | 18 +++-----
 src/plugins/imageZoom/index.tsx           | 23 +++++-----
 src/plugins/index.ts                      | 17 +++++++-
 src/plugins/messageLogger/index.tsx       | 13 +++---
 src/plugins/permissionsViewer/index.tsx   | 27 ++++--------
 src/plugins/pinDms/contextMenus.tsx       | 19 +++-----
 src/plugins/pinDms/index.tsx              |  6 +--
 src/plugins/resurrectHome/index.tsx       | 52 ++++++++++------------
 src/plugins/reverseImageSearch/index.tsx  | 18 +++-----
 src/plugins/reviewDB/index.tsx            | 13 +++---
 src/plugins/searchReply/index.tsx         | 19 ++++----
 src/plugins/serverProfile/index.tsx       | 14 +++---
 src/plugins/translate/index.tsx           |  9 ++--
 src/plugins/unsuppressEmbeds/index.tsx    | 15 +++----
 src/plugins/vencordToolbox/index.tsx      |  9 ++--
 src/plugins/viewIcons/index.tsx           | 17 +++-----
 src/plugins/viewRaw/index.tsx             | 22 ++++------
 src/plugins/voiceMessages/index.tsx       | 45 +++++++++----------
 src/utils/constants.ts                    |  4 ++
 src/utils/types.ts                        |  5 +++
 25 files changed, 220 insertions(+), 245 deletions(-)

diff --git a/src/api/ContextMenu.ts b/src/api/ContextMenu.ts
index d66d98c4f..fdd4facf4 100644
--- a/src/api/ContextMenu.ts
+++ b/src/api/ContextMenu.ts
@@ -17,22 +17,20 @@
 */
 
 import { Logger } from "@utils/Logger";
+import { Menu, React } from "@webpack/common";
 import type { ReactElement } from "react";
 
-type ContextMenuPatchCallbackReturn = (() => void) | void;
 /**
  * @param children The rendered context menu elements
  * @param args Any arguments passed into making the context menu, like the guild, channel, user or message for example
- * @returns A callback which is only ran once used to modify the context menu elements (Use to avoid duplicates)
  */
-export type NavContextMenuPatchCallback = (children: Array<ReactElement | null>, ...args: Array<any>) => ContextMenuPatchCallbackReturn;
+export type NavContextMenuPatchCallback = (children: Array<ReactElement | null>, ...args: Array<any>) => void;
 /**
  * @param navId The navId of the context menu being patched
  * @param children The rendered context menu elements
  * @param args Any arguments passed into making the context menu, like the guild, channel, user or message for example
- * @returns A callback which is only ran once used to modify the context menu elements (Use to avoid duplicates)
  */
-export type GlobalContextMenuPatchCallback = (navId: string, children: Array<ReactElement | null>, ...args: Array<any>) => ContextMenuPatchCallbackReturn;
+export type GlobalContextMenuPatchCallback = (navId: string, children: Array<ReactElement | null>, ...args: Array<any>) => void;
 
 const ContextMenuLogger = new Logger("ContextMenu");
 
@@ -93,14 +91,19 @@ export function removeGlobalContextMenuPatch(patch: GlobalContextMenuPatchCallba
  * @param id The id of the child. If an array is specified, all ids will be tried
  * @param children The context menu children
  */
-export function findGroupChildrenByChildId(id: string | string[], children: Array<ReactElement | null>, _itemsArray?: Array<ReactElement | null>): Array<ReactElement | null> | null {
+export function findGroupChildrenByChildId(id: string | string[], children: Array<ReactElement | null>): Array<ReactElement | null> | null {
     for (const child of children) {
         if (child == null) continue;
 
+        if (Array.isArray(child)) {
+            const found = findGroupChildrenByChildId(id, child);
+            if (found !== null) return found;
+        }
+
         if (
             (Array.isArray(id) && id.some(id => child.props?.id === id))
             || child.props?.id === id
-        ) return _itemsArray ?? null;
+        ) return children;
 
         let nextChildren = child.props?.children;
         if (nextChildren) {
@@ -109,7 +112,7 @@ export function findGroupChildrenByChildId(id: string | string[], children: Arra
                 child.props.children = nextChildren;
             }
 
-            const found = findGroupChildrenByChildId(id, nextChildren, nextChildren);
+            const found = findGroupChildrenByChildId(id, nextChildren);
             if (found !== null) return found;
         }
     }
@@ -126,9 +129,12 @@ interface ContextMenuProps {
     onClose: (callback: (...args: Array<any>) => any) => void;
 }
 
-const patchedMenus = new WeakSet();
+export function _usePatchContextMenu(props: ContextMenuProps) {
+    props = {
+        ...props,
+        children: cloneMenuChildren(props.children),
+    };
 
-export function _patchContextMenu(props: ContextMenuProps) {
     props.contextMenuApiArguments ??= [];
     const contextMenuPatches = navPatches.get(props.navId);
 
@@ -137,8 +143,7 @@ export function _patchContextMenu(props: ContextMenuProps) {
     if (contextMenuPatches) {
         for (const patch of contextMenuPatches) {
             try {
-                const callback = patch(props.children, ...props.contextMenuApiArguments);
-                if (!patchedMenus.has(props)) callback?.();
+                patch(props.children, ...props.contextMenuApiArguments);
             } catch (err) {
                 ContextMenuLogger.error(`Patch for ${props.navId} errored,`, err);
             }
@@ -147,12 +152,30 @@ export function _patchContextMenu(props: ContextMenuProps) {
 
     for (const patch of globalPatches) {
         try {
-            const callback = patch(props.navId, props.children, ...props.contextMenuApiArguments);
-            if (!patchedMenus.has(props)) callback?.();
+            patch(props.navId, props.children, ...props.contextMenuApiArguments);
         } catch (err) {
             ContextMenuLogger.error("Global patch errored,", err);
         }
     }
 
-    patchedMenus.add(props);
+    return props;
+}
+
+function cloneMenuChildren(obj: ReactElement | Array<ReactElement | null> | null) {
+    if (Array.isArray(obj)) {
+        return obj.map(cloneMenuChildren);
+    }
+
+    if (React.isValidElement(obj)) {
+        obj = React.cloneElement(obj);
+
+        if (
+            obj?.props?.children &&
+            (obj.type !== Menu.MenuControlItem || obj.type === Menu.MenuControlItem && obj.props.control != null)
+        ) {
+            obj.props.children = cloneMenuChildren(obj.props.children);
+        }
+    }
+
+    return obj;
 }
diff --git a/src/plugins/_api/contextMenu.ts b/src/plugins/_api/contextMenu.ts
index 55fdf3eae..01619546d 100644
--- a/src/plugins/_api/contextMenu.ts
+++ b/src/plugins/_api/contextMenu.ts
@@ -22,15 +22,15 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "ContextMenuAPI",
     description: "API for adding/removing items to/from context menus.",
-    authors: [Devs.Nuckyz, Devs.Ven],
+    authors: [Devs.Nuckyz, Devs.Ven, Devs.Kyuuhachi],
     required: true,
 
     patches: [
         {
             find: "♫ (つ｡◕‿‿◕｡)つ ♪",
             replacement: {
-                match: /let{navId:/,
-                replace: "Vencord.Api.ContextMenu._patchContextMenu(arguments[0]);$&"
+                match: /(?=let{navId:)(?<=function \i\((\i)\).+?)/,
+                replace: "$1=Vencord.Api.ContextMenu._usePatchContextMenu($1);"
             }
         },
         {
diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index 6f43b76a8..01220eb4e 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addContextMenuPatch } from "@api/ContextMenu";
+import { findGroupChildrenByChildId } from "@api/ContextMenu";
 import { Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
@@ -30,21 +30,21 @@ export default definePlugin({
     authors: [Devs.Ven, Devs.Megu],
     required: true,
 
-    start() {
+    contextMenus: {
         // The settings shortcuts in the user settings cog context menu
         // read the elements from a hardcoded map which for obvious reason
         // doesn't contain our sections. This patches the actions of our
         // sections to manually use SettingsRouter (which only works on desktop
         // but the context menu is usually not available on mobile anyway)
-        addContextMenuPatch("user-settings-cog", children => () => {
-            const section = children.find(c => Array.isArray(c) && c.some(it => it?.props?.id === "VencordSettings")) as any;
+        "user-settings-cog"(children) {
+            const section = findGroupChildrenByChildId("VencordSettings", children);
             section?.forEach(c => {
                 const id = c?.props?.id;
                 if (id?.startsWith("Vencord") || id?.startsWith("Vesktop")) {
-                    c.props.action = () => SettingsRouter.open(id);
+                    c!.props.action = () => SettingsRouter.open(id);
                 }
             });
-        });
+        }
     },
 
     patches: [{
diff --git a/src/plugins/biggerStreamPreview/index.tsx b/src/plugins/biggerStreamPreview/index.tsx
index 40bbe30a8..8cca912bc 100644
--- a/src/plugins/biggerStreamPreview/index.tsx
+++ b/src/plugins/biggerStreamPreview/index.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { ScreenshareIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { openImageModal } from "@utils/discord";
@@ -60,7 +60,7 @@ export const handleViewPreview = async ({ guildId, channelId, ownerId }: Applica
     openImageModal(previewUrl);
 };
 
-export const addViewStreamContext: NavContextMenuPatchCallback = (children, { userId }: { userId: string | bigint; }) => () => {
+export const addViewStreamContext: NavContextMenuPatchCallback = (children, { userId }: { userId: string | bigint; }) => {
     const stream = ApplicationStreamingStore.getAnyStreamForUser(userId);
     if (!stream) return;
 
@@ -89,12 +89,8 @@ export default definePlugin({
     name: "BiggerStreamPreview",
     description: "This plugin allows you to enlarge stream previews",
     authors: [Devs.phil],
-    start: () => {
-        addContextMenuPatch("user-context", userContextPatch);
-        addContextMenuPatch("stream-context", streamContextPatch);
-    },
-    stop: () => {
-        removeContextMenuPatch("user-context", userContextPatch);
-        removeContextMenuPatch("stream-context", streamContextPatch);
+    contextMenus: {
+        "user-context": userContextPatch,
+        "stream-context": streamContextPatch
     }
 });
diff --git a/src/plugins/copyUserURLs/index.tsx b/src/plugins/copyUserURLs/index.tsx
index 9f69674cf..7af8502db 100644
--- a/src/plugins/copyUserURLs/index.tsx
+++ b/src/plugins/copyUserURLs/index.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { LinkIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
@@ -29,7 +29,7 @@ interface UserContextProps {
     user: User;
 }
 
-const UserContextMenuPatch: NavContextMenuPatchCallback = (children, { user }: UserContextProps) => () => {
+const UserContextMenuPatch: NavContextMenuPatchCallback = (children, { user }: UserContextProps) => {
     if (!user) return;
 
     children.push(
@@ -46,12 +46,7 @@ export default definePlugin({
     name: "CopyUserURLs",
     authors: [Devs.castdrian],
     description: "Adds a 'Copy User URL' option to the user context menu.",
-
-    start() {
-        addContextMenuPatch("user-context", UserContextMenuPatch);
-    },
-
-    stop() {
-        removeContextMenuPatch("user-context", UserContextMenuPatch);
-    },
+    contextMenus: {
+        "user-context": UserContextMenuPatch
+    }
 });
diff --git a/src/plugins/emoteCloner/index.tsx b/src/plugins/emoteCloner/index.tsx
index 219ce435f..b25e1be27 100644
--- a/src/plugins/emoteCloner/index.tsx
+++ b/src/plugins/emoteCloner/index.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { CheckedTextInput } from "@components/CheckedTextInput";
 import { Devs } from "@utils/constants";
 import { Logger } from "@utils/Logger";
@@ -312,7 +312,7 @@ function isGifUrl(url: string) {
     return new URL(url).pathname.endsWith(".gif");
 }
 
-const messageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => () => {
+const messageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => {
     const { favoriteableId, itemHref, itemSrc, favoriteableType } = props ?? {};
 
     if (!favoriteableId) return;
@@ -341,7 +341,7 @@ const messageContextMenuPatch: NavContextMenuPatchCallback = (children, props) =
         findGroupChildrenByChildId("copy-link", children)?.push(menuItem);
 };
 
-const expressionPickerPatch: NavContextMenuPatchCallback = (children, props: { target: HTMLElement; }) => () => {
+const expressionPickerPatch: NavContextMenuPatchCallback = (children, props: { target: HTMLElement; }) => {
     const { id, name, type } = props?.target?.dataset ?? {};
     if (!id) return;
 
@@ -363,14 +363,8 @@ export default definePlugin({
     description: "Allows you to clone Emotes & Stickers to your own server (right click them)",
     tags: ["StickerCloner"],
     authors: [Devs.Ven, Devs.Nuckyz],
-
-    start() {
-        addContextMenuPatch("message", messageContextMenuPatch);
-        addContextMenuPatch("expression-picker", expressionPickerPatch);
-    },
-
-    stop() {
-        removeContextMenuPatch("message", messageContextMenuPatch);
-        removeContextMenuPatch("expression-picker", expressionPickerPatch);
+    contextMenus: {
+        "message": messageContextMenuPatch,
+        "expression-picker": expressionPickerPatch
     }
 });
diff --git a/src/plugins/imageZoom/index.tsx b/src/plugins/imageZoom/index.tsx
index 8d8b6726d..048c0ed5b 100644
--- a/src/plugins/imageZoom/index.tsx
+++ b/src/plugins/imageZoom/index.tsx
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { definePluginSettings } from "@api/Settings";
 import { disableStyle, enableStyle } from "@api/Styles";
 import { makeRange } from "@components/PluginSettings/components";
 import { Devs } from "@utils/constants";
 import { debounce } from "@utils/debounce";
 import definePlugin, { OptionType } from "@utils/types";
-import { ContextMenuApi, Menu, React, ReactDOM } from "@webpack/common";
+import { Menu, React, ReactDOM } from "@webpack/common";
 import type { Root } from "react-dom/client";
 
 import { Magnifier, MagnifierProps } from "./components/Magnifier";
@@ -80,25 +80,25 @@ export const settings = definePluginSettings({
 });
 
 
-const imageContextMenuPatch: NavContextMenuPatchCallback = children => () => {
+const imageContextMenuPatch: NavContextMenuPatchCallback = children => {
+    const { square, nearestNeighbour } = settings.use(["square", "nearestNeighbour"]);
+
     children.push(
         <Menu.MenuGroup id="image-zoom">
             <Menu.MenuCheckboxItem
                 id="vc-square"
                 label="Square Lens"
-                checked={settings.store.square}
+                checked={square}
                 action={() => {
-                    settings.store.square = !settings.store.square;
-                    ContextMenuApi.closeContextMenu();
+                    settings.store.square = !square;
                 }}
             />
             <Menu.MenuCheckboxItem
                 id="vc-nearest-neighbour"
                 label="Nearest Neighbour"
-                checked={settings.store.nearestNeighbour}
+                checked={nearestNeighbour}
                 action={() => {
-                    settings.store.nearestNeighbour = !settings.store.nearestNeighbour;
-                    ContextMenuApi.closeContextMenu();
+                    settings.store.nearestNeighbour = !nearestNeighbour;
                 }}
             />
             <Menu.MenuControlItem
@@ -196,6 +196,9 @@ export default definePlugin({
     ],
 
     settings,
+    contextMenus: {
+        "image-context": imageContextMenuPatch
+    },
 
     // to stop from rendering twice /shrug
     currentMagnifierElement: null as React.FunctionComponentElement<MagnifierProps & JSX.IntrinsicAttributes> | null,
@@ -245,7 +248,6 @@ export default definePlugin({
 
     start() {
         enableStyle(styles);
-        addContextMenuPatch("image-context", imageContextMenuPatch);
         this.element = document.createElement("div");
         this.element.classList.add("MagnifierContainer");
         document.body.appendChild(this.element);
@@ -256,6 +258,5 @@ export default definePlugin({
         // so componenetWillUnMount gets called if Magnifier component is still alive
         this.root && this.root.unmount();
         this.element?.remove();
-        removeContextMenuPatch("image-context", imageContextMenuPatch);
     }
 });
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 234838606..7092001ee 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -17,6 +17,7 @@
 */
 
 import { registerCommand, unregisterCommand } from "@api/Commands";
+import { addContextMenuPatch, removeContextMenuPatch } from "@api/ContextMenu";
 import { Settings } from "@api/Settings";
 import { Logger } from "@utils/Logger";
 import { Patch, Plugin, StartAt } from "@utils/types";
@@ -119,7 +120,7 @@ export function startDependenciesRecursive(p: Plugin) {
 }
 
 export const startPlugin = traceFunction("startPlugin", function startPlugin(p: Plugin) {
-    const { name, commands, flux } = p;
+    const { name, commands, flux, contextMenus } = p;
 
     if (p.start) {
         logger.info("Starting plugin", name);
@@ -154,11 +155,17 @@ export const startPlugin = traceFunction("startPlugin", function startPlugin(p:
         }
     }
 
+    if (contextMenus) {
+        for (const navId in contextMenus) {
+            addContextMenuPatch(navId, contextMenus[navId]);
+        }
+    }
+
     return true;
 }, p => `startPlugin ${p.name}`);
 
 export const stopPlugin = traceFunction("stopPlugin", function stopPlugin(p: Plugin) {
-    const { name, commands, flux } = p;
+    const { name, commands, flux, contextMenus } = p;
     if (p.stop) {
         logger.info("Stopping plugin", name);
         if (!p.started) {
@@ -192,5 +199,11 @@ export const stopPlugin = traceFunction("stopPlugin", function stopPlugin(p: Plu
         }
     }
 
+    if (contextMenus) {
+        for (const navId in contextMenus) {
+            removeContextMenuPatch(navId, contextMenus[navId]);
+        }
+    }
+
     return true;
 }, p => `stopPlugin ${p.name}`);
diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index ef986bf87..8bc563b19 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -18,7 +18,7 @@
 
 import "./messageLogger.css";
 
-import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { Settings } from "@api/Settings";
 import { disableStyle, enableStyle } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
@@ -45,7 +45,7 @@ function addDeleteStyle() {
 
 const REMOVE_HISTORY_ID = "ml-remove-history";
 const TOGGLE_DELETE_STYLE_ID = "ml-toggle-style";
-const patchMessageContextMenu: NavContextMenuPatchCallback = (children, props) => () => {
+const patchMessageContextMenu: NavContextMenuPatchCallback = (children, props) => {
     const { message } = props;
     const { deleted, editHistory, id, channel_id } = message;
 
@@ -94,13 +94,12 @@ export default definePlugin({
     description: "Temporarily logs deleted and edited messages.",
     authors: [Devs.rushii, Devs.Ven, Devs.AutumnVN],
 
-    start() {
-        addDeleteStyle();
-        addContextMenuPatch("message", patchMessageContextMenu);
+    contextMenus: {
+        "message": patchMessageContextMenu
     },
 
-    stop() {
-        removeContextMenuPatch("message", patchMessageContextMenu);
+    start() {
+        addDeleteStyle();
     },
 
     renderEdit(edit: { timestamp: any, content: string; }) {
diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx
index 9e0131e64..07f073d63 100644
--- a/src/plugins/permissionsViewer/index.tsx
+++ b/src/plugins/permissionsViewer/index.tsx
@@ -18,7 +18,7 @@
 
 import "./styles.css";
 
-import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
@@ -125,10 +125,10 @@ function MenuItem(guildId: string, id?: string, type?: MenuItemParentType) {
 }
 
 function makeContextMenuPatch(childId: string | string[], type?: MenuItemParentType): NavContextMenuPatchCallback {
-    return (children, props) => () => {
+    return (children, props) => {
         if (!props) return;
         if ((type === MenuItemParentType.User && !props.user) || (type === MenuItemParentType.Guild && !props.guild) || (type === MenuItemParentType.Channel && (!props.channel || !props.guild)))
-            return children;
+            return;
 
         const group = findGroupChildrenByChildId(childId, children);
 
@@ -173,19 +173,10 @@ export default definePlugin({
 
     UserPermissions: (guild: Guild, guildMember: GuildMember | undefined, showBoder: boolean) => !!guildMember && <UserPermissions guild={guild} guildMember={guildMember} showBorder={showBoder} />,
 
-    userContextMenuPatch: makeContextMenuPatch("roles", MenuItemParentType.User),
-    channelContextMenuPatch: makeContextMenuPatch(["mute-channel", "unmute-channel"], MenuItemParentType.Channel),
-    guildContextMenuPatch: makeContextMenuPatch("privacy", MenuItemParentType.Guild),
-
-    start() {
-        addContextMenuPatch("user-context", this.userContextMenuPatch);
-        addContextMenuPatch("channel-context", this.channelContextMenuPatch);
-        addContextMenuPatch(["guild-context", "guild-header-popout"], this.guildContextMenuPatch);
-    },
-
-    stop() {
-        removeContextMenuPatch("user-context", this.userContextMenuPatch);
-        removeContextMenuPatch("channel-context", this.channelContextMenuPatch);
-        removeContextMenuPatch(["guild-context", "guild-header-popout"], this.guildContextMenuPatch);
-    },
+    contextMenus: {
+        "user-context": makeContextMenuPatch("roles", MenuItemParentType.User),
+        "channel-context": makeContextMenuPatch(["mute-channel", "unmute-channel"], MenuItemParentType.Channel),
+        "guild-context": makeContextMenuPatch("privacy", MenuItemParentType.Guild),
+        "guild-header-popout": makeContextMenuPatch("privacy", MenuItemParentType.Guild)
+    }
 });
diff --git a/src/plugins/pinDms/contextMenus.tsx b/src/plugins/pinDms/contextMenus.tsx
index 7d89ec123..1db8b25a9 100644
--- a/src/plugins/pinDms/contextMenus.tsx
+++ b/src/plugins/pinDms/contextMenus.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { Menu } from "@webpack/common";
 
 import { isPinned, movePin, PinOrder, settings, snapshotArray, togglePin } from "./settings";
@@ -50,13 +50,13 @@ function PinMenuItem(channelId: string) {
     );
 }
 
-const GroupDMContext: NavContextMenuPatchCallback = (children, props) => () => {
+const GroupDMContext: NavContextMenuPatchCallback = (children, props) => {
     const container = findGroupChildrenByChildId("leave-channel", children);
     if (container)
         container.unshift(PinMenuItem(props.channel.id));
 };
 
-const UserContext: NavContextMenuPatchCallback = (children, props) => () => {
+const UserContext: NavContextMenuPatchCallback = (children, props) => {
     const container = findGroupChildrenByChildId("close-dm", children);
     if (container) {
         const idx = container.findIndex(c => c?.props?.id === "close-dm");
@@ -64,12 +64,7 @@ const UserContext: NavContextMenuPatchCallback = (children, props) => () => {
     }
 };
 
-export function addContextMenus() {
-    addContextMenuPatch("gdm-context", GroupDMContext);
-    addContextMenuPatch("user-context", UserContext);
-}
-
-export function removeContextMenus() {
-    removeContextMenuPatch("gdm-context", GroupDMContext);
-    removeContextMenuPatch("user-context", UserContext);
-}
+export const contextMenus = {
+    "gdm-context": GroupDMContext,
+    "user-context": UserContext
+};
diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index 792bdab6a..943f0f1b1 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -20,7 +20,7 @@ import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { Channel } from "discord-types/general";
 
-import { addContextMenus, removeContextMenus } from "./contextMenus";
+import { contextMenus } from "./contextMenus";
 import { getPinAt, isPinned, settings, snapshotArray, sortedSnapshot, usePinnedDms } from "./settings";
 
 export default definePlugin({
@@ -29,9 +29,7 @@ export default definePlugin({
     authors: [Devs.Ven, Devs.Strencher],
 
     settings,
-
-    start: addContextMenus,
-    stop: removeContextMenus,
+    contextMenus,
 
     usePinCount(channelIds: string[]) {
         const pinnedDms = usePinnedDms();
diff --git a/src/plugins/resurrectHome/index.tsx b/src/plugins/resurrectHome/index.tsx
index 91ed87a02..6b0069a7f 100644
--- a/src/plugins/resurrectHome/index.tsx
+++ b/src/plugins/resurrectHome/index.tsx
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { findGroupChildrenByChildId } from "@api/ContextMenu";
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { ContextMenuApi, Menu } from "@webpack/common";
+import { Menu } from "@webpack/common";
 
 const settings = definePluginSettings({
     forceServerHome: {
@@ -30,25 +30,11 @@ const settings = definePluginSettings({
     }
 });
 
-const contextMenuPatch: NavContextMenuPatchCallback = (children, props) => () => {
-    if (!props?.guild) return;
+function useForceServerHome() {
+    const { forceServerHome } = settings.use(["forceServerHome"]);
 
-    const group = findGroupChildrenByChildId("hide-muted-channels", children);
-
-    group?.unshift(
-        <Menu.MenuCheckboxItem
-            key="force-server-home"
-            id="force-server-home"
-            label="Force Server Home"
-            checked={settings.store.forceServerHome}
-            action={() => {
-                settings.store.forceServerHome = !settings.store.forceServerHome;
-                ContextMenuApi.closeContextMenu();
-            }}
-        />
-
-    );
-};
+    return forceServerHome;
+}
 
 export default definePlugin({
     name: "ResurrectHome",
@@ -109,17 +95,25 @@ export default definePlugin({
         }
     ],
 
-    start() {
-        addContextMenuPatch("guild-context", contextMenuPatch);
-    },
+    useForceServerHome,
 
-    stop() {
-        removeContextMenuPatch("guild-context", contextMenuPatch);
-    },
+    contextMenus: {
+        "guild-context"(children, props) {
+            const forceServerHome = useForceServerHome();
 
-    useForceServerHome() {
-        const { forceServerHome } = settings.use(["forceServerHome"]);
+            if (!props?.guild) return;
 
-        return forceServerHome;
+            const group = findGroupChildrenByChildId("hide-muted-channels", children);
+
+            group?.unshift(
+                <Menu.MenuCheckboxItem
+                    key="force-server-home"
+                    id="force-server-home"
+                    label="Force Server Home"
+                    checked={forceServerHome}
+                    action={() => settings.store.forceServerHome = !forceServerHome}
+                />
+            );
+        }
     }
 });
diff --git a/src/plugins/reverseImageSearch/index.tsx b/src/plugins/reverseImageSearch/index.tsx
index 6c5f3e729..415dc13d8 100644
--- a/src/plugins/reverseImageSearch/index.tsx
+++ b/src/plugins/reverseImageSearch/index.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { Flex } from "@components/Flex";
 import { OpenExternalIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
@@ -84,7 +84,7 @@ function makeSearchItem(src: string) {
     );
 }
 
-const messageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => () => {
+const messageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => {
     if (props?.reverseImageSearchType !== "img") return;
 
     const src = props.itemHref ?? props.itemSrc;
@@ -93,7 +93,7 @@ const messageContextMenuPatch: NavContextMenuPatchCallback = (children, props) =
     group?.push(makeSearchItem(src));
 };
 
-const imageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => () => {
+const imageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => {
     if (!props?.src) return;
 
     const group = findGroupChildrenByChildId("copy-native-link", children) ?? children;
@@ -115,14 +115,8 @@ export default definePlugin({
             }
         }
     ],
-
-    start() {
-        addContextMenuPatch("message", messageContextMenuPatch);
-        addContextMenuPatch("image-context", imageContextMenuPatch);
-    },
-
-    stop() {
-        removeContextMenuPatch("message", messageContextMenuPatch);
-        removeContextMenuPatch("image-context", imageContextMenuPatch);
+    contextMenus: {
+        "message": messageContextMenuPatch,
+        "image-context": imageContextMenuPatch
     }
 });
diff --git a/src/plugins/reviewDB/index.tsx b/src/plugins/reviewDB/index.tsx
index 50bb62184..ad24e9696 100644
--- a/src/plugins/reviewDB/index.tsx
+++ b/src/plugins/reviewDB/index.tsx
@@ -18,7 +18,7 @@
 
 import "./style.css";
 
-import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import ErrorBoundary from "@components/ErrorBoundary";
 import ExpandableHeader from "@components/ExpandableHeader";
 import { OpenExternalIcon } from "@components/Icons";
@@ -36,7 +36,7 @@ import { getCurrentUserInfo, readNotification } from "./reviewDbApi";
 import { settings } from "./settings";
 import { showToast } from "./utils";
 
-const guildPopoutPatch: NavContextMenuPatchCallback = (children, props: { guild: Guild, onClose(): void; }) => () => {
+const guildPopoutPatch: NavContextMenuPatchCallback = (children, props: { guild: Guild, onClose(): void; }) => {
     children.push(
         <Menu.MenuItem
             label="View Reviews"
@@ -53,6 +53,9 @@ export default definePlugin({
     authors: [Devs.mantikafasi, Devs.Ven],
 
     settings,
+    contextMenus: {
+        "guild-header-popout": guildPopoutPatch
+    },
 
     patches: [
         {
@@ -69,8 +72,6 @@ export default definePlugin({
     },
 
     async start() {
-        addContextMenuPatch("guild-header-popout", guildPopoutPatch);
-
         const s = settings.store;
         const { lastReviewId, notifyReviews } = s;
 
@@ -127,10 +128,6 @@ export default definePlugin({
         }, 4000);
     },
 
-    stop() {
-        removeContextMenuPatch("guild-header-popout", guildPopoutPatch);
-    },
-
     getReviewsComponent: ErrorBoundary.wrap((user: User) => {
         const [reviewCount, setReviewCount] = useState<number>();
 
diff --git a/src/plugins/searchReply/index.tsx b/src/plugins/searchReply/index.tsx
index b151712af..35b197874 100644
--- a/src/plugins/searchReply/index.tsx
+++ b/src/plugins/searchReply/index.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { ReplyIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
@@ -27,7 +27,7 @@ import { Message } from "discord-types/general";
 
 const messageUtils = findByPropsLazy("replyToMessage");
 
-const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { message }: { message: Message; }) => () => {
+const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { message }: { message: Message; }) => {
     // make sure the message is in the selected channel
     if (SelectedChannelStore.getChannelId() !== message.channel_id) return;
     const channel = ChannelStore.getChannel(message?.channel_id);
@@ -38,7 +38,7 @@ const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { messag
     const dmGroup = findGroupChildrenByChildId("pin", children);
     if (dmGroup && !dmGroup.some(child => child?.props?.id === "reply")) {
         const pinIndex = dmGroup.findIndex(c => c?.props.id === "pin");
-        return dmGroup.splice(pinIndex + 1, 0, (
+        dmGroup.splice(pinIndex + 1, 0, (
             <Menu.MenuItem
                 id="reply"
                 label={i18n.Messages.MESSAGE_ACTION_REPLY}
@@ -46,12 +46,13 @@ const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { messag
                 action={(e: React.MouseEvent) => messageUtils.replyToMessage(channel, message, e)}
             />
         ));
+        return;
     }
 
     // servers
     const serverGroup = findGroupChildrenByChildId("mark-unread", children);
     if (serverGroup && !serverGroup.some(child => child?.props?.id === "reply")) {
-        return serverGroup.unshift((
+        serverGroup.unshift((
             <Menu.MenuItem
                 id="reply"
                 label={i18n.Messages.MESSAGE_ACTION_REPLY}
@@ -59,6 +60,7 @@ const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { messag
                 action={(e: React.MouseEvent) => messageUtils.replyToMessage(channel, message, e)}
             />
         ));
+        return;
     }
 };
 
@@ -67,12 +69,7 @@ export default definePlugin({
     name: "SearchReply",
     description: "Adds a reply button to search results",
     authors: [Devs.Aria],
-
-    start() {
-        addContextMenuPatch("message", messageContextMenuPatch);
-    },
-
-    stop() {
-        removeContextMenuPatch("message", messageContextMenuPatch);
+    contextMenus: {
+        "message": messageContextMenuPatch
     }
 });
diff --git a/src/plugins/serverProfile/index.tsx b/src/plugins/serverProfile/index.tsx
index 68f6193cc..9d495c9d3 100644
--- a/src/plugins/serverProfile/index.tsx
+++ b/src/plugins/serverProfile/index.tsx
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { Menu } from "@webpack/common";
@@ -12,7 +12,7 @@ import { Guild } from "discord-types/general";
 
 import { openGuildProfileModal } from "./GuildProfileModal";
 
-const Patch: NavContextMenuPatchCallback = (children, { guild }: { guild: Guild; }) => () => {
+const Patch: NavContextMenuPatchCallback = (children, { guild }: { guild: Guild; }) => {
     const group = findGroupChildrenByChildId("privacy", children);
 
     group?.push(
@@ -29,12 +29,8 @@ export default definePlugin({
     description: "Allows you to view info about a server by right clicking it in the server list",
     authors: [Devs.Ven, Devs.Nuckyz],
     tags: ["guild", "info"],
-
-    start() {
-        addContextMenuPatch(["guild-context", "guild-header-popout"], Patch);
-    },
-
-    stop() {
-        removeContextMenuPatch(["guild-context", "guild-header-popout"], Patch);
+    contextMenus: {
+        "guild-context": Patch,
+        "guild-header-popout": Patch
     }
 });
diff --git a/src/plugins/translate/index.tsx b/src/plugins/translate/index.tsx
index 702e60cf7..f602d1255 100644
--- a/src/plugins/translate/index.tsx
+++ b/src/plugins/translate/index.tsx
@@ -19,7 +19,7 @@
 import "./styles.css";
 
 import { addChatBarButton, removeChatBarButton } from "@api/ChatButtons";
-import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { addAccessory, removeAccessory } from "@api/MessageAccessories";
 import { addPreSendListener, removePreSendListener } from "@api/MessageEvents";
 import { addButton, removeButton } from "@api/MessagePopover";
@@ -32,7 +32,7 @@ import { TranslateChatBarIcon, TranslateIcon } from "./TranslateIcon";
 import { handleTranslate, TranslationAccessory } from "./TranslationAccessory";
 import { translate } from "./utils";
 
-const messageCtxPatch: NavContextMenuPatchCallback = (children, { message }) => () => {
+const messageCtxPatch: NavContextMenuPatchCallback = (children, { message }) => {
     if (!message.content) return;
 
     const group = findGroupChildrenByChildId("copy-text", children);
@@ -57,13 +57,15 @@ export default definePlugin({
     authors: [Devs.Ven],
     dependencies: ["MessageAccessoriesAPI", "MessagePopoverAPI", "MessageEventsAPI", "ChatInputButtonAPI"],
     settings,
+    contextMenus: {
+        "message": messageCtxPatch
+    },
     // not used, just here in case some other plugin wants it or w/e
     translate,
 
     start() {
         addAccessory("vc-translation", props => <TranslationAccessory message={props.message} />);
 
-        addContextMenuPatch("message", messageCtxPatch);
         addChatBarButton("vc-translate", TranslateChatBarIcon);
 
         addButton("vc-translate", message => {
@@ -91,7 +93,6 @@ export default definePlugin({
 
     stop() {
         removePreSendListener(this.preSend);
-        removeContextMenuPatch("message", messageCtxPatch);
         removeChatBarButton("vc-translate");
         removeButton("vc-translate");
         removeAccessory("vc-translation");
diff --git a/src/plugins/unsuppressEmbeds/index.tsx b/src/plugins/unsuppressEmbeds/index.tsx
index a21960774..0e87201c6 100644
--- a/src/plugins/unsuppressEmbeds/index.tsx
+++ b/src/plugins/unsuppressEmbeds/index.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { ImageInvisible, ImageVisible } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
@@ -24,7 +24,7 @@ import { Menu, PermissionsBits, PermissionStore, RestAPI, UserStore } from "@web
 
 const EMBED_SUPPRESSED = 1 << 2;
 
-const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { channel, message: { author, embeds, flags, id: messageId } }) => () => {
+const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { channel, message: { author, embeds, flags, id: messageId } }) => {
     const isEmbedSuppressed = (flags & EMBED_SUPPRESSED) !== 0;
     if (!isEmbedSuppressed && !embeds.length) return;
 
@@ -56,12 +56,7 @@ export default definePlugin({
     name: "UnsuppressEmbeds",
     authors: [Devs.rad, Devs.HypedDomi],
     description: "Allows you to unsuppress embeds in messages",
-
-    start() {
-        addContextMenuPatch("message", messageContextMenuPatch);
-    },
-
-    stop() {
-        removeContextMenuPatch("message", messageContextMenuPatch);
-    },
+    contextMenus: {
+        "message": messageContextMenuPatch
+    }
 });
diff --git a/src/plugins/vencordToolbox/index.tsx b/src/plugins/vencordToolbox/index.tsx
index 0a805a0d2..ba295fa72 100644
--- a/src/plugins/vencordToolbox/index.tsx
+++ b/src/plugins/vencordToolbox/index.tsx
@@ -19,7 +19,7 @@
 import "./index.css";
 
 import { openNotificationLogModal } from "@api/Notifications/notificationLog";
-import { Settings } from "@api/Settings";
+import { Settings, useSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
@@ -30,6 +30,8 @@ import type { ReactNode } from "react";
 const HeaderBarIcon = findExportedComponentLazy("Icon", "Divider");
 
 function VencordPopout(onClose: () => void) {
+    const { useQuickCss } = useSettings();
+
     const pluginEntries = [] as ReactNode[];
 
     for (const plugin of Object.values(Vencord.Plugins.plugins)) {
@@ -68,11 +70,10 @@ function VencordPopout(onClose: () => void) {
             />
             <Menu.MenuCheckboxItem
                 id="vc-toolbox-quickcss-toggle"
-                checked={Settings.useQuickCss}
+                checked={useQuickCss}
                 label={"Enable QuickCSS"}
                 action={() => {
-                    Settings.useQuickCss = !Settings.useQuickCss;
-                    onClose();
+                    Settings.useQuickCss = !useQuickCss;
                 }}
             />
             <Menu.MenuItem
diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index 0920c4185..d9dfc2ad0 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { definePluginSettings } from "@api/Settings";
 import { ImageIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
@@ -80,7 +80,7 @@ function openImage(url: string) {
     });
 }
 
-const UserContext: NavContextMenuPatchCallback = (children, { user, guildId }: UserContextProps) => () => {
+const UserContext: NavContextMenuPatchCallback = (children, { user, guildId }: UserContextProps) => {
     if (!user) return;
     const memberAvatar = GuildMemberStore.getMember(guildId!, user.id)?.avatar || null;
 
@@ -109,7 +109,7 @@ const UserContext: NavContextMenuPatchCallback = (children, { user, guildId }: U
     ));
 };
 
-const GuildContext: NavContextMenuPatchCallback = (children, { guild }: GuildContextProps) => () => {
+const GuildContext: NavContextMenuPatchCallback = (children, { guild }: GuildContextProps) => {
     if (!guild) return;
 
     const { id, icon, banner } = guild;
@@ -155,14 +155,9 @@ export default definePlugin({
 
     openImage,
 
-    start() {
-        addContextMenuPatch("user-context", UserContext);
-        addContextMenuPatch("guild-context", GuildContext);
-    },
-
-    stop() {
-        removeContextMenuPatch("user-context", UserContext);
-        removeContextMenuPatch("guild-context", GuildContext);
+    contextMenus: {
+        "user-context": UserContext,
+        "guild-context": GuildContext
     },
 
     patches: [
diff --git a/src/plugins/viewRaw/index.tsx b/src/plugins/viewRaw/index.tsx
index 08acdc4c5..68b33eed0 100644
--- a/src/plugins/viewRaw/index.tsx
+++ b/src/plugins/viewRaw/index.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { addButton, removeButton } from "@api/MessagePopover";
 import { definePluginSettings } from "@api/Settings";
 import { CodeBlock } from "@components/CodeBlock";
@@ -117,8 +117,8 @@ const settings = definePluginSettings({
     }
 });
 
-function MakeContextCallback(name: "Guild" | "User" | "Channel") {
-    const callback: NavContextMenuPatchCallback = (children, props) => () => {
+function MakeContextCallback(name: "Guild" | "User" | "Channel"): NavContextMenuPatchCallback {
+    return (children, props) => {
         const value = props[name.toLowerCase()];
         if (!value) return;
         if (props.label === i18n.Messages.CHANNEL_ACTIONS_MENU_LABEL) return; // random shit like notification settings
@@ -141,16 +141,19 @@ function MakeContextCallback(name: "Guild" | "User" | "Channel") {
             />
         );
     };
-    return callback;
 }
 
-
 export default definePlugin({
     name: "ViewRaw",
     description: "Copy and view the raw content/data of any message, channel or guild",
     authors: [Devs.KingFish, Devs.Ven, Devs.rad, Devs.ImLvna],
     dependencies: ["MessagePopoverAPI"],
     settings,
+    contextMenus: {
+        "guild-context": MakeContextCallback("Guild"),
+        "channel-context": MakeContextCallback("Channel"),
+        "user-context": MakeContextCallback("User")
+    },
 
     start() {
         addButton("ViewRaw", msg => {
@@ -187,16 +190,9 @@ export default definePlugin({
                 onContextMenu: handleContextMenu
             };
         });
-
-        addContextMenuPatch("guild-context", MakeContextCallback("Guild"));
-        addContextMenuPatch("channel-context", MakeContextCallback("Channel"));
-        addContextMenuPatch("user-context", MakeContextCallback("User"));
     },
 
     stop() {
-        removeButton("CopyRawMessage");
-        removeContextMenuPatch("guild-context", MakeContextCallback("Guild"));
-        removeContextMenuPatch("channel-context", MakeContextCallback("Channel"));
-        removeContextMenuPatch("user-context", MakeContextCallback("User"));
+        removeButton("ViewRaw");
     }
 });
diff --git a/src/plugins/voiceMessages/index.tsx b/src/plugins/voiceMessages/index.tsx
index 2393ef2b6..2f232f341 100644
--- a/src/plugins/voiceMessages/index.tsx
+++ b/src/plugins/voiceMessages/index.tsx
@@ -18,7 +18,7 @@
 
 import "./styles.css";
 
-import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { Microphone } from "@components/Icons";
 import { Link } from "@components/Link";
 import { Devs } from "@utils/constants";
@@ -48,18 +48,30 @@ export type VoiceRecorder = ComponentType<{
 
 const VoiceRecorder = IS_DISCORD_DESKTOP ? VoiceRecorderDesktop : VoiceRecorderWeb;
 
+const ctxMenuPatch: NavContextMenuPatchCallback = (children, props) => {
+    if (props.channel.guild_id && !(PermissionStore.can(PermissionsBits.SEND_VOICE_MESSAGES, props.channel) && PermissionStore.can(PermissionsBits.SEND_MESSAGES, props.channel))) return;
+
+    children.push(
+        <Menu.MenuItem
+            id="vc-send-vmsg"
+            label={
+                <div className={OptionClasses.optionLabel}>
+                    <Microphone className={OptionClasses.optionIcon} height={24} width={24} />
+                    <div className={OptionClasses.optionName}>Send voice message</div>
+                </div>
+            }
+            action={() => openModal(modalProps => <Modal modalProps={modalProps} />)}
+        />
+    );
+};
+
 export default definePlugin({
     name: "VoiceMessages",
     description: "Allows you to send voice messages like on mobile. To do so, right click the upload button and click Send Voice Message",
     authors: [Devs.Ven, Devs.Vap, Devs.Nickyux],
     settings,
-
-    start() {
-        addContextMenuPatch("channel-attach", ctxMenuPatch);
-    },
-
-    stop() {
-        removeContextMenuPatch("channel-attach", ctxMenuPatch);
+    contextMenus: {
+        "channel-attach": ctxMenuPatch
     }
 });
 
@@ -234,20 +246,3 @@ function Modal({ modalProps }: { modalProps: ModalProps; }) {
         </ModalRoot>
     );
 }
-
-const ctxMenuPatch: NavContextMenuPatchCallback = (children, props) => () => {
-    if (props.channel.guild_id && !(PermissionStore.can(PermissionsBits.SEND_VOICE_MESSAGES, props.channel) && PermissionStore.can(PermissionsBits.SEND_MESSAGES, props.channel))) return;
-
-    children.push(
-        <Menu.MenuItem
-            id="vc-send-vmsg"
-            label={
-                <div className={OptionClasses.optionLabel}>
-                    <Microphone className={OptionClasses.optionIcon} height={24} width={24} />
-                    <div className={OptionClasses.optionName}>Send voice message</div>
-                </div>
-            }
-            action={() => openModal(modalProps => <Modal modalProps={modalProps} />)}
-        />
-    );
-};
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index d66bdc826..d213ce272 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -418,6 +418,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     Av32000: {
         name: "Av32000",
         id: 593436735380127770n,
+    },
+    Kyuuhachi: {
+        name: "Kyuuhachi",
+        id: 236588665420251137n,
     }
 } satisfies Record<string, Dev>);
 
diff --git a/src/utils/types.ts b/src/utils/types.ts
index 16867a43c..bec7cb0b3 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -17,6 +17,7 @@
 */
 
 import { Command } from "@api/Commands";
+import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { FluxEvents } from "@webpack/types";
 import { Promisable } from "type-fest";
 
@@ -115,6 +116,10 @@ export interface PluginDef {
     flux?: {
         [E in FluxEvents]?: (event: any) => void;
     };
+    /**
+     * Allows you to manipulate context menus
+     */
+    contextMenus?: Record<string, NavContextMenuPatchCallback>;
     /**
      * Allows you to add custom actions to the Vencord Toolbox.
      * The key will be used as text for the button

From 980206d31568e479f0f0c7a32ab24035374f06d5 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 7 Mar 2024 09:36:59 -0300
Subject: [PATCH 365/632] Fix waitFor initial finds traces getting logged to
 the console even though they always fail

---
 src/webpack/webpack.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index a68890a83..0f7d8b73c 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -475,8 +475,10 @@ export function waitFor(filter: string | string[] | FilterFn, callback: Callback
     else if (typeof filter !== "function")
         throw new Error("filter must be a string, string[] or function, got " + typeof filter);
 
-    const [existing, id] = find(filter!, { isIndirect: true, isWaitFor: true });
-    if (existing) return void callback(existing, id);
+    if (cache != null) {
+        const [existing, id] = find(filter, { isIndirect: true, isWaitFor: true });
+        if (existing) return void callback(existing, id);
+    }
 
     subscriptions.set(filter, callback);
 }

From a59c14f9aa8034fcb3df45af855a7a57c2882b82 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Thu, 7 Mar 2024 19:51:14 +0700
Subject: [PATCH 366/632] CustomRPC: Change timestamp to milisecond (#2231)

---
 src/plugins/customRPC/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/customRPC/index.tsx b/src/plugins/customRPC/index.tsx
index 3653a0776..e70f8c908 100644
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@@ -175,7 +175,7 @@ const settings = definePluginSettings({
     },
     startTime: {
         type: OptionType.NUMBER,
-        description: "Start timestamp (only for custom timestamp mode)",
+        description: "Start timestamp in milisecond (only for custom timestamp mode)",
         onChange: onChange,
         disabled: isTimestampDisabled,
         isValid: (value: number) => {
@@ -185,7 +185,7 @@ const settings = definePluginSettings({
     },
     endTime: {
         type: OptionType.NUMBER,
-        description: "End timestamp (only for custom timestamp mode)",
+        description: "End timestamp in milisecond (only for custom timestamp mode)",
         onChange: onChange,
         disabled: isTimestampDisabled,
         isValid: (value: number) => {
@@ -313,12 +313,12 @@ async function createActivity(): Promise<Activity | undefined> {
     switch (settings.store.timestampMode) {
         case TimestampMode.NOW:
             activity.timestamps = {
-                start: Math.floor(Date.now() / 1000)
+                start: Date.now()
             };
             break;
         case TimestampMode.TIME:
             activity.timestamps = {
-                start: Math.floor(Date.now() / 1000) - (new Date().getHours() * 3600) - (new Date().getMinutes() * 60) - new Date().getSeconds()
+                start: Date.now() - (new Date().getHours() * 3600 + new Date().getMinutes() * 60 + new Date().getSeconds()) * 1000
             };
             break;
         case TimestampMode.CUSTOM:

From f70114238c1307e086db537640926a0db78adb10 Mon Sep 17 00:00:00 2001
From: Sam <149597648+cheesesamwich@users.noreply.github.com>
Date: Thu, 7 Mar 2024 12:55:51 +0000
Subject: [PATCH 367/632] MemberCount: Add options to choose where the member
 count will be displayed (#2224)

---
 src/plugins/memberCount/index.tsx | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/plugins/memberCount/index.tsx b/src/plugins/memberCount/index.tsx
index eb4ce372c..92e9a2057 100644
--- a/src/plugins/memberCount/index.tsx
+++ b/src/plugins/memberCount/index.tsx
@@ -18,10 +18,11 @@
 
 import "./style.css";
 
+import { definePluginSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 import { findStoreLazy } from "@webpack";
 import { FluxStore } from "@webpack/types";
 
@@ -32,6 +33,21 @@ export const ChannelMemberStore = findStoreLazy("ChannelMemberStore") as FluxSto
     getProps(guildId: string, channelId: string): { groups: { count: number; id: string; }[]; };
 };
 
+const settings = definePluginSettings({
+    toolTip: {
+        type: OptionType.BOOLEAN,
+        description: "If the member count should be displayed on the server tooltip",
+        default: true,
+        restartNeeded: true
+    },
+    memberList: {
+        type: OptionType.BOOLEAN,
+        description: "If the member count should be displayed on the member list",
+        default: true,
+        restartNeeded: true
+    }
+});
+
 const sharedIntlNumberFormat = new Intl.NumberFormat();
 export const numberFormat = (value: number) => sharedIntlNumberFormat.format(value);
 export const cl = classNameFactory("vc-membercount-");
@@ -40,6 +56,7 @@ export default definePlugin({
     name: "MemberCount",
     description: "Shows the amount of online & total members in the server member list and tooltip",
     authors: [Devs.Ven, Devs.Commandtechno],
+    settings,
 
     patches: [
         {
@@ -47,17 +64,18 @@ export default definePlugin({
             replacement: {
                 match: /(?<=let\{className:(\i),.+?children):\[(\i\.useMemo[^}]+"aria-multiselectable")/,
                 replace: ":[$1?.startsWith('members')?$self.render():null,$2"
-            }
+            },
+            predicate: () => settings.store.memberList
         },
         {
             find: ".invitesDisabledTooltip",
             replacement: {
                 match: /(?<=\.VIEW_AS_ROLES_MENTIONS_WARNING.{0,100})]/,
                 replace: ",$self.renderTooltip(arguments[0].guild)]"
-            }
+            },
+            predicate: () => settings.store.toolTip
         }
     ],
-
     render: ErrorBoundary.wrap(MemberCount, { noop: true }),
     renderTooltip: ErrorBoundary.wrap(guild => <MemberCount isTooltip tooltipGuildId={guild.id} />, { noop: true })
 });

From 19799767adef192a8451adf0f8c1710933b21a41 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 7 Mar 2024 10:09:04 -0300
Subject: [PATCH 368/632] Fix trying to check for updates if origin doesn't
 have same branch

---
 src/main/updater/git.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts
index 2ff3ba512..20a5d7003 100644
--- a/src/main/updater/git.ts
+++ b/src/main/updater/git.ts
@@ -49,9 +49,12 @@ async function getRepo() {
 async function calculateGitChanges() {
     await git("fetch");
 
-    const branch = await git("branch", "--show-current");
+    const branch = (await git("branch", "--show-current")).stdout.trim();
 
-    const res = await git("log", `HEAD...origin/${branch.stdout.trim()}`, "--pretty=format:%an/%h/%s");
+    const existsOnOrigin = (await git("ls-remote", "origin", branch)).stdout.length > 0;
+    if (!existsOnOrigin) return [];
+
+    const res = await git("log", `HEAD...origin/${branch}`, "--pretty=format:%an/%h/%s");
 
     const commits = res.stdout.trim();
     return commits ? commits.split("\n").map(line => {

From 102842d5288fd22821e2a6eb295255fd88603964 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 7 Mar 2024 11:33:00 -0300
Subject: [PATCH 369/632] Close Ipc FS watchers if window is closed

---
 src/main/ipcMain.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/ipcMain.ts b/src/main/ipcMain.ts
index 47d400eb6..3ac8a14c5 100644
--- a/src/main/ipcMain.ts
+++ b/src/main/ipcMain.ts
@@ -23,7 +23,7 @@ import { debounce } from "@utils/debounce";
 import { IpcEvents } from "@utils/IpcEvents";
 import { Queue } from "@utils/Queue";
 import { BrowserWindow, ipcMain, shell, systemPreferences } from "electron";
-import { mkdirSync, readFileSync, watch } from "fs";
+import { FSWatcher, mkdirSync, readFileSync, watch } from "fs";
 import { open, readdir, readFile, writeFile } from "fs/promises";
 import { join, normalize } from "path";
 
@@ -126,16 +126,23 @@ ipcMain.handle(IpcEvents.SET_SETTINGS, (_, s) => {
 
 
 export function initIpc(mainWindow: BrowserWindow) {
+    let quickCssWatcher: FSWatcher | undefined;
+
     open(QUICKCSS_PATH, "a+").then(fd => {
         fd.close();
-        watch(QUICKCSS_PATH, { persistent: false }, debounce(async () => {
+        quickCssWatcher = watch(QUICKCSS_PATH, { persistent: false }, debounce(async () => {
             mainWindow.webContents.postMessage(IpcEvents.QUICK_CSS_UPDATE, await readCss());
         }, 50));
-    });
+    }).catch(() => { });
 
-    watch(THEMES_DIR, { persistent: false }, debounce(() => {
+    const themesWatcher = watch(THEMES_DIR, { persistent: false }, debounce(() => {
         mainWindow.webContents.postMessage(IpcEvents.THEME_UPDATE, void 0);
     }));
+
+    mainWindow.once("closed", () => {
+        quickCssWatcher?.close();
+        themesWatcher.close();
+    });
 }
 
 ipcMain.handle(IpcEvents.OPEN_MONACO_EDITOR, async () => {

From 1c1d82f9a820ce4b7611032488624d98624a7ecb Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 7 Mar 2024 13:06:08 -0300
Subject: [PATCH 370/632] VencordToolbox: don't subscribe to all settings

Also remove one indirection from useSettings
---
 src/api/Settings.ts                  | 14 ++++++++------
 src/plugins/vencordToolbox/index.tsx |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/api/Settings.ts b/src/api/Settings.ts
index 004a8988b..c1ff6915b 100644
--- a/src/api/Settings.ts
+++ b/src/api/Settings.ts
@@ -223,13 +223,13 @@ export const Settings = makeProxy(settings);
 export function useSettings(paths?: UseSettings<Settings>[]) {
     const [, forceUpdate] = React.useReducer(() => ({}), {});
 
-    const onUpdate: SubscriptionCallback = paths
-        ? (value, path) => paths.includes(path as UseSettings<Settings>) && forceUpdate()
-        : forceUpdate;
+    if (paths) {
+        (forceUpdate as SubscriptionCallback)._paths = paths;
+    }
 
     React.useEffect(() => {
-        subscriptions.add(onUpdate);
-        return () => void subscriptions.delete(onUpdate);
+        subscriptions.add(forceUpdate);
+        return () => void subscriptions.delete(forceUpdate);
     }, []);
 
     return Settings;
@@ -253,8 +253,10 @@ type ResolvePropDeep<T, P> = P extends "" ? T :
 export function addSettingsListener<Path extends keyof Settings>(path: Path, onUpdate: (newValue: Settings[Path], path: Path) => void): void;
 export function addSettingsListener<Path extends string>(path: Path, onUpdate: (newValue: Path extends "" ? any : ResolvePropDeep<Settings, Path>, path: Path extends "" ? string : Path) => void): void;
 export function addSettingsListener(path: string, onUpdate: (newValue: any, path: string) => void) {
-    if (path)
+    if (path) {
         ((onUpdate as SubscriptionCallback)._paths ??= []).push(path);
+    }
+
     subscriptions.add(onUpdate);
 }
 
diff --git a/src/plugins/vencordToolbox/index.tsx b/src/plugins/vencordToolbox/index.tsx
index ba295fa72..00805fbd3 100644
--- a/src/plugins/vencordToolbox/index.tsx
+++ b/src/plugins/vencordToolbox/index.tsx
@@ -30,7 +30,7 @@ import type { ReactNode } from "react";
 const HeaderBarIcon = findExportedComponentLazy("Icon", "Divider");
 
 function VencordPopout(onClose: () => void) {
-    const { useQuickCss } = useSettings();
+    const { useQuickCss } = useSettings(["useQuickCss"]);
 
     const pluginEntries = [] as ReactNode[];
 

From 2e90d4c03d98b9e5ea1dd8505cb0740d90b051d0 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 7 Mar 2024 19:53:26 +0100
Subject: [PATCH 371/632] New plugin: BetterRoleContext ~ edit/copy colour
 shortcuts in profile

---
 src/plugins/betterRoleContext/README.md    |  6 ++
 src/plugins/betterRoleContext/index.tsx    | 79 ++++++++++++++++++++++
 src/webpack/common/settingsStores.ts       |  7 +-
 src/webpack/common/types/index.d.ts        |  4 +-
 src/webpack/common/types/settingsStores.ts | 11 +++
 5 files changed, 104 insertions(+), 3 deletions(-)
 create mode 100644 src/plugins/betterRoleContext/README.md
 create mode 100644 src/plugins/betterRoleContext/index.tsx
 create mode 100644 src/webpack/common/types/settingsStores.ts

diff --git a/src/plugins/betterRoleContext/README.md b/src/plugins/betterRoleContext/README.md
new file mode 100644
index 000000000..3f3086bdb
--- /dev/null
+++ b/src/plugins/betterRoleContext/README.md
@@ -0,0 +1,6 @@
+# BetterRoleContext
+
+Adds options to copy role color  and edit role when right clicking roles in the user profile
+
+![](https://github.com/Vendicated/Vencord/assets/45497981/d1765e9e-7db2-4a3c-b110-139c59235326)
+
diff --git a/src/plugins/betterRoleContext/index.tsx b/src/plugins/betterRoleContext/index.tsx
new file mode 100644
index 000000000..7a914293a
--- /dev/null
+++ b/src/plugins/betterRoleContext/index.tsx
@@ -0,0 +1,79 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import { getCurrentGuild } from "@utils/discord";
+import definePlugin from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+import { Clipboard, Menu, PermissionStore, TextAndImagesSettingsStores } from "@webpack/common";
+
+const GuildSettingsActions = findByPropsLazy("open", "selectRole", "updateGuild");
+
+function PencilIcon() {
+    return (
+        <svg
+            role="img"
+            width="18"
+            height="18"
+            fill="none"
+            viewBox="0 0 24 24"
+        >
+            <path fill="currentColor" d="m13.96 5.46 4.58 4.58a1 1 0 0 0 1.42 0l1.38-1.38a2 2 0 0 0 0-2.82l-3.18-3.18a2 2 0 0 0-2.82 0l-1.38 1.38a1 1 0 0 0 0 1.42ZM2.11 20.16l.73-4.22a3 3 0 0 1 .83-1.61l7.87-7.87a1 1 0 0 1 1.42 0l4.58 4.58a1 1 0 0 1 0 1.42l-7.87 7.87a3 3 0 0 1-1.6.83l-4.23.73a1.5 1.5 0 0 1-1.73-1.73Z" />
+        </svg>
+    );
+}
+
+function AppearanceIcon() {
+    return (
+        <svg width="18" height="18" viewBox="0 0 24 24">
+            <path fill="currentColor" d="M 12,0 C 5.3733333,0 0,5.3733333 0,12 c 0,6.626667 5.3733333,12 12,12 1.106667,0 2,-0.893333 2,-2 0,-0.52 -0.2,-0.986667 -0.52,-1.346667 -0.306667,-0.346666 -0.506667,-0.813333 -0.506667,-1.32 0,-1.106666 0.893334,-2 2,-2 h 2.36 C 21.013333,17.333333 24,14.346667 24,10.666667 24,4.7733333 18.626667,0 12,0 Z M 4.6666667,12 c -1.1066667,0 -2,-0.893333 -2,-2 0,-1.1066667 0.8933333,-2 2,-2 1.1066666,0 2,0.8933333 2,2 0,1.106667 -0.8933334,2 -2,2 z M 8.666667,6.6666667 c -1.106667,0 -2.0000003,-0.8933334 -2.0000003,-2 0,-1.1066667 0.8933333,-2 2.0000003,-2 1.106666,0 2,0.8933333 2,2 0,1.1066666 -0.893334,2 -2,2 z m 6.666666,0 c -1.106666,0 -2,-0.8933334 -2,-2 0,-1.1066667 0.893334,-2 2,-2 1.106667,0 2,0.8933333 2,2 0,1.1066666 -0.893333,2 -2,2 z m 4,5.3333333 c -1.106666,0 -2,-0.893333 -2,-2 0,-1.1066667 0.893334,-2 2,-2 1.106667,0 2,0.8933333 2,2 0,1.106667 -0.893333,2 -2,2 z" />
+        </svg>
+    );
+}
+
+export default definePlugin({
+    name: "BetterRoleContext",
+    description: "Adds options to copy role color / edit role when right clicking roles in the user profile",
+    authors: [Devs.Ven],
+
+    start() {
+        // DeveloperMode needs to be enabled for the context menu to be shown
+        TextAndImagesSettingsStores.DeveloperMode.updateSetting(true);
+    },
+
+    contextMenus: {
+        "dev-context"(children, { id }: { id: string; }) {
+            const guild = getCurrentGuild();
+            const role = guild?.roles[id];
+            if (!role) return;
+
+            if (role.colorString) {
+                children.push(
+                    <Menu.MenuItem
+                        id="vc-copy-role-color"
+                        label="Copy Role Color"
+                        action={() => Clipboard.copy(role.colorString!)}
+                        icon={AppearanceIcon}
+                    />
+                );
+            }
+
+            if (PermissionStore.getGuildPermissionProps(guild).canManageRoles) {
+                children.push(
+                    <Menu.MenuItem
+                        id="vc-edit-role"
+                        label="Edit Role"
+                        action={async () => {
+                            await GuildSettingsActions.open(guild.id, "ROLES");
+                            GuildSettingsActions.selectRole(id);
+                        }}
+                        icon={PencilIcon}
+                    />
+                );
+            }
+        }
+    }
+});
diff --git a/src/webpack/common/settingsStores.ts b/src/webpack/common/settingsStores.ts
index 6db21949a..4a48efda6 100644
--- a/src/webpack/common/settingsStores.ts
+++ b/src/webpack/common/settingsStores.ts
@@ -6,7 +6,10 @@
 
 import { findByPropsLazy } from "@webpack";
 
-export const TextAndImagesSettingsStores = findByPropsLazy("MessageDisplayCompact");
-export const StatusSettingsStores = findByPropsLazy("ShowCurrentGame");
+import * as t from "./types/settingsStores";
+
+
+export const TextAndImagesSettingsStores = findByPropsLazy("MessageDisplayCompact") as Record<string, t.SettingsStore>;
+export const StatusSettingsStores = findByPropsLazy("ShowCurrentGame") as Record<string, t.SettingsStore>;
 
 export const UserSettingsActionCreators = findByPropsLazy("PreloadedUserSettingsActionCreators");
diff --git a/src/webpack/common/types/index.d.ts b/src/webpack/common/types/index.d.ts
index af4b5e1fb..01c968553 100644
--- a/src/webpack/common/types/index.d.ts
+++ b/src/webpack/common/types/index.d.ts
@@ -16,9 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+export * from "./classes";
 export * from "./components";
 export * from "./fluxEvents";
+export * from "./i18nMessages";
 export * from "./menu";
+export * from "./settingsStores";
 export * from "./stores";
 export * from "./utils";
-
diff --git a/src/webpack/common/types/settingsStores.ts b/src/webpack/common/types/settingsStores.ts
new file mode 100644
index 000000000..5453ca352
--- /dev/null
+++ b/src/webpack/common/types/settingsStores.ts
@@ -0,0 +1,11 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+export interface SettingsStore<T = any> {
+    getSetting(): T;
+    updateSetting(value: T): void;
+    useSetting(): T;
+}

From 688ff255d27de8b5bd611c7e678fac69c7f47032 Mon Sep 17 00:00:00 2001
From: Amia <9750071+aamiaa@users.noreply.github.com>
Date: Fri, 8 Mar 2024 04:18:18 +0100
Subject: [PATCH 372/632] fix(MutualGroupDMs): update regex (#2242)

---
 src/plugins/mutualGroupDMs/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx
index 40d5201cb..f5e4b6149 100644
--- a/src/plugins/mutualGroupDMs/index.tsx
+++ b/src/plugins/mutualGroupDMs/index.tsx
@@ -47,8 +47,8 @@ export default definePlugin({
         {
             find: ".Messages.USER_PROFILE_MODAL", // Note: the module is lazy-loaded
             replacement: {
-                match: /(?<=\.MUTUAL_GUILDS\}\),)(?=(\i\.bot).{0,20}(\(0,\i\.jsx\)\(.{0,100}id:))/,
-                replace: '($1||arguments[0].isCurrentUser)?null:$2"MUTUAL_GDMS",children:"Mutual Groups"}),'
+                match: /(?<=\.tabBarItem.{0,50}MUTUAL_GUILDS.+?}\),)(?=.+?(\(0,\i\.jsxs?\)\(.{0,100}id:))/,
+                replace: '(arguments[0].user.bot||arguments[0].isCurrentUser)?null:$1"MUTUAL_GDMS",children:"Mutual Groups"}),'
             }
         },
         {

From 10f33b3dec4f2d197f117f780a6c8283f6f1046d Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 8 Mar 2024 00:23:35 -0300
Subject: [PATCH 373/632] Make more finds use filters.componentByCode

---
 src/plugins/reviewDB/components/ReviewsView.tsx | 6 +++---
 src/webpack/common/components.ts                | 2 +-
 src/webpack/webpack.ts                          | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugins/reviewDB/components/ReviewsView.tsx b/src/plugins/reviewDB/components/ReviewsView.tsx
index eea92bb81..46bd7fb84 100644
--- a/src/plugins/reviewDB/components/ReviewsView.tsx
+++ b/src/plugins/reviewDB/components/ReviewsView.tsx
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { LazyComponent, useAwaiter, useForceUpdater } from "@utils/react";
-import { find, findByPropsLazy } from "@webpack";
+import { useAwaiter, useForceUpdater } from "@utils/react";
+import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import { Forms, React, RelationshipStore, useRef, UserStore } from "@webpack/common";
 
 import { Auth, authorize } from "../auth";
@@ -31,7 +31,7 @@ import ReviewComponent from "./ReviewComponent";
 const { Editor, Transforms } = findByPropsLazy("Editor", "Transforms");
 const { ChatInputTypes } = findByPropsLazy("ChatInputTypes");
 
-const InputComponent = LazyComponent(() => find(m => m.default?.type?.render?.toString().includes("default.CHANNEL_TEXT_AREA")).default);
+const InputComponent = findComponentByCodeLazy("default.CHANNEL_TEXT_AREA");
 const { createChannelRecordFromServer } = findByPropsLazy("createChannelRecordFromServer");
 
 interface UserProps {
diff --git a/src/webpack/common/components.ts b/src/webpack/common/components.ts
index d7bb5d759..048e65d68 100644
--- a/src/webpack/common/components.ts
+++ b/src/webpack/common/components.ts
@@ -51,7 +51,7 @@ export let Avatar: t.Avatar;
 /** css colour resolver stuff, no clue what exactly this does, just copied usage from Discord */
 export let useToken: t.useToken;
 
-export const MaskedLink = waitForComponent<t.MaskedLink>("MaskedLink", m => m?.type?.toString().includes("MASKED_LINK)"));
+export const MaskedLink = waitForComponent<t.MaskedLink>("MaskedLink", filters.componentByCode("MASKED_LINK)"));
 export const Timestamp = waitForComponent<t.Timestamp>("Timestamp", filters.byCode(".Messages.MESSAGE_EDITED_TIMESTAMP_A11Y_LABEL.format"));
 export const Flex = waitForComponent<t.Flex>("Flex", ["Justify", "Align", "Wrap"]);
 
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 0f7d8b73c..992bf38f3 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -60,6 +60,7 @@ export const filters = {
         return m => {
             if (filter(m)) return true;
             if (!m.$$typeof) return false;
+            if (m.type && m.type.render) return filter(m.type.render); // memo + forwardRef
             if (m.type) return filter(m.type); // memos
             if (m.render) return filter(m.render); // forwardRefs
             return false;

From cf7830e747a5f2ff0b1bace93a9fab13f6936477 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 8 Mar 2024 00:24:04 -0300
Subject: [PATCH 374/632] ShowHiddenChannels: Fix patches

---
 src/plugins/showHiddenChannels/index.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 919f3f3c5..2d091c24a 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -305,27 +305,27 @@ export default definePlugin({
             ]
         },
         {
-            find: ".avatars),children",
+            find: '+1]})},"overflow"))',
             replacement: [
                 {
                     // Create a variable for the channel prop
-                    match: /maxUsers:\i,users:\i.+?=(\i).+?;/,
+                    match: /maxUsers:\i,users:\i.+?}=(\i).*?;/,
                     replace: (m, props) => `${m}let{shcChannel}=${props};`
                 },
                 {
                     // Make Discord always render the plus button if the component is used inside the HiddenChannelLockScreen
                     match: /\i>0(?=&&.{0,60}renderPopout)/,
-                    replace: m => `($self.isHiddenChannel(shcChannel,true)?true:${m})`
+                    replace: m => `($self.isHiddenChannel(typeof shcChannel!=="undefined"?shcChannel:void 0,true)?true:${m})`
                 },
                 {
                     // Prevent Discord from overwriting the last children with the plus button if the overflow amount is <= 0 and the component is used inside the HiddenChannelLockScreen
                     match: /(?<=\.value\(\),(\i)=.+?length-)1(?=\]=.{0,60}renderPopout)/,
-                    replace: (_, amount) => `($self.isHiddenChannel(shcChannel,true)&&${amount}<=0?0:1)`
+                    replace: (_, amount) => `($self.isHiddenChannel(typeof shcChannel!=="undefined"?shcChannel:void 0,true)&&${amount}<=0?0:1)`
                 },
                 {
                     // Show only the plus text without overflowed children amount if the overflow amount is <= 0 and the component is used inside the HiddenChannelLockScreen
                     match: /(?<="\+",)(\i)\+1/,
-                    replace: (m, amount) => `$self.isHiddenChannel(shcChannel,true)&&${amount}<=0?"":${m}`
+                    replace: (m, amount) => `$self.isHiddenChannel(typeof shcChannel!=="undefined"?shcChannel:void 0,true)&&${amount}<=0?"":${m}`
                 }
             ]
         },

From b0d37c981e6bbb47b4b25f28d3e87488f9038bac Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 8 Mar 2024 00:29:06 -0300
Subject: [PATCH 375/632] Bump to 1.7.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dde55d311..dbf8aaf34 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.7.0",
+    "version": "1.7.1",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 992533245bc08ccaac258aaca803d362942dde74 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 8 Mar 2024 19:05:30 -0300
Subject: [PATCH 376/632] RoleColorEverywhere: Wrap roleGroupColor in
 ErrorBoundary

---
 src/plugins/roleColorEverywhere/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index 968027163..14d38e8ee 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -17,6 +17,7 @@
 */
 
 import { definePluginSettings } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { ChannelStore, GuildMemberStore, GuildStore } from "@webpack/common";
@@ -112,7 +113,7 @@ export default definePlugin({
         return colorString && parseInt(colorString.slice(1), 16);
     },
 
-    roleGroupColor({ id, count, title, guildId, label }: { id: string; count: number; title: string; guildId: string; label: string; }) {
+    roleGroupColor: ErrorBoundary.wrap(({ id, count, title, guildId, label }: { id: string; count: number; title: string; guildId: string; label: string; }) => {
         const guild = GuildStore.getGuild(guildId);
         const role = guild?.roles[id];
 
@@ -125,7 +126,7 @@ export default definePlugin({
                 {title ?? label} &mdash; {count}
             </span>
         );
-    },
+    }, { noop: true }),
 
     getVoiceProps({ user: { id: userId }, guildId }: { user: { id: string; }; guildId: string; }) {
         return {

From 497f0de9a1dc7f228a67e73b25f12c0d6fa93240 Mon Sep 17 00:00:00 2001
From: Jack <30497388+FieryFlames@users.noreply.github.com>
Date: Mon, 11 Mar 2024 10:52:11 -0400
Subject: [PATCH 377/632] chore(Decor): Change URL formula for cost savings
 (#2247)

---
 src/plugins/decor/index.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx
index 8cfd8c036..713b17d76 100644
--- a/src/plugins/decor/index.tsx
+++ b/src/plugins/decor/index.tsx
@@ -131,9 +131,10 @@ export default definePlugin({
     getDecorAvatarDecorationURL({ avatarDecoration, canAnimate }: { avatarDecoration: AvatarDecoration | null; canAnimate?: boolean; }) {
         // Only Decor avatar decorations have this SKU ID
         if (avatarDecoration?.skuId === SKU_ID) {
-            const url = new URL(`${CDN_URL}/${avatarDecoration.asset}.png`);
-            url.searchParams.set("animate", (!!canAnimate && isAnimatedAvatarDecoration(avatarDecoration.asset)).toString());
-            return url.toString();
+            const parts = avatarDecoration.asset.split("_");
+            // Remove a_ prefix if it's animated and animation is disabled
+            if (isAnimatedAvatarDecoration(avatarDecoration.asset) && !canAnimate) parts.shift();
+            return `${CDN_URL}/${parts.join("_")}.png`;
         } else if (avatarDecoration?.skuId === RAW_SKU_ID) {
             return avatarDecoration.asset;
         }

From 34390e03652f523fd92e3974feb93395bb825bec Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Mon, 11 Mar 2024 16:13:07 +0100
Subject: [PATCH 378/632] Add workaround for guild role api changes on
 canary/ptb

fixes RoleColorEverywhere, ServerInfo, PermissionViewer, BetterRoleContext
---
 src/plugins/betterRoleContext/index.tsx             |  6 ++++--
 .../components/RolesAndUsersPermissions.tsx         |  8 +++++---
 src/plugins/permissionsViewer/index.tsx             |  3 ++-
 src/plugins/permissionsViewer/utils.ts              | 13 ++++++++-----
 src/plugins/roleColorEverywhere/index.tsx           |  6 +++---
 src/plugins/serverProfile/GuildProfileModal.tsx     |  4 ++--
 src/plugins/xsOverlay.desktop/index.ts              |  3 ++-
 src/utils/discord.tsx                               | 10 +++++++++-
 8 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/plugins/betterRoleContext/index.tsx b/src/plugins/betterRoleContext/index.tsx
index 7a914293a..e73779adf 100644
--- a/src/plugins/betterRoleContext/index.tsx
+++ b/src/plugins/betterRoleContext/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { Devs } from "@utils/constants";
-import { getCurrentGuild } from "@utils/discord";
+import { getCurrentGuild, getGuildRoles } from "@utils/discord";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { Clipboard, Menu, PermissionStore, TextAndImagesSettingsStores } from "@webpack/common";
@@ -47,7 +47,9 @@ export default definePlugin({
     contextMenus: {
         "dev-context"(children, { id }: { id: string; }) {
             const guild = getCurrentGuild();
-            const role = guild?.roles[id];
+            if (!guild) return;
+
+            const role = getGuildRoles(guild.id)[id];
             if (!role) return;
 
             if (role.colorString) {
diff --git a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
index e0d25c7ab..adadc90b5 100644
--- a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
@@ -19,7 +19,7 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { InfoIcon, OwnerCrownIcon } from "@components/Icons";
-import { getUniqueUsername } from "@utils/discord";
+import { getGuildRoles, getUniqueUsername } from "@utils/discord";
 import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { ContextMenuApi, FluxDispatcher, GuildMemberStore, Menu, PermissionsBits, Text, Tooltip, useEffect, UserStore, useState, useStateFromStores } from "@webpack/common";
 import type { Guild } from "discord-types/general";
@@ -78,6 +78,8 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
     const [selectedItemIndex, selectItem] = useState(0);
     const selectedItem = permissions[selectedItemIndex];
 
+    const roles = getGuildRoles(guild.id);
+
     return (
         <ModalRoot
             {...modalProps}
@@ -100,7 +102,7 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
                         <div className={cl("perms-list")}>
                             {permissions.map((permission, index) => {
                                 const user = UserStore.getUser(permission.id ?? "");
-                                const role = guild.roles[permission.id ?? ""];
+                                const role = roles[permission.id ?? ""];
 
                                 return (
                                     <button
@@ -201,7 +203,7 @@ function RoleContextMenu({ guild, roleId, onClose }: { guild: Guild; roleId: str
                 id="vc-pw-view-as-role"
                 label="View As Role"
                 action={() => {
-                    const role = guild.roles[roleId];
+                    const role = getGuildRoles(guild.id)[roleId];
                     if (!role) return;
 
                     onClose();
diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx
index 07f073d63..79ff2a27f 100644
--- a/src/plugins/permissionsViewer/index.tsx
+++ b/src/plugins/permissionsViewer/index.tsx
@@ -21,6 +21,7 @@ import "./styles.css";
 import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
+import { getGuildRoles } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
 import { ChannelStore, GuildMemberStore, GuildStore, Menu, PermissionsBits, UserStore } from "@webpack/common";
 import type { Guild, GuildMember } from "discord-types/general";
@@ -107,7 +108,7 @@ function MenuItem(guildId: string, id?: string, type?: MenuItemParentType) {
                     }
 
                     default: {
-                        permissions = Object.values(guild.roles).map(role => ({
+                        permissions = Object.values(getGuildRoles(guild.id)).map(role => ({
                             type: PermissionType.Role,
                             ...role
                         }));
diff --git a/src/plugins/permissionsViewer/utils.ts b/src/plugins/permissionsViewer/utils.ts
index 06f293b03..11dc7e643 100644
--- a/src/plugins/permissionsViewer/utils.ts
+++ b/src/plugins/permissionsViewer/utils.ts
@@ -17,8 +17,9 @@
 */
 
 import { classNameFactory } from "@api/Styles";
+import { getGuildRoles } from "@utils/discord";
 import { wordsToTitle } from "@utils/text";
-import { GuildStore, i18n, Parser } from "@webpack/common";
+import { i18n, Parser } from "@webpack/common";
 import { Guild, GuildMember, Role } from "discord-types/general";
 import type { ReactNode } from "react";
 
@@ -67,7 +68,9 @@ export function getPermissionDescription(permission: string): ReactNode {
     return "";
 }
 
-export function getSortedRoles({ roles, id }: Guild, member: GuildMember) {
+export function getSortedRoles({ id }: Guild, member: GuildMember) {
+    const roles = getGuildRoles(id);
+
     return [...member.roles, id]
         .map(id => roles[id])
         .sort((a, b) => b.position - a.position);
@@ -85,13 +88,13 @@ export function sortUserRoles(roles: Role[]) {
 }
 
 export function sortPermissionOverwrites<T extends { id: string; type: number; }>(overwrites: T[], guildId: string) {
-    const guild = GuildStore.getGuild(guildId);
+    const roles = getGuildRoles(guildId);
 
     return overwrites.sort((a, b) => {
         if (a.type !== PermissionType.Role || b.type !== PermissionType.Role) return 0;
 
-        const roleA = guild.roles[a.id];
-        const roleB = guild.roles[b.id];
+        const roleA = roles[a.id];
+        const roleB = roles[b.id];
 
         return roleB.position - roleA.position;
     });
diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index 14d38e8ee..eea33fbd2 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -19,8 +19,9 @@
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
+import { getGuildRoles } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
-import { ChannelStore, GuildMemberStore, GuildStore } from "@webpack/common";
+import { ChannelStore, GuildMemberStore } from "@webpack/common";
 
 const settings = definePluginSettings({
     chatMentions: {
@@ -114,8 +115,7 @@ export default definePlugin({
     },
 
     roleGroupColor: ErrorBoundary.wrap(({ id, count, title, guildId, label }: { id: string; count: number; title: string; guildId: string; label: string; }) => {
-        const guild = GuildStore.getGuild(guildId);
-        const role = guild?.roles[id];
+        const role = getGuildRoles(guildId)[id];
 
         return (
             <span style={{
diff --git a/src/plugins/serverProfile/GuildProfileModal.tsx b/src/plugins/serverProfile/GuildProfileModal.tsx
index 834367e0a..dbec7836b 100644
--- a/src/plugins/serverProfile/GuildProfileModal.tsx
+++ b/src/plugins/serverProfile/GuildProfileModal.tsx
@@ -7,7 +7,7 @@
 import "./styles.css";
 
 import { classNameFactory } from "@api/Styles";
-import { openImageModal, openUserProfile } from "@utils/discord";
+import { getGuildRoles, openImageModal, openUserProfile } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { useAwaiter } from "@utils/react";
@@ -172,7 +172,7 @@ function ServerInfoTab({ guild }: GuildProps) {
         "Verification Level": ["None", "Low", "Medium", "High", "Highest"][guild.verificationLevel] || "?",
         "Nitro Boosts": `${guild.premiumSubscriberCount ?? 0} (Level ${guild.premiumTier ?? 0})`,
         "Channels": GuildChannelStore.getChannels(guild.id)?.count - 1 || "?", // - null category
-        "Roles": Object.keys(guild.roles).length - 1, // - @everyone
+        "Roles": Object.keys(getGuildRoles(guild.id)).length - 1, // - @everyone
     };
 
     return (
diff --git a/src/plugins/xsOverlay.desktop/index.ts b/src/plugins/xsOverlay.desktop/index.ts
index 5461696ec..3f7eb6e9f 100644
--- a/src/plugins/xsOverlay.desktop/index.ts
+++ b/src/plugins/xsOverlay.desktop/index.ts
@@ -7,6 +7,7 @@
 import { definePluginSettings } from "@api/Settings";
 import { makeRange } from "@components/PluginSettings/components";
 import { Devs } from "@utils/constants";
+import { getGuildRoles } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType, PluginNative } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
@@ -196,7 +197,7 @@ export default definePlugin({
 
                 if (message.mention_roles.length > 0) {
                     for (const roleId of message.mention_roles) {
-                        const role = GuildStore.getGuild(channel.guild_id).roles[roleId];
+                        const role = getGuildRoles(channel.guild_id)[roleId];
                         if (!role) continue;
                         const roleColor = role.colorString ?? `#${pingColor}`;
                         finalMsg = finalMsg.replace(`<@&${roleId}>`, `<b><color=${roleColor}>@${role.name}</color></b>`);
diff --git a/src/utils/discord.tsx b/src/utils/discord.tsx
index 74e1aefe8..08679db4b 100644
--- a/src/utils/discord.tsx
+++ b/src/utils/discord.tsx
@@ -18,7 +18,7 @@
 
 import { MessageObject } from "@api/MessageEvents";
 import { ChannelStore, ComponentDispatch, FluxDispatcher, GuildStore, InviteActions, MaskedLink, MessageActions, ModalImageClasses, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileActions, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
-import { Guild, Message, User } from "discord-types/general";
+import { Guild, Message, Role, User } from "discord-types/general";
 
 import { ImageModal, ModalRoot, ModalSize, openModal } from "./modal";
 
@@ -185,3 +185,11 @@ export async function fetchUserProfile(id: string, options?: FetchUserProfileOpt
 export function getUniqueUsername(user: User) {
     return user.discriminator === "0" ? user.username : user.tag;
 }
+
+// FIXME: remove this once discord merges the role change into stable
+export function getGuildRoles(guildId: string): Record<string, Role> {
+    if ("getRoles" in GuildStore)
+        return (GuildStore as any).getRoles(guildId);
+
+    return GuildStore.getGuild(guildId)?.roles ?? {};
+}

From 1fbc4f7ce13b8df6fec8b51daa6bce30e69808f6 Mon Sep 17 00:00:00 2001
From: Haruka <96925398+nakoyasha@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:19:35 +0200
Subject: [PATCH 379/632] fix(ServerProfile): crop banner to prevent overflow
 (#2250)

---
 src/plugins/serverProfile/styles.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/plugins/serverProfile/styles.css b/src/plugins/serverProfile/styles.css
index 87487ecba..8c88e4f40 100644
--- a/src/plugins/serverProfile/styles.css
+++ b/src/plugins/serverProfile/styles.css
@@ -4,8 +4,13 @@
 }
 
 .vc-gp-banner {
-    width: 100%;
     cursor: pointer;
+    aspect-ratio: auto 240 / 135;
+    height: 334px;
+    width: 100%;
+    object-fit: cover;
+    overflow: clip;
+    overflow-clip-margin: content-box;
 }
 
 .vc-gp-header {

From f9924d555acea0d197809a8e28449240fc6a8f04 Mon Sep 17 00:00:00 2001
From: Elvyra <88881326+EdVraz@users.noreply.github.com>
Date: Mon, 11 Mar 2024 16:31:36 +0100
Subject: [PATCH 380/632] new Plugin: FriendsSince ~ shows friend date in
 profiles (#2240)

* feat: Create friendsSince plugin

* chore: add devs entry

* fix text

* Update src/plugins/friendsSince/index.tsx

Co-authored-by: V <vendicated@riseup.net>

* refactor: Put element into its own section

* feat: add section to user profile in DMs

* escape {

* fixes

* Add README

* Wrap in ErrorBoundary

---------

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/friendsSince/README.md |  5 +++
 src/plugins/friendsSince/index.tsx | 60 ++++++++++++++++++++++++++++++
 src/utils/constants.ts             |  4 ++
 3 files changed, 69 insertions(+)
 create mode 100644 src/plugins/friendsSince/README.md
 create mode 100644 src/plugins/friendsSince/index.tsx

diff --git a/src/plugins/friendsSince/README.md b/src/plugins/friendsSince/README.md
new file mode 100644
index 000000000..ccbb09b67
--- /dev/null
+++ b/src/plugins/friendsSince/README.md
@@ -0,0 +1,5 @@
+# FriendsSince
+
+Shows when you became friends with someone in the user popout
+
+![](https://github.com/Vendicated/Vencord/assets/45497981/bb258188-ab48-4c4d-9858-1e90ba41e926)
diff --git a/src/plugins/friendsSince/index.tsx b/src/plugins/friendsSince/index.tsx
new file mode 100644
index 000000000..ab3320dfe
--- /dev/null
+++ b/src/plugins/friendsSince/index.tsx
@@ -0,0 +1,60 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+import { React, RelationshipStore } from "@webpack/common";
+
+const { Heading, Text } = findByPropsLazy("Heading", "Text");
+const container = findByPropsLazy("memberSinceContainer");
+const { getCreatedAtDate } = findByPropsLazy("getCreatedAtDate");
+const clydeMoreInfo = findByPropsLazy("clydeMoreInfo");
+const locale = findByPropsLazy("getLocale");
+const lastSection = findByPropsLazy("lastSection");
+
+export default definePlugin({
+    name: "FriendsSince",
+    description: "Shows when you became friends with someone in the user popout",
+    authors: [Devs.Elvyra],
+    patches: [
+        {
+            find: ".AnalyticsSections.USER_PROFILE}",
+            replacement: {
+                match: /\i.default,\{userId:(\i.id).{0,30}}\)/,
+                replace: "$&,$self.friendsSince({ userId: $1 })"
+            }
+        },
+        {
+            find: ".UserPopoutUpsellSource.PROFILE_PANEL,",
+            replacement: {
+                match: /\i.default,\{userId:(\i)}\)/,
+                replace: "$&,$self.friendsSince({ userId: $1 })"
+            }
+        }
+    ],
+
+    friendsSince: ErrorBoundary.wrap(({ userId }: { userId: string; }) => {
+        const friendsSince = RelationshipStore.getSince(userId);
+        if (!friendsSince) return null;
+
+        return (
+            <div className={lastSection.section}>
+                <Heading variant="eyebrow" className={clydeMoreInfo.title}>
+                    Friends Since
+                </Heading>
+
+                <div className={container.memberSinceContainer}>
+                    <Text variant="text-sm/normal" className={clydeMoreInfo.body}>
+                        {getCreatedAtDate(friendsSince, locale.getLocale())}
+                    </Text>
+                </div>
+            </div>
+        );
+    }, { noop: true })
+});
+
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index d213ce272..081eed34f 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -422,6 +422,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     Kyuuhachi: {
         name: "Kyuuhachi",
         id: 236588665420251137n,
+    },
+    Elvyra: {
+        name: "Elvyra",
+        id: 708275751816003615n,
     }
 } satisfies Record<string, Dev>);
 

From 2730eada8df7b14b7501c2d9a6f7dcb6f5c0efff Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Mon, 11 Mar 2024 16:35:21 +0100
Subject: [PATCH 381/632] Bump to v1.7.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dbf8aaf34..9d7b6347a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.7.1",
+    "version": "1.7.2",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 6e363814d1770740ff07478c947287d6775f8fcd Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Mon, 11 Mar 2024 12:37:59 -0300
Subject: [PATCH 382/632] ResurrectHome: Fix README image

---
 src/plugins/resurrectHome/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/resurrectHome/README.md b/src/plugins/resurrectHome/README.md
index 215ef816c..2d26635d2 100644
--- a/src/plugins/resurrectHome/README.md
+++ b/src/plugins/resurrectHome/README.md
@@ -2,4 +2,4 @@
 
 Brings back the phased out [Server Home](https://support.discord.com/hc/en-us/articles/6156116949911-Server-Home-Beta) feature!
 
-![](https://private-user-images.githubusercontent.com/47677887/309572891-a9ee7354-9e5e-4b81-8faf-304d9c44f512.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MDk0OTE5MTIsIm5iZiI6MTcwOTQ5MTYxMiwicGF0aCI6Ii80NzY3Nzg4Ny8zMDk1NzI4OTEtYTllZTczNTQtOWU1ZS00YjgxLThmYWYtMzA0ZDljNDRmNTEyLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDAzMDMlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwMzAzVDE4NDY1MlomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTBhYzUxMWY1MzQxNTA4NDE1MWU0YjAxNzM1NzI1YWJkMTNiZmNkNjRmYTRkZDg1ZDE5NzdkMjM0MGVjMDA0OWQmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.TPYWPRWHTJstfviT9HOaBWFkbBhokyxiDC-gOVL2dqs)
+![](https://github.com/Vendicated/Vencord/assets/61953774/98d5d667-bbb9-48b8-872d-c9b3980f6506)

From 6a7657de3fb49ca85b5da1af45a290f25c5ab464 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 12 Mar 2024 20:18:44 -0300
Subject: [PATCH 383/632] Remove getGuildRoles

---
 src/plugins/betterRoleContext/index.tsx              |  6 +++---
 .../components/RolesAndUsersPermissions.tsx          |  8 ++++----
 src/plugins/permissionsViewer/index.tsx              |  3 +--
 src/plugins/permissionsViewer/utils.ts               |  7 +++----
 src/plugins/roleColorEverywhere/index.tsx            |  5 ++---
 src/plugins/serverProfile/GuildProfileModal.tsx      |  6 +++---
 src/plugins/xsOverlay.desktop/index.ts               |  3 +--
 src/utils/discord.tsx                                | 10 +---------
 src/webpack/common/stores.ts                         |  2 +-
 src/webpack/common/types/stores.d.ts                 | 12 +++++++++++-
 10 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/src/plugins/betterRoleContext/index.tsx b/src/plugins/betterRoleContext/index.tsx
index e73779adf..3db3494f9 100644
--- a/src/plugins/betterRoleContext/index.tsx
+++ b/src/plugins/betterRoleContext/index.tsx
@@ -5,10 +5,10 @@
  */
 
 import { Devs } from "@utils/constants";
-import { getCurrentGuild, getGuildRoles } from "@utils/discord";
+import { getCurrentGuild } from "@utils/discord";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { Clipboard, Menu, PermissionStore, TextAndImagesSettingsStores } from "@webpack/common";
+import { Clipboard, GuildStore, Menu, PermissionStore, TextAndImagesSettingsStores } from "@webpack/common";
 
 const GuildSettingsActions = findByPropsLazy("open", "selectRole", "updateGuild");
 
@@ -49,7 +49,7 @@ export default definePlugin({
             const guild = getCurrentGuild();
             if (!guild) return;
 
-            const role = getGuildRoles(guild.id)[id];
+            const role = GuildStore.getRole(guild.id, id);
             if (!role) return;
 
             if (role.colorString) {
diff --git a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
index adadc90b5..c2e50cedd 100644
--- a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
@@ -19,9 +19,9 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { InfoIcon, OwnerCrownIcon } from "@components/Icons";
-import { getGuildRoles, getUniqueUsername } from "@utils/discord";
+import { getUniqueUsername } from "@utils/discord";
 import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { ContextMenuApi, FluxDispatcher, GuildMemberStore, Menu, PermissionsBits, Text, Tooltip, useEffect, UserStore, useState, useStateFromStores } from "@webpack/common";
+import { ContextMenuApi, FluxDispatcher, GuildMemberStore, GuildStore, Menu, PermissionsBits, Text, Tooltip, useEffect, UserStore, useState, useStateFromStores } from "@webpack/common";
 import type { Guild } from "discord-types/general";
 
 import { settings } from "..";
@@ -78,7 +78,7 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
     const [selectedItemIndex, selectItem] = useState(0);
     const selectedItem = permissions[selectedItemIndex];
 
-    const roles = getGuildRoles(guild.id);
+    const roles = GuildStore.getRoles(guild.id);
 
     return (
         <ModalRoot
@@ -203,7 +203,7 @@ function RoleContextMenu({ guild, roleId, onClose }: { guild: Guild; roleId: str
                 id="vc-pw-view-as-role"
                 label="View As Role"
                 action={() => {
-                    const role = getGuildRoles(guild.id)[roleId];
+                    const role = GuildStore.getRole(guild.id, roleId);
                     if (!role) return;
 
                     onClose();
diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx
index 79ff2a27f..b27a3c2f9 100644
--- a/src/plugins/permissionsViewer/index.tsx
+++ b/src/plugins/permissionsViewer/index.tsx
@@ -21,7 +21,6 @@ import "./styles.css";
 import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import { getGuildRoles } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
 import { ChannelStore, GuildMemberStore, GuildStore, Menu, PermissionsBits, UserStore } from "@webpack/common";
 import type { Guild, GuildMember } from "discord-types/general";
@@ -108,7 +107,7 @@ function MenuItem(guildId: string, id?: string, type?: MenuItemParentType) {
                     }
 
                     default: {
-                        permissions = Object.values(getGuildRoles(guild.id)).map(role => ({
+                        permissions = Object.values(GuildStore.getRoles(guild.id)).map(role => ({
                             type: PermissionType.Role,
                             ...role
                         }));
diff --git a/src/plugins/permissionsViewer/utils.ts b/src/plugins/permissionsViewer/utils.ts
index 11dc7e643..ac7537973 100644
--- a/src/plugins/permissionsViewer/utils.ts
+++ b/src/plugins/permissionsViewer/utils.ts
@@ -17,9 +17,8 @@
 */
 
 import { classNameFactory } from "@api/Styles";
-import { getGuildRoles } from "@utils/discord";
 import { wordsToTitle } from "@utils/text";
-import { i18n, Parser } from "@webpack/common";
+import { GuildStore, i18n, Parser } from "@webpack/common";
 import { Guild, GuildMember, Role } from "discord-types/general";
 import type { ReactNode } from "react";
 
@@ -69,7 +68,7 @@ export function getPermissionDescription(permission: string): ReactNode {
 }
 
 export function getSortedRoles({ id }: Guild, member: GuildMember) {
-    const roles = getGuildRoles(id);
+    const roles = GuildStore.getRoles(id);
 
     return [...member.roles, id]
         .map(id => roles[id])
@@ -88,7 +87,7 @@ export function sortUserRoles(roles: Role[]) {
 }
 
 export function sortPermissionOverwrites<T extends { id: string; type: number; }>(overwrites: T[], guildId: string) {
-    const roles = getGuildRoles(guildId);
+    const roles = GuildStore.getRoles(guildId);
 
     return overwrites.sort((a, b) => {
         if (a.type !== PermissionType.Role || b.type !== PermissionType.Role) return 0;
diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index eea33fbd2..b421eb7fa 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -19,9 +19,8 @@
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import { getGuildRoles } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
-import { ChannelStore, GuildMemberStore } from "@webpack/common";
+import { ChannelStore, GuildMemberStore, GuildStore } from "@webpack/common";
 
 const settings = definePluginSettings({
     chatMentions: {
@@ -115,7 +114,7 @@ export default definePlugin({
     },
 
     roleGroupColor: ErrorBoundary.wrap(({ id, count, title, guildId, label }: { id: string; count: number; title: string; guildId: string; label: string; }) => {
-        const role = getGuildRoles(guildId)[id];
+        const role = GuildStore.getRole(guildId, id);
 
         return (
             <span style={{
diff --git a/src/plugins/serverProfile/GuildProfileModal.tsx b/src/plugins/serverProfile/GuildProfileModal.tsx
index dbec7836b..8e6f60518 100644
--- a/src/plugins/serverProfile/GuildProfileModal.tsx
+++ b/src/plugins/serverProfile/GuildProfileModal.tsx
@@ -7,12 +7,12 @@
 import "./styles.css";
 
 import { classNameFactory } from "@api/Styles";
-import { getGuildRoles, openImageModal, openUserProfile } from "@utils/discord";
+import { openImageModal, openUserProfile } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { useAwaiter } from "@utils/react";
 import { findByPropsLazy, findExportedComponentLazy } from "@webpack";
-import { FluxDispatcher, Forms, GuildChannelStore, GuildMemberStore, IconUtils, Parser, PresenceStore, RelationshipStore, ScrollerThin, SnowflakeUtils, TabBar, Timestamp, useEffect, UserStore, UserUtils, useState, useStateFromStores } from "@webpack/common";
+import { FluxDispatcher, Forms, GuildChannelStore, GuildMemberStore, GuildStore, IconUtils, Parser, PresenceStore, RelationshipStore, ScrollerThin, SnowflakeUtils, TabBar, Timestamp, useEffect, UserStore, UserUtils, useState, useStateFromStores } from "@webpack/common";
 import { Guild, User } from "discord-types/general";
 
 const IconClasses = findByPropsLazy("icon", "acronym", "childWrapper");
@@ -172,7 +172,7 @@ function ServerInfoTab({ guild }: GuildProps) {
         "Verification Level": ["None", "Low", "Medium", "High", "Highest"][guild.verificationLevel] || "?",
         "Nitro Boosts": `${guild.premiumSubscriberCount ?? 0} (Level ${guild.premiumTier ?? 0})`,
         "Channels": GuildChannelStore.getChannels(guild.id)?.count - 1 || "?", // - null category
-        "Roles": Object.keys(getGuildRoles(guild.id)).length - 1, // - @everyone
+        "Roles": Object.keys(GuildStore.getRoles(guild.id)).length - 1, // - @everyone
     };
 
     return (
diff --git a/src/plugins/xsOverlay.desktop/index.ts b/src/plugins/xsOverlay.desktop/index.ts
index 3f7eb6e9f..763f6a782 100644
--- a/src/plugins/xsOverlay.desktop/index.ts
+++ b/src/plugins/xsOverlay.desktop/index.ts
@@ -7,7 +7,6 @@
 import { definePluginSettings } from "@api/Settings";
 import { makeRange } from "@components/PluginSettings/components";
 import { Devs } from "@utils/constants";
-import { getGuildRoles } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType, PluginNative } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
@@ -197,7 +196,7 @@ export default definePlugin({
 
                 if (message.mention_roles.length > 0) {
                     for (const roleId of message.mention_roles) {
-                        const role = getGuildRoles(channel.guild_id)[roleId];
+                        const role = GuildStore.getRole(channel.guild_id, roleId);
                         if (!role) continue;
                         const roleColor = role.colorString ?? `#${pingColor}`;
                         finalMsg = finalMsg.replace(`<@&${roleId}>`, `<b><color=${roleColor}>@${role.name}</color></b>`);
diff --git a/src/utils/discord.tsx b/src/utils/discord.tsx
index 08679db4b..74e1aefe8 100644
--- a/src/utils/discord.tsx
+++ b/src/utils/discord.tsx
@@ -18,7 +18,7 @@
 
 import { MessageObject } from "@api/MessageEvents";
 import { ChannelStore, ComponentDispatch, FluxDispatcher, GuildStore, InviteActions, MaskedLink, MessageActions, ModalImageClasses, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileActions, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
-import { Guild, Message, Role, User } from "discord-types/general";
+import { Guild, Message, User } from "discord-types/general";
 
 import { ImageModal, ModalRoot, ModalSize, openModal } from "./modal";
 
@@ -185,11 +185,3 @@ export async function fetchUserProfile(id: string, options?: FetchUserProfileOpt
 export function getUniqueUsername(user: User) {
     return user.discriminator === "0" ? user.username : user.tag;
 }
-
-// FIXME: remove this once discord merges the role change into stable
-export function getGuildRoles(guildId: string): Record<string, Role> {
-    if ("getRoles" in GuildStore)
-        return (GuildStore as any).getRoles(guildId);
-
-    return GuildStore.getGuild(guildId)?.roles ?? {};
-}
diff --git a/src/webpack/common/stores.ts b/src/webpack/common/stores.ts
index 0c470d6a6..f3a18d7bc 100644
--- a/src/webpack/common/stores.ts
+++ b/src/webpack/common/stores.ts
@@ -46,7 +46,7 @@ export let ReadStateStore: GenericStore;
 export let PresenceStore: GenericStore;
 export let PoggerModeSettingsStore: GenericStore;
 
-export let GuildStore: Stores.GuildStore & t.FluxStore;
+export let GuildStore: t.GuildStore;
 export let UserStore: Stores.UserStore & t.FluxStore;
 export let UserProfileStore: GenericStore;
 export let SelectedChannelStore: Stores.SelectedChannelStore & t.FluxStore;
diff --git a/src/webpack/common/types/stores.d.ts b/src/webpack/common/types/stores.d.ts
index ecc87d74c..8e89a6e20 100644
--- a/src/webpack/common/types/stores.d.ts
+++ b/src/webpack/common/types/stores.d.ts
@@ -17,7 +17,7 @@
 */
 
 import { DraftType } from "@webpack/common";
-import { Channel } from "discord-types/general";
+import { Channel, Guild, Role } from "discord-types/general";
 
 import { FluxDispatcher, FluxEvents } from "./utils";
 
@@ -172,3 +172,13 @@ export class DraftStore extends FluxStore {
     getThreadDraftWithParentMessageId?(arg: any): any;
     getThreadSettings(channelId: string): any | null;
 }
+
+export class GuildStore extends FluxStore {
+    getGuild(guildId: string): Guild;
+    getGuildCount(): number;
+    getGuilds(): Record<string, Guild>;
+    getGuildIds(): string[];
+    getRole(guildId: string, roleId: string): Role;
+    getRoles(guildId: string): Record<string, Role>;
+    getAllGuildRoles(): Record<string, Record<string, Role>>;
+}

From bf9a2250387b89f131d2e198a265b4e1cb33fea7 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 12 Mar 2024 20:18:46 -0300
Subject: [PATCH 384/632] HTTP Updater: Only include first commit line

---
 src/main/updater/http.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/updater/http.ts b/src/main/updater/http.ts
index 5653d0143..605e8d7cf 100644
--- a/src/main/updater/http.ts
+++ b/src/main/updater/http.ts
@@ -53,7 +53,7 @@ async function calculateGitChanges() {
         // github api only sends the long sha
         hash: c.sha.slice(0, 7),
         author: c.author.login,
-        message: c.commit.message
+        message: c.commit.message.substring(c.commit.message.indexOf("\n") + 1)
     }));
 }
 

From 7190437e92ec006ca865344d0a9c97e9ce065550 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 13 Mar 2024 00:36:42 +0100
Subject: [PATCH 385/632] rename Devs.obscurity => Devs.fawn :3

---
 src/plugins/anonymiseFileNames/index.tsx  | 2 +-
 src/plugins/betterUploadButton/index.ts   | 2 +-
 src/plugins/fakeNitro/index.tsx           | 2 +-
 src/plugins/quickReply/index.ts           | 2 +-
 src/plugins/timeBarAllActivities/index.ts | 2 +-
 src/plugins/typingIndicator/index.tsx     | 2 +-
 src/utils/constants.ts                    | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/anonymiseFileNames/index.tsx b/src/plugins/anonymiseFileNames/index.tsx
index 0382b65c2..911440230 100644
--- a/src/plugins/anonymiseFileNames/index.tsx
+++ b/src/plugins/anonymiseFileNames/index.tsx
@@ -67,7 +67,7 @@ const settings = definePluginSettings({
 
 export default definePlugin({
     name: "AnonymiseFileNames",
-    authors: [Devs.obscurity],
+    authors: [Devs.fawn],
     description: "Anonymise uploaded file names",
     patches: [
         {
diff --git a/src/plugins/betterUploadButton/index.ts b/src/plugins/betterUploadButton/index.ts
index 3eeb1e453..511d12a4a 100644
--- a/src/plugins/betterUploadButton/index.ts
+++ b/src/plugins/betterUploadButton/index.ts
@@ -21,7 +21,7 @@ import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "BetterUploadButton",
-    authors: [Devs.obscurity, Devs.Ven],
+    authors: [Devs.fawn, Devs.Ven],
     description: "Upload with a single click, open menu with right click",
     patches: [
         {
diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 68560817c..30744276e 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -185,7 +185,7 @@ const hasAttachmentPerms = (channelId: string) => hasPermission(channelId, Permi
 
 export default definePlugin({
     name: "FakeNitro",
-    authors: [Devs.Arjix, Devs.D3SOX, Devs.Ven, Devs.obscurity, Devs.captain, Devs.Nuckyz, Devs.AutumnVN],
+    authors: [Devs.Arjix, Devs.D3SOX, Devs.Ven, Devs.fawn, Devs.captain, Devs.Nuckyz, Devs.AutumnVN],
     description: "Allows you to stream in nitro quality, send fake emojis/stickers and use client themes.",
     dependencies: ["MessageEventsAPI"],
 
diff --git a/src/plugins/quickReply/index.ts b/src/plugins/quickReply/index.ts
index 118a51beb..620e1a33f 100644
--- a/src/plugins/quickReply/index.ts
+++ b/src/plugins/quickReply/index.ts
@@ -54,7 +54,7 @@ const settings = definePluginSettings({
 
 export default definePlugin({
     name: "QuickReply",
-    authors: [Devs.obscurity, Devs.Ven, Devs.pylix],
+    authors: [Devs.fawn, Devs.Ven, Devs.pylix],
     description: "Reply to (ctrl + up/down) and edit (ctrl + shift + up/down) messages via keybinds",
     settings,
 
diff --git a/src/plugins/timeBarAllActivities/index.ts b/src/plugins/timeBarAllActivities/index.ts
index ff8fd8b17..dcb809fd4 100644
--- a/src/plugins/timeBarAllActivities/index.ts
+++ b/src/plugins/timeBarAllActivities/index.ts
@@ -22,7 +22,7 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "TimeBarAllActivities",
     description: "Adds the Spotify time bar to all activities if they have start and end timestamps",
-    authors: [Devs.obscurity],
+    authors: [Devs.fawn],
     patches: [
         {
             find: "}renderTimeBar(",
diff --git a/src/plugins/typingIndicator/index.tsx b/src/plugins/typingIndicator/index.tsx
index 280301480..8bae2f53c 100644
--- a/src/plugins/typingIndicator/index.tsx
+++ b/src/plugins/typingIndicator/index.tsx
@@ -125,7 +125,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "TypingIndicator",
     description: "Adds an indicator if someone is typing on a channel.",
-    authors: [Devs.Nuckyz, Devs.obscurity],
+    authors: [Devs.Nuckyz, Devs.fawn],
     settings,
 
     patches: [
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 081eed34f..40965d08c 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -66,8 +66,8 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "botato",
         id: 440990343899643943n
     },
-    obscurity: {
-        name: "obscurity",
+    fawn: {
+        name: "fawn",
         id: 336678828233588736n,
     },
     rushii: {

From 9aa205b5ec6dc1f380fd61941a0cb9dfa74f814c Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Wed, 13 Mar 2024 21:45:45 +0100
Subject: [PATCH 386/632] rewrite settings api to use SettingsStore class
 (#2257)

Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
---
 browser/VencordNativeStub.ts                  |  12 +-
 src/VencordNative.ts                          |   9 +-
 src/api/Settings.ts                           | 159 +++++----------
 src/components/VencordSettings/ThemesTab.tsx  |   2 +-
 src/components/VencordSettings/VencordTab.tsx |  15 +-
 src/main/index.ts                             |   5 +-
 src/main/ipcMain.ts                           |  36 +---
 src/main/patcher.ts                           |  12 +-
 src/main/settings.ts                          |  53 +++++
 src/main/utils/constants.ts                   |   1 +
 .../fixSpotifyEmbeds.desktop/native.ts        |   4 +-
 .../fixYoutubeEmbeds.desktop/native.ts        |   4 +-
 src/shared/SettingsStore.ts                   | 182 ++++++++++++++++++
 src/utils/quickCss.ts                         |   8 +-
 src/utils/settingsSync.ts                     |   8 +-
 tsconfig.json                                 |   6 +-
 16 files changed, 336 insertions(+), 180 deletions(-)
 create mode 100644 src/main/settings.ts
 create mode 100644 src/shared/SettingsStore.ts

diff --git a/browser/VencordNativeStub.ts b/browser/VencordNativeStub.ts
index 70fc1cf9d..77c72369c 100644
--- a/browser/VencordNativeStub.ts
+++ b/browser/VencordNativeStub.ts
@@ -26,6 +26,7 @@ import { debounce } from "../src/utils";
 import { EXTENSION_BASE_URL } from "../src/utils/web-metadata";
 import { getTheme, Theme } from "../src/utils/discord";
 import { getThemeInfo } from "../src/main/themes";
+import { Settings } from "../src/Vencord";
 
 // Discord deletes this so need to store in variable
 const { localStorage } = window;
@@ -96,8 +97,15 @@ window.VencordNative = {
     },
 
     settings: {
-        get: () => localStorage.getItem("VencordSettings") || "{}",
-        set: async (s: string) => localStorage.setItem("VencordSettings", s),
+        get: () => {
+            try {
+                return JSON.parse(localStorage.getItem("VencordSettings") || "{}");
+            } catch (e) {
+                console.error("Failed to parse settings from localStorage: ", e);
+                return {};
+            }
+        },
+        set: async (s: Settings) => localStorage.setItem("VencordSettings", JSON.stringify(s)),
         getSettingsDir: async () => "LocalStorage"
     },
 
diff --git a/src/VencordNative.ts b/src/VencordNative.ts
index 0faa5569b..10381c900 100644
--- a/src/VencordNative.ts
+++ b/src/VencordNative.ts
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { PluginIpcMappings } from "@main/ipcPlugins";
+import type { UserThemeHeader } from "@main/themes";
 import { IpcEvents } from "@utils/IpcEvents";
 import { IpcRes } from "@utils/types";
+import type { Settings } from "api/Settings";
 import { ipcRenderer } from "electron";
-import { PluginIpcMappings } from "main/ipcPlugins";
-import type { UserThemeHeader } from "main/themes";
 
 function invoke<T = any>(event: IpcEvents, ...args: any[]) {
     return ipcRenderer.invoke(event, ...args) as Promise<T>;
@@ -46,8 +47,8 @@ export default {
     },
 
     settings: {
-        get: () => sendSync<string>(IpcEvents.GET_SETTINGS),
-        set: (settings: string) => invoke<void>(IpcEvents.SET_SETTINGS, settings),
+        get: () => sendSync<Settings>(IpcEvents.GET_SETTINGS),
+        set: (settings: Settings, pathToNotify?: string) => invoke<void>(IpcEvents.SET_SETTINGS, settings, pathToNotify),
         getSettingsDir: () => invoke<string>(IpcEvents.GET_SETTINGS_DIR),
     },
 
diff --git a/src/api/Settings.ts b/src/api/Settings.ts
index c1ff6915b..bd4a4e929 100644
--- a/src/api/Settings.ts
+++ b/src/api/Settings.ts
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { SettingsStore as SettingsStoreClass } from "@shared/SettingsStore";
 import { debounce } from "@utils/debounce";
 import { localStorage } from "@utils/localStorage";
 import { Logger } from "@utils/Logger";
@@ -52,7 +53,6 @@ export interface Settings {
     | "under-page"
     | "window"
     | undefined;
-    macosTranslucency: boolean | undefined;
     disableMinSize: boolean;
     winNativeTitleBar: boolean;
     plugins: {
@@ -88,8 +88,6 @@ const DefaultSettings: Settings = {
     frameless: false,
     transparent: false,
     winCtrlQ: false,
-    // Replaced by macosVibrancyStyle
-    macosTranslucency: undefined,
     macosVibrancyStyle: undefined,
     disableMinSize: false,
     winNativeTitleBar: false,
@@ -110,13 +108,8 @@ const DefaultSettings: Settings = {
     }
 };
 
-try {
-    var settings = JSON.parse(VencordNative.settings.get()) as Settings;
-    mergeDefaults(settings, DefaultSettings);
-} catch (err) {
-    var settings = mergeDefaults({} as Settings, DefaultSettings);
-    logger.error("An error occurred while loading the settings. Corrupt settings file?\n", err);
-}
+const settings = VencordNative.settings.get();
+mergeDefaults(settings, DefaultSettings);
 
 const saveSettingsOnFrequentAction = debounce(async () => {
     if (Settings.cloud.settingsSync && Settings.cloud.authenticated) {
@@ -125,76 +118,52 @@ const saveSettingsOnFrequentAction = debounce(async () => {
     }
 }, 60_000);
 
-type SubscriptionCallback = ((newValue: any, path: string) => void) & { _paths?: Array<string>; };
-const subscriptions = new Set<SubscriptionCallback>();
 
-const proxyCache = {} as Record<string, any>;
+export const SettingsStore = new SettingsStoreClass(settings, {
+    readOnly: true,
+    getDefaultValue({
+        target,
+        key,
+        path
+    }) {
+        const v = target[key];
+        if (!plugins) return v; // plugins not initialised yet. this means this path was reached by being called on the top level
 
-// 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 proxyCache[path] ??= new Proxy(settings, {
-        get(target, p: string) {
-            const v = target[p];
+        if (path === "plugins" && key in plugins)
+            return target[key] = {
+                enabled: plugins[key].required ?? plugins[key].enabledByDefault ?? false
+            };
 
-            // using "in" is important in the following cases to properly handle falsy or nullish values
-            if (!(p in target)) {
-                // Return empty for plugins with no settings
-                if (path === "plugins" && p in plugins)
-                    return target[p] = makeProxy({
-                        enabled: plugins[p].required ?? plugins[p].enabledByDefault ?? false
-                    }, 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.
+        if (path.startsWith("plugins.")) {
+            const plugin = path.slice("plugins.".length);
+            if (plugin in plugins) {
+                const setting = plugins[plugin].options?.[key];
+                if (!setting) return v;
 
-                // Since the property is not set, check if this is a plugin's setting and if so, try to resolve
-                // the default value.
-                if (path.startsWith("plugins.")) {
-                    const plugin = path.slice("plugins.".length);
-                    if (plugin in plugins) {
-                        const setting = plugins[plugin].options?.[p];
-                        if (!setting) return v;
-                        if ("default" in setting)
-                            // normal setting with a default value
-                            return (target[p] = setting.default);
-                        if (setting.type === OptionType.SELECT) {
-                            const def = setting.options.find(o => o.default);
-                            if (def)
-                                target[p] = def.value;
-                            return def?.value;
-                        }
-                    }
-                }
-                return v;
-            }
+                if ("default" in setting)
+                    // normal setting with a default value
+                    return (target[key] = setting.default);
 
-            // Recursively proxy Objects with the updated property path
-            if (typeof v === "object" && !Array.isArray(v) && v !== null)
-                return makeProxy(v, root, `${path}${path && "."}${p}`);
-
-            // primitive or similar, no need to proxy further
-            return v;
-        },
-
-        set(target, p: string, v) {
-            // avoid unnecessary updates to React Components and other listeners
-            if (target[p] === v) return true;
-
-            target[p] = v;
-            // Call any listeners that are listening to a setting of this path
-            const setPath = `${path}${path && "."}${p}`;
-            delete proxyCache[setPath];
-            for (const subscription of subscriptions) {
-                if (!subscription._paths || subscription._paths.includes(setPath)) {
-                    subscription(v, setPath);
+                if (setting.type === OptionType.SELECT) {
+                    const def = setting.options.find(o => o.default);
+                    if (def)
+                        target[key] = def.value;
+                    return def?.value;
                 }
             }
-            // And don't forget to persist the settings!
-            PlainSettings.cloud.settingsSyncVersion = Date.now();
-            localStorage.Vencord_settingsDirty = true;
-            saveSettingsOnFrequentAction();
-            VencordNative.settings.set(JSON.stringify(root, null, 4));
-            return true;
         }
-    });
-}
+        return v;
+    }
+});
+
+SettingsStore.addGlobalChangeListener((_, path) => {
+    SettingsStore.plain.cloud.settingsSyncVersion = Date.now();
+    localStorage.Vencord_settingsDirty = true;
+    saveSettingsOnFrequentAction();
+    VencordNative.settings.set(SettingsStore.plain, path);
+});
 
 /**
  * Same as {@link Settings} but unproxied. You should treat this as readonly,
@@ -210,7 +179,7 @@ export const PlainSettings = settings;
  * the updated settings to disk.
  * This recursively proxies objects. If you need the object non proxied, use {@link PlainSettings}
  */
-export const Settings = makeProxy(settings);
+export const Settings = SettingsStore.store;
 
 /**
  * Settings hook for React components. Returns a smart settings
@@ -223,45 +192,21 @@ export const Settings = makeProxy(settings);
 export function useSettings(paths?: UseSettings<Settings>[]) {
     const [, forceUpdate] = React.useReducer(() => ({}), {});
 
-    if (paths) {
-        (forceUpdate as SubscriptionCallback)._paths = paths;
-    }
-
     React.useEffect(() => {
-        subscriptions.add(forceUpdate);
-        return () => void subscriptions.delete(forceUpdate);
+        if (paths) {
+            paths.forEach(p => SettingsStore.addChangeListener(p, forceUpdate));
+            return () => paths.forEach(p => SettingsStore.removeChangeListener(p, forceUpdate));
+        } else {
+            SettingsStore.addGlobalChangeListener(forceUpdate);
+            return () => SettingsStore.removeGlobalChangeListener(forceUpdate);
+        }
     }, []);
 
-    return Settings;
-}
-
-// Resolves a possibly nested prop in the form of "some.nested.prop" to type of T.some.nested.prop
-type ResolvePropDeep<T, P> = P extends "" ? T :
-    P extends `${infer Pre}.${infer Suf}` ?
-    Pre extends keyof T ? ResolvePropDeep<T[Pre], Suf> : never : P extends keyof T ? T[P] : never;
-
-/**
- * Add a settings listener that will be invoked whenever the desired setting is updated
- * @param path Path to the setting that you want to watch, for example "plugins.Unindent.enabled" will fire your callback
- *             whenever Unindent is toggled. Pass an empty string to get notified for all changes
- * @param onUpdate Callback function whenever a setting matching path is updated. It gets passed the new value and the path
- *                 to the updated setting. This path will be the same as your path argument, unless it was an empty string.
- *
- * @example addSettingsListener("", (newValue, path) => console.log(`${path} is now ${newValue}`))
- *          addSettingsListener("plugins.Unindent.enabled", v => console.log("Unindent is now", v ? "enabled" : "disabled"))
- */
-export function addSettingsListener<Path extends keyof Settings>(path: Path, onUpdate: (newValue: Settings[Path], path: Path) => void): void;
-export function addSettingsListener<Path extends string>(path: Path, onUpdate: (newValue: Path extends "" ? any : ResolvePropDeep<Settings, Path>, path: Path extends "" ? string : Path) => void): void;
-export function addSettingsListener(path: string, onUpdate: (newValue: any, path: string) => void) {
-    if (path) {
-        ((onUpdate as SubscriptionCallback)._paths ??= []).push(path);
-    }
-
-    subscriptions.add(onUpdate);
+    return SettingsStore.store;
 }
 
 export function migratePluginSettings(name: string, ...oldNames: string[]) {
-    const { plugins } = settings;
+    const { plugins } = SettingsStore.plain;
     if (name in plugins) return;
 
     for (const oldName of oldNames) {
@@ -269,7 +214,7 @@ export function migratePluginSettings(name: string, ...oldNames: string[]) {
             logger.info(`Migrating settings from old name ${oldName} to ${name}`);
             plugins[name] = plugins[oldName];
             delete plugins[oldName];
-            VencordNative.settings.set(JSON.stringify(settings, null, 4));
+            SettingsStore.markAsChanged();
             break;
         }
     }
diff --git a/src/components/VencordSettings/ThemesTab.tsx b/src/components/VencordSettings/ThemesTab.tsx
index 8abaaba4f..2eb91cb82 100644
--- a/src/components/VencordSettings/ThemesTab.tsx
+++ b/src/components/VencordSettings/ThemesTab.tsx
@@ -22,6 +22,7 @@ import { Flex } from "@components/Flex";
 import { DeleteIcon } from "@components/Icons";
 import { Link } from "@components/Link";
 import PluginModal from "@components/PluginSettings/PluginModal";
+import type { UserThemeHeader } from "@main/themes";
 import { openInviteModal } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
@@ -30,7 +31,6 @@ import { showItemInFolder } from "@utils/native";
 import { useAwaiter } from "@utils/react";
 import { findByPropsLazy, findLazy } from "@webpack";
 import { Button, Card, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
-import { UserThemeHeader } from "main/themes";
 import type { ComponentType, Ref, SyntheticEvent } from "react";
 
 import { AddonCard } from "./AddonCard";
diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx
index ab910ea2a..c0a66fdc7 100644
--- a/src/components/VencordSettings/VencordTab.tsx
+++ b/src/components/VencordSettings/VencordTab.tsx
@@ -50,14 +50,6 @@ function VencordSettings() {
     const isMac = navigator.platform.toLowerCase().startsWith("mac");
     const needsVibrancySettings = IS_DISCORD_DESKTOP && isMac;
 
-    // One-time migration of the old setting to the new one if necessary.
-    React.useEffect(() => {
-        if (settings.macosTranslucency === true && !settings.macosVibrancyStyle) {
-            settings.macosVibrancyStyle = "sidebar";
-            settings.macosTranslucency = undefined;
-        }
-    }, []);
-
     const Switches: Array<false | {
         key: KeysOfType<typeof settings, boolean>;
         title: string;
@@ -164,7 +156,7 @@ function VencordSettings() {
                     options={[
                         // Sorted from most opaque to most transparent
                         {
-                            label: "No vibrancy", default: !settings.macosTranslucency, value: undefined
+                            label: "No vibrancy", value: undefined
                         },
                         {
                             label: "Under Page (window tinting)",
@@ -191,9 +183,8 @@ function VencordSettings() {
                             value: "header"
                         },
                         {
-                            label: "Sidebar (old value for transparent windows)",
-                            value: "sidebar",
-                            default: settings.macosTranslucency
+                            label: "Sidebar",
+                            value: "sidebar"
                         },
                         {
                             label: "Tooltip",
diff --git a/src/main/index.ts b/src/main/index.ts
index 481736a98..5519d47ac 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -19,7 +19,8 @@
 import { app, protocol, session } from "electron";
 import { join } from "path";
 
-import { ensureSafePath, getSettings } from "./ipcMain";
+import { ensureSafePath } from "./ipcMain";
+import { RendererSettings } from "./settings";
 import { IS_VANILLA, THEMES_DIR } from "./utils/constants";
 import { installExt } from "./utils/extensions";
 
@@ -55,7 +56,7 @@ if (IS_VESKTOP || !IS_VANILLA) {
         });
 
         try {
-            if (getSettings().enableReactDevtools)
+            if (RendererSettings.store.enableReactDevtools)
                 installExt("fmkadmapgofadopljbjfkapdkoienihi")
                     .then(() => console.info("[Vencord] Installed React Developer Tools"))
                     .catch(err => console.error("[Vencord] Failed to install React Developer Tools", err));
diff --git a/src/main/ipcMain.ts b/src/main/ipcMain.ts
index 3ac8a14c5..609a581a7 100644
--- a/src/main/ipcMain.ts
+++ b/src/main/ipcMain.ts
@@ -18,22 +18,21 @@
 
 import "./updater";
 import "./ipcPlugins";
+import "./settings";
 
 import { debounce } from "@utils/debounce";
 import { IpcEvents } from "@utils/IpcEvents";
-import { Queue } from "@utils/Queue";
 import { BrowserWindow, ipcMain, shell, systemPreferences } from "electron";
-import { FSWatcher, mkdirSync, readFileSync, watch } from "fs";
-import { open, readdir, readFile, writeFile } from "fs/promises";
+import { FSWatcher, mkdirSync, watch, writeFileSync } from "fs";
+import { open, readdir, readFile } from "fs/promises";
 import { join, normalize } from "path";
 
 import monacoHtml from "~fileContent/monacoWin.html;base64";
 
 import { getThemeInfo, stripBOM, UserThemeHeader } from "./themes";
-import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE, THEMES_DIR } from "./utils/constants";
+import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, THEMES_DIR } from "./utils/constants";
 import { makeLinksOpenExternally } from "./utils/externalLinks";
 
-mkdirSync(SETTINGS_DIR, { recursive: true });
 mkdirSync(THEMES_DIR, { recursive: true });
 
 export function ensureSafePath(basePath: string, path: string) {
@@ -71,22 +70,6 @@ function getThemeData(fileName: string) {
     return readFile(safePath, "utf-8");
 }
 
-export function readSettings() {
-    try {
-        return readFileSync(SETTINGS_FILE, "utf-8");
-    } catch {
-        return "{}";
-    }
-}
-
-export function getSettings(): typeof import("@api/Settings").Settings {
-    try {
-        return JSON.parse(readSettings());
-    } catch {
-        return {} as any;
-    }
-}
-
 ipcMain.handle(IpcEvents.OPEN_QUICKCSS, () => shell.openPath(QUICKCSS_PATH));
 
 ipcMain.handle(IpcEvents.OPEN_EXTERNAL, (_, url) => {
@@ -101,12 +84,10 @@ ipcMain.handle(IpcEvents.OPEN_EXTERNAL, (_, url) => {
     shell.openExternal(url);
 });
 
-const cssWriteQueue = new Queue();
-const settingsWriteQueue = new Queue();
 
 ipcMain.handle(IpcEvents.GET_QUICK_CSS, () => readCss());
 ipcMain.handle(IpcEvents.SET_QUICK_CSS, (_, css) =>
-    cssWriteQueue.push(() => writeFile(QUICKCSS_PATH, css))
+    writeFileSync(QUICKCSS_PATH, css)
 );
 
 ipcMain.handle(IpcEvents.GET_THEMES_DIR, () => THEMES_DIR);
@@ -117,13 +98,6 @@ ipcMain.handle(IpcEvents.GET_THEME_SYSTEM_VALUES, () => ({
     "os-accent-color": `#${systemPreferences.getAccentColor?.() || ""}`
 }));
 
-ipcMain.handle(IpcEvents.GET_SETTINGS_DIR, () => SETTINGS_DIR);
-ipcMain.on(IpcEvents.GET_SETTINGS, e => e.returnValue = readSettings());
-
-ipcMain.handle(IpcEvents.SET_SETTINGS, (_, s) => {
-    settingsWriteQueue.push(() => writeFile(SETTINGS_FILE, s));
-});
-
 
 export function initIpc(mainWindow: BrowserWindow) {
     let quickCssWatcher: FSWatcher | undefined;
diff --git a/src/main/patcher.ts b/src/main/patcher.ts
index 3ee44d92c..ff63ec82d 100644
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@@ -20,7 +20,8 @@ import { onceDefined } from "@utils/onceDefined";
 import electron, { app, BrowserWindowConstructorOptions, Menu } from "electron";
 import { dirname, join } from "path";
 
-import { getSettings, initIpc } from "./ipcMain";
+import { initIpc } from "./ipcMain";
+import { RendererSettings } from "./settings";
 import { IS_VANILLA } from "./utils/constants";
 
 console.log("[Vencord] Starting up...");
@@ -41,8 +42,7 @@ require.main!.filename = join(asarPath, discordPkg.main);
 app.setAppPath(asarPath);
 
 if (!IS_VANILLA) {
-    const settings = getSettings();
-
+    const settings = RendererSettings.store;
     // Repatch after host updates on Windows
     if (process.platform === "win32") {
         require("./patchWin32Updater");
@@ -84,13 +84,11 @@ if (!IS_VANILLA) {
                     options.backgroundColor = "#00000000";
                 }
 
-                const needsVibrancy = process.platform === "darwin" || (settings.macosVibrancyStyle || settings.macosTranslucency);
+                const needsVibrancy = process.platform === "darwin" && settings.macosVibrancyStyle;
 
                 if (needsVibrancy) {
                     options.backgroundColor = "#00000000";
-                    if (settings.macosTranslucency) {
-                        options.vibrancy = "sidebar";
-                    } else if (settings.macosVibrancyStyle) {
+                    if (settings.macosVibrancyStyle) {
                         options.vibrancy = settings.macosVibrancyStyle;
                     }
                 }
diff --git a/src/main/settings.ts b/src/main/settings.ts
new file mode 100644
index 000000000..6fe2c3be7
--- /dev/null
+++ b/src/main/settings.ts
@@ -0,0 +1,53 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import type { Settings } from "@api/Settings";
+import { SettingsStore } from "@shared/SettingsStore";
+import { IpcEvents } from "@utils/IpcEvents";
+import { ipcMain } from "electron";
+import { mkdirSync, readFileSync, writeFileSync } from "fs";
+
+import { NATIVE_SETTINGS_FILE, SETTINGS_DIR, SETTINGS_FILE } from "./utils/constants";
+
+mkdirSync(SETTINGS_DIR, { recursive: true });
+
+function readSettings<T = object>(name: string, file: string): Partial<T> {
+    try {
+        return JSON.parse(readFileSync(file, "utf-8"));
+    } catch (err: any) {
+        if (err?.code !== "ENOENT")
+            console.error(`Failed to read ${name} settings`, err);
+
+        return {};
+    }
+}
+
+export const RendererSettings = new SettingsStore(readSettings<Settings>("renderer", SETTINGS_FILE));
+
+RendererSettings.addGlobalChangeListener(() => {
+    try {
+        writeFileSync(SETTINGS_FILE, JSON.stringify(RendererSettings.plain, null, 4));
+    } catch (e) {
+        console.error("Failed to write renderer settings", e);
+    }
+});
+
+ipcMain.handle(IpcEvents.GET_SETTINGS_DIR, () => SETTINGS_DIR);
+ipcMain.on(IpcEvents.GET_SETTINGS, e => e.returnValue = RendererSettings.plain);
+
+ipcMain.handle(IpcEvents.SET_SETTINGS, (_, data: Settings, pathToNotify?: string) => {
+    RendererSettings.setData(data, pathToNotify);
+});
+
+export const NativeSettings = new SettingsStore(readSettings("native", NATIVE_SETTINGS_FILE));
+
+NativeSettings.addGlobalChangeListener(() => {
+    try {
+        writeFileSync(NATIVE_SETTINGS_FILE, JSON.stringify(NativeSettings.plain, null, 4));
+    } catch (e) {
+        console.error("Failed to write native settings", e);
+    }
+});
diff --git a/src/main/utils/constants.ts b/src/main/utils/constants.ts
index cd6e509f7..6c076c328 100644
--- a/src/main/utils/constants.ts
+++ b/src/main/utils/constants.ts
@@ -28,6 +28,7 @@ export const SETTINGS_DIR = join(DATA_DIR, "settings");
 export const THEMES_DIR = join(DATA_DIR, "themes");
 export const QUICKCSS_PATH = join(SETTINGS_DIR, "quickCss.css");
 export const SETTINGS_FILE = join(SETTINGS_DIR, "settings.json");
+export const NATIVE_SETTINGS_FILE = join(SETTINGS_DIR, "native-settings.json");
 export const ALLOWED_PROTOCOLS = [
     "https:",
     "http:",
diff --git a/src/plugins/fixSpotifyEmbeds.desktop/native.ts b/src/plugins/fixSpotifyEmbeds.desktop/native.ts
index f779c400a..e15e4a441 100644
--- a/src/plugins/fixSpotifyEmbeds.desktop/native.ts
+++ b/src/plugins/fixSpotifyEmbeds.desktop/native.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { RendererSettings } from "@main/settings";
 import { app } from "electron";
-import { getSettings } from "main/ipcMain";
 
 app.on("browser-window-created", (_, win) => {
     win.webContents.on("frame-created", (_, { frame }) => {
         frame.once("dom-ready", () => {
             if (frame.url.startsWith("https://open.spotify.com/embed/")) {
-                const settings = getSettings().plugins?.FixSpotifyEmbeds;
+                const settings = RendererSettings.store.plugins?.FixSpotifyEmbeds;
                 if (!settings?.enabled) return;
 
                 frame.executeJavaScript(`
diff --git a/src/plugins/fixYoutubeEmbeds.desktop/native.ts b/src/plugins/fixYoutubeEmbeds.desktop/native.ts
index d5c2df363..003cba9e3 100644
--- a/src/plugins/fixYoutubeEmbeds.desktop/native.ts
+++ b/src/plugins/fixYoutubeEmbeds.desktop/native.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { RendererSettings } from "@main/settings";
 import { app } from "electron";
-import { getSettings } from "main/ipcMain";
 
 app.on("browser-window-created", (_, win) => {
     win.webContents.on("frame-created", (_, { frame }) => {
         frame.once("dom-ready", () => {
             if (frame.url.startsWith("https://www.youtube.com/")) {
-                const settings = getSettings().plugins?.FixYoutubeEmbeds;
+                const settings = RendererSettings.store.plugins?.FixYoutubeEmbeds;
                 if (!settings?.enabled) return;
 
                 frame.executeJavaScript(`
diff --git a/src/shared/SettingsStore.ts b/src/shared/SettingsStore.ts
new file mode 100644
index 000000000..4109704bc
--- /dev/null
+++ b/src/shared/SettingsStore.ts
@@ -0,0 +1,182 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { LiteralUnion } from "type-fest";
+
+// Resolves a possibly nested prop in the form of "some.nested.prop" to type of T.some.nested.prop
+type ResolvePropDeep<T, P> = P extends `${infer Pre}.${infer Suf}`
+    ? Pre extends keyof T
+    ? ResolvePropDeep<T[Pre], Suf>
+    : any
+    : P extends keyof T
+    ? T[P]
+    : any;
+
+interface SettingsStoreOptions {
+    readOnly?: boolean;
+    getDefaultValue?: (data: {
+        target: any;
+        key: string;
+        root: any;
+        path: string;
+    }) => any;
+}
+
+// merges the SettingsStoreOptions type into the class
+export interface SettingsStore<T extends object> extends SettingsStoreOptions { }
+
+/**
+ * The SettingsStore allows you to easily create a mutable store that
+ * has support for global and path-based change listeners.
+ */
+export class SettingsStore<T extends object> {
+    private pathListeners = new Map<string, Set<(newData: any) => void>>();
+    private globalListeners = new Set<(newData: T, path: string) => void>();
+
+    /**
+     * The store object. Making changes to this object will trigger the applicable change listeners
+     */
+    public declare store: T;
+    /**
+     * The plain data. Changes to this object will not trigger any change listeners
+     */
+    public declare plain: T;
+
+    public constructor(plain: T, options: SettingsStoreOptions = {}) {
+        this.plain = plain;
+        this.store = this.makeProxy(plain);
+        Object.assign(this, options);
+    }
+
+    private makeProxy(object: any, root: T = object, path: string = "") {
+        const self = this;
+
+        return new Proxy(object, {
+            get(target, key: string) {
+                let v = target[key];
+
+                if (!(key in target) && self.getDefaultValue) {
+                    v = self.getDefaultValue({
+                        target,
+                        key,
+                        root,
+                        path
+                    });
+                }
+
+                if (typeof v === "object" && v !== null && !Array.isArray(v))
+                    return self.makeProxy(v, root, `${path}${path && "."}${key}`);
+
+                return v;
+            },
+            set(target, key: string, value) {
+                if (target[key] === value) return true;
+
+                Reflect.set(target, key, value);
+                const setPath = `${path}${path && "."}${key}`;
+
+                self.globalListeners.forEach(cb => cb(value, setPath));
+                self.pathListeners.get(setPath)?.forEach(cb => cb(value));
+
+                return true;
+            }
+        });
+    }
+
+    /**
+     * Set the data of the store.
+     * This will update this.store and this.plain (and old references to them will be stale! Avoid storing them in variables)
+     *
+     * Additionally, all global listeners (and those for pathToNotify, if specified) will be called with the new data
+     * @param value New data
+     * @param pathToNotify Optional path to notify instead of globally. Used to transfer path via ipc
+     */
+    public setData(value: T, pathToNotify?: string) {
+        if (this.readOnly) throw new Error("SettingsStore is read-only");
+
+        this.plain = value;
+        this.store = this.makeProxy(value);
+
+        if (pathToNotify) {
+            let v = value;
+
+            const path = pathToNotify.split(".");
+            for (const p of path) {
+                if (!v) {
+                    console.warn(
+                        `Settings#setData: Path ${pathToNotify} does not exist in new data. Not dispatching update`
+                    );
+                    return;
+                }
+                v = v[p];
+            }
+
+            this.pathListeners.get(pathToNotify)?.forEach(cb => cb(v));
+        }
+
+        this.markAsChanged();
+    }
+
+    /**
+     * Add a global change listener, that will fire whenever any setting is changed
+     *
+     * @param data The new data. This is either the new value set on the path, or the new root object if it was changed
+     * @param path The path of the setting that was changed. Empty string if the root object was changed
+     */
+    public addGlobalChangeListener(cb: (data: any, path: string) => void) {
+        this.globalListeners.add(cb);
+    }
+
+    /**
+     * Add a scoped change listener that will fire whenever a setting matching the specified path is changed.
+     *
+     * For example if path is `"foo.bar"`, the listener will fire on
+     * ```js
+     * Setting.store.foo.bar = "hi"
+     * ```
+     * but not on
+     * ```js
+     * Setting.store.foo.baz = "hi"
+     * ```
+     * @param path
+     * @param cb
+     */
+    public addChangeListener<P extends LiteralUnion<keyof T, string>>(
+        path: P,
+        cb: (data: ResolvePropDeep<T, P>) => void
+    ) {
+        const listeners = this.pathListeners.get(path as string) ?? new Set();
+        listeners.add(cb);
+        this.pathListeners.set(path as string, listeners);
+    }
+
+    /**
+     * Remove a global listener
+     * @see {@link addGlobalChangeListener}
+     */
+    public removeGlobalChangeListener(cb: (data: any, path: string) => void) {
+        this.globalListeners.delete(cb);
+    }
+
+    /**
+     * Remove a scoped listener
+     * @see {@link addChangeListener}
+     */
+    public removeChangeListener(path: LiteralUnion<keyof T, string>, cb: (data: any) => void) {
+        const listeners = this.pathListeners.get(path as string);
+        if (!listeners) return;
+
+        listeners.delete(cb);
+        if (!listeners.size) this.pathListeners.delete(path as string);
+    }
+
+    /**
+     * Call all global change listeners
+     */
+    public markAsChanged() {
+        this.globalListeners.forEach(cb => cb(this.plain, ""));
+    }
+}
diff --git a/src/utils/quickCss.ts b/src/utils/quickCss.ts
index 81320319d..99f06004c 100644
--- a/src/utils/quickCss.ts
+++ b/src/utils/quickCss.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addSettingsListener, Settings } from "@api/Settings";
+import { Settings, SettingsStore } from "@api/Settings";
 
 
 let style: HTMLStyleElement;
@@ -81,10 +81,10 @@ document.addEventListener("DOMContentLoaded", () => {
     initThemes();
 
     toggle(Settings.useQuickCss);
-    addSettingsListener("useQuickCss", toggle);
+    SettingsStore.addChangeListener("useQuickCss", toggle);
 
-    addSettingsListener("themeLinks", initThemes);
-    addSettingsListener("enabledThemes", initThemes);
+    SettingsStore.addChangeListener("themeLinks", initThemes);
+    SettingsStore.addChangeListener("enabledThemes", initThemes);
 
     if (!IS_WEB)
         VencordNative.quickCss.addThemeChangeListener(initThemes);
diff --git a/src/utils/settingsSync.ts b/src/utils/settingsSync.ts
index 9a0f260af..843922f2f 100644
--- a/src/utils/settingsSync.ts
+++ b/src/utils/settingsSync.ts
@@ -36,14 +36,14 @@ export async function importSettings(data: string) {
 
     if ("settings" in parsed && "quickCss" in parsed) {
         Object.assign(PlainSettings, parsed.settings);
-        await VencordNative.settings.set(JSON.stringify(parsed.settings, null, 4));
+        await VencordNative.settings.set(parsed.settings);
         await VencordNative.quickCss.set(parsed.quickCss);
     } else
         throw new Error("Invalid Settings. Is this even a Vencord Settings file?");
 }
 
 export async function exportSettings({ minify }: { minify?: boolean; } = {}) {
-    const settings = JSON.parse(VencordNative.settings.get());
+    const settings = VencordNative.settings.get();
     const quickCss = await VencordNative.quickCss.get();
     return JSON.stringify({ settings, quickCss }, null, minify ? undefined : 4);
 }
@@ -137,7 +137,7 @@ export async function putCloudSettings(manual?: boolean) {
 
         const { written } = await res.json();
         PlainSettings.cloud.settingsSyncVersion = written;
-        VencordNative.settings.set(JSON.stringify(PlainSettings, null, 4));
+        VencordNative.settings.set(PlainSettings);
 
         cloudSettingsLogger.info("Settings uploaded to cloud successfully");
 
@@ -222,7 +222,7 @@ export async function getCloudSettings(shouldNotify = true, force = false) {
 
         // sync with server timestamp instead of local one
         PlainSettings.cloud.settingsSyncVersion = written;
-        VencordNative.settings.set(JSON.stringify(PlainSettings, null, 4));
+        VencordNative.settings.set(PlainSettings);
 
         cloudSettingsLogger.info("Settings loaded from cloud successfully");
         if (shouldNotify)
diff --git a/tsconfig.json b/tsconfig.json
index 4563f3f86..e9c926408 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,7 +11,7 @@
             "esnext.asynciterable",
             "esnext.symbol"
         ],
-        "module": "commonjs",
+        "module": "esnext",
         "moduleResolution": "node",
         "strict": true,
         "noImplicitAny": false,
@@ -20,13 +20,15 @@
 
         "baseUrl": "./src/",
         "paths": {
+            "@main/*": ["./main/*"],
             "@api/*": ["./api/*"],
             "@components/*": ["./components/*"],
             "@utils/*": ["./utils/*"],
+            "@shared/*": ["./shared/*"],
             "@webpack/types": ["./webpack/common/types"],
             "@webpack/common": ["./webpack/common"],
             "@webpack": ["./webpack/webpack"]
         }
     },
-    "include": ["src/**/*"]
+    "include": ["src/**/*", "browser/**/*", "scripts/**/*"]
 }

From afdcf0edb9d2dc776a77e13e095e3419098b3f52 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 13 Mar 2024 21:59:09 +0100
Subject: [PATCH 387/632] refactor shared utils to more obviously separate
 contexts

---
 src/VencordNative.ts                                |  2 +-
 src/api/Settings.ts                                 |  2 +-
 src/components/VencordSettings/PatchHelperTab.tsx   |  2 +-
 src/main/ipcMain.ts                                 |  4 ++--
 src/main/ipcPlugins.ts                              |  2 +-
 src/main/patcher.ts                                 |  2 +-
 src/main/settings.ts                                |  2 +-
 src/main/updater/git.ts                             |  2 +-
 src/main/updater/http.ts                            |  4 ++--
 .../decor/lib/stores/UsersDecorationsStore.ts       |  2 +-
 src/plugins/imageZoom/index.tsx                     |  2 +-
 src/plugins/pinDms/index.tsx                        |  2 +-
 src/plugins/pronoundb/pronoundbUtils.ts             |  4 ++--
 src/plugins/spotifyControls/PlayerComponent.tsx     |  2 +-
 src/preload.ts                                      |  2 +-
 src/{utils => shared}/IpcEvents.ts                  |  0
 src/{utils => shared}/debounce.ts                   |  0
 src/{utils => shared}/onceDefined.ts                |  0
 src/shared/vencordUserAgent.ts                      | 12 ++++++++++++
 src/utils/constants.ts                              | 13 -------------
 src/utils/index.ts                                  |  4 ++--
 21 files changed, 32 insertions(+), 33 deletions(-)
 rename src/{utils => shared}/IpcEvents.ts (100%)
 rename src/{utils => shared}/debounce.ts (100%)
 rename src/{utils => shared}/onceDefined.ts (100%)
 create mode 100644 src/shared/vencordUserAgent.ts

diff --git a/src/VencordNative.ts b/src/VencordNative.ts
index 10381c900..42e697452 100644
--- a/src/VencordNative.ts
+++ b/src/VencordNative.ts
@@ -6,7 +6,7 @@
 
 import { PluginIpcMappings } from "@main/ipcPlugins";
 import type { UserThemeHeader } from "@main/themes";
-import { IpcEvents } from "@utils/IpcEvents";
+import { IpcEvents } from "@shared/IpcEvents";
 import { IpcRes } from "@utils/types";
 import type { Settings } from "api/Settings";
 import { ipcRenderer } from "electron";
diff --git a/src/api/Settings.ts b/src/api/Settings.ts
index bd4a4e929..0b7975300 100644
--- a/src/api/Settings.ts
+++ b/src/api/Settings.ts
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { debounce } from "@shared/debounce";
 import { SettingsStore as SettingsStoreClass } from "@shared/SettingsStore";
-import { debounce } from "@utils/debounce";
 import { localStorage } from "@utils/localStorage";
 import { Logger } from "@utils/Logger";
 import { mergeDefaults } from "@utils/misc";
diff --git a/src/components/VencordSettings/PatchHelperTab.tsx b/src/components/VencordSettings/PatchHelperTab.tsx
index 35f46ef50..7e68ec1e7 100644
--- a/src/components/VencordSettings/PatchHelperTab.tsx
+++ b/src/components/VencordSettings/PatchHelperTab.tsx
@@ -18,7 +18,7 @@
 
 import { CheckedTextInput } from "@components/CheckedTextInput";
 import { CodeBlock } from "@components/CodeBlock";
-import { debounce } from "@utils/debounce";
+import { debounce } from "@shared/debounce";
 import { Margins } from "@utils/margins";
 import { canonicalizeMatch, canonicalizeReplace } from "@utils/patches";
 import { makeCodeblock } from "@utils/text";
diff --git a/src/main/ipcMain.ts b/src/main/ipcMain.ts
index 609a581a7..9c9741db5 100644
--- a/src/main/ipcMain.ts
+++ b/src/main/ipcMain.ts
@@ -20,8 +20,8 @@ import "./updater";
 import "./ipcPlugins";
 import "./settings";
 
-import { debounce } from "@utils/debounce";
-import { IpcEvents } from "@utils/IpcEvents";
+import { debounce } from "@shared/debounce";
+import { IpcEvents } from "@shared/IpcEvents";
 import { BrowserWindow, ipcMain, shell, systemPreferences } from "electron";
 import { FSWatcher, mkdirSync, watch, writeFileSync } from "fs";
 import { open, readdir, readFile } from "fs/promises";
diff --git a/src/main/ipcPlugins.ts b/src/main/ipcPlugins.ts
index 5d679fc0b..5236dbec4 100644
--- a/src/main/ipcPlugins.ts
+++ b/src/main/ipcPlugins.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { IpcEvents } from "@utils/IpcEvents";
+import { IpcEvents } from "@shared/IpcEvents";
 import { ipcMain } from "electron";
 
 import PluginNatives from "~pluginNatives";
diff --git a/src/main/patcher.ts b/src/main/patcher.ts
index ff63ec82d..0d79a96f6 100644
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { onceDefined } from "@utils/onceDefined";
+import { onceDefined } from "@shared/onceDefined";
 import electron, { app, BrowserWindowConstructorOptions, Menu } from "electron";
 import { dirname, join } from "path";
 
diff --git a/src/main/settings.ts b/src/main/settings.ts
index 6fe2c3be7..96efdd672 100644
--- a/src/main/settings.ts
+++ b/src/main/settings.ts
@@ -5,8 +5,8 @@
  */
 
 import type { Settings } from "@api/Settings";
+import { IpcEvents } from "@shared/IpcEvents";
 import { SettingsStore } from "@shared/SettingsStore";
-import { IpcEvents } from "@utils/IpcEvents";
 import { ipcMain } from "electron";
 import { mkdirSync, readFileSync, writeFileSync } from "fs";
 
diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts
index 20a5d7003..82c38b6bc 100644
--- a/src/main/updater/git.ts
+++ b/src/main/updater/git.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { IpcEvents } from "@utils/IpcEvents";
+import { IpcEvents } from "@shared/IpcEvents";
 import { execFile as cpExecFile } from "child_process";
 import { ipcMain } from "electron";
 import { join } from "path";
diff --git a/src/main/updater/http.ts b/src/main/updater/http.ts
index 605e8d7cf..9e5a1cef4 100644
--- a/src/main/updater/http.ts
+++ b/src/main/updater/http.ts
@@ -16,8 +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 { IpcEvents } from "@shared/IpcEvents";
+import { VENCORD_USER_AGENT } from "@shared/vencordUserAgent";
 import { ipcMain } from "electron";
 import { writeFile } from "fs/promises";
 import { join } from "path";
diff --git a/src/plugins/decor/lib/stores/UsersDecorationsStore.ts b/src/plugins/decor/lib/stores/UsersDecorationsStore.ts
index 7295a3b17..b29945f82 100644
--- a/src/plugins/decor/lib/stores/UsersDecorationsStore.ts
+++ b/src/plugins/decor/lib/stores/UsersDecorationsStore.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { debounce } from "@utils/debounce";
+import { debounce } from "@shared/debounce";
 import { proxyLazy } from "@utils/lazy";
 import { useEffect, useState, zustandCreate } from "@webpack/common";
 import { User } from "discord-types/general";
diff --git a/src/plugins/imageZoom/index.tsx b/src/plugins/imageZoom/index.tsx
index 048c0ed5b..cbaa07d2a 100644
--- a/src/plugins/imageZoom/index.tsx
+++ b/src/plugins/imageZoom/index.tsx
@@ -20,8 +20,8 @@ import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { definePluginSettings } from "@api/Settings";
 import { disableStyle, enableStyle } from "@api/Styles";
 import { makeRange } from "@components/PluginSettings/components";
+import { debounce } from "@shared/debounce";
 import { Devs } from "@utils/constants";
-import { debounce } from "@utils/debounce";
 import definePlugin, { OptionType } from "@utils/types";
 import { Menu, React, ReactDOM } from "@webpack/common";
 import type { Root } from "react-dom/client";
diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index 943f0f1b1..45172328e 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -26,7 +26,7 @@ import { getPinAt, isPinned, settings, snapshotArray, sortedSnapshot, usePinnedD
 export default definePlugin({
     name: "PinDMs",
     description: "Allows you to pin private channels to the top of your DM list. To pin/unpin or reorder pins, right click DMs",
-    authors: [Devs.Ven, Devs.Strencher],
+    authors: [Devs.Ven],
 
     settings,
     contextMenus,
diff --git a/src/plugins/pronoundb/pronoundbUtils.ts b/src/plugins/pronoundb/pronoundbUtils.ts
index eac204b7d..6373c56a0 100644
--- a/src/plugins/pronoundb/pronoundbUtils.ts
+++ b/src/plugins/pronoundb/pronoundbUtils.ts
@@ -17,8 +17,8 @@
 */
 
 import { Settings } from "@api/Settings";
-import { VENCORD_USER_AGENT } from "@utils/constants";
-import { debounce } from "@utils/debounce";
+import { debounce } from "@shared/debounce";
+import { VENCORD_USER_AGENT } from "@shared/vencordUserAgent";
 import { getCurrentChannel } from "@utils/discord";
 import { useAwaiter } from "@utils/react";
 import { UserProfileStore, UserStore } from "@webpack/common";
diff --git a/src/plugins/spotifyControls/PlayerComponent.tsx b/src/plugins/spotifyControls/PlayerComponent.tsx
index 8b3f04bf2..ae28631c9 100644
--- a/src/plugins/spotifyControls/PlayerComponent.tsx
+++ b/src/plugins/spotifyControls/PlayerComponent.tsx
@@ -21,7 +21,7 @@ import "./spotifyStyles.css";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { ImageIcon, LinkIcon, OpenExternalIcon } from "@components/Icons";
-import { debounce } from "@utils/debounce";
+import { debounce } from "@shared/debounce";
 import { openImageModal } from "@utils/discord";
 import { classes, copyWithToast } from "@utils/misc";
 import { ContextMenuApi, FluxDispatcher, Forms, Menu, React, useEffect, useState, useStateFromStores } from "@webpack/common";
diff --git a/src/preload.ts b/src/preload.ts
index 08243000d..e79eb02cc 100644
--- a/src/preload.ts
+++ b/src/preload.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { debounce } from "@utils/debounce";
+import { debounce } from "@shared/debounce";
 import { contextBridge, webFrame } from "electron";
 import { readFileSync, watch } from "fs";
 import { join } from "path";
diff --git a/src/utils/IpcEvents.ts b/src/shared/IpcEvents.ts
similarity index 100%
rename from src/utils/IpcEvents.ts
rename to src/shared/IpcEvents.ts
diff --git a/src/utils/debounce.ts b/src/shared/debounce.ts
similarity index 100%
rename from src/utils/debounce.ts
rename to src/shared/debounce.ts
diff --git a/src/utils/onceDefined.ts b/src/shared/onceDefined.ts
similarity index 100%
rename from src/utils/onceDefined.ts
rename to src/shared/onceDefined.ts
diff --git a/src/shared/vencordUserAgent.ts b/src/shared/vencordUserAgent.ts
new file mode 100644
index 000000000..0cb1882bf
--- /dev/null
+++ b/src/shared/vencordUserAgent.ts
@@ -0,0 +1,12 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import gitHash from "~git-hash";
+import gitRemote from "~git-remote";
+
+export { gitHash, gitRemote };
+
+export const VENCORD_USER_AGENT = `Vencord/${gitHash}${gitRemote ? ` (https://github.com/${gitRemote})` : ""}`;
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 40965d08c..f609fa644 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -16,17 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import gitHash from "~git-hash";
-import gitRemote from "~git-remote";
-
-export {
-    gitHash,
-    gitRemote
-};
-
 export const WEBPACK_CHUNK = "webpackChunkdiscord_app";
 export const REACT_GLOBAL = "Vencord.Webpack.Common.React";
-export const VENCORD_USER_AGENT = `Vencord/${gitHash}${gitRemote ? ` (https://github.com/${gitRemote})` : ""}`;
 export const SUPPORT_CHANNEL_ID = "1026515880080842772";
 
 export interface Dev {
@@ -291,10 +282,6 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "RyanCaoDev",
         id: 952235800110694471n,
     },
-    Strencher: {
-        name: "Strencher",
-        id: 415849376598982656n
-    },
     FieryFlames: {
         name: "Fiery",
         id: 890228870559698955n
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 90bf86082..ea4adce4a 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+export * from "../shared/debounce";
+export * from "../shared/onceDefined";
 export * from "./ChangeList";
 export * from "./constants";
-export * from "./debounce";
 export * from "./discord";
 export * from "./guards";
 export * from "./lazy";
@@ -27,7 +28,6 @@ export * from "./Logger";
 export * from "./margins";
 export * from "./misc";
 export * from "./modal";
-export * from "./onceDefined";
 export * from "./onlyOnce";
 export * from "./patches";
 export * from "./Queue";

From f3ee43fe668ab015e5dc33eb02f956a9c0b71886 Mon Sep 17 00:00:00 2001
From: stupid cat <cat@blargbot.xyz>
Date: Wed, 13 Mar 2024 17:23:04 -0400
Subject: [PATCH 388/632] favGifSearch: don't error on favourited non-urls
 (#2260)

---
 src/plugins/favGifSearch/index.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/plugins/favGifSearch/index.tsx b/src/plugins/favGifSearch/index.tsx
index 592d8f547..d71f56795 100644
--- a/src/plugins/favGifSearch/index.tsx
+++ b/src/plugins/favGifSearch/index.tsx
@@ -200,7 +200,14 @@ function SearchBar({ instance, SearchBarComponent }: { instance: Instance; Searc
 
 
 export function getTargetString(urlStr: string) {
-    const url = new URL(urlStr);
+    let url: URL;
+    try {
+        url = new URL(urlStr);
+    } catch (err) {
+        // Can't resolve URL, return as-is
+        return urlStr;
+    }
+
     switch (settings.store.searchOption) {
         case "url":
             return url.href;

From 6140b9581496a1102839cbefbd2fa1b41a6f4c12 Mon Sep 17 00:00:00 2001
From: Kyuuhachi <1547062+Kyuuhachi@users.noreply.github.com>
Date: Sat, 16 Mar 2024 02:19:26 +0100
Subject: [PATCH 389/632] new plugin: BetterSettings ~ improves Discord's
 settings (#2222)

- makes opening settings much faster
- removes the scuffed transition animation
- organises the settings cog context menu into categories

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/_core/settings.tsx           |  26 +---
 src/plugins/betterSettings/README.md     |   9 ++
 src/plugins/betterSettings/index.tsx     | 177 +++++++++++++++++++++++
 src/webpack/common/components.ts         |   3 +-
 src/webpack/common/types/components.d.ts |   4 +
 5 files changed, 199 insertions(+), 20 deletions(-)
 create mode 100644 src/plugins/betterSettings/README.md
 create mode 100644 src/plugins/betterSettings/index.tsx

diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index 01220eb4e..569c3f0ac 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { findGroupChildrenByChildId } from "@api/ContextMenu";
 import { Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { React, SettingsRouter } from "@webpack/common";
+import { React } from "@webpack/common";
 
 import gitHash from "~git-hash";
 
@@ -30,23 +29,6 @@ export default definePlugin({
     authors: [Devs.Ven, Devs.Megu],
     required: true,
 
-    contextMenus: {
-        // The settings shortcuts in the user settings cog context menu
-        // read the elements from a hardcoded map which for obvious reason
-        // doesn't contain our sections. This patches the actions of our
-        // sections to manually use SettingsRouter (which only works on desktop
-        // but the context menu is usually not available on mobile anyway)
-        "user-settings-cog"(children) {
-            const section = findGroupChildrenByChildId("VencordSettings", children);
-            section?.forEach(c => {
-                const id = c?.props?.id;
-                if (id?.startsWith("Vencord") || id?.startsWith("Vesktop")) {
-                    c!.props.action = () => SettingsRouter.open(id);
-                }
-            });
-        }
-    },
-
     patches: [{
         find: ".versionHash",
         replacement: [
@@ -75,6 +57,12 @@ export default definePlugin({
             },
             replace: "...$self.makeSettingsCategories($1),$&"
         }
+    }, {
+        find: "Messages.USER_SETTINGS_ACTIONS_MENU_LABEL",
+        replacement: {
+            match: /(?<=function\((\i),\i\)\{)(?=let \i=Object.values\(\i.UserSettingsSections\).*?(\i)\.default\.open\()/,
+            replace: "$2.default.open($1);return;"
+        }
     }],
 
     customSections: [] as ((SectionTypes: Record<string, unknown>) => any)[],
diff --git a/src/plugins/betterSettings/README.md b/src/plugins/betterSettings/README.md
new file mode 100644
index 000000000..127c6ce76
--- /dev/null
+++ b/src/plugins/betterSettings/README.md
@@ -0,0 +1,9 @@
+# BetterSettings
+
+Improves Discord's Settings via multiple (toggleable) changes:
+- makes opening settings much faster
+- removes the scuffed transition animation
+- organises the settings cog context menu into categories
+
+![](https://github.com/Vendicated/Vencord/assets/45497981/e8d67a95-3909-4be5-8281-8cf9d2f1c30e)
+
diff --git a/src/plugins/betterSettings/index.tsx b/src/plugins/betterSettings/index.tsx
new file mode 100644
index 000000000..6d3c8798e
--- /dev/null
+++ b/src/plugins/betterSettings/index.tsx
@@ -0,0 +1,177 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { classNameFactory } from "@api/Styles";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+import { ComponentDispatch, FocusLock, i18n, Menu, useEffect, useRef } from "@webpack/common";
+import type { HTMLAttributes, ReactElement } from "react";
+
+type SettingsEntry = { section: string, label: string; };
+
+const cl = classNameFactory("");
+const Classes = findByPropsLazy("animating", "baseLayer", "bg", "layer", "layers");
+
+const settings = definePluginSettings({
+    disableFade: {
+        description: "Disable the crossfade animation",
+        type: OptionType.BOOLEAN,
+        default: true,
+        restartNeeded: true
+    },
+    organizeMenu: {
+        description: "Organizes the settings cog context menu into categories",
+        type: OptionType.BOOLEAN,
+        default: true
+    },
+    eagerLoad: {
+        description: "Removes the loading delay when opening the menu for the first time",
+        type: OptionType.BOOLEAN,
+        default: true,
+        restartNeeded: true
+    }
+});
+
+interface LayerProps extends HTMLAttributes<HTMLDivElement> {
+    mode: "SHOWN" | "HIDDEN";
+    baseLayer?: boolean;
+}
+
+function Layer({ mode, baseLayer = false, ...props }: LayerProps) {
+    const hidden = mode === "HIDDEN";
+    const containerRef = useRef<HTMLDivElement>(null);
+
+    useEffect(() => () => {
+        ComponentDispatch.dispatch("LAYER_POP_START");
+        ComponentDispatch.dispatch("LAYER_POP_COMPLETE");
+    }, []);
+
+    const node = (
+        <div
+            ref={containerRef}
+            aria-hidden={hidden}
+            className={cl({
+                [Classes.layer]: true,
+                [Classes.baseLayer]: baseLayer,
+                "stop-animations": hidden
+            })}
+            style={{ opacity: hidden ? 0 : undefined }}
+            {...props}
+        />
+    );
+
+    return baseLayer
+        ? node
+        : <FocusLock containerRef={containerRef}>{node}</FocusLock>;
+}
+
+export default definePlugin({
+    name: "BetterSettings",
+    description: "Enhances your settings-menu-opening experience",
+    authors: [Devs.Kyuuhachi],
+    settings,
+
+    patches: [
+        {
+            find: "this.renderArtisanalHack()",
+            replacement: [
+                { // Fade in on layer
+                    match: /(?<=(\i)\.contextType=\i\.AccessibilityPreferencesContext;)/,
+                    replace: "$1=$self.Layer;",
+                    predicate: () => settings.store.disableFade
+                },
+                { // Lazy-load contents
+                    match: /createPromise:\(\)=>([^:}]*?),webpackId:"\d+",name:(?!="CollectiblesShop")"[^"]+"/g,
+                    replace: "$&,_:$1",
+                    predicate: () => settings.store.eagerLoad
+                }
+            ]
+        },
+        { // For some reason standardSidebarView also has a small fade-in
+            find: "DefaultCustomContentScroller:function()",
+            replacement: [
+                {
+                    match: /\(0,\i\.useTransition\)\((\i)/,
+                    replace: "(_cb=>_cb(void 0,$1))||$&"
+                },
+                {
+                    match: /\i\.animated\.div/,
+                    replace: '"div"'
+                }
+            ],
+            predicate: () => settings.store.disableFade
+        },
+        { // Load menu stuff on hover, not on click
+            find: "Messages.USER_SETTINGS_WITH_BUILD_OVERRIDE.format",
+            replacement: {
+                match: /(?<=handleOpenSettingsContextMenu.{0,250}?\i\.el\(("[^"]+")\)\.then\([^;]*?("\d+").*?Messages\.USER_SETTINGS,)(?=onClick:)/,
+                replace: "onMouseEnter(){Vencord.Webpack.wreq.el($1).then(()=>Vencord.Webpack.wreq($2));},"
+            },
+            predicate: () => settings.store.eagerLoad
+        },
+        { // Settings cog context menu
+            find: "Messages.USER_SETTINGS_ACTIONS_MENU_LABEL",
+            replacement: {
+                match: /\(0,\i.default\)\(\)(?=\.filter\(\i=>\{let\{section:\i\}=)/,
+                replace: "$self.wrapMenu($&)"
+            }
+        }
+    ],
+
+    Layer(props: LayerProps) {
+        return (
+            <ErrorBoundary fallback={() => props.children as any}>
+                <Layer {...props} />
+            </ErrorBoundary>
+        );
+    },
+
+    wrapMenu(list: SettingsEntry[]) {
+        if (!settings.store.organizeMenu) return list;
+
+        const items = [{ label: null as string | null, items: [] as SettingsEntry[] }];
+
+        for (const item of list) {
+            if (item.section === "HEADER") {
+                items.push({ label: item.label, items: [] });
+            } else if (item.section === "DIVIDER") {
+                items.push({ label: i18n.Messages.OTHER_OPTIONS, items: [] });
+            } else {
+                items.at(-1)!.items.push(item);
+            }
+        }
+
+        return {
+            filter(predicate: (item: SettingsEntry) => boolean) {
+                for (const category of items) {
+                    category.items = category.items.filter(predicate);
+                }
+                return this;
+            },
+            map(render: (item: SettingsEntry) => ReactElement) {
+                return items
+                    .filter(a => a.items.length > 0)
+                    .map(({ label, items }) => {
+                        const children = items.map(render);
+                        if (label) {
+                            return (
+                                <Menu.MenuItem
+                                    id={label.replace(/\W/, "_")}
+                                    label={label}
+                                    children={children}
+                                    action={children[0].props.action}
+                                />);
+                        } else {
+                            return children;
+                        }
+                    });
+            }
+        };
+    }
+});
diff --git a/src/webpack/common/components.ts b/src/webpack/common/components.ts
index 048e65d68..24477c725 100644
--- a/src/webpack/common/components.ts
+++ b/src/webpack/common/components.ts
@@ -47,6 +47,7 @@ export let Paginator: t.Paginator;
 export let ScrollerThin: t.ScrollerThin;
 export let Clickable: t.Clickable;
 export let Avatar: t.Avatar;
+export let FocusLock: t.FocusLock;
 // token lagger real
 /** css colour resolver stuff, no clue what exactly this does, just copied usage from Discord */
 export let useToken: t.useToken;
@@ -58,6 +59,6 @@ export const Flex = waitForComponent<t.Flex>("Flex", ["Justify", "Align", "Wrap"
 export const { OAuth2AuthorizeModal } = findByPropsLazy("OAuth2AuthorizeModal");
 
 waitFor(["FormItem", "Button"], m => {
-    ({ useToken, Card, Button, FormSwitch: Switch, Tooltip, TextInput, TextArea, Text, Select, SearchableSelect, Slider, ButtonLooks, TabBar, Popout, Dialog, Paginator, ScrollerThin, Clickable, Avatar } = m);
+    ({ useToken, Card, Button, FormSwitch: Switch, Tooltip, TextInput, TextArea, Text, Select, SearchableSelect, Slider, ButtonLooks, TabBar, Popout, Dialog, Paginator, ScrollerThin, Clickable, Avatar, FocusLock } = m);
     Forms = m;
 });
diff --git a/src/webpack/common/types/components.d.ts b/src/webpack/common/types/components.d.ts
index 72a8a69b4..3e3ffa4bd 100644
--- a/src/webpack/common/types/components.d.ts
+++ b/src/webpack/common/types/components.d.ts
@@ -453,3 +453,7 @@ export type Avatar = ComponentType<PropsWithChildren<{
     "aria-hidden"?: boolean;
     "aria-label"?: string;
 }>>;
+
+type FocusLock = ComponentType<PropsWithChildren<{
+    containerRef: RefObject<HTMLElement>
+}>>;

From 23aeb212726e5e8e8bbf7de126d1b81b90aa99e4 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 16 Mar 2024 02:30:36 +0100
Subject: [PATCH 390/632] fix ViewIcons & Decor patches

---
 src/plugins/decor/index.tsx     | 2 +-
 src/plugins/viewIcons/index.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx
index 713b17d76..7b9b4e3bf 100644
--- a/src/plugins/decor/index.tsx
+++ b/src/plugins/decor/index.tsx
@@ -43,7 +43,7 @@ export default definePlugin({
         {
             find: "DefaultCustomizationSections",
             replacement: {
-                match: /(?<={user:\i},"decoration"\),)/,
+                match: /(?<=USER_SETTINGS_AVATAR_DECORATION},"decoration"\),)/,
                 replace: "$self.DecorSection(),"
             }
         },
diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index d9dfc2ad0..6eb773c28 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -174,7 +174,7 @@ export default definePlugin({
             find: ".NITRO_BANNER,",
             replacement: {
                 // style: { backgroundImage: shouldShowBanner ? "url(".concat(bannerUrl,
-                match: /style:\{(?=backgroundImage:(\i&&\i)\?"url\("\.concat\((\i),)/,
+                match: /style:\{(?=backgroundImage:(\i)\?"url\("\.concat\((\i),)/,
                 replace:
                     // onClick: () => shouldShowBanner && ev.target.style.backgroundImage && openImage(bannerUrl), style: { cursor: shouldShowBanner ? "pointer" : void 0,
                     'onClick:ev=>$1&&ev.target.style.backgroundImage&&$self.openImage($2),style:{cursor:$1?"pointer":void 0,'

From 356d8d8e5eb6ea030b756556428df4a5e64cae6e Mon Sep 17 00:00:00 2001
From: Hyper <git@hypergonial.com>
Date: Sat, 16 Mar 2024 03:27:59 +0100
Subject: [PATCH 391/632] feat(MessageLogger): Add delete & edit toggle (#2032)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/messageLogger/index.tsx | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index 8bc563b19..26409b89d 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -137,6 +137,16 @@ export default definePlugin({
             ],
             onChange: () => addDeleteStyle()
         },
+        logDeletes: {
+            type: OptionType.BOOLEAN,
+            description: "Whether to log deleted messages",
+            default: true,
+        },
+        logEdits: {
+            type: OptionType.BOOLEAN,
+            description: "Whether to log edited messages",
+            default: true,
+        },
         ignoreBots: {
             type: OptionType.BOOLEAN,
             description: "Whether to ignore messages by bots",
@@ -197,8 +207,8 @@ export default definePlugin({
         return cache;
     },
 
-    shouldIgnore(message: any) {
-        const { ignoreBots, ignoreSelf, ignoreUsers, ignoreChannels, ignoreGuilds } = Settings.plugins.MessageLogger;
+    shouldIgnore(message: any, isEdit = false) {
+        const { ignoreBots, ignoreSelf, ignoreUsers, ignoreChannels, ignoreGuilds, logEdits, logDeletes } = Settings.plugins.MessageLogger;
         const myId = UserStore.getCurrentUser().id;
 
         return ignoreBots && message.author?.bot ||
@@ -206,6 +216,7 @@ export default definePlugin({
             ignoreUsers.includes(message.author?.id) ||
             ignoreChannels.includes(message.channel_id) ||
             ignoreChannels.includes(ChannelStore.getChannel(message.channel_id)?.parent_id) ||
+            (isEdit ? !logEdits : !logDeletes) ||
             ignoreGuilds.includes(ChannelStore.getChannel(message.channel_id)?.guild_id);
     },
 
@@ -241,7 +252,7 @@ export default definePlugin({
                     match: /(MESSAGE_UPDATE:function\((\i)\).+?)\.update\((\i)/,
                     replace: "$1" +
                         ".update($3,m =>" +
-                        "   (($2.message.flags & 64) === 64 || $self.shouldIgnore($2.message)) ? m :" +
+                        "   (($2.message.flags & 64) === 64 || $self.shouldIgnore($2.message, true)) ? m :" +
                         "   $2.message.content !== m.editHistory?.[0]?.content && $2.message.content !== m.content ?" +
                         "       m.set('editHistory',[...(m.editHistory || []), $self.makeEdit($2.message, m)]) :" +
                         "       m" +

From 90ee07fd981ab0814abded622a711fbd1e95f70c Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Sat, 16 Mar 2024 22:43:04 +0700
Subject: [PATCH 392/632] emoteCloner: fix cloning gif stickers (#2268)

---
 src/plugins/emoteCloner/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/emoteCloner/index.tsx b/src/plugins/emoteCloner/index.tsx
index b25e1be27..4c0fe94ad 100644
--- a/src/plugins/emoteCloner/index.tsx
+++ b/src/plugins/emoteCloner/index.tsx
@@ -56,7 +56,7 @@ function getUrl(data: Data) {
     if (data.t === "Emoji")
         return `${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/emojis/${data.id}.${data.isAnimated ? "gif" : "png"}`;
 
-    return `${location.origin}/stickers/${data.id}.${StickerExt[data.format_type]}`;
+    return `${window.GLOBAL_ENV.MEDIA_PROXY_ENDPOINT}/stickers/${data.id}.${StickerExt[data.format_type]}`;
 }
 
 async function fetchSticker(id: string) {

From ae9435ac55dd7a420b59a6a9ab826e106fa2ef81 Mon Sep 17 00:00:00 2001
From: thororen <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 19 Mar 2024 07:06:09 -0400
Subject: [PATCH 393/632] MemberCount: Fix error when not in a channel (#2277)

---
 src/plugins/memberCount/MemberCount.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/memberCount/MemberCount.tsx b/src/plugins/memberCount/MemberCount.tsx
index 50665353e..3231d01ce 100644
--- a/src/plugins/memberCount/MemberCount.tsx
+++ b/src/plugins/memberCount/MemberCount.tsx
@@ -27,7 +27,7 @@ export function MemberCount({ isTooltip, tooltipGuildId }: { isTooltip?: true; t
 
     const { groups } = useStateFromStores(
         [ChannelMemberStore],
-        () => ChannelMemberStore.getProps(guildId, currentChannel.id)
+        () => ChannelMemberStore.getProps(guildId, currentChannel?.id)
     );
 
     if (!isTooltip && (groups.length >= 1 || groups[0].id !== "unknown")) {

From 0d5f492891b45c847c94b8bd9b4b5dd62bcbf976 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 21 Mar 2024 21:17:47 +0100
Subject: [PATCH 394/632] fix ReviewDB

---
 src/plugins/reviewDB/components/ReviewsView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/reviewDB/components/ReviewsView.tsx b/src/plugins/reviewDB/components/ReviewsView.tsx
index 46bd7fb84..a705bc80a 100644
--- a/src/plugins/reviewDB/components/ReviewsView.tsx
+++ b/src/plugins/reviewDB/components/ReviewsView.tsx
@@ -31,7 +31,7 @@ import ReviewComponent from "./ReviewComponent";
 const { Editor, Transforms } = findByPropsLazy("Editor", "Transforms");
 const { ChatInputTypes } = findByPropsLazy("ChatInputTypes");
 
-const InputComponent = findComponentByCodeLazy("default.CHANNEL_TEXT_AREA");
+const InputComponent = findComponentByCodeLazy("default.CHANNEL_TEXT_AREA", "input");
 const { createChannelRecordFromServer } = findByPropsLazy("createChannelRecordFromServer");
 
 interface UserProps {

From 3e332a60622ef1ca525404374588e4041551aa5e Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 21 Mar 2024 23:27:08 +0100
Subject: [PATCH 395/632] fix RestAPI find

---
 src/webpack/common/types/utils.d.ts | 6 +-----
 src/webpack/common/utils.ts         | 7 +++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/webpack/common/types/utils.d.ts b/src/webpack/common/types/utils.d.ts
index 3d1c0eea6..39af843c5 100644
--- a/src/webpack/common/types/utils.d.ts
+++ b/src/webpack/common/types/utils.d.ts
@@ -81,11 +81,7 @@ interface RestRequestData {
     retries?: number;
 }
 
-export type RestAPI = Record<"delete" | "get" | "patch" | "post" | "put", (data: RestRequestData) => Promise<any>> & {
-    V6OrEarlierAPIError: Error;
-    V8APIError: Error;
-    getAPIBaseURL(withVersion?: boolean): string;
-};
+export type RestAPI = Record<"delete" | "get" | "patch" | "post" | "put", (data: RestRequestData) => Promise<any>>;
 
 export type Permissions = "CREATE_INSTANT_INVITE"
     | "KICK_MEMBERS"
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 7060573d5..ec6c0e1ed 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -19,7 +19,7 @@
 import type { Channel, User } from "discord-types/general";
 
 // eslint-disable-next-line path-alias/no-relative
-import { _resolveReady, filters, findByCodeLazy, findByPropsLazy, findLazy, waitFor } from "../webpack";
+import { _resolveReady, filters, findByCodeLazy, findByProps, findByPropsLazy, findLazy, proxyLazyWebpack, waitFor } from "../webpack";
 import type * as t from "./types/utils";
 
 export let FluxDispatcher: t.FluxDispatcher;
@@ -37,7 +37,10 @@ export let ComponentDispatch;
 waitFor(["ComponentDispatch", "ComponentDispatcher"], m => ComponentDispatch = m.ComponentDispatch);
 
 
-export const RestAPI: t.RestAPI = findByPropsLazy("getAPIBaseURL", "get");
+export const RestAPI: t.RestAPI = proxyLazyWebpack(() => {
+    const mod = findByProps("getAPIBaseURL");
+    return mod.HTTP ?? mod;
+});
 export const moment: typeof import("moment") = findByPropsLazy("parseTwoDigitYear");
 
 export const hljs: typeof import("highlight.js") = findByPropsLazy("highlight", "registerLanguage");

From 021948c919ffeec364681c91ff1bc70ea7784d76 Mon Sep 17 00:00:00 2001
From: Eric Liu <45801973+waresnew@users.noreply.github.com>
Date: Thu, 21 Mar 2024 19:39:26 -0400
Subject: [PATCH 396/632] WhoReacted: fix scroll jumping when rendering users
 (#2271)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/whoReacted/index.tsx | 24 ++++++++++++++++++++----
 src/utils/constants.ts           |  4 ++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/plugins/whoReacted/index.tsx b/src/plugins/whoReacted/index.tsx
index 6d994be16..b60366900 100644
--- a/src/plugins/whoReacted/index.tsx
+++ b/src/plugins/whoReacted/index.tsx
@@ -29,7 +29,7 @@ import { Message, ReactionEmoji, User } from "discord-types/general";
 
 const UserSummaryItem = findComponentByCodeLazy("defaultRenderUser", "showDefaultAvatarsForNullUsers");
 const AvatarStyles = findByPropsLazy("moreUsers", "emptyUser", "avatarContainer", "clickableAvatar");
-
+let Scroll: any = null;
 const queue = new Queue();
 let reactions: Record<string, ReactionCacheEntry>;
 
@@ -91,7 +91,7 @@ function handleClickAvatar(event: React.MouseEvent<HTMLElement, MouseEvent>) {
 export default definePlugin({
     name: "WhoReacted",
     description: "Renders the avatars of users who reacted to a message",
-    authors: [Devs.Ven, Devs.KannaDev],
+    authors: [Devs.Ven, Devs.KannaDev, Devs.newwares],
 
     patches: [{
         find: ",reactionRef:",
@@ -105,7 +105,19 @@ export default definePlugin({
             match: /(?<=CONNECTION_OPEN:function\(\){)(\i)={}/,
             replace: "$&;$self.reactions=$1"
         }
-    }],
+    },
+    {
+
+        find: "cleanAutomaticAnchor(){",
+        replacement: {
+            match: /this\.automaticAnchor=null,this\.messageFetchAnchor=null,/,
+            replace: "$&$self.setScrollObj(this),"
+        }
+    }
+    ],
+    setScrollObj(scroll: any) {
+        Scroll = scroll;
+    },
 
     renderUsers(props: RootObject) {
         return props.message.reactions.length > 10 ? null : (
@@ -114,9 +126,13 @@ export default definePlugin({
             </ErrorBoundary>
         );
     },
-
     _renderUsers({ message, emoji, type }: RootObject) {
         const forceUpdate = useForceUpdater();
+        React.useLayoutEffect(() => { // bc need to prevent autoscrolling
+            if (Scroll?.scrollCounter > 0) {
+                Scroll.setAutomaticAnchor(null);
+            }
+        });
         React.useEffect(() => {
             const cb = (e: any) => {
                 if (e.messageId === message.id)
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index f609fa644..335ed5cc1 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -413,6 +413,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     Elvyra: {
         name: "Elvyra",
         id: 708275751816003615n,
+    },
+    newwares: {
+        name: "newwares",
+        id: 421405303951851520n
     }
 } satisfies Record<string, Dev>);
 

From 04d5423b08ced44a5e09a77921b5b315771c76d5 Mon Sep 17 00:00:00 2001
From: Masterjoona <69722179+Masterjoona@users.noreply.github.com>
Date: Fri, 22 Mar 2024 01:42:41 +0200
Subject: [PATCH 397/632] fix(AnonymiseFileNames): anonymise files in forum
 posts (#2270)

---
 src/plugins/anonymiseFileNames/index.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/plugins/anonymiseFileNames/index.tsx b/src/plugins/anonymiseFileNames/index.tsx
index 911440230..b424b7a59 100644
--- a/src/plugins/anonymiseFileNames/index.tsx
+++ b/src/plugins/anonymiseFileNames/index.tsx
@@ -78,6 +78,13 @@ export default definePlugin({
                     "uploadFiles:(...args)=>(args[0].uploads.forEach(f=>f.filename=$self.anonymise(f)),$1(...args)),",
             },
         },
+        {
+            find: "message.attachments",
+            replacement: {
+                match: /(\i.uploadFiles\((\i),)/,
+                replace: "$2.forEach(f=>f.filename=$self.anonymise(f)),$1"
+            }
+        },
         {
             find: ".Messages.ATTACHMENT_UTILITIES_SPOILER",
             replacement: {

From 55901ba35ecbdb6198227fbe4df1a2f14200b643 Mon Sep 17 00:00:00 2001
From: Trey <47907719+trwy7@users.noreply.github.com>
Date: Thu, 21 Mar 2024 17:44:37 -0600
Subject: [PATCH 398/632] AlwaysTrust: Add options for each popup (#2234)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/alwaysTrust/index.ts | 29 ++++++++++++++++++++++++-----
 src/utils/constants.ts           |  4 ++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/plugins/alwaysTrust/index.ts b/src/plugins/alwaysTrust/index.ts
index 07e92afce..5113935f4 100644
--- a/src/plugins/alwaysTrust/index.ts
+++ b/src/plugins/alwaysTrust/index.ts
@@ -16,27 +16,46 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
+
+const settings = definePluginSettings({
+    domain: {
+        type: OptionType.BOOLEAN,
+        default: true,
+        description: "Remove the untrusted domain popup when opening links",
+        restartNeeded: true
+    },
+    file: {
+        type: OptionType.BOOLEAN,
+        default: true,
+        description: "Remove the 'Potentially Dangerous Download' popup when opening links",
+        restartNeeded: true
+    }
+});
 
 export default definePlugin({
     name: "AlwaysTrust",
     description: "Removes the annoying untrusted domain and suspicious file popup",
-    authors: [Devs.zt],
+    authors: [Devs.zt, Devs.Trwy],
     patches: [
         {
             find: ".displayName=\"MaskedLinkStore\"",
             replacement: {
                 match: /(?<=isTrustedDomain\(\i\){)return \i\(\i\)/,
                 replace: "return true"
-            }
+            },
+            predicate: () => settings.store.domain
         },
         {
             find: "isSuspiciousDownload:",
             replacement: {
                 match: /function \i\(\i\){(?=.{0,60}\.parse\(\i\))/,
                 replace: "$&return null;"
-            }
+            },
+            predicate: () => settings.store.file
         }
-    ]
+    ],
+    settings
 });
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 335ed5cc1..5b540895a 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -49,6 +49,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Cynosphere",
         id: 150745989836308480n
     },
+    Trwy: {
+        name: "trey",
+        id: 354427199023218689n
+    },
     Megu: {
         name: "Megumin",
         id: 545581357812678656n

From 2ce348747778b064b2bbd5ea9f3fd9fdd337c7fd Mon Sep 17 00:00:00 2001
From: Syncx <47534062+Syncxv@users.noreply.github.com>
Date: Fri, 22 Mar 2024 10:55:37 +1100
Subject: [PATCH 399/632] PinDMs: add category support & fix bugs (#2203)

Co-authored-by: V <vendicated@riseup.net>
---
 .../pinDms/components/CreateCategoryModal.tsx | 134 ++++++
 src/plugins/pinDms/components/contextMenu.tsx |  96 +++++
 src/plugins/pinDms/constants.ts               |  32 ++
 src/plugins/pinDms/contextMenus.tsx           |  70 ----
 src/plugins/pinDms/data.ts                    | 214 ++++++++++
 src/plugins/pinDms/index.tsx                  | 392 ++++++++++++++----
 src/plugins/pinDms/settings.ts                |  94 -----
 src/plugins/pinDms/styles.css                 |  37 ++
 8 files changed, 822 insertions(+), 247 deletions(-)
 create mode 100644 src/plugins/pinDms/components/CreateCategoryModal.tsx
 create mode 100644 src/plugins/pinDms/components/contextMenu.tsx
 create mode 100644 src/plugins/pinDms/constants.ts
 delete mode 100644 src/plugins/pinDms/contextMenus.tsx
 create mode 100644 src/plugins/pinDms/data.ts
 delete mode 100644 src/plugins/pinDms/settings.ts
 create mode 100644 src/plugins/pinDms/styles.css

diff --git a/src/plugins/pinDms/components/CreateCategoryModal.tsx b/src/plugins/pinDms/components/CreateCategoryModal.tsx
new file mode 100644
index 000000000..f38cc88c0
--- /dev/null
+++ b/src/plugins/pinDms/components/CreateCategoryModal.tsx
@@ -0,0 +1,134 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { classNameFactory } from "@api/Styles";
+import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModalLazy } from "@utils/modal";
+import { extractAndLoadChunksLazy, findComponentByCodeLazy } from "@webpack";
+import { Button, Forms, Text, TextInput, Toasts, useEffect, useState } from "@webpack/common";
+
+import { DEFAULT_COLOR, SWATCHES } from "../constants";
+import { categories, Category, createCategory, getCategory, updateCategory } from "../data";
+import { forceUpdate } from "../index";
+
+interface ColorPickerProps {
+    color: number | null;
+    showEyeDropper?: boolean;
+    suggestedColors?: string[];
+    onChange(value: number | null): void;
+}
+
+interface ColorPickerWithSwatchesProps {
+    defaultColor: number;
+    colors: number[];
+    value: number;
+    disabled?: boolean;
+    onChange(value: number | null): void;
+    renderDefaultButton?: () => React.ReactNode;
+    renderCustomButton?: () => React.ReactNode;
+}
+
+const ColorPicker = findComponentByCodeLazy<ColorPickerProps>(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)");
+const ColorPickerWithSwatches = findComponentByCodeLazy<ColorPickerWithSwatchesProps>(".presets,", "customColor:");
+
+export const requireSettingsMenu = extractAndLoadChunksLazy(['name:"UserSettings"'], /createPromise:.{0,20}el\("(.+?)"\).{0,50}"UserSettings"/);
+
+const cl = classNameFactory("vc-pindms-modal-");
+
+interface Props {
+    categoryId: string | null;
+    initalChannelId: string | null;
+    modalProps: ModalProps;
+}
+
+function useCategory(categoryId: string | null, initalChannelId: string | null) {
+    const [category, setCategory] = useState<Category | null>(null);
+
+    useEffect(() => {
+        if (categoryId)
+            setCategory(getCategory(categoryId)!);
+        else if (initalChannelId)
+            setCategory({
+                id: Toasts.genId(),
+                name: `Pin Category ${categories.length + 1}`,
+                color: 10070709,
+                collapsed: false,
+                channels: [initalChannelId]
+            });
+    }, [categoryId, initalChannelId]);
+
+    return {
+        category,
+        setCategory
+    };
+}
+
+export function NewCategoryModal({ categoryId, modalProps, initalChannelId }: Props) {
+    const { category, setCategory } = useCategory(categoryId, initalChannelId);
+
+    if (!category) return null;
+
+    const onSave = async (e: React.FormEvent<HTMLFormElement> | React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
+        e.preventDefault();
+        if (!categoryId)
+            await createCategory(category);
+        else
+            await updateCategory(category);
+
+        forceUpdate();
+        modalProps.onClose();
+    };
+
+    return (
+        <ModalRoot {...modalProps}>
+            <ModalHeader>
+                <Text variant="heading-lg/semibold" style={{ flexGrow: 1 }}>{categoryId ? "Edit" : "New"} Category</Text>
+            </ModalHeader>
+
+            {/* form is here so when you press enter while in the text input it submits */}
+            <form onSubmit={onSave}>
+                <ModalContent className={cl("content")}>
+                    <Forms.FormSection>
+                        <Forms.FormTitle>Name</Forms.FormTitle>
+                        <TextInput
+                            value={category.name}
+                            onChange={e => setCategory({ ...category, name: e })}
+                        />
+                    </Forms.FormSection>
+                    <Forms.FormDivider />
+                    <Forms.FormSection>
+                        <Forms.FormTitle>Color</Forms.FormTitle>
+                        <ColorPickerWithSwatches
+                            key={category.name}
+                            defaultColor={DEFAULT_COLOR}
+                            colors={SWATCHES}
+                            onChange={c => setCategory({ ...category, color: c! })}
+                            value={category.color}
+                            renderDefaultButton={() => null}
+                            renderCustomButton={() => (
+                                <ColorPicker
+                                    color={category.color}
+                                    onChange={c => setCategory({ ...category, color: c! })}
+                                    key={category.name}
+                                    showEyeDropper={false}
+                                />
+                            )}
+                        />
+                    </Forms.FormSection>
+                </ModalContent>
+                <ModalFooter>
+                    <Button type="submit" onClick={onSave} disabled={!category.name}>{categoryId ? "Save" : "Create"}</Button>
+                </ModalFooter>
+            </form>
+        </ModalRoot>
+    );
+}
+
+export const openCategoryModal = (categoryId: string | null, channelId: string | null) =>
+    openModalLazy(async () => {
+        await requireSettingsMenu();
+        return modalProps => <NewCategoryModal categoryId={categoryId} modalProps={modalProps} initalChannelId={channelId} />;
+    });
+
diff --git a/src/plugins/pinDms/components/contextMenu.tsx b/src/plugins/pinDms/components/contextMenu.tsx
new file mode 100644
index 000000000..0f5a198ba
--- /dev/null
+++ b/src/plugins/pinDms/components/contextMenu.tsx
@@ -0,0 +1,96 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
+import { Menu } from "@webpack/common";
+
+import { addChannelToCategory, canMoveChannelInDirection, categories, isPinned, moveChannel, removeChannelFromCategory } from "../data";
+import { forceUpdate, settings } from "../index";
+import { openCategoryModal } from "./CreateCategoryModal";
+
+function createPinMenuItem(channelId: string) {
+    const pinned = isPinned(channelId);
+
+    return (
+        <Menu.MenuItem
+            id="pin-dm"
+            label="Pin DMs"
+        >
+
+            {!pinned && (
+                <>
+                    <Menu.MenuItem
+                        id="vc-add-category"
+                        label="Add Category"
+                        color="brand"
+                        action={() => openCategoryModal(null, channelId)}
+                    />
+                    <Menu.MenuSeparator />
+
+                    {
+                        categories.map(category => (
+                            <Menu.MenuItem
+                                id={`pin-category-${category.name}`}
+                                label={category.name}
+                                action={() => addChannelToCategory(channelId, category.id).then(forceUpdate)}
+                            />
+                        ))
+                    }
+                </>
+            )}
+
+            {pinned && (
+                <>
+                    <Menu.MenuItem
+                        id="unpin-dm"
+                        label="Unpin DM"
+                        color="danger"
+                        action={() => removeChannelFromCategory(channelId).then(forceUpdate)}
+                    />
+
+                    {
+                        !settings.store.sortDmsByNewestMessage && canMoveChannelInDirection(channelId, -1) && (
+                            <Menu.MenuItem
+                                id="move-up"
+                                label="Move Up"
+                                action={() => moveChannel(channelId, -1).then(forceUpdate)}
+                            />
+                        )
+                    }
+
+                    {
+                        !settings.store.sortDmsByNewestMessage && canMoveChannelInDirection(channelId, 1) && (
+                            <Menu.MenuItem
+                                id="move-down"
+                                label="Move Down"
+                                action={() => moveChannel(channelId, 1).then(forceUpdate)}
+                            />
+                        )
+                    }
+                </>
+            )}
+
+        </Menu.MenuItem>
+    );
+}
+
+const GroupDMContext: NavContextMenuPatchCallback = (children, props) => {
+    const container = findGroupChildrenByChildId("leave-channel", children);
+    container?.unshift(createPinMenuItem(props.channel.id));
+};
+
+const UserContext: NavContextMenuPatchCallback = (children, props) => {
+    const container = findGroupChildrenByChildId("close-dm", children);
+    if (container) {
+        const idx = container.findIndex(c => c?.props?.id === "close-dm");
+        container.splice(idx, 0, createPinMenuItem(props.channel.id));
+    }
+};
+
+export const contextMenus = {
+    "gdm-context": GroupDMContext,
+    "user-context": UserContext
+};
diff --git a/src/plugins/pinDms/constants.ts b/src/plugins/pinDms/constants.ts
new file mode 100644
index 000000000..fbd995e14
--- /dev/null
+++ b/src/plugins/pinDms/constants.ts
@@ -0,0 +1,32 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+export const DEFAULT_CHUNK_SIZE = 256;
+export const DEFAULT_COLOR = 10070709;
+
+export const SWATCHES = [
+    1752220,
+    3066993,
+    3447003,
+    10181046,
+    15277667,
+    15844367,
+    15105570,
+    15158332,
+    9807270,
+    6323595,
+
+    1146986,
+    2067276,
+    2123412,
+    7419530,
+    11342935,
+    12745742,
+    11027200,
+    10038562,
+    9936031,
+    5533306
+];
diff --git a/src/plugins/pinDms/contextMenus.tsx b/src/plugins/pinDms/contextMenus.tsx
deleted file mode 100644
index 1db8b25a9..000000000
--- a/src/plugins/pinDms/contextMenus.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
-import { Menu } from "@webpack/common";
-
-import { isPinned, movePin, PinOrder, settings, snapshotArray, togglePin } from "./settings";
-
-function PinMenuItem(channelId: string) {
-    const pinned = isPinned(channelId);
-    const canMove = pinned && settings.store.pinOrder === PinOrder.Custom;
-
-    return (
-        <>
-            <Menu.MenuItem
-                id="pin-dm"
-                label={pinned ? "Unpin DM" : "Pin DM"}
-                action={() => togglePin(channelId)}
-            />
-            {canMove && snapshotArray[0] !== channelId && (
-                <Menu.MenuItem
-                    id="move-pin-up"
-                    label="Move Pin Up"
-                    action={() => movePin(channelId, -1)}
-                />
-            )}
-            {canMove && snapshotArray[snapshotArray.length - 1] !== channelId && (
-                <Menu.MenuItem
-                    id="move-pin-down"
-                    label="Move Pin Down"
-                    action={() => movePin(channelId, +1)}
-                />
-            )}
-        </>
-    );
-}
-
-const GroupDMContext: NavContextMenuPatchCallback = (children, props) => {
-    const container = findGroupChildrenByChildId("leave-channel", children);
-    if (container)
-        container.unshift(PinMenuItem(props.channel.id));
-};
-
-const UserContext: NavContextMenuPatchCallback = (children, props) => {
-    const container = findGroupChildrenByChildId("close-dm", children);
-    if (container) {
-        const idx = container.findIndex(c => c?.props?.id === "close-dm");
-        container.splice(idx, 0, PinMenuItem(props.channel.id));
-    }
-};
-
-export const contextMenus = {
-    "gdm-context": GroupDMContext,
-    "user-context": UserContext
-};
diff --git a/src/plugins/pinDms/data.ts b/src/plugins/pinDms/data.ts
new file mode 100644
index 000000000..afb6f9795
--- /dev/null
+++ b/src/plugins/pinDms/data.ts
@@ -0,0 +1,214 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import * as DataStore from "@api/DataStore";
+import { Settings } from "@api/Settings";
+import { UserStore } from "@webpack/common";
+
+import { DEFAULT_COLOR } from "./constants";
+import { forceUpdate } from "./index";
+
+export interface Category {
+    id: string;
+    name: string;
+    color: number;
+    channels: string[];
+    collapsed?: boolean;
+}
+
+const CATEGORY_BASE_KEY = "PinDMsCategories-";
+const CATEGORY_MIGRATED_PINDMS_KEY = "PinDMsMigratedPinDMs";
+const CATEGORY_MIGRATED_KEY = "PinDMsMigratedOldCategories";
+const OLD_CATEGORY_KEY = "BetterPinDMsCategories-";
+
+
+export let categories: Category[] = [];
+
+export async function saveCats(cats: Category[]) {
+    const { id } = UserStore.getCurrentUser();
+    await DataStore.set(CATEGORY_BASE_KEY + id, cats);
+}
+
+export async function init() {
+    const id = UserStore.getCurrentUser()?.id;
+    await initCategories(id);
+    await migrateData(id);
+    forceUpdate();
+}
+
+export async function initCategories(userId: string) {
+    categories = await DataStore.get<Category[]>(CATEGORY_BASE_KEY + userId) ?? [];
+}
+
+export function getCategory(id: string) {
+    return categories.find(c => c.id === id);
+}
+
+export async function createCategory(category: Category) {
+    categories.push(category);
+    await saveCats(categories);
+}
+
+export async function updateCategory(category: Category) {
+    const index = categories.findIndex(c => c.id === category.id);
+    if (index === -1) return;
+
+    categories[index] = category;
+    await saveCats(categories);
+}
+
+export async function addChannelToCategory(channelId: string, categoryId: string) {
+    const category = categories.find(c => c.id === categoryId);
+    if (!category) return;
+
+    if (category.channels.includes(channelId)) return;
+
+    category.channels.push(channelId);
+    await saveCats(categories);
+
+}
+
+export async function removeChannelFromCategory(channelId: string) {
+    const category = categories.find(c => c.channels.includes(channelId));
+    if (!category) return;
+
+    category.channels = category.channels.filter(c => c !== channelId);
+    await saveCats(categories);
+}
+
+export async function removeCategory(categoryId: string) {
+    const catagory = categories.find(c => c.id === categoryId);
+    if (!catagory) return;
+
+    // catagory?.channels.forEach(c => removeChannelFromCategory(c));
+    categories = categories.filter(c => c.id !== categoryId);
+    await saveCats(categories);
+}
+
+export async function collapseCategory(id: string, value = true) {
+    const category = categories.find(c => c.id === id);
+    if (!category) return;
+
+    category.collapsed = value;
+    await saveCats(categories);
+}
+
+// utils
+export function isPinned(id: string) {
+    return categories.some(c => c.channels.includes(id));
+}
+
+export function categoryLen() {
+    return categories.length;
+}
+
+export function getAllUncollapsedChannels() {
+    return categories.filter(c => !c.collapsed).map(c => c.channels).flat();
+}
+
+export function getSections() {
+    return categories.reduce((acc, category) => {
+        acc.push(category.channels.length === 0 ? 1 : category.channels.length);
+        return acc;
+    }, [] as number[]);
+}
+
+// move categories
+export const canMoveArrayInDirection = (array: any[], index: number, direction: -1 | 1) => {
+    const a = array[index];
+    const b = array[index + direction];
+
+    return a && b;
+};
+
+export const canMoveCategoryInDirection = (id: string, direction: -1 | 1) => {
+    const index = categories.findIndex(m => m.id === id);
+    return canMoveArrayInDirection(categories, index, direction);
+};
+
+export const canMoveCategory = (id: string) => canMoveCategoryInDirection(id, -1) || canMoveCategoryInDirection(id, 1);
+
+export const canMoveChannelInDirection = (channelId: string, direction: -1 | 1) => {
+    const category = categories.find(c => c.channels.includes(channelId));
+    if (!category) return false;
+
+    const index = category.channels.indexOf(channelId);
+    return canMoveArrayInDirection(category.channels, index, direction);
+};
+
+
+function swapElementsInArray(array: any[], index1: number, index2: number) {
+    if (!array[index1] || !array[index2]) return;
+    [array[index1], array[index2]] = [array[index2], array[index1]];
+}
+
+// stolen from PinDMs
+export async function moveCategory(id: string, direction: -1 | 1) {
+    const a = categories.findIndex(m => m.id === id);
+    const b = a + direction;
+
+    swapElementsInArray(categories, a, b);
+
+    await saveCats(categories);
+}
+
+export async function moveChannel(channelId: string, direction: -1 | 1) {
+    const category = categories.find(c => c.channels.includes(channelId));
+    if (!category) return;
+
+    const a = category.channels.indexOf(channelId);
+    const b = a + direction;
+
+    swapElementsInArray(category.channels, a, b);
+
+    await saveCats(categories);
+}
+
+
+
+// migrate data
+const getPinDMsPins = () => (Settings.plugins.PinDMs.pinnedDMs || void 0)?.split(",") as string[] | undefined;
+
+async function migratePinDMs() {
+    if (categories.some(m => m.id === "oldPins")) {
+        return await DataStore.set(CATEGORY_MIGRATED_PINDMS_KEY, true);
+    }
+
+    const pindmspins = getPinDMsPins();
+
+    // we dont want duplicate pins
+    const difference = [...new Set(pindmspins)]?.filter(m => !categories.some(c => c.channels.includes(m)));
+    if (difference?.length) {
+        categories.push({
+            id: "oldPins",
+            name: "Pins",
+            color: DEFAULT_COLOR,
+            channels: difference
+        });
+    }
+
+    await DataStore.set(CATEGORY_MIGRATED_PINDMS_KEY, true);
+}
+
+async function migrateOldCategories(userId: string) {
+    const oldCats = await DataStore.get<Category[]>(OLD_CATEGORY_KEY + userId);
+    // dont want to migrate if the user has already has categories.
+    if (categories.length === 0 && oldCats?.length) {
+        categories.push(...(oldCats.filter(m => m.id !== "oldPins")));
+    }
+    await DataStore.set(CATEGORY_MIGRATED_KEY, true);
+}
+
+export async function migrateData(userId: string) {
+    const m1 = await DataStore.get(CATEGORY_MIGRATED_KEY), m2 = await DataStore.get(CATEGORY_MIGRATED_PINDMS_KEY);
+    if (m1 && m2) return;
+
+    // want to migrate the old categories first and then slove any conflicts with the PinDMs pins
+    if (!m1) await migrateOldCategories(userId);
+    if (!m2) await migratePinDMs();
+
+    await saveCats(categories);
+}
diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index 45172328e..ee726bfab 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -1,116 +1,131 @@
 /*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
+import "./styles.css";
+
+import { definePluginSettings } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import { classes } from "@utils/misc";
+import definePlugin, { OptionType, StartAt } from "@utils/types";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
+import { ContextMenuApi, FluxDispatcher, Menu, React } from "@webpack/common";
 import { Channel } from "discord-types/general";
 
-import { contextMenus } from "./contextMenus";
-import { getPinAt, isPinned, settings, snapshotArray, sortedSnapshot, usePinnedDms } from "./settings";
+import { contextMenus } from "./components/contextMenu";
+import { openCategoryModal, requireSettingsMenu } from "./components/CreateCategoryModal";
+import { DEFAULT_CHUNK_SIZE } from "./constants";
+import { canMoveCategory, canMoveCategoryInDirection, categories, Category, categoryLen, collapseCategory, getAllUncollapsedChannels, getSections, init, isPinned, moveCategory, removeCategory } from "./data";
+
+interface ChannelComponentProps {
+    children: React.ReactNode,
+    channel: Channel,
+    selected: boolean;
+}
+
+
+const headerClasses = findByPropsLazy("privateChannelsHeaderContainer");
+
+const PrivateChannelSortStore = findStoreLazy("PrivateChannelSortStore") as { getPrivateChannelIds: () => string[]; };
+
+export let instance: any;
+export const forceUpdate = () => instance?.props?._forceUpdate?.();
+
+export const settings = definePluginSettings({
+    sortDmsByNewestMessage: {
+        type: OptionType.BOOLEAN,
+        description: "Sort DMs by newest message",
+        default: false,
+        onChange: () => forceUpdate()
+    },
+
+    dmSectioncollapsed: {
+        type: OptionType.BOOLEAN,
+        description: "Collapse DM sections",
+        default: false,
+        onChange: () => forceUpdate()
+    }
+});
 
 export default definePlugin({
     name: "PinDMs",
     description: "Allows you to pin private channels to the top of your DM list. To pin/unpin or reorder pins, right click DMs",
-    authors: [Devs.Ven],
-
+    authors: [Devs.Ven, Devs.Aria],
     settings,
     contextMenus,
 
-    usePinCount(channelIds: string[]) {
-        const pinnedDms = usePinnedDms();
-        // See comment on 2nd patch for reasoning
-        return channelIds.length ? [pinnedDms.size] : [];
-    },
-
-    getChannel(channels: Record<string, Channel>, idx: number) {
-        return channels[getPinAt(idx)];
-    },
-
-    isPinned,
-    getSnapshot: sortedSnapshot,
-
-    getScrollOffset(channelId: string, rowHeight: number, padding: number, preRenderedChildren: number, originalOffset: number) {
-        if (!isPinned(channelId))
-            return (
-                (rowHeight + padding) * 2 // header
-                + rowHeight * snapshotArray.length // pins
-                + originalOffset // original pin offset minus pins
-            );
-
-        return rowHeight * (snapshotArray.indexOf(channelId) + preRenderedChildren) + padding;
-    },
-
     patches: [
-        // Patch DM list
         {
             find: ".privateChannelsHeaderContainer,",
             replacement: [
+                // Init
                 {
-                    // filter Discord's privateChannelIds list to remove pins, and pass
-                    // pinCount as prop. This needs to be here so that the entire DM list receives
-                    // updates on pin/unpin
-                    match: /(?<=\i,{channels:\i,)privateChannelIds:(\i),/,
-                    replace: "privateChannelIds:$1.filter(c=>!$self.isPinned(c)),pinCount:$self.usePinCount($1),"
+                    match: /(?<=componentDidMount\(\){).{1,100}scrollToChannel/,
+                    replace: "$self._instance = this;$&"
                 },
                 {
-                    // sections is an array of numbers, where each element is a section and
-                    // the number is the amount of rows. Add our pinCount in second place
-                    // - Section 1: buttons for pages like Friends & Library
-                    // - Section 2: our pinned dms
-                    // - Section 3: the normal dm list
-                    match: /(?<=renderRow:this\.renderRow,)sections:\[\i,/,
-                    // For some reason, adding our sections when no private channels are ready yet
-                    // makes DMs infinitely load. Thus usePinCount returns either a single element
-                    // array with the count, or an empty array. Due to spreading, only in the former
-                    // case will an element be added to the outer array
-                    // Thanks for the fix, Strencher!
-                    replace: "$&...this.props.pinCount??[],"
+                    // Filter out pinned channels from the private channel list
+                    match: /(?<=\i,{channels:\i,)privateChannelIds:(\i)/,
+                    replace: "privateChannelIds:$1.filter(c=>!$self.isPinned(c))"
                 },
                 {
-                    // Patch renderSection (renders the header) to set the text to "Pinned DMs" instead of "Direct Messages"
-                    // lookbehind is used to lookup parameter name. We could use arguments[0], but
-                    // if children ever is wrapped in an iife, it will break
-                    match: /children:(\i\.\i\.Messages.DIRECT_MESSAGES)(?<=renderSection=(\i)=>{.+?)/,
-                    replace: "children:$2.section===1?'Pinned DMs':$1"
+                    // Insert the pinned channels to sections
+                    match: /(?<=renderRow:this\.renderRow,)sections:\[.+?1\)]/,
+                    replace: "...$self.makeProps(this,{$&})"
+                },
+
+                // Rendering
+                {
+                    match: /this\.renderDM=\(.+?(\i\.default),{channel.+?this.renderRow=(\i)=>{/,
+                    replace: "$&if($self.isChannelIndex($2.section, $2.row))return $self.renderChannel($2.section,$2.row,$1);"
                 },
                 {
-                    // Patch channel lookup inside renderDM
-                    // channel=channels[channelIds[row]];
-                    match: /(?<=renderDM=\((\i),(\i)\)=>{.*?this.state,\i=\i\[\i\],\i=)((\i)\[\i\]);/,
-                    // section 1 is us, manually get our own channel
-                    // section === 1 ? getChannel(channels, row) : channels[channelIds[row]];
-                    replace: "$1===1?$self.getChannel($4,$2):$3;"
+                    match: /this\.renderSection=(\i)=>{/,
+                    replace: "$&if($self.isCategoryIndex($1.section))return $self.renderCategory($1);"
                 },
                 {
-                    // Fix getRowHeight's check for whether this is the DMs section
-                    // DMS (inlined) === section
-                    match: /(?<=getRowHeight=\(.{2,50}?)1===\i/,
-                    // DMS (inlined) === section - 1
-                    replace: "$&-1"
+                    match: /(?<=span",{)className:\i\.headerText,/,
+                    replace: "...$self.makeSpanProps(),$&"
                 },
+
+                // Fix Row Height
+                {
+                    match: /(?<=this\.getRowHeight=.{1,100}return 1===)\i/,
+                    replace: "($&-$self.categoryLen())"
+                },
+                {
+                    match: /this.getRowHeight=\((\i),(\i)\)=>{/,
+                    replace: "$&if($self.isChannelHidden($1,$2))return 0;"
+                },
+
+                // Fix ScrollTo
                 {
                     // Override scrollToChannel to properly account for pinned channels
                     match: /(?<=scrollTo\(\{to:\i\}\):\(\i\+=)(\d+)\*\(.+?(?=,)/,
                     replace: "$self.getScrollOffset(arguments[0],$1,this.props.padding,this.state.preRenderedChildren,$&)"
-                }
+                },
+                {
+                    match: /(?<=scrollToChannel\(\i\){.{1,300})this\.props\.privateChannelIds/,
+                    replace: "[...$&,...$self.getAllUncollapsedChannels()]"
+                },
+
             ]
         },
 
+
+        // forceUpdate moment
+        // https://regex101.com/r/kDN9fO/1
+        {
+            find: ".FRIENDS},\"friends\"",
+            replacement: {
+                match: /(?<=\i=\i=>{).{1,100}premiumTabSelected.{1,800}showDMHeader:.+?,/,
+                replace: "let forceUpdate = Vencord.Util.useForceUpdater();$&_forceUpdate:forceUpdate,"
+            }
+        },
+
         // Fix Alt Up/Down navigation
         {
             find: ".Routes.APPLICATION_STORE&&",
@@ -118,16 +133,227 @@ export default definePlugin({
                 // channelIds = __OVERLAY__ ? stuff : [...getStaticPaths(),...channelIds)]
                 match: /(?<=\i=__OVERLAY__\?\i:\[\.\.\.\i\(\),\.\.\.)\i/,
                 // ....concat(pins).concat(toArray(channelIds).filter(c => !isPinned(c)))
-                replace: "$self.getSnapshot().concat($&.filter(c=>!$self.isPinned(c)))"
+                replace: "$self.getAllUncollapsedChannels().concat($&.filter(c=>!$self.isPinned(c)))"
             }
         },
+
         // fix alt+shift+up/down
         {
             find: ".getFlattenedGuildIds()],",
             replacement: {
                 match: /(?<=\i===\i\.ME\?)\i\.\i\.getPrivateChannelIds\(\)/,
-                replace: "$self.getSnapshot().concat($&.filter(c=>!$self.isPinned(c)))"
+                replace: "$self.getAllUncollapsedChannels().concat($&.filter(c=>!$self.isPinned(c)))"
             }
         },
-    ]
+    ],
+    sections: null as number[] | null,
+
+    set _instance(i: any) {
+        this.instance = i;
+        instance = i;
+    },
+
+    startAt: StartAt.WebpackReady,
+    start: init,
+    flux: {
+        CONNECTION_OPEN: init,
+    },
+
+    isPinned,
+    categoryLen,
+    getSections,
+    getAllUncollapsedChannels,
+    requireSettingsMenu,
+    makeProps(instance, { sections }: { sections: number[]; }) {
+        this.sections = sections;
+
+        this.sections.splice(1, 0, ...this.getPinCount(instance.props.privateChannelIds || []));
+
+        if (this.instance?.props?.privateChannelIds?.length === 0) {
+            this.sections[this.sections.length - 1] = 0;
+        }
+
+        return {
+            sections: this.sections,
+            chunkSize: this.getChunkSize(),
+        };
+    },
+
+    makeSpanProps() {
+        return {
+            onClick: () => this.collapseDMList(),
+            role: "button",
+            style: { cursor: "pointer" }
+        };
+    },
+
+    getChunkSize() {
+        // the chunk size is the amount of rows (measured in pixels) that are rendered at once (probably)
+        // the higher the chunk size, the more rows are rendered at once
+        // also if the chunk size is 0 it will render everything at once
+
+        const sections = this.getSections();
+        const sectionHeaderSizePx = sections.length * 40;
+        // (header heights + DM heights + DEFAULT_CHUNK_SIZE) * 1.5
+        // we multiply everything by 1.5 so it only gets unmounted after the entire list is off screen
+        return (sectionHeaderSizePx + sections.reduce((acc, v) => acc += v + 44, 0) + DEFAULT_CHUNK_SIZE) * 1.5;
+    },
+
+    getPinCount(channelIds: string[]) {
+        return channelIds.length ? this.getSections() : [];
+    },
+
+    isCategoryIndex(sectionIndex: number) {
+        return this.sections && sectionIndex > 0 && sectionIndex < this.sections.length - 1;
+    },
+
+    isChannelIndex(sectionIndex: number, channelIndex: number) {
+        if (settings.store.dmSectioncollapsed && sectionIndex !== 0)
+            return true;
+        const cat = categories[sectionIndex - 1];
+        return this.isCategoryIndex(sectionIndex) && (cat.channels.length === 0 || cat?.channels[channelIndex]);
+    },
+
+    isDMSectioncollapsed() {
+        return settings.store.dmSectioncollapsed;
+    },
+
+    collapseDMList() {
+        // console.log("HI");
+        settings.store.dmSectioncollapsed = !settings.store.dmSectioncollapsed;
+        forceUpdate();
+    },
+
+    isChannelHidden(categoryIndex: number, channelIndex: number) {
+        if (categoryIndex === 0) return false;
+
+        if (settings.store.dmSectioncollapsed && this.getSections().length + 1 === categoryIndex)
+            return true;
+
+        if (!this.instance || !this.isChannelIndex(categoryIndex, channelIndex)) return false;
+
+        const category = categories[categoryIndex - 1];
+        if (!category) return false;
+
+        return category.collapsed && this.instance.props.selectedChannelId !== category.channels[channelIndex];
+    },
+
+    getScrollOffset(channelId: string, rowHeight: number, padding: number, preRenderedChildren: number, originalOffset: number) {
+        if (!isPinned(channelId))
+            return (
+                (rowHeight + padding) * 2 // header
+                + rowHeight * this.getAllUncollapsedChannels().length // pins
+                + originalOffset // original pin offset minus pins
+            );
+
+        return rowHeight * (this.getAllUncollapsedChannels().indexOf(channelId) + preRenderedChildren) + padding;
+    },
+
+    renderCategory: ErrorBoundary.wrap(({ section }: { section: number; }) => {
+        const category = categories[section - 1];
+
+        if (!category) return null;
+
+        return (
+            <h2
+                className={classes(headerClasses.privateChannelsHeaderContainer, "vc-pindms-section-container", category.collapsed ? "vc-pindms-collapsed" : "")}
+                style={{ color: `#${category.color.toString(16).padStart(6, "0")}` }}
+                onClick={async () => {
+                    await collapseCategory(category.id, !category.collapsed);
+                    forceUpdate();
+                }}
+                onContextMenu={e => {
+                    ContextMenuApi.openContextMenu(e, () => (
+                        <Menu.Menu
+                            navId="vc-pindms-header-menu"
+                            onClose={() => FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" })}
+                            color="danger"
+                            aria-label="Pin DMs Category Menu"
+                        >
+                            <Menu.MenuItem
+                                id="vc-pindms-edit-category"
+                                label="Edit Category"
+                                action={() => openCategoryModal(category.id, null)}
+                            />
+
+                            {
+                                canMoveCategory(category.id) && (
+                                    <>
+                                        {
+                                            canMoveCategoryInDirection(category.id, -1) && <Menu.MenuItem
+                                                id="vc-pindms-move-category-up"
+                                                label="Move Up"
+                                                action={() => moveCategory(category.id, -1).then(() => forceUpdate())}
+                                            />
+                                        }
+                                        {
+                                            canMoveCategoryInDirection(category.id, 1) && <Menu.MenuItem
+                                                id="vc-pindms-move-category-down"
+                                                label="Move Down"
+                                                action={() => moveCategory(category.id, 1).then(() => forceUpdate())}
+                                            />
+                                        }
+                                    </>
+
+                                )
+                            }
+
+                            <Menu.MenuSeparator />
+                            <Menu.MenuItem
+                                id="vc-pindms-delete-category"
+                                color="danger"
+                                label="Delete Category"
+                                action={() => removeCategory(category.id).then(() => forceUpdate())}
+                            />
+
+
+                        </Menu.Menu>
+                    ));
+                }}
+            >
+                <span className={headerClasses.headerText}>
+                    {category?.name ?? "uh oh"}
+                </span>
+                <svg className="vc-pindms-collapse-icon" aria-hidden="true" role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+                    <path fill="currentColor" d="M9.3 5.3a1 1 0 0 0 0 1.4l5.29 5.3-5.3 5.3a1 1 0 1 0 1.42 1.4l6-6a1 1 0 0 0 0-1.4l-6-6a1 1 0 0 0-1.42 0Z"></path>
+                </svg>
+            </h2>
+        );
+    }),
+
+    renderChannel(sectionIndex: number, index: number, ChannelComponent: React.ComponentType<ChannelComponentProps>) {
+        const { channel, category } = this.getChannel(sectionIndex, index, this.instance.props.channels);
+
+        if (!channel || !category) return null;
+        if (this.isChannelHidden(sectionIndex, index)) return null;
+
+        return (
+            <ChannelComponent
+                channel={channel}
+                selected={this.instance.props.selectedChannelId === channel.id}
+            >
+                {channel.id}
+            </ChannelComponent>
+        );
+    },
+
+
+    getChannel(sectionIndex: number, index: number, channels: Record<string, Channel>) {
+        const category = categories[sectionIndex - 1];
+        if (!category) return { channel: null, category: null };
+
+        const channelId = this.getCategoryChannels(category)[index];
+
+        return { channel: channels[channelId], category };
+    },
+
+    getCategoryChannels(category: Category) {
+        if (category.channels.length === 0) return [];
+
+        if (settings.store.sortDmsByNewestMessage) {
+            return PrivateChannelSortStore.getPrivateChannelIds().filter(c => category.channels.includes(c));
+        }
+
+        return category?.channels ?? [];
+    }
 });
diff --git a/src/plugins/pinDms/settings.ts b/src/plugins/pinDms/settings.ts
deleted file mode 100644
index 1e0244ed7..000000000
--- a/src/plugins/pinDms/settings.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { definePluginSettings, Settings, useSettings } from "@api/Settings";
-import { OptionType } from "@utils/types";
-import { findStoreLazy } from "@webpack";
-
-export const enum PinOrder {
-    LastMessage,
-    Custom
-}
-
-export const settings = definePluginSettings({
-    pinOrder: {
-        type: OptionType.SELECT,
-        description: "Which order should pinned DMs be displayed in?",
-        options: [
-            { label: "Most recent message", value: PinOrder.LastMessage, default: true },
-            { label: "Custom (right click channels to reorder)", value: PinOrder.Custom }
-        ]
-    }
-});
-
-const PrivateChannelSortStore = findStoreLazy("PrivateChannelSortStore");
-
-export let snapshotArray: string[];
-let snapshot: Set<string> | undefined;
-
-const getArray = () => (Settings.plugins.PinDMs.pinnedDMs || void 0)?.split(",") as string[] | undefined;
-const save = (pins: string[]) => {
-    snapshot = void 0;
-    Settings.plugins.PinDMs.pinnedDMs = pins.join(",");
-};
-const takeSnapshot = () => {
-    snapshotArray = getArray() ?? [];
-    return snapshot = new Set<string>(snapshotArray);
-};
-const requireSnapshot = () => snapshot ?? takeSnapshot();
-
-export function usePinnedDms() {
-    useSettings(["plugins.PinDMs.pinnedDMs"]);
-
-    return requireSnapshot();
-}
-
-export function isPinned(id: string) {
-    return requireSnapshot().has(id);
-}
-
-export function togglePin(id: string) {
-    const snapshot = requireSnapshot();
-    if (!snapshot.delete(id)) {
-        snapshot.add(id);
-    }
-
-    save([...snapshot]);
-}
-
-export function sortedSnapshot() {
-    requireSnapshot();
-    if (settings.store.pinOrder === PinOrder.LastMessage)
-        return PrivateChannelSortStore.getPrivateChannelIds().filter(isPinned);
-
-    return snapshotArray;
-}
-
-export function getPinAt(idx: number) {
-    return sortedSnapshot()[idx];
-}
-
-export function movePin(id: string, direction: -1 | 1) {
-    const pins = getArray()!;
-    const a = pins.indexOf(id);
-    const b = a + direction;
-
-    [pins[a], pins[b]] = [pins[b], pins[a]];
-
-    save(pins);
-}
diff --git a/src/plugins/pinDms/styles.css b/src/plugins/pinDms/styles.css
new file mode 100644
index 000000000..173f0f76b
--- /dev/null
+++ b/src/plugins/pinDms/styles.css
@@ -0,0 +1,37 @@
+.vc-pindms-section-container {
+    box-sizing: border-box;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    text-transform: uppercase;
+    font-size: 12px;
+    line-height: 16px;
+    letter-spacing: .02em;
+    font-family: var(--font-display);
+    font-weight: 600;
+    flex: 1 1 auto;
+    color: var(--channels-default);
+    cursor: pointer;
+}
+
+.vc-pindms-modal-content {
+    display: grid;
+    justify-content: center;
+    padding: 1rem;
+    gap: 1.5rem;
+}
+
+.vc-pindms-modal-content [class^="defaultContainer"] {
+    display: none;
+}
+
+.vc-pindms-collapse-icon {
+    width: 16px;
+    height: 16px;
+    color: var(--interactive-normal);
+    transform: rotate(90deg)
+}
+
+.vc-pindms-collapsed .vc-pindms-collapse-icon {
+    transform: rotate(0deg);
+}

From 5646fe402ac0da45e9a6a9f25d2594cb721527cf Mon Sep 17 00:00:00 2001
From: MrDiamondDog <84212701+MrDiamondDog@users.noreply.github.com>
Date: Thu, 21 Mar 2024 17:59:25 -0600
Subject: [PATCH 400/632] feat(PatchHelper): Paste Full Patch (#1982)

---
 src/components/CheckedTextInput.tsx           |  6 +-
 .../VencordSettings/PatchHelperTab.tsx        | 65 ++++++++++++++++++-
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/src/components/CheckedTextInput.tsx b/src/components/CheckedTextInput.tsx
index cf4aa119b..de2d7ae04 100644
--- a/src/components/CheckedTextInput.tsx
+++ b/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, useEffect } from "@webpack/common";
 
 // TODO: Refactor settings to use this as well
 interface TextInputProps {
@@ -55,6 +55,10 @@ export function CheckedTextInput({ value: initialValue, onChange, validate }: Te
         }
     }
 
+    useEffect(() => {
+        handleChange(initialValue);
+    }, [initialValue]);
+
     return (
         <>
             <TextInput
diff --git a/src/components/VencordSettings/PatchHelperTab.tsx b/src/components/VencordSettings/PatchHelperTab.tsx
index 7e68ec1e7..064c872ab 100644
--- a/src/components/VencordSettings/PatchHelperTab.tsx
+++ b/src/components/VencordSettings/PatchHelperTab.tsx
@@ -22,9 +22,9 @@ import { debounce } from "@shared/debounce";
 import { Margins } from "@utils/margins";
 import { canonicalizeMatch, canonicalizeReplace } from "@utils/patches";
 import { makeCodeblock } from "@utils/text";
-import { ReplaceFn } from "@utils/types";
+import { Patch, ReplaceFn } from "@utils/types";
 import { search } from "@webpack";
-import { Button, Clipboard, Forms, Parser, React, Switch, TextInput } from "@webpack/common";
+import { Button, Clipboard, Forms, Parser, React, Switch, TextArea, TextInput } from "@webpack/common";
 
 import { SettingsTab, wrapTab } from "./shared";
 
@@ -218,6 +218,60 @@ function ReplacementInput({ replacement, setReplacement, replacementError }) {
     );
 }
 
+interface FullPatchInputProps {
+    setFind(v: string): void;
+    setMatch(v: string): void;
+    setReplacement(v: string | ReplaceFn): void;
+}
+
+function FullPatchInput({ setFind, setMatch, setReplacement }: FullPatchInputProps) {
+    const [fullPatch, setFullPatch] = React.useState<string>("");
+    const [fullPatchError, setFullPatchError] = React.useState<string>("");
+
+    function update() {
+        if (fullPatch === "") {
+            setFullPatchError("");
+
+            setFind("");
+            setMatch("");
+            setReplacement("");
+            return;
+        }
+
+        try {
+            const parsed = (0, eval)(`(${fullPatch})`) as Patch;
+
+            if (!parsed.find) throw new Error("No 'find' field");
+            if (!parsed.replacement) throw new Error("No 'replacement' field");
+
+            if (parsed.replacement instanceof Array) {
+                if (parsed.replacement.length === 0) throw new Error("Invalid replacement");
+
+                parsed.replacement = {
+                    match: parsed.replacement[0].match,
+                    replace: parsed.replacement[0].replace
+                };
+            }
+
+            if (!parsed.replacement.match) throw new Error("No 'replacement.match' field");
+            if (!parsed.replacement.replace) throw new Error("No 'replacement.replace' field");
+
+            setFind(parsed.find);
+            setMatch(parsed.replacement.match instanceof RegExp ? parsed.replacement.match.source : parsed.replacement.match);
+            setReplacement(parsed.replacement.replace);
+            setFullPatchError("");
+        } catch (e) {
+            setFullPatchError((e as Error).message);
+        }
+    }
+
+    return <>
+        <Forms.FormText>Paste your full JSON patch here to fill out the fields</Forms.FormText>
+        <TextArea value={fullPatch} onChange={setFullPatch} onBlur={update} />
+        {fullPatchError !== "" && <Forms.FormText style={{ color: "var(--text-danger)" }}>{fullPatchError}</Forms.FormText>}
+    </>;
+}
+
 function PatchHelper() {
     const [find, setFind] = React.useState<string>("");
     const [match, setMatch] = React.useState<string>("");
@@ -260,6 +314,13 @@ function PatchHelper() {
 
     return (
         <SettingsTab title="Patch Helper">
+            <Forms.FormTitle>full patch</Forms.FormTitle>
+            <FullPatchInput
+                setFind={onFindChange}
+                setMatch={onMatchChange}
+                setReplacement={setReplacement}
+            />
+
             <Forms.FormTitle>find</Forms.FormTitle>
             <TextInput
                 type="text"

From 1cb295b1b97b4e19d49a709541905bdf8949c4a0 Mon Sep 17 00:00:00 2001
From: Inbestigator <119569726+Inbestigator@users.noreply.github.com>
Date: Thu, 21 Mar 2024 18:16:24 -0700
Subject: [PATCH 401/632] new plugin: OverrideForumDefaults (#2272)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/overrideForumDefaults/index.tsx | 54 +++++++++++++++++++++
 src/utils/constants.ts                      |  4 ++
 2 files changed, 58 insertions(+)
 create mode 100644 src/plugins/overrideForumDefaults/index.tsx

diff --git a/src/plugins/overrideForumDefaults/index.tsx b/src/plugins/overrideForumDefaults/index.tsx
new file mode 100644
index 000000000..be106ac8a
--- /dev/null
+++ b/src/plugins/overrideForumDefaults/index.tsx
@@ -0,0 +1,54 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+
+const settings = definePluginSettings({
+    defaultLayout: {
+        type: OptionType.SELECT,
+        options: [
+            { label: "List", value: 1, default: true },
+            { label: "Gallery", value: 2 }
+        ],
+        description: "Which layout to use as default"
+    },
+    defaultSortOrder: {
+        type: OptionType.SELECT,
+        options: [
+            { label: "Recently Active", value: 0, default: true },
+            { label: "Date Posted", value: 1 }
+        ],
+        description: "Which sort order to use as default"
+    }
+});
+
+export default definePlugin({
+    name: "OverrideForumDefaults",
+    description: "Allows you to override default forum layout/sort order. you can still change it on a per-channel basis",
+    authors: [Devs.Inbestigator],
+    patches: [
+        {
+            find: "getDefaultLayout(){",
+            replacement: [
+                {
+                    match: /getDefaultLayout\(\){/,
+                    replace: "$&return $self.getLayout();"
+                },
+                {
+                    match: /getDefaultSortOrder\(\){/,
+                    replace: "$&return $self.getSortOrder();"
+                }
+            ]
+        }
+    ],
+
+    getLayout: () => settings.store.defaultLayout,
+    getSortOrder: () => settings.store.defaultSortOrder,
+
+    settings
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 5b540895a..f3626aaa0 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -418,6 +418,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Elvyra",
         id: 708275751816003615n,
     },
+    Inbestigator: {
+        name: "Inbestigator",
+        id: 761777382041714690n
+    },
     newwares: {
         name: "newwares",
         id: 421405303951851520n

From ec66c35d4101bbd9acb1981f80f99e6418bac6d6 Mon Sep 17 00:00:00 2001
From: mcpower <mcpower@users.noreply.github.com>
Date: Fri, 22 Mar 2024 12:27:09 +1100
Subject: [PATCH 402/632] MessageLinkEmbeds: Load embeds from newest to oldest
 (#2230)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/messageLinkEmbeds/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index 50c09ec9f..6ee60be71 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -255,7 +255,7 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
                 delete msg.embeds;
                 delete msg.interaction;
 
-                messageFetchQueue.push(() => fetchMessage(channelID, messageID)
+                messageFetchQueue.unshift(() => fetchMessage(channelID, messageID)
                     .then(m => m && FluxDispatcher.dispatch({
                         type: "MESSAGE_UPDATE",
                         message: msg

From caa14ece0d238ad8ec2455510a7cd719428f674a Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 22 Mar 2024 03:14:57 +0100
Subject: [PATCH 403/632] bump to v1.7.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9d7b6347a..025fa13d4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.7.2",
+    "version": "1.7.3",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From ca18b6e0446b6f1858a82de47489bb01f925ce25 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 22 Mar 2024 04:08:08 +0100
Subject: [PATCH 404/632] Fix CloudSync

---
 src/components/CheckedTextInput.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/CheckedTextInput.tsx b/src/components/CheckedTextInput.tsx
index de2d7ae04..cf4aa119b 100644
--- a/src/components/CheckedTextInput.tsx
+++ b/src/components/CheckedTextInput.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { React, TextInput, useEffect } from "@webpack/common";
+import { React, TextInput } from "@webpack/common";
 
 // TODO: Refactor settings to use this as well
 interface TextInputProps {
@@ -55,10 +55,6 @@ export function CheckedTextInput({ value: initialValue, onChange, validate }: Te
         }
     }
 
-    useEffect(() => {
-        handleChange(initialValue);
-    }, [initialValue]);
-
     return (
         <>
             <TextInput

From 8d35cc6112a4e50250e397d40c315c9d841e8666 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 22 Mar 2024 09:42:19 -0300
Subject: [PATCH 405/632] BetterNotes: Fix patches

---
 src/plugins/betterNotes/index.tsx | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/plugins/betterNotes/index.tsx b/src/plugins/betterNotes/index.tsx
index da41b9732..2183d98e2 100644
--- a/src/plugins/betterNotes/index.tsx
+++ b/src/plugins/betterNotes/index.tsx
@@ -18,6 +18,7 @@
 
 import { Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
+import { canonicalizeMatch } from "@utils/patches";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 
@@ -39,8 +40,12 @@ export default definePlugin({
                 match: /hideNote:.+?(?=([,}].*?\)))/g,
                 replace: (m, rest) => {
                     const destructuringMatch = rest.match(/}=.+/);
-                    if (destructuringMatch == null) return "hideNote:!0";
-                    return m;
+                    if (destructuringMatch) {
+                        const defaultValueMatch = m.match(canonicalizeMatch(/hideNote:(\i)=!?\d/));
+                        return defaultValueMatch ? `hideNote:${defaultValueMatch[1]}=!0` : m;
+                    }
+
+                    return "hideNote:!0";
                 }
             }
         },
@@ -52,10 +57,10 @@ export default definePlugin({
             }
         },
         {
-            find: ".Messages.NOTE}",
+            find: ".popularApplicationCommandIds,",
             replacement: {
-                match: /(?<=return \i\?)null(?=:\(0,\i\.jsxs)/,
-                replace: "$self.patchPadding(arguments[0])"
+                match: /lastSection:(!?\i)}\),/,
+                replace: "$&$self.patchPadding($1),"
             }
         }
     ],
@@ -75,8 +80,8 @@ export default definePlugin({
         }
     },
 
-    patchPadding(e: any) {
-        if (!e.lastSection) return;
+    patchPadding(lastSection: any) {
+        if (!lastSection) return;
         return (
             <div className={UserPopoutSectionCssClasses.lastSection}></div>
         );

From e1f8b3cb307371471978973e3c8d4501efc8a6e6 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 22 Mar 2024 09:43:17 -0300
Subject: [PATCH 406/632] UserVoiceShow: Fix UserPopout patch stealing
 predicates from another component

---
 src/plugins/userVoiceShow/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/userVoiceShow/index.tsx b/src/plugins/userVoiceShow/index.tsx
index 935ff1c5d..200cfe895 100644
--- a/src/plugins/userVoiceShow/index.tsx
+++ b/src/plugins/userVoiceShow/index.tsx
@@ -98,8 +98,8 @@ export default definePlugin({
         {
             find: ".popularApplicationCommandIds,",
             replacement: {
-                match: /\(0,\i\.jsx\)\(\i\.\i,{user:\i,setNote/,
-                replace: "$self.patchPopout(arguments[0]),$&",
+                match: /applicationId:\i\.id}\),(?=.{0,50}setNote:\i)/,
+                replace: "$&$self.patchPopout(arguments[0]),",
             }
         },
         // below username

From 0983a038f1aa81232f61c5034201dcba51e57724 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 27 Mar 2024 10:29:58 -0300
Subject: [PATCH 407/632] Fix broken patches

---
 src/plugins/_api/chatButtons.ts          | 6 +++---
 src/plugins/_api/memberListDecorators.ts | 2 +-
 src/plugins/webContextMenus.web/index.ts | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/_api/chatButtons.ts b/src/plugins/_api/chatButtons.ts
index ca85964c0..9e2c6bf06 100644
--- a/src/plugins/_api/chatButtons.ts
+++ b/src/plugins/_api/chatButtons.ts
@@ -13,10 +13,10 @@ export default definePlugin({
     authors: [Devs.Ven],
 
     patches: [{
-        find: 'location:"ChannelTextAreaButtons"',
+        find: '"gift")),(null',
         replacement: {
-            match: /if\(!\i\.isMobile\)\{(?=.+?&&(\i)\.push\(.{0,50}"gift")/,
-            replace: "$&Vencord.Api.ChatButtons._injectButtons($1,arguments[0]);"
+            match: /!\i\.isMobile&&(?=\(\i\.isDM.+?&&(\i)\.push\(.{0,50}"gift")/,
+            replace: "$&(Vencord.Api.ChatButtons._injectButtons($1,arguments[0]),!0)&&"
         }
     }]
 });
diff --git a/src/plugins/_api/memberListDecorators.ts b/src/plugins/_api/memberListDecorators.ts
index 1251c3578..5e3e5ed18 100644
--- a/src/plugins/_api/memberListDecorators.ts
+++ b/src/plugins/_api/memberListDecorators.ts
@@ -31,7 +31,7 @@ export default definePlugin({
                     match: /let\{[^}]*lostPermissionTooltipText:\i[^}]*\}=(\i),/,
                     replace: "$&vencordProps=$1,"
                 }, {
-                    match: /decorators:.{0,100}?children:\[/,
+                    match: /\.Messages\.GUILD_OWNER(?=.+?decorators:(\i)\(\)).+?\1=?\(\)=>.+?children:\[/,
                     replace: "$&...(typeof vencordProps=='undefined'?[]:Vencord.Api.MemberListDecorators.__getDecorators(vencordProps)),"
                 }
             ]
diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index faa240783..ac4689036 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -195,7 +195,7 @@ export default definePlugin({
 
         // Add back "Show My Camera" context menu
         {
-            find: '.default("MediaEngineWebRTC");',
+            find: '"MediaEngineWebRTC");',
             replacement: {
                 match: /supports\(\i\)\{switch\(\i\)\{case (\i).Features/,
                 replace: "$&.DISABLE_VIDEO:return true;case $1.Features"

From 31c21594e64d70cfa712e3301b58dbe361cc1ca7 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 27 Mar 2024 10:39:58 -0300
Subject: [PATCH 408/632] Reporter: Ignore another useless error

---
 scripts/generateReport.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 33b099ef8..41e384295 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -67,7 +67,8 @@ const IGNORED_DISCORD_ERRORS = [
     "Unable to process domain list delta: Client revision number is null",
     "Downloading the full bad domains file",
     /\[GatewaySocket\].{0,110}Cannot access '/,
-    "search for 'name' in undefined"
+    "search for 'name' in undefined",
+    "Attempting to set fast connect zstd when unsupported"
 ] as Array<string | RegExp>;
 
 function toCodeBlock(s: string) {

From 0d22ff0091601dc297fe919e63acc5f69baa964a Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 27 Mar 2024 21:27:56 +0100
Subject: [PATCH 409/632] webpack: fix infinite recursion when using
 ConsoleShortcuts plugin

---
 docs/1_INSTALLING.md            | 8 +++-----
 src/plugins/_api/chatButtons.ts | 6 +++---
 src/webpack/common/stores.ts    | 1 -
 src/webpack/webpack.ts          | 4 ++--
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/docs/1_INSTALLING.md b/docs/1_INSTALLING.md
index d57e64e58..edeed4eb5 100644
--- a/docs/1_INSTALLING.md
+++ b/docs/1_INSTALLING.md
@@ -1,6 +1,6 @@
-> [!WARNING]  
-> These instructions are only for advanced users. If you're not a Developer, you should use our [graphical installer](https://github.com/Vendicated/VencordInstaller#usage) instead.  
-> No support will be provided for installing in this fashion. If you cannot figure it out, you should just stick to a regular install.  
+> [!WARNING]
+> These instructions are only for advanced users. If you're not a Developer, you should use our [graphical installer](https://github.com/Vendicated/VencordInstaller#usage) instead.
+> No support will be provided for installing in this fashion. If you cannot figure it out, you should just stick to a regular install.
 
 # Installation Guide
 
@@ -95,5 +95,3 @@ Simply run:
 ```shell
 pnpm uninject
 ```
-
-If you need more help, ask in the support channel in our [Discord Server](https://discord.gg/D9uwnFnqmd).
diff --git a/src/plugins/_api/chatButtons.ts b/src/plugins/_api/chatButtons.ts
index 9e2c6bf06..1ec2fa25e 100644
--- a/src/plugins/_api/chatButtons.ts
+++ b/src/plugins/_api/chatButtons.ts
@@ -13,10 +13,10 @@ export default definePlugin({
     authors: [Devs.Ven],
 
     patches: [{
-        find: '"gift")),(null',
+        find: '"sticker")',
         replacement: {
-            match: /!\i\.isMobile&&(?=\(\i\.isDM.+?&&(\i)\.push\(.{0,50}"gift")/,
-            replace: "$&(Vencord.Api.ChatButtons._injectButtons($1,arguments[0]),!0)&&"
+            match: /!\i\.isMobile(?=.+?(\i)\.push\(.{0,50}"gift")/,
+            replace: "$& &&(Vencord.Api.ChatButtons._injectButtons($1,arguments[0]),true)"
         }
     }]
 });
diff --git a/src/webpack/common/stores.ts b/src/webpack/common/stores.ts
index f3a18d7bc..2f9786bc5 100644
--- a/src/webpack/common/stores.ts
+++ b/src/webpack/common/stores.ts
@@ -44,7 +44,6 @@ export let PermissionStore: GenericStore;
 export let GuildChannelStore: GenericStore;
 export let ReadStateStore: GenericStore;
 export let PresenceStore: GenericStore;
-export let PoggerModeSettingsStore: GenericStore;
 
 export let GuildStore: t.GuildStore;
 export let UserStore: Stores.UserStore & t.FluxStore;
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 992bf38f3..a543a2dcd 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -110,13 +110,13 @@ export const find = traceFunction("find", function find(filter: FilterFn, { isIn
 
     for (const key in cache) {
         const mod = cache[key];
-        if (!mod?.exports) continue;
+        if (!mod?.exports || mod.exports === window) continue;
 
         if (filter(mod.exports)) {
             return isWaitFor ? [mod.exports, key] : mod.exports;
         }
 
-        if (mod.exports.default && filter(mod.exports.default)) {
+        if (mod.exports.default && mod.exports.default !== window && filter(mod.exports.default)) {
             const found = mod.exports.default;
             return isWaitFor ? [found, key] : found;
         }

From 8ab56f5bcfe720b8e6d03f85b5f4ada1a18bfc37 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 27 Mar 2024 21:44:54 +0100
Subject: [PATCH 410/632] ReadAllNotificationButton: make button less ugly

---
 src/plugins/readAllNotificationsButton/index.tsx | 10 +++++++---
 src/plugins/readAllNotificationsButton/style.css | 11 +++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 src/plugins/readAllNotificationsButton/style.css

diff --git a/src/plugins/readAllNotificationsButton/index.tsx b/src/plugins/readAllNotificationsButton/index.tsx
index 0e08edb6d..ae66e11a4 100644
--- a/src/plugins/readAllNotificationsButton/index.tsx
+++ b/src/plugins/readAllNotificationsButton/index.tsx
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import "./style.css";
+
 import { addServerListElement, removeServerListElement, ServerListRenderPosition } from "@api/ServerList";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
@@ -49,9 +51,11 @@ const ReadAllButton = () => (
     <Button
         onClick={onClick}
         size={Button.Sizes.MIN}
-        color={Button.Colors.BRAND}
-        style={{ marginTop: "2px", marginBottom: "8px", marginLeft: "9px" }}
-    >Read all</Button>
+        color={Button.Colors.CUSTOM}
+        className="vc-ranb-button"
+    >
+        Read All
+    </Button>
 );
 
 export default definePlugin({
diff --git a/src/plugins/readAllNotificationsButton/style.css b/src/plugins/readAllNotificationsButton/style.css
new file mode 100644
index 000000000..3d10b2bd5
--- /dev/null
+++ b/src/plugins/readAllNotificationsButton/style.css
@@ -0,0 +1,11 @@
+.vc-ranb-button {
+    color: var(--interactive-normal);
+    padding: 0 0.5em;
+    margin-bottom: 0.5em;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.vc-ranb-button:hover {
+    color: var(--interactive-active);
+}

From 74b6ceee7838d7190f43336c9c29acd392f1870f Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 28 Mar 2024 03:43:37 +0100
Subject: [PATCH 411/632] Fix WhoReacted

---
 src/plugins/whoReacted/index.tsx | 40 +++++++++++++++++---------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/plugins/whoReacted/index.tsx b/src/plugins/whoReacted/index.tsx
index b60366900..b3728c215 100644
--- a/src/plugins/whoReacted/index.tsx
+++ b/src/plugins/whoReacted/index.tsx
@@ -93,28 +93,30 @@ export default definePlugin({
     description: "Renders the avatars of users who reacted to a message",
     authors: [Devs.Ven, Devs.KannaDev, Devs.newwares],
 
-    patches: [{
-        find: ",reactionRef:",
-        replacement: {
-            match: /(\i)\?null:\(0,\i\.jsx\)\(\i\.\i,{className:\i\.reactionCount,.*?}\),/,
-            replace: "$&$1?null:$self.renderUsers(this.props),"
-        }
-    }, {
-        find: '.displayName="MessageReactionsStore";',
-        replacement: {
-            match: /(?<=CONNECTION_OPEN:function\(\){)(\i)={}/,
-            replace: "$&;$self.reactions=$1"
-        }
-    },
-    {
+    patches: [
+        {
+            find: ",reactionRef:",
+            replacement: {
+                match: /(\i)\?null:\(0,\i\.jsx\)\(\i\.\i,{className:\i\.reactionCount,.*?}\),/,
+                replace: "$&$1?null:$self.renderUsers(this.props),"
+            }
+        }, {
+            find: '"MessageReactionsStore"',
+            replacement: {
+                match: /(?<=CONNECTION_OPEN:function\(\){)(\i)={}/,
+                replace: "$&;$self.reactions=$1"
+            }
+        },
+        {
 
-        find: "cleanAutomaticAnchor(){",
-        replacement: {
-            match: /this\.automaticAnchor=null,this\.messageFetchAnchor=null,/,
-            replace: "$&$self.setScrollObj(this),"
+            find: "cleanAutomaticAnchor(){",
+            replacement: {
+                match: /constructor\(\i\)\{(?=.{0,100}automaticAnchor)/,
+                replace: "$&$self.setScrollObj(this);"
+            }
         }
-    }
     ],
+
     setScrollObj(scroll: any) {
         Scroll = scroll;
     },

From b1009baf7af4f4279f73273482d5bed6487f9d64 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 28 Mar 2024 03:47:00 +0100
Subject: [PATCH 412/632] Fix MessageLogger

---
 src/plugins/messageLogger/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index 26409b89d..8a1e23912 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -225,7 +225,7 @@ export default definePlugin({
         {
             // MessageStore
             // Module 171447
-            find: "displayName=\"MessageStore\"",
+            find: '"MessageStore"',
             replacement: [
                 {
                     // Add deleted=true to all target messages in the MESSAGE_DELETE event
@@ -380,7 +380,7 @@ export default definePlugin({
         {
             // ReferencedMessageStore
             // Module 778667
-            find: "displayName=\"ReferencedMessageStore\"",
+            find: '"ReferencedMessageStore"',
             replacement: [
                 {
                     match: /MESSAGE_DELETE:function\((\i)\).+?},/,

From 6c711e2781c01f225e3c36c4b7457b6f27ade2ed Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 28 Mar 2024 03:58:11 +0100
Subject: [PATCH 413/632] Fix PinDMs

---
 src/plugins/pinDms/index.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index ee726bfab..8951f0949 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -79,11 +79,11 @@ export default definePlugin({
 
                 // Rendering
                 {
-                    match: /this\.renderDM=\(.+?(\i\.default),{channel.+?this.renderRow=(\i)=>{/,
-                    replace: "$&if($self.isChannelIndex($2.section, $2.row))return $self.renderChannel($2.section,$2.row,$1);"
+                    match: /"renderRow",(\i)=>{(?<="renderDM",.+?(\i\.default),\{channel:.+?)/,
+                    replace: "$&if($self.isChannelIndex($1.section, $1.row))return $self.renderChannel($1.section,$1.row,$2);"
                 },
                 {
-                    match: /this\.renderSection=(\i)=>{/,
+                    match: /"renderSection",(\i)=>{/,
                     replace: "$&if($self.isCategoryIndex($1.section))return $self.renderCategory($1);"
                 },
                 {
@@ -93,11 +93,11 @@ export default definePlugin({
 
                 // Fix Row Height
                 {
-                    match: /(?<=this\.getRowHeight=.{1,100}return 1===)\i/,
+                    match: /(?<="getRowHeight",.{1,100}return 1===)\i/,
                     replace: "($&-$self.categoryLen())"
                 },
                 {
-                    match: /this.getRowHeight=\((\i),(\i)\)=>{/,
+                    match: /"getRowHeight",\((\i),(\i)\)=>{/,
                     replace: "$&if($self.isChannelHidden($1,$2))return 0;"
                 },
 

From c997ff7ada7e063f4483c3754a07fae3df7df5f4 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 27 Mar 2024 17:44:41 -0300
Subject: [PATCH 414/632] Fix lazy chunk force loading

---
 .../pinDms/components/CreateCategoryModal.tsx |  4 +--
 src/webpack/webpack.ts                        | 27 ++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/plugins/pinDms/components/CreateCategoryModal.tsx b/src/plugins/pinDms/components/CreateCategoryModal.tsx
index f38cc88c0..309ca69ff 100644
--- a/src/plugins/pinDms/components/CreateCategoryModal.tsx
+++ b/src/plugins/pinDms/components/CreateCategoryModal.tsx
@@ -31,9 +31,9 @@ interface ColorPickerWithSwatchesProps {
 }
 
 const ColorPicker = findComponentByCodeLazy<ColorPickerProps>(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)");
-const ColorPickerWithSwatches = findComponentByCodeLazy<ColorPickerWithSwatchesProps>(".presets,", "customColor:");
+const ColorPickerWithSwatches = findComponentByCodeLazy<ColorPickerWithSwatchesProps>("presets,", "customColor:");
 
-export const requireSettingsMenu = extractAndLoadChunksLazy(['name:"UserSettings"'], /createPromise:.{0,20}el\("(.+?)"\).{0,50}"UserSettings"/);
+export const requireSettingsMenu = extractAndLoadChunksLazy(['name:"UserSettings"'], /createPromise:.{0,20}Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\).{0,50}"UserSettings"/);
 
 const cl = classNameFactory("vc-pindms-modal-");
 
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index a543a2dcd..0790e8bf1 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -408,10 +408,11 @@ export function findExportedComponentLazy<T extends object = any>(...props: stri
 
 /**
  * Extract and load chunks using their entry point
- * @param code An array of all the code the module factory containing the entry point (as of using it to load chunks) must include
- * @param matcher A RegExp that returns the entry point id as the first capture group. Defaults to a matcher that captures the first entry point found in the module factory
+ * @param code An array of all the code the module factory containing the lazy chunk loading must include
+ * @param matcher A RegExp that returns the chunk ids array as the first capture group and the entry point id as the second. Defaults to a matcher that captures the lazy chunk loading found in the module factory
+ * @returns A promise that resolves when the chunks were loaded
  */
-export async function extractAndLoadChunks(code: string[], matcher: RegExp = /\.el\("(.+?)"\)(?<=(\i)\.el.+?)\.then\(\2\.bind\(\2,"\1"\)\)/) {
+export async function extractAndLoadChunks(code: string[], matcher: RegExp = /Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\)/) {
     const module = findModuleFactory(...code);
     if (!module) {
         const err = new Error("extractAndLoadChunks: Couldn't find module factory");
@@ -432,9 +433,9 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = /\.
         return;
     }
 
-    const [, id] = match;
-    if (!id || !Number(id)) {
-        const err = new Error("extractAndLoadChunks: Matcher didn't return a capturing group with the entry point, or the entry point returned wasn't a number");
+    const [, rawChunkIds, entryPointId] = match;
+    if (!rawChunkIds || Number.isNaN(entryPointId)) {
+        const err = new Error("extractAndLoadChunks: Matcher didn't return a capturing group with the chunk ids array, or the entry point id returned as the second group wasn't a number");
         logger.warn(err, "Code:", code, "Matcher:", matcher);
 
         // Strict behaviour in DevBuilds to fail early and make sure the issue is found
@@ -444,19 +445,21 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = /\.
         return;
     }
 
-    await (wreq as any).el(id);
-    return wreq(id as any);
+    const chunkIds = Array.from(rawChunkIds.matchAll(/\("(.+?)"\)/g)).map((m: any) => m[1]);
+
+    await Promise.all(chunkIds.map(id => wreq.e(id)));
+    wreq(entryPointId);
 }
 
 /**
  * This is just a wrapper around {@link extractAndLoadChunks} to make our reporter test for your webpack finds.
  *
  * Extract and load chunks using their entry point
- * @param code An array of all the code the module factory containing the entry point (as of using it to load chunks) must include
- * @param matcher A RegExp that returns the entry point id as the first capture group. Defaults to a matcher that captures the first entry point found in the module factory
- * @returns A function that loads the chunks on first call
+ * @param code An array of all the code the module factory containing the lazy chunk loading must include
+ * @param matcher A RegExp that returns the chunk ids array as the first capture group and the entry point id as the second. Defaults to a matcher that captures the lazy chunk loading found in the module factory
+ * @returns A function that returns a promise that resolves when the chunks were loaded, on first call
  */
-export function extractAndLoadChunksLazy(code: string[], matcher: RegExp = /\.el\("(.+?)"\)(?<=(\i)\.el.+?)\.then\(\2\.bind\(\2,"\1"\)\)/) {
+export function extractAndLoadChunksLazy(code: string[], matcher: RegExp = /Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\)/) {
     if (IS_DEV) lazyWebpackSearchHistory.push(["extractAndLoadChunks", [code, matcher]]);
 
     return () => extractAndLoadChunks(code, matcher);

From e71fcc301067a0f9fb54aa25dbd8b7430237a86b Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 28 Mar 2024 04:21:52 +0100
Subject: [PATCH 415/632] Fix FakeNitro

---
 src/plugins/_api/messageEvents.ts | 2 +-
 src/plugins/_api/notices.ts       | 2 +-
 src/plugins/fakeNitro/index.tsx   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/_api/messageEvents.ts b/src/plugins/_api/messageEvents.ts
index 1b4a2d15a..48ae062c7 100644
--- a/src/plugins/_api/messageEvents.ts
+++ b/src/plugins/_api/messageEvents.ts
@@ -35,7 +35,7 @@ export default definePlugin({
             }
         },
         {
-            find: ".handleSendMessage=",
+            find: ".handleSendMessage",
             replacement: {
                 // props.chatInputType...then((function(isMessageValid)... var parsedMessage = b.c.parse(channel,... var replyOptions = f.g.getSendMessageOptionsForReply(pendingReply);
                 // Lookbehind: validateMessage)({openWarningPopout:..., type: i.props.chatInputType, content: t, stickers: r, ...}).then((function(isMessageValid)
diff --git a/src/plugins/_api/notices.ts b/src/plugins/_api/notices.ts
index 0648afa04..90ae6ded9 100644
--- a/src/plugins/_api/notices.ts
+++ b/src/plugins/_api/notices.ts
@@ -26,7 +26,7 @@ export default definePlugin({
     required: true,
     patches: [
         {
-            find: 'displayName="NoticeStore"',
+            find: '"NoticeStore"',
             replacement: [
                 {
                     match: /\i=null;(?=.{0,80}getPremiumSubscription\(\))/g,
diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 30744276e..8db449cdd 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -214,7 +214,7 @@ export default definePlugin({
                 {
                     // Make the emoji always available if the intention allows it
                     match: /if\(!\i\.available/,
-                    replace: m => `${m}&&(typeof fakeNitroIntention==="undefined"||![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention))`
+                    replace: m => `${m}&&(typeof fakeNitroIntention==="undefined"||![${1},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention))`
                 }
             ]
         },
@@ -277,7 +277,7 @@ export default definePlugin({
             }
         },
         {
-            find: '.displayName="UserSettingsProtoStore"',
+            find: '"UserSettingsProtoStore"',
             replacement: [
                 {
                     // Overwrite incoming connection settings proto with our local settings

From 82ab3ad1b9bdf531215221408e13444024b62a19 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 28 Mar 2024 05:18:00 +0100
Subject: [PATCH 416/632] i may be stupid :3

---
 src/plugins/fakeNitro/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 8db449cdd..d6028aa76 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -214,7 +214,7 @@ export default definePlugin({
                 {
                     // Make the emoji always available if the intention allows it
                     match: /if\(!\i\.available/,
-                    replace: m => `${m}&&(typeof fakeNitroIntention==="undefined"||![${1},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention))`
+                    replace: m => `${m}&&(typeof fakeNitroIntention==="undefined"||![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention))`
                 }
             ]
         },

From de9122b05b20c22d9d59bad08e6eb2e2e2ca017e Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Thu, 28 Mar 2024 12:43:05 +0700
Subject: [PATCH 417/632] fix ImageZoom, LoadingQuote, NoRPC,
 RevealAllSpoilers, SecretRingTone (#2306)

---
 src/plugins/imageZoom/index.tsx           | 4 ++--
 src/plugins/loadingQuotes/index.ts        | 4 ++--
 src/plugins/noRPC.discordDesktop/index.ts | 2 +-
 src/plugins/revealAllSpoilers/index.ts    | 4 ++--
 src/plugins/secretRingTone/index.ts       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/imageZoom/index.tsx b/src/plugins/imageZoom/index.tsx
index cbaa07d2a..3f0e3294a 100644
--- a/src/plugins/imageZoom/index.tsx
+++ b/src/plugins/imageZoom/index.tsx
@@ -23,7 +23,7 @@ import { makeRange } from "@components/PluginSettings/components";
 import { debounce } from "@shared/debounce";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { Menu, React, ReactDOM } from "@webpack/common";
+import { Menu, ReactDOM } from "@webpack/common";
 import type { Root } from "react-dom/client";
 
 import { Magnifier, MagnifierProps } from "./components/Magnifier";
@@ -168,7 +168,7 @@ export default definePlugin({
         },
 
         {
-            find: "handleImageLoad=",
+            find: ".handleImageLoad)",
             replacement: [
                 {
                     match: /placeholderVersion:\i,/,
diff --git a/src/plugins/loadingQuotes/index.ts b/src/plugins/loadingQuotes/index.ts
index eed5b3ec5..97178979c 100644
--- a/src/plugins/loadingQuotes/index.ts
+++ b/src/plugins/loadingQuotes/index.ts
@@ -81,11 +81,11 @@ export default definePlugin({
             find: ".LOADING_DID_YOU_KNOW}",
             replacement: [
                 {
-                    match: /\._loadingText=function\(\)\{/,
+                    match: /"_loadingText",function\(\)\{/,
                     replace: "$&return $self.quote;",
                 },
                 {
-                    match: /\._eventLoadingText=function\(\)\{/,
+                    match: /"_eventLoadingText",function\(\)\{/,
                     replace: "$&return $self.quote;",
                     predicate: () => settings.store.replaceEvents
                 }
diff --git a/src/plugins/noRPC.discordDesktop/index.ts b/src/plugins/noRPC.discordDesktop/index.ts
index ebbbd5e8f..4c6319e5e 100644
--- a/src/plugins/noRPC.discordDesktop/index.ts
+++ b/src/plugins/noRPC.discordDesktop/index.ts
@@ -27,7 +27,7 @@ export default definePlugin({
         {
             find: '.ensureModule("discord_rpc")',
             replacement: {
-                match: /\.ensureModule\("discord_rpc"\)\.then\(\(.+?\)\)}/,
+                match: /\.ensureModule\("discord_rpc"\)\.then\(\(.+?\)}\)}/,
                 replace: '.ensureModule("discord_rpc")}',
             },
         },
diff --git a/src/plugins/revealAllSpoilers/index.ts b/src/plugins/revealAllSpoilers/index.ts
index 746973b42..e728181aa 100644
--- a/src/plugins/revealAllSpoilers/index.ts
+++ b/src/plugins/revealAllSpoilers/index.ts
@@ -30,9 +30,9 @@ export default definePlugin({
 
     patches: [
         {
-            find: ".removeObscurity=",
+            find: ".removeObscurity,",
             replacement: {
-                match: /(?<=\.removeObscurity=(\i)=>{)/,
+                match: /(?<="removeObscurity",(\i)=>{)/,
                 replace: (_, event) => `$self.reveal(${event});`
             }
         }
diff --git a/src/plugins/secretRingTone/index.ts b/src/plugins/secretRingTone/index.ts
index 9d6d6a155..8f0176f88 100644
--- a/src/plugins/secretRingTone/index.ts
+++ b/src/plugins/secretRingTone/index.ts
@@ -16,7 +16,7 @@ export default definePlugin({
         {
             find: "call_ringing_beat\"",
             replacement: {
-                match: /500===\i\.random\(1,1e3\)/,
+                match: /500===\i\(\)\.random\(1,1e3\)/,
                 replace: "true"
             }
         },

From ec34412100e226f85d7414651bf99b0fffdba972 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 28 Mar 2024 09:48:47 -0300
Subject: [PATCH 418/632] Fix store finds

---
 src/plugins/alwaysTrust/index.ts                  | 2 +-
 src/plugins/ignoreActivities/index.tsx            | 2 +-
 src/plugins/noBlockedMessages/index.ts            | 4 ++--
 src/plugins/showHiddenChannels/index.tsx          | 6 +++---
 src/plugins/spotifyCrack/index.ts                 | 2 +-
 src/plugins/volumeBooster.discordDesktop/index.ts | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/plugins/alwaysTrust/index.ts b/src/plugins/alwaysTrust/index.ts
index 5113935f4..b195e8ebf 100644
--- a/src/plugins/alwaysTrust/index.ts
+++ b/src/plugins/alwaysTrust/index.ts
@@ -41,7 +41,7 @@ export default definePlugin({
     authors: [Devs.zt, Devs.Trwy],
     patches: [
         {
-            find: ".displayName=\"MaskedLinkStore\"",
+            find: '="MaskedLinkStore",',
             replacement: {
                 match: /(?<=isTrustedDomain\(\i\){)return \i\(\i\)/,
                 replace: "return true"
diff --git a/src/plugins/ignoreActivities/index.tsx b/src/plugins/ignoreActivities/index.tsx
index c04ce1c56..5c349a4e7 100644
--- a/src/plugins/ignoreActivities/index.tsx
+++ b/src/plugins/ignoreActivities/index.tsx
@@ -210,7 +210,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: '.displayName="LocalActivityStore"',
+            find: '="LocalActivityStore",',
             replacement: [
                 {
                     match: /HANG_STATUS.+?(?=!\i\(\i,\i\)&&)(?<=(\i)\.push.+?)/,
diff --git a/src/plugins/noBlockedMessages/index.ts b/src/plugins/noBlockedMessages/index.ts
index f9de3e13c..8435f1351 100644
--- a/src/plugins/noBlockedMessages/index.ts
+++ b/src/plugins/noBlockedMessages/index.ts
@@ -38,8 +38,8 @@ export default definePlugin({
             ]
         },
         ...[
-            'displayName="MessageStore"',
-            'displayName="ReadStateStore"'
+            '="MessageStore",',
+            '="ReadStateStore",'
         ].map(find => ({
             find,
             predicate: () => Settings.plugins.NoBlockedMessages.ignoreBlockedMessages === true,
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 2d091c24a..9968ef16b 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -191,7 +191,7 @@ export default definePlugin({
         },
         {
             // Hide the new version of unreads box for hidden channels
-            find: '.displayName="ChannelListUnreadsStore"',
+            find: '="ChannelListUnreadsStore",',
             replacement: {
                 match: /(?<=if\(null==(\i))(?=.{0,160}?getHasImportantUnread\)\(\i\))/g, // Global because Discord has multiple methods like that in the same module
                 replace: (_, channel) => `||$self.isHiddenChannel(${channel})`
@@ -442,7 +442,7 @@ export default definePlugin({
             }
         },
         {
-            find: '.displayName="GuildChannelStore"',
+            find: '="GuildChannelStore",',
             replacement: [
                 {
                     // Make GuildChannelStore contain hidden channels
@@ -465,7 +465,7 @@ export default definePlugin({
             }
         },
         {
-            find: '.displayName="NowPlayingViewStore"',
+            find: '="NowPlayingViewStore",',
             replacement: {
                 // Make active now voice states on hidden channels
                 match: /(getVoiceStateForUser.{0,150}?)&&\i\.\i\.canWithPartialContext.{0,20}VIEW_CHANNEL.+?}\)(?=\?)/,
diff --git a/src/plugins/spotifyCrack/index.ts b/src/plugins/spotifyCrack/index.ts
index 5d890349c..1beccad60 100644
--- a/src/plugins/spotifyCrack/index.ts
+++ b/src/plugins/spotifyCrack/index.ts
@@ -51,7 +51,7 @@ export default definePlugin({
             },
         },
         {
-            find: '.displayName="SpotifyStore"',
+            find: '"displayName","SpotifyStore")',
             replacement: [
                 {
                     predicate: () => settings.store.noSpotifyAutoPause,
diff --git a/src/plugins/volumeBooster.discordDesktop/index.ts b/src/plugins/volumeBooster.discordDesktop/index.ts
index 4aca79fc7..b455c97ec 100644
--- a/src/plugins/volumeBooster.discordDesktop/index.ts
+++ b/src/plugins/volumeBooster.discordDesktop/index.ts
@@ -71,7 +71,7 @@ export default definePlugin({
         },
         // Prevent the MediaEngineStore from overwriting our LocalVolumes above 200 with the ones the Discord Audio Context Settings sync sends
         {
-            find: '.displayName="MediaEngineStore"',
+            find: '="MediaEngineStore",',
             replacement: [
                 {
                     match: /(\.settings\.audioContextSettings.+?)(\i\[\i\])=(\i\.volume)(.+?setLocalVolume\(\i,).+?\)/,

From 344f8c9f0384a60061d62843c9a144e9e00633eb Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Thu, 28 Mar 2024 11:31:08 +0000
Subject: [PATCH 419/632] Fix DisableCallIdle

---
 src/plugins/disableCallIdle/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/disableCallIdle/index.ts b/src/plugins/disableCallIdle/index.ts
index 904d53b03..d26f72813 100644
--- a/src/plugins/disableCallIdle/index.ts
+++ b/src/plugins/disableCallIdle/index.ts
@@ -29,7 +29,7 @@ export default definePlugin({
         {
             find: ".Messages.BOT_CALL_IDLE_DISCONNECT",
             replacement: {
-                match: /,?(?=this\.idleTimeout=new \i\.Timeout)/,
+                match: /,?(?=\i\(this,"idleTimeout",new \i\.Timeout\))/,
                 replace: ";return;"
             }
         },

From 2f07dc230a8ae5d52e72d66aa7cd68e6e4f4157e Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Thu, 28 Mar 2024 19:40:48 +0700
Subject: [PATCH 420/632] fix BetterGifPicker, Experiments

---
 src/plugins/betterGifPicker/index.ts | 4 ++--
 src/plugins/experiments/index.tsx    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/betterGifPicker/index.ts b/src/plugins/betterGifPicker/index.ts
index 09bb570d7..f1608f28c 100644
--- a/src/plugins/betterGifPicker/index.ts
+++ b/src/plugins/betterGifPicker/index.ts
@@ -15,8 +15,8 @@ export default definePlugin({
         {
             find: ".GIFPickerResultTypes.SEARCH",
             replacement: [{
-                match: "this.state={resultType:null}",
-                replace: 'this.state={resultType:"Favorites"}'
+                match: /(?<="state",{resultType:)null/,
+                replace: '"Favorites"'
             }]
         }
     ]
diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx
index f8ea4b04a..344638828 100644
--- a/src/plugins/experiments/index.tsx
+++ b/src/plugins/experiments/index.tsx
@@ -64,7 +64,7 @@ export default definePlugin({
             }
         },
         {
-            find: ".isStaff=()",
+            find: '"isStaff",',
             predicate: () => settings.store.enableIsStaff,
             replacement: [
                 {

From 74c38146d5f186b242d6fc51c6287a472ba5576b Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 28 Mar 2024 10:17:05 -0300
Subject: [PATCH 421/632] Fix BetterSettings patches (#2307)

---
 src/plugins/betterSettings/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/betterSettings/index.tsx b/src/plugins/betterSettings/index.tsx
index 6d3c8798e..7d81c6f5c 100644
--- a/src/plugins/betterSettings/index.tsx
+++ b/src/plugins/betterSettings/index.tsx
@@ -82,7 +82,7 @@ export default definePlugin({
             find: "this.renderArtisanalHack()",
             replacement: [
                 { // Fade in on layer
-                    match: /(?<=(\i)\.contextType=\i\.AccessibilityPreferencesContext;)/,
+                    match: /(?<=\((\i),"contextType",\i\.AccessibilityPreferencesContext\);)/,
                     replace: "$1=$self.Layer;",
                     predicate: () => settings.store.disableFade
                 },
@@ -107,11 +107,11 @@ export default definePlugin({
             ],
             predicate: () => settings.store.disableFade
         },
-        { // Load menu stuff on hover, not on click
+        { // Load menu TOC eagerly
             find: "Messages.USER_SETTINGS_WITH_BUILD_OVERRIDE.format",
             replacement: {
-                match: /(?<=handleOpenSettingsContextMenu.{0,250}?\i\.el\(("[^"]+")\)\.then\([^;]*?("\d+").*?Messages\.USER_SETTINGS,)(?=onClick:)/,
-                replace: "onMouseEnter(){Vencord.Webpack.wreq.el($1).then(()=>Vencord.Webpack.wreq($2));},"
+                match: /(?<=(\i)\(this,"handleOpenSettingsContextMenu",.{0,100}?openContextMenuLazy.{0,100}?(await Promise\.all[^};]*?\)\)).*?,)(?=\1\(this)/,
+                replace: "(async ()=>$2)(),"
             },
             predicate: () => settings.store.eagerLoad
         },

From 762684a138f19308a3e64d6578aae57f453cae5f Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 28 Mar 2024 10:30:29 -0300
Subject: [PATCH 422/632] Fix more patches

---
 src/plugins/betterGifAltText/index.ts  | 2 +-
 src/plugins/decor/index.tsx            | 4 ++--
 src/plugins/gifPaste/index.ts          | 6 +++---
 src/plugins/ignoreActivities/index.tsx | 2 +-
 src/plugins/noBlockedMessages/index.ts | 2 +-
 src/plugins/resurrectHome/index.tsx    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/plugins/betterGifAltText/index.ts b/src/plugins/betterGifAltText/index.ts
index 8b4116318..f0090343e 100644
--- a/src/plugins/betterGifAltText/index.ts
+++ b/src/plugins/betterGifAltText/index.ts
@@ -26,7 +26,7 @@ export default definePlugin({
         "Change GIF alt text from simply being 'GIF' to containing the gif tags / filename",
     patches: [
         {
-            find: "onCloseImage=",
+            find: '"onCloseImage",',
             replacement: {
                 match: /(return.{0,10}\.jsx.{0,50}isWindowFocused)/,
                 replace:
diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx
index 7b9b4e3bf..d4f420c7d 100644
--- a/src/plugins/decor/index.tsx
+++ b/src/plugins/decor/index.tsx
@@ -61,8 +61,8 @@ export default definePlugin({
                 },
                 // Remove NEW label from decor avatar decorations
                 {
-                    match: /(?<=\.Section\.PREMIUM_PURCHASE&&\i;if\()(?<=avatarDecoration:(\i).+?)/,
-                    replace: "$1.skuId===$self.SKU_ID||"
+                    match: /(?<=\.Section\.PREMIUM_PURCHASE&&\i)(?<=avatarDecoration:(\i).+?)/,
+                    replace: "||$1.skuId===$self.SKU_ID"
                 }
             ]
         },
diff --git a/src/plugins/gifPaste/index.ts b/src/plugins/gifPaste/index.ts
index 3e864b31a..5553bf847 100644
--- a/src/plugins/gifPaste/index.ts
+++ b/src/plugins/gifPaste/index.ts
@@ -29,10 +29,10 @@ export default definePlugin({
     authors: [Devs.Ven],
 
     patches: [{
-        find: ".handleSelectGIF=",
+        find: '"handleSelectGIF",',
         replacement: {
-            match: /\.handleSelectGIF=(\i)=>\{/,
-            replace: ".handleSelectGIF=$1=>{if (!this.props.className) return $self.handleSelect($1);"
+            match: /"handleSelectGIF",(\i)=>\{/,
+            replace: '"handleSelectGIF",$1=>{if (!this.props.className) return $self.handleSelect($1);'
         }
     }],
 
diff --git a/src/plugins/ignoreActivities/index.tsx b/src/plugins/ignoreActivities/index.tsx
index 5c349a4e7..e2262129d 100644
--- a/src/plugins/ignoreActivities/index.tsx
+++ b/src/plugins/ignoreActivities/index.tsx
@@ -213,7 +213,7 @@ export default definePlugin({
             find: '="LocalActivityStore",',
             replacement: [
                 {
-                    match: /HANG_STATUS.+?(?=!\i\(\i,\i\)&&)(?<=(\i)\.push.+?)/,
+                    match: /HANG_STATUS.+?(?=!\i\(\)\(\i,\i\)&&)(?<=(\i)\.push.+?)/,
                     replace: (m, activities) => `${m}${activities}=${activities}.filter($self.isActivityNotIgnored);`
                 }
             ]
diff --git a/src/plugins/noBlockedMessages/index.ts b/src/plugins/noBlockedMessages/index.ts
index 8435f1351..427f725ca 100644
--- a/src/plugins/noBlockedMessages/index.ts
+++ b/src/plugins/noBlockedMessages/index.ts
@@ -39,7 +39,7 @@ export default definePlugin({
         },
         ...[
             '="MessageStore",',
-            '="ReadStateStore",'
+            '"displayName","ReadStateStore")'
         ].map(find => ({
             find,
             predicate: () => Settings.plugins.NoBlockedMessages.ignoreBlockedMessages === true,
diff --git a/src/plugins/resurrectHome/index.tsx b/src/plugins/resurrectHome/index.tsx
index 6b0069a7f..f48debc76 100644
--- a/src/plugins/resurrectHome/index.tsx
+++ b/src/plugins/resurrectHome/index.tsx
@@ -59,7 +59,7 @@ export default definePlugin({
             find: "GuildHomeFeedbackExperiment.definition.id",
             replacement: [
                 {
-                    match: /return{showFeedback:\i,setOnDismissedFeedback:(\i)}/,
+                    match: /return{showFeedback:.+?,setOnDismissedFeedback:(\i)}/,
                     replace: "return{showFeedback:false,setOnDismissedFeedback:$1}"
                 }
             ]

From 126023f8f2dca014117d954642e2cd1408cabd6a Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 28 Mar 2024 10:44:37 -0300
Subject: [PATCH 423/632] ShowHiddenChannels: Fix patches

---
 src/plugins/showHiddenChannels/index.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 9968ef16b..31dc93ad2 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -138,7 +138,7 @@ export default definePlugin({
             all: true,
             // Render null instead of the buttons if the channel is hidden
             replacement: {
-                match: /(?<=renderOpenChatButton=\(\)=>{)/,
+                match: /(?<="renderOpenChatButton",\(\)=>{)/,
                 replace: "if($self.isHiddenChannel(this.props.channel))return null;"
             }
         },
@@ -193,8 +193,8 @@ export default definePlugin({
             // Hide the new version of unreads box for hidden channels
             find: '="ChannelListUnreadsStore",',
             replacement: {
-                match: /(?<=if\(null==(\i))(?=.{0,160}?getHasImportantUnread\)\(\i\))/g, // Global because Discord has multiple methods like that in the same module
-                replace: (_, channel) => `||$self.isHiddenChannel(${channel})`
+                match: /(?=&&\(0,\i\.getHasImportantUnread\)\((\i)\))/g, // Global because Discord has multiple methods like that in the same module
+                replace: (_, channel) => `&&!$self.isHiddenChannel(${channel})`
             }
         },
         {
@@ -218,19 +218,19 @@ export default definePlugin({
             find: "Missing channel in Channel.renderHeaderToolbar",
             replacement: [
                 {
-                    match: /(?<=renderHeaderToolbar=\(\)=>{.+?case \i\.\i\.GUILD_TEXT:)(?=.+?(\i\.push.{0,50}channel:(\i)},"notifications"\)\)))(?<=isLurking:(\i).+?)/,
+                    match: /(?<="renderHeaderToolbar",\(\)=>{.+?case \i\.\i\.GUILD_TEXT:)(?=.+?(\i\.push.{0,50}channel:(\i)},"notifications"\)\)))(?<=isLurking:(\i).+?)/,
                     replace: (_, pushNotificationButtonExpression, channel, isLurking) => `if(!${isLurking}&&$self.isHiddenChannel(${channel})){${pushNotificationButtonExpression};break;}`
                 },
                 {
-                    match: /(?<=renderHeaderToolbar=\(\)=>{.+?case \i\.\i\.GUILD_MEDIA:)(?=.+?(\i\.push.{0,40}channel:(\i)},"notifications"\)\)))(?<=isLurking:(\i).+?)/,
+                    match: /(?<="renderHeaderToolbar",\(\)=>{.+?case \i\.\i\.GUILD_MEDIA:)(?=.+?(\i\.push.{0,40}channel:(\i)},"notifications"\)\)))(?<=isLurking:(\i).+?)/,
                     replace: (_, pushNotificationButtonExpression, channel, isLurking) => `if(!${isLurking}&&$self.isHiddenChannel(${channel})){${pushNotificationButtonExpression};break;}`
                 },
                 {
-                    match: /renderMobileToolbar=\(\)=>{.+?case \i\.\i\.GUILD_DIRECTORY:(?<=let{channel:(\i).+?)/,
+                    match: /"renderMobileToolbar",\(\)=>{.+?case \i\.\i\.GUILD_DIRECTORY:(?<=let{channel:(\i).+?)/,
                     replace: (m, channel) => `${m}if($self.isHiddenChannel(${channel}))break;`
                 },
                 {
-                    match: /(?<=renderHeaderBar=\(\)=>{.+?hideSearch:(\i)\.isDirectory\(\))/,
+                    match: /(?<="renderHeaderBar",\(\)=>{.+?hideSearch:(\i)\.isDirectory\(\))/,
                     replace: (_, channel) => `||$self.isHiddenChannel(${channel})`
                 },
                 {

From 7fe718a018fa7ec1ddb16b002ab3495ea6ba0c29 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 28 Mar 2024 11:30:04 -0300
Subject: [PATCH 424/632] FakeNitro: Make Soundboard sounds not require boost
 level

---
 src/plugins/fakeNitro/index.tsx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index d6028aa76..eb9931956 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -388,6 +388,14 @@ export default definePlugin({
                 match: /\i\.\i\.isPremium\(\i\.\i\.getCurrentUser\(\)\)/,
                 replace: "true"
             }
+        },
+        // Make all Soundboard sounds available
+        {
+            find: 'type:"GUILD_SOUNDBOARD_SOUND_CREATE"',
+            replacement: {
+                match: /(?<=type:"(?:SOUNDBOARD_SOUNDS_RECEIVED|GUILD_SOUNDBOARD_SOUND_CREATE|GUILD_SOUNDBOARD_SOUND_UPDATE|GUILD_SOUNDBOARD_SOUNDS_UPDATE)".+?available:)\i\.available/g,
+                replace: "true"
+            }
         }
     ],
 

From bdef47eb8aee5cc53f09683e7847eca8bc1b722b Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 28 Mar 2024 11:44:38 -0300
Subject: [PATCH 425/632] Bump to 1.7.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 025fa13d4..78370f097 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.7.3",
+    "version": "1.7.4",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 60f66781078d7a5c51265d841c5aa043dd2cb305 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 28 Mar 2024 12:57:28 -0300
Subject: [PATCH 426/632] Decor: Fix find targetting wrong module in some cases

---
 src/plugins/decor/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx
index d4f420c7d..5b2b6d0f0 100644
--- a/src/plugins/decor/index.tsx
+++ b/src/plugins/decor/index.tsx
@@ -49,7 +49,7 @@ export default definePlugin({
         },
         // Decoration modal module
         {
-            find: ".decorationGridItem",
+            find: ".decorationGridItem,",
             replacement: [
                 {
                     match: /(?<==)\i=>{let{children.{20,100}decorationGridItem/,

From 650f4050e10b90dc92c5921f8c6e2550e78079e1 Mon Sep 17 00:00:00 2001
From: Syncx <47534062+Syncxv@users.noreply.github.com>
Date: Fri, 29 Mar 2024 07:40:47 +1100
Subject: [PATCH 427/632] fix(PinDMs): display properly when there are 0
 unpinned dms (#2281)

Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Co-authored-by: V <vendicated@riseup.net>
---
 .../pinDms/components/CreateCategoryModal.tsx |  2 +-
 src/plugins/pinDms/components/contextMenu.tsx |  6 ++--
 src/plugins/pinDms/index.tsx                  | 35 ++++++++++---------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/plugins/pinDms/components/CreateCategoryModal.tsx b/src/plugins/pinDms/components/CreateCategoryModal.tsx
index 309ca69ff..06e1c3568 100644
--- a/src/plugins/pinDms/components/CreateCategoryModal.tsx
+++ b/src/plugins/pinDms/components/CreateCategoryModal.tsx
@@ -53,7 +53,7 @@ function useCategory(categoryId: string | null, initalChannelId: string | null)
             setCategory({
                 id: Toasts.genId(),
                 name: `Pin Category ${categories.length + 1}`,
-                color: 10070709,
+                color: DEFAULT_COLOR,
                 collapsed: false,
                 channels: [initalChannelId]
             });
diff --git a/src/plugins/pinDms/components/contextMenu.tsx b/src/plugins/pinDms/components/contextMenu.tsx
index 0f5a198ba..f2bf9fae6 100644
--- a/src/plugins/pinDms/components/contextMenu.tsx
+++ b/src/plugins/pinDms/components/contextMenu.tsx
@@ -8,7 +8,7 @@ import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/Co
 import { Menu } from "@webpack/common";
 
 import { addChannelToCategory, canMoveChannelInDirection, categories, isPinned, moveChannel, removeChannelFromCategory } from "../data";
-import { forceUpdate, settings } from "../index";
+import { forceUpdate, PinOrder, settings } from "../index";
 import { openCategoryModal } from "./CreateCategoryModal";
 
 function createPinMenuItem(channelId: string) {
@@ -52,7 +52,7 @@ function createPinMenuItem(channelId: string) {
                     />
 
                     {
-                        !settings.store.sortDmsByNewestMessage && canMoveChannelInDirection(channelId, -1) && (
+                        settings.store.pinOrder === PinOrder.Custom && canMoveChannelInDirection(channelId, -1) && (
                             <Menu.MenuItem
                                 id="move-up"
                                 label="Move Up"
@@ -62,7 +62,7 @@ function createPinMenuItem(channelId: string) {
                     }
 
                     {
-                        !settings.store.sortDmsByNewestMessage && canMoveChannelInDirection(channelId, 1) && (
+                        settings.store.pinOrder === PinOrder.Custom && canMoveChannelInDirection(channelId, 1) && (
                             <Menu.MenuItem
                                 id="move-down"
                                 label="Move Down"
diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index 8951f0949..353fc482a 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -34,11 +34,19 @@ const PrivateChannelSortStore = findStoreLazy("PrivateChannelSortStore") as { ge
 export let instance: any;
 export const forceUpdate = () => instance?.props?._forceUpdate?.();
 
+export const enum PinOrder {
+    LastMessage,
+    Custom
+}
+
 export const settings = definePluginSettings({
-    sortDmsByNewestMessage: {
-        type: OptionType.BOOLEAN,
-        description: "Sort DMs by newest message",
-        default: false,
+    pinOrder: {
+        type: OptionType.SELECT,
+        description: "Which order should pinned DMs be displayed in?",
+        options: [
+            { label: "Most recent message", value: PinOrder.LastMessage, default: true },
+            { label: "Custom (right click channels to reorder)", value: PinOrder.Custom }
+        ],
         onChange: () => forceUpdate()
     },
 
@@ -61,11 +69,6 @@ export default definePlugin({
         {
             find: ".privateChannelsHeaderContainer,",
             replacement: [
-                // Init
-                {
-                    match: /(?<=componentDidMount\(\){).{1,100}scrollToChannel/,
-                    replace: "$self._instance = this;$&"
-                },
                 {
                     // Filter out pinned channels from the private channel list
                     match: /(?<=\i,{channels:\i,)privateChannelIds:(\i)/,
@@ -164,12 +167,15 @@ export default definePlugin({
     getSections,
     getAllUncollapsedChannels,
     requireSettingsMenu,
+
     makeProps(instance, { sections }: { sections: number[]; }) {
+        this._instance = instance;
         this.sections = sections;
 
-        this.sections.splice(1, 0, ...this.getPinCount(instance.props.privateChannelIds || []));
+        this.sections.splice(1, 0, ...this.getSections());
 
         if (this.instance?.props?.privateChannelIds?.length === 0) {
+            // dont render direct messages header
             this.sections[this.sections.length - 1] = 0;
         }
 
@@ -199,10 +205,6 @@ export default definePlugin({
         return (sectionHeaderSizePx + sections.reduce((acc, v) => acc += v + 44, 0) + DEFAULT_CHUNK_SIZE) * 1.5;
     },
 
-    getPinCount(channelIds: string[]) {
-        return channelIds.length ? this.getSections() : [];
-    },
-
     isCategoryIndex(sectionIndex: number) {
         return this.sections && sectionIndex > 0 && sectionIndex < this.sections.length - 1;
     },
@@ -211,7 +213,7 @@ export default definePlugin({
         if (settings.store.dmSectioncollapsed && sectionIndex !== 0)
             return true;
         const cat = categories[sectionIndex - 1];
-        return this.isCategoryIndex(sectionIndex) && (cat.channels.length === 0 || cat?.channels[channelIndex]);
+        return this.isCategoryIndex(sectionIndex) && (cat?.channels?.length === 0 || cat?.channels[channelIndex]);
     },
 
     isDMSectioncollapsed() {
@@ -219,7 +221,6 @@ export default definePlugin({
     },
 
     collapseDMList() {
-        // console.log("HI");
         settings.store.dmSectioncollapsed = !settings.store.dmSectioncollapsed;
         forceUpdate();
     },
@@ -350,7 +351,7 @@ export default definePlugin({
     getCategoryChannels(category: Category) {
         if (category.channels.length === 0) return [];
 
-        if (settings.store.sortDmsByNewestMessage) {
+        if (settings.store.pinOrder === PinOrder.LastMessage) {
             return PrivateChannelSortStore.getPrivateChannelIds().filter(c => category.channels.includes(c));
         }
 

From 69b349da77a069dd5c780fc555fc40125079c7ae Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 30 Mar 2024 00:28:15 +0100
Subject: [PATCH 428/632] fix minor updater bugs

---
 src/main/updater/git.ts  | 5 +++--
 src/main/updater/http.ts | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts
index 82c38b6bc..1955f7dce 100644
--- a/src/main/updater/git.ts
+++ b/src/main/updater/git.ts
@@ -28,7 +28,7 @@ const VENCORD_SRC_DIR = join(__dirname, "..");
 
 const execFile = promisify(cpExecFile);
 
-const isFlatpak = process.platform === "linux" && Boolean(process.env.FLATPAK_ID?.includes("discordapp") || process.env.FLATPAK_ID?.includes("Discord"));
+const isFlatpak = process.platform === "linux" && !!process.env.FLATPAK_ID;
 
 if (process.platform === "darwin") process.env.PATH = `/usr/local/bin:${process.env.PATH}`;
 
@@ -60,7 +60,8 @@ async function calculateGitChanges() {
     return commits ? commits.split("\n").map(line => {
         const [author, hash, ...rest] = line.split("/");
         return {
-            hash, author, message: rest.join("/")
+            hash, author,
+            message: rest.join("/").split("\n")[0]
         };
     }) : [];
 }
diff --git a/src/main/updater/http.ts b/src/main/updater/http.ts
index 9e5a1cef4..0738a8c24 100644
--- a/src/main/updater/http.ts
+++ b/src/main/updater/http.ts
@@ -53,7 +53,7 @@ async function calculateGitChanges() {
         // github api only sends the long sha
         hash: c.sha.slice(0, 7),
         author: c.author.login,
-        message: c.commit.message.substring(c.commit.message.indexOf("\n") + 1)
+        message: c.commit.message.split("\n")[0]
     }));
 }
 

From b158cecd4b4b3e4486fc2092daa9b753b1c136fa Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 31 Mar 2024 01:00:09 +0100
Subject: [PATCH 429/632] FakeNitro: Fix sending unavailable emotes of the
 current server

---
 src/plugins/fakeNitro/index.tsx | 25 +++++++++++++------------
 src/utils/constants.ts          |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index eb9931956..d6822d97d 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -25,6 +25,7 @@ import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy, findStoreLazy, proxyLazyWebpack } from "@webpack";
 import { Alerts, ChannelStore, EmojiStore, FluxDispatcher, Forms, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
+import type { CustomEmoji } from "@webpack/types";
 import type { Message } from "discord-types/general";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
 import type { ReactElement, ReactNode } from "react";
@@ -784,6 +785,16 @@ export default definePlugin({
         UploadHandler.promptToUpload([file], ChannelStore.getChannel(channelId), DRAFT_TYPE);
     },
 
+    canUseEmote(e: CustomEmoji, channelId: string) {
+        if (e.require_colons === false) return true;
+        if (e.available === false) return false;
+
+        if (this.canUseEmotes)
+            return e.guildId === this.guildId || hasExternalEmojiPerms(channelId);
+        else
+            return !e.animated && e.guildId === this.guildId;
+    },
+
     start() {
         const s = settings.store;
 
@@ -882,12 +893,8 @@ export default definePlugin({
             }
 
             if (s.enableEmojiBypass) {
-                const canUseEmotes = this.canUseEmotes && hasExternalEmojiPerms(channelId);
-
                 for (const emoji of messageObj.validNonShortcutEmojis) {
-                    if (!emoji.require_colons) continue;
-                    if (emoji.available !== false && canUseEmotes) continue;
-                    if (emoji.guildId === guildId && !emoji.animated) continue;
+                    if (this.canUseEmote(emoji, channelId)) continue;
 
                     hasBypass = true;
 
@@ -917,18 +924,12 @@ export default definePlugin({
         this.preEdit = addPreEditListener(async (channelId, __, messageObj) => {
             if (!s.enableEmojiBypass) return;
 
-            const { guildId } = this;
-
             let hasBypass = false;
 
-            const canUseEmotes = this.canUseEmotes && hasExternalEmojiPerms(channelId);
-
             messageObj.content = messageObj.content.replace(/(?<!\\)<a?:(?:\w+):(\d+)>/ig, (emojiStr, emojiId, offset, origStr) => {
                 const emoji = EmojiStore.getCustomEmojiById(emojiId);
                 if (emoji == null) return emojiStr;
-                if (!emoji.require_colons) return emojiStr;
-                if (emoji.available !== false && canUseEmotes) return emojiStr;
-                if (emoji.guildId === guildId && !emoji.animated) return emojiStr;
+                if (this.canUseEmote(emoji, channelId)) return emojiStr;
 
                 hasBypass = true;
 
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index f3626aaa0..53f9934b1 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -155,7 +155,7 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     },
     kemo: {
         name: "kemo",
-        id: 299693897859465228n
+        id: 715746190813298788n
     },
     dzshn: {
         name: "dzshn",

From c623e447865b2798c99082ebe36039127c332b67 Mon Sep 17 00:00:00 2001
From: Koda!! <162957404+Kodarru@users.noreply.github.com>
Date: Sat, 30 Mar 2024 19:33:03 -0700
Subject: [PATCH 430/632] ReviewDB: Fix website url (#2318)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/reviewDB/settings.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/reviewDB/settings.tsx b/src/plugins/reviewDB/settings.tsx
index 79cf4174e..eeebd0aa1 100644
--- a/src/plugins/reviewDB/settings.tsx
+++ b/src/plugins/reviewDB/settings.tsx
@@ -71,7 +71,7 @@ export const settings = definePluginSettings({
                 </Button>
 
                 <Button onClick={async () => {
-                    let url = "https://reviewdb.mantikafasi.dev/";
+                    let url = "https://reviewdb.mantikafasi.dev";
                     const token = await getToken();
                     if (token)
                         url += "/api/redirect?token=" + encodeURIComponent(token);

From 88f353e7f6e40f561c8ed7150fcdc32ed4491f18 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 2 Apr 2024 13:39:28 -0300
Subject: [PATCH 431/632] ResurrectHome: Fix Force Server Home patch

---
 src/plugins/resurrectHome/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/resurrectHome/index.tsx b/src/plugins/resurrectHome/index.tsx
index f48debc76..24cdf2b02 100644
--- a/src/plugins/resurrectHome/index.tsx
+++ b/src/plugins/resurrectHome/index.tsx
@@ -89,8 +89,8 @@ export default definePlugin({
         {
             find: "61eef9_2",
             replacement: {
-                match: /(?<=getMutableGuildChannelsForGuild\(\i\)\);)(?=if\(null==\i\|\|)/,
-                replace: "if($self.useForceServerHome())return false;"
+                match: /getMutableGuildChannelsForGuild\(\i\);return\(0,\i\.useStateFromStores\).+?\]\)(?=}function)/,
+                replace: m => `${m}&&!$self.useForceServerHome()`
             }
         }
     ],

From 18d47806358f0b5e4e82d58b4767743ff384970a Mon Sep 17 00:00:00 2001
From: Kyuuhachi <1547062+Kyuuhachi@users.noreply.github.com>
Date: Wed, 3 Apr 2024 14:51:28 +0200
Subject: [PATCH 432/632] fix(MessageLinkEmbeds): Actually disable when
 disabled (#2323)

---
 src/plugins/messageLinkEmbeds/index.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index 6ee60be71..2a5f88282 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addAccessory } from "@api/MessageAccessories";
+import { addAccessory, removeAccessory } from "@api/MessageAccessories";
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants.js";
@@ -389,4 +389,8 @@ export default definePlugin({
             );
         }, 4 /* just above rich embeds */);
     },
+
+    stop() {
+        removeAccessory("messageLinkEmbed");
+    }
 });

From 778d79cd35cf4710640ac7563d6e22eb1deb78ca Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 5 Apr 2024 16:09:04 -0300
Subject: [PATCH 433/632] Fix MutualGroupDMs and UserVoiceShow patch

---
 src/plugins/mutualGroupDMs/index.tsx | 2 +-
 src/plugins/userVoiceShow/index.tsx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx
index f5e4b6149..1753fefbc 100644
--- a/src/plugins/mutualGroupDMs/index.tsx
+++ b/src/plugins/mutualGroupDMs/index.tsx
@@ -45,7 +45,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: ".Messages.USER_PROFILE_MODAL", // Note: the module is lazy-loaded
+            find: ".Messages.MUTUAL_GUILDS_WITH_END_COUNT", // Note: the module is lazy-loaded
             replacement: {
                 match: /(?<=\.tabBarItem.{0,50}MUTUAL_GUILDS.+?}\),)(?=.+?(\(0,\i\.jsxs?\)\(.{0,100}id:))/,
                 replace: '(arguments[0].user.bot||arguments[0].isCurrentUser)?null:$1"MUTUAL_GDMS",children:"Mutual Groups"}),'
diff --git a/src/plugins/userVoiceShow/index.tsx b/src/plugins/userVoiceShow/index.tsx
index 200cfe895..feba28316 100644
--- a/src/plugins/userVoiceShow/index.tsx
+++ b/src/plugins/userVoiceShow/index.tsx
@@ -104,7 +104,7 @@ export default definePlugin({
         },
         // below username
         {
-            find: ".USER_PROFILE_MODAL",
+            find: ".Messages.MUTUAL_GUILDS_WITH_END_COUNT", // Lazy-loaded
             replacement: {
                 match: /\.body.+?displayProfile:\i}\),/,
                 replace: "$&$self.patchModal(arguments[0]),",

From c311155d7cba0658eaba6ba8b081e465cc18bceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jade=20=E3=83=BB=3A*=E3=83=BB=E3=80=82*=E3=83=BB?=
 <asleepydoggy@gmail.com>
Date: Sat, 6 Apr 2024 06:29:08 +1100
Subject: [PATCH 434/632] PinDMs: Fix unexpected behaviours when using last
 message sort (#2324)

---
 src/plugins/pinDms/data.ts   | 9 +++++++--
 src/plugins/pinDms/index.tsx | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/plugins/pinDms/data.ts b/src/plugins/pinDms/data.ts
index afb6f9795..a4e40dde0 100644
--- a/src/plugins/pinDms/data.ts
+++ b/src/plugins/pinDms/data.ts
@@ -9,7 +9,7 @@ import { Settings } from "@api/Settings";
 import { UserStore } from "@webpack/common";
 
 import { DEFAULT_COLOR } from "./constants";
-import { forceUpdate } from "./index";
+import { forceUpdate, PinOrder, PrivateChannelSortStore, settings } from "./index";
 
 export interface Category {
     id: string;
@@ -106,7 +106,12 @@ export function categoryLen() {
 }
 
 export function getAllUncollapsedChannels() {
-    return categories.filter(c => !c.collapsed).map(c => c.channels).flat();
+    if (settings.store.pinOrder === PinOrder.LastMessage) {
+        const sortedChannels = PrivateChannelSortStore.getPrivateChannelIds();
+        return categories.filter(c => !c.collapsed).flatMap(c => sortedChannels.filter(channel => c.channels.includes(channel)));
+    }
+
+    return categories.filter(c => !c.collapsed).flatMap(c => c.channels);
 }
 
 export function getSections() {
diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index 353fc482a..010b5506c 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -29,7 +29,7 @@ interface ChannelComponentProps {
 
 const headerClasses = findByPropsLazy("privateChannelsHeaderContainer");
 
-const PrivateChannelSortStore = findStoreLazy("PrivateChannelSortStore") as { getPrivateChannelIds: () => string[]; };
+export const PrivateChannelSortStore = findStoreLazy("PrivateChannelSortStore") as { getPrivateChannelIds: () => string[]; };
 
 export let instance: any;
 export const forceUpdate = () => instance?.props?._forceUpdate?.();
@@ -236,7 +236,7 @@ export default definePlugin({
         const category = categories[categoryIndex - 1];
         if (!category) return false;
 
-        return category.collapsed && this.instance.props.selectedChannelId !== category.channels[channelIndex];
+        return category.collapsed && this.instance.props.selectedChannelId !== this.getCategoryChannels(category)[channelIndex];
     },
 
     getScrollOffset(channelId: string, rowHeight: number, padding: number, preRenderedChildren: number, originalOffset: number) {

From e0becc1ba0c5d7e93b758188865f1d53b7dca0a0 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 7 Apr 2024 21:46:32 +0200
Subject: [PATCH 435/632] ShowHiddenChannels: Fix incompatibility with favorite
 channels experiment

---
 src/plugins/showHiddenChannels/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 31dc93ad2..ce4a47ade 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -452,7 +452,7 @@ export default definePlugin({
                 {
                     // Filter hidden channels from GuildChannelStore.getChannels unless told otherwise
                     match: /(?<=getChannels\(\i)(\){.+?)return (.+?)}/,
-                    replace: (_, rest, channels) => `,shouldIncludeHidden${rest}return $self.resolveGuildChannels(${channels},shouldIncludeHidden??false);}`
+                    replace: (_, rest, channels) => `,shouldIncludeHidden${rest}return $self.resolveGuildChannels(${channels},shouldIncludeHidden??arguments[0]==="@favorites");}`
                 }
             ]
         },

From cba611c1cc46099a191cad64995dc8af8dce7d1a Mon Sep 17 00:00:00 2001
From: Eric <45801973+waresnew@users.noreply.github.com>
Date: Mon, 8 Apr 2024 00:33:35 -0400
Subject: [PATCH 436/632] Better error for primitives on proxyLazy + fix
 StartupTimings (#2339)

---
 src/plugins/startupTimings/index.tsx | 5 +++--
 src/utils/lazy.ts                    | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/plugins/startupTimings/index.tsx b/src/plugins/startupTimings/index.tsx
index c7417f0fc..742d822ae 100644
--- a/src/plugins/startupTimings/index.tsx
+++ b/src/plugins/startupTimings/index.tsx
@@ -17,9 +17,10 @@
 */
 
 import { Devs } from "@utils/constants";
-import { LazyComponent } from "@utils/react";
 import definePlugin from "@utils/types";
 
+import StartupTimingPage from "./StartupTimingPage";
+
 export default definePlugin({
     name: "StartupTimings",
     description: "Adds Startup Timings to the Settings menu",
@@ -31,5 +32,5 @@ export default definePlugin({
             replace: '{section:"StartupTimings",label:"Startup Timings",element:$self.StartupTimingPage},$&'
         }
     }],
-    StartupTimingPage: LazyComponent(() => require("./StartupTimingPage").default)
+    StartupTimingPage
 });
diff --git a/src/utils/lazy.ts b/src/utils/lazy.ts
index 32336fb40..a61785df9 100644
--- a/src/utils/lazy.ts
+++ b/src/utils/lazy.ts
@@ -116,8 +116,11 @@ export function proxyLazy<T>(factory: () => T, attempts = 5, isChild = false): T
                     attempts,
                     true
                 );
-
-            return Reflect.get(target[kGET](), p, receiver);
+            const lazyTarget = target[kGET]();
+            if (typeof lazyTarget === "object" || typeof lazyTarget === "function") {
+                return Reflect.get(lazyTarget, p, receiver);
+            }
+            throw new Error("proxyLazy called on a primitive value");
         }
     }) as any;
 }

From 3ecd2deae5002e32b31b795bef0fbc8a1d8b95bf Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Tue, 9 Apr 2024 07:23:55 +0700
Subject: [PATCH 437/632] plugin settings: fix filter dropdown having no
 padding (#2332)

---
 src/components/PluginSettings/index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/PluginSettings/index.tsx b/src/components/PluginSettings/index.tsx
index fe111fa9d..33a472c1a 100644
--- a/src/components/PluginSettings/index.tsx
+++ b/src/components/PluginSettings/index.tsx
@@ -315,7 +315,6 @@ export default function PluginSettings() {
                 <TextInput autoFocus value={searchValue.value} placeholder="Search for a plugin..." onChange={onSearch} className={Margins.bottom20} />
                 <div className={InputStyles.inputWrapper}>
                     <Select
-                        className={InputStyles.inputDefault}
                         options={[
                             { label: "Show All", value: SearchStatus.ALL, default: true },
                             { label: "Show Enabled", value: SearchStatus.ENABLED },

From ae01e88e1340027a848cbcf2d230f3395e94011c Mon Sep 17 00:00:00 2001
From: byron <47872200+byeoon@users.noreply.github.com>
Date: Mon, 8 Apr 2024 20:33:18 -0400
Subject: [PATCH 438/632] EmoteCloner: fix low quality; don't count managed
 emojis (#2321)

Co-authored-by: Nam Anh <phamnamanh25@gmail.com>
Co-authored-by: ryan-0324 <77452312+ryan-0324@users.noreply.github.com>
Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/emoteCloner/index.tsx | 7 ++++---
 src/utils/constants.ts            | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/plugins/emoteCloner/index.tsx b/src/plugins/emoteCloner/index.tsx
index 4c0fe94ad..cd9890a80 100644
--- a/src/plugins/emoteCloner/index.tsx
+++ b/src/plugins/emoteCloner/index.tsx
@@ -54,9 +54,9 @@ const StickerExt = [, "png", "png", "json", "gif"] as const;
 
 function getUrl(data: Data) {
     if (data.t === "Emoji")
-        return `${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/emojis/${data.id}.${data.isAnimated ? "gif" : "png"}`;
+        return `${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/emojis/${data.id}.${data.isAnimated ? "gif" : "png"}?size=4096&lossless=true`;
 
-    return `${window.GLOBAL_ENV.MEDIA_PROXY_ENDPOINT}/stickers/${data.id}.${StickerExt[data.format_type]}`;
+    return `${window.GLOBAL_ENV.MEDIA_PROXY_ENDPOINT}/stickers/${data.id}.${StickerExt[data.format_type]}?size=4096&lossless=true`;
 }
 
 async function fetchSticker(id: string) {
@@ -130,7 +130,8 @@ function getGuildCandidates(data: Data) {
 
         let count = 0;
         for (const emoji of emojis)
-            if (emoji.animated === isAnimated) count++;
+            if (emoji.animated === isAnimated && !emoji.managed)
+                count++;
         return count < emojiSlots;
     }).sort((a, b) => a.name.localeCompare(b.name));
 }
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 53f9934b1..3bad423d5 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -425,6 +425,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     newwares: {
         name: "newwares",
         id: 421405303951851520n
+    },
+    Byron: {
+        name: "byeoon",
+        id: 1167275288036655133n
     }
 } satisfies Record<string, Dev>);
 

From 26f3618c2cb60d26b3d7cd1734f39d36186fcee7 Mon Sep 17 00:00:00 2001
From: Sqaaakoi <sqaaakoi-git@sqaaakoi.xyz>
Date: Tue, 9 Apr 2024 12:41:48 +1200
Subject: [PATCH 439/632] TypingIndicator: Add an option to show user avatars
 (#2319)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/typingIndicator/index.tsx | 44 ++++++++++++++++++++++-----
 src/plugins/typingIndicator/style.css | 18 +++++++++++
 src/utils/constants.ts                |  4 +++
 3 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 src/plugins/typingIndicator/style.css

diff --git a/src/plugins/typingIndicator/index.tsx b/src/plugins/typingIndicator/index.tsx
index 8bae2f53c..6df3f4b80 100644
--- a/src/plugins/typingIndicator/index.tsx
+++ b/src/plugins/typingIndicator/index.tsx
@@ -16,20 +16,28 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import "./style.css";
+
 import { definePluginSettings, Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { findExportedComponentLazy, findStoreLazy } from "@webpack";
+import { findComponentByCodeLazy, findExportedComponentLazy, findStoreLazy } from "@webpack";
 import { ChannelStore, GuildMemberStore, i18n, RelationshipStore, SelectedChannelStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
 
 import { buildSeveralUsers } from "../typingTweaks";
 
 const ThreeDots = findExportedComponentLazy("Dots", "AnimatedDots");
+const UserSummaryItem = findComponentByCodeLazy("defaultRenderUser", "showDefaultAvatarsForNullUsers");
 
 const TypingStore = findStoreLazy("TypingStore");
 const UserGuildSettingsStore = findStoreLazy("UserGuildSettingsStore");
 
+const enum IndicatorMode {
+    Dots = 1 << 0,
+    Avatars = 1 << 1
+}
+
 function getDisplayName(guildId: string, userId: string) {
     const user = UserStore.getUser(userId);
     return GuildMemberStore.getNick(guildId, userId) ?? (user as any).globalName ?? user.username;
@@ -90,11 +98,24 @@ function TypingIndicator({ channelId }: { channelId: string; }) {
         return (
             <Tooltip text={tooltipText!}>
                 {props => (
-                    <div
-                        {...props}
-                        style={{ marginLeft: 6, height: 16, display: "flex", alignItems: "center", zIndex: 0, cursor: "pointer" }}
-                    >
-                        <ThreeDots dotRadius={3} themed={true} />
+                    <div className="vc-typing-indicator" {...props}>
+                        {((settings.store.indicatorMode & IndicatorMode.Avatars) === IndicatorMode.Avatars) && (
+                            <UserSummaryItem
+                                users={typingUsersArray.map(id => UserStore.getUser(id))}
+                                guildId={guildId}
+                                renderIcon={false}
+                                max={3}
+                                showDefaultAvatarsForNullUsers
+                                showUserPopout
+                                size={16}
+                                className="vc-typing-indicator-avatars"
+                            />
+                        )}
+                        {((settings.store.indicatorMode & IndicatorMode.Dots) === IndicatorMode.Dots) && (
+                            <div className="vc-typing-indicator-dots">
+                                <ThreeDots dotRadius={3} themed={true} />
+                            </div>
+                        )}
                     </div>
                 )}
             </Tooltip>
@@ -119,13 +140,22 @@ const settings = definePluginSettings({
         type: OptionType.BOOLEAN,
         description: "Whether to show the typing indicator for blocked users.",
         default: false
+    },
+    indicatorMode: {
+        type: OptionType.SELECT,
+        description: "How should the indicator be displayed?",
+        options: [
+            { label: "Avatars and animated dots", value: IndicatorMode.Dots | IndicatorMode.Avatars, default: true },
+            { label: "Animated dots", value: IndicatorMode.Dots },
+            { label: "Avatars", value: IndicatorMode.Avatars },
+        ],
     }
 });
 
 export default definePlugin({
     name: "TypingIndicator",
     description: "Adds an indicator if someone is typing on a channel.",
-    authors: [Devs.Nuckyz, Devs.fawn],
+    authors: [Devs.Nuckyz, Devs.fawn, Devs.Sqaaakoi],
     settings,
 
     patches: [
diff --git a/src/plugins/typingIndicator/style.css b/src/plugins/typingIndicator/style.css
new file mode 100644
index 000000000..d92ef0f1e
--- /dev/null
+++ b/src/plugins/typingIndicator/style.css
@@ -0,0 +1,18 @@
+.vc-typing-indicator {
+    display: flex;
+    align-items: center;
+    height: 20px;
+}
+
+.vc-typing-indicator-avatars {
+    margin-left: 6px;
+}
+
+.vc-typing-indicator-dots {
+    margin-left: 6px;
+    height: 16px;
+    display: flex;
+    align-items: center;
+    z-index: 0;
+    cursor: pointer;
+}
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 3bad423d5..04a4f6778 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -426,6 +426,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "newwares",
         id: 421405303951851520n
     },
+    Sqaaakoi: {
+        name: "Sqaaakoi",
+        id: 259558259491340288n
+    },
     Byron: {
         name: "byeoon",
         id: 1167275288036655133n

From 38ffdd7d9457858c6a79a5705f4c7746047f7561 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 9 Apr 2024 02:52:21 +0200
Subject: [PATCH 440/632] FriendsSince: Add icon to be consistent with "member
 since"

Co-authored-by: Trey <47907719+trwy7@users.noreply.github.com>
---
 src/plugins/friendsSince/index.tsx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/plugins/friendsSince/index.tsx b/src/plugins/friendsSince/index.tsx
index ab3320dfe..dd37137a4 100644
--- a/src/plugins/friendsSince/index.tsx
+++ b/src/plugins/friendsSince/index.tsx
@@ -6,6 +6,7 @@
 
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
+import { getCurrentChannel } from "@utils/discord";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { React, RelationshipStore } from "@webpack/common";
@@ -49,6 +50,18 @@ export default definePlugin({
                 </Heading>
 
                 <div className={container.memberSinceContainer}>
+                    {!!getCurrentChannel()?.guild_id && (
+                        <svg
+                            aria-hidden="true"
+                            width="16"
+                            height="16"
+                            viewBox="0 0 24 24"
+                            fill="var(--interactive-normal)"
+                        >
+                            <path d="M13 10a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z" />
+                            <path d="M3 5v-.75C3 3.56 3.56 3 4.25 3s1.24.56 1.33 1.25C6.12 8.65 9.46 12 13 12h1a8 8 0 0 1 8 8 2 2 0 0 1-2 2 .21.21 0 0 1-.2-.15 7.65 7.65 0 0 0-1.32-2.3c-.15-.2-.42-.06-.39.17l.25 2c.02.15-.1.28-.25.28H9a2 2 0 0 1-2-2v-2.22c0-1.57-.67-3.05-1.53-4.37A15.85 15.85 0 0 1 3 5Z" />
+                        </svg>
+                    )}
                     <Text variant="text-sm/normal" className={clydeMoreInfo.body}>
                         {getCreatedAtDate(friendsSince, locale.getLocale())}
                     </Text>

From 34c74b43bd73259ea0d8458515544b3bd7c189dd Mon Sep 17 00:00:00 2001
From: Haruka <96925398+nakoyasha@users.noreply.github.com>
Date: Tue, 9 Apr 2024 04:56:28 +0300
Subject: [PATCH 441/632] new plugin UnlockedAvatarZoom: allows crop zooming in
 further (#2287)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/unlockedAvatarZoom/README.md |  5 ++++
 src/plugins/unlockedAvatarZoom/index.ts  | 35 ++++++++++++++++++++++++
 src/utils/constants.ts                   |  4 +++
 3 files changed, 44 insertions(+)
 create mode 100644 src/plugins/unlockedAvatarZoom/README.md
 create mode 100644 src/plugins/unlockedAvatarZoom/index.ts

diff --git a/src/plugins/unlockedAvatarZoom/README.md b/src/plugins/unlockedAvatarZoom/README.md
new file mode 100644
index 000000000..9ecd0b1a4
--- /dev/null
+++ b/src/plugins/unlockedAvatarZoom/README.md
@@ -0,0 +1,5 @@
+# UnlockedAvatarZoom
+
+Allows you to zoom in further in the image crop tool when changing your avatar
+
+![](https://raw.githubusercontent.com/Vencord/plugin-assets/main/UnlockedAvatarZoom/demo.avif)
diff --git a/src/plugins/unlockedAvatarZoom/index.ts b/src/plugins/unlockedAvatarZoom/index.ts
new file mode 100644
index 000000000..08503eb8b
--- /dev/null
+++ b/src/plugins/unlockedAvatarZoom/index.ts
@@ -0,0 +1,35 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { makeRange } from "@components/PluginSettings/components";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+
+const settings = definePluginSettings({
+    zoomMultiplier: {
+        type: OptionType.SLIDER,
+        description: "Zoom multiplier",
+        markers: makeRange(2, 16),
+        default: 4,
+    },
+});
+
+export default definePlugin({
+    name: "UnlockedAvatarZoom",
+    description: "Allows you to zoom in further in the image crop tool when changing your avatar",
+    authors: [Devs.nakoyasha],
+    settings,
+    patches: [
+        {
+            find: ".Messages.AVATAR_UPLOAD_EDIT_MEDIA",
+            replacement: {
+                match: /maxValue:\d/,
+                replace: "maxValue:$self.settings.store.zoomMultiplier",
+            }
+        }
+    ]
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 04a4f6778..3098e29d0 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -426,6 +426,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "newwares",
         id: 421405303951851520n
     },
+    nakoyasha: {
+        name: "nakoyasha",
+        id: 222069018507345921n
+    },
     Sqaaakoi: {
         name: "Sqaaakoi",
         id: 259558259491340288n

From 7fa12598215d8fab55cf0d06ce7f82be2eeda9eb Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Tue, 9 Apr 2024 09:04:09 +0700
Subject: [PATCH 442/632] NoMosaic: make loading image work with responsive
 layout (#2095)

---
 src/plugins/noMosaic/index.ts   | 48 ++++++++++++++++++++++++---------
 src/plugins/noMosaic/styles.css |  5 ++++
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/plugins/noMosaic/index.ts b/src/plugins/noMosaic/index.ts
index 7f9fad53c..802f65e51 100644
--- a/src/plugins/noMosaic/index.ts
+++ b/src/plugins/noMosaic/index.ts
@@ -11,21 +11,15 @@ import definePlugin, { OptionType } from "@utils/types";
 
 import style from "./styles.css?managed";
 
+const MAX_WIDTH = 550;
+const MAX_HEIGHT = 350;
+
 const settings = definePluginSettings({
     inlineVideo: {
         description: "Play videos without carousel modal",
         type: OptionType.BOOLEAN,
         default: true,
         restartNeeded: true
-    },
-    mediaLayoutType: {
-        description: "Choose media layout type",
-        type: OptionType.SELECT,
-        restartNeeded: true,
-        options: [
-            { label: "STATIC, render loading image but image isn't resposive, no problem unless discord window width is too small", value: "STATIC", default: true },
-            { label: "RESPONSIVE, image is responsive but not render loading image, cause messages shift when loaded", value: "RESPONSIVE" },
-        ]
     }
 });
 
@@ -42,7 +36,7 @@ export default definePlugin({
             find: ".oneByTwoLayoutThreeGrid",
             replacement: [{
                 match: /mediaLayoutType:\i\.\i\.MOSAIC/,
-                replace: "mediaLayoutType:$self.mediaLayoutType()",
+                replace: "mediaLayoutType:'RESPONSIVE'",
             },
             {
                 match: /null!==\(\i=\i\.get\(\i\)\)&&void 0!==\i\?\i:"INVALID"/,
@@ -59,15 +53,43 @@ export default definePlugin({
         },
         {
             find: "Messages.REMOVE_ATTACHMENT_TOOLTIP_TEXT",
-            replacement: {
+            replacement: [{
                 match: /\i===\i\.\i\.MOSAIC/,
                 replace: "true"
+            },
+            {
+                match: /\i!==\i\.\i\.MOSAIC/,
+                replace: "false"
+            }]
+        },
+        {
+            find: ".messageAttachment,",
+            replacement: {
+                match: /\{width:\i,height:\i\}=(\i).*?(?=className:\i\(\)\(\i\.messageAttachment,)/,
+                replace: "$&style:$self.style($1),"
             }
         }
     ],
 
-    mediaLayoutType() {
-        return settings.store.mediaLayoutType;
+    style({ width, height }) {
+        if (!width || !height) return {};
+
+        if (width > MAX_WIDTH || height > MAX_HEIGHT) {
+            if (width / height > MAX_WIDTH / MAX_HEIGHT) {
+                height = Math.ceil(MAX_WIDTH / (width / height));
+                width = MAX_WIDTH;
+            } else {
+                width = Math.ceil(MAX_HEIGHT * (width / height));
+                height = MAX_HEIGHT;
+            }
+        }
+
+        return {
+            maxWidth: width,
+            width: "100%",
+            aspectRatio: `${width} / ${height}`
+        };
+
     },
 
     start() {
diff --git a/src/plugins/noMosaic/styles.css b/src/plugins/noMosaic/styles.css
index 05ea24899..3a8a8e464 100644
--- a/src/plugins/noMosaic/styles.css
+++ b/src/plugins/noMosaic/styles.css
@@ -1,3 +1,8 @@
 [class^="nonMediaAttachmentsContainer_"] [class*="messageAttachment_"] {
     position: relative;
 }
+
+[class^="nonMediaAttachmentsContainer_"],
+[class^="nonMediaAttachmentItem_"]:has([class^="messageAttachment_"][style^="max-width"]) {
+    width: 100%;
+}

From dc4c678aa3b985f0488baa12b6a38129c19a191d Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 9 Apr 2024 04:19:35 +0200
Subject: [PATCH 443/632] bump to v1.7.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 78370f097..0f79d21ab 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.7.4",
+    "version": "1.7.5",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 5636f9d9797bf64170db56447f4bf38f8fadf169 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 9 Apr 2024 17:09:23 -0300
Subject: [PATCH 444/632] Array support for find + ResurrectHome: View Server
 Home Button on Server Guide (#2283)

---
 scripts/generateReport.ts                     |  3 +
 .../VencordSettings/PatchHelperTab.tsx        | 52 ++++++++---
 src/plugins/index.ts                          |  2 +
 src/plugins/resurrectHome/index.tsx           | 92 +++++++++++++++++--
 src/utils/types.ts                            |  2 +-
 src/webpack/patchWebpack.ts                   |  3 +-
 6 files changed, 131 insertions(+), 23 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 41e384295..bb7640631 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -299,6 +299,9 @@ function runTime(token: string) {
                 delete patch.predicate;
                 delete patch.group;
 
+                if (!Array.isArray(patch.find))
+                    patch.find = [patch.find];
+
                 if (!Array.isArray(patch.replacement))
                     patch.replacement = [patch.replacement];
 
diff --git a/src/components/VencordSettings/PatchHelperTab.tsx b/src/components/VencordSettings/PatchHelperTab.tsx
index 064c872ab..c08c366c8 100644
--- a/src/components/VencordSettings/PatchHelperTab.tsx
+++ b/src/components/VencordSettings/PatchHelperTab.tsx
@@ -33,8 +33,8 @@ if (IS_DEV) {
     var differ = require("diff") as typeof import("diff");
 }
 
-const findCandidates = debounce(function ({ find, setModule, setError }) {
-    const candidates = search(find);
+const findCandidates = debounce(function ({ finds, setModule, setError }) {
+    const candidates = search(...finds);
     const keys = Object.keys(candidates);
     const len = keys.length;
     if (len === 0)
@@ -180,7 +180,8 @@ function ReplacementInput({ replacement, setReplacement, replacementError }) {
 
     return (
         <>
-            <Forms.FormTitle>replacement</Forms.FormTitle>
+            {/* FormTitle adds a class if className is not set, so we set it to an empty string to prevent that */}
+            <Forms.FormTitle className="">replacement</Forms.FormTitle>
             <TextInput
                 value={replacement?.toString()}
                 onChange={onChange}
@@ -188,7 +189,7 @@ function ReplacementInput({ replacement, setReplacement, replacementError }) {
             />
             {!isFunc && (
                 <div className="vc-text-selectable">
-                    <Forms.FormTitle>Cheat Sheet</Forms.FormTitle>
+                    <Forms.FormTitle className={Margins.top8}>Cheat Sheet</Forms.FormTitle>
                     {Object.entries({
                         "\\i": "Special regex escape sequence that matches identifiers (varnames, classnames, etc.)",
                         "$$": "Insert a $",
@@ -220,11 +221,12 @@ function ReplacementInput({ replacement, setReplacement, replacementError }) {
 
 interface FullPatchInputProps {
     setFind(v: string): void;
+    setFinds(v: string[]): void;
     setMatch(v: string): void;
     setReplacement(v: string | ReplaceFn): void;
 }
 
-function FullPatchInput({ setFind, setMatch, setReplacement }: FullPatchInputProps) {
+function FullPatchInput({ setFind, setFinds, setMatch, setReplacement }: FullPatchInputProps) {
     const [fullPatch, setFullPatch] = React.useState<string>("");
     const [fullPatchError, setFullPatchError] = React.useState<string>("");
 
@@ -256,7 +258,8 @@ function FullPatchInput({ setFind, setMatch, setReplacement }: FullPatchInputPro
             if (!parsed.replacement.match) throw new Error("No 'replacement.match' field");
             if (!parsed.replacement.replace) throw new Error("No 'replacement.replace' field");
 
-            setFind(parsed.find);
+            setFind(JSON.stringify(parsed.find));
+            setFinds(parsed.find instanceof Array ? parsed.find : [parsed.find]);
             setMatch(parsed.replacement.match instanceof RegExp ? parsed.replacement.match.source : parsed.replacement.match);
             setReplacement(parsed.replacement.replace);
             setFullPatchError("");
@@ -266,7 +269,7 @@ function FullPatchInput({ setFind, setMatch, setReplacement }: FullPatchInputPro
     }
 
     return <>
-        <Forms.FormText>Paste your full JSON patch here to fill out the fields</Forms.FormText>
+        <Forms.FormText className={Margins.bottom8}>Paste your full JSON patch here to fill out the fields</Forms.FormText>
         <TextArea value={fullPatch} onChange={setFullPatch} onBlur={update} />
         {fullPatchError !== "" && <Forms.FormText style={{ color: "var(--text-danger)" }}>{fullPatchError}</Forms.FormText>}
     </>;
@@ -274,6 +277,7 @@ function FullPatchInput({ setFind, setMatch, setReplacement }: FullPatchInputPro
 
 function PatchHelper() {
     const [find, setFind] = React.useState<string>("");
+    const [finds, setFinds] = React.useState<string[]>([]);
     const [match, setMatch] = React.useState<string>("");
     const [replacement, setReplacement] = React.useState<string | ReplaceFn>("");
 
@@ -285,20 +289,39 @@ function PatchHelper() {
     const code = React.useMemo(() => {
         return `
 {
-    find: ${JSON.stringify(find)},
+    find: ${finds.length > 1 ? `[${finds.map(f => JSON.stringify(f)).join(", ")}]` : finds.length > 0 ? JSON.stringify(finds[0]) : "[]"},
     replacement: {
         match: /${match.replace(/(?<!\\)\//g, "\\/")}/,
         replace: ${typeof replacement === "function" ? replacement.toString() : JSON.stringify(replacement)}
     }
 }
         `.trim();
-    }, [find, match, replacement]);
+    }, [finds, match, replacement]);
 
     function onFindChange(v: string) {
         setFindError(void 0);
         setFind(v);
-        if (v.length) {
-            findCandidates({ find: v, setModule, setError: setFindError });
+    }
+
+    function onFindBlur() {
+        let finds = [] as string[];
+        const findArrayMatch = find.match(/^\[.*\]$/);
+
+        if (findArrayMatch) {
+            try {
+                const rawFinds = (0, eval)(`(${find})`);
+                finds = rawFinds instanceof Array ? rawFinds : [rawFinds];
+            } catch (e) {
+                setFindError((e as Error).message);
+                return;
+            }
+        } else if (find.length) {
+            finds = [find];
+        }
+
+        setFinds(finds);
+        if (finds.length) {
+            findCandidates({ finds, setModule, setError: setFindError });
         }
     }
 
@@ -317,19 +340,21 @@ function PatchHelper() {
             <Forms.FormTitle>full patch</Forms.FormTitle>
             <FullPatchInput
                 setFind={onFindChange}
+                setFinds={setFinds}
                 setMatch={onMatchChange}
                 setReplacement={setReplacement}
             />
 
-            <Forms.FormTitle>find</Forms.FormTitle>
+            <Forms.FormTitle className={Margins.top8}>find</Forms.FormTitle>
             <TextInput
                 type="text"
                 value={find}
                 onChange={onFindChange}
+                onBlur={onFindBlur}
                 error={findError}
             />
 
-            <Forms.FormTitle>match</Forms.FormTitle>
+            <Forms.FormTitle className={Margins.top8}>match</Forms.FormTitle>
             <CheckedTextInput
                 value={match}
                 onChange={onMatchChange}
@@ -342,6 +367,7 @@ function PatchHelper() {
                 }}
             />
 
+            <div className={Margins.top8} />
             <ReplacementInput
                 replacement={replacement}
                 setReplacement={setReplacement}
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 7092001ee..932b852bc 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -79,6 +79,8 @@ for (const p of pluginsValues) {
     if (p.patches && isPluginEnabled(p.name)) {
         for (const patch of p.patches) {
             patch.plugin = p.name;
+            if (!Array.isArray(patch.find))
+                patch.find = [patch.find];
             if (!Array.isArray(patch.replacement))
                 patch.replacement = [patch.replacement];
             patches.push(patch);
diff --git a/src/plugins/resurrectHome/index.tsx b/src/plugins/resurrectHome/index.tsx
index 24cdf2b02..980629126 100644
--- a/src/plugins/resurrectHome/index.tsx
+++ b/src/plugins/resurrectHome/index.tsx
@@ -18,9 +18,68 @@
 
 import { findGroupChildrenByChildId } from "@api/ContextMenu";
 import { definePluginSettings } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { Menu } from "@webpack/common";
+import { findByPropsLazy } from "@webpack";
+import { Button, Menu, Tooltip, useEffect, useState } from "@webpack/common";
+
+const ChannelRowClasses = findByPropsLazy("modeConnected", "modeLocked", "icon");
+
+let currentShouldViewServerHome = false;
+const shouldViewServerHomeStates = new Set<React.Dispatch<React.SetStateAction<boolean>>>();
+
+function ViewServerHomeButton() {
+    return (
+        <Tooltip text="View Server Home">
+            {tooltipProps => (
+                <Button
+                    {...tooltipProps}
+                    look={Button.Looks.BLANK}
+                    size={Button.Sizes.NONE}
+                    innerClassName={ChannelRowClasses.icon}
+                    onClick={e => {
+                        e.preventDefault();
+
+                        currentShouldViewServerHome = true;
+                        for (const setState of shouldViewServerHomeStates) {
+                            setState(true);
+                        }
+                    }}
+
+                >
+                    <svg width="20" height="20" viewBox="0 0 24 24">
+                        <path fill="currentColor" d="m2.4 8.4 8.38-6.46a2 2 0 0 1 2.44 0l8.39 6.45a2 2 0 0 1-.79 3.54l-.32.07-.82 8.2a2 2 0 0 1-1.99 1.8H16a1 1 0 0 1-1-1v-5a3 3 0 0 0-6 0v5a1 1 0 0 1-1 1H6.31a2 2 0 0 1-1.99-1.8L3.5 12l-.32-.07a2 2 0 0 1-.79-3.54Z" />
+                    </svg>
+                </Button>
+            )}
+        </Tooltip>
+    );
+}
+
+function useForceServerHome() {
+    const { forceServerHome } = settings.use(["forceServerHome"]);
+    const [shouldViewServerHome, setShouldViewServerHome] = useState(currentShouldViewServerHome);
+
+    useEffect(() => {
+        shouldViewServerHomeStates.add(setShouldViewServerHome);
+
+        return () => {
+            shouldViewServerHomeStates.delete(setShouldViewServerHome);
+        };
+    }, []);
+
+    return shouldViewServerHome || forceServerHome;
+}
+
+function useDisableViewServerHome() {
+    useEffect(() => () => {
+        currentShouldViewServerHome = false;
+        for (const setState of shouldViewServerHomeStates) {
+            setState(false);
+        }
+    }, []);
+}
 
 const settings = definePluginSettings({
     forceServerHome: {
@@ -30,12 +89,6 @@ const settings = definePluginSettings({
     }
 });
 
-function useForceServerHome() {
-    const { forceServerHome } = settings.use(["forceServerHome"]);
-
-    return forceServerHome;
-}
-
 export default definePlugin({
     name: "ResurrectHome",
     description: "Re-enables the Server Home tab when there isn't a Server Guide. Also has an option to force the Server Home over the Server Guide, which is accessible through right-clicking the Server Guide.",
@@ -92,14 +145,37 @@ export default definePlugin({
                 match: /getMutableGuildChannelsForGuild\(\i\);return\(0,\i\.useStateFromStores\).+?\]\)(?=}function)/,
                 replace: m => `${m}&&!$self.useForceServerHome()`
             }
+        },
+        // Add View Server Home Button to Server Guide
+        {
+            find: "487e85_1",
+            replacement: {
+                match: /(?<=text:(\i)\?\i\.\i\.Messages\.SERVER_GUIDE:\i\.\i\.Messages\.GUILD_HOME,)/,
+                replace: "badge:$self.ViewServerHomeButton({serverGuide:$1}),"
+            }
+        },
+        // Disable view Server Home override when the Server Home is unmouted
+        {
+            find: "69386d_5",
+            replacement: {
+                match: /location:"69386d_5".+?;/,
+                replace: "$&$self.useDisableViewServerHome();"
+            }
         }
     ],
 
+    ViewServerHomeButton: ErrorBoundary.wrap(({ serverGuide }: { serverGuide?: boolean; }) => {
+        if (serverGuide !== true) return null;
+
+        return <ViewServerHomeButton />;
+    }),
+
     useForceServerHome,
+    useDisableViewServerHome,
 
     contextMenus: {
         "guild-context"(children, props) {
-            const forceServerHome = useForceServerHome();
+            const { forceServerHome } = settings.use(["forceServerHome"]);
 
             if (!props?.guild) return;
 
diff --git a/src/utils/types.ts b/src/utils/types.ts
index bec7cb0b3..fc34b96de 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -36,7 +36,7 @@ export interface PatchReplacement {
 
 export interface Patch {
     plugin: string;
-    find: string;
+    find: string | string[];
     replacement: PatchReplacement | PatchReplacement[];
     /** Whether this patch should apply to multiple modules */
     all?: boolean;
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index db47c875a..2ce4939b6 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -186,7 +186,8 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
             const executePatch = traceFunction(`patch by ${patch.plugin}`, (match: string | RegExp, replace: string) => code.replace(match, replace));
             if (patch.predicate && !patch.predicate()) continue;
 
-            if (code.includes(patch.find)) {
+            // we change all patch.find to array in plugins/index
+            if ((patch.find as string[]).every(f => code.includes(f))) {
                 patchedBy.add(patch.plugin);
 
                 const previousMod = mod;

From 89dc74d5d7436ea090b759c5fa89c497f04ddf4f Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 14 Apr 2024 00:57:59 +0200
Subject: [PATCH 445/632] partially revert "Array support for find +
 ResurrectHome: View Server Home Button on Server Guide (#2283)"

This reverts commit 5636f9d9797bf64170db56447f4bf38f8fadf169.

It breaks Vesktop which is not acceptable. Need to resolve this conflict and add this back later
---
 scripts/generateReport.ts                     |  3 --
 .../VencordSettings/PatchHelperTab.tsx        | 52 +++++--------------
 src/plugins/index.ts                          |  2 -
 src/utils/types.ts                            |  2 +-
 src/webpack/patchWebpack.ts                   |  3 +-
 5 files changed, 15 insertions(+), 47 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index bb7640631..41e384295 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -299,9 +299,6 @@ function runTime(token: string) {
                 delete patch.predicate;
                 delete patch.group;
 
-                if (!Array.isArray(patch.find))
-                    patch.find = [patch.find];
-
                 if (!Array.isArray(patch.replacement))
                     patch.replacement = [patch.replacement];
 
diff --git a/src/components/VencordSettings/PatchHelperTab.tsx b/src/components/VencordSettings/PatchHelperTab.tsx
index c08c366c8..064c872ab 100644
--- a/src/components/VencordSettings/PatchHelperTab.tsx
+++ b/src/components/VencordSettings/PatchHelperTab.tsx
@@ -33,8 +33,8 @@ if (IS_DEV) {
     var differ = require("diff") as typeof import("diff");
 }
 
-const findCandidates = debounce(function ({ finds, setModule, setError }) {
-    const candidates = search(...finds);
+const findCandidates = debounce(function ({ find, setModule, setError }) {
+    const candidates = search(find);
     const keys = Object.keys(candidates);
     const len = keys.length;
     if (len === 0)
@@ -180,8 +180,7 @@ function ReplacementInput({ replacement, setReplacement, replacementError }) {
 
     return (
         <>
-            {/* FormTitle adds a class if className is not set, so we set it to an empty string to prevent that */}
-            <Forms.FormTitle className="">replacement</Forms.FormTitle>
+            <Forms.FormTitle>replacement</Forms.FormTitle>
             <TextInput
                 value={replacement?.toString()}
                 onChange={onChange}
@@ -189,7 +188,7 @@ function ReplacementInput({ replacement, setReplacement, replacementError }) {
             />
             {!isFunc && (
                 <div className="vc-text-selectable">
-                    <Forms.FormTitle className={Margins.top8}>Cheat Sheet</Forms.FormTitle>
+                    <Forms.FormTitle>Cheat Sheet</Forms.FormTitle>
                     {Object.entries({
                         "\\i": "Special regex escape sequence that matches identifiers (varnames, classnames, etc.)",
                         "$$": "Insert a $",
@@ -221,12 +220,11 @@ function ReplacementInput({ replacement, setReplacement, replacementError }) {
 
 interface FullPatchInputProps {
     setFind(v: string): void;
-    setFinds(v: string[]): void;
     setMatch(v: string): void;
     setReplacement(v: string | ReplaceFn): void;
 }
 
-function FullPatchInput({ setFind, setFinds, setMatch, setReplacement }: FullPatchInputProps) {
+function FullPatchInput({ setFind, setMatch, setReplacement }: FullPatchInputProps) {
     const [fullPatch, setFullPatch] = React.useState<string>("");
     const [fullPatchError, setFullPatchError] = React.useState<string>("");
 
@@ -258,8 +256,7 @@ function FullPatchInput({ setFind, setFinds, setMatch, setReplacement }: FullPat
             if (!parsed.replacement.match) throw new Error("No 'replacement.match' field");
             if (!parsed.replacement.replace) throw new Error("No 'replacement.replace' field");
 
-            setFind(JSON.stringify(parsed.find));
-            setFinds(parsed.find instanceof Array ? parsed.find : [parsed.find]);
+            setFind(parsed.find);
             setMatch(parsed.replacement.match instanceof RegExp ? parsed.replacement.match.source : parsed.replacement.match);
             setReplacement(parsed.replacement.replace);
             setFullPatchError("");
@@ -269,7 +266,7 @@ function FullPatchInput({ setFind, setFinds, setMatch, setReplacement }: FullPat
     }
 
     return <>
-        <Forms.FormText className={Margins.bottom8}>Paste your full JSON patch here to fill out the fields</Forms.FormText>
+        <Forms.FormText>Paste your full JSON patch here to fill out the fields</Forms.FormText>
         <TextArea value={fullPatch} onChange={setFullPatch} onBlur={update} />
         {fullPatchError !== "" && <Forms.FormText style={{ color: "var(--text-danger)" }}>{fullPatchError}</Forms.FormText>}
     </>;
@@ -277,7 +274,6 @@ function FullPatchInput({ setFind, setFinds, setMatch, setReplacement }: FullPat
 
 function PatchHelper() {
     const [find, setFind] = React.useState<string>("");
-    const [finds, setFinds] = React.useState<string[]>([]);
     const [match, setMatch] = React.useState<string>("");
     const [replacement, setReplacement] = React.useState<string | ReplaceFn>("");
 
@@ -289,39 +285,20 @@ function PatchHelper() {
     const code = React.useMemo(() => {
         return `
 {
-    find: ${finds.length > 1 ? `[${finds.map(f => JSON.stringify(f)).join(", ")}]` : finds.length > 0 ? JSON.stringify(finds[0]) : "[]"},
+    find: ${JSON.stringify(find)},
     replacement: {
         match: /${match.replace(/(?<!\\)\//g, "\\/")}/,
         replace: ${typeof replacement === "function" ? replacement.toString() : JSON.stringify(replacement)}
     }
 }
         `.trim();
-    }, [finds, match, replacement]);
+    }, [find, match, replacement]);
 
     function onFindChange(v: string) {
         setFindError(void 0);
         setFind(v);
-    }
-
-    function onFindBlur() {
-        let finds = [] as string[];
-        const findArrayMatch = find.match(/^\[.*\]$/);
-
-        if (findArrayMatch) {
-            try {
-                const rawFinds = (0, eval)(`(${find})`);
-                finds = rawFinds instanceof Array ? rawFinds : [rawFinds];
-            } catch (e) {
-                setFindError((e as Error).message);
-                return;
-            }
-        } else if (find.length) {
-            finds = [find];
-        }
-
-        setFinds(finds);
-        if (finds.length) {
-            findCandidates({ finds, setModule, setError: setFindError });
+        if (v.length) {
+            findCandidates({ find: v, setModule, setError: setFindError });
         }
     }
 
@@ -340,21 +317,19 @@ function PatchHelper() {
             <Forms.FormTitle>full patch</Forms.FormTitle>
             <FullPatchInput
                 setFind={onFindChange}
-                setFinds={setFinds}
                 setMatch={onMatchChange}
                 setReplacement={setReplacement}
             />
 
-            <Forms.FormTitle className={Margins.top8}>find</Forms.FormTitle>
+            <Forms.FormTitle>find</Forms.FormTitle>
             <TextInput
                 type="text"
                 value={find}
                 onChange={onFindChange}
-                onBlur={onFindBlur}
                 error={findError}
             />
 
-            <Forms.FormTitle className={Margins.top8}>match</Forms.FormTitle>
+            <Forms.FormTitle>match</Forms.FormTitle>
             <CheckedTextInput
                 value={match}
                 onChange={onMatchChange}
@@ -367,7 +342,6 @@ function PatchHelper() {
                 }}
             />
 
-            <div className={Margins.top8} />
             <ReplacementInput
                 replacement={replacement}
                 setReplacement={setReplacement}
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 932b852bc..7092001ee 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -79,8 +79,6 @@ for (const p of pluginsValues) {
     if (p.patches && isPluginEnabled(p.name)) {
         for (const patch of p.patches) {
             patch.plugin = p.name;
-            if (!Array.isArray(patch.find))
-                patch.find = [patch.find];
             if (!Array.isArray(patch.replacement))
                 patch.replacement = [patch.replacement];
             patches.push(patch);
diff --git a/src/utils/types.ts b/src/utils/types.ts
index fc34b96de..bec7cb0b3 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -36,7 +36,7 @@ export interface PatchReplacement {
 
 export interface Patch {
     plugin: string;
-    find: string | string[];
+    find: string;
     replacement: PatchReplacement | PatchReplacement[];
     /** Whether this patch should apply to multiple modules */
     all?: boolean;
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index 2ce4939b6..db47c875a 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -186,8 +186,7 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
             const executePatch = traceFunction(`patch by ${patch.plugin}`, (match: string | RegExp, replace: string) => code.replace(match, replace));
             if (patch.predicate && !patch.predicate()) continue;
 
-            // we change all patch.find to array in plugins/index
-            if ((patch.find as string[]).every(f => code.includes(f))) {
+            if (code.includes(patch.find)) {
                 patchedBy.add(patch.plugin);
 
                 const previousMod = mod;

From e5bd5534db78103b522ab7f977a45c238492c870 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 14 Apr 2024 01:35:04 +0200
Subject: [PATCH 446/632] Fix SpotifyControls

---
 .../spotifyControls/PlayerComponent.tsx       | 18 ++++-------
 src/plugins/spotifyControls/index.tsx         | 30 +++++++++++++++----
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/plugins/spotifyControls/PlayerComponent.tsx b/src/plugins/spotifyControls/PlayerComponent.tsx
index ae28631c9..105b3b18a 100644
--- a/src/plugins/spotifyControls/PlayerComponent.tsx
+++ b/src/plugins/spotifyControls/PlayerComponent.tsx
@@ -18,7 +18,6 @@
 
 import "./spotifyStyles.css";
 
-import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { ImageIcon, LinkIcon, OpenExternalIcon } from "@components/Icons";
 import { debounce } from "@shared/debounce";
@@ -376,17 +375,10 @@ export function Player() {
     } as React.CSSProperties;
 
     return (
-        <ErrorBoundary fallback={() => (
-            <div className="vc-spotify-fallback">
-                <p>Failed to render Spotify Modal :(</p>
-                <p >Check the console for errors</p>
-            </div>
-        )}>
-            <div id={cl("player")} style={exportTrackImageStyle}>
-                <Info track={track} />
-                <SeekBar />
-                <Controls />
-            </div>
-        </ErrorBoundary>
+        <div id={cl("player")} style={exportTrackImageStyle}>
+            <Info track={track} />
+            <SeekBar />
+            <Controls />
+        </div>
     );
 }
diff --git a/src/plugins/spotifyControls/index.tsx b/src/plugins/spotifyControls/index.tsx
index d7e4f6454..06595892f 100644
--- a/src/plugins/spotifyControls/index.tsx
+++ b/src/plugins/spotifyControls/index.tsx
@@ -18,6 +18,7 @@
 
 import { Settings } from "@api/Settings";
 import { disableStyle, enableStyle } from "@api/Styles";
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 
@@ -49,10 +50,10 @@ export default definePlugin({
         {
             find: "showTaglessAccountPanel:",
             replacement: {
-                // return React.createElement(AccountPanel, { ..., showTaglessAccountPanel: blah })
-                match: /return ?(.{0,30}\(.{1,3},\{[^}]+?,showTaglessAccountPanel:.+?\}\))/,
-                // return [Player, Panel]
-                replace: "return [$self.renderPlayer(),$1]"
+                // react.jsx)(AccountPanel, { ..., showTaglessAccountPanel: blah })
+                match: /(?<=\i\.jsxs?\)\()(\i),{(?=[^}]*?showTaglessAccountPanel:)/,
+                // react.jsx(WrapperComponent, { VencordOriginal: AccountPanel, ...
+                replace: "$self.PanelWrapper,{VencordOriginal:$1,"
             }
         },
         {
@@ -78,6 +79,25 @@ export default definePlugin({
             }
         }
     ],
+
     start: () => toggleHoverControls(Settings.plugins.SpotifyControls.hoverControls),
-    renderPlayer: () => <Player />
+
+    PanelWrapper({ VencordOriginal, ...props }) {
+        return (
+            <>
+                <ErrorBoundary
+                    fallback={() => (
+                        <div className="vc-spotify-fallback">
+                            <p>Failed to render Spotify Modal :(</p>
+                            <p >Check the console for errors</p>
+                        </div>
+                    )}
+                >
+                    <Player />
+                </ErrorBoundary>
+
+                <VencordOriginal {...props} />
+            </>
+        );
+    }
 });

From af7d1b9df2690be27ecd868624fa8e66e9b44044 Mon Sep 17 00:00:00 2001
From: Elvyra <88881326+EdVraz@users.noreply.github.com>
Date: Sun, 14 Apr 2024 01:36:56 +0200
Subject: [PATCH 447/632] fix ShowMeYourName (#2354)

---
 src/plugins/showMeYourName/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx
index 62d0645d2..a9db1af9a 100644
--- a/src/plugins/showMeYourName/index.tsx
+++ b/src/plugins/showMeYourName/index.tsx
@@ -49,7 +49,7 @@ export default definePlugin({
         {
             find: ".useCanSeeRemixBadge)",
             replacement: {
-                match: /(?<=onContextMenu:\i,children:).*?\}/,
+                match: /(?<=onContextMenu:\i,children:).*?\)}/,
                 replace: "$self.renderUsername(arguments[0])}"
             }
         },

From 59fc922aee50233bef91282e67a37e9c2c6d66b6 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Sun, 14 Apr 2024 06:40:27 +0700
Subject: [PATCH 448/632] viewIcons: fix for banners (#2351)

---
 src/plugins/viewIcons/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index 6eb773c28..f71777ad7 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -174,7 +174,7 @@ export default definePlugin({
             find: ".NITRO_BANNER,",
             replacement: {
                 // style: { backgroundImage: shouldShowBanner ? "url(".concat(bannerUrl,
-                match: /style:\{(?=backgroundImage:(\i)\?"url\("\.concat\((\i),)/,
+                match: /style:\{(?=backgroundImage:(null!=\i)\?"url\("\.concat\((\i),)/,
                 replace:
                     // onClick: () => shouldShowBanner && ev.target.style.backgroundImage && openImage(bannerUrl), style: { cursor: shouldShowBanner ? "pointer" : void 0,
                     'onClick:ev=>$1&&ev.target.style.backgroundImage&&$self.openImage($2),style:{cursor:$1?"pointer":void 0,'

From 00427c53d8dbac36584736bd30a376e61b860c78 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 14 Apr 2024 01:50:18 +0200
Subject: [PATCH 449/632] fix pronoundb

---
 src/plugins/pronoundb/index.ts | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/plugins/pronoundb/index.ts b/src/plugins/pronoundb/index.ts
index b1e74158b..61edd191e 100644
--- a/src/plugins/pronoundb/index.ts
+++ b/src/plugins/pronoundb/index.ts
@@ -36,25 +36,24 @@ export default definePlugin({
     authors: [Devs.Tyman, Devs.TheKodeToad, Devs.Ven],
     description: "Adds pronouns to user messages using pronoundb",
     patches: [
-        // Add next to username (compact mode)
         {
             find: "showCommunicationDisabledStyles",
-            replacement: {
-                match: /("span",{id:\i,className:\i,children:\i}\))/,
-                replace: "$1, $self.CompactPronounsChatComponentWrapper(arguments[0])"
-            }
-        },
-        // Patch the chat timestamp element (normal mode)
-        {
-            find: "showCommunicationDisabledStyles",
-            replacement: {
-                match: /(?<=return\s*\(0,\i\.jsxs?\)\(.+!\i&&)(\(0,\i.jsxs?\)\(.+?\{.+?\}\))/,
-                replace: "[$1, $self.PronounsChatComponentWrapper(arguments[0])]"
-            }
+            replacement: [
+                // Add next to username (compact mode)
+                {
+                    match: /("span",{id:\i,className:\i,children:\i}\))/,
+                    replace: "$1, $self.CompactPronounsChatComponentWrapper(arguments[0])"
+                },
+                // Patch the chat timestamp element (normal mode)
+                {
+                    match: /(?<=return\s*\(0,\i\.jsxs?\)\(.+!\i&&)(\(0,\i.jsxs?\)\(.+?\{.+?\}\))/,
+                    replace: "[$1, $self.PronounsChatComponentWrapper(arguments[0])]"
+                }
+            ]
         },
         // Patch the profile popout username header to use our pronoun hook instead of Discord's pronouns
         {
-            find: ".userTagNoNickname",
+            find: ".pronouns,children",
             replacement: [
                 {
                     match: /{user:(\i),[^}]*,pronouns:(\i),[^}]*}=\i;/,

From 99f523b87c04ed422d60ae2862c0962ee24c0386 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 14 Apr 2024 02:12:25 +0200
Subject: [PATCH 450/632] fix extractAndLoadChunks for when there are no chunks
 to be loaded

---
 src/webpack/webpack.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 0790e8bf1..10c7d7ee1 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -406,13 +406,15 @@ export function findExportedComponentLazy<T extends object = any>(...props: stri
     });
 }
 
+const DefaultExtractAndLoadChunksRegex = /(?:Promise\.all\((\[\i\.\i\(".+?"\).+?\])\)|Promise\.resolve\(\)).then\(\i\.bind\(\i,"(.+?)"\)\)/;
+
 /**
  * Extract and load chunks using their entry point
  * @param code An array of all the code the module factory containing the lazy chunk loading must include
  * @param matcher A RegExp that returns the chunk ids array as the first capture group and the entry point id as the second. Defaults to a matcher that captures the lazy chunk loading found in the module factory
  * @returns A promise that resolves when the chunks were loaded
  */
-export async function extractAndLoadChunks(code: string[], matcher: RegExp = /Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\)/) {
+export async function extractAndLoadChunks(code: string[], matcher: RegExp = DefaultExtractAndLoadChunksRegex) {
     const module = findModuleFactory(...code);
     if (!module) {
         const err = new Error("extractAndLoadChunks: Couldn't find module factory");
@@ -434,7 +436,7 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = /Pr
     }
 
     const [, rawChunkIds, entryPointId] = match;
-    if (!rawChunkIds || Number.isNaN(entryPointId)) {
+    if (Number.isNaN(entryPointId)) {
         const err = new Error("extractAndLoadChunks: Matcher didn't return a capturing group with the chunk ids array, or the entry point id returned as the second group wasn't a number");
         logger.warn(err, "Code:", code, "Matcher:", matcher);
 
@@ -445,9 +447,11 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = /Pr
         return;
     }
 
-    const chunkIds = Array.from(rawChunkIds.matchAll(/\("(.+?)"\)/g)).map((m: any) => m[1]);
+    if (rawChunkIds) {
+        const chunkIds = Array.from(rawChunkIds.matchAll(/\("(.+?)"\)/g)).map((m: any) => m[1]);
+        await Promise.all(chunkIds.map(id => wreq.e(id)));
+    }
 
-    await Promise.all(chunkIds.map(id => wreq.e(id)));
     wreq(entryPointId);
 }
 
@@ -459,7 +463,7 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = /Pr
  * @param matcher A RegExp that returns the chunk ids array as the first capture group and the entry point id as the second. Defaults to a matcher that captures the lazy chunk loading found in the module factory
  * @returns A function that returns a promise that resolves when the chunks were loaded, on first call
  */
-export function extractAndLoadChunksLazy(code: string[], matcher: RegExp = /Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\)/) {
+export function extractAndLoadChunksLazy(code: string[], matcher = DefaultExtractAndLoadChunksRegex) {
     if (IS_DEV) lazyWebpackSearchHistory.push(["extractAndLoadChunks", [code, matcher]]);
 
     return () => extractAndLoadChunks(code, matcher);

From 0f5a75aa4bc27af20b47ba3139d3f33f85901bde Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 14 Apr 2024 02:39:04 +0200
Subject: [PATCH 451/632] bump to v1.7.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0f79d21ab..75ef41e50 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.7.5",
+    "version": "1.7.6",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 52f8a85ab9fbc7f802318147c7618391ff8b0e13 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 14 Apr 2024 14:25:05 +0200
Subject: [PATCH 452/632] fix(FavoriteEmojiFirst): don't lower suggestion count
 on hover

---
 src/plugins/favEmojiFirst/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/favEmojiFirst/index.ts b/src/plugins/favEmojiFirst/index.ts
index f34b13884..afc72a1d2 100644
--- a/src/plugins/favEmojiFirst/index.ts
+++ b/src/plugins/favEmojiFirst/index.ts
@@ -83,6 +83,6 @@ export default definePlugin({
             if (!aIsFavorite && bIsFavorite) return 1;
 
             return 0;
-        }).slice(0, query.results.emojis.sliceTo ?? 10);
+        }).slice(0, query.results.emojis.sliceTo ?? Infinity);
     }
 });

From 356a2c290dfcd9a9d757a3d59989ee28ae8b1b49 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Wed, 17 Apr 2024 03:10:15 +0700
Subject: [PATCH 453/632] fix: RoleColorEverywhere, PictureInPicture, NoMosaic
 (#2356)

---
 src/plugins/noMosaic/index.ts             | 69 ++---------------------
 src/plugins/noMosaic/styles.css           |  8 ---
 src/plugins/pictureInPicture/index.tsx    |  6 +-
 src/plugins/roleColorEverywhere/index.tsx |  2 +-
 4 files changed, 10 insertions(+), 75 deletions(-)
 delete mode 100644 src/plugins/noMosaic/styles.css

diff --git a/src/plugins/noMosaic/index.ts b/src/plugins/noMosaic/index.ts
index 802f65e51..4715bde5c 100644
--- a/src/plugins/noMosaic/index.ts
+++ b/src/plugins/noMosaic/index.ts
@@ -5,15 +5,9 @@
  */
 
 import { definePluginSettings } from "@api/Settings";
-import { disableStyle, enableStyle } from "@api/Styles";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 
-import style from "./styles.css?managed";
-
-const MAX_WIDTH = 550;
-const MAX_HEIGHT = 350;
-
 const settings = definePluginSettings({
     inlineVideo: {
         description: "Play videos without carousel modal",
@@ -33,15 +27,11 @@ export default definePlugin({
 
     patches: [
         {
-            find: ".oneByTwoLayoutThreeGrid",
-            replacement: [{
-                match: /mediaLayoutType:\i\.\i\.MOSAIC/,
-                replace: "mediaLayoutType:'RESPONSIVE'",
-            },
-            {
-                match: /null!==\(\i=\i\.get\(\i\)\)&&void 0!==\i\?\i:"INVALID"/,
-                replace: '"INVALID"',
-            }]
+            find: "isGroupableMedia:function()",
+            replacement: {
+                match: /=>"IMAGE"===\i\|\|"VIDEO"===\i;/,
+                replace: "=>false;"
+            }
         },
         {
             find: "renderAttachments(",
@@ -51,52 +41,5 @@ export default definePlugin({
                 replace: "$&$1.content_type?.startsWith('image/')&&"
             }
         },
-        {
-            find: "Messages.REMOVE_ATTACHMENT_TOOLTIP_TEXT",
-            replacement: [{
-                match: /\i===\i\.\i\.MOSAIC/,
-                replace: "true"
-            },
-            {
-                match: /\i!==\i\.\i\.MOSAIC/,
-                replace: "false"
-            }]
-        },
-        {
-            find: ".messageAttachment,",
-            replacement: {
-                match: /\{width:\i,height:\i\}=(\i).*?(?=className:\i\(\)\(\i\.messageAttachment,)/,
-                replace: "$&style:$self.style($1),"
-            }
-        }
-    ],
-
-    style({ width, height }) {
-        if (!width || !height) return {};
-
-        if (width > MAX_WIDTH || height > MAX_HEIGHT) {
-            if (width / height > MAX_WIDTH / MAX_HEIGHT) {
-                height = Math.ceil(MAX_WIDTH / (width / height));
-                width = MAX_WIDTH;
-            } else {
-                width = Math.ceil(MAX_HEIGHT * (width / height));
-                height = MAX_HEIGHT;
-            }
-        }
-
-        return {
-            maxWidth: width,
-            width: "100%",
-            aspectRatio: `${width} / ${height}`
-        };
-
-    },
-
-    start() {
-        enableStyle(style);
-    },
-
-    stop() {
-        disableStyle(style);
-    }
+    ]
 });
diff --git a/src/plugins/noMosaic/styles.css b/src/plugins/noMosaic/styles.css
deleted file mode 100644
index 3a8a8e464..000000000
--- a/src/plugins/noMosaic/styles.css
+++ /dev/null
@@ -1,8 +0,0 @@
-[class^="nonMediaAttachmentsContainer_"] [class*="messageAttachment_"] {
-    position: relative;
-}
-
-[class^="nonMediaAttachmentsContainer_"],
-[class^="nonMediaAttachmentItem_"]:has([class^="messageAttachment_"][style^="max-width"]) {
-    width: 100%;
-}
diff --git a/src/plugins/pictureInPicture/index.tsx b/src/plugins/pictureInPicture/index.tsx
index ca766affc..0a22f06db 100644
--- a/src/plugins/pictureInPicture/index.tsx
+++ b/src/plugins/pictureInPicture/index.tsx
@@ -10,7 +10,7 @@ import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { React, Tooltip } from "@webpack/common";
+import { Tooltip } from "@webpack/common";
 
 const settings = definePluginSettings({
     loop: {
@@ -28,9 +28,9 @@ export default definePlugin({
     settings,
     patches: [
         {
-            find: ".nonMediaAttachment]",
+            find: ".nonMediaMosaicItem]",
             replacement: {
-                match: /\.nonMediaAttachment\]:!(\i).{0,10}children:\[(\S)/,
+                match: /\.nonMediaMosaicItem\]:!(\i).{0,10}children:\[(\S)/,
                 replace: "$&,$1&&$2&&$self.renderPiPButton(),"
             },
         },
diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index b421eb7fa..6d53906f8 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -94,7 +94,7 @@ export default definePlugin({
             find: "renderPrioritySpeaker",
             replacement: [
                 {
-                    match: /renderName\(\).{0,100}speaking:.{50,100}jsx.{5,10}{/,
+                    match: /renderName\(\).{0,100}speaking:.{50,150}"div",{/,
                     replace: "$&...$self.getVoiceProps(this.props),"
                 }
             ],

From 3a79e41d67fd03946d3234c611b3b63e8c0f86c8 Mon Sep 17 00:00:00 2001
From: Elvyra <88881326+EdVraz@users.noreply.github.com>
Date: Tue, 16 Apr 2024 22:11:25 +0200
Subject: [PATCH 454/632] fix MessageLogger (#2358)

---
 src/plugins/messageLogger/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index 8a1e23912..c8b464391 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -337,12 +337,12 @@ export default definePlugin({
         {
             // Attachment renderer
             // Module 96063
-            find: ".removeAttachmentHoverButton",
+            find: ".removeMosaicItemHoverButton",
             group: true,
             replacement: [
                 {
-                    match: /(className:\i,attachment:\i),/,
-                    replace: "$1,attachment: {deleted},"
+                    match: /(className:\i,item:\i),/,
+                    replace: "$1,item: deleted,"
                 },
                 {
                     match: /\[\i\.obscured\]:.+?,/,

From 23b0841cc759999177f1bef579ebb11a46da3375 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 17 Apr 2024 04:44:42 +0200
Subject: [PATCH 455/632] fix ShowConnections

---
 src/plugins/customRPC/index.tsx       | 3 +--
 src/plugins/showConnections/index.tsx | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/plugins/customRPC/index.tsx b/src/plugins/customRPC/index.tsx
index e70f8c908..35fb64d1c 100644
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@@ -27,7 +27,6 @@ import { ApplicationAssetUtils, FluxDispatcher, Forms, GuildStore, React, Select
 
 const ActivityComponent = findComponentByCodeLazy("onOpenGameProfile");
 const ActivityClassName = findByPropsLazy("activity", "buttonColor");
-const Colors = findByPropsLazy("profileColors");
 
 async function getApplicationAsset(key: string): Promise<string> {
     if (/https?:\/\/(cdn|media)\.discordapp\.(com|net)\/attachments\//.test(key)) return "mp:" + key.replace(/https?:\/\/(cdn|media)\.discordapp\.(com|net)\//, "");
@@ -406,7 +405,7 @@ export default definePlugin({
                     If you want to use image link, download your image and reupload the image to <Link href="https://imgur.com">Imgur</Link> and get the image link by right-clicking the image and select "Copy image address".
                 </Forms.FormText>
                 <Forms.FormDivider />
-                <div style={{ width: "284px" }} className={Colors.profileColors}>
+                <div style={{ width: "284px" }}>
                     {activity[0] && <ActivityComponent activity={activity[0]} className={ActivityClassName.activity} channelId={SelectedChannelStore.getChannelId()}
                         guild={GuildStore.getGuild(SelectedGuildStore.getLastSelectedGuildId())}
                         application={{ id: settings.store.appID }}
diff --git a/src/plugins/showConnections/index.tsx b/src/plugins/showConnections/index.tsx
index 83600e867..ca6122927 100644
--- a/src/plugins/showConnections/index.tsx
+++ b/src/plugins/showConnections/index.tsx
@@ -35,7 +35,7 @@ const Section = findComponentByCodeLazy(".lastSection", "children:");
 const ThemeStore = findStoreLazy("ThemeStore");
 const platformHooks: { useLegacyPlatformType(platform: string): string; } = findByPropsLazy("useLegacyPlatformType");
 const platforms: { get(type: string): ConnectionPlatform; } = findByPropsLazy("isSupported", "getByUrl");
-const getTheme: (user: User, displayProfile: any) => any = findByCodeLazy(',"--profile-gradient-primary-color"');
+const getTheme: (user: User, displayProfile: any) => any = findByCodeLazy('--profile-gradient-primary-color":');
 
 const enum Spacing {
     COMPACT,

From 538b87062a9f45ab88e4acb54e33ef0e48159be8 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 17 Apr 2024 04:44:56 +0200
Subject: [PATCH 456/632] bump to v1.7.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 75ef41e50..723a40cb0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.7.6",
+    "version": "1.7.7",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 89c82e2cd173b26b0eee938022afad5684e174cd Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 17 Apr 2024 23:42:56 +0200
Subject: [PATCH 457/632] fix settings patch

---
 src/plugins/_core/settings.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index 569c3f0ac..1aea0d6ee 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -45,14 +45,14 @@ export default definePlugin({
         replacement: {
             get match() {
                 switch (Settings.plugins.Settings.settingsLocation) {
-                    case "top": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.USER_SETTINGS\}/;
-                    case "aboveNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.BILLING_SETTINGS\}/;
-                    case "belowNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.APP_SETTINGS\}/;
+                    case "top": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.USER_SETTINGS/;
+                    case "aboveNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.BILLING_SETTINGS/;
+                    case "belowNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.APP_SETTINGS/;
                     case "belowActivity": return /(?<=\{section:(\i\.\i)\.DIVIDER},)\{section:"changelog"/;
                     case "bottom": return /\{section:(\i\.\i)\.CUSTOM,\s*element:.+?}/;
                     case "aboveActivity":
                     default:
-                        return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.ACTIVITY_SETTINGS\}/;
+                        return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.ACTIVITY_SETTINGS/;
                 }
             },
             replace: "...$self.makeSettingsCategories($1),$&"

From 0c6ddf80e8e90b33e89684b61e73710a28a99019 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 18 Apr 2024 00:26:09 +0200
Subject: [PATCH 458/632] ShowConnections: fix icon theme logic

---
 src/plugins/showConnections/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/showConnections/index.tsx b/src/plugins/showConnections/index.tsx
index ca6122927..d70c09315 100644
--- a/src/plugins/showConnections/index.tsx
+++ b/src/plugins/showConnections/index.tsx
@@ -35,7 +35,7 @@ const Section = findComponentByCodeLazy(".lastSection", "children:");
 const ThemeStore = findStoreLazy("ThemeStore");
 const platformHooks: { useLegacyPlatformType(platform: string): string; } = findByPropsLazy("useLegacyPlatformType");
 const platforms: { get(type: string): ConnectionPlatform; } = findByPropsLazy("isSupported", "getByUrl");
-const getTheme: (user: User, displayProfile: any) => any = findByCodeLazy('--profile-gradient-primary-color":');
+const getProfileThemeProps = findByCodeLazy(".getPreviewThemeColors", "primaryColor:");
 
 const enum Spacing {
     COMPACT,
@@ -74,8 +74,8 @@ interface ConnectionPlatform {
     icon: { lightSVG: string, darkSVG: string; };
 }
 
-const profilePopoutComponent = ErrorBoundary.wrap(({ user, displayProfile }: { user: User, displayProfile; }) =>
-    <ConnectionsComponent id={user.id} theme={getTheme(user, displayProfile).profileTheme} />
+const profilePopoutComponent = ErrorBoundary.wrap((props: { user: User, displayProfile; }) =>
+    <ConnectionsComponent id={props.user.id} theme={getProfileThemeProps(props).theme} />
 );
 
 const profilePanelComponent = ErrorBoundary.wrap(({ id }: { id: string; }) =>

From 82d914e62f76e2cc81dc812d0e6f249d293b983f Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 18 Apr 2024 00:40:09 +0200
Subject: [PATCH 459/632] CustomRPC: fix preview styles

---
 src/plugins/customRPC/index.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/customRPC/index.tsx b/src/plugins/customRPC/index.tsx
index 35fb64d1c..334372e38 100644
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@@ -22,9 +22,10 @@ import { Devs } from "@utils/constants";
 import { isTruthy } from "@utils/guards";
 import { useAwaiter } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
+import { findByCodeLazy, findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import { ApplicationAssetUtils, FluxDispatcher, Forms, GuildStore, React, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common";
 
+const useProfileThemeStyle = findByCodeLazy("profileThemeStyle:", "--profile-gradient-primary-color");
 const ActivityComponent = findComponentByCodeLazy("onOpenGameProfile");
 const ActivityClassName = findByPropsLazy("activity", "buttonColor");
 
@@ -392,6 +393,8 @@ export default definePlugin({
 
     settingsAboutComponent: () => {
         const activity = useAwaiter(createActivity);
+        const { profileThemeStyle } = useProfileThemeStyle({});
+
         return (
             <>
                 <Forms.FormText>
@@ -405,7 +408,7 @@ export default definePlugin({
                     If you want to use image link, download your image and reupload the image to <Link href="https://imgur.com">Imgur</Link> and get the image link by right-clicking the image and select "Copy image address".
                 </Forms.FormText>
                 <Forms.FormDivider />
-                <div style={{ width: "284px" }}>
+                <div style={{ width: "284px", ...profileThemeStyle }}>
                     {activity[0] && <ActivityComponent activity={activity[0]} className={ActivityClassName.activity} channelId={SelectedChannelStore.getChannelId()}
                         guild={GuildStore.getGuild(SelectedGuildStore.getLastSelectedGuildId())}
                         application={{ id: settings.store.appID }}

From 97ce410f57cdb58007d6eccc6665b5c4877fffcb Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 18 Apr 2024 00:53:28 +0200
Subject: [PATCH 460/632] bump to v1.7.8

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 723a40cb0..776affcda 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.7.7",
+    "version": "1.7.8",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 5aa19bbf49839c31f4a15fa96994c3fb2ce22e31 Mon Sep 17 00:00:00 2001
From: Elvyra <88881326+EdVraz@users.noreply.github.com>
Date: Sat, 20 Apr 2024 11:18:03 +0200
Subject: [PATCH 461/632] fix ValidUser (#2369)

---
 src/plugins/validUser/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/validUser/index.tsx b/src/plugins/validUser/index.tsx
index b0c77cb46..dafa7bc98 100644
--- a/src/plugins/validUser/index.tsx
+++ b/src/plugins/validUser/index.tsx
@@ -111,7 +111,7 @@ function MentionWrapper({ data, UserMention, RoleMention, parse, props }: Mentio
 
 export default definePlugin({
     name: "ValidUser",
-    description: "Fix mentions for unknown users showing up as '<@343383572805058560>' (hover over a mention to fix it)",
+    description: "Fix mentions for unknown users showing up as '@unknown-user' (hover over a mention to fix it)",
     authors: [Devs.Ven],
     tags: ["MentionCacheFix"],
 
@@ -119,7 +119,7 @@ export default definePlugin({
         find: 'className:"mention"',
         replacement: {
             // mention = { react: function (data, parse, props) { if (data.userId == null) return RoleMention() else return UserMention()
-            match: /react(?=\(\i,\i,\i\).{0,50}return null==\i\?\(0,\i\.jsx\)\((\i\.\i),.+?jsx\)\((\i\.\i),\{className:"mention")/,
+            match: /react(?=\(\i,\i,\i\).{0,50}return null==.{0,70}\?\(0,\i\.jsx\)\((\i\.\i),.+?jsx\)\((\i\.\i),\{className:"mention")/,
             // react: (...args) => OurWrapper(RoleMention, UserMention, ...args), originalReact: theirFunc
             replace: "react:(...args)=>$self.renderMention($1,$2,...args),originalReact"
         }

From 87ef214810e561cd37649d3b4eec4dbbbd7e018d Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 20 Apr 2024 11:29:15 +0200
Subject: [PATCH 462/632] RoleColorEverywhere: fix chat mentions

---
 src/plugins/roleColorEverywhere/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index 6d53906f8..71c291fef 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -50,7 +50,7 @@ export default definePlugin({
     patches: [
         // Chat Mentions
         {
-            find: "CLYDE_AI_MENTION_COLOR:null,",
+            find: 'location:"UserMention',
             replacement: [
                 {
                     match: /user:(\i),channel:(\i).{0,400}?"@"\.concat\(.+?\)/,

From 74df53e7c8d81abf77ca67ab7432a5a8bfc8e4f6 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 20 Apr 2024 11:37:22 +0200
Subject: [PATCH 463/632] ValidUser: fix not working for @unknown-user mentions

---
 src/plugins/validUser/index.tsx | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/plugins/validUser/index.tsx b/src/plugins/validUser/index.tsx
index dafa7bc98..d3decd941 100644
--- a/src/plugins/validUser/index.tsx
+++ b/src/plugins/validUser/index.tsx
@@ -115,15 +115,24 @@ export default definePlugin({
     authors: [Devs.Ven],
     tags: ["MentionCacheFix"],
 
-    patches: [{
-        find: 'className:"mention"',
-        replacement: {
-            // mention = { react: function (data, parse, props) { if (data.userId == null) return RoleMention() else return UserMention()
-            match: /react(?=\(\i,\i,\i\).{0,50}return null==.{0,70}\?\(0,\i\.jsx\)\((\i\.\i),.+?jsx\)\((\i\.\i),\{className:"mention")/,
-            // react: (...args) => OurWrapper(RoleMention, UserMention, ...args), originalReact: theirFunc
-            replace: "react:(...args)=>$self.renderMention($1,$2,...args),originalReact"
+    patches: [
+        {
+            find: 'className:"mention"',
+            replacement: {
+                // mention = { react: function (data, parse, props) { if (data.userId == null) return RoleMention() else return UserMention()
+                match: /react(?=\(\i,\i,\i\).{0,50}return null==.{0,70}\?\(0,\i\.jsx\)\((\i\.\i),.+?jsx\)\((\i\.\i),\{className:"mention")/,
+                // react: (...args) => OurWrapper(RoleMention, UserMention, ...args), originalReact: theirFunc
+                replace: "react:(...args)=>$self.renderMention($1,$2,...args),originalReact"
+            }
+        },
+        {
+            find: "unknownUserMentionPlaceholder:",
+            replacement: {
+                match: /unknownUserMentionPlaceholder:/,
+                replace: "$&false&&"
+            }
         }
-    }],
+    ],
 
     renderMention(RoleMention, UserMention, data, parse, props) {
         return (

From 0bebc85b0dc08c9345210499dc9d24dd14c64ac0 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 20 Apr 2024 11:50:28 +0200
Subject: [PATCH 464/632] fix FriendsSince on canary

---
 src/plugins/friendsSince/index.tsx | 16 +++++++++++++---
 src/webpack/webpack.ts             |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/plugins/friendsSince/index.tsx b/src/plugins/friendsSince/index.tsx
index dd37137a4..69d8e739d 100644
--- a/src/plugins/friendsSince/index.tsx
+++ b/src/plugins/friendsSince/index.tsx
@@ -7,12 +7,22 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { getCurrentChannel } from "@utils/discord";
+import { makeLazy } from "@utils/lazy";
 import definePlugin from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { filters, find, findByPropsLazy, handleModuleNotFound } from "@webpack";
 import { React, RelationshipStore } from "@webpack/common";
 
 const { Heading, Text } = findByPropsLazy("Heading", "Text");
-const container = findByPropsLazy("memberSinceContainer");
+// Workaround for module differing on stable & canary
+// FIXME: remove once merged into stable
+const getMemberSinceContainer = makeLazy(() => {
+    for (const name of ["memberSinceWrapper", "memberSinceContainer"]) {
+        const mod = find(filters.byProps(name), { isIndirect: true });
+        if (mod) return mod[name];
+    }
+    handleModuleNotFound("findByProps", "memberSinceWrapper/memberSinceContainer");
+    return "";
+});
 const { getCreatedAtDate } = findByPropsLazy("getCreatedAtDate");
 const clydeMoreInfo = findByPropsLazy("clydeMoreInfo");
 const locale = findByPropsLazy("getLocale");
@@ -49,7 +59,7 @@ export default definePlugin({
                     Friends Since
                 </Heading>
 
-                <div className={container.memberSinceContainer}>
+                <div className={getMemberSinceContainer()}>
                     {!!getCurrentChannel()?.guild_id && (
                         <svg
                             aria-hidden="true"
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 10c7d7ee1..564da4813 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -92,7 +92,7 @@ if (IS_DEV && IS_DISCORD_DESKTOP) {
     }, 0);
 }
 
-function handleModuleNotFound(method: string, ...filter: unknown[]) {
+export function handleModuleNotFound(method: string, ...filter: unknown[]) {
     const err = new Error(`webpack.${method} found no module`);
     logger.error(err, "Filter:", filter);
 

From 8f73b9fd5f50e46b5fb60131b77f4c7c752bfd2e Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 20 Apr 2024 14:51:33 +0200
Subject: [PATCH 465/632] Make Updater slightly more future proof

- Removes the option to disable update notifications. Users really should not be outdated, so this option was never good. To disable notifications, turn on auto update
- Enables auto update by default. Users keep complaining about issues while being outdated, so this should help
- Update Notification now opens Updater in a modal to remove dependency on Settings patch. This makes it slightly more failsafe, it's unlikely that both modals and our settings patch break
---
 src/Vencord.ts                                | 20 ++++-----
 src/api/Settings.ts                           |  4 +-
 src/components/VencordSettings/UpdaterTab.tsx | 41 ++++++++++++-------
 .../VencordSettings/settingsStyles.css        |  8 ++++
 src/components/VencordSettings/shared.tsx     |  6 +--
 5 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/src/Vencord.ts b/src/Vencord.ts
index 29e965fa0..655e76c3d 100644
--- a/src/Vencord.ts
+++ b/src/Vencord.ts
@@ -27,6 +27,7 @@ export { PlainSettings, Settings };
 import "./utils/quickCss";
 import "./webpack/patchWebpack";
 
+import { openUpdaterModal } from "@components/VencordSettings/UpdaterTab";
 import { StartAt } from "@utils/types";
 
 import { get as dsGet } from "./api/DataStore";
@@ -85,7 +86,7 @@ async function init() {
 
     syncSettings();
 
-    if (!IS_WEB) {
+    if (!IS_WEB && !IS_UPDATER_DISABLED) {
         try {
             const isOutdated = await checkForUpdates();
             if (!isOutdated) return;
@@ -103,16 +104,13 @@ async function init() {
                 return;
             }
 
-            if (Settings.notifyAboutUpdates)
-                setTimeout(() => showNotification({
-                    title: "A Vencord update is available!",
-                    body: "Click here to view the update",
-                    permanent: true,
-                    noPersist: true,
-                    onClick() {
-                        SettingsRouter.open("VencordUpdater");
-                    }
-                }), 10_000);
+            setTimeout(() => showNotification({
+                title: "A Vencord update is available!",
+                body: "Click here to view the update",
+                permanent: true,
+                noPersist: true,
+                onClick: openUpdaterModal!
+            }), 10_000);
         } catch (err) {
             UpdateLogger.error("Failed to check for updates", err);
         }
diff --git a/src/api/Settings.ts b/src/api/Settings.ts
index 0b7975300..696c12c28 100644
--- a/src/api/Settings.ts
+++ b/src/api/Settings.ts
@@ -29,7 +29,6 @@ import plugins from "~plugins";
 
 const logger = new Logger("Settings");
 export interface Settings {
-    notifyAboutUpdates: boolean;
     autoUpdate: boolean;
     autoUpdateNotification: boolean,
     useQuickCss: boolean;
@@ -78,8 +77,7 @@ export interface Settings {
 }
 
 const DefaultSettings: Settings = {
-    notifyAboutUpdates: true,
-    autoUpdate: false,
+    autoUpdate: true,
     autoUpdateNotification: true,
     useQuickCss: true,
     themeLinks: [],
diff --git a/src/components/VencordSettings/UpdaterTab.tsx b/src/components/VencordSettings/UpdaterTab.tsx
index 0a5d1f149..680e262d8 100644
--- a/src/components/VencordSettings/UpdaterTab.tsx
+++ b/src/components/VencordSettings/UpdaterTab.tsx
@@ -22,6 +22,7 @@ import { Flex } from "@components/Flex";
 import { Link } from "@components/Link";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
+import { ModalCloseButton, ModalContent, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { relaunch } from "@utils/native";
 import { useAwaiter } from "@utils/react";
 import { changes, checkForUpdates, getRepo, isNewer, update, updateError, UpdateLogger } from "@utils/updater";
@@ -29,7 +30,7 @@ import { Alerts, Button, Card, Forms, Parser, React, Switch, Toasts } from "@web
 
 import gitHash from "~git-hash";
 
-import { SettingsTab, wrapTab } from "./shared";
+import { handleSettingsTabError, SettingsTab, wrapTab } from "./shared";
 
 function withDispatcher(dispatcher: React.Dispatch<React.SetStateAction<boolean>>, action: () => any) {
     return async () => {
@@ -38,21 +39,24 @@ function withDispatcher(dispatcher: React.Dispatch<React.SetStateAction<boolean>
             await action();
         } catch (e: any) {
             UpdateLogger.error("Failed to update", e);
+
+            let err: string;
             if (!e) {
-                var err = "An unknown error occurred (error is undefined).\nPlease try again.";
+                err = "An unknown error occurred (error is undefined).\nPlease try again.";
             } else if (e.code && e.cmd) {
                 const { code, path, cmd, stderr } = e;
 
                 if (code === "ENOENT")
-                    var err = `Command \`${path}\` not found.\nPlease install it and try again`;
+                    err = `Command \`${path}\` not found.\nPlease install it and try again`;
                 else {
-                    var err = `An error occurred while running \`${cmd}\`:\n`;
+                    err = `An error occurred while running \`${cmd}\`:\n`;
                     err += stderr || `Code \`${code}\`. See the console for more info`;
                 }
 
             } else {
-                var err = "An unknown error occurred. See the console for more info.";
+                err = "An unknown error occurred. See the console for more info.";
             }
+
             Alerts.show({
                 title: "Oops!",
                 body: (
@@ -186,7 +190,7 @@ function Newer(props: CommonProps) {
 }
 
 function Updater() {
-    const settings = useSettings(["notifyAboutUpdates", "autoUpdate", "autoUpdateNotification"]);
+    const settings = useSettings(["autoUpdate", "autoUpdateNotification"]);
 
     const [repo, err, repoPending] = useAwaiter(getRepo, { fallbackValue: "Loading..." });
 
@@ -203,14 +207,6 @@ function Updater() {
     return (
         <SettingsTab title="Vencord Updater">
             <Forms.FormTitle tag="h5">Updater Settings</Forms.FormTitle>
-            <Switch
-                value={settings.notifyAboutUpdates}
-                onChange={(v: boolean) => settings.notifyAboutUpdates = v}
-                note="Shows a notification on startup"
-                disabled={settings.autoUpdate}
-            >
-                Get notified about new updates
-            </Switch>
             <Switch
                 value={settings.autoUpdate}
                 onChange={(v: boolean) => settings.autoUpdate = v}
@@ -253,3 +249,20 @@ function Updater() {
 }
 
 export default IS_UPDATER_DISABLED ? null : wrapTab(Updater, "Updater");
+
+export const openUpdaterModal = IS_UPDATER_DISABLED ? null : function () {
+    const UpdaterTab = wrapTab(Updater, "Updater");
+
+    try {
+        openModal(wrapTab((modalProps: ModalProps) => (
+            <ModalRoot {...modalProps} size={ModalSize.MEDIUM}>
+                <ModalContent className="vc-updater-modal">
+                    <ModalCloseButton onClick={modalProps.onClose} className="vc-updater-modal-close-button" />
+                    <UpdaterTab />
+                </ModalContent>
+            </ModalRoot>
+        ), "UpdaterModal"));
+    } catch {
+        handleSettingsTabError();
+    }
+};
diff --git a/src/components/VencordSettings/settingsStyles.css b/src/components/VencordSettings/settingsStyles.css
index 01cbcd557..310dba9af 100644
--- a/src/components/VencordSettings/settingsStyles.css
+++ b/src/components/VencordSettings/settingsStyles.css
@@ -65,3 +65,11 @@
     /* discord also sets cursor: default which prevents the cursor from showing as text */
     cursor: initial;
 }
+
+.vc-updater-modal {
+    padding: 1.5em !important;
+}
+
+.vc-updater-modal-close-button {
+    float: right;
+}
diff --git a/src/components/VencordSettings/shared.tsx b/src/components/VencordSettings/shared.tsx
index 6dd34c46f..1c5f37d82 100644
--- a/src/components/VencordSettings/shared.tsx
+++ b/src/components/VencordSettings/shared.tsx
@@ -42,11 +42,11 @@ export function SettingsTab({ title, children }: PropsWithChildren<{ title: stri
     );
 }
 
-const onError = onlyOnce(handleComponentFailed);
+export const handleSettingsTabError = onlyOnce(handleComponentFailed);
 
-export function wrapTab(component: ComponentType, tab: string) {
+export function wrapTab(component: ComponentType<any>, tab: string) {
     return ErrorBoundary.wrap(component, {
         message: `Failed to render the ${tab} tab. If this issue persists, try using the installer to reinstall!`,
-        onError,
+        onError: handleSettingsTabError,
     });
 }

From af67ddefa14edb896d63afe026d4736ebf954169 Mon Sep 17 00:00:00 2001
From: dolfies <jeyalfie47@gmail.com>
Date: Mon, 22 Apr 2024 19:46:11 -0400
Subject: [PATCH 466/632] ShowTimeouts->ShowHiddenThings ~show invite-disabled
 tooltip too (#2375)

---
 src/plugins/showHiddenThings/README.md        | 11 +++++++
 .../index.ts                                  | 32 +++++++++++++++++--
 2 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 src/plugins/showHiddenThings/README.md
 rename src/plugins/{showTimeouts => showHiddenThings}/index.ts (51%)

diff --git a/src/plugins/showHiddenThings/README.md b/src/plugins/showHiddenThings/README.md
new file mode 100644
index 000000000..b41e2d94d
--- /dev/null
+++ b/src/plugins/showHiddenThings/README.md
@@ -0,0 +1,11 @@
+# ShowHiddenThings
+
+Displays various moderator-only elements regardless of permissions.
+
+## Features
+
+- Show member timeout icons in chat
+![](https://github.com/Vendicated/Vencord/assets/47677887/75e1f6ba-8921-4188-9c2d-c9c3f9d07101)
+
+- Show the invites paused tooltip in the server list
+![](https://github.com/Vendicated/Vencord/assets/47677887/b6a923d2-ac55-40d9-b4f8-fa6fc117148b)
diff --git a/src/plugins/showTimeouts/index.ts b/src/plugins/showHiddenThings/index.ts
similarity index 51%
rename from src/plugins/showTimeouts/index.ts
rename to src/plugins/showHiddenThings/index.ts
index b0774bed4..e7be929bf 100644
--- a/src/plugins/showTimeouts/index.ts
+++ b/src/plugins/showHiddenThings/index.ts
@@ -16,20 +16,46 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { definePluginSettings, migratePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 
+const settings = definePluginSettings({
+    showTimeouts: {
+        type: OptionType.BOOLEAN,
+        description: "Show member timeout icons in chat.",
+        default: true,
+    },
+    showInvitesPaused: {
+        type: OptionType.BOOLEAN,
+        description: "Show the invites paused tooltip in the server list.",
+        default: true,
+    },
+});
+
+migratePluginSettings("ShowHiddenThings", "ShowTimeouts");
 export default definePlugin({
-    name: "ShowTimeouts",
-    description: "Display member timeout icons in chat regardless of permissions.",
+    name: "ShowHiddenThings",
+    tags: ["ShowTimeouts", "ShowInvitesPaused"],
+    description: "Displays various moderator-only elements regardless of permissions.",
     authors: [Devs.Dolfies],
     patches: [
         {
             find: "showCommunicationDisabledStyles",
+            predicate: () => settings.store.showTimeouts,
             replacement: {
                 match: /&&\i\.\i\.canManageUser\(\i\.\i\.MODERATE_MEMBERS,\i\.author,\i\)/,
                 replace: "",
             },
         },
+        {
+            find: "useShouldShowInvitesDisabledNotif:",
+            predicate: () => settings.store.showInvitesPaused,
+            replacement: {
+                match: /\i\.\i\.can\(\i\.Permissions.MANAGE_GUILD,\i\)/,
+                replace: "true",
+            },
+        }
     ],
+    settings,
 });

From 5cf014cb06c759d2af643a00272a10e2816d5d4e Mon Sep 17 00:00:00 2001
From: Amia <9750071+aamiaa@users.noreply.github.com>
Date: Tue, 23 Apr 2024 23:06:19 +0200
Subject: [PATCH 467/632] New Plugin: BetterSessions (#1324)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/betterSessions/README.md          |   5 +
 .../components/RenameButton.tsx               |  37 +++
 .../betterSessions/components/RenameModal.tsx |  94 ++++++++
 .../betterSessions/components/icons.tsx       | 106 ++++++++
 src/plugins/betterSessions/index.tsx          | 227 ++++++++++++++++++
 src/plugins/betterSessions/types.ts           |  32 +++
 src/plugins/betterSessions/utils.ts           |  90 +++++++
 7 files changed, 591 insertions(+)
 create mode 100644 src/plugins/betterSessions/README.md
 create mode 100644 src/plugins/betterSessions/components/RenameButton.tsx
 create mode 100644 src/plugins/betterSessions/components/RenameModal.tsx
 create mode 100644 src/plugins/betterSessions/components/icons.tsx
 create mode 100644 src/plugins/betterSessions/index.tsx
 create mode 100644 src/plugins/betterSessions/types.ts
 create mode 100644 src/plugins/betterSessions/utils.ts

diff --git a/src/plugins/betterSessions/README.md b/src/plugins/betterSessions/README.md
new file mode 100644
index 000000000..cf13e6c50
--- /dev/null
+++ b/src/plugins/betterSessions/README.md
@@ -0,0 +1,5 @@
+# BetterSessions
+
+Enhances the sessions (devices) menu. Allows you to view exact timestamps, give each session a custom name, and receive notifications about new sessions.
+
+![](https://github.com/Vendicated/Vencord/assets/9750071/4a44b617-bb8f-4dcb-93f1-b7d2575ed3d8)
diff --git a/src/plugins/betterSessions/components/RenameButton.tsx b/src/plugins/betterSessions/components/RenameButton.tsx
new file mode 100644
index 000000000..a0c95a6f4
--- /dev/null
+++ b/src/plugins/betterSessions/components/RenameButton.tsx
@@ -0,0 +1,37 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { openModal } from "@utils/modal";
+import { Button } from "@webpack/common";
+
+import { SessionInfo } from "../types";
+import { RenameModal } from "./RenameModal";
+
+export function RenameButton({ session, state }: { session: SessionInfo["session"], state: [string, React.Dispatch<React.SetStateAction<string>>]; }) {
+    return (
+        <Button
+            look={Button.Looks.LINK}
+            color={Button.Colors.LINK}
+            size={Button.Sizes.NONE}
+            style={{
+                paddingTop: "0px",
+                paddingBottom: "0px",
+                top: "-2px"
+            }}
+            onClick={() =>
+                openModal(props => (
+                    <RenameModal
+                        props={props}
+                        session={session}
+                        state={state}
+                    />
+                ))
+            }
+        >
+            Rename
+        </Button>
+    );
+}
diff --git a/src/plugins/betterSessions/components/RenameModal.tsx b/src/plugins/betterSessions/components/RenameModal.tsx
new file mode 100644
index 000000000..1c5783c0e
--- /dev/null
+++ b/src/plugins/betterSessions/components/RenameModal.tsx
@@ -0,0 +1,94 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot } from "@utils/modal";
+import { Button, Forms, React, TextInput } from "@webpack/common";
+import { KeyboardEvent } from "react";
+
+import { SessionInfo } from "../types";
+import { getDefaultName, savedSessionsCache, saveSessionsToDataStore } from "../utils";
+
+export function RenameModal({ props, session, state }: { props: ModalProps, session: SessionInfo["session"], state: [string, React.Dispatch<React.SetStateAction<string>>]; }) {
+    const [title, setTitle] = state;
+    const [value, setValue] = React.useState(savedSessionsCache.get(session.id_hash)?.name ?? "");
+
+    function onSaveClick() {
+        savedSessionsCache.set(session.id_hash, { name: value, isNew: false });
+        if (value !== "") {
+            setTitle(`${value}*`);
+        } else {
+            setTitle(getDefaultName(session.client_info));
+        }
+
+        saveSessionsToDataStore();
+        props.onClose();
+    }
+
+    return (
+        <ModalRoot {...props}>
+            <ModalHeader>
+                <Forms.FormTitle tag="h4">Rename</Forms.FormTitle>
+            </ModalHeader>
+
+            <ModalContent>
+                <Forms.FormTitle tag="h5" style={{ marginTop: "10px" }}>New device name</Forms.FormTitle>
+                <TextInput
+                    style={{ marginBottom: "10px" }}
+                    placeholder={getDefaultName(session.client_info)}
+                    value={value}
+                    onChange={setValue}
+                    onKeyDown={(e: KeyboardEvent<HTMLInputElement>) => {
+                        if (e.key === "Enter") {
+                            onSaveClick();
+                        }
+                    }}
+                />
+                <Button
+                    style={{
+                        marginBottom: "20px",
+                        paddingLeft: "1px",
+                        paddingRight: "1px",
+                        opacity: 0.6
+                    }}
+                    look={Button.Looks.LINK}
+                    color={Button.Colors.LINK}
+                    size={Button.Sizes.NONE}
+                    onClick={() => setValue("")}
+                >
+                    Reset Name
+                </Button>
+            </ModalContent>
+
+            <ModalFooter>
+                <Button
+                    color={Button.Colors.BRAND}
+                    onClick={onSaveClick}
+                >
+                    Save
+                </Button>
+                <Button
+                    color={Button.Colors.TRANSPARENT}
+                    look={Button.Looks.LINK}
+                    onClick={() => props.onClose()}
+                >
+                    Cancel
+                </Button>
+            </ModalFooter>
+        </ModalRoot >
+    );
+}
diff --git a/src/plugins/betterSessions/components/icons.tsx b/src/plugins/betterSessions/components/icons.tsx
new file mode 100644
index 000000000..bd745e76c
--- /dev/null
+++ b/src/plugins/betterSessions/components/icons.tsx
@@ -0,0 +1,106 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { LazyComponent } from "@utils/react";
+import { findByCode } from "@webpack";
+import { SVGProps } from "react";
+
+export const DiscordIcon = (props: React.PropsWithChildren<SVGProps<SVGSVGElement>>) => (
+    <svg
+        {...props}
+        fill="currentColor"
+        viewBox="0 0 16 16"
+    >
+        <path d="M13.545 2.907a13.227 13.227 0 0 0-3.257-1.011.05.05 0 0 0-.052.025c-.141.25-.297.577-.406.833a12.19 12.19 0 0 0-3.658 0 8.258 8.258 0 0 0-.412-.833.051.051 0 0 0-.052-.025c-1.125.194-2.22.534-3.257 1.011a.041.041 0 0 0-.021.018C.356 6.024-.213 9.047.066 12.032c.001.014.01.028.021.037a13.276 13.276 0 0 0 3.995 2.02.05.05 0 0 0 .056-.019c.308-.42.582-.863.818-1.329a.05.05 0 0 0-.01-.059.051.051 0 0 0-.018-.011 8.875 8.875 0 0 1-1.248-.595.05.05 0 0 1-.02-.066.051.051 0 0 1 .015-.019c.084-.063.168-.129.248-.195a.05.05 0 0 1 .051-.007c2.619 1.196 5.454 1.196 8.041 0a.052.052 0 0 1 .053.007c.08.066.164.132.248.195a.051.051 0 0 1-.004.085 8.254 8.254 0 0 1-1.249.594.05.05 0 0 0-.03.03.052.052 0 0 0 .003.041c.24.465.515.909.817 1.329a.05.05 0 0 0 .056.019 13.235 13.235 0 0 0 4.001-2.02.049.049 0 0 0 .021-.037c.334-3.451-.559-6.449-2.366-9.106a.034.034 0 0 0-.02-.019Zm-8.198 7.307c-.789 0-1.438-.724-1.438-1.612 0-.889.637-1.613 1.438-1.613.807 0 1.45.73 1.438 1.613 0 .888-.637 1.612-1.438 1.612Zm5.316 0c-.788 0-1.438-.724-1.438-1.612 0-.889.637-1.613 1.438-1.613.807 0 1.451.73 1.438 1.613 0 .888-.631 1.612-1.438 1.612Z" />
+    </svg>
+);
+
+export const ChromeIcon = (props: React.PropsWithChildren<SVGProps<SVGSVGElement>>) => (
+    <svg
+        {...props}
+        fill="currentColor"
+        viewBox="0 0 512 512"
+    >
+        <path d="M188.8,255.93A67.2,67.2,0,1,0,256,188.75,67.38,67.38,0,0,0,188.8,255.93Z" />
+        <path d="M476.75,217.79s0,0,0,.05a206.63,206.63,0,0,0-7-28.84h-.11a202.16,202.16,0,0,1,7.07,29h0a203.5,203.5,0,0,0-7.07-29H314.24c19.05,17,31.36,40.17,31.36,67.05a86.55,86.55,0,0,1-12.31,44.73L231,478.45a2.44,2.44,0,0,1,0,.27V479h0v-.26A224,224,0,0,0,256,480c6.84,0,13.61-.39,20.3-1a222.91,222.91,0,0,0,29.78-4.74C405.68,451.52,480,362.4,480,255.94A225.25,225.25,0,0,0,476.75,217.79Z" />
+        <path d="M256,345.5c-33.6,0-61.6-17.91-77.29-44.79L76,123.05l-.14-.24A224,224,0,0,0,207.4,474.55l0-.05,77.69-134.6A84.13,84.13,0,0,1,256,345.5Z" />
+        <path d="M91.29,104.57l77.35,133.25A89.19,89.19,0,0,1,256,166H461.17a246.51,246.51,0,0,0-25.78-43.94l.12.08A245.26,245.26,0,0,1,461.17,166h.17a245.91,245.91,0,0,0-25.66-44,2.63,2.63,0,0,1-.35-.26A223.93,223.93,0,0,0,91.14,104.34l.14.24Z" />
+    </svg>
+);
+
+export const EdgeIcon = (props: React.PropsWithChildren<SVGProps<SVGSVGElement>>) => (
+    <svg
+        {...props}
+        fill="currentColor"
+        viewBox="0 0 24 24"
+    >
+        <path d="M21.86 17.86q.14 0 .25.12.1.13.1.25t-.11.33l-.32.46-.43.53-.44.5q-.21.25-.38.42l-.22.23q-.58.53-1.34 1.04-.76.51-1.6.91-.86.4-1.74.64t-1.67.24q-.9 0-1.69-.28-.8-.28-1.48-.78-.68-.5-1.22-1.17-.53-.66-.92-1.44-.38-.77-.58-1.6-.2-.83-.2-1.67 0-1 .32-1.96.33-.97.87-1.8.14.95.55 1.77.41.82 1.02 1.5.6.68 1.38 1.21.78.54 1.64.9.86.36 1.77.56.92.2 1.8.2 1.12 0 2.18-.24 1.06-.23 2.06-.72l.2-.1.2-.05zm-15.5-1.27q0 1.1.27 2.15.27 1.06.78 2.03.51.96 1.24 1.77.74.82 1.66 1.4-1.47-.2-2.8-.74-1.33-.55-2.48-1.37-1.15-.83-2.08-1.9-.92-1.07-1.58-2.33T.36 14.94Q0 13.54 0 12.06q0-.81.32-1.49.31-.68.83-1.23.53-.55 1.2-.96.66-.4 1.35-.66.74-.27 1.5-.39.78-.12 1.55-.12.7 0 1.42.1.72.12 1.4.35.68.23 1.32.57.63.35 1.16.83-.35 0-.7.07-.33.07-.65.23v-.02q-.63.28-1.2.74-.57.46-1.05 1.04-.48.58-.87 1.26-.38.67-.65 1.39-.27.71-.42 1.44-.15.72-.15 1.38zM11.96.06q1.7 0 3.33.39 1.63.38 3.07 1.15 1.43.77 2.62 1.93 1.18 1.16 1.98 2.7.49.94.76 1.96.28 1 .28 2.08 0 .89-.23 1.7-.24.8-.69 1.48-.45.68-1.1 1.22-.64.53-1.45.88-.54.24-1.11.36-.58.13-1.16.13-.42 0-.97-.03-.54-.03-1.1-.12-.55-.1-1.05-.28-.5-.19-.84-.5-.12-.09-.23-.24-.1-.16-.1-.33 0-.15.16-.35.16-.2.35-.5.2-.28.36-.68.16-.4.16-.95 0-1.06-.4-1.96-.4-.91-1.06-1.64-.66-.74-1.52-1.28-.86-.55-1.79-.89-.84-.3-1.72-.44-.87-.14-1.76-.14-1.55 0-3.06.45T.94 7.55q.71-1.74 1.81-3.13 1.1-1.38 2.52-2.35Q6.68 1.1 8.37.58q1.7-.52 3.58-.52Z" />
+    </svg>
+);
+
+export const FirefoxIcon = (props: React.PropsWithChildren<SVGProps<SVGSVGElement>>) => (
+    <svg
+        {...props}
+        fill="currentColor"
+        viewBox="0 0 512 512"
+    >
+        <path d="M130.22 127.548C130.38 127.558 130.3 127.558 130.22 127.548V127.548ZM481.64 172.898C471.03 147.398 449.56 119.898 432.7 111.168C446.42 138.058 454.37 165.048 457.4 185.168C457.405 185.306 457.422 185.443 457.45 185.578C429.87 116.828 383.098 89.1089 344.9 28.7479C329.908 5.05792 333.976 3.51792 331.82 4.08792L331.7 4.15792C284.99 30.1109 256.365 82.5289 249.12 126.898C232.503 127.771 216.219 131.895 201.19 139.035C199.838 139.649 198.736 140.706 198.066 142.031C197.396 143.356 197.199 144.87 197.506 146.323C197.7 147.162 198.068 147.951 198.586 148.639C199.103 149.327 199.76 149.899 200.512 150.318C201.264 150.737 202.096 150.993 202.954 151.071C203.811 151.148 204.676 151.045 205.491 150.768L206.011 150.558C221.511 143.255 238.408 139.393 255.541 139.238C318.369 138.669 352.698 183.262 363.161 201.528C350.161 192.378 326.811 183.338 304.341 187.248C392.081 231.108 368.541 381.784 246.951 376.448C187.487 373.838 149.881 325.467 146.421 285.648C146.421 285.648 157.671 243.698 227.041 243.698C234.541 243.698 255.971 222.778 256.371 216.698C256.281 214.698 213.836 197.822 197.281 181.518C188.434 172.805 184.229 168.611 180.511 165.458C178.499 163.75 176.392 162.158 174.201 160.688C168.638 141.231 168.399 120.638 173.51 101.058C148.45 112.468 128.96 130.508 114.8 146.428H114.68C105.01 134.178 105.68 93.7779 106.25 85.3479C106.13 84.8179 99.022 89.0159 98.1 89.6579C89.5342 95.7103 81.5528 102.55 74.26 110.088C57.969 126.688 30.128 160.242 18.76 211.318C14.224 231.701 12 255.739 12 263.618C12 398.318 121.21 507.508 255.92 507.508C376.56 507.508 478.939 420.281 496.35 304.888C507.922 228.192 481.64 173.82 481.64 172.898Z" />
+    </svg>
+);
+
+export const IEIcon = (props: React.PropsWithChildren<SVGProps<SVGSVGElement>>) => (
+    <svg
+        {...props}
+        fill="currentColor"
+        viewBox="0 0 512 512"
+    >
+        <path d="M483.049 159.706c10.855-24.575 21.424-60.438 21.424-87.871 0-72.722-79.641-98.371-209.673-38.577-107.632-7.181-211.221 73.67-237.098 186.457 30.852-34.862 78.271-82.298 121.977-101.158C125.404 166.85 79.128 228.002 43.992 291.725 23.246 329.651 0 390.94 0 436.747c0 98.575 92.854 86.5 180.251 42.006 31.423 15.43 66.559 15.573 101.695 15.573 97.124 0 184.249-54.294 216.814-146.022H377.927c-52.509 88.593-196.819 52.996-196.819-47.436H509.9c6.407-43.581-1.655-95.715-26.851-141.162zM64.559 346.877c17.711 51.15 53.703 95.871 100.266 123.304-88.741 48.94-173.267 29.096-100.266-123.304zm115.977-108.873c2-55.151 50.276-94.871 103.98-94.871 53.418 0 101.981 39.72 103.981 94.871H180.536zm184.536-187.6c21.425-10.287 48.563-22.003 72.558-22.003 31.422 0 54.274 21.717 54.274 53.722 0 20.003-7.427 49.007-14.569 67.867-26.28-42.292-65.986-81.584-112.263-99.586z" />
+    </svg>
+);
+
+export const OperaIcon = (props: React.PropsWithChildren<SVGProps<SVGSVGElement>>) => (
+    <svg
+        {...props}
+        fill="currentColor"
+        viewBox="0 0 496 512"
+    >
+        <path d="M313.9 32.7c-170.2 0-252.6 223.8-147.5 355.1 36.5 45.4 88.6 75.6 147.5 75.6 36.3 0 70.3-11.1 99.4-30.4-43.8 39.2-101.9 63-165.3 63-3.9 0-8 0-11.9-.3C104.6 489.6 0 381.1 0 248 0 111 111 0 248 0h.8c63.1.3 120.7 24.1 164.4 63.1-29-19.4-63.1-30.4-99.3-30.4zm101.8 397.7c-40.9 24.7-90.7 23.6-132-5.8 56.2-20.5 97.7-91.6 97.7-176.6 0-84.7-41.2-155.8-97.4-176.6 41.8-29.2 91.2-30.3 132.9-5 105.9 98.7 105.5 265.7-1.2 364z" />
+    </svg>
+);
+
+export const SafariIcon = (props: React.PropsWithChildren<SVGProps<SVGSVGElement>>) => (
+    <svg
+        {...props}
+        fill="currentColor"
+        viewBox="0 0 512 512"
+    >
+        <path d="M274.69,274.69l-37.38-37.38L166,346ZM256,8C119,8,8,119,8,256S119,504,256,504,504,393,504,256,393,8,256,8ZM411.85,182.79l14.78-6.13A8,8,0,0,1,437.08,181h0a8,8,0,0,1-4.33,10.46L418,197.57a8,8,0,0,1-10.45-4.33h0A8,8,0,0,1,411.85,182.79ZM314.43,94l6.12-14.78A8,8,0,0,1,331,74.92h0a8,8,0,0,1,4.33,10.45l-6.13,14.78a8,8,0,0,1-10.45,4.33h0A8,8,0,0,1,314.43,94ZM256,60h0a8,8,0,0,1,8,8V84a8,8,0,0,1-8,8h0a8,8,0,0,1-8-8V68A8,8,0,0,1,256,60ZM181,74.92a8,8,0,0,1,10.46,4.33L197.57,94a8,8,0,1,1-14.78,6.12l-6.13-14.78A8,8,0,0,1,181,74.92Zm-63.58,42.49h0a8,8,0,0,1,11.31,0L140,128.72A8,8,0,0,1,140,140h0a8,8,0,0,1-11.31,0l-11.31-11.31A8,8,0,0,1,117.41,117.41ZM60,256h0a8,8,0,0,1,8-8H84a8,8,0,0,1,8,8h0a8,8,0,0,1-8,8H68A8,8,0,0,1,60,256Zm40.15,73.21-14.78,6.13A8,8,0,0,1,74.92,331h0a8,8,0,0,1,4.33-10.46L94,314.43a8,8,0,0,1,10.45,4.33h0A8,8,0,0,1,100.15,329.21Zm4.33-136h0A8,8,0,0,1,94,197.57l-14.78-6.12A8,8,0,0,1,74.92,181h0a8,8,0,0,1,10.45-4.33l14.78,6.13A8,8,0,0,1,104.48,193.24ZM197.57,418l-6.12,14.78a8,8,0,0,1-14.79-6.12l6.13-14.78A8,8,0,1,1,197.57,418ZM264,444a8,8,0,0,1-8,8h0a8,8,0,0,1-8-8V428a8,8,0,0,1,8-8h0a8,8,0,0,1,8,8Zm67-6.92h0a8,8,0,0,1-10.46-4.33L314.43,418a8,8,0,0,1,4.33-10.45h0a8,8,0,0,1,10.45,4.33l6.13,14.78A8,8,0,0,1,331,437.08Zm63.58-42.49h0a8,8,0,0,1-11.31,0L372,383.28A8,8,0,0,1,372,372h0a8,8,0,0,1,11.31,0l11.31,11.31A8,8,0,0,1,394.59,394.59ZM286.25,286.25,110.34,401.66,225.75,225.75,401.66,110.34ZM437.08,331h0a8,8,0,0,1-10.45,4.33l-14.78-6.13a8,8,0,0,1-4.33-10.45h0A8,8,0,0,1,418,314.43l14.78,6.12A8,8,0,0,1,437.08,331ZM444,264H428a8,8,0,0,1-8-8h0a8,8,0,0,1,8-8h16a8,8,0,0,1,8,8h0A8,8,0,0,1,444,264Z" />
+    </svg>
+);
+
+export const UnknownIcon = (props: React.PropsWithChildren<SVGProps<SVGSVGElement>>) => (
+    <svg
+        {...props}
+        fill="currentColor"
+        viewBox="0 0 16 16"
+    >
+        <path fill-rule="evenodd" d="M4.475 5.458c-.284 0-.514-.237-.47-.517C4.28 3.24 5.576 2 7.825 2c2.25 0 3.767 1.36 3.767 3.215 0 1.344-.665 2.288-1.79 2.973-1.1.659-1.414 1.118-1.414 2.01v.03a.5.5 0 0 1-.5.5h-.77a.5.5 0 0 1-.5-.495l-.003-.2c-.043-1.221.477-2.001 1.645-2.712 1.03-.632 1.397-1.135 1.397-2.028 0-.979-.758-1.698-1.926-1.698-1.009 0-1.71.529-1.938 1.402-.066.254-.278.461-.54.461h-.777ZM7.496 14c.622 0 1.095-.474 1.095-1.09 0-.618-.473-1.092-1.095-1.092-.606 0-1.087.474-1.087 1.091S6.89 14 7.496 14Z" />
+    </svg>
+);
+
+export const MobileIcon = LazyComponent(() => findByCode("M15.5 1h-8C6.12 1 5 2.12 5 3.5v17C5 21.88 6.12 23 7.5 23h8c1.38"));
diff --git a/src/plugins/betterSessions/index.tsx b/src/plugins/betterSessions/index.tsx
new file mode 100644
index 000000000..bb79870d2
--- /dev/null
+++ b/src/plugins/betterSessions/index.tsx
@@ -0,0 +1,227 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { showNotification } from "@api/Notifications";
+import { definePluginSettings } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByPropsLazy, findExportedComponentLazy } from "@webpack";
+import { React, RestAPI, Tooltip } from "@webpack/common";
+
+import { RenameButton } from "./components/RenameButton";
+import { Session, SessionInfo } from "./types";
+import { fetchNamesFromDataStore, getDefaultName, GetOsColor, GetPlatformIcon, savedSessionsCache, saveSessionsToDataStore } from "./utils";
+
+const AuthSessionsStore = findByPropsLazy("getSessions");
+const UserSettingsModal = findByPropsLazy("saveAccountChanges", "open");
+
+const TimestampClasses = findByPropsLazy("timestampTooltip", "blockquoteContainer");
+const SessionIconClasses = findByPropsLazy("sessionIcon");
+
+const BlobMask = findExportedComponentLazy("BlobMask");
+
+const settings = definePluginSettings({
+    backgroundCheck: {
+        type: OptionType.BOOLEAN,
+        description: "Check for new sessions in the background, and display notifications when they are detected",
+        default: false,
+        restartNeeded: true
+    },
+    checkInterval: {
+        description: "How often to check for new sessions in the background (if enabled), in minutes",
+        type: OptionType.NUMBER,
+        default: 20,
+        restartNeeded: true
+    }
+});
+
+export default definePlugin({
+    name: "BetterSessions",
+    description: "Enhances the sessions (devices) menu. Allows you to view exact timestamps, give each session a custom name, and receive notifications about new sessions.",
+    authors: [Devs.amia],
+
+    settings: settings,
+
+    patches: [
+        {
+            find: "Messages.AUTH_SESSIONS_SESSION_LOG_OUT",
+            replacement: [
+                // Replace children with a single label with state
+                {
+                    match: /({variant:"eyebrow",className:\i\.sessionInfoRow,children:).{70,110}{children:"\\xb7"}\),\(0,\i\.\i\)\("span",{children:\i\[\d+\]}\)\]}\)\]/,
+                    replace: "$1$self.renderName(arguments[0])"
+                },
+                {
+                    match: /({variant:"text-sm\/medium",className:\i\.sessionInfoRow,children:.{70,110}{children:"\\xb7"}\),\(0,\i\.\i\)\("span",{children:)(\i\[\d+\])}/,
+                    replace: "$1$self.renderTimestamp({ ...arguments[0], timeLabel: $2 })}"
+                },
+                // Replace the icon
+                {
+                    match: /\.currentSession:null\),children:\[(?<=,icon:(\i)\}.+?)/,
+                    replace: "$& $self.renderIcon({ ...arguments[0], DeviceIcon: $1 }), false &&"
+                }
+            ]
+        },
+        {
+            // Add the ability to change BlobMask's lower badge height
+            // (it allows changing width so we can mirror that logic)
+            find: "this.getBadgePositionInterpolation(",
+            replacement: {
+                match: /(\i\.animated\.rect,{id:\i,x:48-\(\i\+8\)\+4,y:)28(,width:\i\+8,height:)24,/,
+                replace: (_, leftPart, rightPart) => `${leftPart} 48 - ((this.props.lowerBadgeHeight ?? 16) + 8) + 4 ${rightPart} (this.props.lowerBadgeHeight ?? 16) + 8,`
+            }
+        }
+    ],
+
+    renderName: ErrorBoundary.wrap(({ session }: SessionInfo) => {
+        const savedSession = savedSessionsCache.get(session.id_hash);
+
+        const state = React.useState(savedSession?.name ? `${savedSession.name}*` : getDefaultName(session.client_info));
+        const [title, setTitle] = state;
+
+        // Show a "NEW" badge if the session is seen for the first time
+        return (
+            <>
+                <span>{title}</span>
+                {(savedSession == null || savedSession.isNew) && (
+                    <div
+                        className="vc-plugins-badge"
+                        style={{
+                            backgroundColor: "#ED4245",
+                            marginLeft: "2px"
+                        }}
+                    >
+                        NEW
+                    </div>
+                )}
+                <RenameButton session={session} state={state} />
+            </>
+        );
+    }, { noop: true }),
+
+    renderTimestamp: ErrorBoundary.wrap(({ session, timeLabel }: { session: Session, timeLabel: string; }) => {
+        return (
+            <Tooltip text={session.approx_last_used_time.toLocaleString()} tooltipClassName={TimestampClasses.timestampTooltip}>
+                {props => (
+                    <span {...props} className={TimestampClasses.timestamp}>
+                        {timeLabel}
+                    </span>
+                )}
+            </Tooltip>
+        );
+    }, { noop: true }),
+
+    renderIcon: ErrorBoundary.wrap(({ session, DeviceIcon }: { session: Session, DeviceIcon: React.ComponentType<any>; }) => {
+        const PlatformIcon = GetPlatformIcon(session.client_info.platform);
+
+        return (
+            <BlobMask
+                style={{ cursor: "unset" }}
+                selected={false}
+                lowerBadge={
+                    <div
+                        style={{
+                            width: "20px",
+                            height: "20px",
+
+                            display: "flex",
+                            justifyContent: "center",
+                            alignItems: "center",
+                            overflow: "hidden",
+
+                            borderRadius: "50%",
+                            backgroundColor: "var(--interactive-normal)",
+                            color: "var(--background-secondary)",
+                        }}
+                    >
+                        <PlatformIcon width={14} height={14} />
+                    </div>
+                }
+                lowerBadgeWidth={20}
+                lowerBadgeHeight={20}
+            >
+                <div
+                    className={SessionIconClasses.sessionIcon}
+                    style={{ backgroundColor: GetOsColor(session.client_info.os) }}
+                >
+                    <DeviceIcon width={28} height={28} />
+                </div>
+            </BlobMask>
+        );
+    }, { noop: true }),
+
+    async checkNewSessions() {
+        const data = await RestAPI.get({
+            url: "/auth/sessions"
+        });
+
+        for (const session of data.body.user_sessions) {
+            if (savedSessionsCache.has(session.id_hash)) continue;
+
+            savedSessionsCache.set(session.id_hash, { name: "", isNew: true });
+            showNotification({
+                title: "BetterSessions",
+                body: `New session:\n${session.client_info.os} · ${session.client_info.platform} · ${session.client_info.location}`,
+                permanent: true,
+                onClick: () => UserSettingsModal.open("Sessions")
+            });
+        }
+
+        saveSessionsToDataStore();
+    },
+
+    flux: {
+        USER_SETTINGS_ACCOUNT_RESET_AND_CLOSE_FORM() {
+            const lastFetchedHashes: string[] = AuthSessionsStore.getSessions().map((session: SessionInfo["session"]) => session.id_hash);
+
+            // Add new sessions to cache
+            lastFetchedHashes.forEach(idHash => {
+                if (!savedSessionsCache.has(idHash)) savedSessionsCache.set(idHash, { name: "", isNew: false });
+            });
+
+            // Delete removed sessions from cache
+            if (lastFetchedHashes.length > 0) {
+                savedSessionsCache.forEach((_, idHash) => {
+                    if (!lastFetchedHashes.includes(idHash)) savedSessionsCache.delete(idHash);
+                });
+            }
+
+            // Dismiss the "NEW" badge of all sessions.
+            // Since the only way for a session to be marked as "NEW" is going to the Devices tab,
+            // closing the settings means they've been viewed and are no longer considered new.
+            savedSessionsCache.forEach(data => {
+                data.isNew = false;
+            });
+            saveSessionsToDataStore();
+        }
+    },
+
+    async start() {
+        await fetchNamesFromDataStore();
+
+        this.checkNewSessions();
+        if (settings.store.backgroundCheck) {
+            this.checkInterval = setInterval(this.checkNewSessions, settings.store.checkInterval * 60 * 1000);
+        }
+    },
+
+    stop() {
+        clearInterval(this.checkInterval);
+    }
+});
diff --git a/src/plugins/betterSessions/types.ts b/src/plugins/betterSessions/types.ts
new file mode 100644
index 000000000..9026d5313
--- /dev/null
+++ b/src/plugins/betterSessions/types.ts
@@ -0,0 +1,32 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+export interface SessionInfo {
+    session: {
+        id_hash: string;
+        approx_last_used_time: Date;
+        client_info: {
+            os: string;
+            platform: string;
+            location: string;
+        };
+    },
+    current?: boolean;
+}
+
+export type Session = SessionInfo["session"];
diff --git a/src/plugins/betterSessions/utils.ts b/src/plugins/betterSessions/utils.ts
new file mode 100644
index 000000000..3015dc47c
--- /dev/null
+++ b/src/plugins/betterSessions/utils.ts
@@ -0,0 +1,90 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { DataStore } from "@api/index";
+import { UserStore } from "@webpack/common";
+
+import { ChromeIcon, DiscordIcon, EdgeIcon, FirefoxIcon, IEIcon, MobileIcon, OperaIcon, SafariIcon, UnknownIcon } from "./components/icons";
+import { SessionInfo } from "./types";
+
+const getDataKey = () => `BetterSessions_savedSessions_${UserStore.getCurrentUser().id}`;
+
+export const savedSessionsCache: Map<string, { name: string, isNew: boolean; }> = new Map();
+
+export function getDefaultName(clientInfo: SessionInfo["session"]["client_info"]) {
+    return `${clientInfo.os} · ${clientInfo.platform}`;
+}
+
+export function saveSessionsToDataStore() {
+    return DataStore.set(getDataKey(), savedSessionsCache);
+}
+
+export async function fetchNamesFromDataStore() {
+    const savedSessions = await DataStore.get<Map<string, { name: string, isNew: boolean; }>>(getDataKey()) || new Map();
+    savedSessions.forEach((data, idHash) => {
+        savedSessionsCache.set(idHash, data);
+    });
+}
+
+export function GetOsColor(os: string) {
+    switch (os) {
+        case "Windows Mobile":
+        case "Windows":
+            return "#55a6ef"; // Light blue
+        case "Linux":
+            return "#cdcd31"; // Yellow
+        case "Android":
+            return "#7bc958"; // Green
+        case "Mac OS X":
+        case "iOS":
+            return ""; // Default to white/black (theme-dependent)
+        default:
+            return "#f3799a"; // Pink
+    }
+}
+
+export function GetPlatformIcon(platform: string) {
+    switch (platform) {
+        case "Discord Android":
+        case "Discord iOS":
+        case "Discord Client":
+            return DiscordIcon;
+        case "Android Chrome":
+        case "Chrome iOS":
+        case "Chrome":
+            return ChromeIcon;
+        case "Edge":
+            return EdgeIcon;
+        case "Firefox":
+            return FirefoxIcon;
+        case "Internet Explorer":
+            return IEIcon;
+        case "Opera Mini":
+        case "Opera":
+            return OperaIcon;
+        case "Mobile Safari":
+        case "Safari":
+            return SafariIcon;
+        case "BlackBerry":
+        case "Facebook Mobile":
+        case "Android Mobile":
+            return MobileIcon;
+        default:
+            return UnknownIcon;
+    }
+}

From 7f0e7dd02bd241f9999da77642189868164b6e54 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 24 Apr 2024 05:23:50 +0200
Subject: [PATCH 468/632] fix FakeProfileThemes

---
 src/plugins/fakeProfileThemes/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/fakeProfileThemes/index.tsx b/src/plugins/fakeProfileThemes/index.tsx
index c61437269..a1b629d10 100644
--- a/src/plugins/fakeProfileThemes/index.tsx
+++ b/src/plugins/fakeProfileThemes/index.tsx
@@ -92,8 +92,9 @@ export default definePlugin({
                 match: /(?<=getUserProfile\(\i\){return )(\i\[\i\])/,
                 replace: "$self.colorDecodeHook($1)"
             }
-        }, {
-            find: ".USER_SETTINGS_PROFILE_THEME_ACCENT",
+        },
+        {
+            find: ".USER_SETTINGS_RESET_PROFILE_THEME",
             replacement: {
                 match: /RESET_PROFILE_THEME}\)(?<=color:(\i),.{0,500}?color:(\i),.{0,500}?)/,
                 replace: "$&,$self.addCopy3y3Button({primary:$1,accent:$2})"

From d5f70070efed3a6c2f481ffe4abce3c5ad45e57b Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 24 Apr 2024 05:27:14 +0200
Subject: [PATCH 469/632] fix badges

---
 src/plugins/_api/badges.tsx          | 2 +-
 src/plugins/betterSessions/index.tsx | 4 ++--
 src/utils/constants.ts               | 8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/plugins/_api/badges.tsx b/src/plugins/_api/badges.tsx
index 16b244a19..6b1a79cd5 100644
--- a/src/plugins/_api/badges.tsx
+++ b/src/plugins/_api/badges.tsx
@@ -65,7 +65,7 @@ export default definePlugin({
     patches: [
         /* Patch the badge list component on user profiles */
         {
-            find: "Messages.PROFILE_USER_BADGES,role:",
+            find: 'id:"premium",',
             replacement: [
                 {
                     match: /&&(\i)\.push\(\{id:"premium".+?\}\);/,
diff --git a/src/plugins/betterSessions/index.tsx b/src/plugins/betterSessions/index.tsx
index bb79870d2..539508f80 100644
--- a/src/plugins/betterSessions/index.tsx
+++ b/src/plugins/betterSessions/index.tsx
@@ -21,14 +21,14 @@ import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findExportedComponentLazy } from "@webpack";
+import { findByPropsLazy, findExportedComponentLazy, findStoreLazy } from "@webpack";
 import { React, RestAPI, Tooltip } from "@webpack/common";
 
 import { RenameButton } from "./components/RenameButton";
 import { Session, SessionInfo } from "./types";
 import { fetchNamesFromDataStore, getDefaultName, GetOsColor, GetPlatformIcon, savedSessionsCache, saveSessionsToDataStore } from "./utils";
 
-const AuthSessionsStore = findByPropsLazy("getSessions");
+const AuthSessionsStore = findStoreLazy("AuthSessionsStore");
 const UserSettingsModal = findByPropsLazy("saveAccountChanges", "open");
 
 const TimestampClasses = findByPropsLazy("timestampTooltip", "blockquoteContainer");
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 3098e29d0..917fabf43 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -437,6 +437,14 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     Byron: {
         name: "byeoon",
         id: 1167275288036655133n
+    },
+    Kaitlyn: {
+        name: "kaitlyn",
+        id: 306158896630988801n
+    },
+    PolisanTheEasyNick: {
+        name: "Oleh Polisan",
+        id: 242305263313485825n
     }
 } satisfies Record<string, Dev>);
 

From 6a69701b54107cbb696615949ba0594a097bf010 Mon Sep 17 00:00:00 2001
From: My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com>
Date: Tue, 23 Apr 2024 23:30:23 -0400
Subject: [PATCH 470/632] fix ValidUser (#2381)

---
 src/plugins/validUser/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/validUser/index.tsx b/src/plugins/validUser/index.tsx
index d3decd941..2fce693e8 100644
--- a/src/plugins/validUser/index.tsx
+++ b/src/plugins/validUser/index.tsx
@@ -120,7 +120,7 @@ export default definePlugin({
             find: 'className:"mention"',
             replacement: {
                 // mention = { react: function (data, parse, props) { if (data.userId == null) return RoleMention() else return UserMention()
-                match: /react(?=\(\i,\i,\i\).{0,50}return null==.{0,70}\?\(0,\i\.jsx\)\((\i\.\i),.+?jsx\)\((\i\.\i),\{className:"mention")/,
+                match: /react(?=\(\i,\i,\i\).{0,100}return null==.{0,70}\?\(0,\i\.jsx\)\((\i\.\i),.+?jsx\)\((\i\.\i),\{className:"mention")/,
                 // react: (...args) => OurWrapper(RoleMention, UserMention, ...args), originalReact: theirFunc
                 replace: "react:(...args)=>$self.renderMention($1,$2,...args),originalReact"
             }

From d55205c55ad9ffa82fa03837ebb4eae623d28705 Mon Sep 17 00:00:00 2001
From: dolfies <jeyalfie47@gmail.com>
Date: Tue, 23 Apr 2024 23:41:53 -0400
Subject: [PATCH 471/632] feat(plugin): ImplicitRelationships (#947)

Co-authored-by: Angelos Bouklis <53124886+ArjixWasTaken@users.noreply.github.com>
Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/implicitRelationships/README.md |   7 +
 src/plugins/implicitRelationships/index.ts  | 182 ++++++++++++++++++++
 src/plugins/sortFriendRequests/index.tsx    |   2 +-
 3 files changed, 190 insertions(+), 1 deletion(-)
 create mode 100644 src/plugins/implicitRelationships/README.md
 create mode 100644 src/plugins/implicitRelationships/index.ts

diff --git a/src/plugins/implicitRelationships/README.md b/src/plugins/implicitRelationships/README.md
new file mode 100644
index 000000000..a76e298f7
--- /dev/null
+++ b/src/plugins/implicitRelationships/README.md
@@ -0,0 +1,7 @@
+# ImplicitRelationships
+
+Shows your implicit relationships in the Friends tab.
+
+Implicit relationships on Discord are people with whom you've frecently interacted and share a mutual server; even though Discord thinks you should be friends with them, you haven't added them as friends.
+
+![](https://camo.githubusercontent.com/6927161ee0c933f7ef6d61f243cca3e6ea4c8db9d1becd8cbf73c45e1bd0d127/68747470733a2f2f692e646f6c66692e65732f7055447859464662674d2e706e673f6b65793d736e3950343936416c32444c7072)
diff --git a/src/plugins/implicitRelationships/index.ts b/src/plugins/implicitRelationships/index.ts
new file mode 100644
index 000000000..9ae9fb512
--- /dev/null
+++ b/src/plugins/implicitRelationships/index.ts
@@ -0,0 +1,182 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByProps, findStoreLazy } from "@webpack";
+import { ChannelStore, FluxDispatcher, GuildStore, RelationshipStore, SnowflakeUtils, UserStore } from "@webpack/common";
+import { Settings } from "Vencord";
+
+const UserAffinitiesStore = findStoreLazy("UserAffinitiesStore");
+
+interface UserAffinity {
+    user_id: string;
+    affinity: number;
+}
+
+export default definePlugin({
+    name: "ImplicitRelationships",
+    description: "Shows your implicit relationships in the Friends tab.",
+    authors: [Devs.Dolfies],
+    patches: [
+        // Counts header
+        {
+            find: ".FRIENDS_ALL_HEADER",
+            replacement: {
+                match: /toString\(\)\}\);case (\i\.\i)\.BLOCKED/,
+                replace: 'toString()});case $1.IMPLICIT:return "Implicit — "+arguments[1];case $1.BLOCKED'
+            },
+        },
+        // No friends page
+        {
+            find: "FriendsEmptyState: Invalid empty state",
+            replacement: {
+                match: /case (\i\.\i)\.ONLINE:(?=return (\i)\.SECTION_ONLINE)/,
+                replace: "case $1.ONLINE:case $1.IMPLICIT:"
+            },
+        },
+        // Sections header
+        {
+            find: ".FRIENDS_SECTION_ONLINE",
+            replacement: {
+                match: /(\(0,\i\.jsx\)\(\i\.TabBar\.Item,\{id:\i\.\i)\.BLOCKED,className:([^\s]+?)\.item,children:\i\.\i\.Messages\.BLOCKED\}\)/,
+                replace: "$1.IMPLICIT,className:$2.item,children:\"Implicit\"}),$&"
+            },
+        },
+        // Sections content
+        {
+            find: '"FriendsStore"',
+            replacement: {
+                match: /(?<=case (\i\.\i)\.BLOCKED:return (\i)\.type===\i\.\i\.BLOCKED)/,
+                replace: ";case $1.IMPLICIT:return $2.type===5"
+            },
+        },
+        // Piggyback relationship fetch
+        {
+            find: ".fetchRelationships()",
+            replacement: {
+                match: /(\i\.\i)\.fetchRelationships\(\)/,
+                // This relationship fetch is actually completely useless, but whatevs
+                replace: "$1.fetchRelationships(),$self.fetchImplicitRelationships()"
+            },
+        },
+        // Modify sort -- thanks megu for the patch (from sortFriendRequests)
+        {
+            find: "getRelationshipCounts(){",
+            replacement: {
+                predicate: () => Settings.plugins.ImplicitRelationships.sortByAffinity,
+                match: /\.sortBy\(\i=>\i\.comparator\)/,
+                replace: "$&.sortBy((row) => $self.sortList(row))"
+            }
+        },
+
+        // Add support for the nonce parameter to Discord's shitcode
+        {
+            find: ".REQUEST_GUILD_MEMBERS",
+            replacement: {
+                match: /\.send\(8,{/,
+                replace: "$&nonce:arguments[1].nonce,"
+            }
+        },
+        {
+            find: "GUILD_MEMBERS_REQUEST:",
+            replacement: {
+                match: /presences:!!(\i)\.presences/,
+                replace: "$&,nonce:$1.nonce"
+            },
+        },
+        {
+            find: ".not_found",
+            replacement: {
+                match: /notFound:(\i)\.not_found/,
+                replace: "$&,nonce:$1.nonce"
+            },
+        }
+    ],
+    settings: definePluginSettings(
+        {
+            sortByAffinity: {
+                type: OptionType.BOOLEAN,
+                default: true,
+                description: "Whether to sort implicit relationships by their affinity to you.",
+                restartNeeded: true
+            },
+        }
+    ),
+
+    sortList(row: any) {
+        return row.type === 5
+            ? -UserAffinitiesStore.getUserAffinity(row.user.id)?.affinity ?? 0
+            : row.comparator;
+    },
+
+    async fetchImplicitRelationships() {
+        // Implicit relationships are defined as users that you:
+        // 1. Have an affinity for
+        // 2. Do not have a relationship with // TODO: Check how this works with pending/blocked relationships
+        // 3. Have a mutual guild with
+        const userAffinities: Set<string> = UserAffinitiesStore.getUserAffinitiesUserIds();
+        const nonFriendAffinities = Array.from(userAffinities).filter(
+            id => !RelationshipStore.getRelationshipType(id)
+        );
+
+        // I would love to just check user cache here (falling back to the gateway of course)
+        // However, users in user cache may just be there because they share a DM or group DM with you
+        // So there's no guarantee that a user being in user cache means they have a mutual with you
+        // To get around this, we request users we have DMs with, and ignore them below if we don't get them back
+        const dmUserIds = new Set(
+            Object.values(ChannelStore.getSortedPrivateChannels()).flatMap(c => c.recipients)
+        );
+        const toRequest = nonFriendAffinities.filter(id => !UserStore.getUser(id) || dmUserIds.has(id));
+        const allGuildIds = Object.keys(GuildStore.getGuilds());
+        const sentNonce = SnowflakeUtils.fromTimestamp(Date.now());
+        let count = allGuildIds.length * Math.ceil(toRequest.length / 100);
+
+        // OP 8 Request Guild Members allows 100 user IDs at a time
+        const ignore = new Set(toRequest);
+        const relationships = RelationshipStore.getRelationships();
+        const callback = ({ nonce, members }) => {
+            if (nonce !== sentNonce) return;
+            members.forEach(member => {
+                ignore.delete(member.user.id);
+            });
+
+            nonFriendAffinities.map(id => UserStore.getUser(id)).filter(user => user && !ignore.has(user.id)).forEach(user => relationships[user.id] = 5);
+            RelationshipStore.emitChange();
+            if (--count === 0) {
+                FluxDispatcher.unsubscribe("GUILD_MEMBERS_CHUNK", callback);
+            }
+        };
+
+        FluxDispatcher.subscribe("GUILD_MEMBERS_CHUNK", callback);
+        for (let i = 0; i < toRequest.length; i += 100) {
+            FluxDispatcher.dispatch({
+                type: "GUILD_MEMBERS_REQUEST",
+                guildIds: allGuildIds,
+                userIds: toRequest.slice(i, i + 100),
+                nonce: sentNonce,
+            });
+        }
+    },
+
+    start() {
+        const { FriendsSections } = findByProps("FriendsSections");
+        FriendsSections.IMPLICIT = "IMPLICIT";
+    }
+});
diff --git a/src/plugins/sortFriendRequests/index.tsx b/src/plugins/sortFriendRequests/index.tsx
index c40a18140..32579a803 100644
--- a/src/plugins/sortFriendRequests/index.tsx
+++ b/src/plugins/sortFriendRequests/index.tsx
@@ -42,7 +42,7 @@ export default definePlugin({
         find: "getRelationshipCounts(){",
         replacement: {
             match: /\.sortBy\(\i=>\i\.comparator\)/,
-            replace: ".sortBy((row) => $self.sortList(row))"
+            replace: "$&.sortBy((row) => $self.sortList(row))"
         }
     }, {
         find: ".Messages.FRIEND_REQUEST_CANCEL",

From 9e0aa4b23ccaef9e030d20d3881135875a3364e2 Mon Sep 17 00:00:00 2001
From: Koda!! <162957404+Kodarru@users.noreply.github.com>
Date: Tue, 23 Apr 2024 20:51:49 -0700
Subject: [PATCH 472/632] feat(plugin): StreamerModeOnStream (#2320)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/streamerModeOnStream/index.ts | 45 +++++++++++++++++++++++
 src/utils/constants.ts                    |  4 ++
 2 files changed, 49 insertions(+)
 create mode 100644 src/plugins/streamerModeOnStream/index.ts

diff --git a/src/plugins/streamerModeOnStream/index.ts b/src/plugins/streamerModeOnStream/index.ts
new file mode 100644
index 000000000..03b83f577
--- /dev/null
+++ b/src/plugins/streamerModeOnStream/index.ts
@@ -0,0 +1,45 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2024 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { FluxDispatcher, UserStore } from "@webpack/common";
+
+interface StreamEvent {
+    streamKey: string;
+}
+
+function toggleStreamerMode({ streamKey }: StreamEvent, value: boolean) {
+    if (!streamKey.endsWith(UserStore.getCurrentUser().id)) return;
+
+    FluxDispatcher.dispatch({
+        type: "STREAMER_MODE_UPDATE",
+        key: "enabled",
+        value
+    });
+}
+
+export default definePlugin({
+    name: "StreamerModeOnStream",
+    description: "Automatically enables streamer mode when you start streaming in Discord",
+    authors: [Devs.Kodarru],
+    flux: {
+        STREAM_CREATE: d => toggleStreamerMode(d, true),
+        STREAM_DELETE: d => toggleStreamerMode(d, false)
+    }
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 917fabf43..8ab0bffb3 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -426,6 +426,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "newwares",
         id: 421405303951851520n
     },
+    Kodarru: {
+        name: "Kodarru",
+        id: 785227396218748949n
+    },
     nakoyasha: {
         name: "nakoyasha",
         id: 222069018507345921n

From 4fce88fa8f048e648240a42e553c740a2927afda Mon Sep 17 00:00:00 2001
From: Elvyra <88881326+EdVraz@users.noreply.github.com>
Date: Wed, 24 Apr 2024 23:05:02 +0200
Subject: [PATCH 473/632] Fix OnePingPerDM and RoleColorEverywhere patches
 (#2387)

---
 src/plugins/onePingPerDM/index.ts         | 2 +-
 src/plugins/roleColorEverywhere/index.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/onePingPerDM/index.ts b/src/plugins/onePingPerDM/index.ts
index ae38343db..e9cde6523 100644
--- a/src/plugins/onePingPerDM/index.ts
+++ b/src/plugins/onePingPerDM/index.ts
@@ -49,7 +49,7 @@ export default definePlugin({
             replace: "$&if(!$self.isPrivateChannelRead(arguments[0]?.message))return;else "
         },
         {
-            match: /sound:(\i\?\i:void 0,volume:\i,onClick)/,
+            match: /sound:(\i\?\i:void 0,soundpack:\i,volume:\i,onClick)/,
             replace: "sound:!$self.isPrivateChannelRead(arguments[0]?.message)?undefined:$1"
         }]
     }],
diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index 71c291fef..942697801 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -94,7 +94,7 @@ export default definePlugin({
             find: "renderPrioritySpeaker",
             replacement: [
                 {
-                    match: /renderName\(\).{0,100}speaking:.{50,150}"div",{/,
+                    match: /renderName\(\).{0,100}speaking:.{50,200}"div",{/,
                     replace: "$&...$self.getVoiceProps(this.props),"
                 }
             ],

From 36327ebd70eadddda03be9b7b36b182e79ae7dde Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 26 Apr 2024 15:55:28 -0300
Subject: [PATCH 474/632] PronounDB: Fix patch

---
 src/plugins/pronoundb/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/pronoundb/index.ts b/src/plugins/pronoundb/index.ts
index 61edd191e..b14b26572 100644
--- a/src/plugins/pronoundb/index.ts
+++ b/src/plugins/pronoundb/index.ts
@@ -56,7 +56,7 @@ export default definePlugin({
             find: ".pronouns,children",
             replacement: [
                 {
-                    match: /{user:(\i),[^}]*,pronouns:(\i),[^}]*}=\i;/,
+                    match: /{user:(\i),[^}]*,pronouns:(\i),[^}]*}=\i.*?;(?=return)/,
                     replace: "$&let vcPronounSource;[$2,vcPronounSource]=$self.useProfilePronouns($1.id);"
                 },
                 PRONOUN_TOOLTIP_PATCH

From c10466f607d889c06afdee46f7af31b1062e78b5 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 26 Apr 2024 18:30:52 -0300
Subject: [PATCH 475/632] MoreUserTags: Fix patches

---
 src/plugins/moreUserTags/index.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/plugins/moreUserTags/index.tsx b/src/plugins/moreUserTags/index.tsx
index d1ad941b0..4ac542216 100644
--- a/src/plugins/moreUserTags/index.tsx
+++ b/src/plugins/moreUserTags/index.tsx
@@ -198,7 +198,8 @@ export default definePlugin({
             replacement: [
                 // make the tag show the right text
                 {
-                    match: /(switch\((\i)\){.+?)case (\i(?:\.\i)?)\.BOT:default:(\i)=.{0,40}(\i\.\i\.Messages)\.BOT_TAG_BOT/,
+                    // FIXME: Remove the BOT_TAG_BOT variant when the change arrives in stable
+                    match: /(switch\((\i)\){.+?)case (\i(?:\.\i)?)\.BOT:default:(\i)=.{0,40}(\i\.\i\.Messages)\.(?:APP_TAG|BOT_TAG_BOT)/,
                     replace: (_, origSwitch, variant, tags, displayedText, strings) =>
                         `${origSwitch}default:{${displayedText} = $self.getTagText(${tags}[${variant}], ${strings})}`
                 },
@@ -321,19 +322,20 @@ export default definePlugin({
 
     isOPTag: (tag: number) => tag === Tag.Types.ORIGINAL_POSTER || tags.some(t => tag === Tag.Types[`${t.name}-OP`]),
 
+    // FIXME: Remove the BOT_TAG_BOT variants from strings when the change arrives in stable
     getTagText(passedTagName: string, strings: Record<string, string>) {
-        if (!passedTagName) return strings.BOT_TAG_BOT;
+        if (!passedTagName) return strings.APP_TAG ?? strings.BOT_TAG_BOT;
         const [tagName, variant] = passedTagName.split("-");
         const tag = tags.find(({ name }) => tagName === name);
-        if (!tag) return strings.BOT_TAG_BOT;
-        if (variant === "BOT" && tagName !== "WEBHOOK" && this.settings.store.dontShowForBots) return strings.BOT_TAG_BOT;
+        if (!tag) return strings.APP_TAG ?? strings.BOT_TAG_BOT;
+        if (variant === "BOT" && tagName !== "WEBHOOK" && this.settings.store.dontShowForBots) return strings.APP_TAG ?? strings.BOT_TAG_BOT;
 
         const tagText = settings.store.tagSettings?.[tag.name]?.text || tag.displayName;
         switch (variant) {
             case "OP":
                 return `${strings.BOT_TAG_FORUM_ORIGINAL_POSTER} • ${tagText}`;
             case "BOT":
-                return `${strings.BOT_TAG_BOT} • ${tagText}`;
+                return `${strings.APP_TAG ?? strings.BOT_TAG_BOT} • ${tagText}`;
             default:
                 return tagText;
         }

From fafd46d2028e702d7341e1eb404c68fede49bdd3 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 26 Apr 2024 18:31:22 -0300
Subject: [PATCH 476/632] FriendsSince: Remove workaround for stable
 compatibility

---
 src/plugins/friendsSince/index.tsx | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/plugins/friendsSince/index.tsx b/src/plugins/friendsSince/index.tsx
index 69d8e739d..d6b7d1072 100644
--- a/src/plugins/friendsSince/index.tsx
+++ b/src/plugins/friendsSince/index.tsx
@@ -7,22 +7,12 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { getCurrentChannel } from "@utils/discord";
-import { makeLazy } from "@utils/lazy";
 import definePlugin from "@utils/types";
-import { filters, find, findByPropsLazy, handleModuleNotFound } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { React, RelationshipStore } from "@webpack/common";
 
 const { Heading, Text } = findByPropsLazy("Heading", "Text");
-// Workaround for module differing on stable & canary
-// FIXME: remove once merged into stable
-const getMemberSinceContainer = makeLazy(() => {
-    for (const name of ["memberSinceWrapper", "memberSinceContainer"]) {
-        const mod = find(filters.byProps(name), { isIndirect: true });
-        if (mod) return mod[name];
-    }
-    handleModuleNotFound("findByProps", "memberSinceWrapper/memberSinceContainer");
-    return "";
-});
+const container = findByPropsLazy("memberSinceWrapper");
 const { getCreatedAtDate } = findByPropsLazy("getCreatedAtDate");
 const clydeMoreInfo = findByPropsLazy("clydeMoreInfo");
 const locale = findByPropsLazy("getLocale");
@@ -59,7 +49,7 @@ export default definePlugin({
                     Friends Since
                 </Heading>
 
-                <div className={getMemberSinceContainer()}>
+                <div className={container.memberSinceWrapper}>
                     {!!getCurrentChannel()?.guild_id && (
                         <svg
                             aria-hidden="true"

From 304bc966604a0e1f5d696174f62b5e216d5cc73a Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 27 Apr 2024 01:02:26 -0300
Subject: [PATCH 477/632] RoleColorEverywhere: Fix patch again

---
 src/plugins/roleColorEverywhere/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index 942697801..dafdd1a27 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -94,7 +94,7 @@ export default definePlugin({
             find: "renderPrioritySpeaker",
             replacement: [
                 {
-                    match: /renderName\(\).{0,100}speaking:.{50,200}"div",{/,
+                    match: /renderName\(\).{0,100}speaking:.+?\.clanTag.+?"div",{/,
                     replace: "$&...$self.getVoiceProps(this.props),"
                 }
             ],

From d2941281a40cd8b6b4a74f69da6530c843e3128f Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 27 Apr 2024 01:04:47 -0300
Subject: [PATCH 478/632] Bump to 1.7.9

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 776affcda..5d94c053b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.7.8",
+    "version": "1.7.9",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 840c775ed8b38b80ab12f3b570d0ef40bae2c6ff Mon Sep 17 00:00:00 2001
From: dolfies <jeyalfie47@gmail.com>
Date: Sat, 27 Apr 2024 16:29:29 -0400
Subject: [PATCH 479/632] fix(ImplicitRelationships): Use new Flux event
 (#2392)

---
 src/plugins/implicitRelationships/index.ts | 25 +++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/plugins/implicitRelationships/index.ts b/src/plugins/implicitRelationships/index.ts
index 9ae9fb512..be17e0fe4 100644
--- a/src/plugins/implicitRelationships/index.ts
+++ b/src/plugins/implicitRelationships/index.ts
@@ -151,20 +151,25 @@ export default definePlugin({
         // OP 8 Request Guild Members allows 100 user IDs at a time
         const ignore = new Set(toRequest);
         const relationships = RelationshipStore.getRelationships();
-        const callback = ({ nonce, members }) => {
-            if (nonce !== sentNonce) return;
-            members.forEach(member => {
-                ignore.delete(member.user.id);
-            });
+        const callback = ({ chunks }) => {
+            for (const chunk of chunks) {
+                const { nonce, members } = chunk;
+                if (nonce !== sentNonce) return;
+                members.forEach(member => {
+                    ignore.delete(member.user.id);
+                });
 
-            nonFriendAffinities.map(id => UserStore.getUser(id)).filter(user => user && !ignore.has(user.id)).forEach(user => relationships[user.id] = 5);
-            RelationshipStore.emitChange();
-            if (--count === 0) {
-                FluxDispatcher.unsubscribe("GUILD_MEMBERS_CHUNK", callback);
+                nonFriendAffinities.map(id => UserStore.getUser(id)).filter(user => user && !ignore.has(user.id)).forEach(user => relationships[user.id] = 5);
+                RelationshipStore.emitChange();
+                if (--count === 0) {
+                    // @ts-ignore
+                    FluxDispatcher.unsubscribe("GUILD_MEMBERS_CHUNK_BATCH", callback);
+                }
             }
         };
 
-        FluxDispatcher.subscribe("GUILD_MEMBERS_CHUNK", callback);
+        // @ts-ignore
+        FluxDispatcher.subscribe("GUILD_MEMBERS_CHUNK_BATCH", callback);
         for (let i = 0; i < toRequest.length; i += 100) {
             FluxDispatcher.dispatch({
                 type: "GUILD_MEMBERS_REQUEST",

From 97886e572811d9aa31964d123f00b7eac111859b Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 30 Apr 2024 17:34:45 -0300
Subject: [PATCH 480/632] BetterFolders: Fix patch; MessageLogger: Ignore
 Venbot; ReviewDB: Clean migration code

---
 src/plugins/betterFolders/index.tsx | 2 +-
 src/plugins/messageLogger/index.tsx | 4 +++-
 src/plugins/reviewDB/index.tsx      | 8 --------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/plugins/betterFolders/index.tsx b/src/plugins/betterFolders/index.tsx
index 68c50bcfd..70e4070cd 100644
--- a/src/plugins/betterFolders/index.tsx
+++ b/src/plugins/betterFolders/index.tsx
@@ -209,7 +209,7 @@ export default definePlugin({
             predicate: () => settings.store.closeAllHomeButton,
             replacement: {
                 // Close all folders when clicking the home button
-                match: /(?<=onClick:\(\)=>{)(?=.{0,200}"discodo")/,
+                match: /(?<=onClick:\(\)=>{)(?=.{0,300}"discodo")/,
                 replace: "$self.closeFolders();"
             }
         }
diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index c8b464391..c3a25e1b6 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -217,7 +217,9 @@ export default definePlugin({
             ignoreChannels.includes(message.channel_id) ||
             ignoreChannels.includes(ChannelStore.getChannel(message.channel_id)?.parent_id) ||
             (isEdit ? !logEdits : !logDeletes) ||
-            ignoreGuilds.includes(ChannelStore.getChannel(message.channel_id)?.guild_id);
+            ignoreGuilds.includes(ChannelStore.getChannel(message.channel_id)?.guild_id) ||
+            // Ignore Venbot in the support channel
+            (message.channel_id === "1026515880080842772" && message.author?.id === "1017176847865352332");
     },
 
     // Based on canary 63b8f1b4f2025213c5cf62f0966625bee3d53136
diff --git a/src/plugins/reviewDB/index.tsx b/src/plugins/reviewDB/index.tsx
index ad24e9696..0c3578b07 100644
--- a/src/plugins/reviewDB/index.tsx
+++ b/src/plugins/reviewDB/index.tsx
@@ -23,7 +23,6 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import ExpandableHeader from "@components/ExpandableHeader";
 import { OpenExternalIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
-import { Logger } from "@utils/Logger";
 import definePlugin from "@utils/types";
 import { Alerts, Menu, Parser, useState } from "@webpack/common";
 import { Guild, User } from "discord-types/general";
@@ -75,13 +74,6 @@ export default definePlugin({
         const s = settings.store;
         const { lastReviewId, notifyReviews } = s;
 
-        const legacy = s as any as { token?: string; };
-        if (legacy.token) {
-            await updateAuth({ token: legacy.token });
-            legacy.token = undefined;
-            new Logger("ReviewDB").info("Migrated legacy settings");
-        }
-
         await initAuth();
 
         setTimeout(async () => {

From 6d01093eec06c9394cbd22122b78ff9bac00df0a Mon Sep 17 00:00:00 2001
From: HAHALOSAH <67280050+HAHALOSAH@users.noreply.github.com>
Date: Tue, 30 Apr 2024 23:30:01 +0000
Subject: [PATCH 481/632] fix(fakeNitro): Use getEmojiURL as emoji.url was
 removed (#2401)

---
 src/plugins/fakeNitro/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index d6822d97d..adf1f70fb 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -24,7 +24,7 @@ import { getCurrentGuild } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy, findStoreLazy, proxyLazyWebpack } from "@webpack";
-import { Alerts, ChannelStore, EmojiStore, FluxDispatcher, Forms, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
+import { Alerts, ChannelStore, EmojiStore, FluxDispatcher, Forms, IconUtils, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
 import type { CustomEmoji } from "@webpack/types";
 import type { Message } from "discord-types/general";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
@@ -900,7 +900,7 @@ export default definePlugin({
 
                     const emojiString = `<${emoji.animated ? "a" : ""}:${emoji.originalName || emoji.name}:${emoji.id}>`;
 
-                    const url = new URL(emoji.url);
+                    const url = new URL(IconUtils.getEmojiURL({ id: emoji.id, animated: emoji.animated, size: s.emojiSize }));
                     url.searchParams.set("size", s.emojiSize.toString());
                     url.searchParams.set("name", emoji.name);
 
@@ -933,7 +933,7 @@ export default definePlugin({
 
                 hasBypass = true;
 
-                const url = new URL(emoji.url);
+                const url = new URL(IconUtils.getEmojiURL({ id: emoji.id, animated: emoji.animated, size: s.emojiSize }));
                 url.searchParams.set("size", s.emojiSize.toString());
                 url.searchParams.set("name", emoji.name);
 

From 51729c828eb1c530240a505efe67707d3c0fe378 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 30 Apr 2024 20:49:27 -0300
Subject: [PATCH 482/632] Bump to 1.8.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5d94c053b..1a0a43227 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.7.9",
+    "version": "1.8.0",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 761e6b39ed0e1d0c7aa6f6b8dc7a49ccbd12ba11 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 1 May 2024 16:35:48 -0300
Subject: [PATCH 483/632] RoleColorEverywhere: Fix patch

---
 src/plugins/roleColorEverywhere/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index dafdd1a27..ed296e577 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -94,7 +94,7 @@ export default definePlugin({
             find: "renderPrioritySpeaker",
             replacement: [
                 {
-                    match: /renderName\(\).{0,100}speaking:.+?\.clanTag.+?"div",{/,
+                    match: /renderName\(\).{0,100}speaking:.+?(?=\[\i\.username\])/,
                     replace: "$&...$self.getVoiceProps(this.props),"
                 }
             ],

From 0f7e60b2086500bc608169065428e4d3c6aa7062 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 1 May 2024 17:09:30 -0300
Subject: [PATCH 484/632] ResurrectHome: Fix patch

---
 src/plugins/resurrectHome/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/resurrectHome/index.tsx b/src/plugins/resurrectHome/index.tsx
index 980629126..2042ed9c7 100644
--- a/src/plugins/resurrectHome/index.tsx
+++ b/src/plugins/resurrectHome/index.tsx
@@ -91,7 +91,7 @@ const settings = definePluginSettings({
 
 export default definePlugin({
     name: "ResurrectHome",
-    description: "Re-enables the Server Home tab when there isn't a Server Guide. Also has an option to force the Server Home over the Server Guide, which is accessible through right-clicking the Server Guide.",
+    description: "Re-enables the Server Home tab when there isn't a Server Guide. Also has an option to force the Server Home over the Server Guide, which is accessible through right-clicking a server.",
     authors: [Devs.Dolfies, Devs.Nuckyz],
     settings,
 
@@ -151,7 +151,7 @@ export default definePlugin({
             find: "487e85_1",
             replacement: {
                 match: /(?<=text:(\i)\?\i\.\i\.Messages\.SERVER_GUIDE:\i\.\i\.Messages\.GUILD_HOME,)/,
-                replace: "badge:$self.ViewServerHomeButton({serverGuide:$1}),"
+                replace: "trailing:$self.ViewServerHomeButton({serverGuide:$1}),"
             }
         },
         // Disable view Server Home override when the Server Home is unmouted

From 7af733c7c81e2b5d40fe0ec12c2525336e113716 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 1 May 2024 17:19:42 -0300
Subject: [PATCH 485/632] RoleColorEverywhere: Actually fix patch

---
 src/plugins/roleColorEverywhere/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx
index ed296e577..56b224da8 100644
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@@ -94,7 +94,7 @@ export default definePlugin({
             find: "renderPrioritySpeaker",
             replacement: [
                 {
-                    match: /renderName\(\).{0,100}speaking:.+?(?=\[\i\.username\])/,
+                    match: /renderName\(\){.+?usernameSpeaking\]:.+?(?=children)/,
                     replace: "$&...$self.getVoiceProps(this.props),"
                 }
             ],

From 5bc20ba1620edd7075d3664d3d5c1da3ca13df05 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 2 May 2024 00:36:37 -0300
Subject: [PATCH 486/632] NoTrack: Option to keep analytics, improve patches

---
 src/plugins/_core/noTrack.ts | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/plugins/_core/noTrack.ts b/src/plugins/_core/noTrack.ts
index 424e62c04..67f6c6448 100644
--- a/src/plugins/_core/noTrack.ts
+++ b/src/plugins/_core/noTrack.ts
@@ -16,17 +16,31 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
+
+const settings = definePluginSettings({
+    disableAnalytics: {
+        type: OptionType.BOOLEAN,
+        description: "Disable Discord's tracking (analytics/'science')",
+        default: true,
+        restartNeeded: true
+    }
+});
 
 export default definePlugin({
     name: "NoTrack",
-    description: "Disable Discord's tracking ('science'), metrics and Sentry crash reporting",
+    description: "Disable Discord's tracking (analytics/'science'), metrics and Sentry crash reporting",
     authors: [Devs.Cyn, Devs.Ven, Devs.Nuckyz, Devs.Arrow],
     required: true,
+
+    settings,
+
     patches: [
         {
             find: "AnalyticsActionHandlers.handle",
+            predicate: () => settings.store.disableAnalytics,
             replacement: {
                 match: /^.+$/,
                 replace: "()=>{}",
@@ -44,11 +58,11 @@ export default definePlugin({
             replacement: [
                 {
                     match: /this\._intervalId=/,
-                    replace: "this._intervalId=undefined&&"
+                    replace: "this._intervalId=void 0&&"
                 },
                 {
-                    match: /(increment\(\i\){)/,
-                    replace: "$1return;"
+                    match: /(?:increment|distribution)\(\i(?:,\i)?\){/g,
+                    replace: "$&return;"
                 }
             ]
         },

From f54dcb74d73103695ab2a742433eb9189375f923 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 2 May 2024 14:58:31 +0200
Subject: [PATCH 487/632] improve contributor modal & badge

---
 src/api/Badges.ts                             |  6 +-
 .../PluginSettings/ContributorModal.tsx       | 60 +++++++++++++------
 .../PluginSettings/contributorModal.css       |  7 ++-
 src/plugins/_api/badges.tsx                   | 15 +++--
 src/utils/misc.tsx                            |  4 ++
 5 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/src/api/Badges.ts b/src/api/Badges.ts
index b50016c5b..061bdeb8a 100644
--- a/src/api/Badges.ts
+++ b/src/api/Badges.ts
@@ -36,7 +36,7 @@ export interface ProfileBadge {
     image?: string;
     link?: string;
     /** Action to perform when you click the badge */
-    onClick?(): void;
+    onClick?(event: React.MouseEvent<HTMLButtonElement, MouseEvent>, props: BadgeUserArgs): void;
     /** Should the user display this badge? */
     shouldShow?(userInfo: BadgeUserArgs): boolean;
     /** Optional props (e.g. style) for the badge, ignored for component badges */
@@ -87,9 +87,7 @@ export function _getBadges(args: BadgeUserArgs) {
 
 export interface BadgeUserArgs {
     user: User;
-    profile: Profile;
-    premiumSince: Date;
-    premiumGuildSince?: Date;
+    guildId: string;
 }
 
 interface ConnectedAccount {
diff --git a/src/components/PluginSettings/ContributorModal.tsx b/src/components/PluginSettings/ContributorModal.tsx
index 82c230259..99a8da168 100644
--- a/src/components/PluginSettings/ContributorModal.tsx
+++ b/src/components/PluginSettings/ContributorModal.tsx
@@ -9,10 +9,12 @@ import "./contributorModal.css";
 import { useSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
+import { Link } from "@components/Link";
 import { DevsById } from "@utils/constants";
 import { fetchUserProfile, getTheme, Theme } from "@utils/discord";
+import { pluralise } from "@utils/misc";
 import { ModalContent, ModalRoot, openModal } from "@utils/modal";
-import { Forms, MaskedLink, showToast, useEffect, useMemo, UserProfileStore, useStateFromStores } from "@webpack/common";
+import { Forms, MaskedLink, showToast, Tooltip, useEffect, useMemo, UserProfileStore, useStateFromStores } from "@webpack/common";
 import { User } from "discord-types/general";
 
 import Plugins from "~plugins";
@@ -72,6 +74,8 @@ function ContributorModal({ user }: { user: User; }) {
             .sort((a, b) => Number(a.required ?? false) - Number(b.required ?? false));
     }, [user.id, user.username]);
 
+    const ContributedHyperLink = <Link href="https://vencord.dev/source">contributed</Link>;
+
     return (
         <>
             <div className={cl("header")}>
@@ -84,30 +88,48 @@ function ContributorModal({ user }: { user: User; }) {
 
                 <div className={cl("links")}>
                     {website && (
-                        <MaskedLink
-                            href={"https://" + website}
-                        >
-                            <WebsiteIcon />
-                        </MaskedLink>
+                        <Tooltip text={website}>
+                            {props => (
+                                <MaskedLink {...props} href={"https://" + website}>
+                                    <WebsiteIcon />
+                                </MaskedLink>
+                            )}
+                        </Tooltip>
                     )}
                     {githubName && (
-                        <MaskedLink href={`https://github.com/${githubName}`}>
-                            <GithubIcon />
-                        </MaskedLink>
+                        <Tooltip text={githubName}>
+                            {props => (
+                                <MaskedLink {...props} href={`https://github.com/${githubName}`}>
+                                    <GithubIcon />
+                                </MaskedLink>
+                            )}
+                        </Tooltip>
                     )}
                 </div>
             </div>
 
-            <div className={cl("plugins")}>
-                {plugins.map(p =>
-                    <PluginCard
-                        key={p.name}
-                        plugin={p}
-                        disabled={p.required ?? false}
-                        onRestartNeeded={() => showToast("Restart to apply changes!")}
-                    />
-                )}
-            </div>
+            {plugins.length ? (
+                <Forms.FormText>
+                    This person has {ContributedHyperLink} to {pluralise(plugins.length, "plugin")}!
+                </Forms.FormText>
+            ) : (
+                <Forms.FormText>
+                    This person has not made any plugins. They likely {ContributedHyperLink} to Vencord in other ways!
+                </Forms.FormText>
+            )}
+
+            {!!plugins.length && (
+                <div className={cl("plugins")}>
+                    {plugins.map(p =>
+                        <PluginCard
+                            key={p.name}
+                            plugin={p}
+                            disabled={p.required ?? false}
+                            onRestartNeeded={() => showToast("Restart to apply changes!")}
+                        />
+                    )}
+                </div>
+            )}
         </>
     );
 }
diff --git a/src/components/PluginSettings/contributorModal.css b/src/components/PluginSettings/contributorModal.css
index 09f0103fd..ad2f1330c 100644
--- a/src/components/PluginSettings/contributorModal.css
+++ b/src/components/PluginSettings/contributorModal.css
@@ -25,11 +25,13 @@
     display: block;
     position: absolute;
     height: 100%;
-    width: 16px;
+    width: 32px;
     background: var(--background-tertiary);
     z-index: -1;
-    left: -16px;
+    left: -32px;
     top: 0;
+    border-top-left-radius: 9999px;
+    border-bottom-left-radius: 9999px;
 }
 
 .vc-author-modal-avatar {
@@ -55,4 +57,5 @@
 .vc-author-modal-plugins {
     display: grid;
     gap: 0.5em;
+    margin-top: 0.75em;
 }
diff --git a/src/plugins/_api/badges.tsx b/src/plugins/_api/badges.tsx
index 6b1a79cd5..6cbe1feb0 100644
--- a/src/plugins/_api/badges.tsx
+++ b/src/plugins/_api/badges.tsx
@@ -34,14 +34,13 @@ const ContributorBadge: ProfileBadge = {
     description: "Vencord Contributor",
     image: CONTRIBUTOR_BADGE,
     position: BadgePosition.START,
-    props: {
-        style: {
-            borderRadius: "50%",
-            transform: "scale(0.9)" // The image is a bit too big compared to default badges
-        }
-    },
     shouldShow: ({ user }) => isPluginDev(user.id),
-    link: "https://github.com/Vendicated/Vencord"
+    onClick(_, { user }) {
+        // circular import shenanigans
+        const { openContributorModal } = require("@components/PluginSettings/ContributorModal") as typeof import("@components/PluginSettings/ContributorModal");
+        // setImmediate is needed to run on later tick to workaround limitation in proxyLazy
+        setImmediate(() => openContributorModal(user));
+    }
 };
 
 let DonorBadges = {} as Record<string, Array<Record<"tooltip" | "badge", string>>>;
@@ -85,7 +84,7 @@ export default definePlugin({
                 // conditionally override their onClick with badge.onClick if it exists
                 {
                     match: /href:(\i)\.link/,
-                    replace: "...($1.onClick && { onClick: $1.onClick }),$&"
+                    replace: "...($1.onClick && { onClick: vcE => $1.onClick(vcE, arguments[0]) }),$&"
                 }
             ]
         }
diff --git a/src/utils/misc.tsx b/src/utils/misc.tsx
index 2b8ccf8a7..32010e59b 100644
--- a/src/utils/misc.tsx
+++ b/src/utils/misc.tsx
@@ -114,3 +114,7 @@ export function identity<T>(value: T): T {
 export const isMobile = navigator.userAgent.includes("Mobi");
 
 export const isPluginDev = (id: string) => Object.hasOwn(DevsById, id);
+
+export function pluralise(amount: number, singular: string, plural = singular + "s") {
+    return amount === 1 ? `${amount} ${singular}` : `${amount} ${plural}`;
+}

From 0a598ae9668547ac11e5a8dd1aee645b1916da2b Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 2 May 2024 15:38:53 +0200
Subject: [PATCH 488/632] fix FriendsSince

---
 src/plugins/friendsSince/index.tsx       |  3 +--
 src/webpack/common/components.ts         | 25 +++++++++++++++++++++++-
 src/webpack/common/types/components.d.ts | 11 ++++++-----
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/plugins/friendsSince/index.tsx b/src/plugins/friendsSince/index.tsx
index d6b7d1072..fb431b52b 100644
--- a/src/plugins/friendsSince/index.tsx
+++ b/src/plugins/friendsSince/index.tsx
@@ -9,9 +9,8 @@ import { Devs } from "@utils/constants";
 import { getCurrentChannel } from "@utils/discord";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { React, RelationshipStore } from "@webpack/common";
+import { Heading, React, RelationshipStore, Text } from "@webpack/common";
 
-const { Heading, Text } = findByPropsLazy("Heading", "Text");
 const container = findByPropsLazy("memberSinceWrapper");
 const { getCreatedAtDate } = findByPropsLazy("getCreatedAtDate");
 const clydeMoreInfo = findByPropsLazy("clydeMoreInfo");
diff --git a/src/webpack/common/components.ts b/src/webpack/common/components.ts
index 24477c725..020c8fc7e 100644
--- a/src/webpack/common/components.ts
+++ b/src/webpack/common/components.ts
@@ -36,6 +36,7 @@ export let Tooltip: t.Tooltip;
 export let TextInput: t.TextInput;
 export let TextArea: t.TextArea;
 export let Text: t.Text;
+export let Heading: t.HeadingTag;
 export let Select: t.Select;
 export let SearchableSelect: t.SearchableSelect;
 export let Slider: t.Slider;
@@ -59,6 +60,28 @@ export const Flex = waitForComponent<t.Flex>("Flex", ["Justify", "Align", "Wrap"
 export const { OAuth2AuthorizeModal } = findByPropsLazy("OAuth2AuthorizeModal");
 
 waitFor(["FormItem", "Button"], m => {
-    ({ useToken, Card, Button, FormSwitch: Switch, Tooltip, TextInput, TextArea, Text, Select, SearchableSelect, Slider, ButtonLooks, TabBar, Popout, Dialog, Paginator, ScrollerThin, Clickable, Avatar, FocusLock } = m);
+    ({
+        useToken,
+        Card,
+        Button,
+        FormSwitch: Switch,
+        Tooltip,
+        TextInput,
+        TextArea,
+        Text,
+        Select,
+        SearchableSelect,
+        Slider,
+        ButtonLooks,
+        TabBar,
+        Popout,
+        Dialog,
+        Paginator,
+        ScrollerThin,
+        Clickable,
+        Avatar,
+        FocusLock,
+        Heading
+    } = m);
     Forms = m;
 });
diff --git a/src/webpack/common/types/components.d.ts b/src/webpack/common/types/components.d.ts
index 3e3ffa4bd..c51264370 100644
--- a/src/webpack/common/types/components.d.ts
+++ b/src/webpack/common/types/components.d.ts
@@ -20,23 +20,24 @@ import type { ComponentType, CSSProperties, FunctionComponent, HtmlHTMLAttribute
 
 export type TextVariant = "heading-sm/normal" | "heading-sm/medium" | "heading-sm/semibold" | "heading-sm/bold" | "heading-md/normal" | "heading-md/medium" | "heading-md/semibold" | "heading-md/bold" | "heading-lg/normal" | "heading-lg/medium" | "heading-lg/semibold" | "heading-lg/bold" | "heading-xl/normal" | "heading-xl/medium" | "heading-xl/bold" | "heading-xxl/normal" | "heading-xxl/medium" | "heading-xxl/bold" | "eyebrow" | "heading-deprecated-14/normal" | "heading-deprecated-14/medium" | "heading-deprecated-14/bold" | "text-xxs/normal" | "text-xxs/medium" | "text-xxs/semibold" | "text-xxs/bold" | "text-xs/normal" | "text-xs/medium" | "text-xs/semibold" | "text-xs/bold" | "text-sm/normal" | "text-sm/medium" | "text-sm/semibold" | "text-sm/bold" | "text-md/normal" | "text-md/medium" | "text-md/semibold" | "text-md/bold" | "text-lg/normal" | "text-lg/medium" | "text-lg/semibold" | "text-lg/bold" | "display-sm" | "display-md" | "display-lg" | "code";
 export type FormTextTypes = Record<"DEFAULT" | "INPUT_PLACEHOLDER" | "DESCRIPTION" | "LABEL_BOLD" | "LABEL_SELECTED" | "LABEL_DESCRIPTOR" | "ERROR" | "SUCCESS", string>;
-export type Heading = `h${1 | 2 | 3 | 4 | 5 | 6}`;
+export type HeadingTag = `h${1 | 2 | 3 | 4 | 5 | 6}`;
 
 export type Margins = Record<"marginTop16" | "marginTop8" | "marginBottom8" | "marginTop20" | "marginBottom20", string>;
 export type ButtonLooks = Record<"FILLED" | "INVERTED" | "OUTLINED" | "LINK" | "BLANK", string>;
 
 export type TextProps = PropsWithChildren<HtmlHTMLAttributes<HTMLDivElement> & {
     variant?: TextVariant;
-    tag?: "div" | "span" | "p" | "strong" | Heading;
+    tag?: "div" | "span" | "p" | "strong" | HeadingTag;
     selectable?: boolean;
     lineClamp?: number;
 }>;
 
 export type Text = ComponentType<TextProps>;
+export type Heading = ComponentType<TextProps>;
 
 export type FormTitle = ComponentType<HTMLProps<HTMLTitleElement> & PropsWithChildren<{
     /** default is h5 */
-    tag?: Heading;
+    tag?: HeadingTag;
     faded?: boolean;
     disabled?: boolean;
     required?: boolean;
@@ -45,7 +46,7 @@ export type FormTitle = ComponentType<HTMLProps<HTMLTitleElement> & PropsWithChi
 
 export type FormSection = ComponentType<PropsWithChildren<{
     /** default is h5 */
-    tag?: Heading;
+    tag?: HeadingTag;
     className?: string;
     titleClassName?: string;
     titleId?: string;
@@ -455,5 +456,5 @@ export type Avatar = ComponentType<PropsWithChildren<{
 }>>;
 
 type FocusLock = ComponentType<PropsWithChildren<{
-    containerRef: RefObject<HTMLElement>
+    containerRef: RefObject<HTMLElement>;
 }>>;

From a055b1d47b971e92fc34cd7b13ac0e172cfd19fd Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 2 May 2024 18:52:41 -0300
Subject: [PATCH 489/632] refactor(Webpack): more reliable patching (#2237)

---
 scripts/generateReport.ts                | 284 ++++++++++--------
 src/plugins/index.ts                     |  49 ++-
 src/plugins/showHiddenChannels/index.tsx |   6 +-
 src/utils/patches.ts                     |  10 +-
 src/webpack/common/components.ts         |   2 +-
 src/webpack/common/utils.ts              |   3 +
 src/webpack/patchWebpack.ts              | 363 ++++++++++++++---------
 src/webpack/webpack.ts                   |  28 +-
 8 files changed, 443 insertions(+), 302 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 41e384295..912f38eda 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -269,7 +269,7 @@ page.on("pageerror", e => console.error("[Page Error]", e));
 
 await page.setBypassCSP(true);
 
-function runTime(token: string) {
+async function runtime(token: string) {
     console.log("[PUP_DEBUG]", "Starting test...");
 
     try {
@@ -282,9 +282,13 @@ function runTime(token: string) {
 
         // Monkey patch Logger to not log with custom css
         // @ts-ignore
+        const originalLog = Vencord.Util.Logger.prototype._log;
+        // @ts-ignore
         Vencord.Util.Logger.prototype._log = function (level, levelColor, args) {
             if (level === "warn" || level === "error")
-                console[level]("[Vencord]", this.name + ":", ...args);
+                return console[level]("[Vencord]", this.name + ":", ...args);
+
+            return originalLog.call(this, level, levelColor, args);
         };
 
         // Force enable all plugins and patches
@@ -310,45 +314,30 @@ function runTime(token: string) {
             });
         });
 
-        Vencord.Webpack.waitFor(
-            "loginToken",
-            m => {
-                console.log("[PUP_DEBUG]", "Logging in with token...");
-                m.loginToken(token);
-            }
-        );
+        let wreq: typeof Vencord.Webpack.wreq;
 
-        // Force load all chunks
-        Vencord.Webpack.onceReady.then(() => setTimeout(async () => {
-            console.log("[PUP_DEBUG]", "Webpack is ready!");
+        const { canonicalizeMatch, Logger } = Vencord.Util;
 
-            const { wreq } = Vencord.Webpack;
+        const validChunks = new Set<string>();
+        const invalidChunks = new Set<string>();
 
-            console.log("[PUP_DEBUG]", "Loading all chunks...");
+        let chunksSearchingResolve: (value: void | PromiseLike<void>) => void;
+        const chunksSearchingDone = new Promise<void>(r => chunksSearchingResolve = r);
 
-            let chunks = null as Record<number, string[]> | null;
-            const sym = Symbol("Vencord.chunksExtract");
+        // True if resolved, false otherwise
+        const chunksSearchPromises = [] as Array<() => boolean>;
+        const lazyChunkRegex = canonicalizeMatch(/Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\)/g);
+        const chunkIdsRegex = canonicalizeMatch(/\("(.+?)"\)/g);
 
-            Object.defineProperty(Object.prototype, sym, {
-                get() {
-                    chunks = this;
-                },
-                set() { },
-                configurable: true,
-            });
+        async function searchAndLoadLazyChunks(factoryCode: string) {
+            const lazyChunks = factoryCode.matchAll(lazyChunkRegex);
+            const validChunkGroups = new Set<[chunkIds: string[], entryPoint: string]>();
 
-            await (wreq as any).el(sym);
-            delete Object.prototype[sym];
+            await Promise.all(Array.from(lazyChunks).map(async ([, rawChunkIds, entryPoint]) => {
+                const chunkIds = Array.from(rawChunkIds.matchAll(chunkIdsRegex)).map(m => m[1]);
+                if (chunkIds.length === 0) return;
 
-            const validChunksEntryPoints = new Set<string>();
-            const validChunks = new Set<string>();
-            const invalidChunks = new Set<string>();
-
-            if (!chunks) throw new Error("Failed to get chunks");
-
-            for (const entryPoint in chunks) {
-                const chunkIds = chunks[entryPoint];
-                let invalidEntryPoint = false;
+                let invalidChunkGroup = false;
 
                 for (const id of chunkIds) {
                     if (wreq.u(id) == null || wreq.u(id) === "undefined.js") continue;
@@ -359,56 +348,28 @@ function runTime(token: string) {
 
                     if (isWasm) {
                         invalidChunks.add(id);
-                        invalidEntryPoint = true;
+                        invalidChunkGroup = true;
                         continue;
                     }
 
                     validChunks.add(id);
                 }
 
-                if (!invalidEntryPoint)
-                    validChunksEntryPoints.add(entryPoint);
-            }
+                if (!invalidChunkGroup) {
+                    validChunkGroups.add([chunkIds, entryPoint]);
+                }
+            }));
 
-            for (const entryPoint of validChunksEntryPoints) {
-                try {
-                    // Loads all chunks required for an entry point
-                    await (wreq as any).el(entryPoint);
-                } catch (err) { }
-            }
+            // Loads all found valid chunk groups
+            await Promise.all(
+                Array.from(validChunkGroups)
+                    .map(([chunkIds]) =>
+                        Promise.all(chunkIds.map(id => wreq.e(id as any).catch(() => { })))
+                    )
+            );
 
-            // Matches "id" or id:
-            const chunkIdRegex = /(?:"(\d+?)")|(?:(\d+?):)/g;
-            const wreqU = wreq.u.toString();
-
-            const allChunks = [] as string[];
-            let currentMatch: RegExpExecArray | null;
-
-            while ((currentMatch = chunkIdRegex.exec(wreqU)) != null) {
-                const id = currentMatch[1] ?? currentMatch[2];
-                if (id == null) continue;
-
-                allChunks.push(id);
-            }
-
-            if (allChunks.length === 0) throw new Error("Failed to get all chunks");
-            const chunksLeft = allChunks.filter(id => {
-                return !(validChunks.has(id) || invalidChunks.has(id));
-            });
-
-            for (const id of chunksLeft) {
-                const isWasm = await fetch(wreq.p + wreq.u(id))
-                    .then(r => r.text())
-                    .then(t => t.includes(".module.wasm") || !t.includes("(this.webpackChunkdiscord_app=this.webpackChunkdiscord_app||[]).push"));
-
-                // Loads a chunk
-                if (!isWasm) await wreq.e(id as any);
-            }
-
-            // Make sure every chunk has finished loading
-            await new Promise(r => setTimeout(r, 1000));
-
-            for (const entryPoint of validChunksEntryPoints) {
+            // Requires the entry points for all valid chunk groups
+            for (const [, entryPoint] of validChunkGroups) {
                 try {
                     if (wreq.m[entryPoint]) wreq(entryPoint as any);
                 } catch (err) {
@@ -416,54 +377,139 @@ function runTime(token: string) {
                 }
             }
 
-            console.log("[PUP_DEBUG]", "Finished loading all chunks!");
+            // setImmediate to only check if all chunks were loaded after this function resolves
+            // We check if all chunks were loaded every time a factory is loaded
+            // If we are still looking for chunks in the other factories, the array will have that factory's chunk search promise not resolved
+            // But, if all chunk search promises are resolved, this means we found every lazy chunk loaded by Discord code and manually loaded them
+            setTimeout(() => {
+                let allResolved = true;
 
-            for (const patch of Vencord.Plugins.patches) {
-                if (!patch.all) {
-                    new Vencord.Util.Logger("WebpackInterceptor").warn(`Patch by ${patch.plugin} found no module (Module id is -): ${patch.find}`);
-                }
-            }
+                for (let i = 0; i < chunksSearchPromises.length; i++) {
+                    const isResolved = chunksSearchPromises[i]();
 
-            for (const [searchType, args] of Vencord.Webpack.lazyWebpackSearchHistory) {
-                let method = searchType;
-
-                if (searchType === "findComponent") method = "find";
-                if (searchType === "findExportedComponent") method = "findByProps";
-                if (searchType === "waitFor" || searchType === "waitForComponent") {
-                    if (typeof args[0] === "string") method = "findByProps";
-                    else method = "find";
-                }
-                if (searchType === "waitForStore") method = "findStore";
-
-                try {
-                    let result: any;
-
-                    if (method === "proxyLazyWebpack" || method === "LazyComponentWebpack") {
-                        const [factory] = args;
-                        result = factory();
-                    } else if (method === "extractAndLoadChunks") {
-                        const [code, matcher] = args;
-
-                        const module = Vencord.Webpack.findModuleFactory(...code);
-                        if (module) result = module.toString().match(Vencord.Util.canonicalizeMatch(matcher));
+                    if (isResolved) {
+                        // Remove finished promises to avoid having to iterate through a huge array everytime
+                        chunksSearchPromises.splice(i--, 1);
                     } else {
-                        // @ts-ignore
-                        result = Vencord.Webpack[method](...args);
+                        allResolved = false;
                     }
-
-                    if (result == null || ("$$vencordInternal" in result && result.$$vencordInternal() == null)) throw "a rock at ben shapiro";
-                } catch (e) {
-                    let logMessage = searchType;
-                    if (method === "find" || method === "proxyLazyWebpack" || method === "LazyComponentWebpack") logMessage += `(${args[0].toString().slice(0, 147)}...)`;
-                    else if (method === "extractAndLoadChunks") logMessage += `([${args[0].map(arg => `"${arg}"`).join(", ")}], ${args[1].toString()})`;
-                    else logMessage += `(${args.map(arg => `"${arg}"`).join(", ")})`;
-
-                    console.log("[PUP_WEBPACK_FIND_FAIL]", logMessage);
                 }
-            }
 
-            setTimeout(() => console.log("[PUPPETEER_TEST_DONE_SIGNAL]"), 1000);
-        }, 1000));
+                if (allResolved) chunksSearchingResolve();
+            }, 0);
+        }
+
+        Vencord.Webpack.waitFor(
+            "loginToken",
+            m => {
+                console.log("[PUP_DEBUG]", "Logging in with token...");
+                m.loginToken(token);
+            }
+        );
+
+        Vencord.Webpack.beforeInitListeners.add(async webpackRequire => {
+            console.log("[PUP_DEBUG]", "Loading all chunks...");
+
+            wreq = webpackRequire;
+
+            Vencord.Webpack.factoryListeners.add(factory => {
+                let isResolved = false;
+                searchAndLoadLazyChunks(factory.toString()).then(() => isResolved = true);
+
+                chunksSearchPromises.push(() => isResolved);
+            });
+
+            // setImmediate to only search the initial factories after Discord initialized the app
+            // our beforeInitListeners are called before Discord initializes the app
+            setTimeout(() => {
+                for (const factoryId in wreq.m) {
+                    let isResolved = false;
+                    searchAndLoadLazyChunks(wreq.m[factoryId].toString()).then(() => isResolved = true);
+
+                    chunksSearchPromises.push(() => isResolved);
+                }
+            }, 0);
+        });
+
+        await chunksSearchingDone;
+
+        // All chunks Discord has mapped to asset files, even if they are not used anymore
+        const allChunks = [] as string[];
+
+        // Matches "id" or id:
+        for (const currentMatch of wreq!.u.toString().matchAll(/(?:"(\d+?)")|(?:(\d+?):)/g)) {
+            const id = currentMatch[1] ?? currentMatch[2];
+            if (id == null) continue;
+
+            allChunks.push(id);
+        }
+
+        if (allChunks.length === 0) throw new Error("Failed to get all chunks");
+
+        // Chunks that are not loaded (not used) by Discord code anymore
+        const chunksLeft = allChunks.filter(id => {
+            return !(validChunks.has(id) || invalidChunks.has(id));
+        });
+
+        await Promise.all(chunksLeft.map(async id => {
+            const isWasm = await fetch(wreq.p + wreq.u(id))
+                .then(r => r.text())
+                .then(t => t.includes(".module.wasm") || !t.includes("(this.webpackChunkdiscord_app=this.webpackChunkdiscord_app||[]).push"));
+
+            // Loads and requires a chunk
+            if (!isWasm) {
+                await wreq.e(id as any);
+                if (wreq.m[id]) wreq(id as any);
+            }
+        }));
+
+        console.log("[PUP_DEBUG]", "Finished loading all chunks!");
+
+        for (const patch of Vencord.Plugins.patches) {
+            if (!patch.all) {
+                new Logger("WebpackInterceptor").warn(`Patch by ${patch.plugin} found no module (Module id is -): ${patch.find}`);
+            }
+        }
+
+        for (const [searchType, args] of Vencord.Webpack.lazyWebpackSearchHistory) {
+            let method = searchType;
+
+            if (searchType === "findComponent") method = "find";
+            if (searchType === "findExportedComponent") method = "findByProps";
+            if (searchType === "waitFor" || searchType === "waitForComponent") {
+                if (typeof args[0] === "string") method = "findByProps";
+                else method = "find";
+            }
+            if (searchType === "waitForStore") method = "findStore";
+
+            try {
+                let result: any;
+
+                if (method === "proxyLazyWebpack" || method === "LazyComponentWebpack") {
+                    const [factory] = args;
+                    result = factory();
+                } else if (method === "extractAndLoadChunks") {
+                    const [code, matcher] = args;
+
+                    const module = Vencord.Webpack.findModuleFactory(...code);
+                    if (module) result = module.toString().match(canonicalizeMatch(matcher));
+                } else {
+                    // @ts-ignore
+                    result = Vencord.Webpack[method](...args);
+                }
+
+                if (result == null || ("$$vencordInternal" in result && result.$$vencordInternal() == null)) throw "a rock at ben shapiro";
+            } catch (e) {
+                let logMessage = searchType;
+                if (method === "find" || method === "proxyLazyWebpack" || method === "LazyComponentWebpack") logMessage += `(${args[0].toString().slice(0, 147)}...)`;
+                else if (method === "extractAndLoadChunks") logMessage += `([${args[0].map(arg => `"${arg}"`).join(", ")}], ${args[1].toString()})`;
+                else logMessage += `(${args.map(arg => `"${arg}"`).join(", ")})`;
+
+                console.log("[PUP_WEBPACK_FIND_FAIL]", logMessage);
+            }
+        }
+
+        setTimeout(() => console.log("[PUPPETEER_TEST_DONE_SIGNAL]"), 1000);
     } catch (e) {
         console.log("[PUP_DEBUG]", "A fatal error occurred:", e);
         process.exit(1);
@@ -473,7 +519,7 @@ function runTime(token: string) {
 await page.evaluateOnNewDocument(`
     ${readFileSync("./dist/browser.js", "utf-8")}
 
-    ;(${runTime.toString()})(${JSON.stringify(process.env.DISCORD_TOKEN)});
+    ;(${runtime.toString()})(${JSON.stringify(process.env.DISCORD_TOKEN)});
 `);
 
 await page.goto(CANARY ? "https://canary.discord.com/login" : "https://discord.com/login");
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 7092001ee..2d5e3e5a4 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -34,6 +34,9 @@ export const PMLogger = logger;
 export const plugins = Plugins;
 export const patches = [] as Patch[];
 
+/** Whether we have subscribed to flux events of all the enabled plugins when FluxDispatcher was ready */
+let enabledPluginsSubscribedFlux = false;
+
 const settings = Settings.plugins;
 
 export function isPluginEnabled(p: string) {
@@ -119,6 +122,33 @@ export function startDependenciesRecursive(p: Plugin) {
     return { restartNeeded, failures };
 }
 
+export function subscribePluginFluxEvents(p: Plugin, fluxDispatcher: typeof FluxDispatcher) {
+    if (p.flux) {
+        logger.debug("Subscribing to flux events of plugin", p.name);
+        for (const [event, handler] of Object.entries(p.flux)) {
+            fluxDispatcher.subscribe(event as FluxEvents, handler);
+        }
+    }
+}
+
+export function unsubscribePluginFluxEvents(p: Plugin, fluxDispatcher: typeof FluxDispatcher) {
+    if (p.flux) {
+        logger.debug("Unsubscribing from flux events of plugin", p.name);
+        for (const [event, handler] of Object.entries(p.flux)) {
+            fluxDispatcher.unsubscribe(event as FluxEvents, handler);
+        }
+    }
+}
+
+export function subscribeAllPluginsFluxEvents(fluxDispatcher: typeof FluxDispatcher) {
+    enabledPluginsSubscribedFlux = true;
+
+    for (const name in Plugins) {
+        if (!isPluginEnabled(name)) continue;
+        subscribePluginFluxEvents(Plugins[name], fluxDispatcher);
+    }
+}
+
 export const startPlugin = traceFunction("startPlugin", function startPlugin(p: Plugin) {
     const { name, commands, flux, contextMenus } = p;
 
@@ -138,7 +168,7 @@ export const startPlugin = traceFunction("startPlugin", function startPlugin(p:
     }
 
     if (commands?.length) {
-        logger.info("Registering commands of plugin", name);
+        logger.debug("Registering commands of plugin", name);
         for (const cmd of commands) {
             try {
                 registerCommand(cmd, name);
@@ -149,13 +179,13 @@ export const startPlugin = traceFunction("startPlugin", function startPlugin(p:
         }
     }
 
-    if (flux) {
-        for (const event in flux) {
-            FluxDispatcher.subscribe(event as FluxEvents, flux[event]);
-        }
+    if (enabledPluginsSubscribedFlux) {
+        subscribePluginFluxEvents(p, FluxDispatcher);
     }
 
+
     if (contextMenus) {
+        logger.debug("Adding context menus patches of plugin", name);
         for (const navId in contextMenus) {
             addContextMenuPatch(navId, contextMenus[navId]);
         }
@@ -182,7 +212,7 @@ export const stopPlugin = traceFunction("stopPlugin", function stopPlugin(p: Plu
     }
 
     if (commands?.length) {
-        logger.info("Unregistering commands of plugin", name);
+        logger.debug("Unregistering commands of plugin", name);
         for (const cmd of commands) {
             try {
                 unregisterCommand(cmd.name);
@@ -193,13 +223,10 @@ export const stopPlugin = traceFunction("stopPlugin", function stopPlugin(p: Plu
         }
     }
 
-    if (flux) {
-        for (const event in flux) {
-            FluxDispatcher.unsubscribe(event as FluxEvents, flux[event]);
-        }
-    }
+    unsubscribePluginFluxEvents(p, FluxDispatcher);
 
     if (contextMenus) {
+        logger.debug("Removing context menus patches of plugin", name);
         for (const navId in contextMenus) {
             removeContextMenuPatch(navId, contextMenus[navId]);
         }
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index ce4a47ade..09aa2302a 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -36,6 +36,8 @@ const enum ShowMode {
     HiddenIconWithMutedStyle
 }
 
+const CONNECT = 1n << 20n;
+
 export const settings = definePluginSettings({
     hideUnreads: {
         description: "Hide Unreads",
@@ -273,12 +275,12 @@ export default definePlugin({
                 {
                     // Change the role permission check to CONNECT if the channel is locked
                     match: /ADMINISTRATOR\)\|\|(?<=context:(\i)}.+?)(?=(.+?)VIEW_CHANNEL)/,
-                    replace: (m, channel, permCheck) => `${m}!Vencord.Webpack.Common.PermissionStore.can(${PermissionsBits.CONNECT}n,${channel})?${permCheck}CONNECT):`
+                    replace: (m, channel, permCheck) => `${m}!Vencord.Webpack.Common.PermissionStore.can(${CONNECT}n,${channel})?${permCheck}CONNECT):`
                 },
                 {
                     // Change the permissionOverwrite check to CONNECT if the channel is locked
                     match: /permissionOverwrites\[.+?\i=(?<=context:(\i)}.+?)(?=(.+?)VIEW_CHANNEL)/,
-                    replace: (m, channel, permCheck) => `${m}!Vencord.Webpack.Common.PermissionStore.can(${PermissionsBits.CONNECT}n,${channel})?${permCheck}CONNECT):`
+                    replace: (m, channel, permCheck) => `${m}!Vencord.Webpack.Common.PermissionStore.can(${CONNECT}n,${channel})?${permCheck}CONNECT):`
                 },
                 {
                     // Include the @everyone role in the allowed roles list for Hidden Channels
diff --git a/src/utils/patches.ts b/src/utils/patches.ts
index c30f7b17c..99f0595d6 100644
--- a/src/utils/patches.ts
+++ b/src/utils/patches.ts
@@ -18,20 +18,20 @@
 
 import { PatchReplacement, ReplaceFn } from "./types";
 
-export function canonicalizeMatch(match: RegExp | string) {
+export function canonicalizeMatch<T extends RegExp | string>(match: T): T {
     if (typeof match === "string") return match;
     const canonSource = match.source
         .replaceAll("\\i", "[A-Za-z_$][\\w$]*");
-    return new RegExp(canonSource, match.flags);
+    return new RegExp(canonSource, match.flags) as T;
 }
 
-export function canonicalizeReplace(replace: string | ReplaceFn, pluginName: string): string | ReplaceFn {
+export function canonicalizeReplace<T extends string | ReplaceFn>(replace: T, pluginName: string): T {
     const self = `Vencord.Plugins.plugins[${JSON.stringify(pluginName)}]`;
 
     if (typeof replace !== "function")
-        return replace.replaceAll("$self", self);
+        return replace.replaceAll("$self", self) as T;
 
-    return (...args) => replace(...args).replaceAll("$self", self);
+    return ((...args) => replace(...args).replaceAll("$self", self)) as T;
 }
 
 export function canonicalizeDescriptor<T>(descriptor: TypedPropertyDescriptor<T>, canonicalize: (value: T) => T) {
diff --git a/src/webpack/common/components.ts b/src/webpack/common/components.ts
index 020c8fc7e..46f843ce6 100644
--- a/src/webpack/common/components.ts
+++ b/src/webpack/common/components.ts
@@ -36,7 +36,7 @@ export let Tooltip: t.Tooltip;
 export let TextInput: t.TextInput;
 export let TextArea: t.TextArea;
 export let Text: t.Text;
-export let Heading: t.HeadingTag;
+export let Heading: t.Heading;
 export let Select: t.Select;
 export let SearchableSelect: t.SearchableSelect;
 export let Slider: t.Slider;
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index ec6c0e1ed..f5d30cd76 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -26,6 +26,9 @@ export let FluxDispatcher: t.FluxDispatcher;
 
 waitFor(["dispatch", "subscribe"], m => {
     FluxDispatcher = m;
+    // Non import call to avoid circular dependency
+    Vencord.Plugins.subscribeAllPluginsFluxEvents(m);
+
     const cb = () => {
         m.unsubscribe("CONNECTION_OPEN", cb);
         _resolveReady();
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index db47c875a..d2b569e8d 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -18,66 +18,120 @@
 
 import { WEBPACK_CHUNK } from "@utils/constants";
 import { Logger } from "@utils/Logger";
-import { canonicalizeReplacement } from "@utils/patches";
+import { canonicalizeMatch, canonicalizeReplacement } from "@utils/patches";
 import { PatchReplacement } from "@utils/types";
+import { WebpackInstance } from "discord-types/other";
 
 import { traceFunction } from "../debug/Tracer";
-import { _initWebpack } from ".";
+import { patches } from "../plugins";
+import { _initWebpack, beforeInitListeners, factoryListeners, moduleListeners, subscriptions, wreq } from ".";
+
+const logger = new Logger("WebpackInterceptor", "#8caaee");
+const initCallbackRegex = canonicalizeMatch(/{return \i\(".+?"\)}/);
 
 let webpackChunk: any[];
 
-const logger = new Logger("WebpackInterceptor", "#8caaee");
+// Patch the window webpack chunk setter to monkey patch the push method before any chunks are pushed
+// This way we can patch the factory of everything being pushed to the modules array
+Object.defineProperty(window, WEBPACK_CHUNK, {
+    configurable: true,
 
-if (window[WEBPACK_CHUNK]) {
-    logger.info(`Patching ${WEBPACK_CHUNK}.push (was already existent, likely from cache!)`);
-    _initWebpack(window[WEBPACK_CHUNK]);
-    patchPush(window[WEBPACK_CHUNK]);
-} else {
-    Object.defineProperty(window, WEBPACK_CHUNK, {
-        get: () => webpackChunk,
-        set: v => {
-            if (v?.push) {
-                if (!v.push.$$vencordOriginal) {
-                    logger.info(`Patching ${WEBPACK_CHUNK}.push`);
-                    patchPush(v);
+    get: () => webpackChunk,
+    set: v => {
+        if (v?.push) {
+            if (!v.push.$$vencordOriginal) {
+                logger.info(`Patching ${WEBPACK_CHUNK}.push`);
+                patchPush(v);
+
+                // @ts-ignore
+                delete window[WEBPACK_CHUNK];
+                window[WEBPACK_CHUNK] = v;
+            }
+        }
+
+        webpackChunk = v;
+    }
+});
+
+// wreq.O is the webpack onChunksLoaded function
+// Discord uses it to await for all the chunks to be loaded before initializing the app
+// We monkey patch it to also monkey patch the initialize app callback to get immediate access to the webpack require and run our listeners before doing it
+Object.defineProperty(Function.prototype, "O", {
+    configurable: true,
+
+    set(onChunksLoaded: any) {
+        // When using react devtools or other extensions, or even when discord loads the sentry, we may also catch their webpack here.
+        // This ensures we actually got the right one
+        // this.e (wreq.e) is the method for loading a chunk, and only the main webpack has it
+        if (new Error().stack?.includes("discord.com") && String(this.e).includes("Promise.all")) {
+            logger.info("Found main WebpackRequire.onChunksLoaded");
+
+            delete (Function.prototype as any).O;
+
+            const originalOnChunksLoaded = onChunksLoaded;
+            onChunksLoaded = function (this: unknown, result: any, chunkIds: string[], callback: () => any, priority: number) {
+                if (callback != null && initCallbackRegex.test(callback.toString())) {
+                    Object.defineProperty(this, "O", {
+                        value: originalOnChunksLoaded,
+                        configurable: true
+                    });
+
+                    const wreq = this as WebpackInstance;
+
+                    const originalCallback = callback;
+                    callback = function (this: unknown) {
+                        logger.info("Patched initialize app callback invoked, initializing our internal references to WebpackRequire and running beforeInitListeners");
+                        _initWebpack(wreq);
+
+                        for (const beforeInitListener of beforeInitListeners) {
+                            beforeInitListener(wreq);
+                        }
+
+                        originalCallback.apply(this, arguments as any);
+                    };
+
+                    callback.toString = originalCallback.toString.bind(originalCallback);
+                    arguments[2] = callback;
                 }
 
-                if (_initWebpack(v)) {
-                    logger.info("Successfully initialised Vencord webpack");
-                    // @ts-ignore
-                    delete window[WEBPACK_CHUNK];
-                    window[WEBPACK_CHUNK] = v;
-                }
-            }
-            webpackChunk = v;
-        },
-        configurable: true
-    });
+                originalOnChunksLoaded.apply(this, arguments as any);
+            };
 
-    // wreq.m is the webpack module factory.
-    // normally, this is populated via webpackGlobal.push, which we patch below.
-    // However, Discord has their .m prepopulated.
-    // Thus, we use this hack to immediately access their wreq.m and patch all already existing factories
-    //
-    // Update: Discord now has TWO webpack instances. Their normal one and sentry
-    // Sentry does not push chunks to the global at all, so this same patch now also handles their sentry modules
-    Object.defineProperty(Function.prototype, "m", {
-        set(v: any) {
-            // When using react devtools or other extensions, we may also catch their webpack here.
-            // This ensures we actually got the right one
-            if (new Error().stack?.includes("discord.com")) {
-                logger.info("Found webpack module factory");
-                patchFactories(v);
-            }
+            onChunksLoaded.toString = originalOnChunksLoaded.toString.bind(originalOnChunksLoaded);
+        }
 
-            Object.defineProperty(this, "m", {
-                value: v,
-                configurable: true,
-            });
-        },
-        configurable: true
-    });
-}
+        Object.defineProperty(this, "O", {
+            value: onChunksLoaded,
+            configurable: true
+        });
+    }
+});
+
+// wreq.m is the webpack module factory.
+// normally, this is populated via webpackGlobal.push, which we patch below.
+// However, Discord has their .m prepopulated.
+// Thus, we use this hack to immediately access their wreq.m and patch all already existing factories
+//
+// Update: Discord now has TWO webpack instances. Their normal one and sentry
+// Sentry does not push chunks to the global at all, so this same patch now also handles their sentry modules
+Object.defineProperty(Function.prototype, "m", {
+    configurable: true,
+
+    set(v: any) {
+        // When using react devtools or other extensions, we may also catch their webpack here.
+        // This ensures we actually got the right one
+        const error = new Error();
+        if (error.stack?.includes("discord.com")) {
+            logger.info("Found Webpack module factory", error.stack.match(/\/assets\/(.+?\.js)/)?.[1] ?? "");
+            patchFactories(v);
+        }
+
+        Object.defineProperty(this, "m", {
+            value: v,
+            configurable: true
+        });
+    }
+});
 
 function patchPush(webpackGlobal: any) {
     function handlePush(chunk: any) {
@@ -91,6 +145,7 @@ function patchPush(webpackGlobal: any) {
     }
 
     handlePush.$$vencordOriginal = webpackGlobal.push;
+    handlePush.toString = handlePush.$$vencordOriginal.toString.bind(handlePush.$$vencordOriginal);
     // Webpack overwrites .push with its own push like so: `d.push = n.bind(null, d.push.bind(d));`
     // it wraps the old push (`d.push.bind(d)`). this old push is in this case our handlePush.
     // If we then repatched the new push, we would end up with recursive patching, which leads to our patches
@@ -99,41 +154,41 @@ function patchPush(webpackGlobal: any) {
     handlePush.bind = (...args: unknown[]) => handlePush.$$vencordOriginal.bind(...args);
 
     Object.defineProperty(webpackGlobal, "push", {
+        configurable: true,
+
         get: () => handlePush,
         set(v) {
             handlePush.$$vencordOriginal = v;
-        },
-        configurable: true
+        }
     });
 }
 
-function patchFactories(factories: Record<string | number, (module: { exports: any; }, exports: any, require: any) => void>) {
-    const { subscriptions, listeners } = Vencord.Webpack;
-    const { patches } = Vencord.Plugins;
+let webpackNotInitializedLogged = false;
 
+function patchFactories(factories: Record<string, (module: any, exports: any, require: WebpackInstance) => void>) {
     for (const id in factories) {
         let mod = factories[id];
-        // Discords Webpack chunks for some ungodly reason contain random
-        // newlines. Cyn recommended this workaround and it seems to work fine,
-        // however this could potentially break code, so if anything goes weird,
-        // this is probably why.
-        // Additionally, `[actual newline]` is one less char than "\n", so if Discord
-        // ever targets newer browsers, the minifier could potentially use this trick and
-        // cause issues.
-        //
-        // 0, prefix is to turn it into an expression: 0,function(){} would be invalid syntax without the 0,
-        let code: string = "0," + mod.toString().replaceAll("\n", "");
+
         const originalMod = mod;
         const patchedBy = new Set();
 
-        const factory = factories[id] = function (module, exports, require) {
+        const factory = factories[id] = function (module: any, exports: any, require: WebpackInstance) {
+            if (wreq == null && IS_DEV) {
+                if (!webpackNotInitializedLogged) {
+                    webpackNotInitializedLogged = true;
+                    logger.error("WebpackRequire was not initialized, running modules without patches instead.");
+                }
+
+                return void originalMod(module, exports, require);
+            }
+
             try {
                 mod(module, exports, require);
             } catch (err) {
                 // Just rethrow discord errors
                 if (mod === originalMod) throw err;
 
-                logger.error("Error in patched chunk", err);
+                logger.error("Error in patched module", err);
                 return void originalMod(module, exports, require);
             }
 
@@ -153,11 +208,11 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
                 return;
             }
 
-            for (const callback of listeners) {
+            for (const callback of moduleListeners) {
                 try {
                     callback(exports, id);
                 } catch (err) {
-                    logger.error("Error in webpack listener", err);
+                    logger.error("Error in Webpack module listener:\n", err, callback);
                 }
             }
 
@@ -171,107 +226,127 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
                         callback(exports.default, id);
                     }
                 } catch (err) {
-                    logger.error("Error while firing callback for webpack chunk", err);
+                    logger.error("Error while firing callback for Webpack subscription:\n", err, filter, callback);
                 }
             }
         } as any as { toString: () => string, original: any, (...args: any[]): void; };
 
-        // for some reason throws some error on which calling .toString() leads to infinite recursion
-        // when you force load all chunks???
-        factory.toString = () => mod.toString();
+        factory.toString = originalMod.toString.bind(originalMod);
         factory.original = originalMod;
 
+        for (const factoryListener of factoryListeners) {
+            try {
+                factoryListener(originalMod);
+            } catch (err) {
+                logger.error("Error in Webpack factory listener:\n", err, factoryListener);
+            }
+        }
+
+        // Discords Webpack chunks for some ungodly reason contain random
+        // newlines. Cyn recommended this workaround and it seems to work fine,
+        // however this could potentially break code, so if anything goes weird,
+        // this is probably why.
+        // Additionally, `[actual newline]` is one less char than "\n", so if Discord
+        // ever targets newer browsers, the minifier could potentially use this trick and
+        // cause issues.
+        //
+        // 0, prefix is to turn it into an expression: 0,function(){} would be invalid syntax without the 0,
+        let code: string = "0," + mod.toString().replaceAll("\n", "");
+
         for (let i = 0; i < patches.length; i++) {
             const patch = patches[i];
-            const executePatch = traceFunction(`patch by ${patch.plugin}`, (match: string | RegExp, replace: string) => code.replace(match, replace));
             if (patch.predicate && !patch.predicate()) continue;
+            if (!code.includes(patch.find)) continue;
 
-            if (code.includes(patch.find)) {
-                patchedBy.add(patch.plugin);
+            patchedBy.add(patch.plugin);
 
-                const previousMod = mod;
-                const previousCode = code;
+            const executePatch = traceFunction(`patch by ${patch.plugin}`, (match: string | RegExp, replace: string) => code.replace(match, replace));
+            const previousMod = mod;
+            const previousCode = code;
 
-                // we change all patch.replacement to array in plugins/index
-                for (const replacement of patch.replacement as PatchReplacement[]) {
-                    if (replacement.predicate && !replacement.predicate()) continue;
-                    const lastMod = mod;
-                    const lastCode = code;
+            // We change all patch.replacement to array in plugins/index
+            for (const replacement of patch.replacement as PatchReplacement[]) {
+                if (replacement.predicate && !replacement.predicate()) continue;
 
-                    canonicalizeReplacement(replacement, patch.plugin);
+                const lastMod = mod;
+                const lastCode = code;
 
-                    try {
-                        const newCode = executePatch(replacement.match, replacement.replace as string);
-                        if (newCode === code) {
-                            if (!patch.noWarn) {
-                                logger.warn(`Patch by ${patch.plugin} had no effect (Module id is ${id}): ${replacement.match}`);
-                                if (IS_DEV) {
-                                    logger.debug("Function Source:\n", code);
-                                }
+                canonicalizeReplacement(replacement, patch.plugin);
+
+                try {
+                    const newCode = executePatch(replacement.match, replacement.replace as string);
+                    if (newCode === code) {
+                        if (!patch.noWarn) {
+                            logger.warn(`Patch by ${patch.plugin} had no effect (Module id is ${id}): ${replacement.match}`);
+                            if (IS_DEV) {
+                                logger.debug("Function Source:\n", code);
                             }
-
-                            if (patch.group) {
-                                logger.warn(`Undoing patch group ${patch.find} by ${patch.plugin} because replacement ${replacement.match} had no effect`);
-                                code = previousCode;
-                                mod = previousMod;
-                                patchedBy.delete(patch.plugin);
-                                break;
-                            }
-                        } else {
-                            code = newCode;
-                            mod = (0, eval)(`// Webpack Module ${id} - Patched by ${[...patchedBy].join(", ")}\n${newCode}\n//# sourceURL=WebpackModule${id}`);
-                        }
-                    } catch (err) {
-                        logger.error(`Patch by ${patch.plugin} errored (Module id is ${id}): ${replacement.match}\n`, err);
-
-                        if (IS_DEV) {
-                            const changeSize = code.length - lastCode.length;
-                            const match = lastCode.match(replacement.match)!;
-
-                            // Use 200 surrounding characters of context
-                            const start = Math.max(0, match.index! - 200);
-                            const end = Math.min(lastCode.length, match.index! + match[0].length + 200);
-                            // (changeSize may be negative)
-                            const endPatched = end + changeSize;
-
-                            const context = lastCode.slice(start, end);
-                            const patchedContext = code.slice(start, endPatched);
-
-                            // inline require to avoid including it in !IS_DEV builds
-                            const diff = (require("diff") as typeof import("diff")).diffWordsWithSpace(context, patchedContext);
-                            let fmt = "%c %s ";
-                            const elements = [] as string[];
-                            for (const d of diff) {
-                                const color = d.removed
-                                    ? "red"
-                                    : d.added
-                                        ? "lime"
-                                        : "grey";
-                                fmt += "%c%s";
-                                elements.push("color:" + color, d.value);
-                            }
-
-                            logger.errorCustomFmt(...Logger.makeTitle("white", "Before"), context);
-                            logger.errorCustomFmt(...Logger.makeTitle("white", "After"), patchedContext);
-                            const [titleFmt, ...titleElements] = Logger.makeTitle("white", "Diff");
-                            logger.errorCustomFmt(titleFmt + fmt, ...titleElements, ...elements);
                         }
 
-                        patchedBy.delete(patch.plugin);
                         if (patch.group) {
-                            logger.warn(`Undoing patch group ${patch.find} by ${patch.plugin} because replacement ${replacement.match} errored`);
-                            code = previousCode;
+                            logger.warn(`Undoing patch group ${patch.find} by ${patch.plugin} because replacement ${replacement.match} had no effect`);
                             mod = previousMod;
+                            code = previousCode;
+                            patchedBy.delete(patch.plugin);
                             break;
                         }
 
-                        code = lastCode;
-                        mod = lastMod;
+                        continue;
                     }
-                }
 
-                if (!patch.all) patches.splice(i--, 1);
+                    code = newCode;
+                    mod = (0, eval)(`// Webpack Module ${id} - Patched by ${[...patchedBy].join(", ")}\n${newCode}\n//# sourceURL=WebpackModule${id}`);
+                } catch (err) {
+                    logger.error(`Patch by ${patch.plugin} errored (Module id is ${id}): ${replacement.match}\n`, err);
+
+                    if (IS_DEV) {
+                        const changeSize = code.length - lastCode.length;
+                        const match = lastCode.match(replacement.match)!;
+
+                        // Use 200 surrounding characters of context
+                        const start = Math.max(0, match.index! - 200);
+                        const end = Math.min(lastCode.length, match.index! + match[0].length + 200);
+                        // (changeSize may be negative)
+                        const endPatched = end + changeSize;
+
+                        const context = lastCode.slice(start, end);
+                        const patchedContext = code.slice(start, endPatched);
+
+                        // inline require to avoid including it in !IS_DEV builds
+                        const diff = (require("diff") as typeof import("diff")).diffWordsWithSpace(context, patchedContext);
+                        let fmt = "%c %s ";
+                        const elements = [] as string[];
+                        for (const d of diff) {
+                            const color = d.removed
+                                ? "red"
+                                : d.added
+                                    ? "lime"
+                                    : "grey";
+                            fmt += "%c%s";
+                            elements.push("color:" + color, d.value);
+                        }
+
+                        logger.errorCustomFmt(...Logger.makeTitle("white", "Before"), context);
+                        logger.errorCustomFmt(...Logger.makeTitle("white", "After"), patchedContext);
+                        const [titleFmt, ...titleElements] = Logger.makeTitle("white", "Diff");
+                        logger.errorCustomFmt(titleFmt + fmt, ...titleElements, ...elements);
+                    }
+
+                    patchedBy.delete(patch.plugin);
+
+                    if (patch.group) {
+                        logger.warn(`Undoing patch group ${patch.find} by ${patch.plugin} because replacement ${replacement.match} errored`);
+                        mod = previousMod;
+                        code = previousCode;
+                        break;
+                    }
+
+                    mod = lastMod;
+                    code = lastCode;
+                }
             }
+
+            if (!patch.all) patches.splice(i--, 1);
         }
     }
 }
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 564da4813..34a9b69c9 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -68,20 +68,16 @@ export const filters = {
     }
 };
 
-export const subscriptions = new Map<FilterFn, CallbackFn>();
-export const listeners = new Set<CallbackFn>();
-
 export type CallbackFn = (mod: any, id: string) => void;
 
-export function _initWebpack(instance: typeof window.webpackChunkdiscord_app) {
-    if (cache !== void 0) throw "no.";
+export const subscriptions = new Map<FilterFn, CallbackFn>();
+export const moduleListeners = new Set<CallbackFn>();
+export const factoryListeners = new Set<(factory: (module: any, exports: any, require: WebpackInstance) => void) => void>();
+export const beforeInitListeners = new Set<(wreq: WebpackInstance) => void>();
 
-    instance.push([[Symbol("Vencord")], {}, r => wreq = r]);
-    instance.pop();
-    if (!wreq) return false;
-
-    cache = wreq.c;
-    return true;
+export function _initWebpack(webpackRequire: WebpackInstance) {
+    wreq = webpackRequire;
+    cache = webpackRequire.c;
 }
 
 let devToolsOpen = false;
@@ -425,7 +421,7 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = Def
 
     const match = module.toString().match(canonicalizeMatch(matcher));
     if (!match) {
-        const err = new Error("extractAndLoadChunks: Couldn't find entry point id in module factory code");
+        const err = new Error("extractAndLoadChunks: Couldn't find chunk loading in module factory code");
         logger.warn(err, "Code:", code, "Matcher:", matcher);
 
         // Strict behaviour in DevBuilds to fail early and make sure the issue is found
@@ -491,14 +487,6 @@ export function waitFor(filter: string | string[] | FilterFn, callback: Callback
     subscriptions.set(filter, callback);
 }
 
-export function addListener(callback: CallbackFn) {
-    listeners.add(callback);
-}
-
-export function removeListener(callback: CallbackFn) {
-    listeners.delete(callback);
-}
-
 /**
  * Search modules by keyword. This searches the factory methods,
  * meaning you can search all sorts of things, displayName, methodName, strings somewhere in the code, etc

From 85d6d74a3e14ed4a1cc83c8131b83c08cfdce04a Mon Sep 17 00:00:00 2001
From: HAHALOSAH <67280050+HAHALOSAH@users.noreply.github.com>
Date: Thu, 2 May 2024 23:00:00 +0000
Subject: [PATCH 490/632] messageLogger: fix niche bug ignoring edits when
 content is same (#2403)

---
 src/plugins/messageLogger/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index c3a25e1b6..988cd8e39 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -255,7 +255,7 @@ export default definePlugin({
                     replace: "$1" +
                         ".update($3,m =>" +
                         "   (($2.message.flags & 64) === 64 || $self.shouldIgnore($2.message, true)) ? m :" +
-                        "   $2.message.content !== m.editHistory?.[0]?.content && $2.message.content !== m.content ?" +
+                        "   $2.message.content !== m.content ?" +
                         "       m.set('editHistory',[...(m.editHistory || []), $self.makeEdit($2.message, m)]) :" +
                         "       m" +
                         ")" +

From 86b53b24a66048c5b961f43575611fcdcb83b753 Mon Sep 17 00:00:00 2001
From: dolfies <jeyalfie47@gmail.com>
Date: Thu, 2 May 2024 19:09:53 -0400
Subject: [PATCH 491/632] feat(plugin): PauseInvitesForever (#2372)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/pauseInvitesForever/README.md |  5 ++
 src/plugins/pauseInvitesForever/index.tsx | 74 +++++++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 src/plugins/pauseInvitesForever/README.md
 create mode 100644 src/plugins/pauseInvitesForever/index.tsx

diff --git a/src/plugins/pauseInvitesForever/README.md b/src/plugins/pauseInvitesForever/README.md
new file mode 100644
index 000000000..7ccf0b72f
--- /dev/null
+++ b/src/plugins/pauseInvitesForever/README.md
@@ -0,0 +1,5 @@
+# PauseInvitesForever
+
+Adds a button to the Security Actions modal to to pause invites indefinitely.
+
+![](https://github.com/Vendicated/Vencord/assets/47677887/e5ba40a3-cb08-462a-8615-fb74dd54c790)
diff --git a/src/plugins/pauseInvitesForever/index.tsx b/src/plugins/pauseInvitesForever/index.tsx
new file mode 100644
index 000000000..81f18fd6e
--- /dev/null
+++ b/src/plugins/pauseInvitesForever/index.tsx
@@ -0,0 +1,74 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+import { GuildStore, RestAPI } from "@webpack/common";
+
+const Messages = findByPropsLazy("GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION");
+const { InvitesDisabledExperiment } = findByPropsLazy("InvitesDisabledExperiment");
+
+export default definePlugin({
+    name: "PauseInvitesForever",
+    tags: ["DisableInvitesForever"],
+    description: "Brings back the option to pause invites indefinitely that stupit Discord removed.",
+    authors: [Devs.Dolfies, Devs.amia],
+
+    patches: [
+        {
+            find: "Messages.GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION",
+            replacement: [{
+                match: /children:\i\.\i\.\i\.GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION/,
+                replace: "children: $self.renderInvitesLabel(arguments[0].guildId, setChecked)",
+            },
+            {
+                match: /(\i\.hasDMsDisabled\)\(\i\),\[\i,(\i)\]=\i\.useState\(\i\))/,
+                replace: "$1,setChecked=$2"
+            }]
+        }
+    ],
+
+    showDisableInvites(guildId: string) {
+        // Once the experiment is removed, this should keep working
+        const { enableInvitesDisabled } = InvitesDisabledExperiment?.getCurrentConfig?.({ guildId }) ?? { enableInvitesDisabled: true };
+        // @ts-ignore
+        return enableInvitesDisabled && !GuildStore.getGuild(guildId).hasFeature("INVITES_DISABLED");
+    },
+
+    disableInvites(guildId: string) {
+        const guild = GuildStore.getGuild(guildId);
+        const features = [...guild.features, "INVITES_DISABLED"];
+        RestAPI.patch({
+            url: `/guilds/${guild.id}`,
+            body: { features },
+        });
+    },
+
+    renderInvitesLabel(guildId: string, setChecked: Function) {
+        return (
+            <div>
+                {Messages.GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION}
+                {this.showDisableInvites(guildId) && <a role="button" onClick={() => {
+                    setChecked(true);
+                    this.disableInvites(guildId);
+                }}> Pause Indefinitely.</a>}
+            </div>
+        );
+    }
+});

From 84c53b4a27404059446f3748af32cb4da8d2bac0 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 3 May 2024 04:52:07 -0300
Subject: [PATCH 492/632] MoreUserTags: Remove old workaround;
 MessageClickActions: Move finds outside of start

---
 src/plugins/messageClickActions/index.ts |  7 +++----
 src/plugins/moreUserTags/index.tsx       | 12 +++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/plugins/messageClickActions/index.ts b/src/plugins/messageClickActions/index.ts
index 052c33f61..3d4bb21bb 100644
--- a/src/plugins/messageClickActions/index.ts
+++ b/src/plugins/messageClickActions/index.ts
@@ -23,11 +23,13 @@ import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { FluxDispatcher, PermissionsBits, PermissionStore, UserStore } from "@webpack/common";
 
+const MessageActions = findByPropsLazy("deleteMessage", "startEditMessage");
+const EditStore = findByPropsLazy("isEditing", "isEditingAny");
+
 let isDeletePressed = false;
 const keydown = (e: KeyboardEvent) => e.key === "Backspace" && (isDeletePressed = true);
 const keyup = (e: KeyboardEvent) => e.key === "Backspace" && (isDeletePressed = false);
 
-
 const settings = definePluginSettings({
     enableDeleteOnClick: {
         type: OptionType.BOOLEAN,
@@ -60,9 +62,6 @@ export default definePlugin({
     settings,
 
     start() {
-        const MessageActions = findByPropsLazy("deleteMessage", "startEditMessage");
-        const EditStore = findByPropsLazy("isEditing", "isEditingAny");
-
         document.addEventListener("keydown", keydown);
         document.addEventListener("keyup", keyup);
 
diff --git a/src/plugins/moreUserTags/index.tsx b/src/plugins/moreUserTags/index.tsx
index 4ac542216..df47e5456 100644
--- a/src/plugins/moreUserTags/index.tsx
+++ b/src/plugins/moreUserTags/index.tsx
@@ -198,8 +198,7 @@ export default definePlugin({
             replacement: [
                 // make the tag show the right text
                 {
-                    // FIXME: Remove the BOT_TAG_BOT variant when the change arrives in stable
-                    match: /(switch\((\i)\){.+?)case (\i(?:\.\i)?)\.BOT:default:(\i)=.{0,40}(\i\.\i\.Messages)\.(?:APP_TAG|BOT_TAG_BOT)/,
+                    match: /(switch\((\i)\){.+?)case (\i(?:\.\i)?)\.BOT:default:(\i)=.{0,40}(\i\.\i\.Messages)\.APP_TAG/,
                     replace: (_, origSwitch, variant, tags, displayedText, strings) =>
                         `${origSwitch}default:{${displayedText} = $self.getTagText(${tags}[${variant}], ${strings})}`
                 },
@@ -322,20 +321,19 @@ export default definePlugin({
 
     isOPTag: (tag: number) => tag === Tag.Types.ORIGINAL_POSTER || tags.some(t => tag === Tag.Types[`${t.name}-OP`]),
 
-    // FIXME: Remove the BOT_TAG_BOT variants from strings when the change arrives in stable
     getTagText(passedTagName: string, strings: Record<string, string>) {
-        if (!passedTagName) return strings.APP_TAG ?? strings.BOT_TAG_BOT;
+        if (!passedTagName) return strings.APP_TAG;
         const [tagName, variant] = passedTagName.split("-");
         const tag = tags.find(({ name }) => tagName === name);
-        if (!tag) return strings.APP_TAG ?? strings.BOT_TAG_BOT;
-        if (variant === "BOT" && tagName !== "WEBHOOK" && this.settings.store.dontShowForBots) return strings.APP_TAG ?? strings.BOT_TAG_BOT;
+        if (!tag) return strings.APP_TAG;
+        if (variant === "BOT" && tagName !== "WEBHOOK" && this.settings.store.dontShowForBots) return strings.APP_TAG;
 
         const tagText = settings.store.tagSettings?.[tag.name]?.text || tag.displayName;
         switch (variant) {
             case "OP":
                 return `${strings.BOT_TAG_FORUM_ORIGINAL_POSTER} • ${tagText}`;
             case "BOT":
-                return `${strings.APP_TAG ?? strings.BOT_TAG_BOT} • ${tagText}`;
+                return `${strings.APP_TAG} • ${tagText}`;
             default:
                 return tagText;
         }

From 03d7e0fb93a32c2ee6984cfdb7e2d5ea3f4de127 Mon Sep 17 00:00:00 2001
From: dolfies <jeyalfie47@gmail.com>
Date: Fri, 3 May 2024 09:09:54 -0400
Subject: [PATCH 493/632] fix sort conflict of ImplicitRelationships &
 SortFriendRequests (#2408)

---
 src/plugins/implicitRelationships/index.ts | 8 ++++----
 src/plugins/sortFriendRequests/index.tsx   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/implicitRelationships/index.ts b/src/plugins/implicitRelationships/index.ts
index be17e0fe4..15165d64a 100644
--- a/src/plugins/implicitRelationships/index.ts
+++ b/src/plugins/implicitRelationships/index.ts
@@ -81,8 +81,8 @@ export default definePlugin({
             find: "getRelationshipCounts(){",
             replacement: {
                 predicate: () => Settings.plugins.ImplicitRelationships.sortByAffinity,
-                match: /\.sortBy\(\i=>\i\.comparator\)/,
-                replace: "$&.sortBy((row) => $self.sortList(row))"
+                match: /\}\)\.sortBy\((.+?)\)\.value\(\)/,
+                replace: "}).sortBy(row => $self.wrapSort(($1), row)).value()"
             }
         },
 
@@ -120,10 +120,10 @@ export default definePlugin({
         }
     ),
 
-    sortList(row: any) {
+    wrapSort(comparator: Function, row: any) {
         return row.type === 5
             ? -UserAffinitiesStore.getUserAffinity(row.user.id)?.affinity ?? 0
-            : row.comparator;
+            : comparator(row);
     },
 
     async fetchImplicitRelationships() {
diff --git a/src/plugins/sortFriendRequests/index.tsx b/src/plugins/sortFriendRequests/index.tsx
index 32579a803..7033591bd 100644
--- a/src/plugins/sortFriendRequests/index.tsx
+++ b/src/plugins/sortFriendRequests/index.tsx
@@ -41,8 +41,8 @@ export default definePlugin({
     patches: [{
         find: "getRelationshipCounts(){",
         replacement: {
-            match: /\.sortBy\(\i=>\i\.comparator\)/,
-            replace: "$&.sortBy((row) => $self.sortList(row))"
+            match: /\}\)\.sortBy\((.+?)\)\.value\(\)/,
+            replace: "}).sortBy(row => $self.wrapSort(($1), row)).value()"
         }
     }, {
         find: ".Messages.FRIEND_REQUEST_CANCEL",
@@ -53,10 +53,10 @@ export default definePlugin({
         }
     }],
 
-    sortList(row: any) {
+    wrapSort(comparator: Function, row: any) {
         return row.type === 3 || row.type === 4
             ? -this.getSince(row.user)
-            : row.comparator;
+            : comparator(row);
     },
 
     getSince(user: User) {

From 315f4f4e587f1d15f69b94c0d1b89b42f43c5eaf Mon Sep 17 00:00:00 2001
From: Sqaaakoi <sqaaakoi-git@sqaaakoi.xyz>
Date: Sat, 4 May 2024 01:17:12 +1200
Subject: [PATCH 494/632] ReviewDB: add more context menu shortcuts to view
 reviews (#2382)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/reviewDB/index.tsx | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/plugins/reviewDB/index.tsx b/src/plugins/reviewDB/index.tsx
index 0c3578b07..bcd0f163f 100644
--- a/src/plugins/reviewDB/index.tsx
+++ b/src/plugins/reviewDB/index.tsx
@@ -35,13 +35,25 @@ import { getCurrentUserInfo, readNotification } from "./reviewDbApi";
 import { settings } from "./settings";
 import { showToast } from "./utils";
 
-const guildPopoutPatch: NavContextMenuPatchCallback = (children, props: { guild: Guild, onClose(): void; }) => {
+const guildPopoutPatch: NavContextMenuPatchCallback = (children, { guild }: { guild: Guild, onClose(): void; }) => {
     children.push(
         <Menu.MenuItem
             label="View Reviews"
             id="vc-rdb-server-reviews"
             icon={OpenExternalIcon}
-            action={() => openReviewsModal(props.guild.id, props.guild.name)}
+            action={() => openReviewsModal(guild.id, guild.name)}
+        />
+    );
+};
+
+const userContextPatch: NavContextMenuPatchCallback = (children, { user }: { user?: User, onClose(): void; }) => {
+    if (!user) return;
+    children.push(
+        <Menu.MenuItem
+            label="View Reviews"
+            id="vc-rdb-user-reviews"
+            icon={OpenExternalIcon}
+            action={() => openReviewsModal(user.id, user.username)}
         />
     );
 };
@@ -53,7 +65,10 @@ export default definePlugin({
 
     settings,
     contextMenus: {
-        "guild-header-popout": guildPopoutPatch
+        "guild-header-popout": guildPopoutPatch,
+        "guild-context": guildPopoutPatch,
+        "user-context": userContextPatch,
+        "user-profile-actions": userContextPatch
     },
 
     patches: [

From 1af44b25f3fa3c6be7ddf66eea82c1adbc087a5a Mon Sep 17 00:00:00 2001
From: katlyn <17418611+katlyn@users.noreply.github.com>
Date: Fri, 3 May 2024 06:51:53 -0800
Subject: [PATCH 495/632] feat(USRBG): update to new API (#2388)

---
 src/plugins/usrbg/index.tsx | 41 +++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/plugins/usrbg/index.tsx b/src/plugins/usrbg/index.tsx
index ce6bd709b..b92839a9a 100644
--- a/src/plugins/usrbg/index.tsx
+++ b/src/plugins/usrbg/index.tsx
@@ -24,9 +24,14 @@ import definePlugin, { OptionType } from "@utils/types";
 
 import style from "./index.css?managed";
 
-const BASE_URL = "https://raw.githubusercontent.com/AutumnVN/usrbg/main/usrbg.json";
+const API_URL = "https://usrbg.is-hardly.online/users";
 
-let data = {} as Record<string, string>;
+interface UsrbgApiReturn {
+    endpoint: string
+    bucket: string
+    prefix: string
+    users: Record<string, string>
+}
 
 const settings = definePluginSettings({
     nitroFirst: {
@@ -48,7 +53,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "USRBG",
     description: "Displays user banners from USRBG, allowing anyone to get a banner without Nitro",
-    authors: [Devs.AutumnVN, Devs.pylix, Devs.TheKodeToad],
+    authors: [Devs.AutumnVN, Devs.katlyn, Devs.pylix, Devs.TheKodeToad],
     settings,
     patches: [
         {
@@ -80,8 +85,7 @@ export default definePlugin({
         }
     ],
 
-
-    data,
+    data: null as UsrbgApiReturn | null,
 
     settingsAboutComponent: () => {
         return (
@@ -91,9 +95,9 @@ export default definePlugin({
 
     voiceBackgroundHook({ className, participantUserId }: any) {
         if (className.includes("tile_")) {
-            if (data[participantUserId]) {
+            if (this.userHasBackground(participantUserId)) {
                 return {
-                    backgroundImage: `url(${data[participantUserId]})`,
+                    backgroundImage: `url(${this.getImageUrl(participantUserId)})`,
                     backgroundSize: "cover",
                     backgroundPosition: "center",
                     backgroundRepeat: "no-repeat"
@@ -104,24 +108,35 @@ export default definePlugin({
 
     useBannerHook({ displayProfile, user }: any) {
         if (displayProfile?.banner && settings.store.nitroFirst) return;
-        if (data[user.id]) return data[user.id];
+        if (this.userHasBackground(user.id)) return this.getImageUrl(user.id);
     },
 
     premiumHook({ userId }: any) {
-        if (data[userId]) return 2;
+        if (this.userHasBackground(userId)) return 2;
     },
 
     shouldShowBadge({ displayProfile, user }: any) {
-        return displayProfile?.banner && (!data[user.id] || settings.store.nitroFirst);
+        return displayProfile?.banner && (!this.userHasBackground(user.id) || settings.store.nitroFirst);
+    },
+
+    userHasBackground(userId: string) {
+        return !!this.data?.users[userId];
+    },
+
+    getImageUrl(userId: string): string|null {
+        if (!this.userHasBackground(userId)) return null;
+
+        // We can assert that data exists because userHasBackground returned true
+        const { endpoint, bucket, prefix, users: { [userId]: etag } } = this.data!;
+        return `${endpoint}/${bucket}/${prefix}${userId}?${etag}`;
     },
 
     async start() {
         enableStyle(style);
 
-        const res = await fetch(BASE_URL);
+        const res = await fetch(API_URL);
         if (res.ok) {
-            data = await res.json();
-            this.data = data;
+            this.data = await res.json();
         }
     }
 });

From 78183eb226c360dbdd978c32ea08ccc9ac38f475 Mon Sep 17 00:00:00 2001
From: sunnie <78964224+sunnniee@users.noreply.github.com>
Date: Fri, 3 May 2024 23:00:42 +0300
Subject: [PATCH 496/632] MsgClickActions: control ping via shift &
 NoReplyMention plugin (#2390)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/messageClickActions/index.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/plugins/messageClickActions/index.ts b/src/plugins/messageClickActions/index.ts
index 3d4bb21bb..14899c367 100644
--- a/src/plugins/messageClickActions/index.ts
+++ b/src/plugins/messageClickActions/index.ts
@@ -17,7 +17,7 @@
 */
 
 import { addClickListener, removeClickListener } from "@api/MessageEvents";
-import { definePluginSettings, Settings } from "@api/Settings";
+import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
@@ -84,11 +84,17 @@ export default definePlugin({
                     const EPHEMERAL = 64;
                     if (msg.hasFlag(EPHEMERAL)) return;
 
+                    const isShiftPress = event.shiftKey && !settings.store.requireModifier;
+                    const NoReplyMention = Vencord.Plugins.plugins.NoReplyMention as any as typeof import("../noReplyMention").default;
+                    const shouldMention = Vencord.Plugins.isPluginEnabled("NoReplyMention")
+                        ? NoReplyMention.shouldMention(msg, isShiftPress)
+                        : !isShiftPress;
+
                     FluxDispatcher.dispatch({
                         type: "CREATE_PENDING_REPLY",
                         channel,
                         message: msg,
-                        shouldMention: !Settings.plugins.NoReplyMention.enabled,
+                        shouldMention,
                         showMentionToggle: channel.guild_id !== null
                     });
                 }

From 520e9151681db577007ab8a5b6a1ecb5b9aae7b8 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 3 May 2024 22:18:31 +0200
Subject: [PATCH 497/632] fix badges with custom component

---
 src/plugins/_api/badges.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/_api/badges.tsx b/src/plugins/_api/badges.tsx
index 6cbe1feb0..3cfbb4d99 100644
--- a/src/plugins/_api/badges.tsx
+++ b/src/plugins/_api/badges.tsx
@@ -78,7 +78,7 @@ export default definePlugin({
                 },
                 // replace their component with ours if applicable
                 {
-                    match: /(?<=text:(\i)\.description,spacing:12,)children:/,
+                    match: /(?<=text:(\i)\.description,spacing:12,.{0,50})children:/,
                     replace: "children:$1.component ? () => $self.renderBadgeComponent($1) :"
                 },
                 // conditionally override their onClick with badge.onClick if it exists

From 0350db76908d847d14a863fbd7bdf8f282cf6395 Mon Sep 17 00:00:00 2001
From: Kyuuhachi <1547062+Kyuuhachi@users.noreply.github.com>
Date: Fri, 3 May 2024 22:42:14 +0200
Subject: [PATCH 498/632] feat(plugin): ImageLink (#2297)

---
 src/plugins/imageLink/README.md |  3 +++
 src/plugins/imageLink/index.ts  | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 src/plugins/imageLink/README.md
 create mode 100644 src/plugins/imageLink/index.ts

diff --git a/src/plugins/imageLink/README.md b/src/plugins/imageLink/README.md
new file mode 100644
index 000000000..add657948
--- /dev/null
+++ b/src/plugins/imageLink/README.md
@@ -0,0 +1,3 @@
+# ImageLink
+
+If a message consists of only a link to an image, Discord hides the link and shows only the image embed. This plugin makes the link show regardless.
diff --git a/src/plugins/imageLink/index.ts b/src/plugins/imageLink/index.ts
new file mode 100644
index 000000000..73a977fa9
--- /dev/null
+++ b/src/plugins/imageLink/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "ImageLink",
+    description: "Never hide image links in messages, even if it's the only content",
+    authors: [Devs.Kyuuhachi],
+
+    patches: [
+        {
+            find: "isEmbedInline:function()",
+            replacement: {
+                match: /(?<=isEmbedInline:function\(\)\{return )\i(?=\})/,
+                replace: "()=>false",
+            },
+        },
+    ],
+});

From 1ef87361f2f4c9117c45aab321a8c8c236e4f10d Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 3 May 2024 18:47:15 -0300
Subject: [PATCH 499/632] Test Patches: Faster chromium setup; Update action
 versions (#2412)

---
 .github/workflows/reportBrokenPlugins.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/reportBrokenPlugins.yml b/.github/workflows/reportBrokenPlugins.yml
index 4b09463e0..12cbb0770 100644
--- a/.github/workflows/reportBrokenPlugins.yml
+++ b/.github/workflows/reportBrokenPlugins.yml
@@ -11,20 +11,20 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               if: ${{ github.event_name == 'schedule' }}
               with:
                   ref: dev
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               if: ${{ github.event_name == 'workflow_dispatch' }}
 
-            - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
+            - uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
 
-            - name: Use Node.js 19
-              uses: actions/setup-node@v3
+            - name: Use Node.js 18
+              uses: actions/setup-node@v4
               with:
-                  node-version: 19
+                  node-version: 18
                   cache: "pnpm"
 
             - name: Install dependencies
@@ -32,7 +32,11 @@ jobs:
                   pnpm install --frozen-lockfile
                   pnpm add puppeteer
 
-                  sudo apt-get install -y chromium-browser
+            - name: Install Google Chrome
+              id: setup-chrome
+              uses: browser-actions/setup-chrome@82b9ce628cc5595478a9ebadc480958a36457dc2
+              with:
+                chrome-version: stable
 
             - name: Build web
               run: pnpm buildWeb --standalone --dev
@@ -41,7 +45,7 @@ jobs:
               timeout-minutes: 10
               run: |
                   export PATH="$PWD/node_modules/.bin:$PATH"
-                  export CHROMIUM_BIN=$(which chromium-browser)
+                  export CHROMIUM_BIN=${{ steps.setup-chrome.outputs.chrome-path }}
 
                   esbuild scripts/generateReport.ts > dist/report.mjs
                   node dist/report.mjs >> $GITHUB_STEP_SUMMARY
@@ -54,7 +58,7 @@ jobs:
               if: success() || failure() # even run if previous one failed
               run: |
                   export PATH="$PWD/node_modules/.bin:$PATH"
-                  export CHROMIUM_BIN=$(which chromium-browser)
+                  export CHROMIUM_BIN=${{ steps.setup-chrome.outputs.chrome-path }}
                   export USE_CANARY=true
 
                   esbuild scripts/generateReport.ts > dist/report.mjs

From 54bb7b96e90ebaee308aebe578122591a27f0727 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 3 May 2024 18:58:56 -0300
Subject: [PATCH 500/632] Test Patches: Remove pnpm add puppeteer as it's
 already in deps

---
 .github/workflows/reportBrokenPlugins.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/reportBrokenPlugins.yml b/.github/workflows/reportBrokenPlugins.yml
index 12cbb0770..39d639988 100644
--- a/.github/workflows/reportBrokenPlugins.yml
+++ b/.github/workflows/reportBrokenPlugins.yml
@@ -30,7 +30,6 @@ jobs:
             - name: Install dependencies
               run: |
                   pnpm install --frozen-lockfile
-                  pnpm add puppeteer
 
             - name: Install Google Chrome
               id: setup-chrome

From a98f12bd1eabd0746834225c4ba3e6c755fe5fd1 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 3 May 2024 19:07:43 -0300
Subject: [PATCH 501/632] SecretRingToneEnabler: Fix patch

---
 src/plugins/secretRingTone/index.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/secretRingTone/index.ts b/src/plugins/secretRingTone/index.ts
index 8f0176f88..9c3956a80 100644
--- a/src/plugins/secretRingTone/index.ts
+++ b/src/plugins/secretRingTone/index.ts
@@ -14,10 +14,11 @@ export default definePlugin({
     authors: [Devs.AndrewDLO, Devs.FieryFlames],
     patches: [
         {
-            find: "call_ringing_beat\"",
+            find: '"call_ringing_beat"',
             replacement: {
-                match: /500===\i\(\)\.random\(1,1e3\)/,
-                replace: "true"
+                // FIXME Remove === alternative when it hits stable
+                match: /500(!==|===)\i\(\)\.random\(1,1e3\)/,
+                replace: (_, predicate) => predicate === "!==" ? "false" : "true",
             }
         },
     ],

From a6c09bc9099832c88a83939bee776fc7d21f1f06 Mon Sep 17 00:00:00 2001
From: dolfies <jeyalfie47@gmail.com>
Date: Fri, 3 May 2024 18:21:02 -0400
Subject: [PATCH 502/632] feat(ValidUser): also display badges & banner (#2235)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/validUser/index.tsx | 72 +++++++++++++++++++++++++++++++--
 src/webpack/common/utils.ts     |  3 +-
 2 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/src/plugins/validUser/index.tsx b/src/plugins/validUser/index.tsx
index 2fce693e8..7a21ac86b 100644
--- a/src/plugins/validUser/index.tsx
+++ b/src/plugins/validUser/index.tsx
@@ -21,12 +21,37 @@ import { Devs } from "@utils/constants";
 import { sleep } from "@utils/misc";
 import { Queue } from "@utils/Queue";
 import definePlugin from "@utils/types";
-import { UserStore, UserUtils, useState } from "@webpack/common";
+import { Constants, FluxDispatcher, RestAPI, UserProfileStore, UserStore, useState } from "@webpack/common";
 import type { ComponentType, ReactNode } from "react";
 
+// LYING to the type checker here
+const UserFlags = Constants.UserFlags as Record<string, number>;
+const badges: Record<string, ProfileBadge> = {
+    "active_developer": { id: "active_developer", description: "Active Developer", icon: "6bdc42827a38498929a4920da12695d9", link: "https://support-dev.discord.com/hc/en-us/articles/10113997751447" },
+    "bug_hunter_level_1": { id: "bug_hunter_level_1", description: "Discord Bug Hunter", icon: "2717692c7dca7289b35297368a940dd0", link: "https://support.discord.com/hc/en-us/articles/360046057772-Discord-Bugs" },
+    "bug_hunter_level_2": { id: "bug_hunter_level_2", description: "Discord Bug Hunter", icon: "848f79194d4be5ff5f81505cbd0ce1e6", link: "https://support.discord.com/hc/en-us/articles/360046057772-Discord-Bugs" },
+    "certified_moderator": { id: "certified_moderator", description: "Moderator Programs Alumni", icon: "fee1624003e2fee35cb398e125dc479b", link: "https://discord.com/safety" },
+    "discord_employee": { id: "staff", description: "Discord Staff", icon: "5e74e9b61934fc1f67c65515d1f7e60d", link: "https://discord.com/company" },
+    "hypesquad": { id: "hypesquad", description: "HypeSquad Events", icon: "bf01d1073931f921909045f3a39fd264", link: "https://discord.com/hypesquad" },
+    "hypesquad_online_house_1": { id: "hypesquad_house_1", description: "HypeSquad Bravery", icon: "8a88d63823d8a71cd5e390baa45efa02", link: "https://discord.com/settings/hypesquad-online" },
+    "hypesquad_online_house_2": { id: "hypesquad_house_2", description: "HypeSquad Brilliance", icon: "011940fd013da3f7fb926e4a1cd2e618", link: "https://discord.com/settings/hypesquad-online" },
+    "hypesquad_online_house_3": { id: "hypesquad_house_3", description: "HypeSquad Balance", icon: "3aa41de486fa12454c3761e8e223442e", link: "https://discord.com/settings/hypesquad-online" },
+    "partner": { id: "partner", description: "Partnered Server Owner", icon: "3f9748e53446a137a052f3454e2de41e", link: "https://discord.com/partners" },
+    "premium": { id: "premium", description: "Subscriber", icon: "2ba85e8026a8614b640c2837bcdfe21b", link: "https://discord.com/settings/premium" },
+    "premium_early_supporter": { id: "early_supporter", description: "Early Supporter", icon: "7060786766c9c840eb3019e725d2b358", link: "https://discord.com/settings/premium" },
+    "verified_developer": { id: "verified_developer", description: "Early Verified Bot Developer", icon: "6df5892e0f35b051f8b61eace34f4967" },
+};
+
 const fetching = new Set<string>();
 const queue = new Queue(5);
 
+interface ProfileBadge {
+    id: string;
+    description: string;
+    icon: string;
+    link?: string;
+}
+
 interface MentionProps {
     data: {
         userId?: string;
@@ -43,6 +68,45 @@ interface MentionProps {
     UserMention: ComponentType<any>;
 }
 
+async function getUser(id: string) {
+    let userObj = UserStore.getUser(id);
+    if (userObj)
+        return userObj;
+
+    const user: any = await RestAPI.get({ url: `/users/${id}` }).then(response => {
+        FluxDispatcher.dispatch({
+            type: "USER_UPDATE",
+            user: response.body,
+        });
+
+        return response.body;
+    });
+
+    // Populate the profile
+    await FluxDispatcher.dispatch(
+        {
+            type: "USER_PROFILE_FETCH_FAILURE",
+            userId: id,
+        }
+    );
+
+    userObj = UserStore.getUser(id);
+    const fakeBadges: ProfileBadge[] = Object.entries(UserFlags)
+        .filter(([_, flag]) => !isNaN(flag) && userObj.hasFlag(flag))
+        .map(([key]) => badges[key.toLowerCase()]);
+    if (user.premium_type || !user.bot && (user.banner || user.avatar?.startsWith?.("a_")))
+        fakeBadges.push(badges.premium);
+
+    // Fill in what we can deduce
+    const profile = UserProfileStore.getUserProfile(id);
+    profile.accentColor = user.accent_color;
+    profile.badges = fakeBadges;
+    profile.banner = user.banner;
+    profile.premiumType = user.premium_type;
+
+    return userObj;
+}
+
 function MentionWrapper({ data, UserMention, RoleMention, parse, props }: MentionProps) {
     const [userId, setUserId] = useState(data.userId);
 
@@ -85,14 +149,14 @@ function MentionWrapper({ data, UserMention, RoleMention, parse, props }: Mentio
                         fetching.add(id);
 
                         queue.unshift(() =>
-                            UserUtils.getUser(id)
+                            getUser(id)
                                 .then(() => {
                                     setUserId(id);
                                     fetching.delete(id);
                                 })
                                 .catch(e => {
                                     if (e?.status === 429) {
-                                        queue.unshift(() => sleep(1000).then(fetch));
+                                        queue.unshift(() => sleep(e?.body?.retry_after ?? 1000).then(fetch));
                                         fetching.delete(id);
                                     }
                                 })
@@ -112,7 +176,7 @@ function MentionWrapper({ data, UserMention, RoleMention, parse, props }: Mentio
 export default definePlugin({
     name: "ValidUser",
     description: "Fix mentions for unknown users showing up as '@unknown-user' (hover over a mention to fix it)",
-    authors: [Devs.Ven],
+    authors: [Devs.Ven, Devs.Dolfies],
     tags: ["MentionCacheFix"],
 
     patches: [
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index f5d30cd76..6d74e9b25 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -23,7 +23,6 @@ import { _resolveReady, filters, findByCodeLazy, findByProps, findByPropsLazy, f
 import type * as t from "./types/utils";
 
 export let FluxDispatcher: t.FluxDispatcher;
-
 waitFor(["dispatch", "subscribe"], m => {
     FluxDispatcher = m;
     // Non import call to avoid circular dependency
@@ -40,6 +39,8 @@ export let ComponentDispatch;
 waitFor(["ComponentDispatch", "ComponentDispatcher"], m => ComponentDispatch = m.ComponentDispatch);
 
 
+export const Constants = findByPropsLazy("Endpoints");
+
 export const RestAPI: t.RestAPI = proxyLazyWebpack(() => {
     const mod = findByProps("getAPIBaseURL");
     return mod.HTTP ?? mod;

From 04d7cb8797b3f15a97228c7b9f051cd7788aeb92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Ruiz=20P=C3=A9rez?=
 <57387907+GabiRP@users.noreply.github.com>
Date: Sat, 4 May 2024 01:15:18 +0200
Subject: [PATCH 503/632] NewGuildSettings: add push notifs, highlights &
 events (#2413)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/newGuildSettings/index.tsx | 34 +++++++++++++++++++++++---
 src/utils/constants.ts                 |  4 +++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/plugins/newGuildSettings/index.tsx b/src/plugins/newGuildSettings/index.tsx
index ff6f1c261..d5c3d9206 100644
--- a/src/plugins/newGuildSettings/index.tsx
+++ b/src/plugins/newGuildSettings/index.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { definePluginSettings,migratePluginSettings } from "@api/Settings";
+import { definePluginSettings, migratePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
@@ -31,6 +31,16 @@ const settings = definePluginSettings({
         type: OptionType.BOOLEAN,
         default: true
     },
+    messages: {
+        description: "Server Notification Settings",
+        type: OptionType.SELECT,
+        options: [
+            { label: "All messages", value: 0 },
+            { label: "Only @mentions", value: 1 },
+            { label: "Nothing", value: 2 },
+            { label: "Server default", value: 3, default: true }
+        ],
+    },
     everyone: {
         description: "Suppress @everyone and @here",
         type: OptionType.BOOLEAN,
@@ -41,6 +51,16 @@ const settings = definePluginSettings({
         type: OptionType.BOOLEAN,
         default: true
     },
+    highlights: {
+        description: "Suppress Highlights automatically",
+        type: OptionType.BOOLEAN,
+        default: true
+    },
+    events: {
+        description: "Mute New Events automatically",
+        type: OptionType.BOOLEAN,
+        default: true
+    },
     showAllChannels: {
         description: "Show all channels automatically",
         type: OptionType.BOOLEAN,
@@ -53,7 +73,7 @@ export default definePlugin({
     name: "NewGuildSettings",
     description: "Automatically mute new servers and change various other settings upon joining",
     tags: ["MuteNewGuild", "mute", "server"],
-    authors: [Devs.Glitch, Devs.Nuckyz, Devs.carince, Devs.Mopi],
+    authors: [Devs.Glitch, Devs.Nuckyz, Devs.carince, Devs.Mopi, Devs.GabiRP],
     patches: [
         {
             find: ",acceptInvite(",
@@ -78,8 +98,16 @@ export default definePlugin({
             {
                 muted: settings.store.guild,
                 suppress_everyone: settings.store.everyone,
-                suppress_roles: settings.store.role
+                suppress_roles: settings.store.role,
+                mute_scheduled_events: settings.store.events,
+                notify_highlights: settings.store.highlights ? 1 : 0
             });
+        if (settings.store.messages !== 3) {
+            updateGuildNotificationSettings(guildId,
+                {
+                    message_notifications: settings.store.messages,
+                });
+        }
         if (settings.store.showAllChannels && isOptInEnabledForGuild(guildId)) {
             toggleShowAllChannels(guildId);
         }
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 8ab0bffb3..cce276ef8 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -449,6 +449,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     PolisanTheEasyNick: {
         name: "Oleh Polisan",
         id: 242305263313485825n
+    },
+    GabiRP: {
+        name: "GabiRP",
+        id: 507955112027750401n
     }
 } satisfies Record<string, Dev>);
 

From dfb06e47d01e148646f682734b560ec4d7df34a8 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 4 May 2024 01:39:20 +0200
Subject: [PATCH 504/632] fix overflow when having two rows of badges

---
 src/plugins/_api/badges/fixBadgeOverflow.css      | 3 +++
 src/plugins/_api/{badges.tsx => badges/index.tsx} | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 src/plugins/_api/badges/fixBadgeOverflow.css
 rename src/plugins/_api/{badges.tsx => badges/index.tsx} (99%)

diff --git a/src/plugins/_api/badges/fixBadgeOverflow.css b/src/plugins/_api/badges/fixBadgeOverflow.css
new file mode 100644
index 000000000..348d0ff38
--- /dev/null
+++ b/src/plugins/_api/badges/fixBadgeOverflow.css
@@ -0,0 +1,3 @@
+[class*="profileBadges"] {
+    flex: none;
+}
diff --git a/src/plugins/_api/badges.tsx b/src/plugins/_api/badges/index.tsx
similarity index 99%
rename from src/plugins/_api/badges.tsx
rename to src/plugins/_api/badges/index.tsx
index 3cfbb4d99..5493d4b6a 100644
--- a/src/plugins/_api/badges.tsx
+++ b/src/plugins/_api/badges/index.tsx
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import "./fixBadgeOverflow.css";
+
 import { BadgePosition, BadgeUserArgs, ProfileBadge } from "@api/Badges";
 import DonateButton from "@components/DonateButton";
 import ErrorBoundary from "@components/ErrorBoundary";

From 80b738ff3e9418aa950027a503aaa7672d83677b Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 4 May 2024 21:15:14 -0300
Subject: [PATCH 505/632] Future proof FakeNitro and Experiments to not brick
 Discord startup

---
 src/plugins/experiments/index.tsx | 17 +++++++++---
 src/plugins/fakeNitro/index.tsx   | 44 +++++++++++++++++--------------
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx
index 344638828..50b9521f9 100644
--- a/src/plugins/experiments/index.tsx
+++ b/src/plugins/experiments/index.tsx
@@ -20,10 +20,12 @@ import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { ErrorCard } from "@components/ErrorCard";
 import { Devs } from "@utils/constants";
+import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { Forms, React } from "@webpack/common";
+import { Forms, React, UserStore } from "@webpack/common";
+import { User } from "discord-types/general";
 
 const KbdStyles = findByPropsLazy("key", "removeBuildOverride");
 
@@ -68,8 +70,8 @@ export default definePlugin({
             predicate: () => settings.store.enableIsStaff,
             replacement: [
                 {
-                    match: /=>*?(\i)\.hasFlag\((\i\.\i)\.STAFF\)}/,
-                    replace: (_, user, flags) => `=>Vencord.Webpack.Common.UserStore.getCurrentUser()?.id===${user}.id||${user}.hasFlag(${flags}.STAFF)}`
+                    match: /(?<=>)(\i)\.hasFlag\((\i\.\i)\.STAFF\)(?=})/,
+                    replace: (_, user, flags) => `$self.isStaff(${user},${flags})`
                 },
                 {
                     match: /hasFreePremium\(\){return this.isStaff\(\)\s*?\|\|/,
@@ -86,6 +88,15 @@ export default definePlugin({
         }
     ],
 
+    isStaff(user: User, flags: any) {
+        try {
+            return UserStore.getCurrentUser()?.id === user.id || user.hasFlag(flags.STAFF);
+        } catch (err) {
+            new Logger("Experiments").error(err);
+            return user.hasFlag(flags.STAFF);
+        }
+    },
+
     settingsAboutComponent: () => {
         const isMacOS = navigator.platform.includes("Mac");
         const modKey = isMacOS ? "cmd" : "ctrl";
diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index adf1f70fb..90ce10f62 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -413,31 +413,35 @@ export default definePlugin({
     },
 
     handleProtoChange(proto: any, user: any) {
-        if (proto == null || typeof proto === "string" || !UserSettingsProtoStore || !PreloadedUserSettingsActionCreators || !AppearanceSettingsActionCreators || !ClientThemeSettingsActionsCreators) return;
+        try {
+            if (proto == null || typeof proto === "string") return;
 
-        const premiumType: number = user?.premium_type ?? UserStore?.getCurrentUser()?.premiumType ?? 0;
+            const premiumType: number = user?.premium_type ?? UserStore?.getCurrentUser()?.premiumType ?? 0;
 
-        if (premiumType !== 2) {
-            proto.appearance ??= AppearanceSettingsActionCreators.create();
+            if (premiumType !== 2) {
+                proto.appearance ??= AppearanceSettingsActionCreators.create();
 
-            if (UserSettingsProtoStore.settings.appearance?.theme != null) {
-                const appearanceSettingsDummy = AppearanceSettingsActionCreators.create({
-                    theme: UserSettingsProtoStore.settings.appearance.theme
-                });
+                if (UserSettingsProtoStore.settings.appearance?.theme != null) {
+                    const appearanceSettingsDummy = AppearanceSettingsActionCreators.create({
+                        theme: UserSettingsProtoStore.settings.appearance.theme
+                    });
 
-                proto.appearance.theme = appearanceSettingsDummy.theme;
-            }
-
-            if (UserSettingsProtoStore.settings.appearance?.clientThemeSettings?.backgroundGradientPresetId?.value != null) {
-                const clientThemeSettingsDummy = ClientThemeSettingsActionsCreators.create({
-                    backgroundGradientPresetId: {
-                        value: UserSettingsProtoStore.settings.appearance.clientThemeSettings.backgroundGradientPresetId.value
-                    }
-                });
-
-                proto.appearance.clientThemeSettings ??= clientThemeSettingsDummy;
-                proto.appearance.clientThemeSettings.backgroundGradientPresetId = clientThemeSettingsDummy.backgroundGradientPresetId;
+                    proto.appearance.theme = appearanceSettingsDummy.theme;
+                }
+
+                if (UserSettingsProtoStore.settings.appearance?.clientThemeSettings?.backgroundGradientPresetId?.value != null) {
+                    const clientThemeSettingsDummy = ClientThemeSettingsActionsCreators.create({
+                        backgroundGradientPresetId: {
+                            value: UserSettingsProtoStore.settings.appearance.clientThemeSettings.backgroundGradientPresetId.value
+                        }
+                    });
+
+                    proto.appearance.clientThemeSettings ??= clientThemeSettingsDummy;
+                    proto.appearance.clientThemeSettings.backgroundGradientPresetId = clientThemeSettingsDummy.backgroundGradientPresetId;
+                }
             }
+        } catch (err) {
+            new Logger("FakeNitro").error(err);
         }
     },
 

From a525cd0113b37fbe08512a6e68ecb62b8d74cd72 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 5 May 2024 03:59:57 +0200
Subject: [PATCH 506/632] bump to v1.8.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1a0a43227..ae4336d36 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.8.0",
+    "version": "1.8.1",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 066b872219e247bf6624d07386ada0791c336dbb Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 5 May 2024 18:56:49 +0200
Subject: [PATCH 507/632] fix webpack patch on client using discordapp.com

---
 src/webpack/patchWebpack.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index d2b569e8d..8dd3dba8b 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -63,7 +63,8 @@ Object.defineProperty(Function.prototype, "O", {
         // When using react devtools or other extensions, or even when discord loads the sentry, we may also catch their webpack here.
         // This ensures we actually got the right one
         // this.e (wreq.e) is the method for loading a chunk, and only the main webpack has it
-        if (new Error().stack?.includes("discord.com") && String(this.e).includes("Promise.all")) {
+        const { stack } = new Error();
+        if ((stack?.includes("discord.com") || stack?.includes("discordapp.com")) && String(this.e).includes("Promise.all")) {
             logger.info("Found main WebpackRequire.onChunksLoaded");
 
             delete (Function.prototype as any).O;

From ce18000c4e403d2408ecf882568ffea90442336d Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 5 May 2024 18:58:23 +0200
Subject: [PATCH 508/632] fix webpack patch on client using discordapp.com part
 2

---
 src/webpack/patchWebpack.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index 8dd3dba8b..d3de20727 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -121,9 +121,9 @@ Object.defineProperty(Function.prototype, "m", {
     set(v: any) {
         // When using react devtools or other extensions, we may also catch their webpack here.
         // This ensures we actually got the right one
-        const error = new Error();
-        if (error.stack?.includes("discord.com")) {
-            logger.info("Found Webpack module factory", error.stack.match(/\/assets\/(.+?\.js)/)?.[1] ?? "");
+        const { stack } = new Error();
+        if (stack?.includes("discord.com") || stack?.includes("discordapp.com")) {
+            logger.info("Found Webpack module factory", stack.match(/\/assets\/(.+?\.js)/)?.[1] ?? "");
             patchFactories(v);
         }
 

From 60e6fdacfa2b07d27b69b9a0ab52a5e5ccfa689b Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 4 May 2024 23:15:33 -0300
Subject: [PATCH 509/632] Resolve PluginSettings circular deps better

---
 src/components/PluginSettings/index.tsx |  5 +++--
 src/plugins/_api/badges/index.tsx       |  8 ++------
 src/plugins/_core/settings.tsx          | 23 +++++++++++++++--------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/components/PluginSettings/index.tsx b/src/components/PluginSettings/index.tsx
index 33a472c1a..e6b2cf1fb 100644
--- a/src/components/PluginSettings/index.tsx
+++ b/src/components/PluginSettings/index.tsx
@@ -27,6 +27,7 @@ import PluginModal from "@components/PluginSettings/PluginModal";
 import { AddonCard } from "@components/VencordSettings/AddonCard";
 import { SettingsTab } from "@components/VencordSettings/shared";
 import { ChangeList } from "@utils/ChangeList";
+import { proxyLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
 import { classes, isObjectEmpty } from "@utils/misc";
@@ -38,8 +39,8 @@ import { Alerts, Button, Card, Forms, lodash, Parser, React, Select, Text, TextI
 
 import Plugins from "~plugins";
 
-import { startDependenciesRecursive, startPlugin, stopPlugin } from "../../plugins";
-
+// Avoid circular dependency
+const { startDependenciesRecursive, startPlugin, stopPlugin } = proxyLazy(() => require("../../plugins"));
 
 const cl = classNameFactory("vc-plugins-");
 const logger = new Logger("PluginSettings", "#a6d189");
diff --git a/src/plugins/_api/badges/index.tsx b/src/plugins/_api/badges/index.tsx
index 5493d4b6a..bbccf0a11 100644
--- a/src/plugins/_api/badges/index.tsx
+++ b/src/plugins/_api/badges/index.tsx
@@ -23,6 +23,7 @@ import DonateButton from "@components/DonateButton";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { Heart } from "@components/Heart";
+import { openContributorModal } from "@components/PluginSettings/ContributorModal";
 import { Devs } from "@utils/constants";
 import { Margins } from "@utils/margins";
 import { isPluginDev } from "@utils/misc";
@@ -37,12 +38,7 @@ const ContributorBadge: ProfileBadge = {
     image: CONTRIBUTOR_BADGE,
     position: BadgePosition.START,
     shouldShow: ({ user }) => isPluginDev(user.id),
-    onClick(_, { user }) {
-        // circular import shenanigans
-        const { openContributorModal } = require("@components/PluginSettings/ContributorModal") as typeof import("@components/PluginSettings/ContributorModal");
-        // setImmediate is needed to run on later tick to workaround limitation in proxyLazy
-        setImmediate(() => openContributorModal(user));
-    }
+    onClick: (_, { user }) => openContributorModal(user)
 };
 
 let DonorBadges = {} as Record<string, Array<Record<"tooltip" | "badge", string>>>;
diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index 1aea0d6ee..772ee9b64 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -17,6 +17,13 @@
 */
 
 import { Settings } from "@api/Settings";
+import BackupAndRestoreTab from "@components/VencordSettings/BackupAndRestoreTab";
+import CloudTab from "@components/VencordSettings/CloudTab";
+import PatchHelperTab from "@components/VencordSettings/PatchHelperTab";
+import PluginsTab from "@components/VencordSettings/PluginsTab";
+import ThemesTab from "@components/VencordSettings/ThemesTab";
+import UpdaterTab from "@components/VencordSettings/UpdaterTab";
+import VencordTab from "@components/VencordSettings/VencordTab";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { React } from "@webpack/common";
@@ -36,7 +43,7 @@ export default definePlugin({
                 match: /\[\(0,.{1,3}\.jsxs?\)\((.{1,10}),(\{[^{}}]+\{.{0,20}.versionHash,.+?\})\)," "/,
                 replace: (m, component, props) => {
                     props = props.replace(/children:\[.+\]/, "");
-                    return `${m},Vencord.Plugins.plugins.Settings.makeInfoElements(${component}, ${props})`;
+                    return `${m},$self.makeInfoElements(${component}, ${props})`;
                 }
             }
         ]
@@ -77,43 +84,43 @@ export default definePlugin({
             {
                 section: "VencordSettings",
                 label: "Vencord",
-                element: require("@components/VencordSettings/VencordTab").default,
+                element: VencordTab,
                 className: "vc-settings"
             },
             {
                 section: "VencordPlugins",
                 label: "Plugins",
-                element: require("@components/VencordSettings/PluginsTab").default,
+                element: PluginsTab,
                 className: "vc-plugins"
             },
             {
                 section: "VencordThemes",
                 label: "Themes",
-                element: require("@components/VencordSettings/ThemesTab").default,
+                element: ThemesTab,
                 className: "vc-themes"
             },
             !IS_UPDATER_DISABLED && {
                 section: "VencordUpdater",
                 label: "Updater",
-                element: require("@components/VencordSettings/UpdaterTab").default,
+                element: UpdaterTab,
                 className: "vc-updater"
             },
             {
                 section: "VencordCloud",
                 label: "Cloud",
-                element: require("@components/VencordSettings/CloudTab").default,
+                element: CloudTab,
                 className: "vc-cloud"
             },
             {
                 section: "VencordSettingsSync",
                 label: "Backup & Restore",
-                element: require("@components/VencordSettings/BackupAndRestoreTab").default,
+                element: BackupAndRestoreTab,
                 className: "vc-backup-restore"
             },
             IS_DEV && {
                 section: "VencordPatchHelper",
                 label: "Patch Helper",
-                element: require("@components/VencordSettings/PatchHelperTab").default,
+                element: PatchHelperTab,
                 className: "vc-patch-helper"
             },
             ...this.customSections.map(func => func(SectionTypes)),

From a090872d8f8b1ccb201b716bc657a90f745f132d Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 4 May 2024 23:15:46 -0300
Subject: [PATCH 510/632] ImplicitRelationships: Properly test find

---
 src/plugins/implicitRelationships/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/implicitRelationships/index.ts b/src/plugins/implicitRelationships/index.ts
index 15165d64a..4faad2a9d 100644
--- a/src/plugins/implicitRelationships/index.ts
+++ b/src/plugins/implicitRelationships/index.ts
@@ -19,11 +19,12 @@
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByProps, findStoreLazy } from "@webpack";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
 import { ChannelStore, FluxDispatcher, GuildStore, RelationshipStore, SnowflakeUtils, UserStore } from "@webpack/common";
 import { Settings } from "Vencord";
 
 const UserAffinitiesStore = findStoreLazy("UserAffinitiesStore");
+const { FriendsSections } = findByPropsLazy("FriendsSections");
 
 interface UserAffinity {
     user_id: string;
@@ -181,7 +182,6 @@ export default definePlugin({
     },
 
     start() {
-        const { FriendsSections } = findByProps("FriendsSections");
         FriendsSections.IMPLICIT = "IMPLICIT";
     }
 });

From 45c1e42ce412bdf732b5f21073f6d4d8a00f3528 Mon Sep 17 00:00:00 2001
From: Fafa <87046111+Faf4a@users.noreply.github.com>
Date: Sun, 5 May 2024 06:42:15 +0200
Subject: [PATCH 511/632] ReviewDB: Fix context menus being added to folders
 (#2416)

---
 src/plugins/reviewDB/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/reviewDB/index.tsx b/src/plugins/reviewDB/index.tsx
index bcd0f163f..e73bce82c 100644
--- a/src/plugins/reviewDB/index.tsx
+++ b/src/plugins/reviewDB/index.tsx
@@ -36,6 +36,7 @@ import { settings } from "./settings";
 import { showToast } from "./utils";
 
 const guildPopoutPatch: NavContextMenuPatchCallback = (children, { guild }: { guild: Guild, onClose(): void; }) => {
+    if (!guild) return;
     children.push(
         <Menu.MenuItem
             label="View Reviews"

From 61235ce9944cd3822bc3be6efcc433ab2a3d5a42 Mon Sep 17 00:00:00 2001
From: Sqaaakoi <sqaaakoi-git@sqaaakoi.xyz>
Date: Sun, 5 May 2024 20:15:01 +1200
Subject: [PATCH 512/632] ImageLink: Fix embed showing in gifs (#2417)

---
 src/plugins/imageLink/index.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/plugins/imageLink/index.ts b/src/plugins/imageLink/index.ts
index 73a977fa9..5e8dd23e9 100644
--- a/src/plugins/imageLink/index.ts
+++ b/src/plugins/imageLink/index.ts
@@ -10,15 +10,15 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "ImageLink",
     description: "Never hide image links in messages, even if it's the only content",
-    authors: [Devs.Kyuuhachi],
+    authors: [Devs.Kyuuhachi, Devs.Sqaaakoi],
 
     patches: [
         {
-            find: "isEmbedInline:function()",
+            find: "unknownUserMentionPlaceholder:",
             replacement: {
-                match: /(?<=isEmbedInline:function\(\)\{return )\i(?=\})/,
-                replace: "()=>false",
-            },
-        },
-    ],
+                match: /\(0,\i\.isEmbedInline\)\(\i\)/,
+                replace: "false",
+            }
+        }
+    ]
 });

From ecf6af5884981236ce8be4573e28629962edacc3 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Mon, 6 May 2024 05:07:46 -0300
Subject: [PATCH 513/632] FakeNitro: Make disableEmbedPermissionCheck setting
 not private

---
 src/plugins/fakeNitro/index.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 90ce10f62..ad7394dc9 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -166,10 +166,13 @@ const settings = definePluginSettings({
         description: "What text the hyperlink should use. {{NAME}} will be replaced with the emoji/sticker name.",
         type: OptionType.STRING,
         default: "{{NAME}}"
+    },
+    disableEmbedPermissionCheck: {
+        description: "Whether to disable the embed permission check when sending fake emojis and stickers",
+        type: OptionType.BOOLEAN,
+        default: false
     }
-}).withPrivateSettings<{
-    disableEmbedPermissionCheck: boolean;
-}>();
+});
 
 function hasPermission(channelId: string, permission: bigint) {
     const channel = ChannelStore.getChannel(channelId);

From 72b17761bbae1823551664f8a72dd0e18aa463ae Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 7 May 2024 04:54:25 +0200
Subject: [PATCH 514/632] upgrade nodejs & pnpm to latest versions

---
 .github/workflows/build.yml               |   10 +-
 .github/workflows/codeberg-mirror.yml     |    2 +-
 .github/workflows/publish.yml             |    8 +-
 .github/workflows/reportBrokenPlugins.yml |    6 +-
 .github/workflows/test.yml                |   10 +-
 package.json                              |    2 +-
 pnpm-lock.yaml                            | 4435 +++++++++++----------
 scripts/build/common.mjs                  |    5 +-
 tsconfig.json                             |    1 +
 9 files changed, 2449 insertions(+), 2030 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9ed7d5ca7..c7a2f24e8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,14 +18,14 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
+            - uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
 
-            - name: Use Node.js 19
-              uses: actions/setup-node@v3
+            - name: Use Node.js 20
+              uses: actions/setup-node@v4
               with:
-                  node-version: 19
+                  node-version: 20
                   cache: "pnpm"
 
             - name: Install dependencies
diff --git a/.github/workflows/codeberg-mirror.yml b/.github/workflows/codeberg-mirror.yml
index 1b2266ee7..5acae6a4f 100644
--- a/.github/workflows/codeberg-mirror.yml
+++ b/.github/workflows/codeberg-mirror.yml
@@ -13,7 +13,7 @@ jobs:
         if: github.repository == 'Vendicated/Vencord'
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
                   fetch-depth: 0
             - uses: pixta-dev/repository-mirroring-action@674e65a7d483ca28dafaacba0d07351bdcc8bd75 # v1.1.1
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 83236c11e..8407e08e2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: check that tag matches package.json version
               run: |
@@ -20,12 +20,12 @@ jobs:
                       exit 1
                   fi
 
-            - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
+            - uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
 
             - name: Use Node.js 19
-              uses: actions/setup-node@v3
+              uses: actions/setup-node@v4
               with:
-                  node-version: 19
+                  node-version: 20
                   cache: "pnpm"
 
             - name: Install dependencies
diff --git a/.github/workflows/reportBrokenPlugins.yml b/.github/workflows/reportBrokenPlugins.yml
index 39d639988..d3a882fa3 100644
--- a/.github/workflows/reportBrokenPlugins.yml
+++ b/.github/workflows/reportBrokenPlugins.yml
@@ -21,10 +21,10 @@ jobs:
 
             - uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
 
-            - name: Use Node.js 18
+            - name: Use Node.js 20
               uses: actions/setup-node@v4
               with:
-                  node-version: 18
+                  node-version: 20
                   cache: "pnpm"
 
             - name: Install dependencies
@@ -35,7 +35,7 @@ jobs:
               id: setup-chrome
               uses: browser-actions/setup-chrome@82b9ce628cc5595478a9ebadc480958a36457dc2
               with:
-                chrome-version: stable
+                  chrome-version: stable
 
             - name: Build web
               run: pnpm buildWeb --standalone --dev
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d4746d673..7a2b320bf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,13 +10,13 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v3
-            - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
+            - uses: actions/checkout@v4
+            - uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
 
-            - name: Use Node.js 18
-              uses: actions/setup-node@v3
+            - name: Use Node.js 20
+              uses: actions/setup-node@v4
               with:
-                  node-version: 18
+                  node-version: 20
                   cache: "pnpm"
 
             - name: Install dependencies
diff --git a/package.json b/package.json
index ae4336d36..97d3da576 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "zip-local": "^0.3.5",
         "zustand": "^3.7.2"
     },
-    "packageManager": "pnpm@8.10.2",
+    "packageManager": "pnpm@9.1.0",
     "pnpm": {
         "patchedDependencies": {
             "eslint-plugin-path-alias@1.0.0": "patches/eslint-plugin-path-alias@1.0.0.patch",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 43866f50b..54b3ab8da 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,8 @@
-lockfileVersion: '6.0'
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
 
 patchedDependencies:
   eslint-plugin-path-alias@1.0.0:
@@ -8,421 +12,318 @@ patchedDependencies:
     hash: xm46kqcmdgzlmm4aifkfpxaho4
     path: patches/eslint@8.46.0.patch
 
-dependencies:
-  '@sapphi-red/web-noise-suppressor':
-    specifier: 0.3.3
-    version: 0.3.3
-  '@vap/core':
-    specifier: 0.0.12
-    version: 0.0.12
-  '@vap/shiki':
-    specifier: 0.10.5
-    version: 0.10.5
-  eslint-plugin-simple-header:
-    specifier: ^1.0.2
-    version: 1.0.2
-  fflate:
-    specifier: ^0.7.4
-    version: 0.7.4
-  gifenc:
-    specifier: github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3
-    version: github.com/mattdesl/gifenc/64842fca317b112a8590f8fef2bf3825da8f6fe3
-  monaco-editor:
-    specifier: ^0.43.0
-    version: 0.43.0
-  nanoid:
-    specifier: ^4.0.2
-    version: 4.0.2
-  virtual-merge:
-    specifier: ^1.0.1
-    version: 1.0.1
+importers:
 
-devDependencies:
-  '@types/chrome':
-    specifier: ^0.0.246
-    version: 0.0.246
-  '@types/diff':
-    specifier: ^5.0.3
-    version: 5.0.3
-  '@types/lodash':
-    specifier: ^4.14.194
-    version: 4.14.194
-  '@types/node':
-    specifier: ^18.16.3
-    version: 18.16.3
-  '@types/react':
-    specifier: ^18.2.0
-    version: 18.2.0
-  '@types/react-dom':
-    specifier: ^18.2.1
-    version: 18.2.1
-  '@types/yazl':
-    specifier: ^2.4.2
-    version: 2.4.2
-  '@typescript-eslint/eslint-plugin':
-    specifier: ^5.59.1
-    version: 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4)
-  '@typescript-eslint/parser':
-    specifier: ^5.59.1
-    version: 5.59.1(eslint@8.46.0)(typescript@5.0.4)
-  diff:
-    specifier: ^5.1.0
-    version: 5.1.0
-  discord-types:
-    specifier: ^1.3.26
-    version: 1.3.26
-  esbuild:
-    specifier: ^0.15.18
-    version: 0.15.18
-  eslint:
-    specifier: ^8.46.0
-    version: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
-  eslint-import-resolver-alias:
-    specifier: ^1.1.2
-    version: 1.1.2
-  eslint-plugin-path-alias:
-    specifier: ^1.0.0
-    version: 1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0)
-  eslint-plugin-simple-import-sort:
-    specifier: ^10.0.0
-    version: 10.0.0(eslint@8.46.0)
-  eslint-plugin-unused-imports:
-    specifier: ^2.0.0
-    version: 2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.46.0)
-  highlight.js:
-    specifier: 10.6.0
-    version: 10.6.0
-  moment:
-    specifier: ^2.29.4
-    version: 2.29.4
-  puppeteer-core:
-    specifier: ^19.11.1
-    version: 19.11.1(typescript@5.0.4)
-  standalone-electron-types:
-    specifier: ^1.0.0
-    version: 1.0.0
-  stylelint:
-    specifier: ^15.6.0
-    version: 15.6.0
-  stylelint-config-standard:
-    specifier: ^33.0.0
-    version: 33.0.0(stylelint@15.6.0)
-  tsx:
-    specifier: ^3.12.7
-    version: 3.12.7
-  type-fest:
-    specifier: ^3.9.0
-    version: 3.9.0
-  typescript:
-    specifier: ^5.0.4
-    version: 5.0.4
-  zip-local:
-    specifier: ^0.3.5
-    version: 0.3.5
-  zustand:
-    specifier: ^3.7.2
-    version: 3.7.2
+  .:
+    dependencies:
+      '@sapphi-red/web-noise-suppressor':
+        specifier: 0.3.3
+        version: 0.3.3
+      '@vap/core':
+        specifier: 0.0.12
+        version: 0.0.12
+      '@vap/shiki':
+        specifier: 0.10.5
+        version: 0.10.5
+      eslint-plugin-simple-header:
+        specifier: ^1.0.2
+        version: 1.0.2
+      fflate:
+        specifier: ^0.7.4
+        version: 0.7.4
+      gifenc:
+        specifier: github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3
+        version: https://codeload.github.com/mattdesl/gifenc/tar.gz/64842fca317b112a8590f8fef2bf3825da8f6fe3
+      monaco-editor:
+        specifier: ^0.43.0
+        version: 0.43.0
+      nanoid:
+        specifier: ^4.0.2
+        version: 4.0.2
+      virtual-merge:
+        specifier: ^1.0.1
+        version: 1.0.1
+    devDependencies:
+      '@types/chrome':
+        specifier: ^0.0.246
+        version: 0.0.246
+      '@types/diff':
+        specifier: ^5.0.3
+        version: 5.0.3
+      '@types/lodash':
+        specifier: ^4.14.194
+        version: 4.14.194
+      '@types/node':
+        specifier: ^18.16.3
+        version: 18.16.3
+      '@types/react':
+        specifier: ^18.2.0
+        version: 18.2.0
+      '@types/react-dom':
+        specifier: ^18.2.1
+        version: 18.2.1
+      '@types/yazl':
+        specifier: ^2.4.2
+        version: 2.4.2
+      '@typescript-eslint/eslint-plugin':
+        specifier: ^5.59.1
+        version: 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/parser':
+        specifier: ^5.59.1
+        version: 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+      diff:
+        specifier: ^5.1.0
+        version: 5.1.0
+      discord-types:
+        specifier: ^1.3.26
+        version: 1.3.26
+      esbuild:
+        specifier: ^0.15.18
+        version: 0.15.18
+      eslint:
+        specifier: ^8.46.0
+        version: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint-import-resolver-alias:
+        specifier: ^1.1.2
+        version: 1.1.2
+      eslint-plugin-path-alias:
+        specifier: ^1.0.0
+        version: 1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0)
+      eslint-plugin-simple-import-sort:
+        specifier: ^10.0.0
+        version: 10.0.0(eslint@8.46.0)
+      eslint-plugin-unused-imports:
+        specifier: ^2.0.0
+        version: 2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.46.0)
+      highlight.js:
+        specifier: 10.6.0
+        version: 10.6.0
+      moment:
+        specifier: ^2.29.4
+        version: 2.29.4
+      puppeteer-core:
+        specifier: ^19.11.1
+        version: 19.11.1(typescript@5.0.4)
+      standalone-electron-types:
+        specifier: ^1.0.0
+        version: 1.0.0
+      stylelint:
+        specifier: ^15.6.0
+        version: 15.6.0
+      stylelint-config-standard:
+        specifier: ^33.0.0
+        version: 33.0.0(stylelint@15.6.0)
+      tsx:
+        specifier: ^3.12.7
+        version: 3.12.7
+      type-fest:
+        specifier: ^3.9.0
+        version: 3.9.0
+      typescript:
+        specifier: ^5.0.4
+        version: 5.0.4
+      zip-local:
+        specifier: ^0.3.5
+        version: 0.3.5
+      zustand:
+        specifier: ^3.7.2
+        version: 3.7.2
 
 packages:
 
-  /@aashutoshrathi/word-wrap@1.2.6:
+  '@aashutoshrathi/word-wrap@1.2.6':
     resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
-  /@babel/code-frame@7.21.4:
+  '@babel/code-frame@7.21.4':
     resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==}
     engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/highlight': 7.18.6
-    dev: true
 
-  /@babel/helper-validator-identifier@7.19.1:
+  '@babel/helper-validator-identifier@7.19.1':
     resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
     engines: {node: '>=6.9.0'}
-    dev: true
 
-  /@babel/highlight@7.18.6:
+  '@babel/highlight@7.18.6':
     resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
     engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-validator-identifier': 7.19.1
-      chalk: 2.4.2
-      js-tokens: 4.0.0
-    dev: true
 
-  /@csstools/css-parser-algorithms@2.1.1(@csstools/css-tokenizer@2.1.1):
+  '@csstools/css-parser-algorithms@2.1.1':
     resolution: {integrity: sha512-viRnRh02AgO4mwIQb2xQNJju0i+Fh9roNgmbR5xEuG7J3TGgxjnE95HnBLgsFJOJOksvcfxOUCgODcft6Y07cA==}
     engines: {node: ^14 || ^16 || >=18}
     peerDependencies:
       '@csstools/css-tokenizer': ^2.1.1
-    dependencies:
-      '@csstools/css-tokenizer': 2.1.1
-    dev: true
 
-  /@csstools/css-tokenizer@2.1.1:
+  '@csstools/css-tokenizer@2.1.1':
     resolution: {integrity: sha512-GbrTj2Z8MCTUv+52GE0RbFGM527xuXZ0Xa5g0Z+YN573uveS4G0qi6WNOMyz3yrFM/jaILTTwJ0+umx81EzqfA==}
     engines: {node: ^14 || ^16 || >=18}
-    dev: true
 
-  /@csstools/media-query-list-parser@2.0.4(@csstools/css-parser-algorithms@2.1.1)(@csstools/css-tokenizer@2.1.1):
+  '@csstools/media-query-list-parser@2.0.4':
     resolution: {integrity: sha512-GyYot6jHgcSDZZ+tLSnrzkR7aJhF2ZW6d+CXH66mjy5WpAQhZD4HDke2OQ36SivGRWlZJpAz7TzbW6OKlEpxAA==}
     engines: {node: ^14 || ^16 || >=18}
     peerDependencies:
       '@csstools/css-parser-algorithms': ^2.1.1
       '@csstools/css-tokenizer': ^2.1.1
-    dependencies:
-      '@csstools/css-parser-algorithms': 2.1.1(@csstools/css-tokenizer@2.1.1)
-      '@csstools/css-tokenizer': 2.1.1
-    dev: true
 
-  /@csstools/selector-specificity@2.2.0(postcss-selector-parser@6.0.12):
+  '@csstools/selector-specificity@2.2.0':
     resolution: {integrity: sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==}
     engines: {node: ^14 || ^16 || >=18}
     peerDependencies:
       postcss-selector-parser: ^6.0.10
-    dependencies:
-      postcss-selector-parser: 6.0.12
-    dev: true
 
-  /@esbuild-kit/cjs-loader@2.4.2:
+  '@esbuild-kit/cjs-loader@2.4.2':
     resolution: {integrity: sha512-BDXFbYOJzT/NBEtp71cvsrGPwGAMGRB/349rwKuoxNSiKjPraNNnlK6MIIabViCjqZugu6j+xeMDlEkWdHHJSg==}
-    dependencies:
-      '@esbuild-kit/core-utils': 3.1.0
-      get-tsconfig: 4.5.0
-    dev: true
 
-  /@esbuild-kit/core-utils@3.1.0:
+  '@esbuild-kit/core-utils@3.1.0':
     resolution: {integrity: sha512-Uuk8RpCg/7fdHSceR1M6XbSZFSuMrxcePFuGgyvsBn+u339dk5OeL4jv2EojwTN2st/unJGsVm4qHWjWNmJ/tw==}
-    dependencies:
-      esbuild: 0.17.18
-      source-map-support: 0.5.21
-    dev: true
 
-  /@esbuild-kit/esm-loader@2.5.5:
+  '@esbuild-kit/esm-loader@2.5.5':
     resolution: {integrity: sha512-Qwfvj/qoPbClxCRNuac1Du01r9gvNOT+pMYtJDapfB1eoGN1YlJ1BixLyL9WVENRx5RXgNLdfYdx/CuswlGhMw==}
-    dependencies:
-      '@esbuild-kit/core-utils': 3.1.0
-      get-tsconfig: 4.5.0
-    dev: true
 
-  /@esbuild/android-arm64@0.17.18:
+  '@esbuild/android-arm64@0.17.18':
     resolution: {integrity: sha512-/iq0aK0eeHgSC3z55ucMAHO05OIqmQehiGay8eP5l/5l+iEr4EIbh4/MI8xD9qRFjqzgkc0JkX0LculNC9mXBw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/android-arm@0.15.18:
+  '@esbuild/android-arm@0.15.18':
     resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/android-arm@0.17.18:
+  '@esbuild/android-arm@0.17.18':
     resolution: {integrity: sha512-EmwL+vUBZJ7mhFCs5lA4ZimpUH3WMAoqvOIYhVQwdIgSpHC8ImHdsRyhHAVxpDYUSm0lWvd63z0XH1IlImS2Qw==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/android-x64@0.17.18:
+  '@esbuild/android-x64@0.17.18':
     resolution: {integrity: sha512-x+0efYNBF3NPW2Xc5bFOSFW7tTXdAcpfEg2nXmxegm4mJuVeS+i109m/7HMiOQ6M12aVGGFlqJX3RhNdYM2lWg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/darwin-arm64@0.17.18:
+  '@esbuild/darwin-arm64@0.17.18':
     resolution: {integrity: sha512-6tY+djEAdF48M1ONWnQb1C+6LiXrKjmqjzPNPWXhu/GzOHTHX2nh8Mo2ZAmBFg0kIodHhciEgUBtcYCAIjGbjQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/darwin-x64@0.17.18:
+  '@esbuild/darwin-x64@0.17.18':
     resolution: {integrity: sha512-Qq84ykvLvya3dO49wVC9FFCNUfSrQJLbxhoQk/TE1r6MjHo3sFF2tlJCwMjhkBVq3/ahUisj7+EpRSz0/+8+9A==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/freebsd-arm64@0.17.18:
+  '@esbuild/freebsd-arm64@0.17.18':
     resolution: {integrity: sha512-fw/ZfxfAzuHfaQeMDhbzxp9mc+mHn1Y94VDHFHjGvt2Uxl10mT4CDavHm+/L9KG441t1QdABqkVYwakMUeyLRA==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/freebsd-x64@0.17.18:
+  '@esbuild/freebsd-x64@0.17.18':
     resolution: {integrity: sha512-FQFbRtTaEi8ZBi/A6kxOC0V0E9B/97vPdYjY9NdawyLd4Qk5VD5g2pbWN2VR1c0xhzcJm74HWpObPszWC+qTew==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-arm64@0.17.18:
+  '@esbuild/linux-arm64@0.17.18':
     resolution: {integrity: sha512-R7pZvQZFOY2sxUG8P6A21eq6q+eBv7JPQYIybHVf1XkQYC+lT7nDBdC7wWKTrbvMXKRaGudp/dzZCwL/863mZQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-arm@0.17.18:
+  '@esbuild/linux-arm@0.17.18':
     resolution: {integrity: sha512-jW+UCM40LzHcouIaqv3e/oRs0JM76JfhHjCavPxMUti7VAPh8CaGSlS7cmyrdpzSk7A+8f0hiedHqr/LMnfijg==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-ia32@0.17.18:
+  '@esbuild/linux-ia32@0.17.18':
     resolution: {integrity: sha512-ygIMc3I7wxgXIxk6j3V00VlABIjq260i967Cp9BNAk5pOOpIXmd1RFQJQX9Io7KRsthDrQYrtcx7QCof4o3ZoQ==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-loong64@0.15.18:
+  '@esbuild/linux-loong64@0.15.18':
     resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-loong64@0.17.18:
+  '@esbuild/linux-loong64@0.17.18':
     resolution: {integrity: sha512-bvPG+MyFs5ZlwYclCG1D744oHk1Pv7j8psF5TfYx7otCVmcJsEXgFEhQkbhNW8otDHL1a2KDINW20cfCgnzgMQ==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-mips64el@0.17.18:
+  '@esbuild/linux-mips64el@0.17.18':
     resolution: {integrity: sha512-oVqckATOAGuiUOa6wr8TXaVPSa+6IwVJrGidmNZS1cZVx0HqkTMkqFGD2HIx9H1RvOwFeWYdaYbdY6B89KUMxA==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-ppc64@0.17.18:
+  '@esbuild/linux-ppc64@0.17.18':
     resolution: {integrity: sha512-3dLlQO+b/LnQNxgH4l9rqa2/IwRJVN9u/bK63FhOPB4xqiRqlQAU0qDU3JJuf0BmaH0yytTBdoSBHrb2jqc5qQ==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-riscv64@0.17.18:
+  '@esbuild/linux-riscv64@0.17.18':
     resolution: {integrity: sha512-/x7leOyDPjZV3TcsdfrSI107zItVnsX1q2nho7hbbQoKnmoeUWjs+08rKKt4AUXju7+3aRZSsKrJtaRmsdL1xA==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-s390x@0.17.18:
+  '@esbuild/linux-s390x@0.17.18':
     resolution: {integrity: sha512-cX0I8Q9xQkL/6F5zWdYmVf5JSQt+ZfZD2bJudZrWD+4mnUvoZ3TDDXtDX2mUaq6upMFv9FlfIh4Gfun0tbGzuw==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-x64@0.17.18:
+  '@esbuild/linux-x64@0.17.18':
     resolution: {integrity: sha512-66RmRsPlYy4jFl0vG80GcNRdirx4nVWAzJmXkevgphP1qf4dsLQCpSKGM3DUQCojwU1hnepI63gNZdrr02wHUA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/netbsd-x64@0.17.18:
+  '@esbuild/netbsd-x64@0.17.18':
     resolution: {integrity: sha512-95IRY7mI2yrkLlTLb1gpDxdC5WLC5mZDi+kA9dmM5XAGxCME0F8i4bYH4jZreaJ6lIZ0B8hTrweqG1fUyW7jbg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/openbsd-x64@0.17.18:
+  '@esbuild/openbsd-x64@0.17.18':
     resolution: {integrity: sha512-WevVOgcng+8hSZ4Q3BKL3n1xTv5H6Nb53cBrtzzEjDbbnOmucEVcZeGCsCOi9bAOcDYEeBZbD2SJNBxlfP3qiA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/sunos-x64@0.17.18:
+  '@esbuild/sunos-x64@0.17.18':
     resolution: {integrity: sha512-Rzf4QfQagnwhQXVBS3BYUlxmEbcV7MY+BH5vfDZekU5eYpcffHSyjU8T0xucKVuOcdCsMo+Ur5wmgQJH2GfNrg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/win32-arm64@0.17.18:
+  '@esbuild/win32-arm64@0.17.18':
     resolution: {integrity: sha512-Kb3Ko/KKaWhjeAm2YoT/cNZaHaD1Yk/pa3FTsmqo9uFh1D1Rfco7BBLIPdDOozrObj2sahslFuAQGvWbgWldAg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/win32-ia32@0.17.18:
+  '@esbuild/win32-ia32@0.17.18':
     resolution: {integrity: sha512-0/xUMIdkVHwkvxfbd5+lfG7mHOf2FRrxNbPiKWg9C4fFrB8H0guClmaM3BFiRUYrznVoyxTIyC/Ou2B7QQSwmw==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/win32-x64@0.17.18:
+  '@esbuild/win32-x64@0.17.18':
     resolution: {integrity: sha512-qU25Ma1I3NqTSHJUOKi9sAH1/Mzuvlke0ioMJRthLXKm7JiSKVwFghlGbDLOO2sARECGhja4xYfRAZNPAkooYg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@eslint-community/eslint-utils@4.4.0(eslint@8.46.0):
+  '@eslint-community/eslint-utils@4.4.0':
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -430,24 +331,1857 @@ packages:
     peerDependenciesMeta:
       eslint:
         optional: true
+
+  '@eslint-community/regexpp@4.5.1':
+    resolution: {integrity: sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
+  '@eslint-community/regexpp@4.6.2':
+    resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
+  '@eslint/eslintrc@2.1.1':
+    resolution: {integrity: sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@eslint/js@8.46.0':
+    resolution: {integrity: sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@humanwhocodes/config-array@0.11.10':
+    resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==}
+    engines: {node: '>=10.10.0'}
+
+  '@humanwhocodes/module-importer@1.0.1':
+    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
+    engines: {node: '>=12.22'}
+
+  '@humanwhocodes/object-schema@1.2.1':
+    resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
+
+  '@nodelib/fs.scandir@2.1.5':
+    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
+    engines: {node: '>= 8'}
+
+  '@nodelib/fs.stat@2.0.5':
+    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
+    engines: {node: '>= 8'}
+
+  '@nodelib/fs.walk@1.2.8':
+    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
+    engines: {node: '>= 8'}
+
+  '@puppeteer/browsers@0.5.0':
+    resolution: {integrity: sha512-Uw6oB7VvmPRLE4iKsjuOh8zgDabhNX67dzo8U/BB0f9527qx+4eeUs+korU98OhG5C4ubg7ufBgVi63XYwS6TQ==}
+    engines: {node: '>=14.1.0'}
+    hasBin: true
+    peerDependencies:
+      typescript: '>= 4.7.4'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@sapphi-red/web-noise-suppressor@0.3.3':
+    resolution: {integrity: sha512-gAC33DCXYwNTI/k1PxOVHmbbzakUSMbb/DHpoV6rn4pKZtPI1dduULSmAAm/y1ipgIlArnk2JcnQzw4n2tCZHw==}
+
+  '@types/chrome@0.0.246':
+    resolution: {integrity: sha512-MxGxEomGxsJiL9xe/7ZwVgwdn8XVKWbPvxpVQl3nWOjrS0Ce63JsfzxUc4aU3GvRcUPYsfufHmJ17BFyKxeA4g==}
+
+  '@types/diff@5.0.3':
+    resolution: {integrity: sha512-amrLbRqTU9bXMCc6uX0sWpxsQzRIo9z6MJPkH1pkez/qOxuqSZVuryJAWoBRq94CeG8JxY+VK4Le9HtjQR5T9A==}
+
+  '@types/filesystem@0.0.33':
+    resolution: {integrity: sha512-2KedRPzwu2K528vFkoXnnWdsG0MtUwPjuA7pRy4vKxlxHEe8qUDZibYHXJKZZr2Cl/ELdCWYqyb/MKwsUuzBWw==}
+
+  '@types/filewriter@0.0.30':
+    resolution: {integrity: sha512-lB98tui0uxc7erbj0serZfJlHKLNJHwBltPnbmO1WRpL5T325GOHRiQfr2E29V2q+S1brDO63Fpdt6vb3bES9Q==}
+
+  '@types/har-format@1.2.13':
+    resolution: {integrity: sha512-PwBsCBD3lDODn4xpje3Y1di0aDJp4Ww7aSfMRVw6ysnxD4I7Wmq2mBkSKaDtN403hqH5sp6c9xQUvFYY3+lkBg==}
+
+  '@types/json-schema@7.0.11':
+    resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
+
+  '@types/lodash@4.14.194':
+    resolution: {integrity: sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==}
+
+  '@types/minimist@1.2.2':
+    resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
+
+  '@types/node@18.16.3':
+    resolution: {integrity: sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q==}
+
+  '@types/normalize-package-data@2.4.1':
+    resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
+
+  '@types/prop-types@15.7.5':
+    resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
+
+  '@types/react-dom@18.2.1':
+    resolution: {integrity: sha512-8QZEV9+Kwy7tXFmjJrp3XUKQSs9LTnE0KnoUb0YCguWBiNW0Yfb2iBMYZ08WPg35IR6P3Z0s00B15SwZnO26+w==}
+
+  '@types/react@17.0.2':
+    resolution: {integrity: sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==}
+
+  '@types/react@18.2.0':
+    resolution: {integrity: sha512-0FLj93y5USLHdnhIhABk83rm8XEGA7kH3cr+YUlvxoUGp1xNt/DINUMvqPxLyOQMzLmZe8i4RTHbvb8MC7NmrA==}
+
+  '@types/scheduler@0.16.3':
+    resolution: {integrity: sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==}
+
+  '@types/semver@7.3.13':
+    resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==}
+
+  '@types/yauzl@2.10.0':
+    resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
+
+  '@types/yazl@2.4.2':
+    resolution: {integrity: sha512-T+9JH8O2guEjXNxqmybzQ92mJUh2oCwDDMSSimZSe1P+pceZiFROZLYmcbqkzV5EUwz6VwcKXCO2S2yUpra6XQ==}
+
+  '@typescript-eslint/eslint-plugin@5.59.1':
+    resolution: {integrity: sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      eslint:
+        optional: true
+      typescript:
+        optional: true
+
+  '@typescript-eslint/parser@5.59.1':
+    resolution: {integrity: sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      eslint:
+        optional: true
+      typescript:
+        optional: true
+
+  '@typescript-eslint/scope-manager@5.59.1':
+    resolution: {integrity: sha512-mau0waO5frJctPuAzcxiNWqJR5Z8V0190FTSqRw1Q4Euop6+zTwHAf8YIXNwDOT29tyUDrQ65jSg9aTU/H0omA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@typescript-eslint/type-utils@5.59.1':
+    resolution: {integrity: sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      typescript: '*'
+    peerDependenciesMeta:
+      eslint:
+        optional: true
+      typescript:
+        optional: true
+
+  '@typescript-eslint/types@5.59.1':
+    resolution: {integrity: sha512-dg0ICB+RZwHlysIy/Dh1SP+gnXNzwd/KS0JprD3Lmgmdq+dJAJnUPe1gNG34p0U19HvRlGX733d/KqscrGC1Pg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@typescript-eslint/typescript-estree@5.59.1':
+    resolution: {integrity: sha512-lYLBBOCsFltFy7XVqzX0Ju+Lh3WPIAWxYpmH/Q7ZoqzbscLiCW00LeYCdsUnnfnj29/s1WovXKh2gwCoinHNGA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/utils@5.59.1':
+    resolution: {integrity: sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    peerDependenciesMeta:
+      eslint:
+        optional: true
+
+  '@typescript-eslint/visitor-keys@5.59.1':
+    resolution: {integrity: sha512-6waEYwBTCWryx0VJmP7JaM4FpipLsFl9CvYf2foAE8Qh/Y0s+bxWysciwOs0LTBED4JCaNxTZ5rGadB14M6dwA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@vap/core@0.0.12':
+    resolution: {integrity: sha512-3csHpkE1zUSRTZwl7xIf2uXg1cD4IhhtUm0F6K/dWydc95R5Nj+krB4OTNATuqkewIv/ViCbwjPfkafAgvZQSg==}
+
+  '@vap/shiki@0.10.5':
+    resolution: {integrity: sha512-5BHVGvQT8qonbLSASon5aQFQ18OZU4FxSl9tLSj6oJ0sap3KdMbYcfGq25M9zFZR1g1dJN7fgjmZXBIS5omIdw==}
+
+  acorn-jsx@5.3.2:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+
+  acorn@8.10.0:
+    resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  agent-base@6.0.2:
+    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
+    engines: {node: '>= 6.0.0'}
+
+  ajv@6.12.6:
+    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+
+  ajv@8.12.0:
+    resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}
+
+  ansi-regex@5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
+
+  ansi-styles@3.2.1:
+    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
+    engines: {node: '>=4'}
+
+  ansi-styles@4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
+
+  argparse@2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+
+  arr-diff@4.0.0:
+    resolution: {integrity: sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==}
+    engines: {node: '>=0.10.0'}
+
+  arr-union@3.1.0:
+    resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
+    engines: {node: '>=0.10.0'}
+
+  array-union@2.1.0:
+    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
+    engines: {node: '>=8'}
+
+  array-unique@0.3.2:
+    resolution: {integrity: sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==}
+    engines: {node: '>=0.10.0'}
+
+  arrify@1.0.1:
+    resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
+    engines: {node: '>=0.10.0'}
+
+  assign-symbols@1.0.0:
+    resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
+    engines: {node: '>=0.10.0'}
+
+  astral-regex@2.0.0:
+    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
+    engines: {node: '>=8'}
+
+  async@1.5.2:
+    resolution: {integrity: sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==}
+
+  atob@2.1.2:
+    resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
+    engines: {node: '>= 4.5.0'}
+    hasBin: true
+
+  balanced-match@1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
+  balanced-match@2.0.0:
+    resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==}
+
+  base64-js@1.5.1:
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+
+  base@0.11.2:
+    resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==}
+    engines: {node: '>=0.10.0'}
+
+  bl@4.1.0:
+    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
+
+  brace-expansion@1.1.11:
+    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+
+  braces@3.0.2:
+    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
+    engines: {node: '>=8'}
+
+  buffer-crc32@0.2.13:
+    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
+
+  buffer-from@1.1.2:
+    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+
+  buffer@5.7.1:
+    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+
+  cache-base@1.0.1:
+    resolution: {integrity: sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==}
+    engines: {node: '>=0.10.0'}
+
+  callsites@3.1.0:
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+    engines: {node: '>=6'}
+
+  camelcase-keys@6.2.2:
+    resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
+    engines: {node: '>=8'}
+
+  camelcase@5.3.1:
+    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
+    engines: {node: '>=6'}
+
+  chalk@2.4.2:
+    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
+    engines: {node: '>=4'}
+
+  chalk@4.1.2:
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+    engines: {node: '>=10'}
+
+  chownr@1.1.4:
+    resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
+
+  chromium-bidi@0.4.7:
+    resolution: {integrity: sha512-6+mJuFXwTMU6I3vYLs6IL8A1DyQTPjCfIL971X0aMPVGRbGnNfl6i6Cl0NMbxi2bRYLGESt9T2ZIMRM5PAEcIQ==}
+    peerDependencies:
+      devtools-protocol: '*'
+
+  class-utils@0.3.6:
+    resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
+    engines: {node: '>=0.10.0'}
+
+  cliui@8.0.1:
+    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
+    engines: {node: '>=12'}
+
+  collection-visit@1.0.0:
+    resolution: {integrity: sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==}
+    engines: {node: '>=0.10.0'}
+
+  color-convert@1.9.3:
+    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
+
+  color-convert@2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
+
+  color-name@1.1.3:
+    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
+
+  color-name@1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+
+  colord@2.9.3:
+    resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}
+
+  component-emitter@1.3.0:
+    resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
+
+  concat-map@0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+
+  copy-descriptor@0.1.1:
+    resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
+    engines: {node: '>=0.10.0'}
+
+  cosmiconfig@8.1.3:
+    resolution: {integrity: sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==}
+    engines: {node: '>=14'}
+
+  cross-fetch@3.1.5:
+    resolution: {integrity: sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==}
+
+  cross-spawn@7.0.3:
+    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
+    engines: {node: '>= 8'}
+
+  css-functions-list@3.1.0:
+    resolution: {integrity: sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==}
+    engines: {node: '>=12.22'}
+
+  css-tree@2.3.1:
+    resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
+
+  cssesc@3.0.0:
+    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  csstype@3.1.2:
+    resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
+
+  debug@2.6.9:
+    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.3.4:
+    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  decamelize-keys@1.1.1:
+    resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
+    engines: {node: '>=0.10.0'}
+
+  decamelize@1.2.0:
+    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
+    engines: {node: '>=0.10.0'}
+
+  decode-uri-component@0.2.0:
+    resolution: {integrity: sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==}
+    engines: {node: '>=0.10'}
+
+  deep-is@0.1.4:
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+
+  define-property@0.2.5:
+    resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
+    engines: {node: '>=0.10.0'}
+
+  define-property@1.0.0:
+    resolution: {integrity: sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==}
+    engines: {node: '>=0.10.0'}
+
+  define-property@2.0.2:
+    resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==}
+    engines: {node: '>=0.10.0'}
+
+  devtools-protocol@0.0.1107588:
+    resolution: {integrity: sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==}
+
+  diff@5.1.0:
+    resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==}
+    engines: {node: '>=0.3.1'}
+
+  dir-glob@3.0.1:
+    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
+    engines: {node: '>=8'}
+
+  discord-types@1.3.26:
+    resolution: {integrity: sha512-ToG51AOCH+JTQf7b+8vuYQe5Iqwz7nZ7StpECAZ/VZcI1ZhQk13pvt9KkRTfRv1xNvwJ2qib4e3+RifQlo8VPQ==}
+
+  doctrine@3.0.0:
+    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
+    engines: {node: '>=6.0.0'}
+
+  emoji-regex@8.0.0:
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+
+  end-of-stream@1.4.4:
+    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
+
+  error-ex@1.3.2:
+    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
+
+  esbuild-android-64@0.15.18:
+    resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+
+  esbuild-android-arm64@0.15.18:
+    resolution: {integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+
+  esbuild-darwin-64@0.15.18:
+    resolution: {integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+
+  esbuild-darwin-arm64@0.15.18:
+    resolution: {integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+
+  esbuild-freebsd-64@0.15.18:
+    resolution: {integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+
+  esbuild-freebsd-arm64@0.15.18:
+    resolution: {integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  esbuild-linux-32@0.15.18:
+    resolution: {integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+
+  esbuild-linux-64@0.15.18:
+    resolution: {integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+
+  esbuild-linux-arm64@0.15.18:
+    resolution: {integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+
+  esbuild-linux-arm@0.15.18:
+    resolution: {integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+
+  esbuild-linux-mips64le@0.15.18:
+    resolution: {integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+
+  esbuild-linux-ppc64le@0.15.18:
+    resolution: {integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+
+  esbuild-linux-riscv64@0.15.18:
+    resolution: {integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+
+  esbuild-linux-s390x@0.15.18:
+    resolution: {integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+
+  esbuild-netbsd-64@0.15.18:
+    resolution: {integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+
+  esbuild-openbsd-64@0.15.18:
+    resolution: {integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+
+  esbuild-sunos-64@0.15.18:
+    resolution: {integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+
+  esbuild-windows-32@0.15.18:
+    resolution: {integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+
+  esbuild-windows-64@0.15.18:
+    resolution: {integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+
+  esbuild-windows-arm64@0.15.18:
+    resolution: {integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+
+  esbuild@0.15.18:
+    resolution: {integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  esbuild@0.17.18:
+    resolution: {integrity: sha512-z1lix43jBs6UKjcZVKOw2xx69ffE2aG0PygLL5qJ9OS/gy0Ewd1gW/PUQIOIQGXBHWNywSc0floSKoMFF8aK2w==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  escalade@3.1.1:
+    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
+    engines: {node: '>=6'}
+
+  escape-string-regexp@1.0.5:
+    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
+    engines: {node: '>=0.8.0'}
+
+  escape-string-regexp@4.0.0:
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
+
+  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'
+    peerDependenciesMeta:
+      eslint-plugin-import:
+        optional: true
+
+  eslint-plugin-path-alias@1.0.0:
+    resolution: {integrity: sha512-FXus57yC+Zd3sMv46pbloXYwFeNVNHJqlACr9V68FG/IzGFBBokGJpmjDbEjpt8ZCeVSndUubeDWWl2A8sCNVQ==}
+    peerDependencies:
+      eslint: ^7
+    peerDependenciesMeta:
+      eslint:
+        optional: true
+
+  eslint-plugin-simple-header@1.0.2:
+    resolution: {integrity: sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA==}
+
+  eslint-plugin-simple-import-sort@10.0.0:
+    resolution: {integrity: sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==}
+    peerDependencies:
+      eslint: '>=5.0.0'
+    peerDependenciesMeta:
+      eslint:
+        optional: true
+
+  eslint-plugin-unused-imports@2.0.0:
+    resolution: {integrity: sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      '@typescript-eslint/eslint-plugin': ^5.0.0
+      eslint: ^8.0.0
+    peerDependenciesMeta:
+      '@typescript-eslint/eslint-plugin':
+        optional: true
+      eslint:
+        optional: true
+
+  eslint-rule-composer@0.3.0:
+    resolution: {integrity: sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==}
+    engines: {node: '>=4.0.0'}
+
+  eslint-scope@5.1.1:
+    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
+    engines: {node: '>=8.0.0'}
+
+  eslint-scope@7.2.2:
+    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-visitor-keys@3.4.0:
+    resolution: {integrity: sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-visitor-keys@3.4.2:
+    resolution: {integrity: sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint@8.46.0:
+    resolution: {integrity: sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    hasBin: true
+
+  espree@9.6.1:
+    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  esquery@1.5.0:
+    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
+    engines: {node: '>=0.10'}
+
+  esrecurse@4.3.0:
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
+
+  estraverse@4.3.0:
+    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
+    engines: {node: '>=4.0'}
+
+  estraverse@5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
+
+  esutils@2.0.3:
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
+    engines: {node: '>=0.10.0'}
+
+  eventemitter3@4.0.7:
+    resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
+
+  extend-shallow@2.0.1:
+    resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
+    engines: {node: '>=0.10.0'}
+
+  extend-shallow@3.0.2:
+    resolution: {integrity: sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==}
+    engines: {node: '>=0.10.0'}
+
+  extract-zip@2.0.1:
+    resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
+    engines: {node: '>= 10.17.0'}
+    hasBin: true
+
+  fast-deep-equal@3.1.3:
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
+
+  fast-glob@3.2.12:
+    resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==}
+    engines: {node: '>=8.6.0'}
+
+  fast-json-stable-stringify@2.1.0:
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+
+  fast-levenshtein@2.0.6:
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+
+  fastest-levenshtein@1.0.16:
+    resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
+    engines: {node: '>= 4.9.1'}
+
+  fastq@1.13.0:
+    resolution: {integrity: sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==}
+
+  fd-slicer@1.1.0:
+    resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
+
+  fflate@0.7.4:
+    resolution: {integrity: sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==}
+
+  file-entry-cache@6.0.1:
+    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+
+  fill-range@7.0.1:
+    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
+    engines: {node: '>=8'}
+
+  find-up@4.1.0:
+    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
+    engines: {node: '>=8'}
+
+  find-up@5.0.0:
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
+
+  flat-cache@3.0.4:
+    resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+
+  flatted@3.2.7:
+    resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
+
+  for-in@1.0.2:
+    resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
+    engines: {node: '>=0.10.0'}
+
+  fragment-cache@0.2.1:
+    resolution: {integrity: sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==}
+    engines: {node: '>=0.10.0'}
+
+  fs-constants@1.0.0:
+    resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
+
+  fs.realpath@1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+
+  fsevents@2.3.2:
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  function-bind@1.1.1:
+    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
+
+  get-caller-file@2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
+  get-stream@5.2.0:
+    resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
+    engines: {node: '>=8'}
+
+  get-tsconfig@4.5.0:
+    resolution: {integrity: sha512-MjhiaIWCJ1sAU4pIQ5i5OfOuHHxVo1oYeNsWTON7jxYkod8pHocXeh+SSbmu5OZZZK73B6cbJ2XADzXehLyovQ==}
+
+  get-value@2.0.6:
+    resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
+    engines: {node: '>=0.10.0'}
+
+  gifenc@https://codeload.github.com/mattdesl/gifenc/tar.gz/64842fca317b112a8590f8fef2bf3825da8f6fe3:
+    resolution: {tarball: https://codeload.github.com/mattdesl/gifenc/tar.gz/64842fca317b112a8590f8fef2bf3825da8f6fe3}
+    name: gifenc
+    version: 1.0.3
+
+  glob-parent@5.1.2:
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
+    engines: {node: '>= 6'}
+
+  glob-parent@6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
+
+  glob@7.2.3:
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+
+  global-modules@2.0.0:
+    resolution: {integrity: sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==}
+    engines: {node: '>=6'}
+
+  global-prefix@3.0.0:
+    resolution: {integrity: sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==}
+    engines: {node: '>=6'}
+
+  globals@13.20.0:
+    resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==}
+    engines: {node: '>=8'}
+
+  globby@11.1.0:
+    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
+    engines: {node: '>=10'}
+
+  globjoin@0.1.4:
+    resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
+
+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
+  grapheme-splitter@1.0.4:
+    resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
+
+  graphemer@1.4.0:
+    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
+
+  hard-rejection@2.1.0:
+    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
+    engines: {node: '>=6'}
+
+  has-flag@3.0.0:
+    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
+    engines: {node: '>=4'}
+
+  has-flag@4.0.0:
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
+
+  has-value@0.3.1:
+    resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
+    engines: {node: '>=0.10.0'}
+
+  has-value@1.0.0:
+    resolution: {integrity: sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==}
+    engines: {node: '>=0.10.0'}
+
+  has-values@0.1.4:
+    resolution: {integrity: sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==}
+    engines: {node: '>=0.10.0'}
+
+  has-values@1.0.0:
+    resolution: {integrity: sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==}
+    engines: {node: '>=0.10.0'}
+
+  has@1.0.3:
+    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
+    engines: {node: '>= 0.4.0'}
+
+  highlight.js@10.6.0:
+    resolution: {integrity: sha512-8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ==}
+
+  hosted-git-info@2.8.9:
+    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
+
+  hosted-git-info@4.1.0:
+    resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
+    engines: {node: '>=10'}
+
+  html-tags@3.3.1:
+    resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
+    engines: {node: '>=8'}
+
+  https-proxy-agent@5.0.1:
+    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
+    engines: {node: '>= 6'}
+
+  ieee754@1.2.1:
+    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
+
+  ignore@5.2.4:
+    resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
+    engines: {node: '>= 4'}
+
+  import-fresh@3.3.0:
+    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
+    engines: {node: '>=6'}
+
+  import-lazy@4.0.0:
+    resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
+    engines: {node: '>=8'}
+
+  imurmurhash@0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
+
+  indent-string@4.0.0:
+    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
+    engines: {node: '>=8'}
+
+  inflight@1.0.6:
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+
+  inherits@2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+
+  ini@1.3.8:
+    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+
+  is-accessor-descriptor@0.1.6:
+    resolution: {integrity: sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==}
+    engines: {node: '>=0.10.0'}
+
+  is-accessor-descriptor@1.0.0:
+    resolution: {integrity: sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-arrayish@0.2.1:
+    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
+
+  is-buffer@1.1.6:
+    resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
+
+  is-core-module@2.12.0:
+    resolution: {integrity: sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==}
+
+  is-data-descriptor@0.1.4:
+    resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==}
+    engines: {node: '>=0.10.0'}
+
+  is-data-descriptor@1.0.0:
+    resolution: {integrity: sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-descriptor@0.1.6:
+    resolution: {integrity: sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==}
+    engines: {node: '>=0.10.0'}
+
+  is-descriptor@1.0.2:
+    resolution: {integrity: sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==}
+    engines: {node: '>=0.10.0'}
+
+  is-extendable@0.1.1:
+    resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
+    engines: {node: '>=0.10.0'}
+
+  is-extendable@1.0.1:
+    resolution: {integrity: sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==}
+    engines: {node: '>=0.10.0'}
+
+  is-extglob@2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-fullwidth-code-point@3.0.0:
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
+    engines: {node: '>=8'}
+
+  is-glob@4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+
+  is-number@3.0.0:
+    resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==}
+    engines: {node: '>=0.10.0'}
+
+  is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+
+  is-path-inside@3.0.3:
+    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
+    engines: {node: '>=8'}
+
+  is-plain-obj@1.1.0:
+    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
+    engines: {node: '>=0.10.0'}
+
+  is-plain-object@2.0.4:
+    resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
+    engines: {node: '>=0.10.0'}
+
+  is-plain-object@5.0.0:
+    resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
+    engines: {node: '>=0.10.0'}
+
+  is-windows@1.0.2:
+    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
+    engines: {node: '>=0.10.0'}
+
+  isarray@1.0.0:
+    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
+
+  isexe@2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+
+  isobject@2.1.0:
+    resolution: {integrity: sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==}
+    engines: {node: '>=0.10.0'}
+
+  isobject@3.0.1:
+    resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
+    engines: {node: '>=0.10.0'}
+
+  js-tokens@4.0.0:
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
+
+  js-yaml@4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+    hasBin: true
+
+  json-parse-even-better-errors@2.3.1:
+    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
+
+  json-schema-traverse@0.4.1:
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
+
+  json-schema-traverse@1.0.0:
+    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
+
+  json-stable-stringify-without-jsonify@1.0.1:
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+
+  jsonc-parser@3.2.0:
+    resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
+
+  jszip@2.7.0:
+    resolution: {integrity: sha512-JIsRKRVC3gTRo2vM4Wy9WBC3TRcfnIZU8k65Phi3izkvPH975FowRYtKGT6PxevA0XnJ/yO8b0QwV0ydVyQwfw==}
+
+  kind-of@3.2.2:
+    resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
+    engines: {node: '>=0.10.0'}
+
+  kind-of@4.0.0:
+    resolution: {integrity: sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==}
+    engines: {node: '>=0.10.0'}
+
+  kind-of@5.1.0:
+    resolution: {integrity: sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==}
+    engines: {node: '>=0.10.0'}
+
+  kind-of@6.0.3:
+    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
+    engines: {node: '>=0.10.0'}
+
+  known-css-properties@0.27.0:
+    resolution: {integrity: sha512-uMCj6+hZYDoffuvAJjFAPz56E9uoowFHmTkqRtRq5WyC5Q6Cu/fTZKNQpX/RbzChBYLLl3lo8CjFZBAZXq9qFg==}
+
+  levn@0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
+
+  lines-and-columns@1.2.4:
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+
+  locate-path@5.0.0:
+    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
+    engines: {node: '>=8'}
+
+  locate-path@6.0.0:
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
+
+  lodash.merge@4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+
+  lodash.truncate@4.4.2:
+    resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
+
+  lru-cache@6.0.0:
+    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
+    engines: {node: '>=10'}
+
+  map-cache@0.2.2:
+    resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
+    engines: {node: '>=0.10.0'}
+
+  map-obj@1.0.1:
+    resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
+    engines: {node: '>=0.10.0'}
+
+  map-obj@4.3.0:
+    resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
+    engines: {node: '>=8'}
+
+  map-visit@1.0.0:
+    resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==}
+    engines: {node: '>=0.10.0'}
+
+  mathml-tag-names@2.1.3:
+    resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}
+
+  mdn-data@2.0.30:
+    resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
+
+  meow@9.0.0:
+    resolution: {integrity: sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==}
+    engines: {node: '>=10'}
+
+  merge2@1.4.1:
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
+    engines: {node: '>= 8'}
+
+  micromatch@4.0.5:
+    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
+    engines: {node: '>=8.6'}
+
+  min-indent@1.0.1:
+    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
+    engines: {node: '>=4'}
+
+  minimatch@3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+
+  minimist-options@4.1.0:
+    resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
+    engines: {node: '>= 6'}
+
+  mitt@3.0.0:
+    resolution: {integrity: sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==}
+
+  mixin-deep@1.3.2:
+    resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==}
+    engines: {node: '>=0.10.0'}
+
+  mkdirp-classic@0.5.3:
+    resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
+
+  moment@2.29.4:
+    resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==}
+
+  monaco-editor@0.43.0:
+    resolution: {integrity: sha512-cnoqwQi/9fml2Szamv1XbSJieGJ1Dc8tENVMD26Kcfl7xGQWp7OBKMjlwKVGYFJ3/AXJjSOGvcqK7Ry/j9BM1Q==}
+
+  ms@2.0.0:
+    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
+
+  ms@2.1.2:
+    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
+
+  nanoid@3.3.6:
+    resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
+  nanoid@4.0.2:
+    resolution: {integrity: sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==}
+    engines: {node: ^14 || ^16 || >=18}
+    hasBin: true
+
+  nanomatch@1.2.13:
+    resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
+    engines: {node: '>=0.10.0'}
+
+  natural-compare-lite@1.4.0:
+    resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
+
+  natural-compare@1.4.0:
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+
+  node-fetch@2.6.7:
+    resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+
+  normalize-package-data@2.5.0:
+    resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
+
+  normalize-package-data@3.0.3:
+    resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==}
+    engines: {node: '>=10'}
+
+  normalize-path@3.0.0:
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
+
+  object-copy@0.1.0:
+    resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
+    engines: {node: '>=0.10.0'}
+
+  object-visit@1.0.1:
+    resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
+    engines: {node: '>=0.10.0'}
+
+  object.pick@1.3.0:
+    resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
+    engines: {node: '>=0.10.0'}
+
+  once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+
+  optionator@0.9.3:
+    resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
+    engines: {node: '>= 0.8.0'}
+
+  p-limit@2.3.0:
+    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
+    engines: {node: '>=6'}
+
+  p-limit@3.1.0:
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
+
+  p-locate@4.1.0:
+    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
+    engines: {node: '>=8'}
+
+  p-locate@5.0.0:
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
+
+  p-try@2.2.0:
+    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
+    engines: {node: '>=6'}
+
+  pako@1.0.11:
+    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
+
+  parent-module@1.0.1:
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+    engines: {node: '>=6'}
+
+  parse-json@5.2.0:
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+    engines: {node: '>=8'}
+
+  pascalcase@0.1.1:
+    resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
+    engines: {node: '>=0.10.0'}
+
+  path-exists@4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
+
+  path-is-absolute@1.0.1:
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
+    engines: {node: '>=0.10.0'}
+
+  path-key@3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
+
+  path-parse@1.0.7:
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
+
+  path-type@4.0.0:
+    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
+    engines: {node: '>=8'}
+
+  pend@1.2.0:
+    resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
+
+  picocolors@1.0.0:
+    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
+
+  picomatch@2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
+
+  postcss-media-query-parser@0.2.3:
+    resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==}
+
+  postcss-resolve-nested-selector@0.1.1:
+    resolution: {integrity: sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==}
+
+  postcss-safe-parser@6.0.0:
+    resolution: {integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==}
+    engines: {node: '>=12.0'}
+    peerDependencies:
+      postcss: ^8.3.3
+
+  postcss-selector-parser@6.0.12:
+    resolution: {integrity: sha512-NdxGCAZdRrwVI1sy59+Wzrh+pMMHxapGnpfenDVlMEXoOcvt4pGE0JLK9YY2F5dLxcFYA/YbVQKhcGU+FtSYQg==}
+    engines: {node: '>=4'}
+
+  postcss-value-parser@4.2.0:
+    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
+
+  postcss@8.4.23:
+    resolution: {integrity: sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  prelude-ls@1.2.1:
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
+
+  progress@2.0.3:
+    resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
+    engines: {node: '>=0.4.0'}
+
+  proxy-from-env@1.1.0:
+    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
+
+  pump@3.0.0:
+    resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
+
+  punycode@2.1.1:
+    resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
+    engines: {node: '>=6'}
+
+  puppeteer-core@19.11.1:
+    resolution: {integrity: sha512-qcuC2Uf0Fwdj9wNtaTZ2OvYRraXpAK+puwwVW8ofOhOgLPZyz1c68tsorfIZyCUOpyBisjr+xByu7BMbEYMepA==}
+    engines: {node: '>=14.14.0'}
+    peerDependencies:
+      typescript: '>= 4.7.4'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  q@1.5.1:
+    resolution: {integrity: sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==}
+    engines: {node: '>=0.6.0', teleport: '>=0.2.0'}
+
+  queue-microtask@1.2.3:
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
+
+  quick-lru@4.0.1:
+    resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==}
+    engines: {node: '>=8'}
+
+  read-pkg-up@7.0.1:
+    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
+    engines: {node: '>=8'}
+
+  read-pkg@5.2.0:
+    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
+    engines: {node: '>=8'}
+
+  readable-stream@3.6.2:
+    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
+    engines: {node: '>= 6'}
+
+  redent@3.0.0:
+    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
+    engines: {node: '>=8'}
+
+  regex-not@1.0.2:
+    resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
+    engines: {node: '>=0.10.0'}
+
+  require-directory@2.1.1:
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+    engines: {node: '>=0.10.0'}
+
+  require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+
+  resolve-from@4.0.0:
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
+    engines: {node: '>=4'}
+
+  resolve-from@5.0.0:
+    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
+    engines: {node: '>=8'}
+
+  resolve-url@0.2.1:
+    resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
+    deprecated: https://github.com/lydell/resolve-url#deprecated
+
+  resolve@1.22.2:
+    resolution: {integrity: sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==}
+    hasBin: true
+
+  ret@0.1.15:
+    resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
+    engines: {node: '>=0.12'}
+
+  reusify@1.0.4:
+    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+
+  rimraf@3.0.2:
+    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
+    hasBin: true
+
+  run-parallel@1.2.0:
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
+
+  safe-buffer@5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+
+  safe-regex@1.1.0:
+    resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==}
+
+  semver@5.7.1:
+    resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
+    hasBin: true
+
+  semver@7.5.0:
+    resolution: {integrity: sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  set-value@2.0.1:
+    resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
+    engines: {node: '>=0.10.0'}
+
+  shebang-command@2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
+
+  shebang-regex@3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
+
+  signal-exit@4.0.1:
+    resolution: {integrity: sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw==}
+    engines: {node: '>=14'}
+
+  slash@3.0.0:
+    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
+    engines: {node: '>=8'}
+
+  slice-ansi@4.0.0:
+    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
+    engines: {node: '>=10'}
+
+  snapdragon@0.8.2:
+    resolution: {integrity: sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==}
+    engines: {node: '>=0.10.0'}
+
+  source-map-js@1.0.2:
+    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
+    engines: {node: '>=0.10.0'}
+
+  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
+
+  source-map-support@0.5.21:
+    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
+
+  source-map-url@0.4.1:
+    resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==}
+    deprecated: See https://github.com/lydell/source-map-url#deprecated
+
+  source-map@0.5.7:
+    resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
+    engines: {node: '>=0.10.0'}
+
+  source-map@0.6.1:
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
+
+  spdx-correct@3.2.0:
+    resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==}
+
+  spdx-exceptions@2.3.0:
+    resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==}
+
+  spdx-expression-parse@3.0.1:
+    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
+
+  spdx-license-ids@3.0.13:
+    resolution: {integrity: sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==}
+
+  split-string@3.1.0:
+    resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
+    engines: {node: '>=0.10.0'}
+
+  standalone-electron-types@1.0.0:
+    resolution: {integrity: sha512-0HOi/tlTz3mjWhsAz4uRbpQcHMZ+ifj1JzWW9nugykOHClBBG77ps8QinrzX1eow4Iw2pnC+RFaSYRgufF4BOg==}
+
+  static-extend@0.1.2:
+    resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
+    engines: {node: '>=0.10.0'}
+
+  string-width@4.2.3:
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
+    engines: {node: '>=8'}
+
+  string_decoder@1.3.0:
+    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+
+  strip-ansi@6.0.1:
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
+    engines: {node: '>=8'}
+
+  strip-indent@3.0.0:
+    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
+    engines: {node: '>=8'}
+
+  strip-json-comments@3.1.1:
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
+    engines: {node: '>=8'}
+
+  style-search@0.1.0:
+    resolution: {integrity: sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==}
+
+  stylelint-config-recommended@12.0.0:
+    resolution: {integrity: sha512-x6x8QNARrGO2sG6iURkzqL+Dp+4bJorPMMRNPScdvaUK8PsynriOcMW7AFDKqkWAS5wbue/u8fUT/4ynzcmqdQ==}
+    peerDependencies:
+      stylelint: ^15.5.0
+
+  stylelint-config-standard@33.0.0:
+    resolution: {integrity: sha512-eyxnLWoXImUn77+ODIuW9qXBDNM+ALN68L3wT1lN2oNspZ7D9NVGlNHb2QCUn4xDug6VZLsh0tF8NyoYzkgTzg==}
+    peerDependencies:
+      stylelint: ^15.5.0
+
+  stylelint@15.6.0:
+    resolution: {integrity: sha512-Cqzpc8tvJm77KaM8qUbhpJ/UYK55Ia0whQXj4b9IId9dlPICO7J8Lyo15SZWiHxKjlvy3p5FQor/3n6i8ignXg==}
+    engines: {node: ^14.13.1 || >=16.0.0}
+    hasBin: true
+
+  supports-color@5.5.0:
+    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
+    engines: {node: '>=4'}
+
+  supports-color@7.2.0:
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
+
+  supports-hyperlinks@3.0.0:
+    resolution: {integrity: sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==}
+    engines: {node: '>=14.18'}
+
+  supports-preserve-symlinks-flag@1.0.0:
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
+    engines: {node: '>= 0.4'}
+
+  svg-tags@1.0.0:
+    resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==}
+
+  table@6.8.1:
+    resolution: {integrity: sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==}
+    engines: {node: '>=10.0.0'}
+
+  tar-fs@2.1.1:
+    resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==}
+
+  tar-stream@2.2.0:
+    resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
+    engines: {node: '>=6'}
+
+  text-table@0.2.0:
+    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
+
+  through@2.3.8:
+    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
+
+  to-object-path@0.3.0:
+    resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==}
+    engines: {node: '>=0.10.0'}
+
+  to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
+
+  to-regex@3.0.2:
+    resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==}
+    engines: {node: '>=0.10.0'}
+
+  tr46@0.0.3:
+    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
+
+  trim-newlines@3.0.1:
+    resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
+    engines: {node: '>=8'}
+
+  tslib@1.14.1:
+    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
+
+  tsutils@3.21.0:
+    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
+    engines: {node: '>= 6'}
+    peerDependencies:
+      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
+
+  tsx@3.12.7:
+    resolution: {integrity: sha512-C2Ip+jPmqKd1GWVQDvz/Eyc6QJbGfE7NrR3fx5BpEHMZsEHoIxHL1j+lKdGobr8ovEyqeNkPLSKp6SCSOt7gmw==}
+    hasBin: true
+
+  type-check@0.4.0:
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
+
+  type-fest@0.18.1:
+    resolution: {integrity: sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==}
+    engines: {node: '>=10'}
+
+  type-fest@0.20.2:
+    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
+    engines: {node: '>=10'}
+
+  type-fest@0.6.0:
+    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
+    engines: {node: '>=8'}
+
+  type-fest@0.8.1:
+    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
+    engines: {node: '>=8'}
+
+  type-fest@3.9.0:
+    resolution: {integrity: sha512-hR8JP2e8UiH7SME5JZjsobBlEiatFoxpzCP+R3ZeCo7kAaG1jXQE5X/buLzogM6GJu8le9Y4OcfNuIQX0rZskA==}
+    engines: {node: '>=14.16'}
+
+  typescript@5.0.4:
+    resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==}
+    engines: {node: '>=12.20'}
+    hasBin: true
+
+  unbzip2-stream@1.4.3:
+    resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
+
+  union-value@1.0.1:
+    resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
+    engines: {node: '>=0.10.0'}
+
+  unset-value@1.0.0:
+    resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
+    engines: {node: '>=0.10.0'}
+
+  uri-js@4.4.1:
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+
+  urix@0.1.0:
+    resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==}
+    deprecated: Please see https://github.com/lydell/urix#deprecated
+
+  use@3.1.1:
+    resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==}
+    engines: {node: '>=0.10.0'}
+
+  util-deprecate@1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+
+  v8-compile-cache@2.3.0:
+    resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==}
+
+  validate-npm-package-license@3.0.4:
+    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
+
+  virtual-merge@1.0.1:
+    resolution: {integrity: sha512-h7rzV6n5fZJbDu2lP4iu+IOtsZ00uqECFUxFePK1uY0pz/S5B7FNDJpmdDVfyGL7poyJECEHfTaIpJaknNkU0Q==}
+
+  vscode-oniguruma@1.7.0:
+    resolution: {integrity: sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==}
+
+  vscode-textmate@5.2.0:
+    resolution: {integrity: sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==}
+
+  webidl-conversions@3.0.1:
+    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
+
+  whatwg-url@5.0.0:
+    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
+
+  which@1.3.1:
+    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
+    hasBin: true
+
+  which@2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
+    hasBin: true
+
+  wrap-ansi@7.0.0:
+    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
+    engines: {node: '>=10'}
+
+  wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+
+  write-file-atomic@5.0.1:
+    resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  ws@8.13.0:
+    resolution: {integrity: sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
+  y18n@5.0.8:
+    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
+    engines: {node: '>=10'}
+
+  yallist@4.0.0:
+    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
+
+  yargs-parser@20.2.9:
+    resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
+    engines: {node: '>=10'}
+
+  yargs-parser@21.1.1:
+    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
+    engines: {node: '>=12'}
+
+  yargs@17.7.1:
+    resolution: {integrity: sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==}
+    engines: {node: '>=12'}
+
+  yauzl@2.10.0:
+    resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
+
+  yocto-queue@0.1.0:
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+    engines: {node: '>=10'}
+
+  zip-local@0.3.5:
+    resolution: {integrity: sha512-GRV3D5TJY+/PqyeRm5CYBs7xVrKTKzljBoEXvocZu0HJ7tPEcgpSOYa2zFIsCZWgKWMuc4U3yMFgFkERGFIB9w==}
+
+  zustand@3.7.2:
+    resolution: {integrity: sha512-PIJDIZKtokhof+9+60cpockVOq05sJzHCriyvaLBmEJixseQ1a5Kdov6fWZfWOu5SK9c+FhH1jU0tntLxRJYMA==}
+    engines: {node: '>=12.7.0'}
+    peerDependencies:
+      react: '>=16.8'
+    peerDependenciesMeta:
+      react:
+        optional: true
+
+snapshots:
+
+  '@aashutoshrathi/word-wrap@1.2.6': {}
+
+  '@babel/code-frame@7.21.4':
+    dependencies:
+      '@babel/highlight': 7.18.6
+
+  '@babel/helper-validator-identifier@7.19.1': {}
+
+  '@babel/highlight@7.18.6':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.19.1
+      chalk: 2.4.2
+      js-tokens: 4.0.0
+
+  '@csstools/css-parser-algorithms@2.1.1(@csstools/css-tokenizer@2.1.1)':
+    dependencies:
+      '@csstools/css-tokenizer': 2.1.1
+
+  '@csstools/css-tokenizer@2.1.1': {}
+
+  '@csstools/media-query-list-parser@2.0.4(@csstools/css-parser-algorithms@2.1.1)(@csstools/css-tokenizer@2.1.1)':
+    dependencies:
+      '@csstools/css-parser-algorithms': 2.1.1(@csstools/css-tokenizer@2.1.1)
+      '@csstools/css-tokenizer': 2.1.1
+
+  '@csstools/selector-specificity@2.2.0(postcss-selector-parser@6.0.12)':
+    dependencies:
+      postcss-selector-parser: 6.0.12
+
+  '@esbuild-kit/cjs-loader@2.4.2':
+    dependencies:
+      '@esbuild-kit/core-utils': 3.1.0
+      get-tsconfig: 4.5.0
+
+  '@esbuild-kit/core-utils@3.1.0':
+    dependencies:
+      esbuild: 0.17.18
+      source-map-support: 0.5.21
+
+  '@esbuild-kit/esm-loader@2.5.5':
+    dependencies:
+      '@esbuild-kit/core-utils': 3.1.0
+      get-tsconfig: 4.5.0
+
+  '@esbuild/android-arm64@0.17.18':
+    optional: true
+
+  '@esbuild/android-arm@0.15.18':
+    optional: true
+
+  '@esbuild/android-arm@0.17.18':
+    optional: true
+
+  '@esbuild/android-x64@0.17.18':
+    optional: true
+
+  '@esbuild/darwin-arm64@0.17.18':
+    optional: true
+
+  '@esbuild/darwin-x64@0.17.18':
+    optional: true
+
+  '@esbuild/freebsd-arm64@0.17.18':
+    optional: true
+
+  '@esbuild/freebsd-x64@0.17.18':
+    optional: true
+
+  '@esbuild/linux-arm64@0.17.18':
+    optional: true
+
+  '@esbuild/linux-arm@0.17.18':
+    optional: true
+
+  '@esbuild/linux-ia32@0.17.18':
+    optional: true
+
+  '@esbuild/linux-loong64@0.15.18':
+    optional: true
+
+  '@esbuild/linux-loong64@0.17.18':
+    optional: true
+
+  '@esbuild/linux-mips64el@0.17.18':
+    optional: true
+
+  '@esbuild/linux-ppc64@0.17.18':
+    optional: true
+
+  '@esbuild/linux-riscv64@0.17.18':
+    optional: true
+
+  '@esbuild/linux-s390x@0.17.18':
+    optional: true
+
+  '@esbuild/linux-x64@0.17.18':
+    optional: true
+
+  '@esbuild/netbsd-x64@0.17.18':
+    optional: true
+
+  '@esbuild/openbsd-x64@0.17.18':
+    optional: true
+
+  '@esbuild/sunos-x64@0.17.18':
+    optional: true
+
+  '@esbuild/win32-arm64@0.17.18':
+    optional: true
+
+  '@esbuild/win32-ia32@0.17.18':
+    optional: true
+
+  '@esbuild/win32-x64@0.17.18':
+    optional: true
+
+  '@eslint-community/eslint-utils@4.4.0(eslint@8.46.0)':
     dependencies:
       eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
       eslint-visitor-keys: 3.4.2
-    dev: true
 
-  /@eslint-community/regexpp@4.5.1:
-    resolution: {integrity: sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==}
-    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
-    dev: true
+  '@eslint-community/regexpp@4.5.1': {}
 
-  /@eslint-community/regexpp@4.6.2:
-    resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==}
-    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
-    dev: true
+  '@eslint-community/regexpp@4.6.2': {}
 
-  /@eslint/eslintrc@2.1.1:
-    resolution: {integrity: sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  '@eslint/eslintrc@2.1.1':
     dependencies:
       ajv: 6.12.6
       debug: 4.3.4
@@ -460,63 +2194,34 @@ packages:
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@eslint/js@8.46.0:
-    resolution: {integrity: sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
+  '@eslint/js@8.46.0': {}
 
-  /@humanwhocodes/config-array@0.11.10:
-    resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==}
-    engines: {node: '>=10.10.0'}
+  '@humanwhocodes/config-array@0.11.10':
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
       debug: 4.3.4
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@humanwhocodes/module-importer@1.0.1:
-    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
-    engines: {node: '>=12.22'}
-    dev: true
+  '@humanwhocodes/module-importer@1.0.1': {}
 
-  /@humanwhocodes/object-schema@1.2.1:
-    resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
-    dev: true
+  '@humanwhocodes/object-schema@1.2.1': {}
 
-  /@nodelib/fs.scandir@2.1.5:
-    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
-    engines: {node: '>= 8'}
+  '@nodelib/fs.scandir@2.1.5':
     dependencies:
       '@nodelib/fs.stat': 2.0.5
       run-parallel: 1.2.0
-    dev: true
 
-  /@nodelib/fs.stat@2.0.5:
-    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
-    engines: {node: '>= 8'}
-    dev: true
+  '@nodelib/fs.stat@2.0.5': {}
 
-  /@nodelib/fs.walk@1.2.8:
-    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
-    engines: {node: '>= 8'}
+  '@nodelib/fs.walk@1.2.8':
     dependencies:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.13.0
-    dev: true
 
-  /@puppeteer/browsers@0.5.0(typescript@5.0.4):
-    resolution: {integrity: sha512-Uw6oB7VvmPRLE4iKsjuOh8zgDabhNX67dzo8U/BB0f9527qx+4eeUs+korU98OhG5C4ubg7ufBgVi63XYwS6TQ==}
-    engines: {node: '>=14.1.0'}
-    hasBin: true
-    peerDependencies:
-      typescript: '>= 4.7.4'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@puppeteer/browsers@0.5.0(typescript@5.0.4)':
     dependencies:
       debug: 4.3.4
       extract-zip: 2.0.1
@@ -529,116 +2234,65 @@ packages:
       yargs: 17.7.1
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@sapphi-red/web-noise-suppressor@0.3.3:
-    resolution: {integrity: sha512-gAC33DCXYwNTI/k1PxOVHmbbzakUSMbb/DHpoV6rn4pKZtPI1dduULSmAAm/y1ipgIlArnk2JcnQzw4n2tCZHw==}
-    dev: false
+  '@sapphi-red/web-noise-suppressor@0.3.3': {}
 
-  /@types/chrome@0.0.246:
-    resolution: {integrity: sha512-MxGxEomGxsJiL9xe/7ZwVgwdn8XVKWbPvxpVQl3nWOjrS0Ce63JsfzxUc4aU3GvRcUPYsfufHmJ17BFyKxeA4g==}
+  '@types/chrome@0.0.246':
     dependencies:
       '@types/filesystem': 0.0.33
       '@types/har-format': 1.2.13
-    dev: true
 
-  /@types/diff@5.0.3:
-    resolution: {integrity: sha512-amrLbRqTU9bXMCc6uX0sWpxsQzRIo9z6MJPkH1pkez/qOxuqSZVuryJAWoBRq94CeG8JxY+VK4Le9HtjQR5T9A==}
-    dev: true
+  '@types/diff@5.0.3': {}
 
-  /@types/filesystem@0.0.33:
-    resolution: {integrity: sha512-2KedRPzwu2K528vFkoXnnWdsG0MtUwPjuA7pRy4vKxlxHEe8qUDZibYHXJKZZr2Cl/ELdCWYqyb/MKwsUuzBWw==}
+  '@types/filesystem@0.0.33':
     dependencies:
       '@types/filewriter': 0.0.30
-    dev: true
 
-  /@types/filewriter@0.0.30:
-    resolution: {integrity: sha512-lB98tui0uxc7erbj0serZfJlHKLNJHwBltPnbmO1WRpL5T325GOHRiQfr2E29V2q+S1brDO63Fpdt6vb3bES9Q==}
-    dev: true
+  '@types/filewriter@0.0.30': {}
 
-  /@types/har-format@1.2.13:
-    resolution: {integrity: sha512-PwBsCBD3lDODn4xpje3Y1di0aDJp4Ww7aSfMRVw6ysnxD4I7Wmq2mBkSKaDtN403hqH5sp6c9xQUvFYY3+lkBg==}
-    dev: true
+  '@types/har-format@1.2.13': {}
 
-  /@types/json-schema@7.0.11:
-    resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
-    dev: true
+  '@types/json-schema@7.0.11': {}
 
-  /@types/lodash@4.14.194:
-    resolution: {integrity: sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==}
-    dev: true
+  '@types/lodash@4.14.194': {}
 
-  /@types/minimist@1.2.2:
-    resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
-    dev: true
+  '@types/minimist@1.2.2': {}
 
-  /@types/node@18.16.3:
-    resolution: {integrity: sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q==}
-    dev: true
+  '@types/node@18.16.3': {}
 
-  /@types/normalize-package-data@2.4.1:
-    resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
-    dev: true
+  '@types/normalize-package-data@2.4.1': {}
 
-  /@types/prop-types@15.7.5:
-    resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
-    dev: true
+  '@types/prop-types@15.7.5': {}
 
-  /@types/react-dom@18.2.1:
-    resolution: {integrity: sha512-8QZEV9+Kwy7tXFmjJrp3XUKQSs9LTnE0KnoUb0YCguWBiNW0Yfb2iBMYZ08WPg35IR6P3Z0s00B15SwZnO26+w==}
+  '@types/react-dom@18.2.1':
     dependencies:
       '@types/react': 18.2.0
-    dev: true
 
-  /@types/react@17.0.2:
-    resolution: {integrity: sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==}
+  '@types/react@17.0.2':
     dependencies:
       '@types/prop-types': 15.7.5
       csstype: 3.1.2
-    dev: true
 
-  /@types/react@18.2.0:
-    resolution: {integrity: sha512-0FLj93y5USLHdnhIhABk83rm8XEGA7kH3cr+YUlvxoUGp1xNt/DINUMvqPxLyOQMzLmZe8i4RTHbvb8MC7NmrA==}
+  '@types/react@18.2.0':
     dependencies:
       '@types/prop-types': 15.7.5
       '@types/scheduler': 0.16.3
       csstype: 3.1.2
-    dev: true
 
-  /@types/scheduler@0.16.3:
-    resolution: {integrity: sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==}
-    dev: true
+  '@types/scheduler@0.16.3': {}
 
-  /@types/semver@7.3.13:
-    resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==}
-    dev: true
+  '@types/semver@7.3.13': {}
 
-  /@types/yauzl@2.10.0:
-    resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
-    requiresBuild: true
+  '@types/yauzl@2.10.0':
     dependencies:
       '@types/node': 18.16.3
-    dev: true
     optional: true
 
-  /@types/yazl@2.4.2:
-    resolution: {integrity: sha512-T+9JH8O2guEjXNxqmybzQ92mJUh2oCwDDMSSimZSe1P+pceZiFROZLYmcbqkzV5EUwz6VwcKXCO2S2yUpra6XQ==}
+  '@types/yazl@2.4.2':
     dependencies:
       '@types/node': 18.16.3
-    dev: true
 
-  /@typescript-eslint/eslint-plugin@5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4):
-    resolution: {integrity: sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      '@typescript-eslint/parser': ^5.0.0
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      eslint:
-        optional: true
-      typescript:
-        optional: true
+  '@typescript-eslint/eslint-plugin@5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4)':
     dependencies:
       '@eslint-community/regexpp': 4.5.1
       '@typescript-eslint/parser': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
@@ -655,19 +2309,8 @@ packages:
       typescript: 5.0.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@typescript-eslint/parser@5.59.1(eslint@8.46.0)(typescript@5.0.4):
-    resolution: {integrity: sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      eslint:
-        optional: true
-      typescript:
-        optional: true
+  '@typescript-eslint/parser@5.59.1(eslint@8.46.0)(typescript@5.0.4)':
     dependencies:
       '@typescript-eslint/scope-manager': 5.59.1
       '@typescript-eslint/types': 5.59.1
@@ -677,27 +2320,13 @@ packages:
       typescript: 5.0.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@typescript-eslint/scope-manager@5.59.1:
-    resolution: {integrity: sha512-mau0waO5frJctPuAzcxiNWqJR5Z8V0190FTSqRw1Q4Euop6+zTwHAf8YIXNwDOT29tyUDrQ65jSg9aTU/H0omA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  '@typescript-eslint/scope-manager@5.59.1':
     dependencies:
       '@typescript-eslint/types': 5.59.1
       '@typescript-eslint/visitor-keys': 5.59.1
-    dev: true
 
-  /@typescript-eslint/type-utils@5.59.1(eslint@8.46.0)(typescript@5.0.4):
-    resolution: {integrity: sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: '*'
-      typescript: '*'
-    peerDependenciesMeta:
-      eslint:
-        optional: true
-      typescript:
-        optional: true
+  '@typescript-eslint/type-utils@5.59.1(eslint@8.46.0)(typescript@5.0.4)':
     dependencies:
       '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.0.4)
       '@typescript-eslint/utils': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
@@ -707,21 +2336,10 @@ packages:
       typescript: 5.0.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@typescript-eslint/types@5.59.1:
-    resolution: {integrity: sha512-dg0ICB+RZwHlysIy/Dh1SP+gnXNzwd/KS0JprD3Lmgmdq+dJAJnUPe1gNG34p0U19HvRlGX733d/KqscrGC1Pg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
+  '@typescript-eslint/types@5.59.1': {}
 
-  /@typescript-eslint/typescript-estree@5.59.1(typescript@5.0.4):
-    resolution: {integrity: sha512-lYLBBOCsFltFy7XVqzX0Ju+Lh3WPIAWxYpmH/Q7ZoqzbscLiCW00LeYCdsUnnfnj29/s1WovXKh2gwCoinHNGA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@typescript-eslint/typescript-estree@5.59.1(typescript@5.0.4)':
     dependencies:
       '@typescript-eslint/types': 5.59.1
       '@typescript-eslint/visitor-keys': 5.59.1
@@ -733,16 +2351,8 @@ packages:
       typescript: 5.0.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@typescript-eslint/utils@5.59.1(eslint@8.46.0)(typescript@5.0.4):
-    resolution: {integrity: sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-    peerDependenciesMeta:
-      eslint:
-        optional: true
+  '@typescript-eslint/utils@5.59.1(eslint@8.46.0)(typescript@5.0.4)':
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0)
       '@types/json-schema': 7.0.11
@@ -756,154 +2366,85 @@ packages:
     transitivePeerDependencies:
       - supports-color
       - typescript
-    dev: true
 
-  /@typescript-eslint/visitor-keys@5.59.1:
-    resolution: {integrity: sha512-6waEYwBTCWryx0VJmP7JaM4FpipLsFl9CvYf2foAE8Qh/Y0s+bxWysciwOs0LTBED4JCaNxTZ5rGadB14M6dwA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  '@typescript-eslint/visitor-keys@5.59.1':
     dependencies:
       '@typescript-eslint/types': 5.59.1
       eslint-visitor-keys: 3.4.0
-    dev: true
 
-  /@vap/core@0.0.12:
-    resolution: {integrity: sha512-3csHpkE1zUSRTZwl7xIf2uXg1cD4IhhtUm0F6K/dWydc95R5Nj+krB4OTNATuqkewIv/ViCbwjPfkafAgvZQSg==}
+  '@vap/core@0.0.12':
     dependencies:
       eventemitter3: 4.0.7
-    dev: false
 
-  /@vap/shiki@0.10.5:
-    resolution: {integrity: sha512-5BHVGvQT8qonbLSASon5aQFQ18OZU4FxSl9tLSj6oJ0sap3KdMbYcfGq25M9zFZR1g1dJN7fgjmZXBIS5omIdw==}
+  '@vap/shiki@0.10.5':
     dependencies:
       jsonc-parser: 3.2.0
       vscode-oniguruma: 1.7.0
       vscode-textmate: 5.2.0
-    dev: false
 
-  /acorn-jsx@5.3.2(acorn@8.10.0):
-    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
-    peerDependencies:
-      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+  acorn-jsx@5.3.2(acorn@8.10.0):
     dependencies:
       acorn: 8.10.0
-    dev: true
 
-  /acorn@8.10.0:
-    resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-    dev: true
+  acorn@8.10.0: {}
 
-  /agent-base@6.0.2:
-    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
-    engines: {node: '>= 6.0.0'}
+  agent-base@6.0.2:
     dependencies:
       debug: 4.3.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /ajv@6.12.6:
-    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+  ajv@6.12.6:
     dependencies:
       fast-deep-equal: 3.1.3
       fast-json-stable-stringify: 2.1.0
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
-    dev: true
 
-  /ajv@8.12.0:
-    resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}
+  ajv@8.12.0:
     dependencies:
       fast-deep-equal: 3.1.3
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
       uri-js: 4.4.1
-    dev: true
 
-  /ansi-regex@5.0.1:
-    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
-    engines: {node: '>=8'}
-    dev: true
+  ansi-regex@5.0.1: {}
 
-  /ansi-styles@3.2.1:
-    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
-    engines: {node: '>=4'}
+  ansi-styles@3.2.1:
     dependencies:
       color-convert: 1.9.3
-    dev: true
 
-  /ansi-styles@4.3.0:
-    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
-    engines: {node: '>=8'}
+  ansi-styles@4.3.0:
     dependencies:
       color-convert: 2.0.1
-    dev: true
 
-  /argparse@2.0.1:
-    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
-    dev: true
+  argparse@2.0.1: {}
 
-  /arr-diff@4.0.0:
-    resolution: {integrity: sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  arr-diff@4.0.0: {}
 
-  /arr-union@3.1.0:
-    resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  arr-union@3.1.0: {}
 
-  /array-union@2.1.0:
-    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
-    engines: {node: '>=8'}
-    dev: true
+  array-union@2.1.0: {}
 
-  /array-unique@0.3.2:
-    resolution: {integrity: sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  array-unique@0.3.2: {}
 
-  /arrify@1.0.1:
-    resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  arrify@1.0.1: {}
 
-  /assign-symbols@1.0.0:
-    resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  assign-symbols@1.0.0: {}
 
-  /astral-regex@2.0.0:
-    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
-    engines: {node: '>=8'}
-    dev: true
+  astral-regex@2.0.0: {}
 
-  /async@1.5.2:
-    resolution: {integrity: sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==}
-    dev: true
+  async@1.5.2: {}
 
-  /atob@2.1.2:
-    resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
-    engines: {node: '>= 4.5.0'}
-    hasBin: true
-    dev: true
+  atob@2.1.2: {}
 
-  /balanced-match@1.0.2:
-    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
-    dev: true
+  balanced-match@1.0.2: {}
 
-  /balanced-match@2.0.0:
-    resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==}
-    dev: true
+  balanced-match@2.0.0: {}
 
-  /base64-js@1.5.1:
-    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
-    dev: true
+  base64-js@1.5.1: {}
 
-  /base@0.11.2:
-    resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==}
-    engines: {node: '>=0.10.0'}
+  base@0.11.2:
     dependencies:
       cache-base: 1.0.1
       class-utils: 0.3.6
@@ -912,48 +2453,32 @@ packages:
       isobject: 3.0.1
       mixin-deep: 1.3.2
       pascalcase: 0.1.1
-    dev: true
 
-  /bl@4.1.0:
-    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
+  bl@4.1.0:
     dependencies:
       buffer: 5.7.1
       inherits: 2.0.4
       readable-stream: 3.6.2
-    dev: true
 
-  /brace-expansion@1.1.11:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+  brace-expansion@1.1.11:
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
-    dev: true
 
-  /braces@3.0.2:
-    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
-    engines: {node: '>=8'}
+  braces@3.0.2:
     dependencies:
       fill-range: 7.0.1
-    dev: true
 
-  /buffer-crc32@0.2.13:
-    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
-    dev: true
+  buffer-crc32@0.2.13: {}
 
-  /buffer-from@1.1.2:
-    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
-    dev: true
+  buffer-from@1.1.2: {}
 
-  /buffer@5.7.1:
-    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+  buffer@5.7.1:
     dependencies:
       base64-js: 1.5.1
       ieee754: 1.2.1
-    dev: true
 
-  /cache-base@1.0.1:
-    resolution: {integrity: sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==}
-    engines: {node: '>=0.10.0'}
+  cache-base@1.0.1:
     dependencies:
       collection-visit: 1.0.0
       component-emitter: 1.3.0
@@ -964,470 +2489,223 @@ packages:
       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'}
-    dev: true
+  callsites@3.1.0: {}
 
-  /camelcase-keys@6.2.2:
-    resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
-    engines: {node: '>=8'}
+  camelcase-keys@6.2.2:
     dependencies:
       camelcase: 5.3.1
       map-obj: 4.3.0
       quick-lru: 4.0.1
-    dev: true
 
-  /camelcase@5.3.1:
-    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
-    engines: {node: '>=6'}
-    dev: true
+  camelcase@5.3.1: {}
 
-  /chalk@2.4.2:
-    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
-    engines: {node: '>=4'}
+  chalk@2.4.2:
     dependencies:
       ansi-styles: 3.2.1
       escape-string-regexp: 1.0.5
       supports-color: 5.5.0
-    dev: true
 
-  /chalk@4.1.2:
-    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
-    engines: {node: '>=10'}
+  chalk@4.1.2:
     dependencies:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
-    dev: true
 
-  /chownr@1.1.4:
-    resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
-    dev: true
+  chownr@1.1.4: {}
 
-  /chromium-bidi@0.4.7(devtools-protocol@0.0.1107588):
-    resolution: {integrity: sha512-6+mJuFXwTMU6I3vYLs6IL8A1DyQTPjCfIL971X0aMPVGRbGnNfl6i6Cl0NMbxi2bRYLGESt9T2ZIMRM5PAEcIQ==}
-    peerDependencies:
-      devtools-protocol: '*'
+  chromium-bidi@0.4.7(devtools-protocol@0.0.1107588):
     dependencies:
       devtools-protocol: 0.0.1107588
       mitt: 3.0.0
-    dev: true
 
-  /class-utils@0.3.6:
-    resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
-    engines: {node: '>=0.10.0'}
+  class-utils@0.3.6:
     dependencies:
       arr-union: 3.1.0
       define-property: 0.2.5
       isobject: 3.0.1
       static-extend: 0.1.2
-    dev: true
 
-  /cliui@8.0.1:
-    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
-    engines: {node: '>=12'}
+  cliui@8.0.1:
     dependencies:
       string-width: 4.2.3
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
-    dev: true
 
-  /collection-visit@1.0.0:
-    resolution: {integrity: sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==}
-    engines: {node: '>=0.10.0'}
+  collection-visit@1.0.0:
     dependencies:
       map-visit: 1.0.0
       object-visit: 1.0.1
-    dev: true
 
-  /color-convert@1.9.3:
-    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
+  color-convert@1.9.3:
     dependencies:
       color-name: 1.1.3
-    dev: true
 
-  /color-convert@2.0.1:
-    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
-    engines: {node: '>=7.0.0'}
+  color-convert@2.0.1:
     dependencies:
       color-name: 1.1.4
-    dev: true
 
-  /color-name@1.1.3:
-    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
-    dev: true
+  color-name@1.1.3: {}
 
-  /color-name@1.1.4:
-    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
-    dev: true
+  color-name@1.1.4: {}
 
-  /colord@2.9.3:
-    resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}
-    dev: true
+  colord@2.9.3: {}
 
-  /component-emitter@1.3.0:
-    resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
-    dev: true
+  component-emitter@1.3.0: {}
 
-  /concat-map@0.0.1:
-    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
-    dev: true
+  concat-map@0.0.1: {}
 
-  /copy-descriptor@0.1.1:
-    resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  copy-descriptor@0.1.1: {}
 
-  /cosmiconfig@8.1.3:
-    resolution: {integrity: sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==}
-    engines: {node: '>=14'}
+  cosmiconfig@8.1.3:
     dependencies:
       import-fresh: 3.3.0
       js-yaml: 4.1.0
       parse-json: 5.2.0
       path-type: 4.0.0
-    dev: true
 
-  /cross-fetch@3.1.5:
-    resolution: {integrity: sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==}
+  cross-fetch@3.1.5:
     dependencies:
       node-fetch: 2.6.7
     transitivePeerDependencies:
       - encoding
-    dev: true
 
-  /cross-spawn@7.0.3:
-    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
-    engines: {node: '>= 8'}
+  cross-spawn@7.0.3:
     dependencies:
       path-key: 3.1.1
       shebang-command: 2.0.0
       which: 2.0.2
-    dev: true
 
-  /css-functions-list@3.1.0:
-    resolution: {integrity: sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==}
-    engines: {node: '>=12.22'}
-    dev: true
+  css-functions-list@3.1.0: {}
 
-  /css-tree@2.3.1:
-    resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==}
-    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
+  css-tree@2.3.1:
     dependencies:
       mdn-data: 2.0.30
       source-map-js: 1.0.2
-    dev: true
 
-  /cssesc@3.0.0:
-    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
-    engines: {node: '>=4'}
-    hasBin: true
-    dev: true
+  cssesc@3.0.0: {}
 
-  /csstype@3.1.2:
-    resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
-    dev: true
+  csstype@3.1.2: {}
 
-  /debug@2.6.9:
-    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+  debug@2.6.9:
     dependencies:
       ms: 2.0.0
-    dev: true
 
-  /debug@4.3.4:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+  debug@4.3.4:
     dependencies:
       ms: 2.1.2
-    dev: true
 
-  /decamelize-keys@1.1.1:
-    resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
-    engines: {node: '>=0.10.0'}
+  decamelize-keys@1.1.1:
     dependencies:
       decamelize: 1.2.0
       map-obj: 1.0.1
-    dev: true
 
-  /decamelize@1.2.0:
-    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  decamelize@1.2.0: {}
 
-  /decode-uri-component@0.2.0:
-    resolution: {integrity: sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==}
-    engines: {node: '>=0.10'}
-    dev: true
+  decode-uri-component@0.2.0: {}
 
-  /deep-is@0.1.4:
-    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
-    dev: true
+  deep-is@0.1.4: {}
 
-  /define-property@0.2.5:
-    resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
-    engines: {node: '>=0.10.0'}
+  define-property@0.2.5:
     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'}
+  define-property@1.0.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'}
+  define-property@2.0.2:
     dependencies:
       is-descriptor: 1.0.2
       isobject: 3.0.1
-    dev: true
 
-  /devtools-protocol@0.0.1107588:
-    resolution: {integrity: sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==}
-    dev: true
+  devtools-protocol@0.0.1107588: {}
 
-  /diff@5.1.0:
-    resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==}
-    engines: {node: '>=0.3.1'}
-    dev: true
+  diff@5.1.0: {}
 
-  /dir-glob@3.0.1:
-    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
-    engines: {node: '>=8'}
+  dir-glob@3.0.1:
     dependencies:
       path-type: 4.0.0
-    dev: true
 
-  /discord-types@1.3.26:
-    resolution: {integrity: sha512-ToG51AOCH+JTQf7b+8vuYQe5Iqwz7nZ7StpECAZ/VZcI1ZhQk13pvt9KkRTfRv1xNvwJ2qib4e3+RifQlo8VPQ==}
+  discord-types@1.3.26:
     dependencies:
       '@types/react': 17.0.2
       moment: 2.29.4
-    dev: true
 
-  /doctrine@3.0.0:
-    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
-    engines: {node: '>=6.0.0'}
+  doctrine@3.0.0:
     dependencies:
       esutils: 2.0.3
-    dev: true
 
-  /emoji-regex@8.0.0:
-    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
-    dev: true
+  emoji-regex@8.0.0: {}
 
-  /end-of-stream@1.4.4:
-    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
+  end-of-stream@1.4.4:
     dependencies:
       once: 1.4.0
-    dev: true
 
-  /error-ex@1.3.2:
-    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
+  error-ex@1.3.2:
     dependencies:
       is-arrayish: 0.2.1
-    dev: true
 
-  /esbuild-android-64@0.15.18:
-    resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  esbuild-android-64@0.15.18:
     optional: true
 
-  /esbuild-android-arm64@0.15.18:
-    resolution: {integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  esbuild-android-arm64@0.15.18:
     optional: true
 
-  /esbuild-darwin-64@0.15.18:
-    resolution: {integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  esbuild-darwin-64@0.15.18:
     optional: true
 
-  /esbuild-darwin-arm64@0.15.18:
-    resolution: {integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  esbuild-darwin-arm64@0.15.18:
     optional: true
 
-  /esbuild-freebsd-64@0.15.18:
-    resolution: {integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  esbuild-freebsd-64@0.15.18:
     optional: true
 
-  /esbuild-freebsd-arm64@0.15.18:
-    resolution: {integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  esbuild-freebsd-arm64@0.15.18:
     optional: true
 
-  /esbuild-linux-32@0.15.18:
-    resolution: {integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-32@0.15.18:
     optional: true
 
-  /esbuild-linux-64@0.15.18:
-    resolution: {integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-64@0.15.18:
     optional: true
 
-  /esbuild-linux-arm64@0.15.18:
-    resolution: {integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-arm64@0.15.18:
     optional: true
 
-  /esbuild-linux-arm@0.15.18:
-    resolution: {integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-arm@0.15.18:
     optional: true
 
-  /esbuild-linux-mips64le@0.15.18:
-    resolution: {integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-mips64le@0.15.18:
     optional: true
 
-  /esbuild-linux-ppc64le@0.15.18:
-    resolution: {integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-ppc64le@0.15.18:
     optional: true
 
-  /esbuild-linux-riscv64@0.15.18:
-    resolution: {integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-riscv64@0.15.18:
     optional: true
 
-  /esbuild-linux-s390x@0.15.18:
-    resolution: {integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-s390x@0.15.18:
     optional: true
 
-  /esbuild-netbsd-64@0.15.18:
-    resolution: {integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: true
+  esbuild-netbsd-64@0.15.18:
     optional: true
 
-  /esbuild-openbsd-64@0.15.18:
-    resolution: {integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
+  esbuild-openbsd-64@0.15.18:
     optional: true
 
-  /esbuild-sunos-64@0.15.18:
-    resolution: {integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: true
+  esbuild-sunos-64@0.15.18:
     optional: true
 
-  /esbuild-windows-32@0.15.18:
-    resolution: {integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  esbuild-windows-32@0.15.18:
     optional: true
 
-  /esbuild-windows-64@0.15.18:
-    resolution: {integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  esbuild-windows-64@0.15.18:
     optional: true
 
-  /esbuild-windows-arm64@0.15.18:
-    resolution: {integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  esbuild-windows-arm64@0.15.18:
     optional: true
 
-  /esbuild@0.15.18:
-    resolution: {integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
+  esbuild@0.15.18:
     optionalDependencies:
       '@esbuild/android-arm': 0.15.18
       '@esbuild/linux-loong64': 0.15.18
@@ -1451,13 +2729,8 @@ packages:
       esbuild-windows-32: 0.15.18
       esbuild-windows-64: 0.15.18
       esbuild-windows-arm64: 0.15.18
-    dev: true
 
-  /esbuild@0.17.18:
-    resolution: {integrity: sha512-z1lix43jBs6UKjcZVKOw2xx69ffE2aG0PygLL5qJ9OS/gy0Ewd1gW/PUQIOIQGXBHWNywSc0floSKoMFF8aK2w==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
+  esbuild@0.17.18:
     optionalDependencies:
       '@esbuild/android-arm': 0.17.18
       '@esbuild/android-arm64': 0.17.18
@@ -1481,115 +2754,51 @@ packages:
       '@esbuild/win32-arm64': 0.17.18
       '@esbuild/win32-ia32': 0.17.18
       '@esbuild/win32-x64': 0.17.18
-    dev: true
 
-  /escalade@3.1.1:
-    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
-    engines: {node: '>=6'}
-    dev: true
+  escalade@3.1.1: {}
 
-  /escape-string-regexp@1.0.5:
-    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
-    engines: {node: '>=0.8.0'}
-    dev: true
+  escape-string-regexp@1.0.5: {}
 
-  /escape-string-regexp@4.0.0:
-    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
-    engines: {node: '>=10'}
-    dev: true
+  escape-string-regexp@4.0.0: {}
 
-  /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'
-    peerDependenciesMeta:
-      eslint-plugin-import:
-        optional: true
-    dev: true
+  eslint-import-resolver-alias@1.1.2: {}
 
-  /eslint-plugin-path-alias@1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0):
-    resolution: {integrity: sha512-FXus57yC+Zd3sMv46pbloXYwFeNVNHJqlACr9V68FG/IzGFBBokGJpmjDbEjpt8ZCeVSndUubeDWWl2A8sCNVQ==}
-    peerDependencies:
-      eslint: ^7
-    peerDependenciesMeta:
-      eslint:
-        optional: true
+  eslint-plugin-path-alias@1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0):
     dependencies:
       eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
       nanomatch: 1.2.13
     transitivePeerDependencies:
       - supports-color
-    dev: true
-    patched: true
 
-  /eslint-plugin-simple-header@1.0.2:
-    resolution: {integrity: sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA==}
-    dev: false
+  eslint-plugin-simple-header@1.0.2: {}
 
-  /eslint-plugin-simple-import-sort@10.0.0(eslint@8.46.0):
-    resolution: {integrity: sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==}
-    peerDependencies:
-      eslint: '>=5.0.0'
-    peerDependenciesMeta:
-      eslint:
-        optional: true
+  eslint-plugin-simple-import-sort@10.0.0(eslint@8.46.0):
     dependencies:
       eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
-    dev: true
 
-  /eslint-plugin-unused-imports@2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.46.0):
-    resolution: {integrity: sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      '@typescript-eslint/eslint-plugin': ^5.0.0
-      eslint: ^8.0.0
-    peerDependenciesMeta:
-      '@typescript-eslint/eslint-plugin':
-        optional: true
-      eslint:
-        optional: true
+  eslint-plugin-unused-imports@2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.46.0):
     dependencies:
       '@typescript-eslint/eslint-plugin': 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4)
       eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
       eslint-rule-composer: 0.3.0
-    dev: true
 
-  /eslint-rule-composer@0.3.0:
-    resolution: {integrity: sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==}
-    engines: {node: '>=4.0.0'}
-    dev: true
+  eslint-rule-composer@0.3.0: {}
 
-  /eslint-scope@5.1.1:
-    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
-    engines: {node: '>=8.0.0'}
+  eslint-scope@5.1.1:
     dependencies:
       esrecurse: 4.3.0
       estraverse: 4.3.0
-    dev: true
 
-  /eslint-scope@7.2.2:
-    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  eslint-scope@7.2.2:
     dependencies:
       esrecurse: 4.3.0
       estraverse: 5.3.0
-    dev: true
 
-  /eslint-visitor-keys@3.4.0:
-    resolution: {integrity: sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
+  eslint-visitor-keys@3.4.0: {}
 
-  /eslint-visitor-keys@3.4.2:
-    resolution: {integrity: sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
+  eslint-visitor-keys@3.4.2: {}
 
-  /eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4):
-    resolution: {integrity: sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    hasBin: true
+  eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4):
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0)
       '@eslint-community/regexpp': 4.6.2
@@ -1630,70 +2839,39 @@ packages:
       text-table: 0.2.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
-    patched: true
 
-  /espree@9.6.1:
-    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  espree@9.6.1:
     dependencies:
       acorn: 8.10.0
       acorn-jsx: 5.3.2(acorn@8.10.0)
       eslint-visitor-keys: 3.4.2
-    dev: true
 
-  /esquery@1.5.0:
-    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
-    engines: {node: '>=0.10'}
+  esquery@1.5.0:
     dependencies:
       estraverse: 5.3.0
-    dev: true
 
-  /esrecurse@4.3.0:
-    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
-    engines: {node: '>=4.0'}
+  esrecurse@4.3.0:
     dependencies:
       estraverse: 5.3.0
-    dev: true
 
-  /estraverse@4.3.0:
-    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
-    engines: {node: '>=4.0'}
-    dev: true
+  estraverse@4.3.0: {}
 
-  /estraverse@5.3.0:
-    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
-    engines: {node: '>=4.0'}
-    dev: true
+  estraverse@5.3.0: {}
 
-  /esutils@2.0.3:
-    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  esutils@2.0.3: {}
 
-  /eventemitter3@4.0.7:
-    resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
-    dev: false
+  eventemitter3@4.0.7: {}
 
-  /extend-shallow@2.0.1:
-    resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
-    engines: {node: '>=0.10.0'}
+  extend-shallow@2.0.1:
     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'}
+  extend-shallow@3.0.2:
     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'}
-    hasBin: true
+  extract-zip@2.0.1:
     dependencies:
       debug: 4.3.4
       get-stream: 5.2.0
@@ -1702,163 +2880,94 @@ packages:
       '@types/yauzl': 2.10.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /fast-deep-equal@3.1.3:
-    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
-    dev: true
+  fast-deep-equal@3.1.3: {}
 
-  /fast-glob@3.2.12:
-    resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==}
-    engines: {node: '>=8.6.0'}
+  fast-glob@3.2.12:
     dependencies:
       '@nodelib/fs.stat': 2.0.5
       '@nodelib/fs.walk': 1.2.8
       glob-parent: 5.1.2
       merge2: 1.4.1
       micromatch: 4.0.5
-    dev: true
 
-  /fast-json-stable-stringify@2.1.0:
-    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
-    dev: true
+  fast-json-stable-stringify@2.1.0: {}
 
-  /fast-levenshtein@2.0.6:
-    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
-    dev: true
+  fast-levenshtein@2.0.6: {}
 
-  /fastest-levenshtein@1.0.16:
-    resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
-    engines: {node: '>= 4.9.1'}
-    dev: true
+  fastest-levenshtein@1.0.16: {}
 
-  /fastq@1.13.0:
-    resolution: {integrity: sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==}
+  fastq@1.13.0:
     dependencies:
       reusify: 1.0.4
-    dev: true
 
-  /fd-slicer@1.1.0:
-    resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
+  fd-slicer@1.1.0:
     dependencies:
       pend: 1.2.0
-    dev: true
 
-  /fflate@0.7.4:
-    resolution: {integrity: sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==}
-    dev: false
+  fflate@0.7.4: {}
 
-  /file-entry-cache@6.0.1:
-    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  file-entry-cache@6.0.1:
     dependencies:
       flat-cache: 3.0.4
-    dev: true
 
-  /fill-range@7.0.1:
-    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
-    engines: {node: '>=8'}
+  fill-range@7.0.1:
     dependencies:
       to-regex-range: 5.0.1
-    dev: true
 
-  /find-up@4.1.0:
-    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
-    engines: {node: '>=8'}
+  find-up@4.1.0:
     dependencies:
       locate-path: 5.0.0
       path-exists: 4.0.0
-    dev: true
 
-  /find-up@5.0.0:
-    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
-    engines: {node: '>=10'}
+  find-up@5.0.0:
     dependencies:
       locate-path: 6.0.0
       path-exists: 4.0.0
-    dev: true
 
-  /flat-cache@3.0.4:
-    resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  flat-cache@3.0.4:
     dependencies:
       flatted: 3.2.7
       rimraf: 3.0.2
-    dev: true
 
-  /flatted@3.2.7:
-    resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
-    dev: true
+  flatted@3.2.7: {}
 
-  /for-in@1.0.2:
-    resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  for-in@1.0.2: {}
 
-  /fragment-cache@0.2.1:
-    resolution: {integrity: sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==}
-    engines: {node: '>=0.10.0'}
+  fragment-cache@0.2.1:
     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
+  fs-constants@1.0.0: {}
 
-  /fs.realpath@1.0.0:
-    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
-    dev: true
+  fs.realpath@1.0.0: {}
 
-  /fsevents@2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  fsevents@2.3.2:
     optional: true
 
-  /function-bind@1.1.1:
-    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
-    dev: true
+  function-bind@1.1.1: {}
 
-  /get-caller-file@2.0.5:
-    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
-    engines: {node: 6.* || 8.* || >= 10.*}
-    dev: true
+  get-caller-file@2.0.5: {}
 
-  /get-stream@5.2.0:
-    resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
-    engines: {node: '>=8'}
+  get-stream@5.2.0:
     dependencies:
       pump: 3.0.0
-    dev: true
 
-  /get-tsconfig@4.5.0:
-    resolution: {integrity: sha512-MjhiaIWCJ1sAU4pIQ5i5OfOuHHxVo1oYeNsWTON7jxYkod8pHocXeh+SSbmu5OZZZK73B6cbJ2XADzXehLyovQ==}
-    dev: true
+  get-tsconfig@4.5.0: {}
 
-  /get-value@2.0.6:
-    resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  get-value@2.0.6: {}
 
-  /glob-parent@5.1.2:
-    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
-    engines: {node: '>= 6'}
+  gifenc@https://codeload.github.com/mattdesl/gifenc/tar.gz/64842fca317b112a8590f8fef2bf3825da8f6fe3: {}
+
+  glob-parent@5.1.2:
     dependencies:
       is-glob: 4.0.3
-    dev: true
 
-  /glob-parent@6.0.2:
-    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
-    engines: {node: '>=10.13.0'}
+  glob-parent@6.0.2:
     dependencies:
       is-glob: 4.0.3
-    dev: true
 
-  /glob@7.2.3:
-    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+  glob@7.2.3:
     dependencies:
       fs.realpath: 1.0.0
       inflight: 1.0.6
@@ -1866,34 +2975,22 @@ packages:
       minimatch: 3.1.2
       once: 1.4.0
       path-is-absolute: 1.0.1
-    dev: true
 
-  /global-modules@2.0.0:
-    resolution: {integrity: sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==}
-    engines: {node: '>=6'}
+  global-modules@2.0.0:
     dependencies:
       global-prefix: 3.0.0
-    dev: true
 
-  /global-prefix@3.0.0:
-    resolution: {integrity: sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==}
-    engines: {node: '>=6'}
+  global-prefix@3.0.0:
     dependencies:
       ini: 1.3.8
       kind-of: 6.0.3
       which: 1.3.1
-    dev: true
 
-  /globals@13.20.0:
-    resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==}
-    engines: {node: '>=8'}
+  globals@13.20.0:
     dependencies:
       type-fest: 0.20.2
-    dev: true
 
-  /globby@11.1.0:
-    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
-    engines: {node: '>=10'}
+  globby@11.1.0:
     dependencies:
       array-union: 2.1.0
       dir-glob: 3.0.1
@@ -1901,441 +2998,235 @@ packages:
       ignore: 5.2.4
       merge2: 1.4.1
       slash: 3.0.0
-    dev: true
 
-  /globjoin@0.1.4:
-    resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
-    dev: true
+  globjoin@0.1.4: {}
 
-  /graceful-fs@4.2.11:
-    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
-    dev: true
+  graceful-fs@4.2.11: {}
 
-  /grapheme-splitter@1.0.4:
-    resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
-    dev: true
+  grapheme-splitter@1.0.4: {}
 
-  /graphemer@1.4.0:
-    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
-    dev: true
+  graphemer@1.4.0: {}
 
-  /hard-rejection@2.1.0:
-    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
-    engines: {node: '>=6'}
-    dev: true
+  hard-rejection@2.1.0: {}
 
-  /has-flag@3.0.0:
-    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
-    engines: {node: '>=4'}
-    dev: true
+  has-flag@3.0.0: {}
 
-  /has-flag@4.0.0:
-    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
-    engines: {node: '>=8'}
-    dev: true
+  has-flag@4.0.0: {}
 
-  /has-value@0.3.1:
-    resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
-    engines: {node: '>=0.10.0'}
+  has-value@0.3.1:
     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'}
+  has-value@1.0.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@0.1.4: {}
 
-  /has-values@1.0.0:
-    resolution: {integrity: sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==}
-    engines: {node: '>=0.10.0'}
+  has-values@1.0.0:
     dependencies:
       is-number: 3.0.0
       kind-of: 4.0.0
-    dev: true
 
-  /has@1.0.3:
-    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
-    engines: {node: '>= 0.4.0'}
+  has@1.0.3:
     dependencies:
       function-bind: 1.1.1
-    dev: true
 
-  /highlight.js@10.6.0:
-    resolution: {integrity: sha512-8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ==}
-    dev: true
+  highlight.js@10.6.0: {}
 
-  /hosted-git-info@2.8.9:
-    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
-    dev: true
+  hosted-git-info@2.8.9: {}
 
-  /hosted-git-info@4.1.0:
-    resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
-    engines: {node: '>=10'}
+  hosted-git-info@4.1.0:
     dependencies:
       lru-cache: 6.0.0
-    dev: true
 
-  /html-tags@3.3.1:
-    resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
-    engines: {node: '>=8'}
-    dev: true
+  html-tags@3.3.1: {}
 
-  /https-proxy-agent@5.0.1:
-    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
-    engines: {node: '>= 6'}
+  https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
       debug: 4.3.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /ieee754@1.2.1:
-    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
-    dev: true
+  ieee754@1.2.1: {}
 
-  /ignore@5.2.4:
-    resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
-    engines: {node: '>= 4'}
-    dev: true
+  ignore@5.2.4: {}
 
-  /import-fresh@3.3.0:
-    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
-    engines: {node: '>=6'}
+  import-fresh@3.3.0:
     dependencies:
       parent-module: 1.0.1
       resolve-from: 4.0.0
-    dev: true
 
-  /import-lazy@4.0.0:
-    resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
-    engines: {node: '>=8'}
-    dev: true
+  import-lazy@4.0.0: {}
 
-  /imurmurhash@0.1.4:
-    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
-    engines: {node: '>=0.8.19'}
-    dev: true
+  imurmurhash@0.1.4: {}
 
-  /indent-string@4.0.0:
-    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
-    engines: {node: '>=8'}
-    dev: true
+  indent-string@4.0.0: {}
 
-  /inflight@1.0.6:
-    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+  inflight@1.0.6:
     dependencies:
       once: 1.4.0
       wrappy: 1.0.2
-    dev: true
 
-  /inherits@2.0.4:
-    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
-    dev: true
+  inherits@2.0.4: {}
 
-  /ini@1.3.8:
-    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
-    dev: true
+  ini@1.3.8: {}
 
-  /is-accessor-descriptor@0.1.6:
-    resolution: {integrity: sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==}
-    engines: {node: '>=0.10.0'}
+  is-accessor-descriptor@0.1.6:
     dependencies:
       kind-of: 3.2.2
-    dev: true
 
-  /is-accessor-descriptor@1.0.0:
-    resolution: {integrity: sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==}
-    engines: {node: '>=0.10.0'}
+  is-accessor-descriptor@1.0.0:
     dependencies:
       kind-of: 6.0.3
-    dev: true
 
-  /is-arrayish@0.2.1:
-    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
-    dev: true
+  is-arrayish@0.2.1: {}
 
-  /is-buffer@1.1.6:
-    resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
-    dev: true
+  is-buffer@1.1.6: {}
 
-  /is-core-module@2.12.0:
-    resolution: {integrity: sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==}
+  is-core-module@2.12.0:
     dependencies:
       has: 1.0.3
-    dev: true
 
-  /is-data-descriptor@0.1.4:
-    resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==}
-    engines: {node: '>=0.10.0'}
+  is-data-descriptor@0.1.4:
     dependencies:
       kind-of: 3.2.2
-    dev: true
 
-  /is-data-descriptor@1.0.0:
-    resolution: {integrity: sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==}
-    engines: {node: '>=0.10.0'}
+  is-data-descriptor@1.0.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'}
+  is-descriptor@0.1.6:
     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'}
+  is-descriptor@1.0.2:
     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@0.1.1: {}
 
-  /is-extendable@1.0.1:
-    resolution: {integrity: sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==}
-    engines: {node: '>=0.10.0'}
+  is-extendable@1.0.1:
     dependencies:
       is-plain-object: 2.0.4
-    dev: true
 
-  /is-extglob@2.1.1:
-    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  is-extglob@2.1.1: {}
 
-  /is-fullwidth-code-point@3.0.0:
-    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
-    engines: {node: '>=8'}
-    dev: true
+  is-fullwidth-code-point@3.0.0: {}
 
-  /is-glob@4.0.3:
-    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
-    engines: {node: '>=0.10.0'}
+  is-glob@4.0.3:
     dependencies:
       is-extglob: 2.1.1
-    dev: true
 
-  /is-number@3.0.0:
-    resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==}
-    engines: {node: '>=0.10.0'}
+  is-number@3.0.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-number@7.0.0: {}
 
-  /is-path-inside@3.0.3:
-    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
-    engines: {node: '>=8'}
-    dev: true
+  is-path-inside@3.0.3: {}
 
-  /is-plain-obj@1.1.0:
-    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  is-plain-obj@1.1.0: {}
 
-  /is-plain-object@2.0.4:
-    resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
-    engines: {node: '>=0.10.0'}
+  is-plain-object@2.0.4:
     dependencies:
       isobject: 3.0.1
-    dev: true
 
-  /is-plain-object@5.0.0:
-    resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  is-plain-object@5.0.0: {}
 
-  /is-windows@1.0.2:
-    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  is-windows@1.0.2: {}
 
-  /isarray@1.0.0:
-    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
-    dev: true
+  isarray@1.0.0: {}
 
-  /isexe@2.0.0:
-    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
-    dev: true
+  isexe@2.0.0: {}
 
-  /isobject@2.1.0:
-    resolution: {integrity: sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==}
-    engines: {node: '>=0.10.0'}
+  isobject@2.1.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
+  isobject@3.0.1: {}
 
-  /js-tokens@4.0.0:
-    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
-    dev: true
+  js-tokens@4.0.0: {}
 
-  /js-yaml@4.1.0:
-    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
-    hasBin: true
+  js-yaml@4.1.0:
     dependencies:
       argparse: 2.0.1
-    dev: true
 
-  /json-parse-even-better-errors@2.3.1:
-    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
-    dev: true
+  json-parse-even-better-errors@2.3.1: {}
 
-  /json-schema-traverse@0.4.1:
-    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
-    dev: true
+  json-schema-traverse@0.4.1: {}
 
-  /json-schema-traverse@1.0.0:
-    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
-    dev: true
+  json-schema-traverse@1.0.0: {}
 
-  /json-stable-stringify-without-jsonify@1.0.1:
-    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
-    dev: true
+  json-stable-stringify-without-jsonify@1.0.1: {}
 
-  /jsonc-parser@3.2.0:
-    resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
-    dev: false
+  jsonc-parser@3.2.0: {}
 
-  /jszip@2.7.0:
-    resolution: {integrity: sha512-JIsRKRVC3gTRo2vM4Wy9WBC3TRcfnIZU8k65Phi3izkvPH975FowRYtKGT6PxevA0XnJ/yO8b0QwV0ydVyQwfw==}
+  jszip@2.7.0:
     dependencies:
       pako: 1.0.11
-    dev: true
 
-  /kind-of@3.2.2:
-    resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
-    engines: {node: '>=0.10.0'}
+  kind-of@3.2.2:
     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'}
+  kind-of@4.0.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@5.1.0: {}
 
-  /kind-of@6.0.3:
-    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  kind-of@6.0.3: {}
 
-  /known-css-properties@0.27.0:
-    resolution: {integrity: sha512-uMCj6+hZYDoffuvAJjFAPz56E9uoowFHmTkqRtRq5WyC5Q6Cu/fTZKNQpX/RbzChBYLLl3lo8CjFZBAZXq9qFg==}
-    dev: true
+  known-css-properties@0.27.0: {}
 
-  /levn@0.4.1:
-    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
-    engines: {node: '>= 0.8.0'}
+  levn@0.4.1:
     dependencies:
       prelude-ls: 1.2.1
       type-check: 0.4.0
-    dev: true
 
-  /lines-and-columns@1.2.4:
-    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
-    dev: true
+  lines-and-columns@1.2.4: {}
 
-  /locate-path@5.0.0:
-    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
-    engines: {node: '>=8'}
+  locate-path@5.0.0:
     dependencies:
       p-locate: 4.1.0
-    dev: true
 
-  /locate-path@6.0.0:
-    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
-    engines: {node: '>=10'}
+  locate-path@6.0.0:
     dependencies:
       p-locate: 5.0.0
-    dev: true
 
-  /lodash.merge@4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
-    dev: true
+  lodash.merge@4.6.2: {}
 
-  /lodash.truncate@4.4.2:
-    resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
-    dev: true
+  lodash.truncate@4.4.2: {}
 
-  /lru-cache@6.0.0:
-    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
-    engines: {node: '>=10'}
+  lru-cache@6.0.0:
     dependencies:
       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-cache@0.2.2: {}
 
-  /map-obj@1.0.1:
-    resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  map-obj@1.0.1: {}
 
-  /map-obj@4.3.0:
-    resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
-    engines: {node: '>=8'}
-    dev: true
+  map-obj@4.3.0: {}
 
-  /map-visit@1.0.0:
-    resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==}
-    engines: {node: '>=0.10.0'}
+  map-visit@1.0.0:
     dependencies:
       object-visit: 1.0.1
-    dev: true
 
-  /mathml-tag-names@2.1.3:
-    resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}
-    dev: true
+  mathml-tag-names@2.1.3: {}
 
-  /mdn-data@2.0.30:
-    resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
-    dev: true
+  mdn-data@2.0.30: {}
 
-  /meow@9.0.0:
-    resolution: {integrity: sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==}
-    engines: {node: '>=10'}
+  meow@9.0.0:
     dependencies:
       '@types/minimist': 1.2.2
       camelcase-keys: 6.2.2
@@ -2349,88 +3240,48 @@ packages:
       trim-newlines: 3.0.1
       type-fest: 0.18.1
       yargs-parser: 20.2.9
-    dev: true
 
-  /merge2@1.4.1:
-    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
-    engines: {node: '>= 8'}
-    dev: true
+  merge2@1.4.1: {}
 
-  /micromatch@4.0.5:
-    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
-    engines: {node: '>=8.6'}
+  micromatch@4.0.5:
     dependencies:
       braces: 3.0.2
       picomatch: 2.3.1
-    dev: true
 
-  /min-indent@1.0.1:
-    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
-    engines: {node: '>=4'}
-    dev: true
+  min-indent@1.0.1: {}
 
-  /minimatch@3.1.2:
-    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+  minimatch@3.1.2:
     dependencies:
       brace-expansion: 1.1.11
-    dev: true
 
-  /minimist-options@4.1.0:
-    resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
-    engines: {node: '>= 6'}
+  minimist-options@4.1.0:
     dependencies:
       arrify: 1.0.1
       is-plain-obj: 1.1.0
       kind-of: 6.0.3
-    dev: true
 
-  /mitt@3.0.0:
-    resolution: {integrity: sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==}
-    dev: true
+  mitt@3.0.0: {}
 
-  /mixin-deep@1.3.2:
-    resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==}
-    engines: {node: '>=0.10.0'}
+  mixin-deep@1.3.2:
     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
+  mkdirp-classic@0.5.3: {}
 
-  /moment@2.29.4:
-    resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==}
-    dev: true
+  moment@2.29.4: {}
 
-  /monaco-editor@0.43.0:
-    resolution: {integrity: sha512-cnoqwQi/9fml2Szamv1XbSJieGJ1Dc8tENVMD26Kcfl7xGQWp7OBKMjlwKVGYFJ3/AXJjSOGvcqK7Ry/j9BM1Q==}
-    dev: false
+  monaco-editor@0.43.0: {}
 
-  /ms@2.0.0:
-    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
-    dev: true
+  ms@2.0.0: {}
 
-  /ms@2.1.2:
-    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
-    dev: true
+  ms@2.1.2: {}
 
-  /nanoid@3.3.6:
-    resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
-    dev: true
+  nanoid@3.3.6: {}
 
-  /nanoid@4.0.2:
-    resolution: {integrity: sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==}
-    engines: {node: ^14 || ^16 || >=18}
-    hasBin: true
-    dev: false
+  nanoid@4.0.2: {}
 
-  /nanomatch@1.2.13:
-    resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
-    engines: {node: '>=0.10.0'}
+  nanomatch@1.2.13:
     dependencies:
       arr-diff: 4.0.0
       array-unique: 0.3.2
@@ -2445,84 +3296,50 @@ packages:
       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
+  natural-compare-lite@1.4.0: {}
 
-  /natural-compare@1.4.0:
-    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
-    dev: true
+  natural-compare@1.4.0: {}
 
-  /node-fetch@2.6.7:
-    resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
-    engines: {node: 4.x || >=6.0.0}
-    peerDependencies:
-      encoding: ^0.1.0
-    peerDependenciesMeta:
-      encoding:
-        optional: true
+  node-fetch@2.6.7:
     dependencies:
       whatwg-url: 5.0.0
-    dev: true
 
-  /normalize-package-data@2.5.0:
-    resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
+  normalize-package-data@2.5.0:
     dependencies:
       hosted-git-info: 2.8.9
       resolve: 1.22.2
       semver: 5.7.1
       validate-npm-package-license: 3.0.4
-    dev: true
 
-  /normalize-package-data@3.0.3:
-    resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==}
-    engines: {node: '>=10'}
+  normalize-package-data@3.0.3:
     dependencies:
       hosted-git-info: 4.1.0
       is-core-module: 2.12.0
       semver: 7.5.0
       validate-npm-package-license: 3.0.4
-    dev: true
 
-  /normalize-path@3.0.0:
-    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  normalize-path@3.0.0: {}
 
-  /object-copy@0.1.0:
-    resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
-    engines: {node: '>=0.10.0'}
+  object-copy@0.1.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'}
+  object-visit@1.0.1:
     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'}
+  object.pick@1.3.0:
     dependencies:
       isobject: 3.0.1
-    dev: true
 
-  /once@1.4.0:
-    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+  once@1.4.0:
     dependencies:
       wrappy: 1.0.2
-    dev: true
 
-  /optionator@0.9.3:
-    resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
-    engines: {node: '>= 0.8.0'}
+  optionator@0.9.3:
     dependencies:
       '@aashutoshrathi/word-wrap': 1.2.6
       deep-is: 0.1.4
@@ -2530,176 +3347,91 @@ packages:
       levn: 0.4.1
       prelude-ls: 1.2.1
       type-check: 0.4.0
-    dev: true
 
-  /p-limit@2.3.0:
-    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
-    engines: {node: '>=6'}
+  p-limit@2.3.0:
     dependencies:
       p-try: 2.2.0
-    dev: true
 
-  /p-limit@3.1.0:
-    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
-    engines: {node: '>=10'}
+  p-limit@3.1.0:
     dependencies:
       yocto-queue: 0.1.0
-    dev: true
 
-  /p-locate@4.1.0:
-    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
-    engines: {node: '>=8'}
+  p-locate@4.1.0:
     dependencies:
       p-limit: 2.3.0
-    dev: true
 
-  /p-locate@5.0.0:
-    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
-    engines: {node: '>=10'}
+  p-locate@5.0.0:
     dependencies:
       p-limit: 3.1.0
-    dev: true
 
-  /p-try@2.2.0:
-    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
-    engines: {node: '>=6'}
-    dev: true
+  p-try@2.2.0: {}
 
-  /pako@1.0.11:
-    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
-    dev: true
+  pako@1.0.11: {}
 
-  /parent-module@1.0.1:
-    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
-    engines: {node: '>=6'}
+  parent-module@1.0.1:
     dependencies:
       callsites: 3.1.0
-    dev: true
 
-  /parse-json@5.2.0:
-    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
-    engines: {node: '>=8'}
+  parse-json@5.2.0:
     dependencies:
       '@babel/code-frame': 7.21.4
       error-ex: 1.3.2
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
-    dev: true
 
-  /pascalcase@0.1.1:
-    resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  pascalcase@0.1.1: {}
 
-  /path-exists@4.0.0:
-    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
-    engines: {node: '>=8'}
-    dev: true
+  path-exists@4.0.0: {}
 
-  /path-is-absolute@1.0.1:
-    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  path-is-absolute@1.0.1: {}
 
-  /path-key@3.1.1:
-    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
-    engines: {node: '>=8'}
-    dev: true
+  path-key@3.1.1: {}
 
-  /path-parse@1.0.7:
-    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
-    dev: true
+  path-parse@1.0.7: {}
 
-  /path-type@4.0.0:
-    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
-    engines: {node: '>=8'}
-    dev: true
+  path-type@4.0.0: {}
 
-  /pend@1.2.0:
-    resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
-    dev: true
+  pend@1.2.0: {}
 
-  /picocolors@1.0.0:
-    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
-    dev: true
+  picocolors@1.0.0: {}
 
-  /picomatch@2.3.1:
-    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
-    engines: {node: '>=8.6'}
-    dev: true
+  picomatch@2.3.1: {}
 
-  /postcss-media-query-parser@0.2.3:
-    resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==}
-    dev: true
+  postcss-media-query-parser@0.2.3: {}
 
-  /postcss-resolve-nested-selector@0.1.1:
-    resolution: {integrity: sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==}
-    dev: true
+  postcss-resolve-nested-selector@0.1.1: {}
 
-  /postcss-safe-parser@6.0.0(postcss@8.4.23):
-    resolution: {integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==}
-    engines: {node: '>=12.0'}
-    peerDependencies:
-      postcss: ^8.3.3
+  postcss-safe-parser@6.0.0(postcss@8.4.23):
     dependencies:
       postcss: 8.4.23
-    dev: true
 
-  /postcss-selector-parser@6.0.12:
-    resolution: {integrity: sha512-NdxGCAZdRrwVI1sy59+Wzrh+pMMHxapGnpfenDVlMEXoOcvt4pGE0JLK9YY2F5dLxcFYA/YbVQKhcGU+FtSYQg==}
-    engines: {node: '>=4'}
+  postcss-selector-parser@6.0.12:
     dependencies:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
-    dev: true
 
-  /postcss-value-parser@4.2.0:
-    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
-    dev: true
+  postcss-value-parser@4.2.0: {}
 
-  /postcss@8.4.23:
-    resolution: {integrity: sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==}
-    engines: {node: ^10 || ^12 || >=14}
+  postcss@8.4.23:
     dependencies:
       nanoid: 3.3.6
       picocolors: 1.0.0
       source-map-js: 1.0.2
-    dev: true
 
-  /prelude-ls@1.2.1:
-    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
-    engines: {node: '>= 0.8.0'}
-    dev: true
+  prelude-ls@1.2.1: {}
 
-  /progress@2.0.3:
-    resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
-    engines: {node: '>=0.4.0'}
-    dev: true
+  progress@2.0.3: {}
 
-  /proxy-from-env@1.1.0:
-    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
-    dev: true
+  proxy-from-env@1.1.0: {}
 
-  /pump@3.0.0:
-    resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
+  pump@3.0.0:
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
-    dev: true
 
-  /punycode@2.1.1:
-    resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
-    engines: {node: '>=6'}
-    dev: true
+  punycode@2.1.1: {}
 
-  /puppeteer-core@19.11.1(typescript@5.0.4):
-    resolution: {integrity: sha512-qcuC2Uf0Fwdj9wNtaTZ2OvYRraXpAK+puwwVW8ofOhOgLPZyz1c68tsorfIZyCUOpyBisjr+xByu7BMbEYMepA==}
-    engines: {node: '>=14.14.0'}
-    peerDependencies:
-      typescript: '>= 4.7.4'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  puppeteer-core@19.11.1(typescript@5.0.4):
     dependencies:
       '@puppeteer/browsers': 0.5.0(typescript@5.0.4)
       chromium-bidi: 0.4.7(devtools-protocol@0.0.1107588)
@@ -2718,190 +3450,106 @@ packages:
       - encoding
       - supports-color
       - utf-8-validate
-    dev: true
 
-  /q@1.5.1:
-    resolution: {integrity: sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==}
-    engines: {node: '>=0.6.0', teleport: '>=0.2.0'}
-    dev: true
+  q@1.5.1: {}
 
-  /queue-microtask@1.2.3:
-    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
-    dev: true
+  queue-microtask@1.2.3: {}
 
-  /quick-lru@4.0.1:
-    resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==}
-    engines: {node: '>=8'}
-    dev: true
+  quick-lru@4.0.1: {}
 
-  /read-pkg-up@7.0.1:
-    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
-    engines: {node: '>=8'}
+  read-pkg-up@7.0.1:
     dependencies:
       find-up: 4.1.0
       read-pkg: 5.2.0
       type-fest: 0.8.1
-    dev: true
 
-  /read-pkg@5.2.0:
-    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
-    engines: {node: '>=8'}
+  read-pkg@5.2.0:
     dependencies:
       '@types/normalize-package-data': 2.4.1
       normalize-package-data: 2.5.0
       parse-json: 5.2.0
       type-fest: 0.6.0
-    dev: true
 
-  /readable-stream@3.6.2:
-    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
-    engines: {node: '>= 6'}
+  readable-stream@3.6.2:
     dependencies:
       inherits: 2.0.4
       string_decoder: 1.3.0
       util-deprecate: 1.0.2
-    dev: true
 
-  /redent@3.0.0:
-    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
-    engines: {node: '>=8'}
+  redent@3.0.0:
     dependencies:
       indent-string: 4.0.0
       strip-indent: 3.0.0
-    dev: true
 
-  /regex-not@1.0.2:
-    resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
-    engines: {node: '>=0.10.0'}
+  regex-not@1.0.2:
     dependencies:
       extend-shallow: 3.0.2
       safe-regex: 1.1.0
-    dev: true
 
-  /require-directory@2.1.1:
-    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  require-directory@2.1.1: {}
 
-  /require-from-string@2.0.2:
-    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  require-from-string@2.0.2: {}
 
-  /resolve-from@4.0.0:
-    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
-    engines: {node: '>=4'}
-    dev: true
+  resolve-from@4.0.0: {}
 
-  /resolve-from@5.0.0:
-    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
-    engines: {node: '>=8'}
-    dev: true
+  resolve-from@5.0.0: {}
 
-  /resolve-url@0.2.1:
-    resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
-    deprecated: https://github.com/lydell/resolve-url#deprecated
-    dev: true
+  resolve-url@0.2.1: {}
 
-  /resolve@1.22.2:
-    resolution: {integrity: sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==}
-    hasBin: true
+  resolve@1.22.2:
     dependencies:
       is-core-module: 2.12.0
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
-    dev: true
 
-  /ret@0.1.15:
-    resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
-    engines: {node: '>=0.12'}
-    dev: true
+  ret@0.1.15: {}
 
-  /reusify@1.0.4:
-    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
-    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
-    dev: true
+  reusify@1.0.4: {}
 
-  /rimraf@3.0.2:
-    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
-    hasBin: true
+  rimraf@3.0.2:
     dependencies:
       glob: 7.2.3
-    dev: true
 
-  /run-parallel@1.2.0:
-    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
+  run-parallel@1.2.0:
     dependencies:
       queue-microtask: 1.2.3
-    dev: true
 
-  /safe-buffer@5.2.1:
-    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
-    dev: true
+  safe-buffer@5.2.1: {}
 
-  /safe-regex@1.1.0:
-    resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==}
+  safe-regex@1.1.0:
     dependencies:
       ret: 0.1.15
-    dev: true
 
-  /semver@5.7.1:
-    resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
-    hasBin: true
-    dev: true
+  semver@5.7.1: {}
 
-  /semver@7.5.0:
-    resolution: {integrity: sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==}
-    engines: {node: '>=10'}
-    hasBin: true
+  semver@7.5.0:
     dependencies:
       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'}
+  set-value@2.0.1:
     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'}
+  shebang-command@2.0.0:
     dependencies:
       shebang-regex: 3.0.0
-    dev: true
 
-  /shebang-regex@3.0.0:
-    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
-    engines: {node: '>=8'}
-    dev: true
+  shebang-regex@3.0.0: {}
 
-  /signal-exit@4.0.1:
-    resolution: {integrity: sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw==}
-    engines: {node: '>=14'}
-    dev: true
+  signal-exit@4.0.1: {}
 
-  /slash@3.0.0:
-    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
-    engines: {node: '>=8'}
-    dev: true
+  slash@3.0.0: {}
 
-  /slice-ansi@4.0.0:
-    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
-    engines: {node: '>=10'}
+  slice-ansi@4.0.0:
     dependencies:
       ansi-styles: 4.3.0
       astral-regex: 2.0.0
       is-fullwidth-code-point: 3.0.0
-    dev: true
 
-  /snapdragon@0.8.2:
-    resolution: {integrity: sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==}
-    engines: {node: '>=0.10.0'}
+  snapdragon@0.8.2:
     dependencies:
       base: 0.11.2
       debug: 2.6.9
@@ -2913,148 +3561,87 @@ packages:
       use: 3.1.1
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /source-map-js@1.0.2:
-    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  source-map-js@1.0.2: {}
 
-  /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
+  source-map-resolve@0.5.3:
     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-support@0.5.21:
-    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
+  source-map-support@0.5.21:
     dependencies:
       buffer-from: 1.1.2
       source-map: 0.6.1
-    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-url@0.4.1: {}
 
-  /source-map@0.5.7:
-    resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  source-map@0.5.7: {}
 
-  /source-map@0.6.1:
-    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  source-map@0.6.1: {}
 
-  /spdx-correct@3.2.0:
-    resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==}
+  spdx-correct@3.2.0:
     dependencies:
       spdx-expression-parse: 3.0.1
       spdx-license-ids: 3.0.13
-    dev: true
 
-  /spdx-exceptions@2.3.0:
-    resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==}
-    dev: true
+  spdx-exceptions@2.3.0: {}
 
-  /spdx-expression-parse@3.0.1:
-    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
+  spdx-expression-parse@3.0.1:
     dependencies:
       spdx-exceptions: 2.3.0
       spdx-license-ids: 3.0.13
-    dev: true
 
-  /spdx-license-ids@3.0.13:
-    resolution: {integrity: sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==}
-    dev: true
+  spdx-license-ids@3.0.13: {}
 
-  /split-string@3.1.0:
-    resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
-    engines: {node: '>=0.10.0'}
+  split-string@3.1.0:
     dependencies:
       extend-shallow: 3.0.2
-    dev: true
 
-  /standalone-electron-types@1.0.0:
-    resolution: {integrity: sha512-0HOi/tlTz3mjWhsAz4uRbpQcHMZ+ifj1JzWW9nugykOHClBBG77ps8QinrzX1eow4Iw2pnC+RFaSYRgufF4BOg==}
+  standalone-electron-types@1.0.0:
     dependencies:
       '@types/node': 18.16.3
-    dev: true
 
-  /static-extend@0.1.2:
-    resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
-    engines: {node: '>=0.10.0'}
+  static-extend@0.1.2:
     dependencies:
       define-property: 0.2.5
       object-copy: 0.1.0
-    dev: true
 
-  /string-width@4.2.3:
-    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
-    engines: {node: '>=8'}
+  string-width@4.2.3:
     dependencies:
       emoji-regex: 8.0.0
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
-    dev: true
 
-  /string_decoder@1.3.0:
-    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+  string_decoder@1.3.0:
     dependencies:
       safe-buffer: 5.2.1
-    dev: true
 
-  /strip-ansi@6.0.1:
-    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
-    engines: {node: '>=8'}
+  strip-ansi@6.0.1:
     dependencies:
       ansi-regex: 5.0.1
-    dev: true
 
-  /strip-indent@3.0.0:
-    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
-    engines: {node: '>=8'}
+  strip-indent@3.0.0:
     dependencies:
       min-indent: 1.0.1
-    dev: true
 
-  /strip-json-comments@3.1.1:
-    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
-    engines: {node: '>=8'}
-    dev: true
+  strip-json-comments@3.1.1: {}
 
-  /style-search@0.1.0:
-    resolution: {integrity: sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==}
-    dev: true
+  style-search@0.1.0: {}
 
-  /stylelint-config-recommended@12.0.0(stylelint@15.6.0):
-    resolution: {integrity: sha512-x6x8QNARrGO2sG6iURkzqL+Dp+4bJorPMMRNPScdvaUK8PsynriOcMW7AFDKqkWAS5wbue/u8fUT/4ynzcmqdQ==}
-    peerDependencies:
-      stylelint: ^15.5.0
+  stylelint-config-recommended@12.0.0(stylelint@15.6.0):
     dependencies:
       stylelint: 15.6.0
-    dev: true
 
-  /stylelint-config-standard@33.0.0(stylelint@15.6.0):
-    resolution: {integrity: sha512-eyxnLWoXImUn77+ODIuW9qXBDNM+ALN68L3wT1lN2oNspZ7D9NVGlNHb2QCUn4xDug6VZLsh0tF8NyoYzkgTzg==}
-    peerDependencies:
-      stylelint: ^15.5.0
+  stylelint-config-standard@33.0.0(stylelint@15.6.0):
     dependencies:
       stylelint: 15.6.0
       stylelint-config-recommended: 12.0.0(stylelint@15.6.0)
-    dev: true
 
-  /stylelint@15.6.0:
-    resolution: {integrity: sha512-Cqzpc8tvJm77KaM8qUbhpJ/UYK55Ia0whQXj4b9IId9dlPICO7J8Lyo15SZWiHxKjlvy3p5FQor/3n6i8ignXg==}
-    engines: {node: ^14.13.1 || >=16.0.0}
-    hasBin: true
+  stylelint@15.6.0:
     dependencies:
       '@csstools/css-parser-algorithms': 2.1.1(@csstools/css-tokenizer@2.1.1)
       '@csstools/css-tokenizer': 2.1.1
@@ -3100,324 +3687,180 @@ packages:
       write-file-atomic: 5.0.1
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /supports-color@5.5.0:
-    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
-    engines: {node: '>=4'}
+  supports-color@5.5.0:
     dependencies:
       has-flag: 3.0.0
-    dev: true
 
-  /supports-color@7.2.0:
-    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
-    engines: {node: '>=8'}
+  supports-color@7.2.0:
     dependencies:
       has-flag: 4.0.0
-    dev: true
 
-  /supports-hyperlinks@3.0.0:
-    resolution: {integrity: sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==}
-    engines: {node: '>=14.18'}
+  supports-hyperlinks@3.0.0:
     dependencies:
       has-flag: 4.0.0
       supports-color: 7.2.0
-    dev: true
 
-  /supports-preserve-symlinks-flag@1.0.0:
-    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
-    engines: {node: '>= 0.4'}
-    dev: true
+  supports-preserve-symlinks-flag@1.0.0: {}
 
-  /svg-tags@1.0.0:
-    resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==}
-    dev: true
+  svg-tags@1.0.0: {}
 
-  /table@6.8.1:
-    resolution: {integrity: sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==}
-    engines: {node: '>=10.0.0'}
+  table@6.8.1:
     dependencies:
       ajv: 8.12.0
       lodash.truncate: 4.4.2
       slice-ansi: 4.0.0
       string-width: 4.2.3
       strip-ansi: 6.0.1
-    dev: true
 
-  /tar-fs@2.1.1:
-    resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==}
+  tar-fs@2.1.1:
     dependencies:
       chownr: 1.1.4
       mkdirp-classic: 0.5.3
       pump: 3.0.0
       tar-stream: 2.2.0
-    dev: true
 
-  /tar-stream@2.2.0:
-    resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
-    engines: {node: '>=6'}
+  tar-stream@2.2.0:
     dependencies:
       bl: 4.1.0
       end-of-stream: 1.4.4
       fs-constants: 1.0.0
       inherits: 2.0.4
       readable-stream: 3.6.2
-    dev: true
 
-  /text-table@0.2.0:
-    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
-    dev: true
+  text-table@0.2.0: {}
 
-  /through@2.3.8:
-    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
-    dev: true
+  through@2.3.8: {}
 
-  /to-object-path@0.3.0:
-    resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==}
-    engines: {node: '>=0.10.0'}
+  to-object-path@0.3.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'}
+  to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0
-    dev: true
 
-  /to-regex@3.0.2:
-    resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==}
-    engines: {node: '>=0.10.0'}
+  to-regex@3.0.2:
     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
+  tr46@0.0.3: {}
 
-  /trim-newlines@3.0.1:
-    resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
-    engines: {node: '>=8'}
-    dev: true
+  trim-newlines@3.0.1: {}
 
-  /tslib@1.14.1:
-    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
-    dev: true
+  tslib@1.14.1: {}
 
-  /tsutils@3.21.0(typescript@5.0.4):
-    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
-    engines: {node: '>= 6'}
-    peerDependencies:
-      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
+  tsutils@3.21.0(typescript@5.0.4):
     dependencies:
       tslib: 1.14.1
       typescript: 5.0.4
-    dev: true
 
-  /tsx@3.12.7:
-    resolution: {integrity: sha512-C2Ip+jPmqKd1GWVQDvz/Eyc6QJbGfE7NrR3fx5BpEHMZsEHoIxHL1j+lKdGobr8ovEyqeNkPLSKp6SCSOt7gmw==}
-    hasBin: true
+  tsx@3.12.7:
     dependencies:
       '@esbuild-kit/cjs-loader': 2.4.2
       '@esbuild-kit/core-utils': 3.1.0
       '@esbuild-kit/esm-loader': 2.5.5
     optionalDependencies:
       fsevents: 2.3.2
-    dev: true
 
-  /type-check@0.4.0:
-    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
-    engines: {node: '>= 0.8.0'}
+  type-check@0.4.0:
     dependencies:
       prelude-ls: 1.2.1
-    dev: true
 
-  /type-fest@0.18.1:
-    resolution: {integrity: sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==}
-    engines: {node: '>=10'}
-    dev: true
+  type-fest@0.18.1: {}
 
-  /type-fest@0.20.2:
-    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
-    engines: {node: '>=10'}
-    dev: true
+  type-fest@0.20.2: {}
 
-  /type-fest@0.6.0:
-    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
-    engines: {node: '>=8'}
-    dev: true
+  type-fest@0.6.0: {}
 
-  /type-fest@0.8.1:
-    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
-    engines: {node: '>=8'}
-    dev: true
+  type-fest@0.8.1: {}
 
-  /type-fest@3.9.0:
-    resolution: {integrity: sha512-hR8JP2e8UiH7SME5JZjsobBlEiatFoxpzCP+R3ZeCo7kAaG1jXQE5X/buLzogM6GJu8le9Y4OcfNuIQX0rZskA==}
-    engines: {node: '>=14.16'}
-    dev: true
+  type-fest@3.9.0: {}
 
-  /typescript@5.0.4:
-    resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==}
-    engines: {node: '>=12.20'}
-    hasBin: true
-    dev: true
+  typescript@5.0.4: {}
 
-  /unbzip2-stream@1.4.3:
-    resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
+  unbzip2-stream@1.4.3:
     dependencies:
       buffer: 5.7.1
       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'}
+  union-value@1.0.1:
     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'}
+  unset-value@1.0.0:
     dependencies:
       has-value: 0.3.1
       isobject: 3.0.1
-    dev: true
 
-  /uri-js@4.4.1:
-    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+  uri-js@4.4.1:
     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
+  urix@0.1.0: {}
 
-  /use@3.1.1:
-    resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  use@3.1.1: {}
 
-  /util-deprecate@1.0.2:
-    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
-    dev: true
+  util-deprecate@1.0.2: {}
 
-  /v8-compile-cache@2.3.0:
-    resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==}
-    dev: true
+  v8-compile-cache@2.3.0: {}
 
-  /validate-npm-package-license@3.0.4:
-    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
+  validate-npm-package-license@3.0.4:
     dependencies:
       spdx-correct: 3.2.0
       spdx-expression-parse: 3.0.1
-    dev: true
 
-  /virtual-merge@1.0.1:
-    resolution: {integrity: sha512-h7rzV6n5fZJbDu2lP4iu+IOtsZ00uqECFUxFePK1uY0pz/S5B7FNDJpmdDVfyGL7poyJECEHfTaIpJaknNkU0Q==}
-    dev: false
+  virtual-merge@1.0.1: {}
 
-  /vscode-oniguruma@1.7.0:
-    resolution: {integrity: sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==}
-    dev: false
+  vscode-oniguruma@1.7.0: {}
 
-  /vscode-textmate@5.2.0:
-    resolution: {integrity: sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==}
-    dev: false
+  vscode-textmate@5.2.0: {}
 
-  /webidl-conversions@3.0.1:
-    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
-    dev: true
+  webidl-conversions@3.0.1: {}
 
-  /whatwg-url@5.0.0:
-    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
+  whatwg-url@5.0.0:
     dependencies:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
-    dev: true
 
-  /which@1.3.1:
-    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
-    hasBin: true
+  which@1.3.1:
     dependencies:
       isexe: 2.0.0
-    dev: true
 
-  /which@2.0.2:
-    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
-    engines: {node: '>= 8'}
-    hasBin: true
+  which@2.0.2:
     dependencies:
       isexe: 2.0.0
-    dev: true
 
-  /wrap-ansi@7.0.0:
-    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
-    engines: {node: '>=10'}
+  wrap-ansi@7.0.0:
     dependencies:
       ansi-styles: 4.3.0
       string-width: 4.2.3
       strip-ansi: 6.0.1
-    dev: true
 
-  /wrappy@1.0.2:
-    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
-    dev: true
+  wrappy@1.0.2: {}
 
-  /write-file-atomic@5.0.1:
-    resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  write-file-atomic@5.0.1:
     dependencies:
       imurmurhash: 0.1.4
       signal-exit: 4.0.1
-    dev: true
 
-  /ws@8.13.0:
-    resolution: {integrity: sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: '>=5.0.2'
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-    dev: true
+  ws@8.13.0: {}
 
-  /y18n@5.0.8:
-    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
-    engines: {node: '>=10'}
-    dev: true
+  y18n@5.0.8: {}
 
-  /yallist@4.0.0:
-    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
-    dev: true
+  yallist@4.0.0: {}
 
-  /yargs-parser@20.2.9:
-    resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
-    engines: {node: '>=10'}
-    dev: true
+  yargs-parser@20.2.9: {}
 
-  /yargs-parser@21.1.1:
-    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
-    engines: {node: '>=12'}
-    dev: true
+  yargs-parser@21.1.1: {}
 
-  /yargs@17.7.1:
-    resolution: {integrity: sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==}
-    engines: {node: '>=12'}
+  yargs@17.7.1:
     dependencies:
       cliui: 8.0.1
       escalade: 3.1.1
@@ -3426,45 +3869,19 @@ packages:
       string-width: 4.2.3
       y18n: 5.0.8
       yargs-parser: 21.1.1
-    dev: true
 
-  /yauzl@2.10.0:
-    resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
+  yauzl@2.10.0:
     dependencies:
       buffer-crc32: 0.2.13
       fd-slicer: 1.1.0
-    dev: true
 
-  /yocto-queue@0.1.0:
-    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
-    engines: {node: '>=10'}
-    dev: true
+  yocto-queue@0.1.0: {}
 
-  /zip-local@0.3.5:
-    resolution: {integrity: sha512-GRV3D5TJY+/PqyeRm5CYBs7xVrKTKzljBoEXvocZu0HJ7tPEcgpSOYa2zFIsCZWgKWMuc4U3yMFgFkERGFIB9w==}
+  zip-local@0.3.5:
     dependencies:
       async: 1.5.2
       graceful-fs: 4.2.11
       jszip: 2.7.0
       q: 1.5.1
-    dev: true
 
-  /zustand@3.7.2:
-    resolution: {integrity: sha512-PIJDIZKtokhof+9+60cpockVOq05sJzHCriyvaLBmEJixseQ1a5Kdov6fWZfWOu5SK9c+FhH1jU0tntLxRJYMA==}
-    engines: {node: '>=12.7.0'}
-    peerDependencies:
-      react: '>=16.8'
-    peerDependenciesMeta:
-      react:
-        optional: true
-    dev: true
-
-  github.com/mattdesl/gifenc/64842fca317b112a8590f8fef2bf3825da8f6fe3:
-    resolution: {tarball: https://codeload.github.com/mattdesl/gifenc/tar.gz/64842fca317b112a8590f8fef2bf3825da8f6fe3}
-    name: gifenc
-    version: 1.0.3
-    dev: false
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
+  zustand@3.7.2: {}
diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
index 5c34ad038..e2c901226 100644
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@@ -25,10 +25,11 @@ import { access, readdir, readFile } from "fs/promises";
 import { join, relative } from "path";
 import { promisify } from "util";
 
-// wtf is this assert syntax
-import PackageJSON from "../../package.json" assert { type: "json" };
 import { getPluginTarget } from "../utils.mjs";
 
+/** @type {import("../../package.json")} */
+const PackageJSON = JSON.parse(readFileSync("package.json"));
+
 export const VERSION = PackageJSON.version;
 // https://reproducible-builds.org/docs/source-date-epoch/
 export const BUILD_TIMESTAMP = Number(process.env.SOURCE_DATE_EPOCH) || Date.now();
diff --git a/tsconfig.json b/tsconfig.json
index e9c926408..96c904766 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,6 @@
 {
     "compilerOptions": {
+        "resolveJsonModule": true,
         "allowSyntheticDefaultImports": true,
         "esModuleInterop": true,
         "skipLibCheck": true,

From 0e66c4a1f598d3ec8efa9e5314bbb600c71165ec Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 7 May 2024 02:46:52 -0300
Subject: [PATCH 515/632] Fix subscribing to plugin flux events twice

---
 src/plugins/index.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 2d5e3e5a4..488847d15 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -36,6 +36,7 @@ export const patches = [] as Patch[];
 
 /** Whether we have subscribed to flux events of all the enabled plugins when FluxDispatcher was ready */
 let enabledPluginsSubscribedFlux = false;
+const subscribedFluxEventsPlugins = new Set<string>();
 
 const settings = Settings.plugins;
 
@@ -123,7 +124,9 @@ export function startDependenciesRecursive(p: Plugin) {
 }
 
 export function subscribePluginFluxEvents(p: Plugin, fluxDispatcher: typeof FluxDispatcher) {
-    if (p.flux) {
+    if (p.flux && !subscribedFluxEventsPlugins.has(p.name)) {
+        subscribedFluxEventsPlugins.add(p.name);
+
         logger.debug("Subscribing to flux events of plugin", p.name);
         for (const [event, handler] of Object.entries(p.flux)) {
             fluxDispatcher.subscribe(event as FluxEvents, handler);
@@ -133,6 +136,8 @@ export function subscribePluginFluxEvents(p: Plugin, fluxDispatcher: typeof Flux
 
 export function unsubscribePluginFluxEvents(p: Plugin, fluxDispatcher: typeof FluxDispatcher) {
     if (p.flux) {
+        subscribedFluxEventsPlugins.delete(p.name);
+
         logger.debug("Unsubscribing from flux events of plugin", p.name);
         for (const [event, handler] of Object.entries(p.flux)) {
             fluxDispatcher.unsubscribe(event as FluxEvents, handler);

From 75847147d132ff5eb432dbdd7f12fdc0a03c86a1 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 7 May 2024 03:20:56 -0300
Subject: [PATCH 516/632] FakeNitro: Add custom notifications sound bypass

---
 src/plugins/fakeNitro/index.tsx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index ad7394dc9..03feda0a8 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -400,6 +400,14 @@ export default definePlugin({
                 match: /(?<=type:"(?:SOUNDBOARD_SOUNDS_RECEIVED|GUILD_SOUNDBOARD_SOUND_CREATE|GUILD_SOUNDBOARD_SOUND_UPDATE|GUILD_SOUNDBOARD_SOUNDS_UPDATE)".+?available:)\i\.available/g,
                 replace: "true"
             }
+        },
+        // Allow using custom notification sounds
+        {
+            find: "canUseCustomNotificationSounds:function",
+            replacement: {
+                match: /canUseCustomNotificationSounds:function\(\i\){/,
+                replace: "$&return true;"
+            }
         }
     ],
 

From 97acffafcc75676330d7939a94930001614fe975 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 7 May 2024 16:32:19 +0200
Subject: [PATCH 517/632] fix useStateFromStores JSDoc

Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
---
 src/webpack/common/stores.ts         | 14 +++-----------
 src/webpack/common/types/stores.d.ts |  7 +++++++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/webpack/common/stores.ts b/src/webpack/common/stores.ts
index 2f9786bc5..be5721ff3 100644
--- a/src/webpack/common/stores.ts
+++ b/src/webpack/common/stores.ts
@@ -64,23 +64,15 @@ export let DraftStore: t.DraftStore;
 /**
  * React hook that returns stateful data for one or more stores
  * You might need a custom comparator (4th argument) if your store data is an object
- *
  * @param stores The stores to listen to
  * @param mapper A function that returns the data you need
- * @param idk some thing, idk just pass null
+ * @param dependencies An array of reactive values which the hook depends on. Use this if your mapper or equality function depends on the value of another hook
  * @param isEqual A custom comparator for the data returned by mapper
  *
  * @example const user = useStateFromStores([UserStore], () => UserStore.getCurrentUser(), null, (old, current) => old.id === current.id);
  */
-export const { useStateFromStores }: {
-    useStateFromStores: <T>(
-        stores: t.FluxStore[],
-        mapper: () => T,
-        idk?: any,
-        isEqual?: (old: T, newer: T) => boolean
-    ) => T;
-}
-    = findByPropsLazy("useStateFromStores");
+// eslint-disable-next-line prefer-destructuring
+export const useStateFromStores: t.useStateFromStores = findByPropsLazy("useStateFromStores").useStateFromStores;
 
 waitForStore("DraftStore", s => DraftStore = s);
 waitForStore("UserStore", s => UserStore = s);
diff --git a/src/webpack/common/types/stores.d.ts b/src/webpack/common/types/stores.d.ts
index 8e89a6e20..d6bf3aaf3 100644
--- a/src/webpack/common/types/stores.d.ts
+++ b/src/webpack/common/types/stores.d.ts
@@ -182,3 +182,10 @@ export class GuildStore extends FluxStore {
     getRoles(guildId: string): Record<string, Role>;
     getAllGuildRoles(): Record<string, Record<string, Role>>;
 }
+
+export type useStateFromStores = <T>(
+    stores: t.FluxStore[],
+    mapper: () => T,
+    dependencies?: any,
+    isEqual?: (old: T, newer: T) => boolean
+) => T;

From 799b903da94447bb6e62871977f1cd102cf9e06f Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 7 May 2024 22:40:14 +0200
Subject: [PATCH 518/632] Revert "messageLogger: fix niche bug ignoring edits
 when content is same (#2403)"

This reverts commit 85d6d74a3e14ed4a1cc83c8131b83c08cfdce04a.

As suspected, this code was actually necessary
---
 src/plugins/messageLogger/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index 988cd8e39..c3a25e1b6 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -255,7 +255,7 @@ export default definePlugin({
                     replace: "$1" +
                         ".update($3,m =>" +
                         "   (($2.message.flags & 64) === 64 || $self.shouldIgnore($2.message, true)) ? m :" +
-                        "   $2.message.content !== m.content ?" +
+                        "   $2.message.content !== m.editHistory?.[0]?.content && $2.message.content !== m.content ?" +
                         "       m.set('editHistory',[...(m.editHistory || []), $self.makeEdit($2.message, m)]) :" +
                         "       m" +
                         ")" +

From 53dda32fb045a0cb6ea7d65edda0111d61a8ba6f Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 7 May 2024 21:36:40 -0300
Subject: [PATCH 519/632] BetterFolders: Fix broken patch

---
 src/plugins/betterFolders/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/betterFolders/index.tsx b/src/plugins/betterFolders/index.tsx
index 70e4070cd..0b06d035c 100644
--- a/src/plugins/betterFolders/index.tsx
+++ b/src/plugins/betterFolders/index.tsx
@@ -127,7 +127,7 @@ export default definePlugin({
                 },
                 // If we are rendering the Better Folders sidebar, we filter out everything but the scroller for the guild list from the GuildsBar Tree children
                 {
-                    match: /unreadMentionsIndicatorBottom,barClassName.+?}\)\]/,
+                    match: /unreadMentionsIndicatorBottom,.+?}\)\]/,
                     replace: "$&.filter($self.makeGuildsBarTreeFilter(!!arguments[0].isBetterFolders))"
                 },
                 // Export the isBetterFolders variable to the folders component

From 21d2019e6032d78a922273ecba1c04c6576d9d53 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 8 May 2024 02:43:46 +0200
Subject: [PATCH 520/632] improve SupportHelper

---
 src/plugins/_core/supportHelper.tsx | 118 ++++++++++++++++++++++------
 1 file changed, 92 insertions(+), 26 deletions(-)

diff --git a/src/plugins/_core/supportHelper.tsx b/src/plugins/_core/supportHelper.tsx
index 674be8e53..63f32cbd2 100644
--- a/src/plugins/_core/supportHelper.tsx
+++ b/src/plugins/_core/supportHelper.tsx
@@ -16,20 +16,24 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { DataStore } from "@api/index";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Link } from "@components/Link";
+import { openUpdaterModal } from "@components/VencordSettings/UpdaterTab";
 import { Devs, SUPPORT_CHANNEL_ID } from "@utils/constants";
+import { Margins } from "@utils/margins";
 import { isPluginDev } from "@utils/misc";
+import { relaunch } from "@utils/native";
 import { makeCodeblock } from "@utils/text";
 import definePlugin from "@utils/types";
-import { isOutdated } from "@utils/updater";
-import { Alerts, Forms, UserStore } from "@webpack/common";
+import { isOutdated, update } from "@utils/updater";
+import { Alerts, Card, ChannelStore, Forms, GuildMemberStore, NavigationRouter, Parser, RelationshipStore, UserStore } from "@webpack/common";
 
 import gitHash from "~git-hash";
 import plugins from "~plugins";
 
 import settings from "./settings";
 
-const REMEMBER_DISMISS_KEY = "Vencord-SupportHelper-Dismiss";
+const VENCORD_GUILD_ID = "1015060230222131221";
 
 const AllowedChannelIds = [
     SUPPORT_CHANNEL_ID,
@@ -37,6 +41,12 @@ const AllowedChannelIds = [
     "1033680203433660458", // Vencord > #v
 ];
 
+const TrustedRolesIds = [
+    "1026534353167208489", // contributor
+    "1026504932959977532", // regular
+    "1042507929485586532", // donor
+];
+
 export default definePlugin({
     name: "SupportHelper",
     required: true,
@@ -44,6 +54,14 @@ export default definePlugin({
     authors: [Devs.Ven],
     dependencies: ["CommandsAPI"],
 
+    patches: [{
+        find: ".BEGINNING_DM.format",
+        replacement: {
+            match: /BEGINNING_DM\.format\(\{.+?\}\),(?=.{0,100}userId:(\i\.getRecipientId\(\)))/,
+            replace: "$& $self.ContributorDmWarningCard({ userId: $1 }),"
+        }
+    }],
+
     commands: [{
         name: "vencord-debug",
         description: "Send Vencord Debug info",
@@ -64,15 +82,13 @@ export default definePlugin({
             const isApiPlugin = (plugin: string) => plugin.endsWith("API") || plugins[plugin].required;
 
             const enabledPlugins = Object.keys(plugins).filter(p => Vencord.Plugins.isPluginEnabled(p) && !isApiPlugin(p));
-            const enabledApiPlugins = Object.keys(plugins).filter(p => Vencord.Plugins.isPluginEnabled(p) && isApiPlugin(p));
 
             const info = {
-                Vencord: `v${VERSION} • ${gitHash}${settings.additionalInfo} - ${Intl.DateTimeFormat("en-GB", { dateStyle: "medium" }).format(BUILD_TIMESTAMP)}`,
-                "Discord Branch": RELEASE_CHANNEL,
-                Client: client,
-                Platform: window.navigator.platform,
-                Outdated: isOutdated,
-                OpenAsar: "openasar" in window,
+                Vencord:
+                    `v${VERSION} • [${gitHash}](<https://github.com/Vendicated/Vencord/commit/${gitHash}>)` +
+                    `${settings.additionalInfo} - ${Intl.DateTimeFormat("en-GB", { dateStyle: "medium" }).format(BUILD_TIMESTAMP)}`,
+                Client: `${RELEASE_CHANNEL} ~ ${client}`,
+                Platform: window.navigator.platform
             };
 
             if (IS_DISCORD_DESKTOP) {
@@ -80,11 +96,10 @@ export default definePlugin({
             }
 
             const debugInfo = `
-**Vencord Debug Info**
->>> ${Object.entries(info).map(([k, v]) => `${k}: ${v}`).join("\n")}
+>>> ${Object.entries(info).map(([k, v]) => `**${k}**: ${v}`).join("\n")}
 
-Enabled Plugins (${enabledPlugins.length + enabledApiPlugins.length}):
-${makeCodeblock(enabledPlugins.join(", ") + "\n\n" + enabledApiPlugins.join(", "))}
+Enabled Plugins (${enabledPlugins.length}):
+${makeCodeblock(enabledPlugins.join(", "))}
 `;
 
             return {
@@ -97,24 +112,75 @@ ${makeCodeblock(enabledPlugins.join(", ") + "\n\n" + enabledApiPlugins.join(", "
         async CHANNEL_SELECT({ channelId }) {
             if (channelId !== SUPPORT_CHANNEL_ID) return;
 
-            if (isPluginDev(UserStore.getCurrentUser().id)) return;
+            const selfId = UserStore.getCurrentUser()?.id;
+            if (!selfId || isPluginDev(selfId)) return;
 
-            if (isOutdated && gitHash !== await DataStore.get(REMEMBER_DISMISS_KEY)) {
-                const rememberDismiss = () => DataStore.set(REMEMBER_DISMISS_KEY, gitHash);
-
-                Alerts.show({
+            if (isOutdated) {
+                return Alerts.show({
                     title: "Hold on!",
                     body: <div>
                         <Forms.FormText>You are using an outdated version of Vencord! Chances are, your issue is already fixed.</Forms.FormText>
-                        <Forms.FormText>
-                            Please first update using the Updater Page in Settings, or use the VencordInstaller (Update Vencord Button)
-                            to do so, in case you can't access the Updater page.
+                        <Forms.FormText className={Margins.top8}>
+                            Please first update before asking for support!
                         </Forms.FormText>
                     </div>,
-                    onCancel: rememberDismiss,
-                    onConfirm: rememberDismiss
+                    onCancel: () => openUpdaterModal!(),
+                    cancelText: "View Updates",
+                    confirmText: "Update & Restart Now",
+                    async onConfirm() {
+                        await update();
+                        relaunch();
+                    },
+                    secondaryConfirmText: "I know what I'm doing or I can't update"
+                });
+            }
+
+            // @ts-ignore outdated type
+            const roles = GuildMemberStore.getSelfMember(VENCORD_GUILD_ID)?.roles;
+            if (!roles || TrustedRolesIds.some(id => roles.includes(id))) return;
+
+            if (IS_UPDATER_DISABLED) {
+                return Alerts.show({
+                    title: "Hold on!",
+                    body: <div>
+                        <Forms.FormText>You are using an externally updated Vencord version, which we do not provide support for!</Forms.FormText>
+                        <Forms.FormText className={Margins.top8}>
+                            Please either switch to an <Link href="https://vencord.dev/download">officially supported version of Vencord</Link>, or
+                            contact your package maintainer for support instead.
+                        </Forms.FormText>
+                    </div>,
+                    onCloseCallback: () => setTimeout(() => NavigationRouter.back(), 50)
+                });
+            }
+
+            const repo = await VencordNative.updater.getRepo();
+            if (repo.ok && !repo.value.includes("Vendicated/Vencord")) {
+                return Alerts.show({
+                    title: "Hold on!",
+                    body: <div>
+                        <Forms.FormText>You are using a fork of Vencord, which we do not provide support for!</Forms.FormText>
+                        <Forms.FormText className={Margins.top8}>
+                            Please either switch to an <Link href="https://vencord.dev/download">officially supported version of Vencord</Link>, or
+                            contact your package maintainer for support instead.
+                        </Forms.FormText>
+                    </div>,
+                    onCloseCallback: () => setTimeout(() => NavigationRouter.back(), 50)
                 });
             }
         }
-    }
+    },
+
+    ContributorDmWarningCard: ErrorBoundary.wrap(({ userId }) => {
+        if (!isPluginDev(userId)) return null;
+        if (RelationshipStore.isFriend(userId)) return null;
+
+        return (
+            <Card className={`vc-plugins-restart-card ${Margins.top8}`}>
+                Please do not private message Vencord plugin developers for support!
+                <br />
+                Instead, use the Vencord support channel: {Parser.parse("https://discord.com/channels/1015060230222131221/1026515880080842772")}
+                {!ChannelStore.getChannel(SUPPORT_CHANNEL_ID) && " (Click the link to join)"}
+            </Card>
+        );
+    }, { noop: true })
 });

From e2dc9e75d162c54f20cf4a5d717d9688d125b482 Mon Sep 17 00:00:00 2001
From: kaitlynkitty <87152313+kaitlynkittyy@users.noreply.github.com>
Date: Tue, 7 May 2024 21:17:42 -0400
Subject: [PATCH 521/632] new plugin WebScreenShareFixes: remove low stream
 bitrate limit (#2405)

---
 src/plugins/webScreenShareFixes.web/index.ts | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/plugins/webScreenShareFixes.web/index.ts

diff --git a/src/plugins/webScreenShareFixes.web/index.ts b/src/plugins/webScreenShareFixes.web/index.ts
new file mode 100644
index 000000000..8d1ab5821
--- /dev/null
+++ b/src/plugins/webScreenShareFixes.web/index.ts
@@ -0,0 +1,30 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "WebScreenShareFixes",
+    authors: [Devs.Kaitlyn],
+    description: "Removes 2500kbps bitrate cap on chromium and vesktop clients.",
+    enabledByDefault: true,
+    patches: [
+        {
+            find: "x-google-max-bitrate",
+            replacement: [
+                {
+                    match: /"x-google-max-bitrate=".concat\(\i\)/,
+                    replace: '"x-google-max-bitrate=".concat("80_000")'
+                },
+                {
+                    match: /;level-asymmetry-allowed=1/,
+                    replace: ";b=AS:800000;level-asymmetry-allowed=1"
+                }
+            ]
+        }
+    ]
+});

From efca196deda743b4295b90b4e5e52320c8bd3d5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Han=20Seung=20Min=20-=20=ED=95=9C=EC=8A=B9=EB=AF=BC?=
 <hanseungmin.ar@gmail.com>
Date: Wed, 8 May 2024 10:25:32 +0900
Subject: [PATCH 522/632] new plugin MessageLatency: indicator for other
 people's latency (#2353)

---
 src/plugins/messageLatency/README.md |  31 ++++++
 src/plugins/messageLatency/index.tsx | 147 +++++++++++++++++++++++++++
 src/utils/constants.ts               |   4 +
 3 files changed, 182 insertions(+)
 create mode 100644 src/plugins/messageLatency/README.md
 create mode 100644 src/plugins/messageLatency/index.tsx

diff --git a/src/plugins/messageLatency/README.md b/src/plugins/messageLatency/README.md
new file mode 100644
index 000000000..8d2a776cd
--- /dev/null
+++ b/src/plugins/messageLatency/README.md
@@ -0,0 +1,31 @@
+# MessageLatency
+
+Displays an indicator for messages that took ≥n seconds to send.
+
+> **NOTE**
+>
+> -   This plugin only applies to messages received after opening the channel
+> -   False positives can exist if the user's system clock has drifted.
+> -   Grouped messages only display latency of the first message
+
+## Demo
+
+### Chat View
+
+![chat-view](https://github.com/Vendicated/Vencord/assets/82430093/69430881-60b3-422f-aa3d-c62953837566)
+
+### Clock -ve Drift
+
+![pissbot-on-top](https://github.com/Vendicated/Vencord/assets/82430093/d9248b66-e761-4872-8829-e8bf4fea6ec8)
+
+### Clock +ve Drift
+
+![dumb-ai](https://github.com/Vendicated/Vencord/assets/82430093/0e9783cf-51d5-4559-ae10-42399e7d4099)
+
+### Connection Delay
+
+![who-this](https://github.com/Vendicated/Vencord/assets/82430093/fd68873d-8630-42cc-a166-e9063d2718b2)
+
+### Icons
+
+![icons](https://github.com/Vendicated/Vencord/assets/82430093/17630bd9-44ee-4967-bcdf-3315eb6eca85)
diff --git a/src/plugins/messageLatency/index.tsx b/src/plugins/messageLatency/index.tsx
new file mode 100644
index 000000000..0b6d75033
--- /dev/null
+++ b/src/plugins/messageLatency/index.tsx
@@ -0,0 +1,147 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import { isNonNullish } from "@utils/guards";
+import definePlugin, { OptionType } from "@utils/types";
+import { findExportedComponentLazy } from "@webpack";
+import { SnowflakeUtils, Tooltip } from "@webpack/common";
+import { Message } from "discord-types/general";
+
+type FillValue = ("status-danger" | "status-warning" | "text-muted");
+type Fill = [FillValue, FillValue, FillValue];
+type DiffKey = keyof Diff;
+
+interface Diff {
+    days: number,
+    hours: number,
+    minutes: number,
+    seconds: number;
+}
+
+const HiddenVisually = findExportedComponentLazy("HiddenVisually");
+
+export default definePlugin({
+    name: "MessageLatency",
+    description: "Displays an indicator for messages that took ≥n seconds to send",
+    authors: [Devs.arHSM],
+    settings: definePluginSettings({
+        latency: {
+            type: OptionType.NUMBER,
+            description: "Threshold in seconds for latency indicator",
+            default: 2
+        }
+    }),
+    patches: [
+        {
+            find: "showCommunicationDisabledStyles",
+            replacement: {
+                match: /(message:(\i),avatar:\i,username:\(0,\i.jsxs\)\(\i.Fragment,\{children:\[)(\i&&)/,
+                replace: "$1$self.Tooltip()({ message: $2 }),$3"
+            }
+        }
+    ],
+    stringDelta(delta: number) {
+        const diff: Diff = {
+            days: Math.round(delta / (60 * 60 * 24)),
+            hours: Math.round((delta / (60 * 60)) % 24),
+            minutes: Math.round((delta / (60)) % 60),
+            seconds: Math.round(delta % 60),
+        };
+
+        const str = (k: DiffKey) => diff[k] > 0 ? `${diff[k]} ${k}` : null;
+        const keys = Object.keys(diff) as DiffKey[];
+
+        return keys.map(str).filter(isNonNullish).join(" ") || "0 seconds";
+    },
+    latencyTooltipData(message: Message) {
+        const { id, nonce } = message;
+
+        // Message wasn't received through gateway
+        if (!isNonNullish(nonce)) return null;
+
+        const delta = Math.round((SnowflakeUtils.extractTimestamp(id) - SnowflakeUtils.extractTimestamp(nonce)) / 1000);
+
+        // Thanks dziurwa (I hate you)
+        // This is when the user's clock is ahead
+        // Can't do anything if the clock is behind
+        const abs = Math.abs(delta);
+        const ahead = abs !== delta;
+
+        const stringDelta = this.stringDelta(abs);
+
+        // Also thanks dziurwa
+        // 2 minutes
+        const TROLL_LIMIT = 2 * 60;
+        const { latency } = this.settings.store;
+
+        const fill: Fill = delta >= TROLL_LIMIT || ahead ? ["text-muted", "text-muted", "text-muted"] : delta >= (latency * 2) ? ["status-danger", "text-muted", "text-muted"] : ["status-warning", "status-warning", "text-muted"];
+
+        return abs >= latency ? { delta: stringDelta, ahead: abs !== delta, fill } : null;
+    },
+    Tooltip() {
+        return ErrorBoundary.wrap(({ message }: { message: Message; }) => {
+
+            const d = this.latencyTooltipData(message);
+
+            if (!isNonNullish(d)) return null;
+
+            return <Tooltip
+                text={d.ahead ? `This user's clock is ${d.delta} ahead` : `This message was sent with a delay of ${d.delta}.`}
+                position="top"
+            >
+                {
+                    props => <>
+                        {<this.Icon delta={d.delta} fill={d.fill} props={props} />}
+                        {/* Time Out indicator uses this, I think this is for a11y */}
+                        <HiddenVisually>Delayed Message</HiddenVisually>
+                    </>
+                }
+            </Tooltip>;
+        });
+    },
+    Icon({ delta, fill, props }: {
+        delta: string;
+        fill: Fill,
+        props: {
+            onClick(): void;
+            onMouseEnter(): void;
+            onMouseLeave(): void;
+            onContextMenu(): void;
+            onFocus(): void;
+            onBlur(): void;
+            "aria-label"?: string;
+        };
+    }) {
+        return <svg
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 16 16"
+            width="12"
+            height="12"
+            role="img"
+            fill="none"
+            style={{ marginRight: "8px", verticalAlign: -1 }}
+            aria-label={delta}
+            aria-hidden="false"
+            {...props}
+        >
+            <path
+                fill={`var(--${fill[0]})`}
+                d="M4.8001 12C4.8001 11.5576 4.51344 11.2 4.16023 11.2H2.23997C1.88676 11.2 1.6001 11.5576 1.6001 12V13.6C1.6001 14.0424 1.88676 14.4 2.23997 14.4H4.15959C4.5128 14.4 4.79946 14.0424 4.79946 13.6L4.8001 12Z"
+            />
+            <path
+                fill={`var(--${fill[1]})`}
+                d="M9.6001 7.12724C9.6001 6.72504 9.31337 6.39998 8.9601 6.39998H7.0401C6.68684 6.39998 6.40011 6.72504 6.40011 7.12724V13.6727C6.40011 14.0749 6.68684 14.4 7.0401 14.4H8.9601C9.31337 14.4 9.6001 14.0749 9.6001 13.6727V7.12724Z"
+            />
+            <path
+                fill={`var(--${fill[2]})`}
+                d="M14.4001 2.31109C14.4001 1.91784 14.1134 1.59998 13.7601 1.59998H11.8401C11.4868 1.59998 11.2001 1.91784 11.2001 2.31109V13.6888C11.2001 14.0821 11.4868 14.4 11.8401 14.4H13.7601C14.1134 14.4 14.4001 14.0821 14.4001 13.6888V2.31109Z"
+            />
+        </svg>;
+    }
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index cce276ef8..ab6c0bb70 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -266,6 +266,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Dziurwa",
         id: 1001086404203389018n
     },
+    arHSM: {
+        name: "arHSM",
+        id: 841509053422632990n
+    },
     F53: {
         name: "F53",
         id: 280411966126948353n

From d3acd7edc7d7972888f06ea6c919587d11e825ff Mon Sep 17 00:00:00 2001
From: Kyuuhachi <1547062+Kyuuhachi@users.noreply.github.com>
Date: Wed, 8 May 2024 03:32:09 +0200
Subject: [PATCH 523/632] new plugin ReplyTimestamp: show timestamps of replied
 messages  (#2296)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/replyTimestamp/README.md |  5 ++
 src/plugins/replyTimestamp/index.tsx | 77 ++++++++++++++++++++++++++++
 src/plugins/replyTimestamp/style.css |  3 ++
 3 files changed, 85 insertions(+)
 create mode 100644 src/plugins/replyTimestamp/README.md
 create mode 100644 src/plugins/replyTimestamp/index.tsx
 create mode 100644 src/plugins/replyTimestamp/style.css

diff --git a/src/plugins/replyTimestamp/README.md b/src/plugins/replyTimestamp/README.md
new file mode 100644
index 000000000..b7952bf3a
--- /dev/null
+++ b/src/plugins/replyTimestamp/README.md
@@ -0,0 +1,5 @@
+# ReplyTimestamp
+
+Shows timestamps on the previews of replied-to messages. Pretty simple.
+
+![](https://github.com/Vendicated/Vencord/assets/1547062/62e2b67a-e567-4c7a-884d-4640f897f7e0)
diff --git a/src/plugins/replyTimestamp/index.tsx b/src/plugins/replyTimestamp/index.tsx
new file mode 100644
index 000000000..05ec28b1b
--- /dev/null
+++ b/src/plugins/replyTimestamp/index.tsx
@@ -0,0 +1,77 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./style.css";
+
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+import { Timestamp } from "@webpack/common";
+import type { Message } from "discord-types/general";
+import type { HTMLAttributes } from "react";
+
+const { getMessageTimestampId } = findByPropsLazy("getMessageTimestampId");
+const { calendarFormat, dateFormat, isSameDay } = findByPropsLazy("calendarFormat", "dateFormat", "isSameDay", "accessibilityLabelCalendarFormat");
+const MessageClasses = findByPropsLazy("separator", "latin24CompactTimeStamp");
+
+function Sep(props: HTMLAttributes<HTMLElement>) {
+    return <i className={MessageClasses.separator} aria-hidden={true} {...props} />;
+}
+
+const enum ReferencedMessageState {
+    LOADED = 0,
+    NOT_LOADED = 1,
+    DELETED = 2,
+}
+
+type ReferencedMessage = { state: ReferencedMessageState.LOADED; message: Message; } | { state: ReferencedMessageState.NOT_LOADED | ReferencedMessageState.DELETED; };
+
+function ReplyTimestamp({
+    referencedMessage,
+    baseMessage,
+}: {
+    referencedMessage: ReferencedMessage,
+    baseMessage: Message;
+}) {
+    if (referencedMessage.state !== ReferencedMessageState.LOADED) return null;
+    const refTimestamp = referencedMessage.message.timestamp as any;
+    const baseTimestamp = baseMessage.timestamp as any;
+    return (
+        <Timestamp
+            id={getMessageTimestampId(referencedMessage.message)}
+            className="vc-reply-timestamp"
+            compact={isSameDay(refTimestamp, baseTimestamp)}
+            timestamp={refTimestamp}
+            isInline={false}
+        >
+            <Sep>[</Sep>
+            {isSameDay(refTimestamp, baseTimestamp)
+                ? dateFormat(refTimestamp, "LT")
+                : calendarFormat(refTimestamp)
+            }
+            <Sep>]</Sep>
+        </Timestamp>
+    );
+}
+
+export default definePlugin({
+    name: "ReplyTimestamp",
+    description: "Shows a timestamp on replied-message previews",
+    authors: [Devs.Kyuuhachi],
+
+    patches: [
+        {
+            find: "renderSingleLineMessage:function()",
+            replacement: {
+                match: /(?<="aria-label":\i,children:\[)(?=\i,\i,\i\])/,
+                replace: "$self.ReplyTimestamp(arguments[0]),"
+            }
+        }
+    ],
+
+    ReplyTimestamp: ErrorBoundary.wrap(ReplyTimestamp, { noop: true }),
+});
diff --git a/src/plugins/replyTimestamp/style.css b/src/plugins/replyTimestamp/style.css
new file mode 100644
index 000000000..f42371717
--- /dev/null
+++ b/src/plugins/replyTimestamp/style.css
@@ -0,0 +1,3 @@
+.vc-reply-timestamp {
+    margin-right: 0.25em;
+}

From 1317222c35a4f6dd2b7329507c7b7ac5a9854d9e Mon Sep 17 00:00:00 2001
From: puv <dev@puv.bar>
Date: Wed, 8 May 2024 04:44:57 +0300
Subject: [PATCH 524/632] feat(plugin): VoiceDownload (#2280)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/voiceDownload/index.tsx | 53 +++++++++++++++++++++++++++++
 src/plugins/voiceDownload/style.css | 12 +++++++
 src/utils/constants.ts              |  4 +++
 3 files changed, 69 insertions(+)
 create mode 100644 src/plugins/voiceDownload/index.tsx
 create mode 100644 src/plugins/voiceDownload/style.css

diff --git a/src/plugins/voiceDownload/index.tsx b/src/plugins/voiceDownload/index.tsx
new file mode 100644
index 000000000..453a522d3
--- /dev/null
+++ b/src/plugins/voiceDownload/index.tsx
@@ -0,0 +1,53 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./style.css";
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "VoiceDownload",
+    description: "Adds a download to voice messages. (Opens a new browser tab)",
+    authors: [Devs.puv],
+    patches: [
+        {
+            find: "rippleContainer,children",
+            replacement: {
+                match: /\(0,\i\.jsx\).{0,150},children:.{0,50}\("source",{src:(\i)}\)}\)/,
+                replace: "[$&, $self.renderDownload($1)]"
+            }
+        }
+    ],
+
+    renderDownload(src: string) {
+        return (
+            <a
+                className="vc-voice-download"
+                href={src}
+                download="voice-message.ogg"
+                onClick={e => e.stopPropagation()}
+                aria-label="Download voice message"
+            >
+                <this.Icon />
+            </a>
+        );
+    },
+
+    Icon: () => (
+        <svg
+            className="icon"
+            height="24"
+            width="24"
+            viewBox="0 0 24 24"
+            fill="currentColor"
+        >
+            <path
+                d="M12 2a1 1 0 0 1 1 1v10.59l3.3-3.3a1 1 0 1 1 1.4 1.42l-5 5a1 1 0 0 1-1.4 0l-5-5a1 1 0 1 1 1.4-1.42l3.3 3.3V3a1 1 0 0 1 1-1ZM3 20a1 1 0 1 0 0 2h18a1 1 0 1 0 0-2H3Z"
+            />
+        </svg>
+    ),
+});
diff --git a/src/plugins/voiceDownload/style.css b/src/plugins/voiceDownload/style.css
new file mode 100644
index 000000000..2b776023f
--- /dev/null
+++ b/src/plugins/voiceDownload/style.css
@@ -0,0 +1,12 @@
+.vc-voice-download {
+    width: 24px;
+    height: 24px;
+    color: var(--interactive-normal);
+    margin-left: 12px;
+    cursor: pointer;
+    position: relative;
+}
+
+.vc-voice-download:hover {
+    color: var(--interactive-active);
+}
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index ab6c0bb70..a0c4752dc 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -430,6 +430,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "newwares",
         id: 421405303951851520n
     },
+    puv: {
+        name: "puv",
+        id: 469441552251355137n
+    },
     Kodarru: {
         name: "Kodarru",
         id: 785227396218748949n

From 5c787145e3a83dfe99ff4e595711298b96efe5d2 Mon Sep 17 00:00:00 2001
From: dolfies <jeyalfie47@gmail.com>
Date: Tue, 7 May 2024 21:50:26 -0400
Subject: [PATCH 525/632] showHiddenThings: also show ModView & hidden
 discovery servers (#2415)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/showHiddenThings/README.md |  6 ++++++
 src/plugins/showHiddenThings/index.ts  | 28 +++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/plugins/showHiddenThings/README.md b/src/plugins/showHiddenThings/README.md
index b41e2d94d..e969391e4 100644
--- a/src/plugins/showHiddenThings/README.md
+++ b/src/plugins/showHiddenThings/README.md
@@ -9,3 +9,9 @@ Displays various moderator-only elements regardless of permissions.
 
 - Show the invites paused tooltip in the server list
 ![](https://github.com/Vendicated/Vencord/assets/47677887/b6a923d2-ac55-40d9-b4f8-fa6fc117148b)
+
+- Show the member mod view context menu item in all servers
+
+![](https://github.com/Vendicated/Vencord/assets/47677887/3dac95dd-841c-4c15-ad87-2db7bd1e4dab)
+
+- Disable filters in Server Discovery search that hide servers that don't meet discovery criteria
diff --git a/src/plugins/showHiddenThings/index.ts b/src/plugins/showHiddenThings/index.ts
index e7be929bf..1858582a8 100644
--- a/src/plugins/showHiddenThings/index.ts
+++ b/src/plugins/showHiddenThings/index.ts
@@ -31,12 +31,22 @@ const settings = definePluginSettings({
         description: "Show the invites paused tooltip in the server list.",
         default: true,
     },
+    showModView: {
+        type: OptionType.BOOLEAN,
+        description: "Show the member mod view context menu item in all servers.",
+        default: true,
+    },
+    disableDiscoveryFilters: {
+        type: OptionType.BOOLEAN,
+        description: "Disable filters in Server Discovery search that hide servers that don't meet discovery criteria.",
+        default: true,
+    },
 });
 
 migratePluginSettings("ShowHiddenThings", "ShowTimeouts");
 export default definePlugin({
     name: "ShowHiddenThings",
-    tags: ["ShowTimeouts", "ShowInvitesPaused"],
+    tags: ["ShowTimeouts", "ShowInvitesPaused", "ShowModView", "DisableDiscoveryFilters"],
     description: "Displays various moderator-only elements regardless of permissions.",
     authors: [Devs.Dolfies],
     patches: [
@@ -55,6 +65,22 @@ export default definePlugin({
                 match: /\i\.\i\.can\(\i\.Permissions.MANAGE_GUILD,\i\)/,
                 replace: "true",
             },
+        },
+        {
+            find: "canAccessGuildMemberModViewWithExperiment:",
+            predicate: () => settings.store.showModView,
+            replacement: {
+                match: /return \i\.hasAny\(\i\.computePermissions\(\{user:\i,context:\i,checkElevated:!1\}\),\i\.MemberSafetyPagePermissions\)/,
+                replace: "return true",
+            }
+        },
+        {
+            find: "auto_removed:",
+            predicate: () => settings.store.disableDiscoveryFilters,
+            replacement: {
+                match: /filters:\i\.join\(" AND "\),facets:\[/,
+                replace: "facets:["
+            }
         }
     ],
     settings,

From dd3b7e534651bbe42fdd80b12c8b5815026760b7 Mon Sep 17 00:00:00 2001
From: KK2-5 <120592920+KK2-5@users.noreply.github.com>
Date: Tue, 7 May 2024 22:55:32 -0300
Subject: [PATCH 526/632] LastfmRichPresence: Add option to use album name as
 status name (#2400)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/lastfm/index.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/plugins/lastfm/index.tsx b/src/plugins/lastfm/index.tsx
index 5dfec8a32..1213ece29 100644
--- a/src/plugins/lastfm/index.tsx
+++ b/src/plugins/lastfm/index.tsx
@@ -77,7 +77,8 @@ const enum NameFormat {
     ArtistFirst = "artist-first",
     SongFirst = "song-first",
     ArtistOnly = "artist",
-    SongOnly = "song"
+    SongOnly = "song",
+    AlbumName = "album"
 }
 
 const applicationId = "1108588077900898414";
@@ -147,6 +148,10 @@ const settings = definePluginSettings({
             {
                 label: "Use song name only",
                 value: NameFormat.SongOnly
+            },
+            {
+                label: "Use album name (falls back to custom status text if song has no album)",
+                value: NameFormat.AlbumName
             }
         ],
     },
@@ -313,6 +318,8 @@ export default definePlugin({
                     return trackData.artist;
                 case NameFormat.SongOnly:
                     return trackData.name;
+                case NameFormat.AlbumName:
+                    return trackData.album || settings.store.statusName;
                 default:
                     return settings.store.statusName;
             }

From 449f95500ae3124f55bb51fe7e8f8e29e7fb10a2 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 8 May 2024 03:56:25 +0200
Subject: [PATCH 527/632] bump to v1.8.2

---
 package.json                        | 2 +-
 src/plugins/voiceDownload/index.tsx | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 97d3da576..9fd84f9b8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.8.1",
+    "version": "1.8.2",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {
diff --git a/src/plugins/voiceDownload/index.tsx b/src/plugins/voiceDownload/index.tsx
index 453a522d3..8586b9f91 100644
--- a/src/plugins/voiceDownload/index.tsx
+++ b/src/plugins/voiceDownload/index.tsx
@@ -39,7 +39,6 @@ export default definePlugin({
 
     Icon: () => (
         <svg
-            className="icon"
             height="24"
             width="24"
             viewBox="0 0 24 24"

From 6ad17ff7e7f7bedcea3099e62a7e6601137239b3 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 8 May 2024 17:12:13 -0300
Subject: [PATCH 528/632] BetterFolders: Fix component erroring

---
 src/plugins/betterFolders/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/betterFolders/index.tsx b/src/plugins/betterFolders/index.tsx
index 0b06d035c..d252682f8 100644
--- a/src/plugins/betterFolders/index.tsx
+++ b/src/plugins/betterFolders/index.tsx
@@ -279,7 +279,7 @@ export default definePlugin({
     makeGuildsBarTreeFilter(isBetterFolders: boolean) {
         return child => {
             if (isBetterFolders) {
-                return "onScroll" in child.props;
+                return child?.props?.onScroll != null;
             }
             return true;
         };

From b1cc67a860fe2b6546900797dfa49a936b97f7dd Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 8 May 2024 23:42:04 +0200
Subject: [PATCH 529/632] fix(BetterSettings): do not catch errors of other ui

---
 src/plugins/betterSettings/index.tsx | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/plugins/betterSettings/index.tsx b/src/plugins/betterSettings/index.tsx
index 7d81c6f5c..5836734ef 100644
--- a/src/plugins/betterSettings/index.tsx
+++ b/src/plugins/betterSettings/index.tsx
@@ -6,8 +6,8 @@
 
 import { definePluginSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
-import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
+import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { ComponentDispatch, FocusLock, i18n, Menu, useEffect, useRef } from "@webpack/common";
@@ -124,12 +124,23 @@ export default definePlugin({
         }
     ],
 
+    // This is the very outer layer of the entire ui, so we can't wrap this in an ErrorBoundary
+    // without possibly also catching unrelated errors of children.
+    //
+    // Thus, we sanity check webpack modules & do this really hacky try catch to hopefully prevent hard crashes if something goes wrong.
+    // try catch will only catch errors in the Layer function (hence why it's called as a plain function rather than a component), but
+    // not in children
     Layer(props: LayerProps) {
-        return (
-            <ErrorBoundary fallback={() => props.children as any}>
-                <Layer {...props} />
-            </ErrorBoundary>
-        );
+        try {
+            if (!FocusLock || !ComponentDispatch)
+                throw new Error("Failed to fetch some webpack modules");
+
+            return Layer(props);
+        } catch (e) {
+            new Logger("BetterSettings").error("Failed to render Layer", e);
+        }
+
+        return props.children;
     },
 
     wrapMenu(list: SettingsEntry[]) {

From 025193533d1baf0e37df236cbda97f2f539e8b20 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 8 May 2024 23:49:47 +0200
Subject: [PATCH 530/632] VoiceDownload: fix doing nothing on discord desktop
 app

---
 src/plugins/voiceDownload/index.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/plugins/voiceDownload/index.tsx b/src/plugins/voiceDownload/index.tsx
index 8586b9f91..571c3d0e9 100644
--- a/src/plugins/voiceDownload/index.tsx
+++ b/src/plugins/voiceDownload/index.tsx
@@ -28,9 +28,12 @@ export default definePlugin({
             <a
                 className="vc-voice-download"
                 href={src}
-                download="voice-message.ogg"
                 onClick={e => e.stopPropagation()}
                 aria-label="Download voice message"
+                {...IS_DISCORD_DESKTOP
+                    ? { target: "_blank" } // open externally
+                    : { download: "voice-message.ogg" } // download directly (not supported on discord desktop)
+                }
             >
                 <this.Icon />
             </a>

From 6bd0898efe489901178e45012a586c991947a068 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 8 May 2024 23:52:28 +0200
Subject: [PATCH 531/632] fix(SupportHelper): dont flag vencord web as
 externally updated

---
 src/plugins/_core/supportHelper.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/_core/supportHelper.tsx b/src/plugins/_core/supportHelper.tsx
index 63f32cbd2..c7377833a 100644
--- a/src/plugins/_core/supportHelper.tsx
+++ b/src/plugins/_core/supportHelper.tsx
@@ -139,7 +139,7 @@ ${makeCodeblock(enabledPlugins.join(", "))}
             const roles = GuildMemberStore.getSelfMember(VENCORD_GUILD_ID)?.roles;
             if (!roles || TrustedRolesIds.some(id => roles.includes(id))) return;
 
-            if (IS_UPDATER_DISABLED) {
+            if (!IS_WEB && IS_UPDATER_DISABLED) {
                 return Alerts.show({
                     title: "Hold on!",
                     body: <div>

From 840a8f1fdd6e9f16c8ac44a2f21b09fb873a141f Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 8 May 2024 18:37:27 -0300
Subject: [PATCH 532/632] CrashHandler: Increment timeout for trying to recover

---
 src/plugins/crashHandler/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/crashHandler/index.ts b/src/plugins/crashHandler/index.ts
index f8c76d7f7..10053021f 100644
--- a/src/plugins/crashHandler/index.ts
+++ b/src/plugins/crashHandler/index.ts
@@ -104,7 +104,7 @@ export default definePlugin({
 
                 shouldAttemptRecover = false;
                 // This is enough to avoid a crash loop
-                setTimeout(() => shouldAttemptRecover = true, 500);
+                setTimeout(() => shouldAttemptRecover = true, 1000);
             } catch { }
 
             try {

From a2acce55c34ddf3e0eafdfe7ecf747dcee859fb5 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 9 May 2024 03:04:03 +0200
Subject: [PATCH 533/632] BetterSettings: fix error handling crashing in some
 niche cases

---
 src/plugins/betterSettings/index.tsx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/plugins/betterSettings/index.tsx b/src/plugins/betterSettings/index.tsx
index 5836734ef..c9bf070fa 100644
--- a/src/plugins/betterSettings/index.tsx
+++ b/src/plugins/betterSettings/index.tsx
@@ -131,16 +131,11 @@ export default definePlugin({
     // try catch will only catch errors in the Layer function (hence why it's called as a plain function rather than a component), but
     // not in children
     Layer(props: LayerProps) {
-        try {
-            if (!FocusLock || !ComponentDispatch)
-                throw new Error("Failed to fetch some webpack modules");
-
-            return Layer(props);
-        } catch (e) {
-            new Logger("BetterSettings").error("Failed to render Layer", e);
+        if (!FocusLock || !ComponentDispatch) {
+            new Logger("BetterSettings").error("Failed to find some components");
         }
 
-        return props.children;
+        return <Layer {...props} />;
     },
 
     wrapMenu(list: SettingsEntry[]) {

From 251ee32e01ab70a6ec1c6a6a003c89682edca21b Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 9 May 2024 03:10:07 +0200
Subject: [PATCH 534/632] new plugin ShowTimeoutDuration ~ shows how much
 longer a user's timeout will last

---
 src/plugins/showTimeoutDuration/README.md  |   8 ++
 src/plugins/showTimeoutDuration/index.tsx  | 106 +++++++++++++++++++++
 src/plugins/showTimeoutDuration/styles.css |   4 +
 3 files changed, 118 insertions(+)
 create mode 100644 src/plugins/showTimeoutDuration/README.md
 create mode 100644 src/plugins/showTimeoutDuration/index.tsx
 create mode 100644 src/plugins/showTimeoutDuration/styles.css

diff --git a/src/plugins/showTimeoutDuration/README.md b/src/plugins/showTimeoutDuration/README.md
new file mode 100644
index 000000000..137802473
--- /dev/null
+++ b/src/plugins/showTimeoutDuration/README.md
@@ -0,0 +1,8 @@
+# ShowTimeoutDuration
+
+Displays how much longer a user's timeout will last.
+Either in the timeout icon tooltip, or next to it, configurable via settings!
+
+![indicator in tooltip](https://github.com/Vendicated/Vencord/assets/45497981/606588a3-2646-40d9-8800-b6307f650136)
+
+![indicator next to timeout icon](https://github.com/Vendicated/Vencord/assets/45497981/ab9d2101-0fdc-4143-9310-9488f056eeee)
diff --git a/src/plugins/showTimeoutDuration/index.tsx b/src/plugins/showTimeoutDuration/index.tsx
new file mode 100644
index 000000000..f57ee0fc9
--- /dev/null
+++ b/src/plugins/showTimeoutDuration/index.tsx
@@ -0,0 +1,106 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./styles.css";
+
+import { definePluginSettings } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import { Margins } from "@utils/margins";
+import definePlugin, { OptionType } from "@utils/types";
+import { findComponentLazy } from "@webpack";
+import { ChannelStore, Forms, GuildMemberStore, i18n, Text, Tooltip } from "@webpack/common";
+import { Message } from "discord-types/general";
+
+const CountDown = findComponentLazy(m => m.prototype?.render?.toString().includes(".MAX_AGE_NEVER"));
+
+const enum DisplayStyle {
+    Tooltip = "tooltip",
+    Inline = "ssalggnikool"
+}
+
+const settings = definePluginSettings({
+    displayStyle: {
+        description: "How to display the timeout duration",
+        type: OptionType.SELECT,
+        restartNeeded: true,
+        options: [
+            { label: "In the Tooltip", value: DisplayStyle.Tooltip },
+            { label: "Next to the timeout icon", value: DisplayStyle.Inline, default: true },
+        ],
+    }
+});
+
+function renderTimeout(message: Message, inline: boolean) {
+    const guildId = ChannelStore.getChannel(message.channel_id)?.guild_id;
+    if (!guildId) return null;
+
+    const member = GuildMemberStore.getMember(guildId, message.author.id);
+    if (!member?.communicationDisabledUntil) return null;
+
+    const countdown = () => (
+        <CountDown
+            deadline={new Date(member.communicationDisabledUntil!)}
+            showUnits
+            stopAtOneSec
+        />
+    );
+
+    return inline
+        ? countdown()
+        : i18n.Messages.GUILD_ENABLE_COMMUNICATION_TIME_REMAINING.format({
+            username: message.author.username,
+            countdown
+        });
+}
+
+export default definePlugin({
+    name: "ShowTimeoutDuration",
+    description: "Shows how much longer a user's timeout will last, either in the timeout icon tooltip or next to it",
+    authors: [Devs.Ven],
+
+    settings,
+
+    patches: [
+        {
+            find: ".GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY",
+            replacement: [
+                {
+                    match: /(\i)\.Tooltip,{(text:.{0,30}\.Messages\.GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY)/,
+                    get replace() {
+                        if (settings.store.displayStyle === DisplayStyle.Inline)
+                            return "$self.TooltipWrapper,{vcProps:arguments[0],$2";
+
+                        return "$1.Tooltip,{text:$self.renderTimeoutDuration(arguments[0])";
+                    }
+                }
+            ]
+        }
+    ],
+
+    renderTimeoutDuration: ErrorBoundary.wrap(({ message }: { message: Message; }) => {
+        return (
+            <>
+                <Forms.FormText>{i18n.Messages.GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY}</Forms.FormText>
+                <Forms.FormText className={Margins.top8}>
+                    {renderTimeout(message, false)}
+                </Forms.FormText>
+            </>
+        );
+    }, { noop: true }),
+
+    TooltipWrapper: ErrorBoundary.wrap(({ vcProps: { message }, ...tooltipProps }: { vcProps: { message: Message; }; }) => {
+        return (
+            <div className="vc-std-wrapper">
+                <Tooltip {...tooltipProps as any} />
+
+                <Text variant="text-md/normal" color="status-danger">
+                    {renderTimeout(message, true)} timeout remaining
+                </Text>
+            </div>
+        );
+    }, { noop: true })
+});
diff --git a/src/plugins/showTimeoutDuration/styles.css b/src/plugins/showTimeoutDuration/styles.css
new file mode 100644
index 000000000..70a826e10
--- /dev/null
+++ b/src/plugins/showTimeoutDuration/styles.css
@@ -0,0 +1,4 @@
+.vc-std-wrapper {
+    display: flex;
+    align-items: center;
+}

From 14e68d9a246006122d2b1a4e2a17a53d955cbbca Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 9 May 2024 03:12:11 +0200
Subject: [PATCH 535/632] im the dumbest dumdum

---
 src/plugins/betterSettings/index.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/betterSettings/index.tsx b/src/plugins/betterSettings/index.tsx
index c9bf070fa..5064bd538 100644
--- a/src/plugins/betterSettings/index.tsx
+++ b/src/plugins/betterSettings/index.tsx
@@ -9,14 +9,15 @@ import { classNameFactory } from "@api/Styles";
 import { Devs } from "@utils/constants";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { waitFor } from "@webpack";
 import { ComponentDispatch, FocusLock, i18n, Menu, useEffect, useRef } from "@webpack/common";
 import type { HTMLAttributes, ReactElement } from "react";
 
 type SettingsEntry = { section: string, label: string; };
 
 const cl = classNameFactory("");
-const Classes = findByPropsLazy("animating", "baseLayer", "bg", "layer", "layers");
+let Classes: Record<string, string>;
+waitFor(["animating", "baseLayer", "bg", "layer", "layers"], m => Classes = m);
 
 const settings = definePluginSettings({
     disableFade: {
@@ -131,8 +132,9 @@ export default definePlugin({
     // try catch will only catch errors in the Layer function (hence why it's called as a plain function rather than a component), but
     // not in children
     Layer(props: LayerProps) {
-        if (!FocusLock || !ComponentDispatch) {
+        if (!FocusLock || !ComponentDispatch || !Classes) {
             new Logger("BetterSettings").error("Failed to find some components");
+            return props.children;
         }
 
         return <Layer {...props} />;

From 1a3a378fb15adae9d0240773dd301ff88fe434da Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 9 May 2024 03:14:20 -0300
Subject: [PATCH 536/632] ErrorBoundary some more components

---
 src/plugins/betterNotes/index.tsx             |  5 ++++-
 .../imageZoom/components/Magnifier.tsx        |  5 +++--
 src/plugins/mutualGroupDMs/index.tsx          |  5 +++--
 src/plugins/pauseInvitesForever/index.tsx     | 20 ++++++++++---------
 .../readAllNotificationsButton/index.tsx      |  3 ++-
 src/plugins/showMeYourName/index.tsx          | 11 +++++-----
 6 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/plugins/betterNotes/index.tsx b/src/plugins/betterNotes/index.tsx
index 2183d98e2..5ebca1f8b 100644
--- a/src/plugins/betterNotes/index.tsx
+++ b/src/plugins/betterNotes/index.tsx
@@ -17,6 +17,7 @@
 */
 
 import { Settings } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { canonicalizeMatch } from "@utils/patches";
 import definePlugin, { OptionType } from "@utils/types";
@@ -83,7 +84,9 @@ export default definePlugin({
     patchPadding(lastSection: any) {
         if (!lastSection) return;
         return (
-            <div className={UserPopoutSectionCssClasses.lastSection}></div>
+            <ErrorBoundary noop>
+                <div className={UserPopoutSectionCssClasses.lastSection}></div>
+            </ErrorBoundary>
         );
     }
 });
diff --git a/src/plugins/imageZoom/components/Magnifier.tsx b/src/plugins/imageZoom/components/Magnifier.tsx
index 816717350..aadd0903a 100644
--- a/src/plugins/imageZoom/components/Magnifier.tsx
+++ b/src/plugins/imageZoom/components/Magnifier.tsx
@@ -17,6 +17,7 @@
 */
 
 import { classNameFactory } from "@api/Styles";
+import ErrorBoundary from "@components/ErrorBoundary";
 import { FluxDispatcher, React, useRef, useState } from "@webpack/common";
 
 import { ELEMENT_ID } from "../constants";
@@ -36,7 +37,7 @@ export interface MagnifierProps {
 
 const cl = classNameFactory("vc-imgzoom-");
 
-export const Magnifier: React.FC<MagnifierProps> = ({ instance, size: initialSize, zoom: initalZoom }) => {
+export const Magnifier = ErrorBoundary.wrap<MagnifierProps>(({ instance, size: initialSize, zoom: initalZoom }) => {
     const [ready, setReady] = useState(false);
 
     const [lensPosition, setLensPosition] = useState<Vec2>({ x: 0, y: 0 });
@@ -199,4 +200,4 @@ export const Magnifier: React.FC<MagnifierProps> = ({ instance, size: initialSiz
                 )}
         </div>
     );
-};
+}, { noop: true });
diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx
index 1753fefbc..e787fefb4 100644
--- a/src/plugins/mutualGroupDMs/index.tsx
+++ b/src/plugins/mutualGroupDMs/index.tsx
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { isNonNullish } from "@utils/guards";
 import definePlugin from "@utils/types";
@@ -60,7 +61,7 @@ export default definePlugin({
         }
     ],
 
-    renderMutualGDMs(user: User, onClose: () => void) {
+    renderMutualGDMs: ErrorBoundary.wrap((user: User, onClose: () => void) => {
         const entries = ChannelStore.getSortedPrivateChannels().filter(c => c.isGroupDM() && c.recipients.includes(user.id)).map(c => (
             <Clickable
                 className={ProfileListClasses.listRow}
@@ -99,5 +100,5 @@ export default definePlugin({
                 }
             </ScrollerThin>
         );
-    }
+    })
 });
diff --git a/src/plugins/pauseInvitesForever/index.tsx b/src/plugins/pauseInvitesForever/index.tsx
index 81f18fd6e..1e71a4ed1 100644
--- a/src/plugins/pauseInvitesForever/index.tsx
+++ b/src/plugins/pauseInvitesForever/index.tsx
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { GuildStore, RestAPI } from "@webpack/common";
+import { GuildStore, i18n, RestAPI } from "@webpack/common";
 
-const Messages = findByPropsLazy("GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION");
 const { InvitesDisabledExperiment } = findByPropsLazy("InvitesDisabledExperiment");
 
 export default definePlugin({
@@ -62,13 +62,15 @@ export default definePlugin({
 
     renderInvitesLabel(guildId: string, setChecked: Function) {
         return (
-            <div>
-                {Messages.GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION}
-                {this.showDisableInvites(guildId) && <a role="button" onClick={() => {
-                    setChecked(true);
-                    this.disableInvites(guildId);
-                }}> Pause Indefinitely.</a>}
-            </div>
+            <ErrorBoundary noop>
+                <div>
+                    {i18n.Messages.GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION}
+                    {this.showDisableInvites(guildId) && <a role="button" onClick={() => {
+                        setChecked(true);
+                        this.disableInvites(guildId);
+                    }}> Pause Indefinitely.</a>}
+                </div>
+            </ErrorBoundary>
         );
     }
 });
diff --git a/src/plugins/readAllNotificationsButton/index.tsx b/src/plugins/readAllNotificationsButton/index.tsx
index ae66e11a4..3bf53f993 100644
--- a/src/plugins/readAllNotificationsButton/index.tsx
+++ b/src/plugins/readAllNotificationsButton/index.tsx
@@ -19,6 +19,7 @@
 import "./style.css";
 
 import { addServerListElement, removeServerListElement, ServerListRenderPosition } from "@api/ServerList";
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { Button, FluxDispatcher, GuildChannelStore, GuildStore, React, ReadStateStore } from "@webpack/common";
@@ -64,7 +65,7 @@ export default definePlugin({
     authors: [Devs.kemo],
     dependencies: ["ServerListAPI"],
 
-    renderReadAllButton: () => <ReadAllButton />,
+    renderReadAllButton: ErrorBoundary.wrap(ReadAllButton, { noop: true }),
 
     start() {
         addServerListElement(ServerListRenderPosition.Above, this.renderReadAllButton);
diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx
index a9db1af9a..7ba245da5 100644
--- a/src/plugins/showMeYourName/index.tsx
+++ b/src/plugins/showMeYourName/index.tsx
@@ -7,6 +7,7 @@
 import "./styles.css";
 
 import { definePluginSettings } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { Message, User } from "discord-types/general";
@@ -56,7 +57,7 @@ export default definePlugin({
     ],
     settings,
 
-    renderUsername: ({ author, message, isRepliedMessage, withMentionPrefix, userOverride }: UsernameProps) => {
+    renderUsername: ErrorBoundary.wrap(({ author, message, isRepliedMessage, withMentionPrefix, userOverride }: UsernameProps) => {
         try {
             const user = userOverride ?? message.author;
             let { username } = user;
@@ -66,14 +67,14 @@ export default definePlugin({
             const { nick } = author;
             const prefix = withMentionPrefix ? "@" : "";
             if (username === nick || isRepliedMessage && !settings.store.inReplies)
-                return prefix + nick;
+                return <>{prefix}{nick}</>;
             if (settings.store.mode === "user-nick")
                 return <>{prefix}{username} <span className="vc-smyn-suffix">{nick}</span></>;
             if (settings.store.mode === "nick-user")
                 return <>{prefix}{nick} <span className="vc-smyn-suffix">{username}</span></>;
-            return prefix + username;
+            return <>{prefix}{username}</>;
         } catch {
-            return author?.nick;
+            return <>{author?.nick}</>;
         }
-    },
+    }, { noop: true }),
 });

From 395b0007bf15255f6c3e29586d4e56ffc16d3624 Mon Sep 17 00:00:00 2001
From: DShadow <62884000+CatGirlDShadow@users.noreply.github.com>
Date: Sat, 11 May 2024 18:43:34 +0300
Subject: [PATCH 537/632] permissionsViewer: add role & user context menus to
 copy id (#2436)

Co-authored-by: V <vendicated@riseup.net>
---
 .../components/RolesAndUsersPermissions.tsx   | 69 ++++++++++++++-----
 1 file changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
index c2e50cedd..963750fa3 100644
--- a/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx
@@ -21,7 +21,7 @@ import { Flex } from "@components/Flex";
 import { InfoIcon, OwnerCrownIcon } from "@components/Icons";
 import { getUniqueUsername } from "@utils/discord";
 import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { ContextMenuApi, FluxDispatcher, GuildMemberStore, GuildStore, Menu, PermissionsBits, Text, Tooltip, useEffect, UserStore, useState, useStateFromStores } from "@webpack/common";
+import { Clipboard, ContextMenuApi, FluxDispatcher, GuildMemberStore, GuildStore, i18n, Menu, PermissionsBits, Text, Tooltip, useEffect, UserStore, useState, useStateFromStores } from "@webpack/common";
 import type { Guild } from "discord-types/general";
 
 import { settings } from "..";
@@ -112,7 +112,7 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
                                         <div
                                             className={cl("perms-list-item", { "perms-list-item-active": selectedItemIndex === index })}
                                             onContextMenu={e => {
-                                                if ((settings.store as any).unsafeViewAsRole && permission.type === PermissionType.Role)
+                                                if (permission.type === PermissionType.Role)
                                                     ContextMenuApi.openContextMenu(e, () => (
                                                         <RoleContextMenu
                                                             guild={guild}
@@ -120,6 +120,14 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
                                                             onClose={modalProps.onClose}
                                                         />
                                                     ));
+                                                else if (permission.type === PermissionType.User) {
+                                                    ContextMenuApi.openContextMenu(e, () => (
+                                                        <UserContextMenu
+                                                            userId={permission.id!}
+                                                            onClose={modalProps.onClose}
+                                                        />
+                                                    ));
+                                                }
                                             }}
                                         >
                                             {(permission.type === PermissionType.Role || permission.type === PermissionType.Owner) && (
@@ -200,24 +208,53 @@ function RoleContextMenu({ guild, roleId, onClose }: { guild: Guild; roleId: str
             aria-label="Role Options"
         >
             <Menu.MenuItem
-                id="vc-pw-view-as-role"
-                label="View As Role"
+                id="vc-copy-role-id"
+                label={i18n.Messages.COPY_ID_ROLE}
                 action={() => {
-                    const role = GuildStore.getRole(guild.id, roleId);
-                    if (!role) return;
+                    Clipboard.copy(roleId);
+                }}
+            />
 
-                    onClose();
+            {(settings.store as any).unsafeViewAsRole && (
+                <Menu.MenuItem
+                    id="vc-pw-view-as-role"
+                    label={i18n.Messages.VIEW_AS_ROLE}
+                    action={() => {
+                        const role = GuildStore.getRole(guild.id, roleId);
+                        if (!role) return;
 
-                    FluxDispatcher.dispatch({
-                        type: "IMPERSONATE_UPDATE",
-                        guildId: guild.id,
-                        data: {
-                            type: "ROLES",
-                            roles: {
-                                [roleId]: role
+                        onClose();
+
+                        FluxDispatcher.dispatch({
+                            type: "IMPERSONATE_UPDATE",
+                            guildId: guild.id,
+                            data: {
+                                type: "ROLES",
+                                roles: {
+                                    [roleId]: role
+                                }
                             }
-                        }
-                    });
+                        });
+                    }
+                    }
+                />
+            )}
+        </Menu.Menu>
+    );
+}
+
+function UserContextMenu({ userId, onClose }: { userId: string; onClose: () => void; }) {
+    return (
+        <Menu.Menu
+            navId={cl("user-context-menu")}
+            onClose={ContextMenuApi.closeContextMenu}
+            aria-label="User Options"
+        >
+            <Menu.MenuItem
+                id="vc-copy-user-id"
+                label={i18n.Messages.COPY_ID_USER}
+                action={() => {
+                    Clipboard.copy(userId);
                 }}
             />
         </Menu.Menu>

From fbaa4ad5bcd32788a1d9f891be56dd71f93c9448 Mon Sep 17 00:00:00 2001
From: nyan <24845294+nyakowint@users.noreply.github.com>
Date: Sat, 11 May 2024 12:05:22 -0400
Subject: [PATCH 538/632] XSOverlay: add settings for different notification
 types (#2055)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/xsOverlay.desktop/index.ts | 69 ++++++++++++++++++--------
 1 file changed, 48 insertions(+), 21 deletions(-)

diff --git a/src/plugins/xsOverlay.desktop/index.ts b/src/plugins/xsOverlay.desktop/index.ts
index 763f6a782..b666d1168 100644
--- a/src/plugins/xsOverlay.desktop/index.ts
+++ b/src/plugins/xsOverlay.desktop/index.ts
@@ -1,6 +1,6 @@
 /*
  * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated and contributors
+ * Copyright (c) 2024 Vendicated and contributors
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
@@ -13,10 +13,7 @@ import { findByPropsLazy } from "@webpack";
 import { ChannelStore, GuildStore, UserStore } from "@webpack/common";
 import type { Channel, Embed, GuildMember, MessageAttachment, User } from "discord-types/general";
 
-const enum ChannelTypes {
-    DM = 1,
-    GROUP_DM = 3
-}
+const { ChannelTypes } = findByPropsLazy("ChannelTypes");
 
 interface Message {
     guild_id: string,
@@ -72,14 +69,35 @@ interface Call {
 }
 
 const MuteStore = findByPropsLazy("isSuppressEveryoneEnabled");
+const Notifs = findByPropsLazy("makeTextChatNotification");
 const XSLog = new Logger("XSOverlay");
 
 const settings = definePluginSettings({
-    ignoreBots: {
+    botNotifications: {
         type: OptionType.BOOLEAN,
-        description: "Ignore messages from bots",
+        description: "Allow bot notifications",
         default: false
     },
+    serverNotifications: {
+        type: OptionType.BOOLEAN,
+        description: "Allow server notifications",
+        default: true
+    },
+    dmNotifications: {
+        type: OptionType.BOOLEAN,
+        description: "Allow Direct Message notifications",
+        default: true
+    },
+    groupDmNotifications: {
+        type: OptionType.BOOLEAN,
+        description: "Allow Group DM notifications",
+        default: true
+    },
+    callNotifications: {
+        type: OptionType.BOOLEAN,
+        description: "Allow call notifications",
+        default: true
+    },
     pingColor: {
         type: OptionType.STRING,
         description: "User mention color",
@@ -100,6 +118,11 @@ const settings = definePluginSettings({
         description: "Notif duration (secs)",
         default: 1.0,
     },
+    timeoutPerCharacter: {
+        type: OptionType.NUMBER,
+        description: "Duration multiplier per character",
+        default: 0.5
+    },
     opacity: {
         type: OptionType.SLIDER,
         description: "Notif opacity",
@@ -124,7 +147,7 @@ export default definePlugin({
     settings,
     flux: {
         CALL_UPDATE({ call }: { call: Call; }) {
-            if (call?.ringing?.includes(UserStore.getCurrentUser().id)) {
+            if (call?.ringing?.includes(UserStore.getCurrentUser().id) && settings.store.callNotifications) {
                 const channel = ChannelStore.getChannel(call.channel_id);
                 sendOtherNotif("Incoming call", `${channel.name} is calling you...`);
             }
@@ -134,7 +157,7 @@ export default definePlugin({
             try {
                 if (optimistic) return;
                 const channel = ChannelStore.getChannel(message.channel_id);
-                if (!shouldNotify(message, channel)) return;
+                if (!shouldNotify(message, message.channel_id)) return;
 
                 const pingColor = settings.store.pingColor.replaceAll("#", "").trim();
                 const channelPingColor = settings.store.channelPingColor.replaceAll("#", "").trim();
@@ -194,6 +217,7 @@ export default definePlugin({
                     finalMsg = finalMsg.replace(/<@!?(\d{17,20})>/g, (_, id) => `<color=#${pingColor}><b>@${UserStore.getUser(id)?.username || "unknown-user"}</color></b>`);
                 }
 
+                // color role mentions (unity styling btw lol)
                 if (message.mention_roles.length > 0) {
                     for (const roleId of message.mention_roles) {
                         const role = GuildStore.getRole(channel.guild_id, roleId);
@@ -213,6 +237,7 @@ export default definePlugin({
                     }
                 }
 
+                // color channel mentions
                 if (channelMatches) {
                     for (const cMatch of channelMatches) {
                         let channelId = cMatch.split("<#")[1];
@@ -221,6 +246,7 @@ export default definePlugin({
                     }
                 }
 
+                if (shouldIgnoreForChannelType(channel)) return;
                 sendMsgNotif(titleString, finalMsg, message);
             } catch (err) {
                 XSLog.error(`Failed to catch MESSAGE_CREATE: ${err}`);
@@ -229,13 +255,20 @@ export default definePlugin({
     }
 });
 
+function shouldIgnoreForChannelType(channel: Channel) {
+    if (channel.type === ChannelTypes.DM && settings.store.dmNotifications) return false;
+    if (channel.type === ChannelTypes.GROUP_DM && settings.store.groupDmNotifications) return false;
+    else return !settings.store.serverNotifications;
+}
+
 function sendMsgNotif(titleString: string, content: string, message: Message) {
+    const timeout = Math.max(settings.store.timeout, content.length * settings.store.timeoutPerCharacter);
     fetch(`https://cdn.discordapp.com/avatars/${message.author.id}/${message.author.avatar}.png?size=128`).then(response => response.arrayBuffer()).then(result => {
         const msgData = {
             messageType: 1,
             index: 0,
-            timeout: settings.store.timeout,
-            height: calculateHeight(cleanMessage(content)),
+            timeout,
+            height: calculateHeight(content),
             opacity: settings.store.opacity,
             volume: settings.store.volume,
             audioPath: settings.store.soundPath,
@@ -254,7 +287,7 @@ function sendOtherNotif(content: string, titleString: string) {
         messageType: 1,
         index: 0,
         timeout: settings.store.timeout,
-        height: calculateHeight(cleanMessage(content)),
+        height: calculateHeight(content),
         opacity: settings.store.opacity,
         volume: settings.store.volume,
         audioPath: settings.store.soundPath,
@@ -267,13 +300,11 @@ function sendOtherNotif(content: string, titleString: string) {
     Native.sendToOverlay(msgData);
 }
 
-function shouldNotify(message: Message, channel: Channel) {
+function shouldNotify(message: Message, channel: string) {
     const currentUser = UserStore.getCurrentUser();
     if (message.author.id === currentUser.id) return false;
-    if (message.author.bot && settings.store.ignoreBots) return false;
-    if (MuteStore.allowAllMessages(channel) || message.mention_everyone && !MuteStore.isSuppressEveryoneEnabled(message.guild_id)) return true;
-
-    return message.mentions.some(m => m.id === currentUser.id);
+    if (message.author.bot && !settings.store.botNotifications) return false;
+    return Notifs.shouldNotify(message, channel);
 }
 
 function calculateHeight(content: string) {
@@ -282,7 +313,3 @@ function calculateHeight(content: string) {
     if (content.length <= 300) return 200;
     return 250;
 }
-
-function cleanMessage(content: string) {
-    return content.replace(new RegExp("<[^>]*>", "g"), "");
-}

From 6b88eaccbb82dee8ff4bedbc29adad7cd1782be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Han=20Seung=20Min=20-=20=ED=95=9C=EC=8A=B9=EB=AF=BC?=
 <hanseungmin.ar@gmail.com>
Date: Sun, 12 May 2024 01:09:48 +0900
Subject: [PATCH 539/632] messageLatency: fix grammar & add aliucord/kotlin
 client tooltip (#2426)

---
 src/plugins/messageLatency/index.tsx | 35 ++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/plugins/messageLatency/index.tsx b/src/plugins/messageLatency/index.tsx
index 0b6d75033..48b57863e 100644
--- a/src/plugins/messageLatency/index.tsx
+++ b/src/plugins/messageLatency/index.tsx
@@ -13,7 +13,7 @@ import { findExportedComponentLazy } from "@webpack";
 import { SnowflakeUtils, Tooltip } from "@webpack/common";
 import { Message } from "discord-types/general";
 
-type FillValue = ("status-danger" | "status-warning" | "text-muted");
+type FillValue = ("status-danger" | "status-warning" | "status-positive" | "text-muted");
 type Fill = [FillValue, FillValue, FillValue];
 type DiffKey = keyof Diff;
 
@@ -54,10 +54,24 @@ export default definePlugin({
             seconds: Math.round(delta % 60),
         };
 
-        const str = (k: DiffKey) => diff[k] > 0 ? `${diff[k]} ${k}` : null;
+        const str = (k: DiffKey) => diff[k] > 0 ? `${diff[k]} ${diff[k] > 1 ? k : k.substring(0, k.length - 1)}` : null;
         const keys = Object.keys(diff) as DiffKey[];
 
-        return keys.map(str).filter(isNonNullish).join(" ") || "0 seconds";
+        const ts = keys.reduce((prev, k) => {
+            const s = str(k);
+
+            return prev + (
+                isNonNullish(s)
+                    ? (prev !== ""
+                        ? k === "seconds"
+                            ? " and "
+                            : " "
+                        : "") + s
+                    : ""
+            );
+        }, "");
+
+        return [ts || "0 seconds", diff.days === 17 && diff.hours === 1] as const;
     },
     latencyTooltipData(message: Message) {
         const { id, nonce } = message;
@@ -73,16 +87,23 @@ export default definePlugin({
         const abs = Math.abs(delta);
         const ahead = abs !== delta;
 
-        const stringDelta = this.stringDelta(abs);
+        const [stringDelta, isSuspectedKotlinDiscord] = this.stringDelta(abs);
+        const isKotlinDiscord = ahead && isSuspectedKotlinDiscord;
 
         // Also thanks dziurwa
         // 2 minutes
         const TROLL_LIMIT = 2 * 60;
         const { latency } = this.settings.store;
 
-        const fill: Fill = delta >= TROLL_LIMIT || ahead ? ["text-muted", "text-muted", "text-muted"] : delta >= (latency * 2) ? ["status-danger", "text-muted", "text-muted"] : ["status-warning", "status-warning", "text-muted"];
+        const fill: Fill = isKotlinDiscord
+            ? ["status-positive", "status-positive", "text-muted"]
+            : delta >= TROLL_LIMIT || ahead
+                ? ["text-muted", "text-muted", "text-muted"]
+                : delta >= (latency * 2)
+                    ? ["status-danger", "text-muted", "text-muted"]
+                    : ["status-warning", "status-warning", "text-muted"];
 
-        return abs >= latency ? { delta: stringDelta, ahead: abs !== delta, fill } : null;
+        return abs >= latency ? { delta: stringDelta, ahead, fill, isKotlinDiscord } : null;
     },
     Tooltip() {
         return ErrorBoundary.wrap(({ message }: { message: Message; }) => {
@@ -92,7 +113,7 @@ export default definePlugin({
             if (!isNonNullish(d)) return null;
 
             return <Tooltip
-                text={d.ahead ? `This user's clock is ${d.delta} ahead` : `This message was sent with a delay of ${d.delta}.`}
+                text={d.ahead ? `This user's clock is ${d.delta} ahead. ${d.isKotlinDiscord ? "User is suspected to be on an old mobile client" : ""}` : `This message was sent with a delay of ${d.delta}.`}
                 position="top"
             >
                 {

From 2eb8ba18410188715ecdeea80b4b5b046204e153 Mon Sep 17 00:00:00 2001
From: Im_Banana <67657872+ImBonana@users.noreply.github.com>
Date: Sat, 11 May 2024 23:49:00 +0300
Subject: [PATCH 540/632] SilentTyping: add chat input context menu option to
 toggle (#2386)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/silentTyping/index.tsx | 36 +++++++++++++++++++++++++++---
 src/utils/constants.ts             |  4 ++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/plugins/silentTyping/index.tsx b/src/plugins/silentTyping/index.tsx
index 8b59c6ace..2a6a64283 100644
--- a/src/plugins/silentTyping/index.tsx
+++ b/src/plugins/silentTyping/index.tsx
@@ -18,10 +18,11 @@
 
 import { addChatBarButton, ChatBarButton, removeChatBarButton } from "@api/ChatButtons";
 import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, sendBotMessage } from "@api/Commands";
+import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { FluxDispatcher, React } from "@webpack/common";
+import { FluxDispatcher, Menu, React } from "@webpack/common";
 
 const settings = definePluginSettings({
     showIcon: {
@@ -30,6 +31,11 @@ const settings = definePluginSettings({
         description: "Show an icon for toggling the plugin",
         restartNeeded: true,
     },
+    contextMenu: {
+        type: OptionType.BOOLEAN,
+        description: "Add option to toggle the functionality in the chat input context menu",
+        default: true
+    },
     isEnabled: {
         type: OptionType.BOOLEAN,
         description: "Toggle functionality",
@@ -56,13 +62,37 @@ const SilentTypingToggle: ChatBarButton = ({ isMainChat }) => {
     );
 };
 
+
+const ChatBarContextCheckbox: NavContextMenuPatchCallback = children => {
+    const { isEnabled, contextMenu } = settings.use(["isEnabled", "contextMenu"]);
+    if (!contextMenu) return;
+
+    const group = findGroupChildrenByChildId("submit-button", children);
+
+    if (!group) return;
+
+    const idx = group.findIndex(c => c?.props?.id === "submit-button");
+
+    group.splice(idx + 1, 0,
+        <Menu.MenuCheckboxItem
+            id="vc-silent-typing"
+            label="Enable Silent Typing"
+            checked={isEnabled}
+            action={() => settings.store.isEnabled = !settings.store.isEnabled}
+        />
+    );
+};
+
+
 export default definePlugin({
     name: "SilentTyping",
-    authors: [Devs.Ven, Devs.Rini],
+    authors: [Devs.Ven, Devs.Rini, Devs.ImBanana],
     description: "Hide that you are typing",
     dependencies: ["CommandsAPI", "ChatInputButtonAPI"],
     settings,
-
+    contextMenus: {
+        "textarea-context": ChatBarContextCheckbox
+    },
     patches: [
         {
             find: '.dispatch({type:"TYPING_START_LOCAL"',
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index a0c4752dc..6d9950a98 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -461,6 +461,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     GabiRP: {
         name: "GabiRP",
         id: 507955112027750401n
+    },
+    ImBanana: {
+        name: "Im_Banana",
+        id: 635250116688871425n
     }
 } satisfies Record<string, Dev>);
 

From 9b328da4ce2363fa0e9e2fc24795d09597df1ab7 Mon Sep 17 00:00:00 2001
From: Overcast Warmth System
 <110815694+OvercastWarmth@users.noreply.github.com>
Date: Sun, 12 May 2024 06:57:48 +1000
Subject: [PATCH 541/632] ThemeAttributes: add data-author-username to messages
 (#2422)

---
 src/plugins/themeAttributes/README.md | 1 +
 src/plugins/themeAttributes/index.ts  | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/themeAttributes/README.md b/src/plugins/themeAttributes/README.md
index 110eca574..87cb803c5 100644
--- a/src/plugins/themeAttributes/README.md
+++ b/src/plugins/themeAttributes/README.md
@@ -15,6 +15,7 @@ This allows themes to more easily theme those elements or even do things that ot
 ### Chat Messages
 
 - `data-author-id` contains the id of the author
+- `data-author-username` contains the username of the author
 - `data-is-self` is a boolean indicating whether this is the current user's message
 
 ![image](https://github.com/Vendicated/Vencord/assets/45497981/34bd5053-3381-402f-82b2-9c812cc7e122)
diff --git a/src/plugins/themeAttributes/index.ts b/src/plugins/themeAttributes/index.ts
index 8afc2121f..b8ceac621 100644
--- a/src/plugins/themeAttributes/index.ts
+++ b/src/plugins/themeAttributes/index.ts
@@ -36,10 +36,12 @@ export default definePlugin({
     ],
 
     getMessageProps(props: { message: Message; }) {
-        const authorId = props.message?.author?.id;
+        const author = props.message?.author;
+        const authorId = author?.id;
         return {
             "data-author-id": authorId,
-            "data-is-self": authorId && authorId === UserStore.getCurrentUser()?.id
+            "data-author-username": author?.username,
+            "data-is-self": authorId && authorId === UserStore.getCurrentUser()?.id,
         };
     }
 });

From 207fe846367afc7ed75104968e52d47550a1cc08 Mon Sep 17 00:00:00 2001
From: nin0dev <personal@nin0dev.com>
Date: Sat, 11 May 2024 17:29:31 -0400
Subject: [PATCH 542/632] CustomRPC: show warning when game activity is
 disabled (#2245)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/customRPC/index.tsx | 30 +++++++++++++++++++++++++++---
 src/utils/constants.ts          |  4 ++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/plugins/customRPC/index.tsx b/src/plugins/customRPC/index.tsx
index 334372e38..f1b2fbf53 100644
--- a/src/plugins/customRPC/index.tsx
+++ b/src/plugins/customRPC/index.tsx
@@ -17,13 +17,16 @@
 */
 
 import { definePluginSettings, Settings } from "@api/Settings";
+import { ErrorCard } from "@components/ErrorCard";
 import { Link } from "@components/Link";
 import { Devs } from "@utils/constants";
 import { isTruthy } from "@utils/guards";
+import { Margins } from "@utils/margins";
+import { classes } from "@utils/misc";
 import { useAwaiter } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy, findComponentByCodeLazy } from "@webpack";
-import { ApplicationAssetUtils, FluxDispatcher, Forms, GuildStore, React, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common";
+import { ApplicationAssetUtils, Button, FluxDispatcher, Forms, GuildStore, React, SelectedChannelStore, SelectedGuildStore, StatusSettingsStores, UserStore } from "@webpack/common";
 
 const useProfileThemeStyle = findByCodeLazy("profileThemeStyle:", "--profile-gradient-primary-color");
 const ActivityComponent = findComponentByCodeLazy("onOpenGameProfile");
@@ -386,17 +389,36 @@ async function setRpc(disable?: boolean) {
 export default definePlugin({
     name: "CustomRPC",
     description: "Allows you to set a custom rich presence.",
-    authors: [Devs.captain, Devs.AutumnVN],
+    authors: [Devs.captain, Devs.AutumnVN, Devs.nin0dev],
     start: setRpc,
     stop: () => setRpc(true),
     settings,
 
     settingsAboutComponent: () => {
         const activity = useAwaiter(createActivity);
+        const gameActivityEnabled = StatusSettingsStores.ShowCurrentGame.useSetting();
         const { profileThemeStyle } = useProfileThemeStyle({});
 
         return (
             <>
+                {!gameActivityEnabled && (
+                    <ErrorCard
+                        className={classes(Margins.top16, Margins.bottom16)}
+                        style={{ padding: "1em" }}
+                    >
+                        <Forms.FormTitle>Notice</Forms.FormTitle>
+                        <Forms.FormText>Game activity isn't enabled, people won't be able to see your custom rich presence!</Forms.FormText>
+
+                        <Button
+                            color={Button.Colors.TRANSPARENT}
+                            className={Margins.top8}
+                            onClick={() => StatusSettingsStores.ShowCurrentGame.updateSetting(true)}
+                        >
+                            Enable
+                        </Button>
+                    </ErrorCard>
+                )}
+
                 <Forms.FormText>
                     Go to <Link href="https://discord.com/developers/applications">Discord Developer Portal</Link> to create an application and
                     get the application ID.
@@ -407,7 +429,9 @@ export default definePlugin({
                 <Forms.FormText>
                     If you want to use image link, download your image and reupload the image to <Link href="https://imgur.com">Imgur</Link> and get the image link by right-clicking the image and select "Copy image address".
                 </Forms.FormText>
-                <Forms.FormDivider />
+
+                <Forms.FormDivider className={Margins.top8} />
+
                 <div style={{ width: "284px", ...profileThemeStyle }}>
                     {activity[0] && <ActivityComponent activity={activity[0]} className={ActivityClassName.activity} channelId={SelectedChannelStore.getChannelId()}
                         guild={GuildStore.getGuild(SelectedGuildStore.getLastSelectedGuildId())}
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 6d9950a98..09c27d15f 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -418,6 +418,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Kyuuhachi",
         id: 236588665420251137n,
     },
+    nin0dev: {
+        name: "nin0dev",
+        id: 886685857560539176n
+    },
     Elvyra: {
         name: "Elvyra",
         id: 708275751816003615n,

From c55b0de30c5c382850ce0a48d9bbcf150250f250 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 11 May 2024 18:34:47 -0300
Subject: [PATCH 543/632] FakeNitro: Update description

---
 src/plugins/fakeNitro/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 03feda0a8..ea171c833 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -190,7 +190,7 @@ const hasAttachmentPerms = (channelId: string) => hasPermission(channelId, Permi
 export default definePlugin({
     name: "FakeNitro",
     authors: [Devs.Arjix, Devs.D3SOX, Devs.Ven, Devs.fawn, Devs.captain, Devs.Nuckyz, Devs.AutumnVN],
-    description: "Allows you to stream in nitro quality, send fake emojis/stickers and use client themes.",
+    description: "Allows you to stream in nitro quality, send fake emojis/stickers, use client themes and custom Discord notifications.",
     dependencies: ["MessageEventsAPI"],
 
     settings,

From cc5e39c9a96aca4dfbd29f83e7377f942888dc1b Mon Sep 17 00:00:00 2001
From: Fafa <87046111+Faf4a@users.noreply.github.com>
Date: Sat, 11 May 2024 23:50:29 +0200
Subject: [PATCH 544/632] Dearrow: allow configuring which elements get
 dearrowd (#2414)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/dearrow/index.tsx | 38 +++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/plugins/dearrow/index.tsx b/src/plugins/dearrow/index.tsx
index b02c80d3d..888e2bb45 100644
--- a/src/plugins/dearrow/index.tsx
+++ b/src/plugins/dearrow/index.tsx
@@ -6,10 +6,11 @@
 
 import "./styles.css";
 
+import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { Logger } from "@utils/Logger";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 import { Tooltip } from "@webpack/common";
 import type { Component } from "react";
 
@@ -34,11 +35,19 @@ interface Props {
     };
 }
 
+const enum ReplaceElements {
+    ReplaceAllElements,
+    ReplaceTitlesOnly,
+    ReplaceThumbnailsOnly
+}
+
 const embedUrlRe = /https:\/\/www\.youtube\.com\/embed\/([a-zA-Z0-9_-]{11})/;
 
 async function embedDidMount(this: Component<Props>) {
     try {
         const { embed } = this.props;
+        const { replaceElements } = settings.store;
+
         if (!embed || embed.dearrow || embed.provider?.name !== "YouTube" || !embed.video?.url) return;
 
         const videoId = embedUrlRe.exec(embed.video.url)?.[1];
@@ -58,12 +67,12 @@ async function embedDidMount(this: Component<Props>) {
             enabled: true
         };
 
-        if (hasTitle) {
+        if (hasTitle && replaceElements !== ReplaceElements.ReplaceThumbnailsOnly) {
             embed.dearrow.oldTitle = embed.rawTitle;
             embed.rawTitle = titles[0].title.replace(/ >(\S)/g, " $1");
         }
 
-        if (hasThumb) {
+        if (hasThumb && replaceElements !== ReplaceElements.ReplaceTitlesOnly) {
             embed.dearrow.oldThumb = embed.thumbnail.proxyURL;
             embed.thumbnail.proxyURL = `https://dearrow-thumb.ajay.app/api/v1/getThumbnail?videoID=${videoId}&time=${thumbnails[0].timestamp}`;
         }
@@ -128,10 +137,30 @@ function DearrowButton({ component }: { component: Component<Props>; }) {
     );
 }
 
+const settings = definePluginSettings({
+    hideButton: {
+        description: "Hides the Dearrow button from YouTube embeds",
+        type: OptionType.BOOLEAN,
+        default: false,
+        restartNeeded: true
+    },
+    replaceElements: {
+        description: "Choose which elements of the embed will be replaced",
+        type: OptionType.SELECT,
+        restartNeeded: true,
+        options: [
+            { label: "Everything (Titles & Thumbnails)", value: ReplaceElements.ReplaceAllElements, default: true },
+            { label: "Titles", value: ReplaceElements.ReplaceTitlesOnly },
+            { label: "Thumbnails", value: ReplaceElements.ReplaceThumbnailsOnly },
+        ],
+    }
+});
+
 export default definePlugin({
     name: "Dearrow",
     description: "Makes YouTube embed titles and thumbnails less sensationalist, powered by Dearrow",
     authors: [Devs.Ven],
+    settings,
 
     embedDidMount,
     renderButton(component: Component<Props>) {
@@ -154,7 +183,8 @@ export default definePlugin({
             // add dearrow button
             {
                 match: /children:\[(?=null!=\i\?\i\.renderSuppressButton)/,
-                replace: "children:[$self.renderButton(this),"
+                replace: "children:[$self.renderButton(this),",
+                predicate: () => !settings.store.hideButton
             }
         ]
     }],

From b22bfc80fdafcca52b5b547b4fa74212fba82283 Mon Sep 17 00:00:00 2001
From: Elvyra <88881326+EdVraz@users.noreply.github.com>
Date: Sun, 12 May 2024 01:23:51 +0200
Subject: [PATCH 545/632] pronounDB: Update to API v2 (#2355)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/pronoundb/index.ts          |  2 +-
 src/plugins/pronoundb/pronoundbUtils.ts | 44 ++++++++++++++-----------
 src/plugins/pronoundb/types.ts          | 34 +++++++++----------
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/src/plugins/pronoundb/index.ts b/src/plugins/pronoundb/index.ts
index b14b26572..a5891d2e8 100644
--- a/src/plugins/pronoundb/index.ts
+++ b/src/plugins/pronoundb/index.ts
@@ -33,7 +33,7 @@ const PRONOUN_TOOLTIP_PATCH = {
 
 export default definePlugin({
     name: "PronounDB",
-    authors: [Devs.Tyman, Devs.TheKodeToad, Devs.Ven],
+    authors: [Devs.Tyman, Devs.TheKodeToad, Devs.Ven, Devs.Elvyra],
     description: "Adds pronouns to user messages using pronoundb",
     patches: [
         {
diff --git a/src/plugins/pronoundb/pronoundbUtils.ts b/src/plugins/pronoundb/pronoundbUtils.ts
index 6373c56a0..d4fdb09d3 100644
--- a/src/plugins/pronoundb/pronoundbUtils.ts
+++ b/src/plugins/pronoundb/pronoundbUtils.ts
@@ -24,7 +24,7 @@ import { useAwaiter } from "@utils/react";
 import { UserProfileStore, UserStore } from "@webpack/common";
 
 import { settings } from "./settings";
-import { PronounCode, PronounMapping, PronounsResponse } from "./types";
+import { CachePronouns, PronounCode, PronounMapping, PronounsResponse } from "./types";
 
 type PronounsWithSource = [string | null, string];
 const EmptyPronouns: PronounsWithSource = [null, ""];
@@ -40,9 +40,9 @@ export const enum PronounSource {
 }
 
 // A map of cached pronouns so the same request isn't sent twice
-const cache: Record<string, PronounCode> = {};
+const cache: Record<string, CachePronouns> = {};
 // A map of ids and callbacks that should be triggered on fetch
-const requestQueue: Record<string, ((pronouns: PronounCode) => void)[]> = {};
+const requestQueue: Record<string, ((pronouns: string) => void)[]> = {};
 
 // Executes all queued requests and calls their callbacks
 const bulkFetch = debounce(async () => {
@@ -50,7 +50,7 @@ const bulkFetch = debounce(async () => {
     const pronouns = await bulkFetchPronouns(ids);
     for (const id of ids) {
         // Call all callbacks for the id
-        requestQueue[id]?.forEach(c => c(pronouns[id]));
+        requestQueue[id]?.forEach(c => c(pronouns[id] ? extractPronouns(pronouns[id].sets) : ""));
         delete requestQueue[id];
     }
 });
@@ -78,8 +78,8 @@ export function useFormattedPronouns(id: string, useGlobalProfile: boolean = fal
     if (settings.store.pronounSource === PronounSource.PreferDiscord && discordPronouns)
         return [discordPronouns, "Discord"];
 
-    if (result && result !== "unspecified")
-        return [formatPronouns(result), "PronounDB"];
+    if (result && result !== PronounMapping.unspecified)
+        return [result, "PronounDB"];
 
     return [discordPronouns, "Discord"];
 }
@@ -98,8 +98,9 @@ const NewLineRe = /\n+/g;
 
 // Gets the cached pronouns, if you're too impatient for a promise!
 export function getCachedPronouns(id: string): string | null {
-    const cached = cache[id];
-    if (cached && cached !== "unspecified") return cached;
+    const cached = cache[id] ? extractPronouns(cache[id].sets) : undefined;
+
+    if (cached && cached !== PronounMapping.unspecified) return cached;
 
     return cached || null;
 }
@@ -125,7 +126,7 @@ async function bulkFetchPronouns(ids: string[]): Promise<PronounsResponse> {
     params.append("ids", ids.join(","));
 
     try {
-        const req = await fetch("https://pronoundb.org/api/v1/lookup-bulk?" + params.toString(), {
+        const req = await fetch("https://pronoundb.org/api/v2/lookup?" + params.toString(), {
             method: "GET",
             headers: {
                 "Accept": "application/json",
@@ -140,21 +141,24 @@ async function bulkFetchPronouns(ids: string[]): Promise<PronounsResponse> {
     } catch (e) {
         // If the request errors, treat it as if no pronouns were found for all ids, and log it
         console.error("PronounDB fetching failed: ", e);
-        const dummyPronouns = Object.fromEntries(ids.map(id => [id, "unspecified"] as const));
+        const dummyPronouns = Object.fromEntries(ids.map(id => [id, { sets: {} }] as const));
         Object.assign(cache, dummyPronouns);
         return dummyPronouns;
     }
 }
 
-export function formatPronouns(pronouns: string): string {
+export function extractPronouns(pronounSet?: { [locale: string]: PronounCode[] }): string {
+    if (!pronounSet || !pronounSet.en) return PronounMapping.unspecified;
+    // PronounDB returns an empty set instead of {sets: {en: ["unspecified"]}}.
+    const pronouns = pronounSet.en;
     const { pronounsFormat } = Settings.plugins.PronounDB as { pronounsFormat: PronounsFormat, enabled: boolean; };
-    // For capitalized pronouns, just return the mapping (it is by default capitalized)
-    if (pronounsFormat === PronounsFormat.Capitalized) return PronounMapping[pronouns];
-    // If it is set to lowercase and a special code (any, ask, avoid), then just return the capitalized text
-    else if (
-        pronounsFormat === PronounsFormat.Lowercase
-        && ["any", "ask", "avoid", "other"].includes(pronouns)
-    ) return PronounMapping[pronouns];
-    // Otherwise (lowercase and not a special code), then convert the mapping to lowercase
-    else return PronounMapping[pronouns].toLowerCase();
+
+    if (pronouns.length === 1) {
+        // For capitalized pronouns or special codes (any, ask, avoid), we always return the normal (capitalized) string
+        if (pronounsFormat === PronounsFormat.Capitalized || ["any", "ask", "avoid", "other", "unspecified"].includes(pronouns[0]))
+            return PronounMapping[pronouns[0]];
+        else return PronounMapping[pronouns[0]].toLowerCase();
+    }
+    const pronounString = pronouns.map(p => p[0].toUpperCase() + p.slice(1)).join("/");
+    return pronounsFormat === PronounsFormat.Capitalized ? pronounString : pronounString.toLowerCase();
 }
diff --git a/src/plugins/pronoundb/types.ts b/src/plugins/pronoundb/types.ts
index 9cfd77c8a..d099a7de8 100644
--- a/src/plugins/pronoundb/types.ts
+++ b/src/plugins/pronoundb/types.ts
@@ -26,31 +26,29 @@ export interface UserProfilePronounsProps {
 }
 
 export interface PronounsResponse {
-    [id: string]: PronounCode;
+    [id: string]: {
+        sets?: {
+            [locale: string]: PronounCode[];
+        }
+    }
+}
+
+export interface CachePronouns {
+    sets?: {
+        [locale: string]: PronounCode[];
+    }
 }
 
 export type PronounCode = keyof typeof PronounMapping;
 
 export const PronounMapping = {
-    hh: "He/Him",
-    hi: "He/It",
-    hs: "He/She",
-    ht: "He/They",
-    ih: "It/Him",
-    ii: "It/Its",
-    is: "It/She",
-    it: "It/They",
-    shh: "She/He",
-    sh: "She/Her",
-    si: "She/It",
-    st: "She/They",
-    th: "They/He",
-    ti: "They/It",
-    ts: "They/She",
-    tt: "They/Them",
+    he: "He/Him",
+    it: "It/Its",
+    she: "She/Her",
+    they: "They/Them",
     any: "Any pronouns",
     other: "Other pronouns",
     ask: "Ask me my pronouns",
     avoid: "Avoid pronouns, use my name",
-    unspecified: "Unspecified"
+    unspecified: "No pronouns specified.",
 } as const;

From 0f9acba59ed4096eb6fc6a73da3c4c252c494c21 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 12 May 2024 02:00:29 +0200
Subject: [PATCH 546/632] settingsSync: include date in filename for better
 sorting

Co-authored-by: cd CreepArghhh_ <65649991+cd-CreepArghhh@users.noreply.github.com>
---
 src/plugins/fakeNitro/index.tsx | 4 ++--
 src/utils/settingsSync.ts       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index ea171c833..087928e9f 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -111,7 +111,7 @@ const hyperLinkRegex = /\[.+?\]\((https?:\/\/.+?)\)/;
 
 const settings = definePluginSettings({
     enableEmojiBypass: {
-        description: "Allow sending fake emojis",
+        description: "Allows sending fake emojis (also bypasses missing permission to use custom emojis)",
         type: OptionType.BOOLEAN,
         default: true,
         restartNeeded: true
@@ -129,7 +129,7 @@ const settings = definePluginSettings({
         restartNeeded: true
     },
     enableStickerBypass: {
-        description: "Allow sending fake stickers",
+        description: "Allows sending fake stickers (also bypasses missing permission to use stickers)",
         type: OptionType.BOOLEAN,
         default: true,
         restartNeeded: true
diff --git a/src/utils/settingsSync.ts b/src/utils/settingsSync.ts
index 843922f2f..f19928ac4 100644
--- a/src/utils/settingsSync.ts
+++ b/src/utils/settingsSync.ts
@@ -18,7 +18,7 @@
 
 import { showNotification } from "@api/Notifications";
 import { PlainSettings, Settings } from "@api/Settings";
-import { Toasts } from "@webpack/common";
+import { moment, Toasts } from "@webpack/common";
 import { deflateSync, inflateSync } from "fflate";
 
 import { getCloudAuth, getCloudUrl } from "./cloud";
@@ -49,7 +49,7 @@ export async function exportSettings({ minify }: { minify?: boolean; } = {}) {
 }
 
 export async function downloadSettingsBackup() {
-    const filename = "vencord-settings-backup.json";
+    const filename = `vencord-settings-backup-${moment().format("YYYY-MM-DD")}.json`;
     const backup = await exportSettings();
     const data = new TextEncoder().encode(backup);
 

From f21db5cb011202a50dc6b7fd5695e15e5dea564c Mon Sep 17 00:00:00 2001
From: Claire <MachineMuse@users.noreply.github.com>
Date: Sat, 11 May 2024 17:08:17 -0700
Subject: [PATCH 547/632] add Native settings implementation (#2346)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/api/Commands/commandHelpers.ts |  2 +-
 src/api/Settings.ts                |  2 +-
 src/main/settings.ts               | 18 +++++++++++++++++-
 src/utils/mergeDefaults.ts         | 24 ++++++++++++++++++++++++
 src/utils/misc.tsx                 | 19 -------------------
 5 files changed, 43 insertions(+), 22 deletions(-)
 create mode 100644 src/utils/mergeDefaults.ts

diff --git a/src/api/Commands/commandHelpers.ts b/src/api/Commands/commandHelpers.ts
index dc5ecfd67..2f7039137 100644
--- a/src/api/Commands/commandHelpers.ts
+++ b/src/api/Commands/commandHelpers.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { mergeDefaults } from "@utils/misc";
+import { mergeDefaults } from "@utils/mergeDefaults";
 import { findByPropsLazy } from "@webpack";
 import { MessageActions, SnowflakeUtils } from "@webpack/common";
 import { Message } from "discord-types/general";
diff --git a/src/api/Settings.ts b/src/api/Settings.ts
index 696c12c28..490e6ef7f 100644
--- a/src/api/Settings.ts
+++ b/src/api/Settings.ts
@@ -20,7 +20,7 @@ import { debounce } from "@shared/debounce";
 import { SettingsStore as SettingsStoreClass } from "@shared/SettingsStore";
 import { localStorage } from "@utils/localStorage";
 import { Logger } from "@utils/Logger";
-import { mergeDefaults } from "@utils/misc";
+import { mergeDefaults } from "@utils/mergeDefaults";
 import { putCloudSettings } from "@utils/settingsSync";
 import { DefinedSettings, OptionType, SettingsChecks, SettingsDefinition } from "@utils/types";
 import { React } from "@webpack/common";
diff --git a/src/main/settings.ts b/src/main/settings.ts
index 96efdd672..3d367a945 100644
--- a/src/main/settings.ts
+++ b/src/main/settings.ts
@@ -7,6 +7,7 @@
 import type { Settings } from "@api/Settings";
 import { IpcEvents } from "@shared/IpcEvents";
 import { SettingsStore } from "@shared/SettingsStore";
+import { mergeDefaults } from "@utils/mergeDefaults";
 import { ipcMain } from "electron";
 import { mkdirSync, readFileSync, writeFileSync } from "fs";
 
@@ -42,7 +43,22 @@ ipcMain.handle(IpcEvents.SET_SETTINGS, (_, data: Settings, pathToNotify?: string
     RendererSettings.setData(data, pathToNotify);
 });
 
-export const NativeSettings = new SettingsStore(readSettings("native", NATIVE_SETTINGS_FILE));
+export interface NativeSettings {
+    plugins: {
+        [plugin: string]: {
+            [setting: string]: any;
+        };
+    };
+}
+
+const DefaultNativeSettings: NativeSettings = {
+    plugins: {}
+};
+
+const nativeSettings = readSettings<NativeSettings>("native", NATIVE_SETTINGS_FILE);
+mergeDefaults(nativeSettings, DefaultNativeSettings);
+
+export const NativeSettings = new SettingsStore(nativeSettings);
 
 NativeSettings.addGlobalChangeListener(() => {
     try {
diff --git a/src/utils/mergeDefaults.ts b/src/utils/mergeDefaults.ts
new file mode 100644
index 000000000..58ba136dd
--- /dev/null
+++ b/src/utils/mergeDefaults.ts
@@ -0,0 +1,24 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+/**
+ * Recursively merges defaults into an object and returns the same object
+ * @param obj Object
+ * @param defaults Defaults
+ * @returns obj
+ */
+export function mergeDefaults<T>(obj: T, defaults: T): T {
+    for (const key in defaults) {
+        const v = defaults[key];
+        if (typeof v === "object" && !Array.isArray(v)) {
+            obj[key] ??= {} as any;
+            mergeDefaults(obj[key], v);
+        } else {
+            obj[key] ??= v;
+        }
+    }
+    return obj;
+}
diff --git a/src/utils/misc.tsx b/src/utils/misc.tsx
index 32010e59b..fb08c93f6 100644
--- a/src/utils/misc.tsx
+++ b/src/utils/misc.tsx
@@ -20,25 +20,6 @@ import { Clipboard, Toasts } from "@webpack/common";
 
 import { DevsById } from "./constants";
 
-/**
- * Recursively merges defaults into an object and returns the same object
- * @param obj Object
- * @param defaults Defaults
- * @returns obj
- */
-export function mergeDefaults<T>(obj: T, defaults: T): T {
-    for (const key in defaults) {
-        const v = defaults[key];
-        if (typeof v === "object" && !Array.isArray(v)) {
-            obj[key] ??= {} as any;
-            mergeDefaults(obj[key], v);
-        } else {
-            obj[key] ??= v;
-        }
-    }
-    return obj;
-}
-
 /**
  * Calls .join(" ") on the arguments
  * classes("one", "two") => "one two"

From d6507947f57b84e7ed51c73d7596ab7df667d5de Mon Sep 17 00:00:00 2001
From: HAHALOSAH <67280050+HAHALOSAH@users.noreply.github.com>
Date: Sat, 11 May 2024 17:32:44 -0700
Subject: [PATCH 548/632] Plugin Settings: fix text overflow for long plugin
 names (#2383)

Co-authored-by: V <vendicated@riseup.net>
---
 src/components/VencordSettings/AddonCard.tsx | 20 ++++++++++--
 src/components/VencordSettings/addonCard.css | 33 ++++++++++++++++++++
 src/utils/constants.ts                       |  4 +++
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/components/VencordSettings/AddonCard.tsx b/src/components/VencordSettings/AddonCard.tsx
index c4c3aaca9..1161a6411 100644
--- a/src/components/VencordSettings/AddonCard.tsx
+++ b/src/components/VencordSettings/AddonCard.tsx
@@ -21,7 +21,7 @@ import "./addonCard.css";
 import { classNameFactory } from "@api/Styles";
 import { Badge } from "@components/Badge";
 import { Switch } from "@components/Switch";
-import { Text } from "@webpack/common";
+import { Text, useRef } from "@webpack/common";
 import type { MouseEventHandler, ReactNode } from "react";
 
 const cl = classNameFactory("vc-addon-");
@@ -42,6 +42,8 @@ interface Props {
 }
 
 export function AddonCard({ disabled, isNew, name, infoButton, footer, author, enabled, setEnabled, description, onMouseEnter, onMouseLeave }: Props) {
+    const titleRef = useRef<HTMLDivElement>(null);
+    const titleContainerRef = useRef<HTMLDivElement>(null);
     return (
         <div
             className={cl("card", { "card-disabled": disabled })}
@@ -51,7 +53,21 @@ export function AddonCard({ disabled, isNew, name, infoButton, footer, author, e
             <div className={cl("header")}>
                 <div className={cl("name-author")}>
                     <Text variant="text-md/bold" className={cl("name")}>
-                        {name}{isNew && <Badge text="NEW" color="#ED4245" />}
+                        <div ref={titleContainerRef} className={cl("title-container")}>
+                            <div
+                                ref={titleRef}
+                                className={cl("title")}
+                                onMouseOver={() => {
+                                    const title = titleRef.current!;
+                                    const titleContainer = titleContainerRef.current!;
+
+                                    title.style.setProperty("--offset", `${titleContainer.clientWidth - title.scrollWidth}px`);
+                                    title.style.setProperty("--duration", `${Math.max(0.5, (title.scrollWidth - titleContainer.clientWidth) / 7)}s`);
+                                }}
+                            >
+                                {name}
+                            </div>
+                        </div>{isNew && <Badge text="NEW" color="#ED4245" />}
                     </Text>
                     {!!author && (
                         <Text variant="text-md/normal" className={cl("author")}>
diff --git a/src/components/VencordSettings/addonCard.css b/src/components/VencordSettings/addonCard.css
index f2dee11d9..e46e4c29c 100644
--- a/src/components/VencordSettings/addonCard.css
+++ b/src/components/VencordSettings/addonCard.css
@@ -62,3 +62,36 @@
 .vc-addon-author::before {
     content: "by ";
 }
+
+.vc-addon-title-container {
+    width: 100%;
+    overflow: hidden;
+    height: 1.25em;
+    position: relative;
+}
+
+.vc-addon-title {
+    position: absolute;
+    inset: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+@keyframes vc-addon-title {
+    0% {
+        transform: translateX(0);
+    }
+
+    50% {
+        transform: translateX(var(--offset));
+    }
+
+    100% {
+        transform: translateX(0);
+    }
+}
+
+.vc-addon-title:hover {
+    overflow: visible;
+    animation: vc-addon-title var(--duration) linear infinite;
+}
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 09c27d15f..c1e2cea2c 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -462,6 +462,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Oleh Polisan",
         id: 242305263313485825n
     },
+    HAHALOSAH: {
+        name: "HAHALOSAH",
+        id: 903418691268513883n
+    },
     GabiRP: {
         name: "GabiRP",
         id: 507955112027750401n

From a99354503f81cd41b6f3f8f33ee76c653f358560 Mon Sep 17 00:00:00 2001
From: Cats <42129397+Cats1337@users.noreply.github.com>
Date: Sat, 11 May 2024 20:44:06 -0400
Subject: [PATCH 549/632] feat(Translate): add toggle for chat bar icon (#2418)

---
 src/plugins/translate/TranslateIcon.tsx | 4 ++--
 src/plugins/translate/settings.ts       | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/plugins/translate/TranslateIcon.tsx b/src/plugins/translate/TranslateIcon.tsx
index cc0ed5e93..b22c488eb 100644
--- a/src/plugins/translate/TranslateIcon.tsx
+++ b/src/plugins/translate/TranslateIcon.tsx
@@ -40,9 +40,9 @@ export function TranslateIcon({ height = 24, width = 24, className }: { height?:
 }
 
 export const TranslateChatBarIcon: ChatBarButton = ({ isMainChat }) => {
-    const { autoTranslate } = settings.use(["autoTranslate"]);
+    const { autoTranslate, showChatBarButton } = settings.use(["autoTranslate", "showChatBarButton"]);
 
-    if (!isMainChat) return null;
+    if (!isMainChat || !showChatBarButton) return null;
 
     const toggle = () => {
         const newState = !autoTranslate;
diff --git a/src/plugins/translate/settings.ts b/src/plugins/translate/settings.ts
index cef003a83..65d845353 100644
--- a/src/plugins/translate/settings.ts
+++ b/src/plugins/translate/settings.ts
@@ -48,6 +48,11 @@ export const settings = definePluginSettings({
         type: OptionType.BOOLEAN,
         description: "Automatically translate your messages before sending. You can also shift/right click the translate button to toggle this",
         default: false
+    },
+    showChatBarButton: {
+        type: OptionType.BOOLEAN,
+        description: "Show translate button in chat bar",
+        default: true
     }
 }).withPrivateSettings<{
     showAutoTranslateAlert: boolean;

From bbec51fd19a23d5ab41cfa637901ece5d83f683c Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 12 May 2024 03:23:00 +0200
Subject: [PATCH 550/632] but here's the bumper (v1.8.3)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9fd84f9b8..0e5845987 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.8.2",
+    "version": "1.8.3",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 5c7fa5578ce97b8f5c59e38a963d0e240eec833e Mon Sep 17 00:00:00 2001
From: nyan <24845294+nyakowint@users.noreply.github.com>
Date: Sun, 12 May 2024 18:54:08 -0400
Subject: [PATCH 551/632] XSOverlay: Adjust message length timeout (#2445)

---
 src/plugins/xsOverlay.desktop/index.ts | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/plugins/xsOverlay.desktop/index.ts b/src/plugins/xsOverlay.desktop/index.ts
index b666d1168..5251959f2 100644
--- a/src/plugins/xsOverlay.desktop/index.ts
+++ b/src/plugins/xsOverlay.desktop/index.ts
@@ -68,7 +68,6 @@ interface Call {
     ringing: string[];
 }
 
-const MuteStore = findByPropsLazy("isSuppressEveryoneEnabled");
 const Notifs = findByPropsLazy("makeTextChatNotification");
 const XSLog = new Logger("XSOverlay");
 
@@ -115,13 +114,13 @@ const settings = definePluginSettings({
     },
     timeout: {
         type: OptionType.NUMBER,
-        description: "Notif duration (secs)",
-        default: 1.0,
+        description: "Notification duration (secs)",
+        default: 3,
     },
-    timeoutPerCharacter: {
-        type: OptionType.NUMBER,
-        description: "Duration multiplier per character",
-        default: 0.5
+    lengthBasedTimeout: {
+        type: OptionType.BOOLEAN,
+        description: "Extend duration with message length",
+        default: true
     },
     opacity: {
         type: OptionType.SLIDER,
@@ -262,12 +261,11 @@ function shouldIgnoreForChannelType(channel: Channel) {
 }
 
 function sendMsgNotif(titleString: string, content: string, message: Message) {
-    const timeout = Math.max(settings.store.timeout, content.length * settings.store.timeoutPerCharacter);
     fetch(`https://cdn.discordapp.com/avatars/${message.author.id}/${message.author.avatar}.png?size=128`).then(response => response.arrayBuffer()).then(result => {
         const msgData = {
             messageType: 1,
             index: 0,
-            timeout,
+            timeout: settings.store.lengthBasedTimeout ? calculateTimeout(content) : settings.store.timeout,
             height: calculateHeight(content),
             opacity: settings.store.opacity,
             volume: settings.store.volume,
@@ -286,7 +284,7 @@ function sendOtherNotif(content: string, titleString: string) {
     const msgData = {
         messageType: 1,
         index: 0,
-        timeout: settings.store.timeout,
+        timeout: settings.store.lengthBasedTimeout ? calculateTimeout(content) : settings.store.timeout,
         height: calculateHeight(content),
         opacity: settings.store.opacity,
         volume: settings.store.volume,
@@ -313,3 +311,10 @@ function calculateHeight(content: string) {
     if (content.length <= 300) return 200;
     return 250;
 }
+
+function calculateTimeout(content: string) {
+    if (content.length <= 100) return 3;
+    if (content.length <= 200) return 4;
+    if (content.length <= 300) return 5;
+    return 6;
+}

From fd7dafb15327efa95eedc313998e6900715f67f4 Mon Sep 17 00:00:00 2001
From: dolfies <jeyalfie47@gmail.com>
Date: Sun, 12 May 2024 19:07:12 -0400
Subject: [PATCH 552/632] fix(MessageLatency): Adjust for Discord kotlin
 clients (#2443)

---
 src/plugins/messageLatency/index.tsx | 47 +++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/plugins/messageLatency/index.tsx b/src/plugins/messageLatency/index.tsx
index 48b57863e..301e605fb 100644
--- a/src/plugins/messageLatency/index.tsx
+++ b/src/plugins/messageLatency/index.tsx
@@ -24,19 +24,27 @@ interface Diff {
     seconds: number;
 }
 
+const DISCORD_KT_DELAY = 1471228.928;
 const HiddenVisually = findExportedComponentLazy("HiddenVisually");
 
 export default definePlugin({
     name: "MessageLatency",
     description: "Displays an indicator for messages that took ≥n seconds to send",
     authors: [Devs.arHSM],
+
     settings: definePluginSettings({
         latency: {
             type: OptionType.NUMBER,
             description: "Threshold in seconds for latency indicator",
             default: 2
+        },
+        detectDiscordKotlin: {
+            type: OptionType.BOOLEAN,
+            description: "Detect old Discord Android clients",
+            default: true
         }
     }),
+
     patches: [
         {
             find: "showCommunicationDisabledStyles",
@@ -46,6 +54,7 @@ export default definePlugin({
             }
         }
     ],
+
     stringDelta(delta: number) {
         const diff: Diff = {
             days: Math.round(delta / (60 * 60 * 24)),
@@ -71,15 +80,25 @@ export default definePlugin({
             );
         }, "");
 
-        return [ts || "0 seconds", diff.days === 17 && diff.hours === 1] as const;
+        return ts || "0 seconds";
     },
+
     latencyTooltipData(message: Message) {
+        const { latency, detectDiscordKotlin } = this.settings.store;
         const { id, nonce } = message;
 
         // Message wasn't received through gateway
         if (!isNonNullish(nonce)) return null;
 
-        const delta = Math.round((SnowflakeUtils.extractTimestamp(id) - SnowflakeUtils.extractTimestamp(nonce)) / 1000);
+        let isDiscordKotlin = false;
+        let delta = Math.round((SnowflakeUtils.extractTimestamp(id) - SnowflakeUtils.extractTimestamp(nonce)) / 1000);
+
+        // Old Discord Android clients have a delay of around 17 days
+        // This is a workaround for that
+        if (-delta >= DISCORD_KT_DELAY - 86400) { // One day of padding for good measure
+            isDiscordKotlin = detectDiscordKotlin;
+            delta += DISCORD_KT_DELAY;
+        }
 
         // Thanks dziurwa (I hate you)
         // This is when the user's clock is ahead
@@ -87,15 +106,13 @@ export default definePlugin({
         const abs = Math.abs(delta);
         const ahead = abs !== delta;
 
-        const [stringDelta, isSuspectedKotlinDiscord] = this.stringDelta(abs);
-        const isKotlinDiscord = ahead && isSuspectedKotlinDiscord;
+        const stringDelta = abs >= latency ? this.stringDelta(abs) : null;
 
         // Also thanks dziurwa
         // 2 minutes
         const TROLL_LIMIT = 2 * 60;
-        const { latency } = this.settings.store;
 
-        const fill: Fill = isKotlinDiscord
+        const fill: Fill = isDiscordKotlin
             ? ["status-positive", "status-positive", "text-muted"]
             : delta >= TROLL_LIMIT || ahead
                 ? ["text-muted", "text-muted", "text-muted"]
@@ -103,17 +120,24 @@ export default definePlugin({
                     ? ["status-danger", "text-muted", "text-muted"]
                     : ["status-warning", "status-warning", "text-muted"];
 
-        return abs >= latency ? { delta: stringDelta, ahead, fill, isKotlinDiscord } : null;
+        return (abs >= latency || isDiscordKotlin) ? { delta: stringDelta, ahead, fill, isDiscordKotlin } : null;
     },
+
     Tooltip() {
         return ErrorBoundary.wrap(({ message }: { message: Message; }) => {
-
             const d = this.latencyTooltipData(message);
 
             if (!isNonNullish(d)) return null;
 
+            let text: string;
+            if (!d.delta) {
+                text = "User is suspected to be on an old Discord Android client";
+            } else {
+                text = (d.ahead ? `This user's clock is ${d.delta} ahead.` : `This message was sent with a delay of ${d.delta}.`) + (d.isDiscordKotlin ? " User is suspected to be on an old Discord Android client." : "");
+            }
+
             return <Tooltip
-                text={d.ahead ? `This user's clock is ${d.delta} ahead. ${d.isKotlinDiscord ? "User is suspected to be on an old mobile client" : ""}` : `This message was sent with a delay of ${d.delta}.`}
+                text={text}
                 position="top"
             >
                 {
@@ -126,8 +150,9 @@ export default definePlugin({
             </Tooltip>;
         });
     },
+
     Icon({ delta, fill, props }: {
-        delta: string;
+        delta: string | null;
         fill: Fill,
         props: {
             onClick(): void;
@@ -147,7 +172,7 @@ export default definePlugin({
             role="img"
             fill="none"
             style={{ marginRight: "8px", verticalAlign: -1 }}
-            aria-label={delta}
+            aria-label={delta ?? "Old Discord Android client"}
             aria-hidden="false"
             {...props}
         >

From 902b6bcdf20c6e9b3170ace70c124834e6e4f8cd Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 12 May 2024 20:58:26 -0300
Subject: [PATCH 553/632] PinDMs: ErrorBoundary renderChannel

---
 src/plugins/pinDms/index.tsx | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index 010b5506c..79503b9ad 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -320,25 +320,26 @@ export default definePlugin({
                 </svg>
             </h2>
         );
-    }),
+    }, { noop: true }),
 
     renderChannel(sectionIndex: number, index: number, ChannelComponent: React.ComponentType<ChannelComponentProps>) {
-        const { channel, category } = this.getChannel(sectionIndex, index, this.instance.props.channels);
+        return ErrorBoundary.wrap(() => {
+            const { channel, category } = this.getChannel(sectionIndex, index, this.instance.props.channels);
 
-        if (!channel || !category) return null;
-        if (this.isChannelHidden(sectionIndex, index)) return null;
+            if (!channel || !category) return null;
+            if (this.isChannelHidden(sectionIndex, index)) return null;
 
-        return (
-            <ChannelComponent
-                channel={channel}
-                selected={this.instance.props.selectedChannelId === channel.id}
-            >
-                {channel.id}
-            </ChannelComponent>
-        );
+            return (
+                <ChannelComponent
+                    channel={channel}
+                    selected={this.instance.props.selectedChannelId === channel.id}
+                >
+                    {channel.id}
+                </ChannelComponent>
+            );
+        }, { noop: true });
     },
 
-
     getChannel(sectionIndex: number, index: number, channels: Record<string, Channel>) {
         const category = categories[sectionIndex - 1];
         if (!category) return { channel: null, category: null };

From 1f1c80c5f3bf897cec82d08302a2d3f396436ed0 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Mon, 13 May 2024 03:30:10 +0200
Subject: [PATCH 554/632] ValidUser: fix crashing when viewing a valid-userd
 staff's profile

---
 src/plugins/validUser/index.tsx | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/plugins/validUser/index.tsx b/src/plugins/validUser/index.tsx
index 7a21ac86b..fd88ca9c9 100644
--- a/src/plugins/validUser/index.tsx
+++ b/src/plugins/validUser/index.tsx
@@ -18,6 +18,7 @@
 
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
+import { isNonNullish } from "@utils/guards";
 import { sleep } from "@utils/misc";
 import { Queue } from "@utils/Queue";
 import definePlugin from "@utils/types";
@@ -27,19 +28,20 @@ import type { ComponentType, ReactNode } from "react";
 // LYING to the type checker here
 const UserFlags = Constants.UserFlags as Record<string, number>;
 const badges: Record<string, ProfileBadge> = {
-    "active_developer": { id: "active_developer", description: "Active Developer", icon: "6bdc42827a38498929a4920da12695d9", link: "https://support-dev.discord.com/hc/en-us/articles/10113997751447" },
-    "bug_hunter_level_1": { id: "bug_hunter_level_1", description: "Discord Bug Hunter", icon: "2717692c7dca7289b35297368a940dd0", link: "https://support.discord.com/hc/en-us/articles/360046057772-Discord-Bugs" },
-    "bug_hunter_level_2": { id: "bug_hunter_level_2", description: "Discord Bug Hunter", icon: "848f79194d4be5ff5f81505cbd0ce1e6", link: "https://support.discord.com/hc/en-us/articles/360046057772-Discord-Bugs" },
-    "certified_moderator": { id: "certified_moderator", description: "Moderator Programs Alumni", icon: "fee1624003e2fee35cb398e125dc479b", link: "https://discord.com/safety" },
-    "discord_employee": { id: "staff", description: "Discord Staff", icon: "5e74e9b61934fc1f67c65515d1f7e60d", link: "https://discord.com/company" },
-    "hypesquad": { id: "hypesquad", description: "HypeSquad Events", icon: "bf01d1073931f921909045f3a39fd264", link: "https://discord.com/hypesquad" },
-    "hypesquad_online_house_1": { id: "hypesquad_house_1", description: "HypeSquad Bravery", icon: "8a88d63823d8a71cd5e390baa45efa02", link: "https://discord.com/settings/hypesquad-online" },
-    "hypesquad_online_house_2": { id: "hypesquad_house_2", description: "HypeSquad Brilliance", icon: "011940fd013da3f7fb926e4a1cd2e618", link: "https://discord.com/settings/hypesquad-online" },
-    "hypesquad_online_house_3": { id: "hypesquad_house_3", description: "HypeSquad Balance", icon: "3aa41de486fa12454c3761e8e223442e", link: "https://discord.com/settings/hypesquad-online" },
-    "partner": { id: "partner", description: "Partnered Server Owner", icon: "3f9748e53446a137a052f3454e2de41e", link: "https://discord.com/partners" },
-    "premium": { id: "premium", description: "Subscriber", icon: "2ba85e8026a8614b640c2837bcdfe21b", link: "https://discord.com/settings/premium" },
-    "premium_early_supporter": { id: "early_supporter", description: "Early Supporter", icon: "7060786766c9c840eb3019e725d2b358", link: "https://discord.com/settings/premium" },
-    "verified_developer": { id: "verified_developer", description: "Early Verified Bot Developer", icon: "6df5892e0f35b051f8b61eace34f4967" },
+    active_developer: { id: "active_developer", description: "Active Developer", icon: "6bdc42827a38498929a4920da12695d9", link: "https://support-dev.discord.com/hc/en-us/articles/10113997751447" },
+    bug_hunter_level_1: { id: "bug_hunter_level_1", description: "Discord Bug Hunter", icon: "2717692c7dca7289b35297368a940dd0", link: "https://support.discord.com/hc/en-us/articles/360046057772-Discord-Bugs" },
+    bug_hunter_level_2: { id: "bug_hunter_level_2", description: "Discord Bug Hunter", icon: "848f79194d4be5ff5f81505cbd0ce1e6", link: "https://support.discord.com/hc/en-us/articles/360046057772-Discord-Bugs" },
+    certified_moderator: { id: "certified_moderator", description: "Moderator Programs Alumni", icon: "fee1624003e2fee35cb398e125dc479b", link: "https://discord.com/safety" },
+    discord_employee: { id: "staff", description: "Discord Staff", icon: "5e74e9b61934fc1f67c65515d1f7e60d", link: "https://discord.com/company" },
+    get staff() { return this.discord_employee; },
+    hypesquad: { id: "hypesquad", description: "HypeSquad Events", icon: "bf01d1073931f921909045f3a39fd264", link: "https://discord.com/hypesquad" },
+    hypesquad_online_house_1: { id: "hypesquad_house_1", description: "HypeSquad Bravery", icon: "8a88d63823d8a71cd5e390baa45efa02", link: "https://discord.com/settings/hypesquad-online" },
+    hypesquad_online_house_2: { id: "hypesquad_house_2", description: "HypeSquad Brilliance", icon: "011940fd013da3f7fb926e4a1cd2e618", link: "https://discord.com/settings/hypesquad-online" },
+    hypesquad_online_house_3: { id: "hypesquad_house_3", description: "HypeSquad Balance", icon: "3aa41de486fa12454c3761e8e223442e", link: "https://discord.com/settings/hypesquad-online" },
+    partner: { id: "partner", description: "Partnered Server Owner", icon: "3f9748e53446a137a052f3454e2de41e", link: "https://discord.com/partners" },
+    premium: { id: "premium", description: "Subscriber", icon: "2ba85e8026a8614b640c2837bcdfe21b", link: "https://discord.com/settings/premium" },
+    premium_early_supporter: { id: "early_supporter", description: "Early Supporter", icon: "7060786766c9c840eb3019e725d2b358", link: "https://discord.com/settings/premium" },
+    verified_developer: { id: "verified_developer", description: "Early Verified Bot Developer", icon: "6df5892e0f35b051f8b61eace34f4967" },
 };
 
 const fetching = new Set<string>();
@@ -93,7 +95,8 @@ async function getUser(id: string) {
     userObj = UserStore.getUser(id);
     const fakeBadges: ProfileBadge[] = Object.entries(UserFlags)
         .filter(([_, flag]) => !isNaN(flag) && userObj.hasFlag(flag))
-        .map(([key]) => badges[key.toLowerCase()]);
+        .map(([key]) => badges[key.toLowerCase()])
+        .filter(isNonNullish);
     if (user.premium_type || !user.bot && (user.banner || user.avatar?.startsWith?.("a_")))
         fakeBadges.push(badges.premium);
 

From f6765818d2248292b4dacf74c3ae3e2eae5856d4 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Mon, 13 May 2024 03:34:01 +0200
Subject: [PATCH 555/632] ValidUser: fix rendering old mentions when message is
 edited

Fixes https://github.com/Vendicated/Vencord/issues/2451
---
 src/plugins/pinDms/index.tsx    | 2 +-
 src/plugins/validUser/index.tsx | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index 79503b9ad..60484561a 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -83,7 +83,7 @@ export default definePlugin({
                 // Rendering
                 {
                     match: /"renderRow",(\i)=>{(?<="renderDM",.+?(\i\.default),\{channel:.+?)/,
-                    replace: "$&if($self.isChannelIndex($1.section, $1.row))return $self.renderChannel($1.section,$1.row,$2);"
+                    replace: "$&if($self.isChannelIndex($1.section, $1.row))return $self.renderChannel($1.section,$1.row,$2)();"
                 },
                 {
                     match: /"renderSection",(\i)=>{/,
diff --git a/src/plugins/validUser/index.tsx b/src/plugins/validUser/index.tsx
index fd88ca9c9..64b734f53 100644
--- a/src/plugins/validUser/index.tsx
+++ b/src/plugins/validUser/index.tsx
@@ -23,7 +23,7 @@ import { sleep } from "@utils/misc";
 import { Queue } from "@utils/Queue";
 import definePlugin from "@utils/types";
 import { Constants, FluxDispatcher, RestAPI, UserProfileStore, UserStore, useState } from "@webpack/common";
-import type { ComponentType, ReactNode } from "react";
+import { type ComponentType, type ReactNode } from "react";
 
 // LYING to the type checker here
 const UserFlags = Constants.UserFlags as Record<string, number>;
@@ -205,6 +205,7 @@ export default definePlugin({
         return (
             <ErrorBoundary noop>
                 <MentionWrapper
+                    key={"mention" + data.userId}
                     RoleMention={RoleMention}
                     UserMention={UserMention}
                     data={data}

From 59ee9c501dd31438e8907f3aaa6f1f9baebea893 Mon Sep 17 00:00:00 2001
From: dolfies <jeyalfie47@gmail.com>
Date: Mon, 13 May 2024 01:09:19 -0400
Subject: [PATCH 556/632] feat(ShowHiddenThings): Remove Discovery banned/NSFW
 filters (#2453)

---
 src/plugins/showHiddenThings/README.md |  4 +++-
 src/plugins/showHiddenThings/index.ts  | 24 +++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/plugins/showHiddenThings/README.md b/src/plugins/showHiddenThings/README.md
index e969391e4..753e5c148 100644
--- a/src/plugins/showHiddenThings/README.md
+++ b/src/plugins/showHiddenThings/README.md
@@ -1,6 +1,6 @@
 # ShowHiddenThings
 
-Displays various moderator-only elements regardless of permissions.
+Displays various hidden & moderator-only things regardless of permissions.
 
 ## Features
 
@@ -15,3 +15,5 @@ Displays various moderator-only elements regardless of permissions.
 ![](https://github.com/Vendicated/Vencord/assets/47677887/3dac95dd-841c-4c15-ad87-2db7bd1e4dab)
 
 - Disable filters in Server Discovery search that hide servers that don't meet discovery criteria
+
+- Disable filters in Server Discovery search that hide NSFW & disallowed servers
diff --git a/src/plugins/showHiddenThings/index.ts b/src/plugins/showHiddenThings/index.ts
index 1858582a8..8de70aca9 100644
--- a/src/plugins/showHiddenThings/index.ts
+++ b/src/plugins/showHiddenThings/index.ts
@@ -41,13 +41,18 @@ const settings = definePluginSettings({
         description: "Disable filters in Server Discovery search that hide servers that don't meet discovery criteria.",
         default: true,
     },
+    disableDisallowedDiscoveryFilters: {
+        type: OptionType.BOOLEAN,
+        description: "Disable filters in Server Discovery search that hide NSFW & disallowed servers.",
+        default: true,
+    },
 });
 
 migratePluginSettings("ShowHiddenThings", "ShowTimeouts");
 export default definePlugin({
     name: "ShowHiddenThings",
     tags: ["ShowTimeouts", "ShowInvitesPaused", "ShowModView", "DisableDiscoveryFilters"],
-    description: "Displays various moderator-only elements regardless of permissions.",
+    description: "Displays various hidden & moderator-only things regardless of permissions.",
     authors: [Devs.Dolfies],
     patches: [
         {
@@ -81,6 +86,23 @@ export default definePlugin({
                 match: /filters:\i\.join\(" AND "\),facets:\[/,
                 replace: "facets:["
             }
+        },
+        {
+            find: "DiscoveryBannedSearchWords.includes",
+            predicate: () => settings.store.disableDisallowedDiscoveryFilters,
+            replacement: {
+                match: /(?<=function\(\){)(?=.{0,130}DiscoveryBannedSearchWords\.includes)/,
+                replace: "return false;"
+            }
+        },
+        {
+            find: "Endpoints.GUILD_DISCOVERY_VALID_TERM",
+            predicate: () => settings.store.disableDisallowedDiscoveryFilters,
+            all: true,
+            replacement: {
+                match: /\i\.HTTP\.get\(\{url:\i\.Endpoints\.GUILD_DISCOVERY_VALID_TERM,query:\{term:\i\},oldFormErrors:!0\}\);/g,
+                replace: "Promise.resolve({ body: { valid: true } });"
+            }
         }
     ],
     settings,

From 9621dc7bb39087a752910eab170701fb6b4be585 Mon Sep 17 00:00:00 2001
From: axiand <axiand@proton.me>
Date: Tue, 14 May 2024 03:16:49 +0200
Subject: [PATCH 557/632] EmoteCloner: allow cloning from reactions (#2458)

---
 src/plugins/emoteCloner/index.tsx | 5 +++--
 src/utils/constants.ts            | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/plugins/emoteCloner/index.tsx b/src/plugins/emoteCloner/index.tsx
index cd9890a80..8c3ded6a7 100644
--- a/src/plugins/emoteCloner/index.tsx
+++ b/src/plugins/emoteCloner/index.tsx
@@ -322,8 +322,9 @@ const messageContextMenuPatch: NavContextMenuPatchCallback = (children, props) =
         switch (favoriteableType) {
             case "emoji":
                 const match = props.message.content.match(RegExp(`<a?:(\\w+)(?:~\\d+)?:${favoriteableId}>|https://cdn\\.discordapp\\.com/emojis/${favoriteableId}\\.`));
-                if (!match) return;
-                const name = match[1] ?? "FakeNitroEmoji";
+                const reaction = props.message.reactions.find(reaction => reaction.emoji.id === favoriteableId);
+                if (!match && !reaction) return;
+                const name = (match && match[1]) ?? reaction?.emoji.name ?? "FakeNitroEmoji";
 
                 return buildMenuItem("Emoji", () => ({
                     id: favoriteableId,
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index c1e2cea2c..e446a27b6 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -473,6 +473,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     ImBanana: {
         name: "Im_Banana",
         id: 635250116688871425n
+    },
+    xocherry: {
+        name: "xocherry",
+        id: 221288171013406720n
     }
 } satisfies Record<string, Dev>);
 

From bd6f9e6f32e5ad95f7e16f323746a5770b1208de Mon Sep 17 00:00:00 2001
From: Amia <9750071+aamiaa@users.noreply.github.com>
Date: Tue, 14 May 2024 03:22:49 +0200
Subject: [PATCH 558/632] fix(MutualGroupDMs): properly pass props (#2457)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/mutualGroupDMs/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx
index e787fefb4..94998677b 100644
--- a/src/plugins/mutualGroupDMs/index.tsx
+++ b/src/plugins/mutualGroupDMs/index.tsx
@@ -56,12 +56,12 @@ export default definePlugin({
             find: ".UserProfileSections.USER_INFO_CONNECTIONS:",
             replacement: {
                 match: /(?<={user:(\i),onClose:(\i)}\);)(?=case \i\.\i\.MUTUAL_FRIENDS)/,
-                replace: "case \"MUTUAL_GDMS\":return $self.renderMutualGDMs($1,$2);"
+                replace: "case \"MUTUAL_GDMS\":return $self.renderMutualGDMs({user: $1, onClose: $2});"
             }
         }
     ],
 
-    renderMutualGDMs: ErrorBoundary.wrap((user: User, onClose: () => void) => {
+    renderMutualGDMs: ErrorBoundary.wrap(({ user, onClose }: { user: User, onClose: () => void; }) => {
         const entries = ChannelStore.getSortedPrivateChannels().filter(c => c.isGroupDM() && c.recipients.includes(user.id)).map(c => (
             <Clickable
                 className={ProfileListClasses.listRow}

From 5d049534a7972938a4b46b6311d63410e00eb1a2 Mon Sep 17 00:00:00 2001
From: Haruka <personal@shiroko.me>
Date: Tue, 14 May 2024 04:39:05 +0300
Subject: [PATCH 559/632] FakeNitro: allow using subscription-locked emojis
 (#2456)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/fakeNitro/index.tsx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 087928e9f..293183664 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -39,6 +39,7 @@ const StickerStore = findStoreLazy("StickersStore") as {
 
 const UserSettingsProtoStore = findStoreLazy("UserSettingsProtoStore");
 const ProtoUtils = findByPropsLazy("BINARY_READ_OPTIONS");
+const RoleSubscriptionEmojiUtils = findByPropsLazy("isUnusableRoleSubscriptionEmoji");
 
 function searchProtoClassField(localName: string, protoClass: any) {
     const field = protoClass?.fields?.find((field: any) => field.localName === localName);
@@ -408,6 +409,15 @@ export default definePlugin({
                 match: /canUseCustomNotificationSounds:function\(\i\){/,
                 replace: "$&return true;"
             }
+        },
+        // Allows the usage of subscription-locked emojis
+        {
+            find: "isUnusableRoleSubscriptionEmoji:function",
+            replacement: {
+                match: /isUnusableRoleSubscriptionEmoji:function/,
+                // replace the original export with a func that always returns false and alias the original
+                replace: "isUnusableRoleSubscriptionEmoji:()=>()=>false,isUnusableRoleSubscriptionEmojiOriginal:function"
+            }
         }
     ],
 
@@ -804,6 +814,9 @@ export default definePlugin({
         if (e.require_colons === false) return true;
         if (e.available === false) return false;
 
+        const isUnusableRoleSubEmoji = RoleSubscriptionEmojiUtils.isUnusableRoleSubscriptionEmojiOriginal ?? RoleSubscriptionEmojiUtils.isUnusableRoleSubscriptionEmoji;
+        if (isUnusableRoleSubEmoji(e, this.guildId)) return false;
+
         if (this.canUseEmotes)
             return e.guildId === this.guildId || hasExternalEmojiPerms(channelId);
         else

From 892167420aa2db6fc6563c7e6ace5e37a4c946ea Mon Sep 17 00:00:00 2001
From: Anubis <102488279+AnubisNekhet@users.noreply.github.com>
Date: Tue, 14 May 2024 07:27:20 +0530
Subject: [PATCH 560/632] MessageLogger: use discord variables instead of
 hardcoded colors (#2428)

---
 src/plugins/messageLogger/deleteStyleOverlay.css | 2 +-
 src/plugins/messageLogger/deleteStyleText.css    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/messageLogger/deleteStyleOverlay.css b/src/plugins/messageLogger/deleteStyleOverlay.css
index 3778e80b3..59e4ac666 100644
--- a/src/plugins/messageLogger/deleteStyleOverlay.css
+++ b/src/plugins/messageLogger/deleteStyleOverlay.css
@@ -1,3 +1,3 @@
 .messagelogger-deleted {
-    background-color: rgba(240 71 71 / 15%) !important;
+    background-color: hsla(var(--red-430-hsl, 0 85% 61%) / 15%) !important;
 }
diff --git a/src/plugins/messageLogger/deleteStyleText.css b/src/plugins/messageLogger/deleteStyleText.css
index 8fb8bf129..3477ef229 100644
--- a/src/plugins/messageLogger/deleteStyleText.css
+++ b/src/plugins/messageLogger/deleteStyleText.css
@@ -1,19 +1,19 @@
 /* Message content highlighting */
 .messagelogger-deleted [class*="contents"] > :is(div, h1, h2, h3, p) {
-    color: #f04747 !important;
+    color: var(--status-danger, #f04747) !important;
 }
 
 /* Bot "thinking" text highlighting */
 .messagelogger-deleted [class*="colorStandard"] {
-    color: #f04747 !important;
+    color: var(--status-danger, #f04747) !important;
 }
 
 /* Embed highlighting */
 .messagelogger-deleted article :is(div, span, h1, h2, h3, p) {
-    color: #f04747 !important;
+    color: var(--status-danger, #f04747) !important;
 }
 
 .messagelogger-deleted a {
-    color: #be3535 !important;
+    color: var(--red-460, #be3535) !important;
     text-decoration: underline;
 }

From 9dc8e4e24493b0dd5bd4758eb419e5d1c4052029 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Mon, 13 May 2024 22:45:57 -0300
Subject: [PATCH 561/632] Properly ErrorBoundary recent changes

---
 src/plugins/betterNotes/index.tsx         | 12 ++--
 src/plugins/pauseInvitesForever/index.tsx | 71 ++++++++++++-----------
 2 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/src/plugins/betterNotes/index.tsx b/src/plugins/betterNotes/index.tsx
index 5ebca1f8b..cacdba5fd 100644
--- a/src/plugins/betterNotes/index.tsx
+++ b/src/plugins/betterNotes/index.tsx
@@ -61,7 +61,7 @@ export default definePlugin({
             find: ".popularApplicationCommandIds,",
             replacement: {
                 match: /lastSection:(!?\i)}\),/,
-                replace: "$&$self.patchPadding($1),"
+                replace: "$&$self.patchPadding({lastSection:$1}),"
             }
         }
     ],
@@ -81,12 +81,10 @@ export default definePlugin({
         }
     },
 
-    patchPadding(lastSection: any) {
-        if (!lastSection) return;
+    patchPadding: ErrorBoundary.wrap(({ lastSection }) => {
+        if (!lastSection) return null;
         return (
-            <ErrorBoundary noop>
-                <div className={UserPopoutSectionCssClasses.lastSection}></div>
-            </ErrorBoundary>
+            <div className={UserPopoutSectionCssClasses.lastSection} ></div>
         );
-    }
+    })
 });
diff --git a/src/plugins/pauseInvitesForever/index.tsx b/src/plugins/pauseInvitesForever/index.tsx
index 1e71a4ed1..e7abaa17d 100644
--- a/src/plugins/pauseInvitesForever/index.tsx
+++ b/src/plugins/pauseInvitesForever/index.tsx
@@ -24,6 +24,22 @@ import { GuildStore, i18n, RestAPI } from "@webpack/common";
 
 const { InvitesDisabledExperiment } = findByPropsLazy("InvitesDisabledExperiment");
 
+function showDisableInvites(guildId: string) {
+    // Once the experiment is removed, this should keep working
+    const { enableInvitesDisabled } = InvitesDisabledExperiment?.getCurrentConfig?.({ guildId }) ?? { enableInvitesDisabled: true };
+    // @ts-ignore
+    return enableInvitesDisabled && !GuildStore.getGuild(guildId).hasFeature("INVITES_DISABLED");
+}
+
+function disableInvites(guildId: string) {
+    const guild = GuildStore.getGuild(guildId);
+    const features = [...guild.features, "INVITES_DISABLED"];
+    RestAPI.patch({
+        url: `/guilds/${guild.id}`,
+        body: { features },
+    });
+}
+
 export default definePlugin({
     name: "PauseInvitesForever",
     tags: ["DisableInvitesForever"],
@@ -33,44 +49,29 @@ export default definePlugin({
     patches: [
         {
             find: "Messages.GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION",
-            replacement: [{
-                match: /children:\i\.\i\.\i\.GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION/,
-                replace: "children: $self.renderInvitesLabel(arguments[0].guildId, setChecked)",
-            },
-            {
-                match: /(\i\.hasDMsDisabled\)\(\i\),\[\i,(\i)\]=\i\.useState\(\i\))/,
-                replace: "$1,setChecked=$2"
-            }]
+            group: true,
+            replacement: [
+                {
+                    match: /children:\i\.\i\.\i\.GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION/,
+                    replace: "children: $self.renderInvitesLabel({guildId:arguments[0].guildId,setChecked})",
+                },
+                {
+                    match: /(\i\.hasDMsDisabled\)\(\i\),\[\i,(\i)\]=\i\.useState\(\i\))/,
+                    replace: "$1,setChecked=$2"
+                }
+            ]
         }
     ],
 
-    showDisableInvites(guildId: string) {
-        // Once the experiment is removed, this should keep working
-        const { enableInvitesDisabled } = InvitesDisabledExperiment?.getCurrentConfig?.({ guildId }) ?? { enableInvitesDisabled: true };
-        // @ts-ignore
-        return enableInvitesDisabled && !GuildStore.getGuild(guildId).hasFeature("INVITES_DISABLED");
-    },
-
-    disableInvites(guildId: string) {
-        const guild = GuildStore.getGuild(guildId);
-        const features = [...guild.features, "INVITES_DISABLED"];
-        RestAPI.patch({
-            url: `/guilds/${guild.id}`,
-            body: { features },
-        });
-    },
-
-    renderInvitesLabel(guildId: string, setChecked: Function) {
+    renderInvitesLabel: ErrorBoundary.wrap(({ guildId, setChecked }) => {
         return (
-            <ErrorBoundary noop>
-                <div>
-                    {i18n.Messages.GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION}
-                    {this.showDisableInvites(guildId) && <a role="button" onClick={() => {
-                        setChecked(true);
-                        this.disableInvites(guildId);
-                    }}> Pause Indefinitely.</a>}
-                </div>
-            </ErrorBoundary>
+            <div>
+                {i18n.Messages.GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION}
+                {showDisableInvites(guildId) && <a role="button" onClick={() => {
+                    setChecked(true);
+                    disableInvites(guildId);
+                }}> Pause Indefinitely.</a>}
+            </div>
         );
-    }
+    })
 });

From d4ebfc233fde9e54b76ca17cb2cac82fbb4d6aa9 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Mon, 13 May 2024 23:00:02 -0300
Subject: [PATCH 562/632] Make all RestAPI calls use Endpoints object

---
 src/plugins/betterSessions/index.tsx        | 4 ++--
 src/plugins/emoteCloner/index.tsx           | 6 +++---
 src/plugins/friendInvites/index.ts          | 4 ++--
 src/plugins/invisibleChat.desktop/index.tsx | 4 ++--
 src/plugins/messageLinkEmbeds/index.tsx     | 3 ++-
 src/plugins/pauseInvitesForever/index.tsx   | 4 ++--
 src/plugins/unsuppressEmbeds/index.tsx      | 4 ++--
 src/plugins/validUser/index.tsx             | 2 +-
 src/plugins/voiceMessages/index.tsx         | 4 ++--
 src/plugins/whoReacted/index.tsx            | 4 ++--
 src/utils/discord.tsx                       | 4 ++--
 11 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/plugins/betterSessions/index.tsx b/src/plugins/betterSessions/index.tsx
index 539508f80..9c93289c8 100644
--- a/src/plugins/betterSessions/index.tsx
+++ b/src/plugins/betterSessions/index.tsx
@@ -22,7 +22,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy, findExportedComponentLazy, findStoreLazy } from "@webpack";
-import { React, RestAPI, Tooltip } from "@webpack/common";
+import { Constants, React, RestAPI, Tooltip } from "@webpack/common";
 
 import { RenameButton } from "./components/RenameButton";
 import { Session, SessionInfo } from "./types";
@@ -168,7 +168,7 @@ export default definePlugin({
 
     async checkNewSessions() {
         const data = await RestAPI.get({
-            url: "/auth/sessions"
+            url: Constants.Endpoints.AUTH_SESSIONS
         });
 
         for (const session of data.body.user_sessions) {
diff --git a/src/plugins/emoteCloner/index.tsx b/src/plugins/emoteCloner/index.tsx
index 8c3ded6a7..b456c351e 100644
--- a/src/plugins/emoteCloner/index.tsx
+++ b/src/plugins/emoteCloner/index.tsx
@@ -24,7 +24,7 @@ import { Margins } from "@utils/margins";
 import { ModalContent, ModalHeader, ModalRoot, openModalLazy } from "@utils/modal";
 import definePlugin from "@utils/types";
 import { findByPropsLazy, findStoreLazy } from "@webpack";
-import { EmojiStore, FluxDispatcher, Forms, GuildStore, Menu, PermissionsBits, PermissionStore, React, RestAPI, Toasts, Tooltip, UserStore } from "@webpack/common";
+import { Constants, EmojiStore, FluxDispatcher, Forms, GuildStore, Menu, PermissionsBits, PermissionStore, React, RestAPI, Toasts, Tooltip, UserStore } from "@webpack/common";
 import { Promisable } from "type-fest";
 
 const StickersStore = findStoreLazy("StickersStore");
@@ -64,7 +64,7 @@ async function fetchSticker(id: string) {
     if (cached) return cached;
 
     const { body } = await RestAPI.get({
-        url: `/stickers/${id}`
+        url: Constants.Endpoints.STICKER(id)
     });
 
     FluxDispatcher.dispatch({
@@ -83,7 +83,7 @@ async function cloneSticker(guildId: string, sticker: Sticker) {
     data.append("file", await fetchBlob(getUrl(sticker)));
 
     const { body } = await RestAPI.post({
-        url: `/guilds/${guildId}/stickers`,
+        url: Constants.Endpoints.GUILD_STICKER_PACKS(guildId),
         body: data,
     });
 
diff --git a/src/plugins/friendInvites/index.ts b/src/plugins/friendInvites/index.ts
index e5ff447ed..47e312c31 100644
--- a/src/plugins/friendInvites/index.ts
+++ b/src/plugins/friendInvites/index.ts
@@ -20,7 +20,7 @@ import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption,
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { RestAPI, UserStore } from "@webpack/common";
+import { Constants, RestAPI, UserStore } from "@webpack/common";
 
 const FriendInvites = findByPropsLazy("createFriendInvite");
 const { uuid4 } = findByPropsLazy("uuid4");
@@ -58,7 +58,7 @@ export default definePlugin({
                 if (uses === 1) {
                     const random = uuid4();
                     const { body: { invite_suggestions } } = await RestAPI.post({
-                        url: "/friend-finder/find-friends",
+                        url: Constants.Endpoints.FRIEND_FINDER,
                         body: {
                             modified_contacts: {
                                 [random]: [1, "", ""]
diff --git a/src/plugins/invisibleChat.desktop/index.tsx b/src/plugins/invisibleChat.desktop/index.tsx
index fcb0af712..3dfe51e77 100644
--- a/src/plugins/invisibleChat.desktop/index.tsx
+++ b/src/plugins/invisibleChat.desktop/index.tsx
@@ -23,7 +23,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { getStegCloak } from "@utils/dependencies";
 import definePlugin, { OptionType } from "@utils/types";
-import { ChannelStore, FluxDispatcher, RestAPI, Tooltip } from "@webpack/common";
+import { ChannelStore, Constants, FluxDispatcher, RestAPI, Tooltip } from "@webpack/common";
 import { Message } from "discord-types/general";
 
 import { buildDecModal } from "./components/DecryptionModal";
@@ -153,7 +153,7 @@ export default definePlugin({
     // Gets the Embed of a Link
     async getEmbed(url: URL): Promise<Object | {}> {
         const { body } = await RestAPI.post({
-            url: "/unfurler/embed-urls",
+            url: Constants.Endpoints.UNFURL_EMBED_URLS,
             body: {
                 urls: [url]
             }
diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index 2a5f88282..5c3063628 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -27,6 +27,7 @@ import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import {
     Button,
     ChannelStore,
+    Constants,
     FluxDispatcher,
     GuildStore,
     IconUtils,
@@ -132,7 +133,7 @@ async function fetchMessage(channelID: string, messageID: string) {
     messageCache.set(messageID, { fetched: false });
 
     const res = await RestAPI.get({
-        url: `/channels/${channelID}/messages`,
+        url: Constants.Endpoints.MESSAGES(channelID),
         query: {
             limit: 1,
             around: messageID
diff --git a/src/plugins/pauseInvitesForever/index.tsx b/src/plugins/pauseInvitesForever/index.tsx
index e7abaa17d..6a70be1aa 100644
--- a/src/plugins/pauseInvitesForever/index.tsx
+++ b/src/plugins/pauseInvitesForever/index.tsx
@@ -20,7 +20,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { GuildStore, i18n, RestAPI } from "@webpack/common";
+import { Constants, GuildStore, i18n, RestAPI } from "@webpack/common";
 
 const { InvitesDisabledExperiment } = findByPropsLazy("InvitesDisabledExperiment");
 
@@ -35,7 +35,7 @@ function disableInvites(guildId: string) {
     const guild = GuildStore.getGuild(guildId);
     const features = [...guild.features, "INVITES_DISABLED"];
     RestAPI.patch({
-        url: `/guilds/${guild.id}`,
+        url: Constants.Endpoints.GUILD(guildId),
         body: { features },
     });
 }
diff --git a/src/plugins/unsuppressEmbeds/index.tsx b/src/plugins/unsuppressEmbeds/index.tsx
index 0e87201c6..16debf711 100644
--- a/src/plugins/unsuppressEmbeds/index.tsx
+++ b/src/plugins/unsuppressEmbeds/index.tsx
@@ -20,7 +20,7 @@ import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/Co
 import { ImageInvisible, ImageVisible } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { Menu, PermissionsBits, PermissionStore, RestAPI, UserStore } from "@webpack/common";
+import { Constants, Menu, PermissionsBits, PermissionStore, RestAPI, UserStore } from "@webpack/common";
 
 const EMBED_SUPPRESSED = 1 << 2;
 
@@ -44,7 +44,7 @@ const messageContextMenuPatch: NavContextMenuPatchCallback = (children, { channe
             icon={isEmbedSuppressed ? ImageVisible : ImageInvisible}
             action={() =>
                 RestAPI.patch({
-                    url: `/channels/${channel.id}/messages/${messageId}`,
+                    url: Constants.Endpoints.MESSAGE(channel.id, messageId),
                     body: { flags: isEmbedSuppressed ? flags & ~EMBED_SUPPRESSED : flags | EMBED_SUPPRESSED }
                 })
             }
diff --git a/src/plugins/validUser/index.tsx b/src/plugins/validUser/index.tsx
index 64b734f53..4825cdaa3 100644
--- a/src/plugins/validUser/index.tsx
+++ b/src/plugins/validUser/index.tsx
@@ -75,7 +75,7 @@ async function getUser(id: string) {
     if (userObj)
         return userObj;
 
-    const user: any = await RestAPI.get({ url: `/users/${id}` }).then(response => {
+    const user: any = await RestAPI.get({ url: Constants.Endpoints.USER(id) }).then(response => {
         FluxDispatcher.dispatch({
             type: "USER_UPDATE",
             user: response.body,
diff --git a/src/plugins/voiceMessages/index.tsx b/src/plugins/voiceMessages/index.tsx
index 2f232f341..40e877df9 100644
--- a/src/plugins/voiceMessages/index.tsx
+++ b/src/plugins/voiceMessages/index.tsx
@@ -28,7 +28,7 @@ import { useAwaiter } from "@utils/react";
 import definePlugin from "@utils/types";
 import { chooseFile } from "@utils/web";
 import { findByPropsLazy, findStoreLazy } from "@webpack";
-import { Button, Card, FluxDispatcher, Forms, lodash, Menu, MessageActions, PermissionsBits, PermissionStore, RestAPI, SelectedChannelStore, showToast, SnowflakeUtils, Toasts, useEffect, useState } from "@webpack/common";
+import { Button, Card, Constants, FluxDispatcher, Forms, lodash, Menu, MessageActions, PermissionsBits, PermissionStore, RestAPI, SelectedChannelStore, showToast, SnowflakeUtils, Toasts, useEffect, useState } from "@webpack/common";
 import { ComponentType } from "react";
 
 import { VoiceRecorderDesktop } from "./DesktopRecorder";
@@ -98,7 +98,7 @@ function sendAudio(blob: Blob, meta: AudioMetadata) {
 
     upload.on("complete", () => {
         RestAPI.post({
-            url: `/channels/${channelId}/messages`,
+            url: Constants.Endpoints.MESSAGES(channelId),
             body: {
                 flags: 1 << 13,
                 channel_id: channelId,
diff --git a/src/plugins/whoReacted/index.tsx b/src/plugins/whoReacted/index.tsx
index b3728c215..5721dc912 100644
--- a/src/plugins/whoReacted/index.tsx
+++ b/src/plugins/whoReacted/index.tsx
@@ -23,7 +23,7 @@ import { Queue } from "@utils/Queue";
 import { useForceUpdater } from "@utils/react";
 import definePlugin from "@utils/types";
 import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
-import { ChannelStore, FluxDispatcher, React, RestAPI, Tooltip } from "@webpack/common";
+import { ChannelStore, Constants, FluxDispatcher, React, RestAPI, Tooltip } from "@webpack/common";
 import { CustomEmoji } from "@webpack/types";
 import { Message, ReactionEmoji, User } from "discord-types/general";
 
@@ -36,7 +36,7 @@ let reactions: Record<string, ReactionCacheEntry>;
 function fetchReactions(msg: Message, emoji: ReactionEmoji, type: number) {
     const key = emoji.name + (emoji.id ? `:${emoji.id}` : "");
     return RestAPI.get({
-        url: `/channels/${msg.channel_id}/messages/${msg.id}/reactions/${key}`,
+        url: Constants.Endpoints.REACTIONS(msg.channel_id, msg.id, key),
         query: {
             limit: 100,
             type
diff --git a/src/utils/discord.tsx b/src/utils/discord.tsx
index 74e1aefe8..57202ba3c 100644
--- a/src/utils/discord.tsx
+++ b/src/utils/discord.tsx
@@ -17,7 +17,7 @@
 */
 
 import { MessageObject } from "@api/MessageEvents";
-import { ChannelStore, ComponentDispatch, FluxDispatcher, GuildStore, InviteActions, MaskedLink, MessageActions, ModalImageClasses, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileActions, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
+import { ChannelStore, ComponentDispatch, Constants, FluxDispatcher, GuildStore, InviteActions, MaskedLink, MessageActions, ModalImageClasses, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileActions, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
 import { Guild, Message, User } from "discord-types/general";
 
 import { ImageModal, ModalRoot, ModalSize, openModal } from "./modal";
@@ -162,7 +162,7 @@ export async function fetchUserProfile(id: string, options?: FetchUserProfileOpt
     FluxDispatcher.dispatch({ type: "USER_PROFILE_FETCH_START", userId: id });
 
     const { body } = await RestAPI.get({
-        url: `/users/${id}/profile`,
+        url: Constants.Endpoints.USER_PROFILE(id),
         query: {
             with_mutual_guilds: false,
             with_mutual_friends_count: false,

From 12376c622ee1568d7c4633272362534ca7aea2df Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 14 May 2024 18:52:35 +0200
Subject: [PATCH 563/632] fix settings ui on canary

---
 src/plugins/_core/settings.tsx | 112 ++++++++++++++++++++++-----------
 1 file changed, 75 insertions(+), 37 deletions(-)

diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index 772ee9b64..0a6aea8b9 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -26,7 +26,7 @@ import UpdaterTab from "@components/VencordSettings/UpdaterTab";
 import VencordTab from "@components/VencordSettings/VencordTab";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { React } from "@webpack/common";
+import { i18n, React } from "@webpack/common";
 
 import gitHash from "~git-hash";
 
@@ -36,41 +36,55 @@ export default definePlugin({
     authors: [Devs.Ven, Devs.Megu],
     required: true,
 
-    patches: [{
-        find: ".versionHash",
-        replacement: [
-            {
-                match: /\[\(0,.{1,3}\.jsxs?\)\((.{1,10}),(\{[^{}}]+\{.{0,20}.versionHash,.+?\})\)," "/,
-                replace: (m, component, props) => {
-                    props = props.replace(/children:\[.+\]/, "");
-                    return `${m},$self.makeInfoElements(${component}, ${props})`;
+    patches: [
+        {
+            find: ".versionHash",
+            replacement: [
+                {
+                    match: /\[\(0,.{1,3}\.jsxs?\)\((.{1,10}),(\{[^{}}]+\{.{0,20}.versionHash,.+?\})\)," "/,
+                    replace: (m, component, props) => {
+                        props = props.replace(/children:\[.+\]/, "");
+                        return `${m},$self.makeInfoElements(${component}, ${props})`;
+                    }
                 }
+            ]
+        },
+        // Discord Stable
+        // FIXME: remove once change merged to stable
+        {
+            find: "Messages.ACTIVITY_SETTINGS",
+            replacement: {
+                get match() {
+                    switch (Settings.plugins.Settings.settingsLocation) {
+                        case "top": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.USER_SETTINGS/;
+                        case "aboveNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.BILLING_SETTINGS/;
+                        case "belowNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.APP_SETTINGS/;
+                        case "belowActivity": return /(?<=\{section:(\i\.\i)\.DIVIDER},)\{section:"changelog"/;
+                        case "bottom": return /\{section:(\i\.\i)\.CUSTOM,\s*element:.+?}/;
+                        case "aboveActivity":
+                        default:
+                            return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.ACTIVITY_SETTINGS/;
+                    }
+                },
+                replace: "...$self.makeSettingsCategories($1),$&"
+            }
+        },
+        // Discord Canary
+        {
+            find: "Messages.ACTIVITY_SETTINGS",
+            replacement: {
+                match: /(?<=section:(.{0,50})\.DIVIDER\}\))([,;])(?=.{0,200}(\i)\.push.{0,100}label:(\i)\.header)/,
+                replace: (_, sectionTypes, commaOrSemi, elements, element) => `${commaOrSemi} $self.addSettings(${elements}, ${element}, ${sectionTypes}) ${commaOrSemi}`
+            }
+        },
+        {
+            find: "Messages.USER_SETTINGS_ACTIONS_MENU_LABEL",
+            replacement: {
+                match: /(?<=function\((\i),\i\)\{)(?=let \i=Object.values\(\i.UserSettingsSections\).*?(\i)\.default\.open\()/,
+                replace: "$2.default.open($1);return;"
             }
-        ]
-    }, {
-        find: "Messages.ACTIVITY_SETTINGS",
-        replacement: {
-            get match() {
-                switch (Settings.plugins.Settings.settingsLocation) {
-                    case "top": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.USER_SETTINGS/;
-                    case "aboveNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.BILLING_SETTINGS/;
-                    case "belowNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.APP_SETTINGS/;
-                    case "belowActivity": return /(?<=\{section:(\i\.\i)\.DIVIDER},)\{section:"changelog"/;
-                    case "bottom": return /\{section:(\i\.\i)\.CUSTOM,\s*element:.+?}/;
-                    case "aboveActivity":
-                    default:
-                        return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.ACTIVITY_SETTINGS/;
-                }
-            },
-            replace: "...$self.makeSettingsCategories($1),$&"
         }
-    }, {
-        find: "Messages.USER_SETTINGS_ACTIONS_MENU_LABEL",
-        replacement: {
-            match: /(?<=function\((\i),\i\)\{)(?=let \i=Object.values\(\i.UserSettingsSections\).*?(\i)\.default\.open\()/,
-            replace: "$2.default.open($1);return;"
-        }
-    }],
+    ],
 
     customSections: [] as ((SectionTypes: Record<string, unknown>) => any)[],
 
@@ -130,19 +144,43 @@ export default definePlugin({
         ].filter(Boolean);
     },
 
+    isRightSpot({ header, settings }: { header?: string; settings?: string[]; }) {
+        const firstChild = settings?.[0];
+        // lowest two elements... sanity backup
+        if (firstChild === "LOGOUT" || firstChild === "SOCIAL_LINKS") return true;
+
+        const { settingsLocation } = Settings.plugins.Settings;
+
+        if (settingsLocation === "bottom") return firstChild === "LOGOUT";
+        if (settingsLocation === "belowActivity") return firstChild === "CHANGELOG";
+
+        const names = {
+            top: i18n.Messages.USER_SETTINGS,
+            aboveNitro: i18n.Messages.BILLING_SETTINGS,
+            belowNitro: i18n.Messages.APP_SETTINGS,
+            aboveActivity: i18n.Messages.ACTIVITY_SETTINGS
+        };
+        return header === names[settingsLocation];
+    },
+
+    addSettings(elements: any[], element: { header?: string; settings: string[]; }, sectionTypes: Record<string, unknown>) {
+        if (!this.isRightSpot(element)) return;
+
+        elements.push(...this.makeSettingsCategories(sectionTypes));
+    },
+
     options: {
         settingsLocation: {
             type: OptionType.SELECT,
             description: "Where to put the Vencord settings section",
             options: [
                 { label: "At the very top", value: "top" },
-                { label: "Above the Nitro section", value: "aboveNitro" },
+                { label: "Above the Nitro section", value: "aboveNitro", default: true },
                 { label: "Below the Nitro section", value: "belowNitro" },
-                { label: "Above Activity Settings", value: "aboveActivity", default: true },
+                { label: "Above Activity Settings", value: "aboveActivity" },
                 { label: "Below Activity Settings", value: "belowActivity" },
                 { label: "At the very bottom", value: "bottom" },
-            ],
-            restartNeeded: true
+            ]
         },
     },
 

From a54b55edad3e33c44ac1419d7d20c1724a528f7e Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 14 May 2024 18:54:00 +0200
Subject: [PATCH 564/632] bump to v1.8.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0e5845987..95f98a8ba 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.8.3",
+    "version": "1.8.4",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 719c6140f3fafb0ae04323268651f0b4f919af91 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 14 May 2024 21:18:43 +0200
Subject: [PATCH 565/632] fix Vencord Settings section being added multiple
 times

---
 src/plugins/_core/settings.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index 0a6aea8b9..b09af2c05 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -154,6 +154,8 @@ export default definePlugin({
         if (settingsLocation === "bottom") return firstChild === "LOGOUT";
         if (settingsLocation === "belowActivity") return firstChild === "CHANGELOG";
 
+        if (!header) return;
+
         const names = {
             top: i18n.Messages.USER_SETTINGS,
             aboveNitro: i18n.Messages.BILLING_SETTINGS,
@@ -163,8 +165,12 @@ export default definePlugin({
         return header === names[settingsLocation];
     },
 
+    patchedSettings: new WeakSet(),
+
     addSettings(elements: any[], element: { header?: string; settings: string[]; }, sectionTypes: Record<string, unknown>) {
-        if (!this.isRightSpot(element)) return;
+        if (this.patchedSettings.has(elements) || !this.isRightSpot(element)) return;
+
+        this.patchedSettings.add(elements);
 
         elements.push(...this.makeSettingsCategories(sectionTypes));
     },

From d8b3869b8113f304a352677907c6ee9975ee0cd1 Mon Sep 17 00:00:00 2001
From: Board <26598490+BoardTM@users.noreply.github.com>
Date: Wed, 15 May 2024 01:07:33 +0200
Subject: [PATCH 566/632] ThemeAttributes: add larger avatar url variables to
 avatars (#2449)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/themeAttributes/README.md | 10 ++++++++-
 src/plugins/themeAttributes/index.ts  | 30 ++++++++++++++++++++++++++-
 src/utils/constants.ts                |  4 ++++
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/plugins/themeAttributes/README.md b/src/plugins/themeAttributes/README.md
index 87cb803c5..89001aae4 100644
--- a/src/plugins/themeAttributes/README.md
+++ b/src/plugins/themeAttributes/README.md
@@ -1,6 +1,6 @@
 # ThemeAttributes
 
-This plugin adds data attributes to various elements inside Discord
+This plugin adds data attributes and CSS variables to various elements inside Discord
 
 This allows themes to more easily theme those elements or even do things that otherwise wouldn't be possible
 
@@ -19,3 +19,11 @@ This allows themes to more easily theme those elements or even do things that ot
 - `data-is-self` is a boolean indicating whether this is the current user's message
 
 ![image](https://github.com/Vendicated/Vencord/assets/45497981/34bd5053-3381-402f-82b2-9c812cc7e122)
+
+## CSS Variables
+
+### Avatars
+
+`--avatar-url-<resolution>` contains a URL for the users avatar with the size attribute adjusted for the resolutions `128, 256, 512, 1024, 2048, 4096`.
+
+![image](https://github.com/Vendicated/Vencord/assets/26598490/192ddac0-c827-472f-9933-fa99ff36f723)
diff --git a/src/plugins/themeAttributes/index.ts b/src/plugins/themeAttributes/index.ts
index b8ceac621..b80844546 100644
--- a/src/plugins/themeAttributes/index.ts
+++ b/src/plugins/themeAttributes/index.ts
@@ -9,10 +9,11 @@ import definePlugin from "@utils/types";
 import { UserStore } from "@webpack/common";
 import { Message } from "discord-types/general";
 
+
 export default definePlugin({
     name: "ThemeAttributes",
     description: "Adds data attributes to various elements for theming purposes",
-    authors: [Devs.Ven],
+    authors: [Devs.Ven, Devs.Board],
 
     patches: [
         // Add data-tab-id to all tab bar items
@@ -32,9 +33,36 @@ export default definePlugin({
                 match: /\.messageListItem(?=,"aria)/,
                 replace: "$&,...$self.getMessageProps(arguments[0])"
             }
+        },
+
+        // add --avatar-url-<resolution> css variable to avatar img elements
+        // popout profiles
+        {
+            find: ".LABEL_WITH_ONLINE_STATUS",
+            replacement: {
+                match: /src:null!=\i\?(\i).{1,50}"aria-hidden":!0/,
+                replace: "$&,style:$self.getAvatarStyles($1)"
+            }
+        },
+        // chat avatars
+        {
+            find: "showCommunicationDisabledStyles",
+            replacement: {
+                match: /src:(\i),"aria-hidden":!0/,
+                replace: "$&,style:$self.getAvatarStyles($1)"
+            }
         }
     ],
 
+    getAvatarStyles(src: string) {
+        return Object.fromEntries(
+            [128, 256, 512, 1024, 2048, 4096].map(size => [
+                `--avatar-url-${size}`,
+                `url(${src.replace(/\d+$/, String(size))})`
+            ])
+        );
+    },
+
     getMessageProps(props: { message: Message; }) {
         const author = props.message?.author;
         const authorId = author?.id;
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index e446a27b6..69c18cd56 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -382,6 +382,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "ant0n",
         id: 145224646868860928n
     },
+    Board: {
+        name: "BoardTM",
+        id: 285475344817848320n,
+    },
     philipbry: {
         name: "philipbry",
         id: 554994003318276106n

From 5232a85319d3db6fa30e6dd638f19582aae092c5 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <ulysseszhan@pm.me>
Date: Tue, 14 May 2024 16:18:30 -0700
Subject: [PATCH 567/632] new plugin NoServerEmoji ~ hides server emojis from
 autocomplete (#1787)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/noServerEmojis/index.ts | 50 +++++++++++++++++++++++++++++
 src/utils/constants.ts              |  4 +++
 2 files changed, 54 insertions(+)
 create mode 100644 src/plugins/noServerEmojis/index.ts

diff --git a/src/plugins/noServerEmojis/index.ts b/src/plugins/noServerEmojis/index.ts
new file mode 100644
index 000000000..ed843769c
--- /dev/null
+++ b/src/plugins/noServerEmojis/index.ts
@@ -0,0 +1,50 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+
+const settings = definePluginSettings({
+    shownEmojis: {
+        description: "The types of emojis to show in the autocomplete menu.",
+        type: OptionType.SELECT,
+        default: "onlyUnicode",
+        options: [
+            { label: "Only unicode emojis", value: "onlyUnicode" },
+            { label: "Unicode emojis and server emojis from current server", value: "currentServer" },
+            { label: "Unicode emojis and all server emojis (Discord default)", value: "all" }
+        ]
+    }
+});
+
+export default definePlugin({
+    name: "NoServerEmojis",
+    authors: [Devs.UlyssesZhan],
+    description: "Do not show server emojis in the autocomplete menu.",
+    settings,
+    patches: [
+        {
+            find: "}searchWithoutFetchingLatest(",
+            replacement: {
+                match: /searchWithoutFetchingLatest.{20,300}get\((\i).{10,40}?reduce\(\((\i),(\i)\)=>\{/,
+                replace: "$& if ($self.shouldSkip($1, $3)) return $2;"
+            }
+        }
+    ],
+    shouldSkip(guildId: string, emoji: any) {
+        if (emoji.type !== "GUILD_EMOJI") {
+            return false;
+        }
+        if (settings.store.shownEmojis === "onlyUnicode") {
+            return true;
+        }
+        if (settings.store.shownEmojis === "currentServer") {
+            return emoji.guildId !== guildId;
+        }
+        return false;
+    }
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 69c18cd56..21d891900 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -378,6 +378,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "ProffDea",
         id: 609329952180928513n
     },
+    UlyssesZhan: {
+        name: "UlyssesZhan",
+        id: 586808226058862623n
+    },
     ant0n: {
         name: "ant0n",
         id: 145224646868860928n

From 81d3f5df1a5b0faee051a7b8cd74f4f45386e4c3 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <ulysseszhan@pm.me>
Date: Tue, 14 May 2024 16:21:00 -0700
Subject: [PATCH 568/632] new plugin CtrlEnterSend (#1794)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/ctrlEnterSend/index.ts | 68 ++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 src/plugins/ctrlEnterSend/index.ts

diff --git a/src/plugins/ctrlEnterSend/index.ts b/src/plugins/ctrlEnterSend/index.ts
new file mode 100644
index 000000000..4b9dd8e06
--- /dev/null
+++ b/src/plugins/ctrlEnterSend/index.ts
@@ -0,0 +1,68 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+
+export default definePlugin({
+    name: "CtrlEnterSend",
+    authors: [Devs.UlyssesZhan],
+    description: "Use Ctrl+Enter to send messages (customizable)",
+    settings: definePluginSettings({
+        submitRule: {
+            description: "The way to send a message",
+            type: OptionType.SELECT,
+            options: [
+                {
+                    label: "Ctrl+Enter (Enter or Shift+Enter for new line)",
+                    value: "ctrl+enter"
+                },
+                {
+                    label: "Shift+Enter (Enter for new line)",
+                    value: "shift+enter"
+                },
+                {
+                    label: "Enter (Shift+Enter for new line; Discord default)",
+                    value: "enter"
+                }
+            ],
+            default: "ctrl+enter"
+        },
+        sendMessageInTheMiddleOfACodeBlock: {
+            description: "Whether to send a message in the middle of a code block",
+            type: OptionType.BOOLEAN,
+            default: true,
+        }
+    }),
+    patches: [
+        {
+            find: "KeyboardKeys.ENTER&&(!",
+            replacement: {
+                match: /(?<=(\i)\.which===\i\.KeyboardKeys.ENTER&&).{0,100}(\(0,\i\.hasOpenPlainTextCodeBlock\)\(\i\)).{0,100}(?=&&\(\i\.preventDefault)/,
+                replace: "$self.shouldSubmit($1, $2)"
+            }
+        }
+    ],
+    shouldSubmit(event: KeyboardEvent, codeblock: boolean): boolean {
+        let result = false;
+        switch (this.settings.store.submitRule) {
+            case "shift+enter":
+                result = event.shiftKey;
+                break;
+            case "ctrl+enter":
+                result = event.ctrlKey;
+                break;
+            case "enter":
+                result = !event.shiftKey && !event.ctrlKey;
+                break;
+        }
+        if (!this.settings.store.sendMessageInTheMiddleOfACodeBlock) {
+            result &&= !codeblock;
+        }
+        return result;
+    }
+});

From 97dd56ccdab091ba65b6e25efd172b0464b191d5 Mon Sep 17 00:00:00 2001
From: ! Sleepy <109904491+eepyfemboi@users.noreply.github.com>
Date: Tue, 14 May 2024 17:17:19 -0700
Subject: [PATCH 569/632] MoreUserTags: Add chat moderator tag (#2424)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/moreUserTags/index.tsx | 42 ++++++++++--------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/plugins/moreUserTags/index.tsx b/src/plugins/moreUserTags/index.tsx
index df47e5456..1257b4524 100644
--- a/src/plugins/moreUserTags/index.tsx
+++ b/src/plugins/moreUserTags/index.tsx
@@ -50,6 +50,7 @@ interface TagSettings {
     MODERATOR_STAFF: TagSetting,
     MODERATOR: TagSetting,
     VOICE_MODERATOR: TagSetting,
+    TRIAL_MODERATOR: TagSetting,
     [k: string]: TagSetting;
 }
 
@@ -93,6 +94,11 @@ const tags: Tag[] = [
         displayName: "VC Mod",
         description: "Can manage voice chats",
         permissions: ["MOVE_MEMBERS", "MUTE_MEMBERS", "DEAFEN_MEMBERS"]
+    }, {
+        name: "CHAT_MODERATOR",
+        displayName: "Chat Mod",
+        description: "Can timeout people",
+        permissions: ["MODERATE_MEMBERS"]
     }
 ];
 const defaultSettings = Object.fromEntries(
@@ -263,34 +269,14 @@ export default definePlugin({
     ],
 
     start() {
-        if (settings.store.tagSettings) return;
-        // @ts-ignore
-        if (!settings.store.visibility_WEBHOOK) settings.store.tagSettings = defaultSettings;
-        else {
-            const newSettings = { ...defaultSettings };
-            Object.entries(Vencord.PlainSettings.plugins.MoreUserTags).forEach(([name, value]) => {
-                const [setting, tag] = name.split("_");
-                if (setting === "visibility") {
-                    switch (value) {
-                        case "always":
-                            // its the default
-                            break;
-                        case "chat":
-                            newSettings[tag].showInNotChat = false;
-                            break;
-                        case "not-chat":
-                            newSettings[tag].showInChat = false;
-                            break;
-                        case "never":
-                            newSettings[tag].showInChat = false;
-                            newSettings[tag].showInNotChat = false;
-                            break;
-                    }
-                }
-                settings.store.tagSettings = newSettings;
-                delete Vencord.Settings.plugins.MoreUserTags[name];
-            });
-        }
+        settings.store.tagSettings ??= defaultSettings;
+
+        // newly added field might be missing from old users
+        settings.store.tagSettings.CHAT_MODERATOR ??= {
+            text: "Chat Mod",
+            showInChat: true,
+            showInNotChat: true
+        };
     },
 
     getPermissions(user: User, channel: Channel): string[] {

From 840d571ce2b756f2bde31296bec433930df14413 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 14 May 2024 21:34:25 -0300
Subject: [PATCH 570/632] Fix BetterSettings & StartupTimings patch

---
 src/plugins/betterSettings/index.tsx | 2 +-
 src/plugins/startupTimings/index.tsx | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/betterSettings/index.tsx b/src/plugins/betterSettings/index.tsx
index 5064bd538..e90e5c82a 100644
--- a/src/plugins/betterSettings/index.tsx
+++ b/src/plugins/betterSettings/index.tsx
@@ -119,7 +119,7 @@ export default definePlugin({
         { // Settings cog context menu
             find: "Messages.USER_SETTINGS_ACTIONS_MENU_LABEL",
             replacement: {
-                match: /\(0,\i.default\)\(\)(?=\.filter\(\i=>\{let\{section:\i\}=)/,
+                match: /\(0,\i.useDefaultUserSettingsSections\)\(\)(?=\.filter\(\i=>\{let\{section:\i\}=)/,
                 replace: "$self.wrapMenu($&)"
             }
         }
diff --git a/src/plugins/startupTimings/index.tsx b/src/plugins/startupTimings/index.tsx
index 742d822ae..cf366df38 100644
--- a/src/plugins/startupTimings/index.tsx
+++ b/src/plugins/startupTimings/index.tsx
@@ -26,10 +26,12 @@ export default definePlugin({
     description: "Adds Startup Timings to the Settings menu",
     authors: [Devs.Megu],
     patches: [{
-        find: "UserSettingsSections.PAYMENT_FLOW_MODAL_TEST_PAGE,",
+        find: "Messages.ACTIVITY_SETTINGS",
         replacement: {
-            match: /{section:\i\.UserSettingsSections\.PAYMENT_FLOW_MODAL_TEST_PAGE/,
-            replace: '{section:"StartupTimings",label:"Startup Timings",element:$self.StartupTimingPage},$&'
+            match: /(?<=}\)([,;])(\i\.settings)\.forEach.+?(\i)\.push.+}\))/,
+            replace: (_, commaOrSemi, settings, elements) => "" +
+                `${commaOrSemi}${settings}?.[0]==="CHANGELOG"` +
+                `&&${elements}.push({section:"StartupTimings",label:"Startup Timings",element:$self.StartupTimingPage})`
         }
     }],
     StartupTimingPage

From 0e4724ec0d2ee3c9bd15f81d29dcbd8fec1211ce Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 15 May 2024 03:14:02 +0200
Subject: [PATCH 571/632] Settings: remove obsolete patch; add redundancy &
 more useful dbg copy

---
 src/plugins/_core/settings.tsx | 79 +++++++++++++++++++++-------------
 1 file changed, 48 insertions(+), 31 deletions(-)

diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index b09af2c05..81d1d1797 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -30,6 +30,9 @@ import { i18n, React } from "@webpack/common";
 
 import gitHash from "~git-hash";
 
+type SectionType = "HEADER" | "DIVIDER" | "CUSTOM";
+type SectionTypes = Record<SectionType, SectionType>;
+
 export default definePlugin({
     name: "Settings",
     description: "Adds Settings UI and debug info",
@@ -41,34 +44,18 @@ export default definePlugin({
             find: ".versionHash",
             replacement: [
                 {
-                    match: /\[\(0,.{1,3}\.jsxs?\)\((.{1,10}),(\{[^{}}]+\{.{0,20}.versionHash,.+?\})\)," "/,
+                    match: /\[\(0,\i\.jsxs?\)\((.{1,10}),(\{[^{}}]+\{.{0,20}.versionHash,.+?\})\)," "/,
                     replace: (m, component, props) => {
                         props = props.replace(/children:\[.+\]/, "");
                         return `${m},$self.makeInfoElements(${component}, ${props})`;
                     }
+                },
+                {
+                    match: /copyValue:\i\.join\(" "\)/,
+                    replace: "$& + $self.getInfoString()"
                 }
             ]
         },
-        // Discord Stable
-        // FIXME: remove once change merged to stable
-        {
-            find: "Messages.ACTIVITY_SETTINGS",
-            replacement: {
-                get match() {
-                    switch (Settings.plugins.Settings.settingsLocation) {
-                        case "top": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.USER_SETTINGS/;
-                        case "aboveNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.BILLING_SETTINGS/;
-                        case "belowNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.APP_SETTINGS/;
-                        case "belowActivity": return /(?<=\{section:(\i\.\i)\.DIVIDER},)\{section:"changelog"/;
-                        case "bottom": return /\{section:(\i\.\i)\.CUSTOM,\s*element:.+?}/;
-                        case "aboveActivity":
-                        default:
-                            return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.ACTIVITY_SETTINGS/;
-                    }
-                },
-                replace: "...$self.makeSettingsCategories($1),$&"
-            }
-        },
         // Discord Canary
         {
             find: "Messages.ACTIVITY_SETTINGS",
@@ -77,6 +64,13 @@ export default definePlugin({
                 replace: (_, sectionTypes, commaOrSemi, elements, element) => `${commaOrSemi} $self.addSettings(${elements}, ${element}, ${sectionTypes}) ${commaOrSemi}`
             }
         },
+        {
+            find: "useDefaultUserSettingsSections:function",
+            replacement: {
+                match: /(?<=useDefaultUserSettingsSections:function\(\){return )(\i)\}/,
+                replace: "$self.wrapSettingsHook($1)}"
+            }
+        },
         {
             find: "Messages.USER_SETTINGS_ACTIONS_MENU_LABEL",
             replacement: {
@@ -86,9 +80,9 @@ export default definePlugin({
         }
     ],
 
-    customSections: [] as ((SectionTypes: Record<string, unknown>) => any)[],
+    customSections: [] as ((SectionTypes: SectionTypes) => any)[],
 
-    makeSettingsCategories(SectionTypes: Record<string, unknown>) {
+    makeSettingsCategories(SectionTypes: SectionTypes) {
         return [
             {
                 section: SectionTypes.HEADER,
@@ -167,7 +161,7 @@ export default definePlugin({
 
     patchedSettings: new WeakSet(),
 
-    addSettings(elements: any[], element: { header?: string; settings: string[]; }, sectionTypes: Record<string, unknown>) {
+    addSettings(elements: any[], element: { header?: string; settings: string[]; }, sectionTypes: SectionTypes) {
         if (this.patchedSettings.has(elements) || !this.isRightSpot(element)) return;
 
         this.patchedSettings.add(elements);
@@ -175,6 +169,20 @@ export default definePlugin({
         elements.push(...this.makeSettingsCategories(sectionTypes));
     },
 
+    wrapSettingsHook(originalHook: (...args: any[]) => Record<string, unknown>[]) {
+        return (...args: any[]) => {
+            const elements = originalHook(...args);
+            if (!this.patchedSettings.has(elements))
+                elements.unshift(...this.makeSettingsCategories({
+                    HEADER: "HEADER",
+                    DIVIDER: "DIVIDER",
+                    CUSTOM: "CUSTOM"
+                }));
+
+            return elements;
+        };
+    },
+
     options: {
         settingsLocation: {
             type: OptionType.SELECT,
@@ -213,15 +221,24 @@ export default definePlugin({
         return "";
     },
 
-    makeInfoElements(Component: React.ComponentType<React.PropsWithChildren>, props: React.PropsWithChildren) {
+    getInfoRows() {
         const { electronVersion, chromiumVersion, additionalInfo } = this;
 
-        return (
-            <>
-                <Component {...props}>Vencord {gitHash}{additionalInfo}</Component>
-                {electronVersion && <Component {...props}>Electron {electronVersion}</Component>}
-                {chromiumVersion && <Component {...props}>Chromium {chromiumVersion}</Component>}
-            </>
+        const rows = [`Vencord ${gitHash}${additionalInfo}`];
+
+        if (electronVersion) rows.push(`Electron ${electronVersion}`);
+        if (chromiumVersion) rows.push(`Chromium ${chromiumVersion}`);
+
+        return rows;
+    },
+
+    getInfoString() {
+        return "\n" + this.getInfoRows().join("\n");
+    },
+
+    makeInfoElements(Component: React.ComponentType<React.PropsWithChildren>, props: React.PropsWithChildren) {
+        return this.getInfoRows().map((text, i) =>
+            <Component key={i} {...props}>{text}</Component>
         );
     }
 });

From 46801de21fc587118710873bee7e78f517932cf0 Mon Sep 17 00:00:00 2001
From: mcpower <mcpower@users.noreply.github.com>
Date: Wed, 15 May 2024 11:42:09 +1000
Subject: [PATCH 572/632] chore: tidy up suggested vscode extensions list
 (#2221)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 .vscode/extensions.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index f16f1e273..e86effb19 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,11 +1,9 @@
 {
     "recommendations": [
         "dbaeumer.vscode-eslint",
-        "eamodio.gitlens",
         "EditorConfig.EditorConfig",
-        "ExodiusStudios.comment-anchors",
-        "formulahendry.auto-rename-tag",
         "GregorBiswanger.json2ts",
-        "stylelint.vscode-stylelint"
+        "stylelint.vscode-stylelint",
+        "Vendicated.vencord-companion"
     ]
 }

From 1fea8420938a4dfd519881132d5782a30604112a Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 14 May 2024 22:47:19 -0300
Subject: [PATCH 573/632] BetterFolders: Fix scrolling

---
 src/plugins/betterFolders/index.tsx | 30 +++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/plugins/betterFolders/index.tsx b/src/plugins/betterFolders/index.tsx
index d252682f8..795f19901 100644
--- a/src/plugins/betterFolders/index.tsx
+++ b/src/plugins/betterFolders/index.tsx
@@ -20,7 +20,7 @@ import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy, findStoreLazy } from "@webpack";
-import { FluxDispatcher, i18n } from "@webpack/common";
+import { FluxDispatcher, i18n, useMemo } from "@webpack/common";
 
 import FolderSideBar from "./FolderSideBar";
 
@@ -117,8 +117,8 @@ export default definePlugin({
                 },
                 // If we are rendering the Better Folders sidebar, we filter out guilds that are not in folders and unexpanded folders
                 {
-                    match: /(useStateFromStoresArray\).{0,25}let \i)=(\i\.\i.getGuildsTree\(\))/,
-                    replace: (_, rest, guildsTree) => `${rest}=$self.getGuildTree(!!arguments[0].isBetterFolders,${guildsTree},arguments[0].betterFoldersExpandedIds)`
+                    match: /\[(\i)\]=(\(0,\i\.useStateFromStoresArray\).{0,40}getGuildsTree\(\).+?}\))(?=,)/,
+                    replace: (_, originalTreeVar, rest) => `[betterFoldersOriginalTree]=${rest},${originalTreeVar}=$self.getGuildTree(!!arguments[0].isBetterFolders,betterFoldersOriginalTree,arguments[0].betterFoldersExpandedIds)`
                 },
                 // If we are rendering the Better Folders sidebar, we filter out everything but the servers and folders from the GuildsBar Guild List children
                 {
@@ -252,19 +252,21 @@ export default definePlugin({
         }
     },
 
-    getGuildTree(isBetterFolders: boolean, oldTree: any, expandedFolderIds?: Set<any>) {
-        if (!isBetterFolders || expandedFolderIds == null) return oldTree;
+    getGuildTree(isBetterFolders: boolean, originalTree: any, expandedFolderIds?: Set<any>) {
+        return useMemo(() => {
+            if (!isBetterFolders || expandedFolderIds == null) return originalTree;
 
-        const newTree = new GuildsTree();
-        // Children is every folder and guild which is not in a folder, this filters out only the expanded folders
-        newTree.root.children = oldTree.root.children.filter(guildOrFolder => expandedFolderIds.has(guildOrFolder.id));
-        // Nodes is every folder and guild, even if it's in a folder, this filters out only the expanded folders and guilds inside them
-        newTree.nodes = Object.fromEntries(
-            Object.entries(oldTree.nodes)
-                .filter(([_, guildOrFolder]: any[]) => expandedFolderIds.has(guildOrFolder.id) || expandedFolderIds.has(guildOrFolder.parentId))
-        );
+            const newTree = new GuildsTree();
+            // Children is every folder and guild which is not in a folder, this filters out only the expanded folders
+            newTree.root.children = originalTree.root.children.filter(guildOrFolder => expandedFolderIds.has(guildOrFolder.id));
+            // Nodes is every folder and guild, even if it's in a folder, this filters out only the expanded folders and guilds inside them
+            newTree.nodes = Object.fromEntries(
+                Object.entries(originalTree.nodes)
+                    .filter(([_, guildOrFolder]: any[]) => expandedFolderIds.has(guildOrFolder.id) || expandedFolderIds.has(guildOrFolder.parentId))
+            );
 
-        return newTree;
+            return newTree;
+        }, [isBetterFolders, originalTree, expandedFolderIds]);
     },
 
     makeGuildsBarGuildListFilter(isBetterFolders: boolean) {

From 4d572670f15d1ce2ffde979eb70714e251d09443 Mon Sep 17 00:00:00 2001
From: Eric <45801973+waresnew@users.noreply.github.com>
Date: Tue, 14 May 2024 22:10:29 -0400
Subject: [PATCH 574/632] new plugin ValidReply ~ fix "Message could not be
 loaded" (#2337)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/validReply/README.md |   7 ++
 src/plugins/validReply/index.ts  | 106 +++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 src/plugins/validReply/README.md
 create mode 100644 src/plugins/validReply/index.ts

diff --git a/src/plugins/validReply/README.md b/src/plugins/validReply/README.md
new file mode 100644
index 000000000..49e313cf5
--- /dev/null
+++ b/src/plugins/validReply/README.md
@@ -0,0 +1,7 @@
+# ValidReply
+
+Fixes referenced (replied to) messages showing as "Message could not be loaded".
+
+Hover the text to load the message!
+
+![](https://github.com/Vendicated/Vencord/assets/45801973/d3286acf-e822-4b7f-a4e7-8ced18f581af)
diff --git a/src/plugins/validReply/index.ts b/src/plugins/validReply/index.ts
new file mode 100644
index 000000000..21a1bdd1f
--- /dev/null
+++ b/src/plugins/validReply/index.ts
@@ -0,0 +1,106 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+import { FluxDispatcher, RestAPI } from "@webpack/common";
+import { Message, User } from "discord-types/general";
+import { Channel } from "discord-types/general/index.js";
+
+const enum ReferencedMessageState {
+    Loaded,
+    NotLoaded,
+    Deleted
+}
+
+interface Reply {
+    baseAuthor: User,
+    baseMessage: Message;
+    channel: Channel;
+    referencedMessage: { state: ReferencedMessageState; };
+    compact: boolean;
+    isReplyAuthorBlocked: boolean;
+}
+
+const fetching = new Map<string, string>();
+let ReplyStore: any;
+
+const { createMessageRecord } = findByPropsLazy("createMessageRecord");
+
+export default definePlugin({
+    name: "ValidReply",
+    description: 'Fixes "Message could not be loaded" upon hovering over the reply',
+    authors: [Devs.newwares],
+    patches: [
+        {
+            find: "Messages.REPLY_QUOTE_MESSAGE_NOT_LOADED",
+            replacement: {
+                match: /Messages\.REPLY_QUOTE_MESSAGE_NOT_LOADED/,
+                replace: "$&,onMouseEnter:()=>$self.fetchReply(arguments[0])"
+            }
+        },
+        {
+            find: "ReferencedMessageStore",
+            replacement: {
+                match: /constructor\(\)\{\i\(this,"_channelCaches",new Map\)/,
+                replace: "$&;$self.setReplyStore(this);"
+            }
+        }
+    ],
+
+    setReplyStore(store: any) {
+        ReplyStore = store;
+    },
+
+    async fetchReply(reply: Reply) {
+        const { channel_id: channelId, message_id: messageId } = reply.baseMessage.messageReference!;
+
+        if (fetching.has(messageId)) {
+            return;
+        }
+        fetching.set(messageId, channelId);
+
+        RestAPI.get({
+            url: `/channels/${channelId}/messages`,
+            query: {
+                limit: 1,
+                around: messageId
+            },
+            retries: 2
+        })
+            .then(res => {
+                const reply: Message | undefined = res?.body?.[0];
+                if (!reply) return;
+
+                if (reply.id !== messageId) {
+                    ReplyStore.set(channelId, messageId, {
+                        state: ReferencedMessageState.Deleted
+                    });
+
+                    FluxDispatcher.dispatch({
+                        type: "MESSAGE_DELETE",
+                        channelId: channelId,
+                        message: messageId
+                    });
+                } else {
+                    ReplyStore.set(reply.channel_id, reply.id, {
+                        state: ReferencedMessageState.Loaded,
+                        message: createMessageRecord(reply)
+                    });
+
+                    FluxDispatcher.dispatch({
+                        type: "MESSAGE_UPDATE",
+                        message: reply
+                    });
+                }
+            })
+            .catch(() => { })
+            .finally(() => {
+                fetching.delete(messageId);
+            });
+    }
+});

From f4d64616904dabc1b8bd4dd15fccc31c45c147d0 Mon Sep 17 00:00:00 2001
From: Aztup <55710232+Aztup@users.noreply.github.com>
Date: Wed, 15 May 2024 04:35:00 +0200
Subject: [PATCH 575/632] feat(plugins/openInApp) Add tidal support (#2404)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/main/utils/constants.ts    |  1 +
 src/plugins/openInApp/index.ts | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/main/utils/constants.ts b/src/main/utils/constants.ts
index 6c076c328..9513da51c 100644
--- a/src/main/utils/constants.ts
+++ b/src/main/utils/constants.ts
@@ -35,6 +35,7 @@ export const ALLOWED_PROTOCOLS = [
     "steam:",
     "spotify:",
     "com.epicgames.launcher:",
+    "tidal:"
 ];
 
 export const IS_VANILLA = /* @__PURE__ */ process.argv.includes("--vanilla");
diff --git a/src/plugins/openInApp/index.ts b/src/plugins/openInApp/index.ts
index 0835c0612..83da5f3c3 100644
--- a/src/plugins/openInApp/index.ts
+++ b/src/plugins/openInApp/index.ts
@@ -26,6 +26,7 @@ const ShortUrlMatcher = /^https:\/\/(spotify\.link|s\.team)\/.+$/;
 const SpotifyMatcher = /^https:\/\/open\.spotify\.com\/(track|album|artist|playlist|user|episode)\/(.+)(?:\?.+?)?$/;
 const SteamMatcher = /^https:\/\/(steamcommunity\.com|(?:help|store)\.steampowered\.com)\/.+$/;
 const EpicMatcher = /^https:\/\/store\.epicgames\.com\/(.+)$/;
+const TidalMatcher = /^https:\/\/tidal\.com\/browse\/(track|album|artist|playlist|user|video|mix)\/(.+)(?:\?.+?)?$/;
 
 const settings = definePluginSettings({
     spotify: {
@@ -42,6 +43,11 @@ const settings = definePluginSettings({
         type: OptionType.BOOLEAN,
         description: "Open Epic Games links in the Epic Games Launcher",
         default: true,
+    },
+    tidal: {
+        type: OptionType.BOOLEAN,
+        description: "Open Tidal links in the Tidal app",
+        default: true,
     }
 });
 
@@ -49,7 +55,7 @@ const Native = VencordNative.pluginHelpers.OpenInApp as PluginNative<typeof impo
 
 export default definePlugin({
     name: "OpenInApp",
-    description: "Open Spotify, Steam and Epic Games URLs in their respective apps instead of your browser",
+    description: "Open Spotify, Tidal, Steam and Epic Games URLs in their respective apps instead of your browser",
     authors: [Devs.Ven],
     settings,
 
@@ -127,6 +133,19 @@ export default definePlugin({
             return true;
         }
 
+        tidal: {
+            if (!settings.store.tidal) break tidal;
+
+            const match = TidalMatcher.exec(url);
+            if (!match) break tidal;
+
+            const [, type, id] = match;
+            VencordNative.native.openExternal(`tidal://${type}/${id}`);
+
+            event?.preventDefault();
+            return true;
+        }
+
         // in case short url didn't end up being something we can handle
         if (event?.defaultPrevented) {
             window.open(url, "_blank");

From 4da8b9aad79afff758aaf039529f5b05926e1975 Mon Sep 17 00:00:00 2001
From: ScattrdBlade <61068313+ScattrdBlade@users.noreply.github.com>
Date: Tue, 14 May 2024 22:44:47 -0400
Subject: [PATCH 576/632] PetPet: Fix Upload Image Option (#2461)

---
 src/plugins/crashHandler/index.ts    | 25 +++++++++++++------------
 src/plugins/fakeNitro/index.tsx      |  5 ++---
 src/plugins/petpet/index.ts          | 17 ++++++++++++-----
 src/utils/constants.ts               |  6 +++++-
 src/webpack/common/stores.ts         |  7 +------
 src/webpack/common/types/stores.d.ts |  9 +++++++++
 src/webpack/common/utils.ts          |  2 ++
 src/webpack/webpack.ts               |  2 +-
 8 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/plugins/crashHandler/index.ts b/src/plugins/crashHandler/index.ts
index 10053021f..3297ca300 100644
--- a/src/plugins/crashHandler/index.ts
+++ b/src/plugins/crashHandler/index.ts
@@ -24,22 +24,20 @@ import { closeAllModals } from "@utils/modal";
 import definePlugin, { OptionType } from "@utils/types";
 import { maybePromptToUpdate } from "@utils/updater";
 import { filters, findBulk, proxyLazyWebpack } from "@webpack";
-import { FluxDispatcher, NavigationRouter, SelectedChannelStore } from "@webpack/common";
+import { DraftType, FluxDispatcher, NavigationRouter, SelectedChannelStore } from "@webpack/common";
 
 const CrashHandlerLogger = new Logger("CrashHandler");
-const { ModalStack, DraftManager, DraftType, closeExpressionPicker } = proxyLazyWebpack(() => {
-    const modules = findBulk(
+
+const { ModalStack, DraftManager, closeExpressionPicker } = proxyLazyWebpack(() => {
+    const [ModalStack, DraftManager, ExpressionManager] = findBulk(
         filters.byProps("pushLazy", "popAll"),
         filters.byProps("clearDraft", "saveDraft"),
-        filters.byProps("DraftType"),
-        filters.byProps("closeExpressionPicker", "openExpressionPicker"),
-    );
+        filters.byProps("closeExpressionPicker", "openExpressionPicker"),);
 
     return {
-        ModalStack: modules[0],
-        DraftManager: modules[1],
-        DraftType: modules[2]?.DraftType,
-        closeExpressionPicker: modules[3]?.closeExpressionPicker,
+        ModalStack,
+        DraftManager,
+        closeExpressionPicker: ExpressionManager?.closeExpressionPicker,
     };
 });
 
@@ -137,8 +135,11 @@ export default definePlugin({
         try {
             const channelId = SelectedChannelStore.getChannelId();
 
-            DraftManager.clearDraft(channelId, DraftType.ChannelMessage);
-            DraftManager.clearDraft(channelId, DraftType.FirstThreadMessage);
+            for (const key in DraftType) {
+                if (!Number.isNaN(Number(key))) continue;
+
+                DraftManager.clearDraft(channelId, DraftType[key]);
+            }
         } catch (err) {
             CrashHandlerLogger.debug("Failed to clear drafts.", err);
         }
diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 293183664..a55a7771e 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -24,13 +24,12 @@ import { getCurrentGuild } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy, findStoreLazy, proxyLazyWebpack } from "@webpack";
-import { Alerts, ChannelStore, EmojiStore, FluxDispatcher, Forms, IconUtils, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
+import { Alerts, ChannelStore, DraftType, EmojiStore, FluxDispatcher, Forms, IconUtils, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
 import type { CustomEmoji } from "@webpack/types";
 import type { Message } from "discord-types/general";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
 import type { ReactElement, ReactNode } from "react";
 
-const DRAFT_TYPE = 0;
 const StickerStore = findStoreLazy("StickersStore") as {
     getPremiumPacks(): StickerPack[];
     getAllGuildStickers(): Map<string, Sticker[]>;
@@ -807,7 +806,7 @@ export default definePlugin({
         gif.finish();
 
         const file = new File([gif.bytesView()], `${stickerId}.gif`, { type: "image/gif" });
-        UploadHandler.promptToUpload([file], ChannelStore.getChannel(channelId), DRAFT_TYPE);
+        UploadHandler.promptToUpload([file], ChannelStore.getChannel(channelId), DraftType.ChannelMessage);
     },
 
     canUseEmote(e: CustomEmoji, channelId: string) {
diff --git a/src/plugins/petpet/index.ts b/src/plugins/petpet/index.ts
index 3f9743255..2e06d0b17 100644
--- a/src/plugins/petpet/index.ts
+++ b/src/plugins/petpet/index.ts
@@ -21,10 +21,9 @@ import { Devs } from "@utils/constants";
 import { makeLazy } from "@utils/lazy";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { UploadHandler, UserUtils } from "@webpack/common";
+import { DraftType, UploadHandler, UploadManager, UserUtils } from "@webpack/common";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
 
-const DRAFT_TYPE = 0;
 const DEFAULT_DELAY = 20;
 const DEFAULT_RESOLUTION = 128;
 const FRAMES = 10;
@@ -59,9 +58,12 @@ async function resolveImage(options: Argument[], ctx: CommandContext, noServerPf
     for (const opt of options) {
         switch (opt.name) {
             case "image":
-                const upload = UploadStore.getUploads(ctx.channel.id, DRAFT_TYPE)[0];
+                const upload = UploadStore.getUpload(ctx.channel.id, opt.name, DraftType.SlashCommand);
                 if (upload) {
-                    if (!upload.isImage) throw "Upload is not an image";
+                    if (!upload.isImage) {
+                        UploadManager.clearAll(ctx.channel.id, DraftType.SlashCommand);
+                        throw "Upload is not an image";
+                    }
                     return upload.item.file;
                 }
                 break;
@@ -73,10 +75,12 @@ async function resolveImage(options: Argument[], ctx: CommandContext, noServerPf
                     return user.getAvatarURL(noServerPfp ? void 0 : ctx.guild?.id, 2048).replace(/\?size=\d+$/, "?size=2048");
                 } catch (err) {
                     console.error("[petpet] Failed to fetch user\n", err);
+                    UploadManager.clearAll(ctx.channel.id, DraftType.SlashCommand);
                     throw "Failed to fetch user. Check the console for more info.";
                 }
         }
     }
+    UploadManager.clearAll(ctx.channel.id, DraftType.SlashCommand);
     return null;
 }
 
@@ -130,6 +134,7 @@ export default definePlugin({
                     var url = await resolveImage(opts, cmdCtx, noServerPfp);
                     if (!url) throw "No Image specified!";
                 } catch (err) {
+                    UploadManager.clearAll(cmdCtx.channel.id, DraftType.SlashCommand);
                     sendBotMessage(cmdCtx.channel.id, {
                         content: String(err),
                     });
@@ -147,6 +152,8 @@ export default definePlugin({
                 canvas.width = canvas.height = resolution;
                 const ctx = canvas.getContext("2d")!;
 
+                UploadManager.clearAll(cmdCtx.channel.id, DraftType.SlashCommand);
+
                 for (let i = 0; i < FRAMES; i++) {
                     ctx.clearRect(0, 0, canvas.width, canvas.height);
 
@@ -174,7 +181,7 @@ export default definePlugin({
                 const file = new File([gif.bytesView()], "petpet.gif", { type: "image/gif" });
                 // Immediately after the command finishes, Discord clears all input, including pending attachments.
                 // Thus, setTimeout is needed to make this execute after Discord cleared the input
-                setTimeout(() => UploadHandler.promptToUpload([file], cmdCtx.channel, DRAFT_TYPE), 10);
+                setTimeout(() => UploadHandler.promptToUpload([file], cmdCtx.channel, DraftType.ChannelMessage), 10);
             },
         },
     ]
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 21d891900..a77edf7d5 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -485,7 +485,11 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     xocherry: {
         name: "xocherry",
         id: 221288171013406720n
-    }
+    },
+    ScattrdBlade: {
+        name: "ScattrdBlade",
+        id: 678007540608532491n
+    },
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly
diff --git a/src/webpack/common/stores.ts b/src/webpack/common/stores.ts
index be5721ff3..123c62b05 100644
--- a/src/webpack/common/stores.ts
+++ b/src/webpack/common/stores.ts
@@ -27,12 +27,7 @@ export const Flux: t.Flux = findByPropsLazy("connectStores");
 
 export type GenericStore = t.FluxStore & Record<string, any>;
 
-export enum DraftType {
-    ChannelMessage = 0,
-    ThreadSettings = 1,
-    FirstThreadMessage = 2,
-    ApplicationLauncherCommand = 3
-}
+export const { DraftType }: { DraftType: typeof t.DraftType; } = findByPropsLazy("DraftType");
 
 export let MessageStore: Omit<Stores.MessageStore, "getMessages"> & {
     getMessages(chanId: string): any;
diff --git a/src/webpack/common/types/stores.d.ts b/src/webpack/common/types/stores.d.ts
index d6bf3aaf3..27715b5ee 100644
--- a/src/webpack/common/types/stores.d.ts
+++ b/src/webpack/common/types/stores.d.ts
@@ -173,6 +173,15 @@ export class DraftStore extends FluxStore {
     getThreadSettings(channelId: string): any | null;
 }
 
+export enum DraftType {
+    ChannelMessage,
+    ThreadSettings,
+    FirstThreadMessage,
+    ApplicationLauncherCommand,
+    Poll,
+    SlashCommand,
+}
+
 export class GuildStore extends FluxStore {
     getGuild(guildId: string): Guild;
     getGuildCount(): number;
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 6d74e9b25..2cd636d8e 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -119,6 +119,8 @@ export function showToast(message: string, type = ToastType.MESSAGE) {
 }
 
 export const UserUtils = findByPropsLazy("getUser", "fetchCurrentUser") as { getUser: (id: string) => Promise<User>; };
+
+export const UploadManager = findByPropsLazy("clearAll", "addFile");
 export const UploadHandler = findByPropsLazy("showUploadFileSizeExceededError", "promptToUpload") as {
     promptToUpload: (files: File[], channel: Channel, draftType: Number) => void;
 };
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 34a9b69c9..8ea6713d0 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -432,7 +432,7 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = Def
     }
 
     const [, rawChunkIds, entryPointId] = match;
-    if (Number.isNaN(entryPointId)) {
+    if (Number.isNaN(Number(entryPointId))) {
         const err = new Error("extractAndLoadChunks: Matcher didn't return a capturing group with the chunk ids array, or the entry point id returned as the second group wasn't a number");
         logger.warn(err, "Code:", code, "Matcher:", matcher);
 

From f74da73086b2b361490e028c999c80b3ac2ba76a Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 14 May 2024 23:57:43 -0300
Subject: [PATCH 577/632] feat: Allow finds to use regex (#2452)

---
 .../VencordSettings/PatchHelperTab.tsx        | 44 ++++++++++++++-----
 src/utils/types.ts                            |  8 +++-
 src/webpack/patchWebpack.ts                   |  7 ++-
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/src/components/VencordSettings/PatchHelperTab.tsx b/src/components/VencordSettings/PatchHelperTab.tsx
index 064c872ab..9e2980e7e 100644
--- a/src/components/VencordSettings/PatchHelperTab.tsx
+++ b/src/components/VencordSettings/PatchHelperTab.tsx
@@ -180,7 +180,8 @@ function ReplacementInput({ replacement, setReplacement, replacementError }) {
 
     return (
         <>
-            <Forms.FormTitle>replacement</Forms.FormTitle>
+            {/* FormTitle adds a class if className is not set, so we set it to an empty string to prevent that */}
+            <Forms.FormTitle className="">replacement</Forms.FormTitle>
             <TextInput
                 value={replacement?.toString()}
                 onChange={onChange}
@@ -188,7 +189,7 @@ function ReplacementInput({ replacement, setReplacement, replacementError }) {
             />
             {!isFunc && (
                 <div className="vc-text-selectable">
-                    <Forms.FormTitle>Cheat Sheet</Forms.FormTitle>
+                    <Forms.FormTitle className={Margins.top8}>Cheat Sheet</Forms.FormTitle>
                     {Object.entries({
                         "\\i": "Special regex escape sequence that matches identifiers (varnames, classnames, etc.)",
                         "$$": "Insert a $",
@@ -220,11 +221,12 @@ function ReplacementInput({ replacement, setReplacement, replacementError }) {
 
 interface FullPatchInputProps {
     setFind(v: string): void;
+    setParsedFind(v: string | RegExp): void;
     setMatch(v: string): void;
     setReplacement(v: string | ReplaceFn): void;
 }
 
-function FullPatchInput({ setFind, setMatch, setReplacement }: FullPatchInputProps) {
+function FullPatchInput({ setFind, setParsedFind, setMatch, setReplacement }: FullPatchInputProps) {
     const [fullPatch, setFullPatch] = React.useState<string>("");
     const [fullPatchError, setFullPatchError] = React.useState<string>("");
 
@@ -233,6 +235,7 @@ function FullPatchInput({ setFind, setMatch, setReplacement }: FullPatchInputPro
             setFullPatchError("");
 
             setFind("");
+            setParsedFind("");
             setMatch("");
             setReplacement("");
             return;
@@ -256,7 +259,8 @@ function FullPatchInput({ setFind, setMatch, setReplacement }: FullPatchInputPro
             if (!parsed.replacement.match) throw new Error("No 'replacement.match' field");
             if (!parsed.replacement.replace) throw new Error("No 'replacement.replace' field");
 
-            setFind(parsed.find);
+            setFind(parsed.find instanceof RegExp ? parsed.find.toString() : parsed.find);
+            setParsedFind(parsed.find);
             setMatch(parsed.replacement.match instanceof RegExp ? parsed.replacement.match.source : parsed.replacement.match);
             setReplacement(parsed.replacement.replace);
             setFullPatchError("");
@@ -266,7 +270,7 @@ function FullPatchInput({ setFind, setMatch, setReplacement }: FullPatchInputPro
     }
 
     return <>
-        <Forms.FormText>Paste your full JSON patch here to fill out the fields</Forms.FormText>
+        <Forms.FormText className={Margins.bottom8}>Paste your full JSON patch here to fill out the fields</Forms.FormText>
         <TextArea value={fullPatch} onChange={setFullPatch} onBlur={update} />
         {fullPatchError !== "" && <Forms.FormText style={{ color: "var(--text-danger)" }}>{fullPatchError}</Forms.FormText>}
     </>;
@@ -274,6 +278,7 @@ function FullPatchInput({ setFind, setMatch, setReplacement }: FullPatchInputPro
 
 function PatchHelper() {
     const [find, setFind] = React.useState<string>("");
+    const [parsedFind, setParsedFind] = React.useState<string | RegExp>("");
     const [match, setMatch] = React.useState<string>("");
     const [replacement, setReplacement] = React.useState<string | ReplaceFn>("");
 
@@ -285,20 +290,34 @@ function PatchHelper() {
     const code = React.useMemo(() => {
         return `
 {
-    find: ${JSON.stringify(find)},
+    find: ${parsedFind instanceof RegExp ? parsedFind.toString() : JSON.stringify(parsedFind)},
     replacement: {
         match: /${match.replace(/(?<!\\)\//g, "\\/")}/,
         replace: ${typeof replacement === "function" ? replacement.toString() : JSON.stringify(replacement)}
     }
 }
         `.trim();
-    }, [find, match, replacement]);
+    }, [parsedFind, match, replacement]);
 
     function onFindChange(v: string) {
         setFindError(void 0);
         setFind(v);
-        if (v.length) {
-            findCandidates({ find: v, setModule, setError: setFindError });
+    }
+
+    function onFindBlur() {
+        try {
+            let parsedFind = find as string | RegExp;
+            if (/^\/.+?\/$/.test(find)) parsedFind = new RegExp(find.slice(1, -1));
+
+            setFindError(void 0);
+            setFind(find);
+            setParsedFind(parsedFind);
+
+            if (find.length) {
+                findCandidates({ find: parsedFind, setModule, setError: setFindError });
+            }
+        } catch (e: any) {
+            setFindError((e as Error).message);
         }
     }
 
@@ -317,19 +336,21 @@ function PatchHelper() {
             <Forms.FormTitle>full patch</Forms.FormTitle>
             <FullPatchInput
                 setFind={onFindChange}
+                setParsedFind={setParsedFind}
                 setMatch={onMatchChange}
                 setReplacement={setReplacement}
             />
 
-            <Forms.FormTitle>find</Forms.FormTitle>
+            <Forms.FormTitle className={Margins.top8}>find</Forms.FormTitle>
             <TextInput
                 type="text"
                 value={find}
                 onChange={onFindChange}
+                onBlur={onFindBlur}
                 error={findError}
             />
 
-            <Forms.FormTitle>match</Forms.FormTitle>
+            <Forms.FormTitle className={Margins.top8}>match</Forms.FormTitle>
             <CheckedTextInput
                 value={match}
                 onChange={onMatchChange}
@@ -342,6 +363,7 @@ function PatchHelper() {
                 }}
             />
 
+            <div className={Margins.top8} />
             <ReplacementInput
                 replacement={replacement}
                 setReplacement={setReplacement}
diff --git a/src/utils/types.ts b/src/utils/types.ts
index bec7cb0b3..8f2ee8632 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -29,14 +29,19 @@ export default function definePlugin<P extends PluginDef>(p: P & Record<string,
 export type ReplaceFn = (match: string, ...groups: string[]) => string;
 
 export interface PatchReplacement {
+    /** The match for the patch replacement. If you use a string it will be implicitly converted to a RegExp */
     match: string | RegExp;
+    /** The replacement string or function which returns the string for the patch replacement */
     replace: string | ReplaceFn;
+    /** A function which returns whether this patch replacement should be applied */
     predicate?(): boolean;
 }
 
 export interface Patch {
     plugin: string;
-    find: string;
+    /** A string or RegExp which is only include/matched in the module code you wish to patch. Prefer only using a RegExp if a simple string test is not enough */
+    find: string | RegExp;
+    /** The replacement(s) for the module being patched */
     replacement: PatchReplacement | PatchReplacement[];
     /** Whether this patch should apply to multiple modules */
     all?: boolean;
@@ -44,6 +49,7 @@ export interface Patch {
     noWarn?: boolean;
     /** Only apply this set of replacements if all of them succeed. Use this if your replacements depend on each other */
     group?: boolean;
+    /** A function which returns whether this patch should be applied */
     predicate?(): boolean;
 }
 
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index d3de20727..c7e424671 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -257,7 +257,12 @@ function patchFactories(factories: Record<string, (module: any, exports: any, re
         for (let i = 0; i < patches.length; i++) {
             const patch = patches[i];
             if (patch.predicate && !patch.predicate()) continue;
-            if (!code.includes(patch.find)) continue;
+
+            const moduleMatches = typeof patch.find === "string"
+                ? code.includes(patch.find)
+                : patch.find.test(code);
+
+            if (!moduleMatches) continue;
 
             patchedBy.add(patch.plugin);
 

From 54f58cd7c954a936cb833448ac0dfe027c647511 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 15 May 2024 00:38:07 -0300
Subject: [PATCH 578/632] Fix: Canonicalize regex finds

---
 scripts/generateReport.ts | 4 +++-
 src/plugins/index.ts      | 7 ++++++-
 src/utils/patches.ts      | 8 +++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 912f38eda..164e409df 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -303,8 +303,10 @@ async function runtime(token: string) {
                 delete patch.predicate;
                 delete patch.group;
 
-                if (!Array.isArray(patch.replacement))
+                Vencord.Util.canonicalizeFind(patch);
+                if (!Array.isArray(patch.replacement)) {
                     patch.replacement = [patch.replacement];
+                }
 
                 patch.replacement.forEach(r => {
                     delete r.predicate;
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 488847d15..3291885c1 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -20,6 +20,7 @@ import { registerCommand, unregisterCommand } from "@api/Commands";
 import { addContextMenuPatch, removeContextMenuPatch } from "@api/ContextMenu";
 import { Settings } from "@api/Settings";
 import { Logger } from "@utils/Logger";
+import { canonicalizeFind } from "@utils/patches";
 import { Patch, Plugin, StartAt } from "@utils/types";
 import { FluxDispatcher } from "@webpack/common";
 import { FluxEvents } from "@webpack/types";
@@ -83,8 +84,12 @@ for (const p of pluginsValues) {
     if (p.patches && isPluginEnabled(p.name)) {
         for (const patch of p.patches) {
             patch.plugin = p.name;
-            if (!Array.isArray(patch.replacement))
+
+            canonicalizeFind(patch);
+            if (!Array.isArray(patch.replacement)) {
                 patch.replacement = [patch.replacement];
+            }
+
             patches.push(patch);
         }
     }
diff --git a/src/utils/patches.ts b/src/utils/patches.ts
index 99f0595d6..87f3ce78c 100644
--- a/src/utils/patches.ts
+++ b/src/utils/patches.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { PatchReplacement, ReplaceFn } from "./types";
+import { Patch, PatchReplacement, ReplaceFn } from "./types";
 
 export function canonicalizeMatch<T extends RegExp | string>(match: T): T {
     if (typeof match === "string") return match;
@@ -55,3 +55,9 @@ export function canonicalizeReplacement(replacement: Pick<PatchReplacement, "mat
     );
     Object.defineProperties(replacement, descriptors);
 }
+
+export function canonicalizeFind(patch: Patch) {
+    const descriptors = Object.getOwnPropertyDescriptors(patch);
+    descriptors.find = canonicalizeDescriptor(descriptors.find, canonicalizeMatch);
+    Object.defineProperties(patch, descriptors);
+}

From 0460374af060ed2fa2786de3acd8e12466b3b2df Mon Sep 17 00:00:00 2001
From: Eric <45801973+waresnew@users.noreply.github.com>
Date: Wed, 15 May 2024 21:46:09 -0400
Subject: [PATCH 579/632] Fix: Plugins without start/stop function failing to
 stop/start (#2463)

---
 src/plugins/index.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 3291885c1..a434b4a6f 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -170,13 +170,14 @@ export const startPlugin = traceFunction("startPlugin", function startPlugin(p:
         }
         try {
             p.start();
-            p.started = true;
         } catch (e) {
             logger.error(`Failed to start ${name}\n`, e);
             return false;
         }
     }
 
+    p.started = true;
+
     if (commands?.length) {
         logger.debug("Registering commands of plugin", name);
         for (const cmd of commands) {
@@ -206,6 +207,7 @@ export const startPlugin = traceFunction("startPlugin", function startPlugin(p:
 
 export const stopPlugin = traceFunction("stopPlugin", function stopPlugin(p: Plugin) {
     const { name, commands, flux, contextMenus } = p;
+
     if (p.stop) {
         logger.info("Stopping plugin", name);
         if (!p.started) {
@@ -214,13 +216,14 @@ export const stopPlugin = traceFunction("stopPlugin", function stopPlugin(p: Plu
         }
         try {
             p.stop();
-            p.started = false;
         } catch (e) {
             logger.error(`Failed to stop ${name}\n`, e);
             return false;
         }
     }
 
+    p.started = false;
+
     if (commands?.length) {
         logger.debug("Unregistering commands of plugin", name);
         for (const cmd of commands) {

From c0c897fc237df5e60be759966a12c8e2478ee9ef Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 15 May 2024 23:00:21 -0300
Subject: [PATCH 580/632] extractAndLoadChunksLazy: Cache result to avoid
 searching factories everytime

---
 src/webpack/webpack.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 8ea6713d0..0bee08f32 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { proxyLazy } from "@utils/lazy";
+import { makeLazy, proxyLazy } from "@utils/lazy";
 import { LazyComponent } from "@utils/lazyReact";
 import { Logger } from "@utils/Logger";
 import { canonicalizeMatch } from "@utils/patches";
@@ -462,7 +462,7 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = Def
 export function extractAndLoadChunksLazy(code: string[], matcher = DefaultExtractAndLoadChunksRegex) {
     if (IS_DEV) lazyWebpackSearchHistory.push(["extractAndLoadChunks", [code, matcher]]);
 
-    return () => extractAndLoadChunks(code, matcher);
+    return makeLazy(() => extractAndLoadChunks(code, matcher));
 }
 
 /**

From 7b4ecff67e08fecfc91d01cc44a02992b520b948 Mon Sep 17 00:00:00 2001
From: rozbrajaczpoziomow <roz@rozbrajacz.futbol>
Date: Thu, 16 May 2024 04:22:45 +0200
Subject: [PATCH 581/632] feat(MessageLatency): Show milliseconds option
 (#2454)

---
 src/plugins/messageLatency/index.tsx | 36 ++++++++++++++++++----------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/plugins/messageLatency/index.tsx b/src/plugins/messageLatency/index.tsx
index 301e605fb..6f0f68577 100644
--- a/src/plugins/messageLatency/index.tsx
+++ b/src/plugins/messageLatency/index.tsx
@@ -22,9 +22,10 @@ interface Diff {
     hours: number,
     minutes: number,
     seconds: number;
+    milliseconds: number;
 }
 
-const DISCORD_KT_DELAY = 1471228.928;
+const DISCORD_KT_DELAY = 14712289280;
 const HiddenVisually = findExportedComponentLazy("HiddenVisually");
 
 export default definePlugin({
@@ -42,6 +43,11 @@ export default definePlugin({
             type: OptionType.BOOLEAN,
             description: "Detect old Discord Android clients",
             default: true
+        },
+        showMillis: {
+            type: OptionType.BOOLEAN,
+            description: "Show milliseconds",
+            default: false
         }
     }),
 
@@ -55,12 +61,13 @@ export default definePlugin({
         }
     ],
 
-    stringDelta(delta: number) {
+    stringDelta(delta: number, showMillis: boolean) {
         const diff: Diff = {
-            days: Math.round(delta / (60 * 60 * 24)),
-            hours: Math.round((delta / (60 * 60)) % 24),
-            minutes: Math.round((delta / (60)) % 60),
-            seconds: Math.round(delta % 60),
+            days: Math.round(delta / (60 * 60 * 24 * 1000)),
+            hours: Math.round((delta / (60 * 60 * 1000)) % 24),
+            minutes: Math.round((delta / (60 * 1000)) % 60),
+            seconds: Math.round(delta / 1000 % 60),
+            milliseconds: Math.round(delta % 1000)
         };
 
         const str = (k: DiffKey) => diff[k] > 0 ? `${diff[k]} ${diff[k] > 1 ? k : k.substring(0, k.length - 1)}` : null;
@@ -72,7 +79,7 @@ export default definePlugin({
             return prev + (
                 isNonNullish(s)
                     ? (prev !== ""
-                        ? k === "seconds"
+                        ? (showMillis ? k === "milliseconds" : k === "seconds")
                             ? " and "
                             : " "
                         : "") + s
@@ -84,18 +91,21 @@ export default definePlugin({
     },
 
     latencyTooltipData(message: Message) {
-        const { latency, detectDiscordKotlin } = this.settings.store;
+        const { latency, detectDiscordKotlin, showMillis } = this.settings.store;
         const { id, nonce } = message;
 
         // Message wasn't received through gateway
         if (!isNonNullish(nonce)) return null;
 
         let isDiscordKotlin = false;
-        let delta = Math.round((SnowflakeUtils.extractTimestamp(id) - SnowflakeUtils.extractTimestamp(nonce)) / 1000);
+        let delta = SnowflakeUtils.extractTimestamp(id) - SnowflakeUtils.extractTimestamp(nonce); // milliseconds
+        if (!showMillis) {
+            delta = Math.round(delta / 1000) * 1000;
+        }
 
         // Old Discord Android clients have a delay of around 17 days
         // This is a workaround for that
-        if (-delta >= DISCORD_KT_DELAY - 86400) { // One day of padding for good measure
+        if (-delta >= DISCORD_KT_DELAY - 86400000) { // One day of padding for good measure
             isDiscordKotlin = detectDiscordKotlin;
             delta += DISCORD_KT_DELAY;
         }
@@ -106,17 +116,17 @@ export default definePlugin({
         const abs = Math.abs(delta);
         const ahead = abs !== delta;
 
-        const stringDelta = abs >= latency ? this.stringDelta(abs) : null;
+        const stringDelta = abs >= latency * 1000 ? this.stringDelta(abs, showMillis) : null;
 
         // Also thanks dziurwa
         // 2 minutes
-        const TROLL_LIMIT = 2 * 60;
+        const TROLL_LIMIT = 2 * 60 * 1000;
 
         const fill: Fill = isDiscordKotlin
             ? ["status-positive", "status-positive", "text-muted"]
             : delta >= TROLL_LIMIT || ahead
                 ? ["text-muted", "text-muted", "text-muted"]
-                : delta >= (latency * 2)
+                : delta >= (latency * 2000)
                     ? ["status-danger", "text-muted", "text-muted"]
                     : ["status-warning", "status-warning", "text-muted"];
 

From 09f894468a020be4fbbff5e59150c37985db6ef7 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 15 May 2024 23:38:36 -0300
Subject: [PATCH 582/632] MessageLatency: Fix wrong constant & false positive

---
 src/plugins/messageLatency/index.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugins/messageLatency/index.tsx b/src/plugins/messageLatency/index.tsx
index 6f0f68577..d517c0e01 100644
--- a/src/plugins/messageLatency/index.tsx
+++ b/src/plugins/messageLatency/index.tsx
@@ -25,7 +25,7 @@ interface Diff {
     milliseconds: number;
 }
 
-const DISCORD_KT_DELAY = 14712289280;
+const DISCORD_KT_DELAY = 1471228928;
 const HiddenVisually = findExportedComponentLazy("HiddenVisually");
 
 export default definePlugin({
@@ -115,8 +115,9 @@ export default definePlugin({
         // Can't do anything if the clock is behind
         const abs = Math.abs(delta);
         const ahead = abs !== delta;
+        const latencyMillis = latency * 1000;
 
-        const stringDelta = abs >= latency * 1000 ? this.stringDelta(abs, showMillis) : null;
+        const stringDelta = abs >= latencyMillis ? this.stringDelta(abs, showMillis) : null;
 
         // Also thanks dziurwa
         // 2 minutes
@@ -126,11 +127,11 @@ export default definePlugin({
             ? ["status-positive", "status-positive", "text-muted"]
             : delta >= TROLL_LIMIT || ahead
                 ? ["text-muted", "text-muted", "text-muted"]
-                : delta >= (latency * 2000)
+                : delta >= (latencyMillis * 2)
                     ? ["status-danger", "text-muted", "text-muted"]
                     : ["status-warning", "status-warning", "text-muted"];
 
-        return (abs >= latency || isDiscordKotlin) ? { delta: stringDelta, ahead, fill, isDiscordKotlin } : null;
+        return (abs >= latencyMillis || isDiscordKotlin) ? { delta: stringDelta, ahead, fill, isDiscordKotlin } : null;
     },
 
     Tooltip() {

From 4281b7a94a97b2b9d930116779f37f3e293b7b64 Mon Sep 17 00:00:00 2001
From: Sqaaakoi <sqaaakoi-git@sqaaakoi.xyz>
Date: Thu, 16 May 2024 15:21:52 +1200
Subject: [PATCH 583/632] ShowTimeoutDuration: Simplify tooltip style, allow
 changing style without reload (#2441)

---
 src/plugins/showTimeoutDuration/index.tsx  | 34 +++++++---------------
 src/plugins/showTimeoutDuration/styles.css |  4 +++
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/plugins/showTimeoutDuration/index.tsx b/src/plugins/showTimeoutDuration/index.tsx
index f57ee0fc9..bfe806802 100644
--- a/src/plugins/showTimeoutDuration/index.tsx
+++ b/src/plugins/showTimeoutDuration/index.tsx
@@ -9,11 +9,11 @@ import "./styles.css";
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import { Margins } from "@utils/margins";
 import definePlugin, { OptionType } from "@utils/types";
 import { findComponentLazy } from "@webpack";
-import { ChannelStore, Forms, GuildMemberStore, i18n, Text, Tooltip } from "@webpack/common";
+import { ChannelStore, GuildMemberStore, i18n, Text, Tooltip } from "@webpack/common";
 import { Message } from "discord-types/general";
+import { FunctionComponent, ReactNode } from "react";
 
 const CountDown = findComponentLazy(m => m.prototype?.render?.toString().includes(".MAX_AGE_NEVER"));
 
@@ -26,7 +26,6 @@ const settings = definePluginSettings({
     displayStyle: {
         description: "How to display the timeout duration",
         type: OptionType.SELECT,
-        restartNeeded: true,
         options: [
             { label: "In the Tooltip", value: DisplayStyle.Tooltip },
             { label: "Next to the timeout icon", value: DisplayStyle.Inline, default: true },
@@ -60,7 +59,7 @@ function renderTimeout(message: Message, inline: boolean) {
 export default definePlugin({
     name: "ShowTimeoutDuration",
     description: "Shows how much longer a user's timeout will last, either in the timeout icon tooltip or next to it",
-    authors: [Devs.Ven],
+    authors: [Devs.Ven, Devs.Sqaaakoi],
 
     settings,
 
@@ -70,33 +69,20 @@ export default definePlugin({
             replacement: [
                 {
                     match: /(\i)\.Tooltip,{(text:.{0,30}\.Messages\.GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY)/,
-                    get replace() {
-                        if (settings.store.displayStyle === DisplayStyle.Inline)
-                            return "$self.TooltipWrapper,{vcProps:arguments[0],$2";
-
-                        return "$1.Tooltip,{text:$self.renderTimeoutDuration(arguments[0])";
-                    }
+                    replace: "$self.TooltipWrapper,{message:arguments[0].message,$2"
                 }
             ]
         }
     ],
 
-    renderTimeoutDuration: ErrorBoundary.wrap(({ message }: { message: Message; }) => {
-        return (
-            <>
-                <Forms.FormText>{i18n.Messages.GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY}</Forms.FormText>
-                <Forms.FormText className={Margins.top8}>
-                    {renderTimeout(message, false)}
-                </Forms.FormText>
-            </>
-        );
-    }, { noop: true }),
-
-    TooltipWrapper: ErrorBoundary.wrap(({ vcProps: { message }, ...tooltipProps }: { vcProps: { message: Message; }; }) => {
+    TooltipWrapper: ErrorBoundary.wrap(({ message, children, text }: { message: Message; children: FunctionComponent<any>; text: ReactNode; }) => {
+        if (settings.store.displayStyle === DisplayStyle.Tooltip) return <Tooltip
+            children={children}
+            text={renderTimeout(message, false)}
+        />;
         return (
             <div className="vc-std-wrapper">
-                <Tooltip {...tooltipProps as any} />
-
+                <Tooltip text={text} children={children} />
                 <Text variant="text-md/normal" color="status-danger">
                     {renderTimeout(message, true)} timeout remaining
                 </Text>
diff --git a/src/plugins/showTimeoutDuration/styles.css b/src/plugins/showTimeoutDuration/styles.css
index 70a826e10..a6f830c38 100644
--- a/src/plugins/showTimeoutDuration/styles.css
+++ b/src/plugins/showTimeoutDuration/styles.css
@@ -2,3 +2,7 @@
     display: flex;
     align-items: center;
 }
+
+.vc-std-wrapper [class*="communicationDisabled"] {
+    margin-right: 0;
+}

From fb19642d8d8465c8578185491d6a2aba5bf4ab0a Mon Sep 17 00:00:00 2001
From: DShadow <62884000+PonyGirlDShadow@users.noreply.github.com>
Date: Thu, 16 May 2024 07:07:14 +0300
Subject: [PATCH 584/632] fix(readAllNotificationsButton): Mark threads as read
 (#2437)

---
 .../readAllNotificationsButton/index.tsx      | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/plugins/readAllNotificationsButton/index.tsx b/src/plugins/readAllNotificationsButton/index.tsx
index 3bf53f993..7a6737a8a 100644
--- a/src/plugins/readAllNotificationsButton/index.tsx
+++ b/src/plugins/readAllNotificationsButton/index.tsx
@@ -22,14 +22,34 @@ import { addServerListElement, removeServerListElement, ServerListRenderPosition
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
+import { findStoreLazy } from "@webpack";
 import { Button, FluxDispatcher, GuildChannelStore, GuildStore, React, ReadStateStore } from "@webpack/common";
+import { Channel } from "discord-types/general";
+
+interface ThreadJoined {
+    channel: Channel;
+    joinTimestamp: number;
+}
+
+type ThreadsJoined = Record<string, ThreadJoined>;
+type ThreadsJoinedByParent = Record<string, ThreadsJoined>;
+
+interface ActiveJoinedThreadsStore {
+    getActiveJoinedThreadsForGuild(guildId: string): ThreadsJoinedByParent;
+}
+
+const ActiveJoinedThreadsStore: ActiveJoinedThreadsStore = findStoreLazy("ActiveJoinedThreadsStore");
 
 function onClick() {
     const channels: Array<any> = [];
 
     Object.values(GuildStore.getGuilds()).forEach(guild => {
-        GuildChannelStore.getChannels(guild.id).SELECTABLE
-            .concat(GuildChannelStore.getChannels(guild.id).VOCAL)
+        GuildChannelStore.getChannels(guild.id).SELECTABLE // Array<{ channel, comparator }>
+            .concat(GuildChannelStore.getChannels(guild.id).VOCAL) // Array<{ channel, comparator }>
+            .concat(
+                Object.values(ActiveJoinedThreadsStore.getActiveJoinedThreadsForGuild(guild.id))
+                    .flatMap(threadChannels => Object.values(threadChannels))
+            )
             .forEach((c: { channel: { id: string; }; }) => {
                 if (!ReadStateStore.hasUnread(c.channel.id)) return;
 

From cddc811c02b37a0dd0bff24b36ff562f42497231 Mon Sep 17 00:00:00 2001
From: nyx <60797172+verticalsync@users.noreply.github.com>
Date: Thu, 16 May 2024 08:26:40 +0300
Subject: [PATCH 585/632] feat(ViewIcons): Group & User DMs icons support
 (#2464)

---
 src/plugins/viewIcons/index.tsx | 58 ++++++++++++++++++++++++++++++---
 src/utils/constants.ts          |  4 +++
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index f71777ad7..fc74db0f7 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -36,6 +36,10 @@ interface GuildContextProps {
     guild?: Guild;
 }
 
+interface GroupDMContextProps {
+    channel: Channel;
+}
+
 const settings = definePluginSettings({
     format: {
         type: OptionType.SELECT,
@@ -145,10 +149,27 @@ const GuildContext: NavContextMenuPatchCallback = (children, { guild }: GuildCon
     ));
 };
 
+const GroupDMContext: NavContextMenuPatchCallback = (children, { channel }: GroupDMContextProps) => {
+    if (!channel) return;
+
+    children.splice(-1, 0, (
+        <Menu.MenuGroup>
+            <Menu.MenuItem
+                id="view-group-channel-icon"
+                label="View Icon"
+                action={() =>
+                    openImage(IconUtils.getChannelIconURL(channel)!)
+                }
+                icon={ImageIcon}
+            />
+        </Menu.MenuGroup>
+    ));
+};
+
 export default definePlugin({
     name: "ViewIcons",
-    authors: [Devs.Ven, Devs.TheKodeToad, Devs.Nuckyz],
-    description: "Makes avatars and banners in user profiles clickable, and adds View Icon/Banner entries in the user and server context menu",
+    authors: [Devs.Ven, Devs.TheKodeToad, Devs.Nuckyz, Devs.nyx],
+    description: "Makes avatars and banners in user profiles clickable, adds View Icon/Banner entries in the user, server and group channel context menu.",
     tags: ["ImageUtilities"],
 
     settings,
@@ -157,11 +178,12 @@ export default definePlugin({
 
     contextMenus: {
         "user-context": UserContext,
-        "guild-context": GuildContext
+        "guild-context": GuildContext,
+        "gdm-context": GroupDMContext
     },
 
     patches: [
-        // Make pfps clickable
+        // Profiles Modal pfp
         {
             find: "User Profile Modal - Context Menu",
             replacement: {
@@ -169,7 +191,7 @@ export default definePlugin({
                 replace: "{src:$1,onClick:()=>$self.openImage($1)"
             }
         },
-        // Make banners clickable
+        // Banners
         {
             find: ".NITRO_BANNER,",
             replacement: {
@@ -180,12 +202,38 @@ export default definePlugin({
                     'onClick:ev=>$1&&ev.target.style.backgroundImage&&$self.openImage($2),style:{cursor:$1?"pointer":void 0,'
             }
         },
+        // User DMs "User Profile" popup in the right
         {
             find: ".avatarPositionPanel",
             replacement: {
                 match: /(?<=avatarWrapperNonUserBot.{0,50})onClick:(\i\|\|\i)\?void 0(?<=,avatarSrc:(\i).+?)/,
                 replace: "style:($1)?{cursor:\"pointer\"}:{},onClick:$1?()=>{$self.openImage($2)}"
             }
+        },
+        // Group DMs top small & large icon
+        {
+            find: ".recipients.length>=2",
+            all: true,
+            replacement: {
+                match: /null==\i\.icon\?.+?src:(\(0,\i\.getChannelIconURL\).+?\))(?=[,}])/,
+                replace: (m, iconUrl) => `${m},onClick:()=>$self.openImage(${iconUrl})`
+            }
+        },
+        // User DMs top small icon
+        {
+            find: /HiddenVisually,{children:\i\.\i\.Messages\.DIRECT_MESSAGE/,
+            replacement: {
+                match: /.Avatar,.+?src:(.+?\))(?=[,}])/,
+                replace: (m, avatarUrl) => `${m},onClick:()=>$self.openImage(${avatarUrl})`
+            }
+        },
+        // User Dms top large icon
+        {
+            find: 'experimentLocation:"empty_messages"',
+            replacement: {
+                match: /.Avatar,.+?src:(.+?\))(?=[,}])/,
+                replace: (m, avatarUrl) => `${m},onClick:()=>$self.openImage(${avatarUrl})`
+            }
         }
     ]
 });
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index a77edf7d5..e6e13bf38 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -490,6 +490,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "ScattrdBlade",
         id: 678007540608532491n
     },
+    nyx: {
+        name: "verticalsync",
+        id: 328165170536775680n
+    },
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly

From c5e554e48c89c0b386fef718799fb5b289204c40 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 16 May 2024 02:37:24 -0300
Subject: [PATCH 586/632] ViewIcon: Replace regex find with string find

---
 src/plugins/viewIcons/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index fc74db0f7..104252f6e 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -221,7 +221,7 @@ export default definePlugin({
         },
         // User DMs top small icon
         {
-            find: /HiddenVisually,{children:\i\.\i\.Messages\.DIRECT_MESSAGE/,
+            find: ".cursorPointer:null,children",
             replacement: {
                 match: /.Avatar,.+?src:(.+?\))(?=[,}])/,
                 replace: (m, avatarUrl) => `${m},onClick:()=>$self.openImage(${avatarUrl})`

From 0c50e153eff0c26fbd8850cbe92cdcde9fc0a3fa Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 16 May 2024 23:02:50 -0300
Subject: [PATCH 587/632] FakeNitro: Fix & rewrite emoji bypass patches

---
 src/plugins/fakeNitro/index.tsx | 75 +++++++++++++++++----------------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index a55a7771e..65cae3752 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -54,16 +54,22 @@ const ClientThemeSettingsActionsCreators = proxyLazyWebpack(() => searchProtoCla
 
 
 const enum EmojiIntentions {
-    REACTION = 0,
-    STATUS = 1,
-    COMMUNITY_CONTENT = 2,
-    CHAT = 3,
-    GUILD_STICKER_RELATED_EMOJI = 4,
-    GUILD_ROLE_BENEFIT_EMOJI = 5,
-    COMMUNITY_CONTENT_ONLY = 6,
-    SOUNDBOARD = 7
+    REACTION,
+    STATUS,
+    COMMUNITY_CONTENT,
+    CHAT,
+    GUILD_STICKER_RELATED_EMOJI,
+    GUILD_ROLE_BENEFIT_EMOJI,
+    COMMUNITY_CONTENT_ONLY,
+    SOUNDBOARD,
+    VOICE_CHANNEL_TOPIC,
+    GIFT,
+    AUTO_SUGGESTION,
+    POLLS
 }
 
+const IS_BYPASSEABLE_INTENTION = `[${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)`;
+
 const enum StickerType {
     PNG = 1,
     APNG = 2,
@@ -198,37 +204,43 @@ export default definePlugin({
     patches: [
         {
             find: ".PREMIUM_LOCKED;",
+            group: true,
             predicate: () => settings.store.enableEmojiBypass,
             replacement: [
                 {
-                    // Create a variable for the intention of listing the emoji
-                    match: /(?<=,intention:(\i).+?;)/,
-                    replace: (_, intention) => `let fakeNitroIntention=${intention};`
+                    // Create a variable for the intention of using the emoji
+                    match: /(?<=\.USE_EXTERNAL_EMOJIS.+?;)(?<=intention:(\i).+?)/,
+                    replace: (_, intention) => `const fakeNitroIntention=${intention};`
                 },
                 {
-                    // Send the intention of listing the emoji to the nitro permission check functions
-                    match: /\.(?:canUseEmojisEverywhere|canUseAnimatedEmojis)\(\i(?=\))/g,
-                    replace: '$&,typeof fakeNitroIntention!=="undefined"?fakeNitroIntention:void 0'
+                    // Disallow the emoji for external if the intention doesn't allow it
+                    match: /&&!\i&&!\i(?=\)return \i\.\i\.DISALLOW_EXTERNAL;)/,
+                    replace: m => `${m}&&!${IS_BYPASSEABLE_INTENTION}`
                 },
                 {
-                    // Disallow the emoji if the intention doesn't allow it
-                    match: /(&&!\i&&)!(\i)(?=\)return \i\.\i\.DISALLOW_EXTERNAL;)/,
-                    replace: (_, rest, canUseExternal) => `${rest}(!${canUseExternal}&&(typeof fakeNitroIntention==="undefined"||![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)))`
+                    // Disallow the emoji for unavailable if the intention doesn't allow it
+                    match: /!\i\.available(?=\)return \i\.\i\.GUILD_SUBSCRIPTION_UNAVAILABLE;)/,
+                    replace: m => `${m}&&!${IS_BYPASSEABLE_INTENTION}`
                 },
                 {
-                    // Make the emoji always available if the intention allows it
-                    match: /if\(!\i\.available/,
-                    replace: m => `${m}&&(typeof fakeNitroIntention==="undefined"||![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention))`
+                    // Disallow the emoji for premium locked if the intention doesn't allow it
+                    match: /!\i\.\i\.canUseEmojisEverywhere\(\i\)/,
+                    replace: m => `(${m}&&!${IS_BYPASSEABLE_INTENTION})`
+                },
+                {
+                    // Allow animated emojis to be used if the intention allows it
+                    match: /(?<=\|\|)\i\.\i\.canUseAnimatedEmojis\(\i\)/,
+                    replace: m => `(${m}||${IS_BYPASSEABLE_INTENTION})`
                 }
             ]
         },
-        // Allow emojis and animated emojis to be sent everywhere
+        // Allows the usage of subscription-locked emojis
         {
-            find: "canUseAnimatedEmojis:function",
-            predicate: () => settings.store.enableEmojiBypass,
+            find: "isUnusableRoleSubscriptionEmoji:function",
             replacement: {
-                match: /((?:canUseEmojisEverywhere|canUseAnimatedEmojis):function\(\i)\){(.+?\))(?=})/g,
-                replace: (_, rest, premiumCheck) => `${rest},fakeNitroIntention){${premiumCheck}||fakeNitroIntention==null||[${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)`
+                match: /isUnusableRoleSubscriptionEmoji:function/,
+                // Replace the original export with a func that always returns false and alias the original
+                replace: "isUnusableRoleSubscriptionEmoji:()=>()=>false,isUnusableRoleSubscriptionEmojiOriginal:function"
             }
         },
         // Allow stickers to be sent everywhere
@@ -242,10 +254,10 @@ export default definePlugin({
         },
         // Make stickers always available
         {
-            find: "\"SENDABLE\"",
+            find: '"SENDABLE"',
             predicate: () => settings.store.enableStickerBypass,
             replacement: {
-                match: /(\w+)\.available\?/,
+                match: /\i\.available\?/,
                 replace: "true?"
             }
         },
@@ -408,15 +420,6 @@ export default definePlugin({
                 match: /canUseCustomNotificationSounds:function\(\i\){/,
                 replace: "$&return true;"
             }
-        },
-        // Allows the usage of subscription-locked emojis
-        {
-            find: "isUnusableRoleSubscriptionEmoji:function",
-            replacement: {
-                match: /isUnusableRoleSubscriptionEmoji:function/,
-                // replace the original export with a func that always returns false and alias the original
-                replace: "isUnusableRoleSubscriptionEmoji:()=>()=>false,isUnusableRoleSubscriptionEmojiOriginal:function"
-            }
         }
     ],
 

From 03d83e1ff752ac3338ee3aa7f52ed67e6da92ff3 Mon Sep 17 00:00:00 2001
From: Tuur Martens <tuurmartens4@gmail.com>
Date: Fri, 17 May 2024 09:11:41 +0200
Subject: [PATCH 588/632] new plugin AutomodContext (#2290)

---
 src/plugins/automodContext/index.tsx | 73 ++++++++++++++++++++++++++++
 src/utils/constants.ts               |  4 ++
 2 files changed, 77 insertions(+)
 create mode 100644 src/plugins/automodContext/index.tsx

diff --git a/src/plugins/automodContext/index.tsx b/src/plugins/automodContext/index.tsx
new file mode 100644
index 000000000..5425c5526
--- /dev/null
+++ b/src/plugins/automodContext/index.tsx
@@ -0,0 +1,73 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+import { Button, ChannelStore, Text } from "@webpack/common";
+
+const { selectChannel } = findByPropsLazy("selectChannel", "selectVoiceChannel");
+
+function jumpToMessage(channelId: string, messageId: string) {
+    const guildId = ChannelStore.getChannel(channelId)?.guild_id;
+
+    selectChannel({
+        guildId,
+        channelId,
+        messageId,
+        jumpType: "INSTANT"
+    });
+}
+
+function findChannelId(message: any): string | null {
+    const { embeds: [embed] } = message;
+    const channelField = embed.fields.find(({ rawName }) => rawName === "channel_id");
+
+    if (!channelField) {
+        return null;
+    }
+
+    return channelField.rawValue;
+}
+
+export default definePlugin({
+    name: "AutomodContext",
+    description: "Allows you to jump to the messages surrounding an automod hit.",
+    authors: [Devs.JohnyTheCarrot],
+
+    patches: [
+        {
+            find: ".Messages.GUILD_AUTOMOD_REPORT_ISSUES",
+            replacement: {
+                match: /\.Messages\.ACTIONS.+?}\)(?=,(\(0.{0,40}\.dot.*?}\)),)/,
+                replace: (m, dot) => `${m},${dot},$self.renderJumpButton({message:arguments[0].message})`
+            }
+        }
+    ],
+
+    renderJumpButton: ErrorBoundary.wrap(({ message }: { message: any; }) => {
+        const channelId = findChannelId(message);
+
+        if (!channelId) {
+            return null;
+        }
+
+        return (
+            <Button
+                style={{ padding: "2px 8px" }}
+                look={Button.Looks.LINK}
+                size={Button.Sizes.SMALL}
+                color={Button.Colors.LINK}
+                onClick={() => jumpToMessage(channelId, message.id)}
+            >
+                <Text color="text-link" variant="text-xs/normal">
+                    Jump to Surrounding
+                </Text>
+            </Button>
+        );
+    }, { noop: true })
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index e6e13bf38..5327e3cdf 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -442,6 +442,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "newwares",
         id: 421405303951851520n
     },
+    JohnyTheCarrot: {
+        name: "JohnyTheCarrot",
+        id: 132819036282159104n
+    },
     puv: {
         name: "puv",
         id: 469441552251355137n

From ffe1d7cc4d00b3d8061df55b0dd64f8ce720abc9 Mon Sep 17 00:00:00 2001
From: Moxxie <79810799+ImpishMoxxie@users.noreply.github.com>
Date: Fri, 17 May 2024 10:17:14 +0300
Subject: [PATCH 589/632] new plugin ReplaceGoogleSearch (#2450)

---
 src/plugins/ReplaceGoogleSearch/index.tsx | 107 ++++++++++++++++++++++
 src/utils/constants.ts                    |   8 ++
 2 files changed, 115 insertions(+)
 create mode 100644 src/plugins/ReplaceGoogleSearch/index.tsx

diff --git a/src/plugins/ReplaceGoogleSearch/index.tsx b/src/plugins/ReplaceGoogleSearch/index.tsx
new file mode 100644
index 000000000..1b1a761fc
--- /dev/null
+++ b/src/plugins/ReplaceGoogleSearch/index.tsx
@@ -0,0 +1,107 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { Flex, Menu } from "@webpack/common";
+
+const DefaultEngines = {
+    Google: "https://www.google.com/search?q=",
+    DuckDuckGo: "https://duckduckgo.com/",
+    Bing: "https://www.bing.com/search?q=",
+    Yahoo: "https://search.yahoo.com/search?p=",
+    Github: "https://github.com/search?q=",
+    Kagi: "https://kagi.com/search?q=",
+    Yandex: "https://yandex.com/search/?text=",
+    AOL: "https://search.aol.com/aol/search?q=",
+    Baidu: "https://www.baidu.com/s?wd=",
+    Wikipedia: "https://wikipedia.org/w/index.php?search=",
+} as const;
+
+const settings = definePluginSettings({
+    customEngineName: {
+        description: "Name of the custom search engine",
+        type: OptionType.STRING,
+        placeholder: "Google"
+    },
+    customEngineURL: {
+        description: "The URL of your Engine",
+        type: OptionType.STRING,
+        placeholder: "https://google.com/search?q="
+    }
+});
+
+function search(src: string, engine: string) {
+    open(engine + encodeURIComponent(src), "_blank");
+}
+
+function makeSearchItem(src: string) {
+    let Engines = {};
+
+    if (settings.store.customEngineName && settings.store.customEngineURL) {
+        Engines[settings.store.customEngineName] = settings.store.customEngineURL;
+    }
+
+    Engines = { ...Engines, ...DefaultEngines };
+
+    return (
+        <Menu.MenuItem
+            label="Search Text"
+            key="search-text"
+            id="vc-search-text"
+        >
+            {Object.keys(Engines).map((engine, i) => {
+                const key = "vc-search-content-" + engine;
+                return (
+                    <Menu.MenuItem
+                        key={key}
+                        id={key}
+                        label={
+                            <Flex style={{ alignItems: "center", gap: "0.5em" }}>
+                                <img
+                                    style={{
+                                        borderRadius: "50%"
+                                    }}
+                                    aria-hidden="true"
+                                    height={16}
+                                    width={16}
+                                    src={`https://www.google.com/s2/favicons?domain=${Engines[engine]}`}
+                                />
+                                {engine}
+                            </Flex>
+                        }
+                        action={() => search(src, Engines[engine])}
+                    />
+                );
+            })}
+        </Menu.MenuItem>
+    );
+}
+
+const messageContextMenuPatch: NavContextMenuPatchCallback = (children, _props) => {
+    const selection = document.getSelection()?.toString();
+    if (!selection) return;
+
+    const group = findGroupChildrenByChildId("search-google", children);
+    if (group) {
+        const idx = group.findIndex(c => c?.props?.id === "search-google");
+        if (idx !== -1) group[idx] = makeSearchItem(selection);
+    }
+};
+
+export default definePlugin({
+    name: "ReplaceGoogleSearch",
+    description: "Replaces the Google search with different Engines",
+    authors: [Devs.Moxxie, Devs.Ethan],
+
+    settings,
+
+    contextMenus: {
+        "message": messageContextMenuPatch
+    }
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 5327e3cdf..974758e3a 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -494,6 +494,14 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "ScattrdBlade",
         id: 678007540608532491n
     },
+    Moxxie: {
+        name: "Moxxie",
+        id: 712653921692155965n,
+    },
+    Ethan: {
+        name: "Ethan",
+        id: 721717126523781240n,
+    },
     nyx: {
         name: "verticalsync",
         id: 328165170536775680n

From 6547cc10f7f515652de6513326342ea3e87535ba Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 17 May 2024 04:34:50 -0300
Subject: [PATCH 590/632] FakeNitro: Fix attempting to bypass unicode emojis

Closes #2470
---
 src/plugins/fakeNitro/index.tsx      | 6 +++---
 src/webpack/common/types/stores.d.ts | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 65cae3752..9c8af1e7c 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -25,7 +25,7 @@ import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy, findStoreLazy, proxyLazyWebpack } from "@webpack";
 import { Alerts, ChannelStore, DraftType, EmojiStore, FluxDispatcher, Forms, IconUtils, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
-import type { CustomEmoji } from "@webpack/types";
+import type { Emoji } from "@webpack/types";
 import type { Message } from "discord-types/general";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
 import type { ReactElement, ReactNode } from "react";
@@ -812,8 +812,8 @@ export default definePlugin({
         UploadHandler.promptToUpload([file], ChannelStore.getChannel(channelId), DraftType.ChannelMessage);
     },
 
-    canUseEmote(e: CustomEmoji, channelId: string) {
-        if (e.require_colons === false) return true;
+    canUseEmote(e: Emoji, channelId: string) {
+        if (e.type === "UNICODE") return true;
         if (e.available === false) return false;
 
         const isUnusableRoleSubEmoji = RoleSubscriptionEmojiUtils.isUnusableRoleSubscriptionEmojiOriginal ?? RoleSubscriptionEmojiUtils.isUnusableRoleSubscriptionEmoji;
diff --git a/src/webpack/common/types/stores.d.ts b/src/webpack/common/types/stores.d.ts
index 27715b5ee..059924f5a 100644
--- a/src/webpack/common/types/stores.d.ts
+++ b/src/webpack/common/types/stores.d.ts
@@ -63,7 +63,7 @@ export interface CustomEmoji {
     originalName?: string;
     require_colons: boolean;
     roles: string[];
-    url: string;
+    type: "GUILD_EMOJI";
 }
 
 export interface UnicodeEmoji {
@@ -75,6 +75,7 @@ export interface UnicodeEmoji {
     };
     index: number;
     surrogates: string;
+    type: "UNICODE";
     uniqueName: string;
     useSpriteSheet: boolean;
     get allNamesString(): string;

From 60f8225b96cbdce8bd5f8a60d805da39ac8a523f Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 17 May 2024 04:51:59 -0300
Subject: [PATCH 591/632] chore: Fix non standard plugin names

---
 src/plugins/partyMode/index.ts                               | 5 +++--
 .../{ReplaceGoogleSearch => replaceGoogleSearch}/index.tsx   | 0
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename src/plugins/{ReplaceGoogleSearch => replaceGoogleSearch}/index.tsx (100%)

diff --git a/src/plugins/partyMode/index.ts b/src/plugins/partyMode/index.ts
index 06e87195e..56c19c02c 100644
--- a/src/plugins/partyMode/index.ts
+++ b/src/plugins/partyMode/index.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { definePluginSettings } from "@api/Settings";
+import { definePluginSettings, migratePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { FluxDispatcher } from "@webpack/common";
@@ -41,8 +41,9 @@ const settings = definePluginSettings({
     },
 });
 
+migratePluginSettings("PartyMode", "Party mode 🎉");
 export default definePlugin({
-    name: "Party mode 🎉",
+    name: "PartyMode",
     description: "Allows you to use party mode cause the party never ends ✨",
     authors: [Devs.UwUDev],
     settings,
diff --git a/src/plugins/ReplaceGoogleSearch/index.tsx b/src/plugins/replaceGoogleSearch/index.tsx
similarity index 100%
rename from src/plugins/ReplaceGoogleSearch/index.tsx
rename to src/plugins/replaceGoogleSearch/index.tsx

From 0b4b6031c53f9943acb8a61747aa8c9994c2fcfe Mon Sep 17 00:00:00 2001
From: Nico <nico@d3sox.me>
Date: Fri, 17 May 2024 10:21:12 +0200
Subject: [PATCH 592/632] new plugin NoDefaultHangStatus (#2468)

---
 src/plugins/noDefaultHangStatus/README.md |  5 +++++
 src/plugins/noDefaultHangStatus/index.ts  | 24 +++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 src/plugins/noDefaultHangStatus/README.md
 create mode 100644 src/plugins/noDefaultHangStatus/index.ts

diff --git a/src/plugins/noDefaultHangStatus/README.md b/src/plugins/noDefaultHangStatus/README.md
new file mode 100644
index 000000000..e6bc9f83a
--- /dev/null
+++ b/src/plugins/noDefaultHangStatus/README.md
@@ -0,0 +1,5 @@
+# NoDefaultHangStatus
+
+Disable the default hang status when joining voice channels
+
+![Visualization](https://github.com/Vendicated/Vencord/assets/24937357/329a9742-236f-48f7-94ff-c3510eca505a)
diff --git a/src/plugins/noDefaultHangStatus/index.ts b/src/plugins/noDefaultHangStatus/index.ts
new file mode 100644
index 000000000..3f77feb22
--- /dev/null
+++ b/src/plugins/noDefaultHangStatus/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "NoDefaultHangStatus",
+    description: "Disable the default hang status when joining voice channels",
+    authors: [Devs.D3SOX],
+
+    patches: [
+        {
+            find: "HangStatusTypes.CHILLING)",
+            replacement: {
+                match: /{enableHangStatus:(\i),/,
+                replace: "{_enableHangStatus:$1=false,"
+            }
+        }
+    ]
+});

From 84e477f678b316a2de26cbdede9a19767313cb74 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 17 May 2024 05:43:40 -0300
Subject: [PATCH 593/632] Add missing README to new plugins

---
 src/plugins/automodContext/README.md      | 5 +++++
 src/plugins/replaceGoogleSearch/README.md | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 src/plugins/automodContext/README.md
 create mode 100644 src/plugins/replaceGoogleSearch/README.md

diff --git a/src/plugins/automodContext/README.md b/src/plugins/automodContext/README.md
new file mode 100644
index 000000000..f70d71d90
--- /dev/null
+++ b/src/plugins/automodContext/README.md
@@ -0,0 +1,5 @@
+# AutomodContext
+
+Allows you to jump to the messages surrounding an automod hit
+
+![Visualization](https://github.com/Vendicated/Vencord/assets/61953774/d13740c8-2062-4553-b975-82fd3d6cc08b)
diff --git a/src/plugins/replaceGoogleSearch/README.md b/src/plugins/replaceGoogleSearch/README.md
new file mode 100644
index 000000000..1ab30212e
--- /dev/null
+++ b/src/plugins/replaceGoogleSearch/README.md
@@ -0,0 +1,5 @@
+# ReplaceGoogleSearch
+
+Replaces the Google search with different Engines
+
+![Visualization](https://github.com/Vendicated/Vencord/assets/61953774/8b8158d2-0407-4d7b-9dff-a8b9bdc1a122)

From 5fc6ba86d187e51004bce274e5281cc67cf7ec75 Mon Sep 17 00:00:00 2001
From: Nico <nico@d3sox.me>
Date: Fri, 17 May 2024 17:40:01 +0200
Subject: [PATCH 594/632] fix(replaceGoogleSearch): correct GitHub casing
 (#2471)

---
 src/plugins/replaceGoogleSearch/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/replaceGoogleSearch/index.tsx b/src/plugins/replaceGoogleSearch/index.tsx
index 1b1a761fc..dff593a3b 100644
--- a/src/plugins/replaceGoogleSearch/index.tsx
+++ b/src/plugins/replaceGoogleSearch/index.tsx
@@ -15,7 +15,7 @@ const DefaultEngines = {
     DuckDuckGo: "https://duckduckgo.com/",
     Bing: "https://www.bing.com/search?q=",
     Yahoo: "https://search.yahoo.com/search?p=",
-    Github: "https://github.com/search?q=",
+    GitHub: "https://github.com/search?q=",
     Kagi: "https://kagi.com/search?q=",
     Yandex: "https://yandex.com/search/?text=",
     AOL: "https://search.aol.com/aol/search?q=",

From 54817ab5069026421c263d8d71c252b43d4976a9 Mon Sep 17 00:00:00 2001
From: flag <38012125+Yumiro@users.noreply.github.com>
Date: Fri, 17 May 2024 17:36:35 +0100
Subject: [PATCH 595/632] lastfmRPC: add setting to toggle "View Song" button
 (#2292)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/lastfm/index.tsx | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/plugins/lastfm/index.tsx b/src/plugins/lastfm/index.tsx
index 1213ece29..02fd694f8 100644
--- a/src/plugins/lastfm/index.tsx
+++ b/src/plugins/lastfm/index.tsx
@@ -114,6 +114,11 @@ const settings = definePluginSettings({
         type: OptionType.BOOLEAN,
         default: false,
     },
+    shareSong: {
+        description: "show link to song on last.fm",
+        type: OptionType.BOOLEAN,
+        default: true,
+    },
     hideWithSpotify: {
         description: "hide last.fm presence if spotify is running",
         type: OptionType.BOOLEAN,
@@ -295,12 +300,7 @@ export default definePlugin({
                 large_text: trackData.album || undefined,
             };
 
-        const buttons: ActivityButton[] = [
-            {
-                label: "View Song",
-                url: trackData.url,
-            },
-        ];
+        const buttons: ActivityButton[] = [];
 
         if (settings.store.shareUsername)
             buttons.push({
@@ -308,6 +308,12 @@ export default definePlugin({
                 url: `https://www.last.fm/user/${settings.store.username}`,
             });
 
+        if (settings.store.shareSong)
+            buttons.push({
+                label: "View Song",
+                url: trackData.url,
+            });
+
         const statusName = (() => {
             switch (settings.store.nameFormat) {
                 case NameFormat.ArtistFirst:
@@ -333,7 +339,7 @@ export default definePlugin({
             state: trackData.artist,
             assets,
 
-            buttons: buttons.map(v => v.label),
+            buttons: buttons.length ? buttons.map(v => v.label) : undefined,
             metadata: {
                 button_urls: buttons.map(v => v.url),
             },

From c3757a2ae6cf775b32a1935cdce96feb1124faff Mon Sep 17 00:00:00 2001
From: vee <vendicated@riseup.net>
Date: Fri, 17 May 2024 23:01:07 +0200
Subject: [PATCH 596/632] add package for publishing types to npm (#2473)

https://www.npmjs.com/package/@vencord/types
---
 package.json                                  |   14 +-
 packages/vencord-types/.gitignore             |    7 +
 packages/vencord-types/.npmignore             |    4 +
 packages/vencord-types/HOW2PUB.md             |    5 +
 packages/vencord-types/README.md              |   11 +
 packages/vencord-types/globals.d.ts           |   24 +
 packages/vencord-types/index.d.ts             |    5 +
 packages/vencord-types/package.json           |   28 +
 packages/vencord-types/prepare.ts             |   47 +
 pnpm-lock.yaml                                | 1123 +++++++++++++++--
 pnpm-workspace.yaml                           |    2 +
 src/Vencord.ts                                |    1 +
 src/api/Notifications/Notifications.tsx       |    1 +
 src/components/ExpandableHeader.tsx           |    8 +-
 src/components/index.ts                       |   18 +
 src/modules.d.ts                              |    2 +-
 .../decor/lib/stores/AuthorizationStore.tsx   |    9 +-
 .../lib/stores/CurrentUserDecorationsStore.ts |    4 +-
 .../decor/lib/stores/UsersDecorationsStore.ts |    6 +-
 .../decor/ui/components/DecorSection.tsx      |    2 +-
 .../components/UserPermissions.tsx            |    2 +-
 src/plugins/reviewDB/index.tsx                |    2 +-
 src/utils/index.ts                            |    2 +
 src/utils/types.ts                            |    2 +-
 src/webpack/common/utils.ts                   |    4 +-
 tsconfig.json                                 |   10 +-
 26 files changed, 1231 insertions(+), 112 deletions(-)
 create mode 100644 packages/vencord-types/.gitignore
 create mode 100644 packages/vencord-types/.npmignore
 create mode 100644 packages/vencord-types/HOW2PUB.md
 create mode 100644 packages/vencord-types/README.md
 create mode 100644 packages/vencord-types/globals.d.ts
 create mode 100644 packages/vencord-types/index.d.ts
 create mode 100644 packages/vencord-types/package.json
 create mode 100644 packages/vencord-types/prepare.ts
 create mode 100644 pnpm-workspace.yaml
 create mode 100644 src/components/index.ts

diff --git a/package.json b/package.json
index 95f98a8ba..0819f2aee 100644
--- a/package.json
+++ b/package.json
@@ -19,16 +19,17 @@
     "scripts": {
         "build": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/build.mjs",
         "buildWeb": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/buildWeb.mjs",
+        "watch": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/build.mjs --watch",
         "generatePluginJson": "tsx scripts/generatePluginList.ts",
+        "generateTypes": "tspc --emitDeclarationOnly --declaration --outDir packages/vencord-types",
         "inject": "node scripts/runInstaller.mjs",
+        "uninject": "node scripts/runInstaller.mjs",
         "lint": "eslint . --ext .js,.jsx,.ts,.tsx --ignore-pattern src/userplugins",
         "lint-styles": "stylelint \"src/**/*.css\" --ignore-pattern src/userplugins",
         "lint:fix": "pnpm lint --fix",
         "test": "pnpm build && pnpm lint && pnpm lint-styles && pnpm testTsc && pnpm generatePluginJson",
         "testWeb": "pnpm lint && pnpm buildWeb && pnpm testTsc",
-        "testTsc": "tsc --noEmit",
-        "uninject": "node scripts/runInstaller.mjs",
-        "watch": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/build.mjs --watch"
+        "testTsc": "tsc --noEmit"
     },
     "dependencies": {
         "@sapphi-red/web-noise-suppressor": "0.3.3",
@@ -65,11 +66,12 @@
         "standalone-electron-types": "^1.0.0",
         "stylelint": "^15.6.0",
         "stylelint-config-standard": "^33.0.0",
+        "ts-patch": "^3.1.2",
         "tsx": "^3.12.7",
         "type-fest": "^3.9.0",
-        "typescript": "^5.0.4",
-        "zip-local": "^0.3.5",
-        "zustand": "^3.7.2"
+        "typescript": "^5.4.5",
+        "typescript-transform-paths": "^3.4.7",
+        "zip-local": "^0.3.5"
     },
     "packageManager": "pnpm@9.1.0",
     "pnpm": {
diff --git a/packages/vencord-types/.gitignore b/packages/vencord-types/.gitignore
new file mode 100644
index 000000000..bc23f8b6a
--- /dev/null
+++ b/packages/vencord-types/.gitignore
@@ -0,0 +1,7 @@
+*
+!.*ignore
+!package.json
+!*.md
+!prepare.ts
+!index.d.ts
+!globals.d.ts
diff --git a/packages/vencord-types/.npmignore b/packages/vencord-types/.npmignore
new file mode 100644
index 000000000..28822788f
--- /dev/null
+++ b/packages/vencord-types/.npmignore
@@ -0,0 +1,4 @@
+node_modules
+prepare.ts
+.gitignore
+HOW2PUB.md
diff --git a/packages/vencord-types/HOW2PUB.md b/packages/vencord-types/HOW2PUB.md
new file mode 100644
index 000000000..2085898ec
--- /dev/null
+++ b/packages/vencord-types/HOW2PUB.md
@@ -0,0 +1,5 @@
+# How to publish
+
+1. run `pnpm generateTypes` in the project root
+2. bump package.json version
+3. npm publish
diff --git a/packages/vencord-types/README.md b/packages/vencord-types/README.md
new file mode 100644
index 000000000..0513f8703
--- /dev/null
+++ b/packages/vencord-types/README.md
@@ -0,0 +1,11 @@
+# Vencord Types
+
+Typings for Vencord's api, published to npm
+
+```sh
+npm i @vencord/types
+
+yarn add @vencord/types
+
+pnpm add @vencord/types
+```
diff --git a/packages/vencord-types/globals.d.ts b/packages/vencord-types/globals.d.ts
new file mode 100644
index 000000000..a5916e54f
--- /dev/null
+++ b/packages/vencord-types/globals.d.ts
@@ -0,0 +1,24 @@
+/*
+ * 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/>.
+*/
+
+declare global {
+    export var VencordNative: typeof import("./VencordNative").default;
+    export var Vencord: typeof import("./Vencord");
+}
+
+export { };
diff --git a/packages/vencord-types/index.d.ts b/packages/vencord-types/index.d.ts
new file mode 100644
index 000000000..c7d8253c6
--- /dev/null
+++ b/packages/vencord-types/index.d.ts
@@ -0,0 +1,5 @@
+/* eslint-disable */
+
+/// <reference path="Vencord.d.ts" />
+/// <reference path="globals.d.ts" />
+/// <reference path="modules.d.ts" />
diff --git a/packages/vencord-types/package.json b/packages/vencord-types/package.json
new file mode 100644
index 000000000..8f9d852e4
--- /dev/null
+++ b/packages/vencord-types/package.json
@@ -0,0 +1,28 @@
+{
+    "name": "@vencord/types",
+    "private": false,
+    "version": "0.1.3",
+    "description": "",
+    "types": "index.d.ts",
+    "scripts": {
+        "prepublishOnly": "tsx ./prepare.ts",
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "keywords": [],
+    "author": "Vencord",
+    "license": "GPL-3.0",
+    "devDependencies": {
+        "@types/fs-extra": "^11.0.4",
+        "fs-extra": "^11.2.0",
+        "tsx": "^3.12.6"
+    },
+    "dependencies": {
+        "@types/lodash": "^4.14.191",
+        "@types/node": "^18.11.18",
+        "@types/react": "^18.2.0",
+        "@types/react-dom": "^18.0.10",
+        "discord-types": "^1.3.26",
+        "standalone-electron-types": "^1.0.0",
+        "type-fest": "^3.5.3"
+    }
+}
diff --git a/packages/vencord-types/prepare.ts b/packages/vencord-types/prepare.ts
new file mode 100644
index 000000000..de1f6b04b
--- /dev/null
+++ b/packages/vencord-types/prepare.ts
@@ -0,0 +1,47 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { cpSync, moveSync, readdirSync, rmSync } from "fs-extra";
+import { join } from "path";
+
+readdirSync(join(__dirname, "src"))
+    .forEach(child => moveSync(join(__dirname, "src", child), join(__dirname, child), { overwrite: true }));
+
+const VencordSrc = join(__dirname, "..", "..", "src");
+
+for (const file of ["preload.d.ts", "userplugins", "main", "debug", "src", "browser", "scripts"]) {
+    rmSync(join(__dirname, file), { recursive: true, force: true });
+}
+
+function copyDtsFiles(from: string, to: string) {
+    for (const file of readdirSync(from, { withFileTypes: true })) {
+        // bad
+        if (from === VencordSrc && file.name === "globals.d.ts") continue;
+
+        const fullFrom = join(from, file.name);
+        const fullTo = join(to, file.name);
+
+        if (file.isDirectory()) {
+            copyDtsFiles(fullFrom, fullTo);
+        } else if (file.name.endsWith(".d.ts")) {
+            cpSync(fullFrom, fullTo);
+        }
+    }
+}
+
+copyDtsFiles(VencordSrc, __dirname);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 54b3ab8da..065d5d4e7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -67,10 +67,10 @@ importers:
         version: 2.4.2
       '@typescript-eslint/eslint-plugin':
         specifier: ^5.59.1
-        version: 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4)
+        version: 5.59.1(@typescript-eslint/parser@5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5))(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5)
       '@typescript-eslint/parser':
         specifier: ^5.59.1
-        version: 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+        version: 5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5)
       diff:
         specifier: ^5.1.0
         version: 5.1.0
@@ -85,16 +85,16 @@ importers:
         version: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
       eslint-import-resolver-alias:
         specifier: ^1.1.2
-        version: 1.1.2
+        version: 1.1.2(eslint-plugin-import@2.29.1(@typescript-eslint/parser@5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5))(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)))
       eslint-plugin-path-alias:
         specifier: ^1.0.0
-        version: 1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0)
+        version: 1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))
       eslint-plugin-simple-import-sort:
         specifier: ^10.0.0
-        version: 10.0.0(eslint@8.46.0)
+        version: 10.0.0(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))
       eslint-plugin-unused-imports:
         specifier: ^2.0.0
-        version: 2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.46.0)
+        version: 2.0.0(@typescript-eslint/eslint-plugin@5.59.1(@typescript-eslint/parser@5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5))(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5))(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))
       highlight.js:
         specifier: 10.6.0
         version: 10.6.0
@@ -103,7 +103,7 @@ importers:
         version: 2.29.4
       puppeteer-core:
         specifier: ^19.11.1
-        version: 19.11.1(typescript@5.0.4)
+        version: 19.11.1(typescript@5.4.5)
       standalone-electron-types:
         specifier: ^1.0.0
         version: 1.0.0
@@ -113,6 +113,9 @@ importers:
       stylelint-config-standard:
         specifier: ^33.0.0
         version: 33.0.0(stylelint@15.6.0)
+      ts-patch:
+        specifier: ^3.1.2
+        version: 3.1.2
       tsx:
         specifier: ^3.12.7
         version: 3.12.7
@@ -120,14 +123,48 @@ importers:
         specifier: ^3.9.0
         version: 3.9.0
       typescript:
-        specifier: ^5.0.4
-        version: 5.0.4
+        specifier: ^5.4.5
+        version: 5.4.5
+      typescript-transform-paths:
+        specifier: ^3.4.7
+        version: 3.4.7(typescript@5.4.5)
       zip-local:
         specifier: ^0.3.5
         version: 0.3.5
-      zustand:
-        specifier: ^3.7.2
-        version: 3.7.2
+
+  packages/vencord-types:
+    dependencies:
+      '@types/lodash':
+        specifier: ^4.14.191
+        version: 4.14.194
+      '@types/node':
+        specifier: ^18.11.18
+        version: 18.16.3
+      '@types/react':
+        specifier: ^18.2.0
+        version: 18.2.0
+      '@types/react-dom':
+        specifier: ^18.0.10
+        version: 18.2.1
+      discord-types:
+        specifier: ^1.3.26
+        version: 1.3.26
+      standalone-electron-types:
+        specifier: ^1.0.0
+        version: 1.0.0
+      type-fest:
+        specifier: ^3.5.3
+        version: 3.9.0
+    devDependencies:
+      '@types/fs-extra':
+        specifier: ^11.0.4
+        version: 11.0.4
+      fs-extra:
+        specifier: ^11.2.0
+        version: 11.2.0
+      tsx:
+        specifier: ^3.12.6
+        version: 3.12.7
 
 packages:
 
@@ -328,9 +365,6 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-    peerDependenciesMeta:
-      eslint:
-        optional: true
 
   '@eslint-community/regexpp@4.5.1':
     resolution: {integrity: sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==}
@@ -396,12 +430,21 @@ packages:
   '@types/filewriter@0.0.30':
     resolution: {integrity: sha512-lB98tui0uxc7erbj0serZfJlHKLNJHwBltPnbmO1WRpL5T325GOHRiQfr2E29V2q+S1brDO63Fpdt6vb3bES9Q==}
 
+  '@types/fs-extra@11.0.4':
+    resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==}
+
   '@types/har-format@1.2.13':
     resolution: {integrity: sha512-PwBsCBD3lDODn4xpje3Y1di0aDJp4Ww7aSfMRVw6ysnxD4I7Wmq2mBkSKaDtN403hqH5sp6c9xQUvFYY3+lkBg==}
 
   '@types/json-schema@7.0.11':
     resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
 
+  '@types/json5@0.0.29':
+    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
+
+  '@types/jsonfile@6.1.4':
+    resolution: {integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==}
+
   '@types/lodash@4.14.194':
     resolution: {integrity: sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==}
 
@@ -446,8 +489,6 @@ packages:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
-      eslint:
-        optional: true
       typescript:
         optional: true
 
@@ -458,8 +499,6 @@ packages:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
-      eslint:
-        optional: true
       typescript:
         optional: true
 
@@ -474,8 +513,6 @@ packages:
       eslint: '*'
       typescript: '*'
     peerDependenciesMeta:
-      eslint:
-        optional: true
       typescript:
         optional: true
 
@@ -497,9 +534,6 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-    peerDependenciesMeta:
-      eslint:
-        optional: true
 
   '@typescript-eslint/visitor-keys@5.59.1':
     resolution: {integrity: sha512-6waEYwBTCWryx0VJmP7JaM4FpipLsFl9CvYf2foAE8Qh/Y0s+bxWysciwOs0LTBED4JCaNxTZ5rGadB14M6dwA==}
@@ -554,6 +588,14 @@ packages:
     resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
     engines: {node: '>=0.10.0'}
 
+  array-buffer-byte-length@1.0.1:
+    resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
+    engines: {node: '>= 0.4'}
+
+  array-includes@3.1.8:
+    resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
+    engines: {node: '>= 0.4'}
+
   array-union@2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
@@ -562,6 +604,22 @@ packages:
     resolution: {integrity: sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==}
     engines: {node: '>=0.10.0'}
 
+  array.prototype.findlastindex@1.2.5:
+    resolution: {integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flat@1.3.2:
+    resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flatmap@1.3.2:
+    resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
+    engines: {node: '>= 0.4'}
+
+  arraybuffer.prototype.slice@1.0.3:
+    resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
+    engines: {node: '>= 0.4'}
+
   arrify@1.0.1:
     resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
     engines: {node: '>=0.10.0'}
@@ -582,6 +640,10 @@ packages:
     engines: {node: '>= 4.5.0'}
     hasBin: true
 
+  available-typed-arrays@1.0.7:
+    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
+    engines: {node: '>= 0.4'}
+
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
@@ -618,6 +680,10 @@ packages:
     resolution: {integrity: sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==}
     engines: {node: '>=0.10.0'}
 
+  call-bind@1.0.7:
+    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
+    engines: {node: '>= 0.4'}
+
   callsites@3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
@@ -711,6 +777,18 @@ packages:
   csstype@3.1.2:
     resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
 
+  data-view-buffer@1.0.1:
+    resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-length@1.0.1:
+    resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-offset@1.0.0:
+    resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
+    engines: {node: '>= 0.4'}
+
   debug@2.6.9:
     resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
     peerDependencies:
@@ -719,6 +797,14 @@ packages:
       supports-color:
         optional: true
 
+  debug@3.2.7:
+    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   debug@4.3.4:
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
@@ -743,6 +829,14 @@ packages:
   deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
+  define-data-property@1.1.4:
+    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
+    engines: {node: '>= 0.4'}
+
+  define-properties@1.2.1:
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
+    engines: {node: '>= 0.4'}
+
   define-property@0.2.5:
     resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
     engines: {node: '>=0.10.0'}
@@ -769,6 +863,10 @@ packages:
   discord-types@1.3.26:
     resolution: {integrity: sha512-ToG51AOCH+JTQf7b+8vuYQe5Iqwz7nZ7StpECAZ/VZcI1ZhQk13pvt9KkRTfRv1xNvwJ2qib4e3+RifQlo8VPQ==}
 
+  doctrine@2.1.0:
+    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
+    engines: {node: '>=0.10.0'}
+
   doctrine@3.0.0:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
     engines: {node: '>=6.0.0'}
@@ -782,6 +880,33 @@ packages:
   error-ex@1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
 
+  es-abstract@1.23.3:
+    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
+    engines: {node: '>= 0.4'}
+
+  es-define-property@1.0.0:
+    resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
+    engines: {node: '>= 0.4'}
+
+  es-errors@1.3.0:
+    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+    engines: {node: '>= 0.4'}
+
+  es-object-atoms@1.0.0:
+    resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
+    engines: {node: '>= 0.4'}
+
+  es-set-tostringtag@2.0.3:
+    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
+    engines: {node: '>= 0.4'}
+
+  es-shim-unscopables@1.0.2:
+    resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
+
+  es-to-primitive@1.2.1:
+    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
+    engines: {node: '>= 0.4'}
+
   esbuild-android-64@0.15.18:
     resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==}
     engines: {node: '>=12'}
@@ -929,17 +1054,45 @@ packages:
     engines: {node: '>= 4'}
     peerDependencies:
       eslint-plugin-import: '>=1.4.0'
+
+  eslint-import-resolver-node@0.3.9:
+    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
+
+  eslint-module-utils@2.8.1:
+    resolution: {integrity: sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
     peerDependenciesMeta:
-      eslint-plugin-import:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+
+  eslint-plugin-import@2.29.1:
+    resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
         optional: true
 
   eslint-plugin-path-alias@1.0.0:
     resolution: {integrity: sha512-FXus57yC+Zd3sMv46pbloXYwFeNVNHJqlACr9V68FG/IzGFBBokGJpmjDbEjpt8ZCeVSndUubeDWWl2A8sCNVQ==}
     peerDependencies:
       eslint: ^7
-    peerDependenciesMeta:
-      eslint:
-        optional: true
 
   eslint-plugin-simple-header@1.0.2:
     resolution: {integrity: sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA==}
@@ -948,9 +1101,6 @@ packages:
     resolution: {integrity: sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==}
     peerDependencies:
       eslint: '>=5.0.0'
-    peerDependenciesMeta:
-      eslint:
-        optional: true
 
   eslint-plugin-unused-imports@2.0.0:
     resolution: {integrity: sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==}
@@ -961,8 +1111,6 @@ packages:
     peerDependenciesMeta:
       '@typescript-eslint/eslint-plugin':
         optional: true
-      eslint:
-        optional: true
 
   eslint-rule-composer@0.3.0:
     resolution: {integrity: sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==}
@@ -1078,6 +1226,9 @@ packages:
   flatted@3.2.7:
     resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
 
+  for-each@0.3.3:
+    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+
   for-in@1.0.2:
     resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
     engines: {node: '>=0.10.0'}
@@ -1089,6 +1240,10 @@ packages:
   fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
+  fs-extra@11.2.0:
+    resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==}
+    engines: {node: '>=14.14'}
+
   fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
@@ -1100,14 +1255,32 @@ packages:
   function-bind@1.1.1:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
 
+  function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+
+  function.prototype.name@1.1.6:
+    resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
+    engines: {node: '>= 0.4'}
+
+  functions-have-names@1.2.3:
+    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
+
   get-caller-file@2.0.5:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
 
+  get-intrinsic@1.2.4:
+    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
+    engines: {node: '>= 0.4'}
+
   get-stream@5.2.0:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
     engines: {node: '>=8'}
 
+  get-symbol-description@1.0.2:
+    resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
+    engines: {node: '>= 0.4'}
+
   get-tsconfig@4.5.0:
     resolution: {integrity: sha512-MjhiaIWCJ1sAU4pIQ5i5OfOuHHxVo1oYeNsWTON7jxYkod8pHocXeh+SSbmu5OZZZK73B6cbJ2XADzXehLyovQ==}
 
@@ -1117,7 +1290,6 @@ packages:
 
   gifenc@https://codeload.github.com/mattdesl/gifenc/tar.gz/64842fca317b112a8590f8fef2bf3825da8f6fe3:
     resolution: {tarball: https://codeload.github.com/mattdesl/gifenc/tar.gz/64842fca317b112a8590f8fef2bf3825da8f6fe3}
-    name: gifenc
     version: 1.0.3
 
   glob-parent@5.1.2:
@@ -1143,6 +1315,10 @@ packages:
     resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==}
     engines: {node: '>=8'}
 
+  globalthis@1.0.4:
+    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
+    engines: {node: '>= 0.4'}
+
   globby@11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
     engines: {node: '>=10'}
@@ -1150,6 +1326,9 @@ packages:
   globjoin@0.1.4:
     resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
 
+  gopd@1.0.1:
+    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
+
   graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
@@ -1163,6 +1342,9 @@ packages:
     resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
     engines: {node: '>=6'}
 
+  has-bigints@1.0.2:
+    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
+
   has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
@@ -1171,6 +1353,21 @@ packages:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
 
+  has-property-descriptors@1.0.2:
+    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
+
+  has-proto@1.0.3:
+    resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
+    engines: {node: '>= 0.4'}
+
+  has-symbols@1.0.3:
+    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
+    engines: {node: '>= 0.4'}
+
+  has-tostringtag@1.0.2:
+    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+    engines: {node: '>= 0.4'}
+
   has-value@0.3.1:
     resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
     engines: {node: '>=0.10.0'}
@@ -1191,6 +1388,10 @@ packages:
     resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
     engines: {node: '>= 0.4.0'}
 
+  hasown@2.0.2:
+    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+    engines: {node: '>= 0.4'}
+
   highlight.js@10.6.0:
     resolution: {integrity: sha512-8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ==}
 
@@ -1241,6 +1442,10 @@ packages:
   ini@1.3.8:
     resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
 
+  internal-slot@1.0.7:
+    resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
+    engines: {node: '>= 0.4'}
+
   is-accessor-descriptor@0.1.6:
     resolution: {integrity: sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==}
     engines: {node: '>=0.10.0'}
@@ -1249,15 +1454,33 @@ packages:
     resolution: {integrity: sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==}
     engines: {node: '>=0.10.0'}
 
+  is-array-buffer@3.0.4:
+    resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
+    engines: {node: '>= 0.4'}
+
   is-arrayish@0.2.1:
     resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
 
+  is-bigint@1.0.4:
+    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
+
+  is-boolean-object@1.1.2:
+    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
+    engines: {node: '>= 0.4'}
+
   is-buffer@1.1.6:
     resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
 
+  is-callable@1.2.7:
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
+    engines: {node: '>= 0.4'}
+
   is-core-module@2.12.0:
     resolution: {integrity: sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==}
 
+  is-core-module@2.13.1:
+    resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==}
+
   is-data-descriptor@0.1.4:
     resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==}
     engines: {node: '>=0.10.0'}
@@ -1266,6 +1489,14 @@ packages:
     resolution: {integrity: sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==}
     engines: {node: '>=0.10.0'}
 
+  is-data-view@1.0.1:
+    resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
+    engines: {node: '>= 0.4'}
+
+  is-date-object@1.0.5:
+    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
+    engines: {node: '>= 0.4'}
+
   is-descriptor@0.1.6:
     resolution: {integrity: sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==}
     engines: {node: '>=0.10.0'}
@@ -1294,6 +1525,14 @@ packages:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
 
+  is-negative-zero@2.0.3:
+    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
+    engines: {node: '>= 0.4'}
+
+  is-number-object@1.0.7:
+    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
+    engines: {node: '>= 0.4'}
+
   is-number@3.0.0:
     resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==}
     engines: {node: '>=0.10.0'}
@@ -1318,6 +1557,29 @@ packages:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
 
+  is-regex@1.1.4:
+    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
+    engines: {node: '>= 0.4'}
+
+  is-shared-array-buffer@1.0.3:
+    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
+    engines: {node: '>= 0.4'}
+
+  is-string@1.0.7:
+    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
+    engines: {node: '>= 0.4'}
+
+  is-symbol@1.0.4:
+    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
+    engines: {node: '>= 0.4'}
+
+  is-typed-array@1.1.13:
+    resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
+    engines: {node: '>= 0.4'}
+
+  is-weakref@1.0.2:
+    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
+
   is-windows@1.0.2:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
     engines: {node: '>=0.10.0'}
@@ -1325,6 +1587,9 @@ packages:
   isarray@1.0.0:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
 
+  isarray@2.0.5:
+    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
+
   isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
@@ -1355,9 +1620,16 @@ packages:
   json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
 
+  json5@1.0.2:
+    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
+    hasBin: true
+
   jsonc-parser@3.2.0:
     resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
 
+  jsonfile@6.1.0:
+    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
+
   jszip@2.7.0:
     resolution: {integrity: sha512-JIsRKRVC3gTRo2vM4Wy9WBC3TRcfnIZU8k65Phi3izkvPH975FowRYtKGT6PxevA0XnJ/yO8b0QwV0ydVyQwfw==}
 
@@ -1450,6 +1722,9 @@ packages:
     resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
     engines: {node: '>= 6'}
 
+  minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+
   mitt@3.0.0:
     resolution: {integrity: sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==}
 
@@ -1472,6 +1747,9 @@ packages:
   ms@2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
 
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
   nanoid@3.3.6:
     resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -1516,14 +1794,37 @@ packages:
     resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
     engines: {node: '>=0.10.0'}
 
+  object-inspect@1.13.1:
+    resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
+
+  object-keys@1.1.1:
+    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
+    engines: {node: '>= 0.4'}
+
   object-visit@1.0.1:
     resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
     engines: {node: '>=0.10.0'}
 
+  object.assign@4.1.5:
+    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
+    engines: {node: '>= 0.4'}
+
+  object.fromentries@2.0.8:
+    resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
+    engines: {node: '>= 0.4'}
+
+  object.groupby@1.0.3:
+    resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
+    engines: {node: '>= 0.4'}
+
   object.pick@1.3.0:
     resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
     engines: {node: '>=0.10.0'}
 
+  object.values@1.2.0:
+    resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
+    engines: {node: '>= 0.4'}
+
   once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
 
@@ -1595,6 +1896,10 @@ packages:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
+  possible-typed-array-names@1.0.0:
+    resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
+    engines: {node: '>= 0.4'}
+
   postcss-media-query-parser@0.2.3:
     resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==}
 
@@ -1676,6 +1981,10 @@ packages:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
 
+  regexp.prototype.flags@1.5.2:
+    resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
+    engines: {node: '>= 0.4'}
+
   require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -1700,6 +2009,10 @@ packages:
     resolution: {integrity: sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==}
     hasBin: true
 
+  resolve@1.22.8:
+    resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
+    hasBin: true
+
   ret@0.1.15:
     resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
     engines: {node: '>=0.12'}
@@ -1715,9 +2028,17 @@ packages:
   run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
 
+  safe-array-concat@1.1.2:
+    resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
+    engines: {node: '>=0.4'}
+
   safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
+  safe-regex-test@1.0.3:
+    resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
+    engines: {node: '>= 0.4'}
+
   safe-regex@1.1.0:
     resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==}
 
@@ -1725,11 +2046,28 @@ packages:
     resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
     hasBin: true
 
+  semver@6.3.1:
+    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
+    hasBin: true
+
   semver@7.5.0:
     resolution: {integrity: sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==}
     engines: {node: '>=10'}
     hasBin: true
 
+  semver@7.6.2:
+    resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  set-function-length@1.2.2:
+    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
+    engines: {node: '>= 0.4'}
+
+  set-function-name@2.0.2:
+    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
+    engines: {node: '>= 0.4'}
+
   set-value@2.0.1:
     resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
     engines: {node: '>=0.10.0'}
@@ -1742,6 +2080,10 @@ packages:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
+  side-channel@1.0.6:
+    resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
+    engines: {node: '>= 0.4'}
+
   signal-exit@4.0.1:
     resolution: {integrity: sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw==}
     engines: {node: '>=14'}
@@ -1808,6 +2150,17 @@ packages:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
 
+  string.prototype.trim@1.2.9:
+    resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.trimend@1.0.8:
+    resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
+
+  string.prototype.trimstart@1.0.8:
+    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
+    engines: {node: '>= 0.4'}
+
   string_decoder@1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
 
@@ -1815,6 +2168,10 @@ packages:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
 
+  strip-bom@3.0.0:
+    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
+    engines: {node: '>=4'}
+
   strip-indent@3.0.0:
     resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
     engines: {node: '>=8'}
@@ -1896,6 +2253,13 @@ packages:
     resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
     engines: {node: '>=8'}
 
+  ts-patch@3.1.2:
+    resolution: {integrity: sha512-n58F5AqjUMdp9RAKq+E1YBkmONltPVbt1nN+wrmZXoYZek6QcvaTuqvKMhYhr5BxtC53kD/exxIPA1cP1RQxsA==}
+    hasBin: true
+
+  tsconfig-paths@3.15.0:
+    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
+
   tslib@1.14.1:
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
 
@@ -1933,11 +2297,35 @@ packages:
     resolution: {integrity: sha512-hR8JP2e8UiH7SME5JZjsobBlEiatFoxpzCP+R3ZeCo7kAaG1jXQE5X/buLzogM6GJu8le9Y4OcfNuIQX0rZskA==}
     engines: {node: '>=14.16'}
 
-  typescript@5.0.4:
-    resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==}
-    engines: {node: '>=12.20'}
+  typed-array-buffer@1.0.2:
+    resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-byte-length@1.0.1:
+    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-byte-offset@1.0.2:
+    resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-length@1.0.6:
+    resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
+    engines: {node: '>= 0.4'}
+
+  typescript-transform-paths@3.4.7:
+    resolution: {integrity: sha512-1Us1kdkdfKd2unbkBAOV2HHRmbRBYpSuk9nJ7cLD2hP4QmfToiM/VpxNlhJc1eezVwVqSKSBjNSzZsK/fWR/9A==}
+    peerDependencies:
+      typescript: '>=3.6.5'
+
+  typescript@5.4.5:
+    resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==}
+    engines: {node: '>=14.17'}
     hasBin: true
 
+  unbox-primitive@1.0.2:
+    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
+
   unbzip2-stream@1.4.3:
     resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
 
@@ -1945,6 +2333,10 @@ packages:
     resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
     engines: {node: '>=0.10.0'}
 
+  universalify@2.0.1:
+    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
+    engines: {node: '>= 10.0.0'}
+
   unset-value@1.0.0:
     resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
     engines: {node: '>=0.10.0'}
@@ -1984,6 +2376,13 @@ packages:
   whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
 
+  which-boxed-primitive@1.0.2:
+    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
+
+  which-typed-array@1.1.15:
+    resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
+    engines: {node: '>= 0.4'}
+
   which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
     hasBin: true
@@ -2045,15 +2444,6 @@ packages:
   zip-local@0.3.5:
     resolution: {integrity: sha512-GRV3D5TJY+/PqyeRm5CYBs7xVrKTKzljBoEXvocZu0HJ7tPEcgpSOYa2zFIsCZWgKWMuc4U3yMFgFkERGFIB9w==}
 
-  zustand@3.7.2:
-    resolution: {integrity: sha512-PIJDIZKtokhof+9+60cpockVOq05sJzHCriyvaLBmEJixseQ1a5Kdov6fWZfWOu5SK9c+FhH1jU0tntLxRJYMA==}
-    engines: {node: '>=12.7.0'}
-    peerDependencies:
-      react: '>=16.8'
-    peerDependenciesMeta:
-      react:
-        optional: true
-
 snapshots:
 
   '@aashutoshrathi/word-wrap@1.2.6': {}
@@ -2076,7 +2466,7 @@ snapshots:
 
   '@csstools/css-tokenizer@2.1.1': {}
 
-  '@csstools/media-query-list-parser@2.0.4(@csstools/css-parser-algorithms@2.1.1)(@csstools/css-tokenizer@2.1.1)':
+  '@csstools/media-query-list-parser@2.0.4(@csstools/css-parser-algorithms@2.1.1(@csstools/css-tokenizer@2.1.1))(@csstools/css-tokenizer@2.1.1)':
     dependencies:
       '@csstools/css-parser-algorithms': 2.1.1(@csstools/css-tokenizer@2.1.1)
       '@csstools/css-tokenizer': 2.1.1
@@ -2172,7 +2562,7 @@ snapshots:
   '@esbuild/win32-x64@0.17.18':
     optional: true
 
-  '@eslint-community/eslint-utils@4.4.0(eslint@8.46.0)':
+  '@eslint-community/eslint-utils@4.4.0(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))':
     dependencies:
       eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
       eslint-visitor-keys: 3.4.2
@@ -2221,7 +2611,7 @@ snapshots:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.13.0
 
-  '@puppeteer/browsers@0.5.0(typescript@5.0.4)':
+  '@puppeteer/browsers@0.5.0(typescript@5.4.5)':
     dependencies:
       debug: 4.3.4
       extract-zip: 2.0.1
@@ -2229,9 +2619,10 @@ snapshots:
       progress: 2.0.3
       proxy-from-env: 1.1.0
       tar-fs: 2.1.1
-      typescript: 5.0.4
       unbzip2-stream: 1.4.3
       yargs: 17.7.1
+    optionalDependencies:
+      typescript: 5.4.5
     transitivePeerDependencies:
       - supports-color
 
@@ -2250,10 +2641,21 @@ snapshots:
 
   '@types/filewriter@0.0.30': {}
 
+  '@types/fs-extra@11.0.4':
+    dependencies:
+      '@types/jsonfile': 6.1.4
+      '@types/node': 18.16.3
+
   '@types/har-format@1.2.13': {}
 
   '@types/json-schema@7.0.11': {}
 
+  '@types/json5@0.0.29': {}
+
+  '@types/jsonfile@6.1.4':
+    dependencies:
+      '@types/node': 18.16.3
+
   '@types/lodash@4.14.194': {}
 
   '@types/minimist@1.2.2': {}
@@ -2292,32 +2694,34 @@ snapshots:
     dependencies:
       '@types/node': 18.16.3
 
-  '@typescript-eslint/eslint-plugin@5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4)':
+  '@typescript-eslint/eslint-plugin@5.59.1(@typescript-eslint/parser@5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5))(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5)':
     dependencies:
       '@eslint-community/regexpp': 4.5.1
-      '@typescript-eslint/parser': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/parser': 5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5)
       '@typescript-eslint/scope-manager': 5.59.1
-      '@typescript-eslint/type-utils': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
-      '@typescript-eslint/utils': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/type-utils': 5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5)
+      '@typescript-eslint/utils': 5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5)
       debug: 4.3.4
       eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
       grapheme-splitter: 1.0.4
       ignore: 5.2.4
       natural-compare-lite: 1.4.0
       semver: 7.5.0
-      tsutils: 3.21.0(typescript@5.0.4)
-      typescript: 5.0.4
+      tsutils: 3.21.0(typescript@5.4.5)
+    optionalDependencies:
+      typescript: 5.4.5
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@5.59.1(eslint@8.46.0)(typescript@5.0.4)':
+  '@typescript-eslint/parser@5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/scope-manager': 5.59.1
       '@typescript-eslint/types': 5.59.1
-      '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.0.4)
+      '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.4.5)
       debug: 4.3.4
       eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
-      typescript: 5.0.4
+    optionalDependencies:
+      typescript: 5.4.5
     transitivePeerDependencies:
       - supports-color
 
@@ -2326,20 +2730,21 @@ snapshots:
       '@typescript-eslint/types': 5.59.1
       '@typescript-eslint/visitor-keys': 5.59.1
 
-  '@typescript-eslint/type-utils@5.59.1(eslint@8.46.0)(typescript@5.0.4)':
+  '@typescript-eslint/type-utils@5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5)':
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.0.4)
-      '@typescript-eslint/utils': 5.59.1(eslint@8.46.0)(typescript@5.0.4)
+      '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.4.5)
+      '@typescript-eslint/utils': 5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5)
       debug: 4.3.4
       eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
-      tsutils: 3.21.0(typescript@5.0.4)
-      typescript: 5.0.4
+      tsutils: 3.21.0(typescript@5.4.5)
+    optionalDependencies:
+      typescript: 5.4.5
     transitivePeerDependencies:
       - supports-color
 
   '@typescript-eslint/types@5.59.1': {}
 
-  '@typescript-eslint/typescript-estree@5.59.1(typescript@5.0.4)':
+  '@typescript-eslint/typescript-estree@5.59.1(typescript@5.4.5)':
     dependencies:
       '@typescript-eslint/types': 5.59.1
       '@typescript-eslint/visitor-keys': 5.59.1
@@ -2347,19 +2752,20 @@ snapshots:
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.0
-      tsutils: 3.21.0(typescript@5.0.4)
-      typescript: 5.0.4
+      tsutils: 3.21.0(typescript@5.4.5)
+    optionalDependencies:
+      typescript: 5.4.5
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@5.59.1(eslint@8.46.0)(typescript@5.0.4)':
+  '@typescript-eslint/utils@5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))
       '@types/json-schema': 7.0.11
       '@types/semver': 7.3.13
       '@typescript-eslint/scope-manager': 5.59.1
       '@typescript-eslint/types': 5.59.1
-      '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.0.4)
+      '@typescript-eslint/typescript-estree': 5.59.1(typescript@5.4.5)
       eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
       eslint-scope: 5.1.1
       semver: 7.5.0
@@ -2424,10 +2830,58 @@ snapshots:
 
   arr-union@3.1.0: {}
 
+  array-buffer-byte-length@1.0.1:
+    dependencies:
+      call-bind: 1.0.7
+      is-array-buffer: 3.0.4
+
+  array-includes@3.1.8:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-object-atoms: 1.0.0
+      get-intrinsic: 1.2.4
+      is-string: 1.0.7
+
   array-union@2.1.0: {}
 
   array-unique@0.3.2: {}
 
+  array.prototype.findlastindex@1.2.5:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-errors: 1.3.0
+      es-object-atoms: 1.0.0
+      es-shim-unscopables: 1.0.2
+
+  array.prototype.flat@1.3.2:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-shim-unscopables: 1.0.2
+
+  array.prototype.flatmap@1.3.2:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-shim-unscopables: 1.0.2
+
+  arraybuffer.prototype.slice@1.0.3:
+    dependencies:
+      array-buffer-byte-length: 1.0.1
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.4
+      is-array-buffer: 3.0.4
+      is-shared-array-buffer: 1.0.3
+
   arrify@1.0.1: {}
 
   assign-symbols@1.0.0: {}
@@ -2438,6 +2892,10 @@ snapshots:
 
   atob@2.1.2: {}
 
+  available-typed-arrays@1.0.7:
+    dependencies:
+      possible-typed-array-names: 1.0.0
+
   balanced-match@1.0.2: {}
 
   balanced-match@2.0.0: {}
@@ -2490,6 +2948,14 @@ snapshots:
       union-value: 1.0.1
       unset-value: 1.0.0
 
+  call-bind@1.0.7:
+    dependencies:
+      es-define-property: 1.0.0
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.4
+      set-function-length: 1.2.2
+
   callsites@3.1.0: {}
 
   camelcase-keys@6.2.2:
@@ -2586,10 +3052,32 @@ snapshots:
 
   csstype@3.1.2: {}
 
+  data-view-buffer@1.0.1:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+
+  data-view-byte-length@1.0.1:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+
+  data-view-byte-offset@1.0.0:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+
   debug@2.6.9:
     dependencies:
       ms: 2.0.0
 
+  debug@3.2.7:
+    dependencies:
+      ms: 2.1.3
+
   debug@4.3.4:
     dependencies:
       ms: 2.1.2
@@ -2605,6 +3093,18 @@ snapshots:
 
   deep-is@0.1.4: {}
 
+  define-data-property@1.1.4:
+    dependencies:
+      es-define-property: 1.0.0
+      es-errors: 1.3.0
+      gopd: 1.0.1
+
+  define-properties@1.2.1:
+    dependencies:
+      define-data-property: 1.1.4
+      has-property-descriptors: 1.0.2
+      object-keys: 1.1.1
+
   define-property@0.2.5:
     dependencies:
       is-descriptor: 0.1.6
@@ -2631,6 +3131,10 @@ snapshots:
       '@types/react': 17.0.2
       moment: 2.29.4
 
+  doctrine@2.1.0:
+    dependencies:
+      esutils: 2.0.3
+
   doctrine@3.0.0:
     dependencies:
       esutils: 2.0.3
@@ -2645,6 +3149,81 @@ snapshots:
     dependencies:
       is-arrayish: 0.2.1
 
+  es-abstract@1.23.3:
+    dependencies:
+      array-buffer-byte-length: 1.0.1
+      arraybuffer.prototype.slice: 1.0.3
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      data-view-buffer: 1.0.1
+      data-view-byte-length: 1.0.1
+      data-view-byte-offset: 1.0.0
+      es-define-property: 1.0.0
+      es-errors: 1.3.0
+      es-object-atoms: 1.0.0
+      es-set-tostringtag: 2.0.3
+      es-to-primitive: 1.2.1
+      function.prototype.name: 1.1.6
+      get-intrinsic: 1.2.4
+      get-symbol-description: 1.0.2
+      globalthis: 1.0.4
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.2
+      has-proto: 1.0.3
+      has-symbols: 1.0.3
+      hasown: 2.0.2
+      internal-slot: 1.0.7
+      is-array-buffer: 3.0.4
+      is-callable: 1.2.7
+      is-data-view: 1.0.1
+      is-negative-zero: 2.0.3
+      is-regex: 1.1.4
+      is-shared-array-buffer: 1.0.3
+      is-string: 1.0.7
+      is-typed-array: 1.1.13
+      is-weakref: 1.0.2
+      object-inspect: 1.13.1
+      object-keys: 1.1.1
+      object.assign: 4.1.5
+      regexp.prototype.flags: 1.5.2
+      safe-array-concat: 1.1.2
+      safe-regex-test: 1.0.3
+      string.prototype.trim: 1.2.9
+      string.prototype.trimend: 1.0.8
+      string.prototype.trimstart: 1.0.8
+      typed-array-buffer: 1.0.2
+      typed-array-byte-length: 1.0.1
+      typed-array-byte-offset: 1.0.2
+      typed-array-length: 1.0.6
+      unbox-primitive: 1.0.2
+      which-typed-array: 1.1.15
+
+  es-define-property@1.0.0:
+    dependencies:
+      get-intrinsic: 1.2.4
+
+  es-errors@1.3.0: {}
+
+  es-object-atoms@1.0.0:
+    dependencies:
+      es-errors: 1.3.0
+
+  es-set-tostringtag@2.0.3:
+    dependencies:
+      get-intrinsic: 1.2.4
+      has-tostringtag: 1.0.2
+      hasown: 2.0.2
+
+  es-shim-unscopables@1.0.2:
+    dependencies:
+      hasown: 2.0.2
+
+  es-to-primitive@1.2.1:
+    dependencies:
+      is-callable: 1.2.7
+      is-date-object: 1.0.5
+      is-symbol: 1.0.4
+
   esbuild-android-64@0.15.18:
     optional: true
 
@@ -2761,9 +3340,56 @@ snapshots:
 
   escape-string-regexp@4.0.0: {}
 
-  eslint-import-resolver-alias@1.1.2: {}
+  eslint-import-resolver-alias@1.1.2(eslint-plugin-import@2.29.1(@typescript-eslint/parser@5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5))(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))):
+    dependencies:
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5))(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))
 
-  eslint-plugin-path-alias@1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0):
+  eslint-import-resolver-node@0.3.9:
+    dependencies:
+      debug: 3.2.7
+      is-core-module: 2.13.1
+      resolve: 1.22.8
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-module-utils@2.8.1(@typescript-eslint/parser@5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)):
+    dependencies:
+      debug: 3.2.7
+    optionalDependencies:
+      '@typescript-eslint/parser': 5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5)
+      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint-import-resolver-node: 0.3.9
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-import@2.29.1(@typescript-eslint/parser@5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5))(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)):
+    dependencies:
+      array-includes: 3.1.8
+      array.prototype.findlastindex: 1.2.5
+      array.prototype.flat: 1.3.2
+      array.prototype.flatmap: 1.3.2
+      debug: 3.2.7
+      doctrine: 2.1.0
+      eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
+      eslint-import-resolver-node: 0.3.9
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))
+      hasown: 2.0.2
+      is-core-module: 2.13.1
+      is-glob: 4.0.3
+      minimatch: 3.1.2
+      object.fromentries: 2.0.8
+      object.groupby: 1.0.3
+      object.values: 1.2.0
+      semver: 6.3.1
+      tsconfig-paths: 3.15.0
+    optionalDependencies:
+      '@typescript-eslint/parser': 5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5)
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+
+  eslint-plugin-path-alias@1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)):
     dependencies:
       eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
       nanomatch: 1.2.13
@@ -2772,15 +3398,16 @@ snapshots:
 
   eslint-plugin-simple-header@1.0.2: {}
 
-  eslint-plugin-simple-import-sort@10.0.0(eslint@8.46.0):
+  eslint-plugin-simple-import-sort@10.0.0(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)):
     dependencies:
       eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
 
-  eslint-plugin-unused-imports@2.0.0(@typescript-eslint/eslint-plugin@5.59.1)(eslint@8.46.0):
+  eslint-plugin-unused-imports@2.0.0(@typescript-eslint/eslint-plugin@5.59.1(@typescript-eslint/parser@5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5))(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5))(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.59.1(@typescript-eslint/parser@5.59.1)(eslint@8.46.0)(typescript@5.0.4)
       eslint: 8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4)
       eslint-rule-composer: 0.3.0
+    optionalDependencies:
+      '@typescript-eslint/eslint-plugin': 5.59.1(@typescript-eslint/parser@5.59.1(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5))(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))(typescript@5.4.5)
 
   eslint-rule-composer@0.3.0: {}
 
@@ -2800,7 +3427,7 @@ snapshots:
 
   eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4):
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.46.0(patch_hash=xm46kqcmdgzlmm4aifkfpxaho4))
       '@eslint-community/regexpp': 4.6.2
       '@eslint/eslintrc': 2.1.1
       '@eslint/js': 8.46.0
@@ -2932,6 +3559,10 @@ snapshots:
 
   flatted@3.2.7: {}
 
+  for-each@0.3.3:
+    dependencies:
+      is-callable: 1.2.7
+
   for-in@1.0.2: {}
 
   fragment-cache@0.2.1:
@@ -2940,6 +3571,12 @@ snapshots:
 
   fs-constants@1.0.0: {}
 
+  fs-extra@11.2.0:
+    dependencies:
+      graceful-fs: 4.2.11
+      jsonfile: 6.1.0
+      universalify: 2.0.1
+
   fs.realpath@1.0.0: {}
 
   fsevents@2.3.2:
@@ -2947,12 +3584,37 @@ snapshots:
 
   function-bind@1.1.1: {}
 
+  function-bind@1.1.2: {}
+
+  function.prototype.name@1.1.6:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      functions-have-names: 1.2.3
+
+  functions-have-names@1.2.3: {}
+
   get-caller-file@2.0.5: {}
 
+  get-intrinsic@1.2.4:
+    dependencies:
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      has-proto: 1.0.3
+      has-symbols: 1.0.3
+      hasown: 2.0.2
+
   get-stream@5.2.0:
     dependencies:
       pump: 3.0.0
 
+  get-symbol-description@1.0.2:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.4
+
   get-tsconfig@4.5.0: {}
 
   get-value@2.0.6: {}
@@ -2990,6 +3652,11 @@ snapshots:
     dependencies:
       type-fest: 0.20.2
 
+  globalthis@1.0.4:
+    dependencies:
+      define-properties: 1.2.1
+      gopd: 1.0.1
+
   globby@11.1.0:
     dependencies:
       array-union: 2.1.0
@@ -3001,6 +3668,10 @@ snapshots:
 
   globjoin@0.1.4: {}
 
+  gopd@1.0.1:
+    dependencies:
+      get-intrinsic: 1.2.4
+
   graceful-fs@4.2.11: {}
 
   grapheme-splitter@1.0.4: {}
@@ -3009,10 +3680,24 @@ snapshots:
 
   hard-rejection@2.1.0: {}
 
+  has-bigints@1.0.2: {}
+
   has-flag@3.0.0: {}
 
   has-flag@4.0.0: {}
 
+  has-property-descriptors@1.0.2:
+    dependencies:
+      es-define-property: 1.0.0
+
+  has-proto@1.0.3: {}
+
+  has-symbols@1.0.3: {}
+
+  has-tostringtag@1.0.2:
+    dependencies:
+      has-symbols: 1.0.3
+
   has-value@0.3.1:
     dependencies:
       get-value: 2.0.6
@@ -3036,6 +3721,10 @@ snapshots:
     dependencies:
       function-bind: 1.1.1
 
+  hasown@2.0.2:
+    dependencies:
+      function-bind: 1.1.2
+
   highlight.js@10.6.0: {}
 
   hosted-git-info@2.8.9: {}
@@ -3077,6 +3766,12 @@ snapshots:
 
   ini@1.3.8: {}
 
+  internal-slot@1.0.7:
+    dependencies:
+      es-errors: 1.3.0
+      hasown: 2.0.2
+      side-channel: 1.0.6
+
   is-accessor-descriptor@0.1.6:
     dependencies:
       kind-of: 3.2.2
@@ -3085,14 +3780,34 @@ snapshots:
     dependencies:
       kind-of: 6.0.3
 
+  is-array-buffer@3.0.4:
+    dependencies:
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
+
   is-arrayish@0.2.1: {}
 
+  is-bigint@1.0.4:
+    dependencies:
+      has-bigints: 1.0.2
+
+  is-boolean-object@1.1.2:
+    dependencies:
+      call-bind: 1.0.7
+      has-tostringtag: 1.0.2
+
   is-buffer@1.1.6: {}
 
+  is-callable@1.2.7: {}
+
   is-core-module@2.12.0:
     dependencies:
       has: 1.0.3
 
+  is-core-module@2.13.1:
+    dependencies:
+      hasown: 2.0.2
+
   is-data-descriptor@0.1.4:
     dependencies:
       kind-of: 3.2.2
@@ -3101,6 +3816,14 @@ snapshots:
     dependencies:
       kind-of: 6.0.3
 
+  is-data-view@1.0.1:
+    dependencies:
+      is-typed-array: 1.1.13
+
+  is-date-object@1.0.5:
+    dependencies:
+      has-tostringtag: 1.0.2
+
   is-descriptor@0.1.6:
     dependencies:
       is-accessor-descriptor: 0.1.6
@@ -3127,6 +3850,12 @@ snapshots:
     dependencies:
       is-extglob: 2.1.1
 
+  is-negative-zero@2.0.3: {}
+
+  is-number-object@1.0.7:
+    dependencies:
+      has-tostringtag: 1.0.2
+
   is-number@3.0.0:
     dependencies:
       kind-of: 3.2.2
@@ -3143,10 +3872,37 @@ snapshots:
 
   is-plain-object@5.0.0: {}
 
+  is-regex@1.1.4:
+    dependencies:
+      call-bind: 1.0.7
+      has-tostringtag: 1.0.2
+
+  is-shared-array-buffer@1.0.3:
+    dependencies:
+      call-bind: 1.0.7
+
+  is-string@1.0.7:
+    dependencies:
+      has-tostringtag: 1.0.2
+
+  is-symbol@1.0.4:
+    dependencies:
+      has-symbols: 1.0.3
+
+  is-typed-array@1.1.13:
+    dependencies:
+      which-typed-array: 1.1.15
+
+  is-weakref@1.0.2:
+    dependencies:
+      call-bind: 1.0.7
+
   is-windows@1.0.2: {}
 
   isarray@1.0.0: {}
 
+  isarray@2.0.5: {}
+
   isexe@2.0.0: {}
 
   isobject@2.1.0:
@@ -3169,8 +3925,18 @@ snapshots:
 
   json-stable-stringify-without-jsonify@1.0.1: {}
 
+  json5@1.0.2:
+    dependencies:
+      minimist: 1.2.8
+
   jsonc-parser@3.2.0: {}
 
+  jsonfile@6.1.0:
+    dependencies:
+      universalify: 2.0.1
+    optionalDependencies:
+      graceful-fs: 4.2.11
+
   jszip@2.7.0:
     dependencies:
       pako: 1.0.11
@@ -3260,6 +4026,8 @@ snapshots:
       is-plain-obj: 1.1.0
       kind-of: 6.0.3
 
+  minimist@1.2.8: {}
+
   mitt@3.0.0: {}
 
   mixin-deep@1.3.2:
@@ -3277,6 +4045,8 @@ snapshots:
 
   ms@2.1.2: {}
 
+  ms@2.1.3: {}
+
   nanoid@3.3.6: {}
 
   nanoid@4.0.2: {}
@@ -3327,14 +4097,44 @@ snapshots:
       define-property: 0.2.5
       kind-of: 3.2.2
 
+  object-inspect@1.13.1: {}
+
+  object-keys@1.1.1: {}
+
   object-visit@1.0.1:
     dependencies:
       isobject: 3.0.1
 
+  object.assign@4.1.5:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      has-symbols: 1.0.3
+      object-keys: 1.1.1
+
+  object.fromentries@2.0.8:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-object-atoms: 1.0.0
+
+  object.groupby@1.0.3:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+
   object.pick@1.3.0:
     dependencies:
       isobject: 3.0.1
 
+  object.values@1.2.0:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+
   once@1.4.0:
     dependencies:
       wrappy: 1.0.2
@@ -3397,6 +4197,8 @@ snapshots:
 
   picomatch@2.3.1: {}
 
+  possible-typed-array-names@1.0.0: {}
+
   postcss-media-query-parser@0.2.3: {}
 
   postcss-resolve-nested-selector@0.1.1: {}
@@ -3431,9 +4233,9 @@ snapshots:
 
   punycode@2.1.1: {}
 
-  puppeteer-core@19.11.1(typescript@5.0.4):
+  puppeteer-core@19.11.1(typescript@5.4.5):
     dependencies:
-      '@puppeteer/browsers': 0.5.0(typescript@5.0.4)
+      '@puppeteer/browsers': 0.5.0(typescript@5.4.5)
       chromium-bidi: 0.4.7(devtools-protocol@0.0.1107588)
       cross-fetch: 3.1.5
       debug: 4.3.4
@@ -3442,9 +4244,10 @@ snapshots:
       https-proxy-agent: 5.0.1
       proxy-from-env: 1.1.0
       tar-fs: 2.1.1
-      typescript: 5.0.4
       unbzip2-stream: 1.4.3
       ws: 8.13.0
+    optionalDependencies:
+      typescript: 5.4.5
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -3486,6 +4289,13 @@ snapshots:
       extend-shallow: 3.0.2
       safe-regex: 1.1.0
 
+  regexp.prototype.flags@1.5.2:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-errors: 1.3.0
+      set-function-name: 2.0.2
+
   require-directory@2.1.1: {}
 
   require-from-string@2.0.2: {}
@@ -3502,6 +4312,12 @@ snapshots:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
+  resolve@1.22.8:
+    dependencies:
+      is-core-module: 2.13.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+
   ret@0.1.15: {}
 
   reusify@1.0.4: {}
@@ -3514,18 +4330,51 @@ snapshots:
     dependencies:
       queue-microtask: 1.2.3
 
+  safe-array-concat@1.1.2:
+    dependencies:
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
+      has-symbols: 1.0.3
+      isarray: 2.0.5
+
   safe-buffer@5.2.1: {}
 
+  safe-regex-test@1.0.3:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-regex: 1.1.4
+
   safe-regex@1.1.0:
     dependencies:
       ret: 0.1.15
 
   semver@5.7.1: {}
 
+  semver@6.3.1: {}
+
   semver@7.5.0:
     dependencies:
       lru-cache: 6.0.0
 
+  semver@7.6.2: {}
+
+  set-function-length@1.2.2:
+    dependencies:
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.4
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.2
+
+  set-function-name@2.0.2:
+    dependencies:
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      functions-have-names: 1.2.3
+      has-property-descriptors: 1.0.2
+
   set-value@2.0.1:
     dependencies:
       extend-shallow: 2.0.1
@@ -3539,6 +4388,13 @@ snapshots:
 
   shebang-regex@3.0.0: {}
 
+  side-channel@1.0.6:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.4
+      object-inspect: 1.13.1
+
   signal-exit@4.0.1: {}
 
   slash@3.0.0: {}
@@ -3616,6 +4472,25 @@ snapshots:
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
 
+  string.prototype.trim@1.2.9:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-object-atoms: 1.0.0
+
+  string.prototype.trimend@1.0.8:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+
+  string.prototype.trimstart@1.0.8:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+
   string_decoder@1.3.0:
     dependencies:
       safe-buffer: 5.2.1
@@ -3624,6 +4499,8 @@ snapshots:
     dependencies:
       ansi-regex: 5.0.1
 
+  strip-bom@3.0.0: {}
+
   strip-indent@3.0.0:
     dependencies:
       min-indent: 1.0.1
@@ -3645,7 +4522,7 @@ snapshots:
     dependencies:
       '@csstools/css-parser-algorithms': 2.1.1(@csstools/css-tokenizer@2.1.1)
       '@csstools/css-tokenizer': 2.1.1
-      '@csstools/media-query-list-parser': 2.0.4(@csstools/css-parser-algorithms@2.1.1)(@csstools/css-tokenizer@2.1.1)
+      '@csstools/media-query-list-parser': 2.0.4(@csstools/css-parser-algorithms@2.1.1(@csstools/css-tokenizer@2.1.1))(@csstools/css-tokenizer@2.1.1)
       '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.12)
       balanced-match: 2.0.0
       colord: 2.9.3
@@ -3751,12 +4628,28 @@ snapshots:
 
   trim-newlines@3.0.1: {}
 
+  ts-patch@3.1.2:
+    dependencies:
+      chalk: 4.1.2
+      global-prefix: 3.0.0
+      minimist: 1.2.8
+      resolve: 1.22.8
+      semver: 7.6.2
+      strip-ansi: 6.0.1
+
+  tsconfig-paths@3.15.0:
+    dependencies:
+      '@types/json5': 0.0.29
+      json5: 1.0.2
+      minimist: 1.2.8
+      strip-bom: 3.0.0
+
   tslib@1.14.1: {}
 
-  tsutils@3.21.0(typescript@5.0.4):
+  tsutils@3.21.0(typescript@5.4.5):
     dependencies:
       tslib: 1.14.1
-      typescript: 5.0.4
+      typescript: 5.4.5
 
   tsx@3.12.7:
     dependencies:
@@ -3780,7 +4673,51 @@ snapshots:
 
   type-fest@3.9.0: {}
 
-  typescript@5.0.4: {}
+  typed-array-buffer@1.0.2:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-typed-array: 1.1.13
+
+  typed-array-byte-length@1.0.1:
+    dependencies:
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
+
+  typed-array-byte-offset@1.0.2:
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
+
+  typed-array-length@1.0.6:
+    dependencies:
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
+      possible-typed-array-names: 1.0.0
+
+  typescript-transform-paths@3.4.7(typescript@5.4.5):
+    dependencies:
+      minimatch: 3.1.2
+      typescript: 5.4.5
+
+  typescript@5.4.5: {}
+
+  unbox-primitive@1.0.2:
+    dependencies:
+      call-bind: 1.0.7
+      has-bigints: 1.0.2
+      has-symbols: 1.0.3
+      which-boxed-primitive: 1.0.2
 
   unbzip2-stream@1.4.3:
     dependencies:
@@ -3794,6 +4731,8 @@ snapshots:
       is-extendable: 0.1.1
       set-value: 2.0.1
 
+  universalify@2.0.1: {}
+
   unset-value@1.0.0:
     dependencies:
       has-value: 0.3.1
@@ -3829,6 +4768,22 @@ snapshots:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
 
+  which-boxed-primitive@1.0.2:
+    dependencies:
+      is-bigint: 1.0.4
+      is-boolean-object: 1.1.2
+      is-number-object: 1.0.7
+      is-string: 1.0.7
+      is-symbol: 1.0.4
+
+  which-typed-array@1.1.15:
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.2
+
   which@1.3.1:
     dependencies:
       isexe: 2.0.0
@@ -3883,5 +4838,3 @@ snapshots:
       graceful-fs: 4.2.11
       jszip: 2.7.0
       q: 1.5.1
-
-  zustand@3.7.2: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
new file mode 100644
index 000000000..9bec5ba55
--- /dev/null
+++ b/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+packages:
+    - packages/*
diff --git a/src/Vencord.ts b/src/Vencord.ts
index 655e76c3d..72541148e 100644
--- a/src/Vencord.ts
+++ b/src/Vencord.ts
@@ -17,6 +17,7 @@
 */
 
 export * as Api from "./api";
+export * as Components from "./components";
 export * as Plugins from "./plugins";
 export * as Util from "./utils";
 export * as QuickCss from "./utils/quickCss";
diff --git a/src/api/Notifications/Notifications.tsx b/src/api/Notifications/Notifications.tsx
index 602564671..1350e5bdc 100644
--- a/src/api/Notifications/Notifications.tsx
+++ b/src/api/Notifications/Notifications.tsx
@@ -100,6 +100,7 @@ export async function showNotification(data: NotificationData) {
         const n = new Notification(title, {
             body,
             icon,
+            // @ts-expect-error ts is drunk
             image
         });
         n.onclick = onClick;
diff --git a/src/components/ExpandableHeader.tsx b/src/components/ExpandableHeader.tsx
index 1cbce4f2e..84b065862 100644
--- a/src/components/ExpandableHeader.tsx
+++ b/src/components/ExpandableHeader.tsx
@@ -16,10 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import "./ExpandableHeader.css";
+
 import { classNameFactory } from "@api/Styles";
 import { Text, Tooltip, useState } from "@webpack/common";
-export const cl = classNameFactory("vc-expandableheader-");
-import "./ExpandableHeader.css";
+
+const cl = classNameFactory("vc-expandableheader-");
 
 export interface ExpandableHeaderProps {
     onMoreClick?: () => void;
@@ -31,7 +33,7 @@ export interface ExpandableHeaderProps {
     buttons?: React.ReactNode[];
 }
 
-export default function ExpandableHeader({ children, onMoreClick, buttons, moreTooltipText, defaultState = false, onDropDownClick, headerText }: ExpandableHeaderProps) {
+export function ExpandableHeader({ children, onMoreClick, buttons, moreTooltipText, defaultState = false, onDropDownClick, headerText }: ExpandableHeaderProps) {
     const [showContent, setShowContent] = useState(defaultState);
 
     return (
diff --git a/src/components/index.ts b/src/components/index.ts
new file mode 100644
index 000000000..38e610fd8
--- /dev/null
+++ b/src/components/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+export * from "./Badge";
+export * from "./CheckedTextInput";
+export * from "./CodeBlock";
+export * from "./DonateButton";
+export { default as ErrorBoundary } from "./ErrorBoundary";
+export * from "./ErrorCard";
+export * from "./ExpandableHeader";
+export * from "./Flex";
+export * from "./Heart";
+export * from "./Icons";
+export * from "./Link";
+export * from "./Switch";
diff --git a/src/modules.d.ts b/src/modules.d.ts
index 24f34664d..489799256 100644
--- a/src/modules.d.ts
+++ b/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;
 }
 
diff --git a/src/plugins/decor/lib/stores/AuthorizationStore.tsx b/src/plugins/decor/lib/stores/AuthorizationStore.tsx
index e31b1f43c..ba71da99e 100644
--- a/src/plugins/decor/lib/stores/AuthorizationStore.tsx
+++ b/src/plugins/decor/lib/stores/AuthorizationStore.tsx
@@ -9,7 +9,6 @@ import { proxyLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
 import { openModal } from "@utils/modal";
 import { OAuth2AuthorizeModal, showToast, Toasts, UserStore, zustandCreate, zustandPersist } from "@webpack/common";
-import type { StateStorage } from "zustand/middleware";
 
 import { AUTHORIZE_URL, CLIENT_ID } from "../constants";
 
@@ -23,7 +22,7 @@ interface AuthorizationState {
     isAuthorized: () => boolean;
 }
 
-const indexedDBStorage: StateStorage = {
+const indexedDBStorage = {
     async getItem(name: string): Promise<string | null> {
         return DataStore.get(name).then(v => v ?? null);
     },
@@ -36,9 +35,9 @@ const indexedDBStorage: StateStorage = {
 };
 
 // TODO: Move switching accounts subscription inside the store?
-export const useAuthorizationStore = proxyLazy(() => zustandCreate<AuthorizationState>(
+export const useAuthorizationStore = proxyLazy(() => zustandCreate(
     zustandPersist(
-        (set, get) => ({
+        (set: any, get: any) => ({
             token: null,
             tokens: {},
             init: () => { set({ token: get().tokens[UserStore.getCurrentUser().id] ?? null }); },
@@ -91,7 +90,7 @@ export const useAuthorizationStore = proxyLazy(() => zustandCreate<Authorization
                 ));
             },
             isAuthorized: () => !!get().token,
-        }),
+        } as AuthorizationState),
         {
             name: "decor-auth",
             getStorage: () => indexedDBStorage,
diff --git a/src/plugins/decor/lib/stores/CurrentUserDecorationsStore.ts b/src/plugins/decor/lib/stores/CurrentUserDecorationsStore.ts
index 1485a7438..e2bba6c0a 100644
--- a/src/plugins/decor/lib/stores/CurrentUserDecorationsStore.ts
+++ b/src/plugins/decor/lib/stores/CurrentUserDecorationsStore.ts
@@ -21,7 +21,7 @@ interface UserDecorationsState {
     clear: () => void;
 }
 
-export const useCurrentUserDecorationsStore = proxyLazy(() => zustandCreate<UserDecorationsState>((set, get) => ({
+export const useCurrentUserDecorationsStore = proxyLazy(() => zustandCreate((set: any, get: any) => ({
     decorations: [],
     selectedDecoration: null,
     async fetch() {
@@ -53,4 +53,4 @@ export const useCurrentUserDecorationsStore = proxyLazy(() => zustandCreate<User
         useUsersDecorationsStore.getState().set(UserStore.getCurrentUser().id, decoration ? decorationToAsset(decoration) : null);
     },
     clear: () => set({ decorations: [], selectedDecoration: null })
-})));
+} as UserDecorationsState)));
diff --git a/src/plugins/decor/lib/stores/UsersDecorationsStore.ts b/src/plugins/decor/lib/stores/UsersDecorationsStore.ts
index b29945f82..53aa33e63 100644
--- a/src/plugins/decor/lib/stores/UsersDecorationsStore.ts
+++ b/src/plugins/decor/lib/stores/UsersDecorationsStore.ts
@@ -30,7 +30,7 @@ interface UsersDecorationsState {
     set: (userId: string, decoration: string | null) => void;
 }
 
-export const useUsersDecorationsStore = proxyLazy(() => zustandCreate<UsersDecorationsState>((set, get) => ({
+export const useUsersDecorationsStore = proxyLazy(() => zustandCreate((set: any, get: any) => ({
     usersDecorations: new Map<string, UserDecorationData>(),
     fetchQueue: new Set(),
     bulkFetch: debounce(async () => {
@@ -40,7 +40,7 @@ export const useUsersDecorationsStore = proxyLazy(() => zustandCreate<UsersDecor
 
         set({ fetchQueue: new Set() });
 
-        const fetchIds = Array.from(fetchQueue);
+        const fetchIds = [...fetchQueue];
         const fetchedUsersDecorations = await getUsersDecorations(fetchIds);
 
         const newUsersDecorations = new Map(usersDecorations);
@@ -92,7 +92,7 @@ export const useUsersDecorationsStore = proxyLazy(() => zustandCreate<UsersDecor
         newUsersDecorations.set(userId, { asset: decoration, fetchedAt: new Date() });
         set({ usersDecorations: newUsersDecorations });
     }
-})));
+} as UsersDecorationsState)));
 
 export function useUserDecorAvatarDecoration(user?: User): AvatarDecoration | null | undefined {
     const [decorAvatarDecoration, setDecorAvatarDecoration] = useState<string | null>(user ? useUsersDecorationsStore.getState().getAsset(user.id) ?? null : null);
diff --git a/src/plugins/decor/ui/components/DecorSection.tsx b/src/plugins/decor/ui/components/DecorSection.tsx
index f11a87a53..ff044f8c7 100644
--- a/src/plugins/decor/ui/components/DecorSection.tsx
+++ b/src/plugins/decor/ui/components/DecorSection.tsx
@@ -15,7 +15,7 @@ import { openChangeDecorationModal } from "../modals/ChangeDecorationModal";
 
 const CustomizationSection = findByCodeLazy(".customizationSectionBackground");
 
-interface DecorSectionProps {
+export interface DecorSectionProps {
     hideTitle?: boolean;
     hideDivider?: boolean;
     noMargin?: boolean;
diff --git a/src/plugins/permissionsViewer/components/UserPermissions.tsx b/src/plugins/permissionsViewer/components/UserPermissions.tsx
index bcd6bdf07..869a6a1ee 100644
--- a/src/plugins/permissionsViewer/components/UserPermissions.tsx
+++ b/src/plugins/permissionsViewer/components/UserPermissions.tsx
@@ -17,7 +17,7 @@
 */
 
 import ErrorBoundary from "@components/ErrorBoundary";
-import ExpandableHeader from "@components/ExpandableHeader";
+import { ExpandableHeader } from "@components/ExpandableHeader";
 import { classes } from "@utils/misc";
 import { filters, findBulk, proxyLazyWebpack } from "@webpack";
 import { i18n, PermissionsBits, Text, Tooltip, useMemo, UserStore } from "@webpack/common";
diff --git a/src/plugins/reviewDB/index.tsx b/src/plugins/reviewDB/index.tsx
index e73bce82c..2ae74c388 100644
--- a/src/plugins/reviewDB/index.tsx
+++ b/src/plugins/reviewDB/index.tsx
@@ -20,7 +20,7 @@ import "./style.css";
 
 import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import ErrorBoundary from "@components/ErrorBoundary";
-import ExpandableHeader from "@components/ExpandableHeader";
+import { ExpandableHeader } from "@components/ExpandableHeader";
 import { OpenExternalIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
diff --git a/src/utils/index.ts b/src/utils/index.ts
index ea4adce4a..62f3f6e96 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -23,9 +23,11 @@ export * from "./constants";
 export * from "./discord";
 export * from "./guards";
 export * from "./lazy";
+export * from "./lazyReact";
 export * from "./localStorage";
 export * from "./Logger";
 export * from "./margins";
+export * from "./mergeDefaults";
 export * from "./misc";
 export * from "./modal";
 export * from "./onlyOnce";
diff --git a/src/utils/types.ts b/src/utils/types.ts
index 8f2ee8632..6e1524196 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -244,7 +244,7 @@ export interface PluginSettingSliderDef {
     stickToMarkers?: boolean;
 }
 
-interface IPluginOptionComponentProps {
+export interface IPluginOptionComponentProps {
     /**
      * Run this when the value changes.
      *
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 2cd636d8e..72a71f31c 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -138,10 +138,10 @@ waitFor(["open", "saveAccountChanges"], m => SettingsRouter = m);
 
 export const { Permissions: PermissionsBits } = findLazy(m => typeof m.Permissions?.ADMINISTRATOR === "bigint") as { Permissions: t.PermissionsBits; };
 
-export const zustandCreate: typeof import("zustand").default = findByCodeLazy("will be removed in v4");
+export const zustandCreate = findByCodeLazy("will be removed in v4");
 
 const persistFilter = filters.byCode("[zustand persist middleware]");
-export const { persist: zustandPersist }: typeof import("zustand/middleware") = findLazy(m => m.persist && persistFilter(m.persist));
+export const { persist: zustandPersist } = findLazy(m => m.persist && persistFilter(m.persist));
 
 export const MessageActions = findByPropsLazy("editMessage", "sendMessage");
 export const UserProfileActions = findByPropsLazy("openUserProfileModal", "closeUserProfileModal");
diff --git a/tsconfig.json b/tsconfig.json
index 96c904766..8db0ab3c1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -29,7 +29,15 @@
             "@webpack/types": ["./webpack/common/types"],
             "@webpack/common": ["./webpack/common"],
             "@webpack": ["./webpack/webpack"]
-        }
+        },
+
+        "plugins": [
+            // Transform paths in output .d.ts files (Include this line if you output declarations files)
+            {
+                "transform": "typescript-transform-paths",
+                "afterDeclarations": true
+            }
+        ]
     },
     "include": ["src/**/*", "browser/**/*", "scripts/**/*"]
 }

From 8b0e7030adda2b554271ce19c2d6456640d450a1 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 17 May 2024 18:42:28 -0300
Subject: [PATCH 597/632] ViewIcons: Fix Group Icons being clickable in channel
 list

---
 src/plugins/viewIcons/index.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index 104252f6e..359365ee4 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -212,8 +212,7 @@ export default definePlugin({
         },
         // Group DMs top small & large icon
         {
-            find: ".recipients.length>=2",
-            all: true,
+            find: /\.recipients\.length>=2(?!<isMultiUserDM.{0,50})/,
             replacement: {
                 match: /null==\i\.icon\?.+?src:(\(0,\i\.getChannelIconURL\).+?\))(?=[,}])/,
                 replace: (m, iconUrl) => `${m},onClick:()=>$self.openImage(${iconUrl})`

From 4e92612aa8b0fb4d1bf19349b3e4d1c4237c43c4 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 17 May 2024 19:41:12 -0300
Subject: [PATCH 598/632] ResurrectHome: Likely fix breaking latest messages in
 chat

---
 src/plugins/resurrectHome/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/resurrectHome/index.tsx b/src/plugins/resurrectHome/index.tsx
index 2042ed9c7..70827e08f 100644
--- a/src/plugins/resurrectHome/index.tsx
+++ b/src/plugins/resurrectHome/index.tsx
@@ -135,7 +135,7 @@ export default definePlugin({
             find: '"MessageActionCreators"',
             replacement: {
                 match: /(?<=focusMessage\(\i\){.+?)(?=focus:{messageId:(\i)})/,
-                replace: "before:$1,"
+                replace: "after:$1,"
             }
         },
         // Force Server Home instead of Server Guide

From 04a86490a5e20419639e3222145711c271655f66 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 18 May 2024 00:36:50 -0300
Subject: [PATCH 599/632] FriendsSince: Show in user profile modal

---
 src/plugins/friendsSince/index.tsx | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/plugins/friendsSince/index.tsx b/src/plugins/friendsSince/index.tsx
index fb431b52b..8ad9dc7f4 100644
--- a/src/plugins/friendsSince/index.tsx
+++ b/src/plugins/friendsSince/index.tsx
@@ -7,6 +7,8 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { getCurrentChannel } from "@utils/discord";
+import { Logger } from "@utils/Logger";
+import { classes } from "@utils/misc";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { Heading, React, RelationshipStore, Text } from "@webpack/common";
@@ -22,6 +24,7 @@ export default definePlugin({
     description: "Shows when you became friends with someone in the user popout",
     authors: [Devs.Elvyra],
     patches: [
+        // User popup
         {
             find: ".AnalyticsSections.USER_PROFILE}",
             replacement: {
@@ -29,16 +32,34 @@ export default definePlugin({
                 replace: "$&,$self.friendsSince({ userId: $1 })"
             }
         },
+        // User DMs "User Profile" popup in the right
         {
             find: ".UserPopoutUpsellSource.PROFILE_PANEL,",
             replacement: {
                 match: /\i.default,\{userId:(\i)}\)/,
                 replace: "$&,$self.friendsSince({ userId: $1 })"
             }
+        },
+        // User Profile Modal
+        {
+            find: ".userInfoSectionHeader,",
+            replacement: {
+                match: /(\.Messages\.USER_PROFILE_MEMBER_SINCE.+?userId:(.+?),textClassName:)(\i\.userInfoText)}\)/,
+                replace: (_, rest, userId, textClassName) => `${rest}!$self.getFriendSince(${userId}) ? ${textClassName} : void 0 }), $self.friendsSince({ userId: ${userId}, textClassName: ${textClassName} })`
+            }
         }
     ],
 
-    friendsSince: ErrorBoundary.wrap(({ userId }: { userId: string; }) => {
+    getFriendSince(userId: string) {
+        try {
+            return RelationshipStore.getSince(userId);
+        } catch (err) {
+            new Logger("FriendsSince").error(err);
+            return null;
+        }
+    },
+
+    friendsSince: ErrorBoundary.wrap(({ userId, textClassName }: { userId: string; textClassName?: string; }) => {
         const friendsSince = RelationshipStore.getSince(userId);
         if (!friendsSince) return null;
 
@@ -61,7 +82,7 @@ export default definePlugin({
                             <path d="M3 5v-.75C3 3.56 3.56 3 4.25 3s1.24.56 1.33 1.25C6.12 8.65 9.46 12 13 12h1a8 8 0 0 1 8 8 2 2 0 0 1-2 2 .21.21 0 0 1-.2-.15 7.65 7.65 0 0 0-1.32-2.3c-.15-.2-.42-.06-.39.17l.25 2c.02.15-.1.28-.25.28H9a2 2 0 0 1-2-2v-2.22c0-1.57-.67-3.05-1.53-4.37A15.85 15.85 0 0 1 3 5Z" />
                         </svg>
                     )}
-                    <Text variant="text-sm/normal" className={clydeMoreInfo.body}>
+                    <Text variant="text-sm/normal" className={classes(clydeMoreInfo.body, textClassName)}>
                         {getCreatedAtDate(friendsSince, locale.getLocale())}
                     </Text>
                 </div>
@@ -69,4 +90,3 @@ export default definePlugin({
         );
     }, { noop: true })
 });
-

From 54e1bac6c6d095460a5d75cce233b993ff33eb1a Mon Sep 17 00:00:00 2001
From: Eric <45801973+waresnew@users.noreply.github.com>
Date: Sat, 18 May 2024 19:41:58 -0400
Subject: [PATCH 600/632] new plugin CustomIdle (#2342)

---
 src/plugins/customidle/README.md |  5 ++
 src/plugins/customidle/index.ts  | 94 ++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 src/plugins/customidle/README.md
 create mode 100644 src/plugins/customidle/index.ts

diff --git a/src/plugins/customidle/README.md b/src/plugins/customidle/README.md
new file mode 100644
index 000000000..63bf87d89
--- /dev/null
+++ b/src/plugins/customidle/README.md
@@ -0,0 +1,5 @@
+# CustomIdle
+
+Lets you change the time until your status gets automatically set to idle. You can also prevent idling altogether.
+
+![Plugin Configuration](https://github.com/Vendicated/Vencord/assets/45801973/4e5259b2-18e0-42e5-b69f-efc672ce1e0b)
diff --git a/src/plugins/customidle/index.ts b/src/plugins/customidle/index.ts
new file mode 100644
index 000000000..a59bbcb01
--- /dev/null
+++ b/src/plugins/customidle/index.ts
@@ -0,0 +1,94 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Notices } from "@api/index";
+import { definePluginSettings } from "@api/Settings";
+import { makeRange } from "@components/PluginSettings/components";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { FluxDispatcher } from "@webpack/common";
+
+const settings = definePluginSettings({
+    idleTimeout: {
+        description: "Minutes before Discord goes idle (0 to disable auto-idle)",
+        type: OptionType.SLIDER,
+        markers: makeRange(0, 60, 5),
+        default: 10,
+        stickToMarkers: false,
+        restartNeeded: true // Because of the setInterval patch
+    },
+    remainInIdle: {
+        description: "When you come back to Discord, remain idle until you confirm you want to go online",
+        type: OptionType.BOOLEAN,
+        default: true
+    }
+});
+
+export default definePlugin({
+    name: "CustomIdle",
+    description: "Allows you to set the time before Discord goes idle (or disable auto-idle)",
+    authors: [Devs.newwares],
+    settings,
+    patches: [
+        {
+            find: "IDLE_DURATION:function(){return",
+            replacement: {
+                match: /(IDLE_DURATION:function\(\){return )\i/,
+                replace: "$1$self.getIdleTimeout()"
+            }
+        },
+        {
+            find: 'type:"IDLE",idle:',
+            replacement: [
+                {
+                    match: /Math\.min\((\i\.AfkTimeout\.getSetting\(\)\*\i\.default\.Millis\.SECOND),\i\.IDLE_DURATION\)/,
+                    replace: "$1" // Decouple idle from afk (phone notifications will remain at user setting or 10 min maximum)
+                },
+                {
+                    match: /\i\.default\.dispatch\({type:"IDLE",idle:!1}\)/,
+                    replace: "$self.handleOnline()"
+                },
+                {
+                    match: /(setInterval\(\i,\.25\*)\i\.IDLE_DURATION/,
+                    replace: "$1$self.getIntervalDelay()" // For web installs
+                }
+            ]
+        }
+    ],
+
+    getIntervalDelay() {
+        return Math.min(6e5, this.getIdleTimeout());
+    },
+
+    handleOnline() {
+        if (!settings.store.remainInIdle) {
+            FluxDispatcher.dispatch({
+                type: "IDLE",
+                idle: false
+            });
+            return;
+        }
+
+        const backOnlineMessage = "Welcome back! Click the button to go online. Click the X to stay idle until reload.";
+        if (
+            Notices.currentNotice?.[1] === backOnlineMessage ||
+            Notices.noticesQueue.some(([, noticeMessage]) => noticeMessage === backOnlineMessage)
+        ) return;
+
+        Notices.showNotice(backOnlineMessage, "Exit idle", () => {
+            Notices.popNotice();
+            FluxDispatcher.dispatch({
+                type: "IDLE",
+                idle: false
+            });
+        });
+    },
+
+    getIdleTimeout() { // milliseconds, default is 6e5
+        const { idleTimeout } = settings.store;
+        return idleTimeout === 0 ? Infinity : idleTimeout * 60000;
+    }
+});

From caed7cd92c5d6dfa74d00fbc752116c015acf55d Mon Sep 17 00:00:00 2001
From: Noxillio <me@noxillio.dev>
Date: Sun, 19 May 2024 00:22:45 +0000
Subject: [PATCH 601/632] MoreUserTags: If server owner tag is disabled, do not
 give other tags (#2219)

---
 src/plugins/moreUserTags/index.tsx | 9 +++++++++
 src/utils/constants.ts             | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/src/plugins/moreUserTags/index.tsx b/src/plugins/moreUserTags/index.tsx
index 1257b4524..9c848df6d 100644
--- a/src/plugins/moreUserTags/index.tsx
+++ b/src/plugins/moreUserTags/index.tsx
@@ -354,6 +354,15 @@ export default definePlugin({
             if (location === "chat" && !settings.tagSettings[tag.name].showInChat) continue;
             if (location === "not-chat" && !settings.tagSettings[tag.name].showInNotChat) continue;
 
+            // If the owner tag is disabled, and the user is the owner of the guild,
+            // avoid adding other tags because the owner will always match the condition for them
+            if (
+                tag.name !== "OWNER" &&
+                GuildStore.getGuild(channel?.guild_id)?.ownerId === user.id &&
+                (location === "chat" && !settings.tagSettings.OWNER.showInChat) ||
+                (location === "not-chat" && !settings.tagSettings.OWNER.showInNotChat)
+            ) continue;
+
             if (
                 tag.permissions?.some(perm => perms.includes(perm)) ||
                 (tag.condition?.(message!, user, channel))
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 974758e3a..44d13b54c 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -422,6 +422,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Av32000",
         id: 593436735380127770n,
     },
+    Noxillio: {
+        name: "Noxillio",
+        id: 138616536502894592n,
+    },
     Kyuuhachi: {
         name: "Kyuuhachi",
         id: 236588665420251137n,

From d43731833aab46b8eb7876e8c42474f7a9164c9e Mon Sep 17 00:00:00 2001
From: Eric <45801973+waresnew@users.noreply.github.com>
Date: Sat, 18 May 2024 20:45:05 -0400
Subject: [PATCH 602/632] Fix: PatchHelper not auto filling match field (#2338)

---
 .../VencordSettings/PatchHelperTab.tsx        | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/components/VencordSettings/PatchHelperTab.tsx b/src/components/VencordSettings/PatchHelperTab.tsx
index 9e2980e7e..013e32d7d 100644
--- a/src/components/VencordSettings/PatchHelperTab.tsx
+++ b/src/components/VencordSettings/PatchHelperTab.tsx
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { CheckedTextInput } from "@components/CheckedTextInput";
 import { CodeBlock } from "@components/CodeBlock";
 import { debounce } from "@shared/debounce";
 import { Margins } from "@utils/margins";
@@ -47,7 +46,7 @@ const findCandidates = debounce(function ({ find, setModule, setError }) {
 
 interface ReplacementComponentProps {
     module: [id: number, factory: Function];
-    match: string | RegExp;
+    match: string;
     replacement: string | ReplaceFn;
     setReplacementError(error: any): void;
 }
@@ -58,7 +57,13 @@ function ReplacementComponent({ module, match, replacement, setReplacementError
 
     const [patchedCode, matchResult, diff] = React.useMemo(() => {
         const src: string = fact.toString().replaceAll("\n", "");
-        const canonicalMatch = canonicalizeMatch(match);
+
+        try {
+            new RegExp(match);
+        } catch (e) {
+            return ["", [], []];
+        }
+        const canonicalMatch = canonicalizeMatch(new RegExp(match));
         try {
             const canonicalReplace = canonicalizeReplace(replacement, "YourPlugin");
             var patched = src.replace(canonicalMatch, canonicalReplace as string);
@@ -286,6 +291,7 @@ function PatchHelper() {
 
     const [module, setModule] = React.useState<[number, Function]>();
     const [findError, setFindError] = React.useState<string>();
+    const [matchError, setMatchError] = React.useState<string>();
 
     const code = React.useMemo(() => {
         return `
@@ -322,12 +328,17 @@ function PatchHelper() {
     }
 
     function onMatchChange(v: string) {
+        setMatchError(void 0);
+        setMatch(v);
+    }
+
+    function onMatchBlur() {
         try {
-            new RegExp(v);
-            setFindError(void 0);
-            setMatch(v);
+            new RegExp(match);
+            setMatchError(void 0);
+            setMatch(match);
         } catch (e: any) {
-            setFindError((e as Error).message);
+            setMatchError((e as Error).message);
         }
     }
 
@@ -351,16 +362,12 @@ function PatchHelper() {
             />
 
             <Forms.FormTitle className={Margins.top8}>match</Forms.FormTitle>
-            <CheckedTextInput
+            <TextInput
+                type="text"
                 value={match}
                 onChange={onMatchChange}
-                validate={v => {
-                    try {
-                        return (new RegExp(v), true);
-                    } catch (e) {
-                        return (e as Error).message;
-                    }
-                }}
+                onBlur={onMatchBlur}
+                error={matchError}
             />
 
             <div className={Margins.top8} />
@@ -374,7 +381,7 @@ function PatchHelper() {
             {module && (
                 <ReplacementComponent
                     module={module}
-                    match={new RegExp(match)}
+                    match={match}
                     replacement={replacement}
                     setReplacementError={setReplacementError}
                 />

From eac8a026a61e7e147ad0bd7fddf9efc1af14a70b Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 18 May 2024 21:53:22 -0300
Subject: [PATCH 603/632] fix(PatchHelper): Make find and match more responsive

---
 .../VencordSettings/PatchHelperTab.tsx         | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/components/VencordSettings/PatchHelperTab.tsx b/src/components/VencordSettings/PatchHelperTab.tsx
index 013e32d7d..e09a1dbf3 100644
--- a/src/components/VencordSettings/PatchHelperTab.tsx
+++ b/src/components/VencordSettings/PatchHelperTab.tsx
@@ -306,20 +306,16 @@ function PatchHelper() {
     }, [parsedFind, match, replacement]);
 
     function onFindChange(v: string) {
-        setFindError(void 0);
         setFind(v);
-    }
 
-    function onFindBlur() {
         try {
-            let parsedFind = find as string | RegExp;
-            if (/^\/.+?\/$/.test(find)) parsedFind = new RegExp(find.slice(1, -1));
+            let parsedFind = v as string | RegExp;
+            if (/^\/.+?\/$/.test(v)) parsedFind = new RegExp(v.slice(1, -1));
 
             setFindError(void 0);
-            setFind(find);
             setParsedFind(parsedFind);
 
-            if (find.length) {
+            if (v.length) {
                 findCandidates({ find: parsedFind, setModule, setError: setFindError });
             }
         } catch (e: any) {
@@ -328,15 +324,11 @@ function PatchHelper() {
     }
 
     function onMatchChange(v: string) {
-        setMatchError(void 0);
         setMatch(v);
-    }
 
-    function onMatchBlur() {
         try {
-            new RegExp(match);
+            new RegExp(v);
             setMatchError(void 0);
-            setMatch(match);
         } catch (e: any) {
             setMatchError((e as Error).message);
         }
@@ -357,7 +349,6 @@ function PatchHelper() {
                 type="text"
                 value={find}
                 onChange={onFindChange}
-                onBlur={onFindBlur}
                 error={findError}
             />
 
@@ -366,7 +357,6 @@ function PatchHelper() {
                 type="text"
                 value={match}
                 onChange={onMatchChange}
-                onBlur={onMatchBlur}
                 error={matchError}
             />
 

From bc8b465753b5aa081024a5d1aca44260d8a32f86 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 19 May 2024 03:40:16 -0300
Subject: [PATCH 604/632] chore: Make package manager version not strict

---
 .npmrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.npmrc b/.npmrc
index 319e41e69..336b6ad13 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1,2 @@
 strict-peer-dependencies=false
+package-manager-strict=false

From b33b5bdc9f5b15f74e4a169d1072cb41d95819cc Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 19 May 2024 03:54:31 -0300
Subject: [PATCH 605/632] MessageLinkEmbeds: Add limit for nested links

---
 src/plugins/messageLinkEmbeds/index.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index 5c3063628..6c8fd83e9 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -227,10 +227,8 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
 
     const accessories = [] as (JSX.Element | null)[];
 
-    let match = null as RegExpMatchArray | null;
-    while ((match = messageLinkRegex.exec(message.content!)) !== null) {
-        const [_, channelID, messageID] = match;
-        if (embeddedBy.includes(messageID)) {
+    for (const [_, channelID, messageID] of message.content!.matchAll(messageLinkRegex)) {
+        if (embeddedBy.includes(messageID) || embeddedBy.length > 2) {
             continue;
         }
 

From a94b88cd5610de1f4dee27a01cf1005d856dc01b Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 19 May 2024 04:20:27 -0300
Subject: [PATCH 606/632] MessageLinkEmbeds: No longer need to reset global
 regex

---
 src/plugins/messageLinkEmbeds/index.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index 6c8fd83e9..dea586478 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -376,9 +376,6 @@ export default definePlugin({
             if (!messageLinkRegex.test(props.message.content))
                 return null;
 
-            // need to reset the regex because it's global
-            messageLinkRegex.lastIndex = 0;
-
             return (
                 <ErrorBoundary>
                     <MessageEmbedAccessory

From 5f8b96dced7e4ba8bc841d7de5482834fd0298e3 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 19 May 2024 22:11:42 -0300
Subject: [PATCH 607/632] Change duplicate find for SHC and VCDoubleClick

---
 src/plugins/showHiddenChannels/index.tsx | 2 +-
 src/plugins/vcDoubleClick/index.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 09aa2302a..f08bc2d1d 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -436,7 +436,7 @@ export default definePlugin({
             },
         },
         {
-            find: ".shouldCloseDefaultModals",
+            find: 'className:"channelMention",children',
             replacement: {
                 // Show inside voice channel instead of trying to join them when clicking on a channel mention
                 match: /(?<=getChannel\(\i\);if\(null!=(\i))(?=.{0,100}?selectVoiceChannel)/,
diff --git a/src/plugins/vcDoubleClick/index.ts b/src/plugins/vcDoubleClick/index.ts
index a55ac7b67..8d4cae6a9 100644
--- a/src/plugins/vcDoubleClick/index.ts
+++ b/src/plugins/vcDoubleClick/index.ts
@@ -48,7 +48,7 @@ export default definePlugin({
         })),
         {
             // channel mentions
-            find: ".shouldCloseDefaultModals",
+            find: 'className:"channelMention",children',
             replacement: {
                 match: /onClick:(\i)(?=,.{0,30}className:"channelMention".+?(\i)\.inContent)/,
                 replace: (_, onClick, props) => ""

From 0a595120b98ab382376f87bb8786d6f33aeba1a9 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 19 May 2024 23:08:33 -0300
Subject: [PATCH 608/632] Fix: Ignore bundled lib webpack on web

---
 src/webpack/patchWebpack.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index c7e424671..f891e38df 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -122,7 +122,7 @@ Object.defineProperty(Function.prototype, "m", {
         // When using react devtools or other extensions, we may also catch their webpack here.
         // This ensures we actually got the right one
         const { stack } = new Error();
-        if (stack?.includes("discord.com") || stack?.includes("discordapp.com")) {
+        if ((stack?.includes("discord.com") || stack?.includes("discordapp.com")) && !Array.isArray(v)) {
             logger.info("Found Webpack module factory", stack.match(/\/assets\/(.+?\.js)/)?.[1] ?? "");
             patchFactories(v);
         }

From 025508f18dbb75afdca57715b83a9dfb2ad95757 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 19 May 2024 23:32:15 -0300
Subject: [PATCH 609/632] StartupTimings: Fix patch

---
 src/plugins/_core/settings.tsx       | 1 -
 src/plugins/startupTimings/index.tsx | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index 81d1d1797..b743b0066 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -56,7 +56,6 @@ export default definePlugin({
                 }
             ]
         },
-        // Discord Canary
         {
             find: "Messages.ACTIVITY_SETTINGS",
             replacement: {
diff --git a/src/plugins/startupTimings/index.tsx b/src/plugins/startupTimings/index.tsx
index cf366df38..5051fdf4a 100644
--- a/src/plugins/startupTimings/index.tsx
+++ b/src/plugins/startupTimings/index.tsx
@@ -28,7 +28,7 @@ export default definePlugin({
     patches: [{
         find: "Messages.ACTIVITY_SETTINGS",
         replacement: {
-            match: /(?<=}\)([,;])(\i\.settings)\.forEach.+?(\i)\.push.+}\))/,
+            match: /(?<=}\)([,;])(\i\.settings)\.forEach.+?(\i)\.push.+}\)}\))/,
             replace: (_, commaOrSemi, settings, elements) => "" +
                 `${commaOrSemi}${settings}?.[0]==="CHANGELOG"` +
                 `&&${elements}.push({section:"StartupTimings",label:"Startup Timings",element:$self.StartupTimingPage})`

From dac2d7520d0b0f90c2ced2931eee67730b7159b9 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Mon, 20 May 2024 18:19:45 +0200
Subject: [PATCH 610/632] bump to v1.8.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0819f2aee..a99b0ad70 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.8.4",
+    "version": "1.8.5",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From f384fe6aa5a80a0406167b360ae96b350283cab7 Mon Sep 17 00:00:00 2001
From: Alyxia Sother <lexisoth2005@gmail.com>
Date: Tue, 21 May 2024 02:13:24 +0200
Subject: [PATCH 611/632] fakeProfileThemes: settings UI improvements (#966)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/fakeProfileThemes/index.css |   3 +
 src/plugins/fakeProfileThemes/index.tsx | 143 +++++++++++++++++++++---
 2 files changed, 129 insertions(+), 17 deletions(-)
 create mode 100644 src/plugins/fakeProfileThemes/index.css

diff --git a/src/plugins/fakeProfileThemes/index.css b/src/plugins/fakeProfileThemes/index.css
new file mode 100644
index 000000000..1c9bebf2d
--- /dev/null
+++ b/src/plugins/fakeProfileThemes/index.css
@@ -0,0 +1,3 @@
+.vc-fpt-preview * {
+    pointer-events: none;
+}
diff --git a/src/plugins/fakeProfileThemes/index.tsx b/src/plugins/fakeProfileThemes/index.tsx
index a1b629d10..7a6bda9a5 100644
--- a/src/plugins/fakeProfileThemes/index.tsx
+++ b/src/plugins/fakeProfileThemes/index.tsx
@@ -17,13 +17,17 @@
 */
 
 // This plugin is a port from Alyxia's Vendetta plugin
+import "./index.css";
+
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { Margins } from "@utils/margins";
-import { copyWithToast } from "@utils/misc";
+import { classes, copyWithToast } from "@utils/misc";
+import { useAwaiter } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { Button, Forms } from "@webpack/common";
+import { extractAndLoadChunksLazy, findComponentByCodeLazy } from "@webpack";
+import { Button, Flex, Forms, React, Text, UserProfileStore, UserStore, useState } from "@webpack/common";
 import { User } from "discord-types/general";
 import virtualMerge from "virtual-merge";
 
@@ -81,6 +85,34 @@ const settings = definePluginSettings({
     }
 });
 
+interface ColorPickerProps {
+    color: number | null;
+    label: React.ReactElement;
+    showEyeDropper?: boolean;
+    suggestedColors?: string[];
+    onChange(value: number | null): void;
+}
+
+// I can't be bothered to figure out the semantics of this component. The
+// functions surely get some event argument sent to them and they likely aren't
+// all required. If anyone who wants to use this component stumbles across this
+// code, you'll have to do the research yourself.
+interface ProfileModalProps {
+    user: User;
+    pendingThemeColors: [number, number];
+    onAvatarChange: () => void;
+    onBannerChange: () => void;
+    canUsePremiumCustomization: boolean;
+    hideExampleButton: boolean;
+    hideFakeActivity: boolean;
+    isTryItOutFlow: boolean;
+}
+
+const ColorPicker = findComponentByCodeLazy<ColorPickerProps>(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)");
+const ProfileModal = findComponentByCodeLazy<ProfileModalProps>('"ProfileCustomizationPreview"');
+
+const requireColorPicker = extractAndLoadChunksLazy(["USER_SETTINGS_PROFILE_COLOR_DEFAULT_BUTTON.format"], /createPromise:\(\)=>\i\.\i\("(.+?)"\).then\(\i\.bind\(\i,"(.+?)"\)\)/);
+
 export default definePlugin({
     name: "FakeProfileThemes",
     description: "Allows profile theming by hiding the colors in your bio thanks to invisible 3y3 encoding",
@@ -101,21 +133,98 @@ export default definePlugin({
             }
         }
     ],
-    settingsAboutComponent: () => (
-        <Forms.FormSection>
-            <Forms.FormTitle tag="h3">Usage</Forms.FormTitle>
-            <Forms.FormText>
-                After enabling this plugin, you will see custom colors in the profiles of other people using compatible plugins. <br />
-                To set your own colors:
-                <ul>
-                    <li>• go to your profile settings</li>
-                    <li>• choose your own colors in the Nitro preview</li>
-                    <li>• click the "Copy 3y3" button</li>
-                    <li>• paste the invisible text anywhere in your bio</li>
-                </ul><br />
-                <b>Please note:</b> if you are using a theme which hides nitro ads, you should disable it temporarily to set colors.
-            </Forms.FormText>
-        </Forms.FormSection>),
+    settingsAboutComponent: () => {
+        const existingColors = decode(
+            UserProfileStore.getUserProfile(UserStore.getCurrentUser().id).bio
+        ) ?? [0, 0];
+        const [color1, setColor1] = useState(existingColors[0]);
+        const [color2, setColor2] = useState(existingColors[1]);
+
+        const [, , loadingColorPickerChunk] = useAwaiter(requireColorPicker);
+
+        return (
+            <Forms.FormSection>
+                <Forms.FormTitle tag="h3">Usage</Forms.FormTitle>
+                <Forms.FormText>
+                    After enabling this plugin, you will see custom colors in
+                    the profiles of other people using compatible plugins.{" "}
+                    <br />
+                    To set your own colors:
+                    <ul>
+                        <li>
+                            • use the color pickers below to choose your colors
+                        </li>
+                        <li>• click the "Copy 3y3" button</li>
+                        <li>• paste the invisible text anywhere in your bio</li>
+                    </ul><br />
+                    <Forms.FormDivider
+                        className={classes(Margins.top8, Margins.bottom8)}
+                    />
+                    <Forms.FormTitle tag="h3">Color pickers</Forms.FormTitle>
+                    {!loadingColorPickerChunk && (
+                        <Flex
+                            direction={Flex.Direction.HORIZONTAL}
+                            style={{ gap: "1rem" }}
+                        >
+                            <ColorPicker
+                                color={color1}
+                                label={
+                                    <Text
+                                        variant={"text-xs/normal"}
+                                        style={{ marginTop: "4px" }}
+                                    >
+                                        Primary
+                                    </Text>
+                                }
+                                onChange={(color: number) => {
+                                    setColor1(color);
+                                }}
+                            />
+                            <ColorPicker
+                                color={color2}
+                                label={
+                                    <Text
+                                        variant={"text-xs/normal"}
+                                        style={{ marginTop: "4px" }}
+                                    >
+                                        Accent
+                                    </Text>
+                                }
+                                onChange={(color: number) => {
+                                    setColor2(color);
+                                }}
+                            />
+                            <Button
+                                onClick={() => {
+                                    const colorString = encode(color1, color2);
+                                    copyWithToast(colorString);
+                                }}
+                                color={Button.Colors.PRIMARY}
+                                size={Button.Sizes.XLARGE}
+                            >
+                                Copy 3y3
+                            </Button>
+                        </Flex>
+                    )}
+                    <Forms.FormDivider
+                        className={classes(Margins.top8, Margins.bottom8)}
+                    />
+                    <Forms.FormTitle tag="h3">Preview</Forms.FormTitle>
+                    <div className="vc-fpt-preview">
+                        <ProfileModal
+                            user={UserStore.getCurrentUser()}
+                            pendingThemeColors={[color1, color2]}
+                            onAvatarChange={() => { }}
+                            onBannerChange={() => { }}
+                            canUsePremiumCustomization={true}
+                            hideExampleButton={true}
+                            hideFakeActivity={true}
+                            isTryItOutFlow={true}
+                        />
+                    </div>
+                </Forms.FormText>
+            </Forms.FormSection>);
+    },
     settings,
     colorDecodeHook(user: UserProfile) {
         if (user) {

From 9c092b9c2996f029683e4fa3ea2c676c25a88c86 Mon Sep 17 00:00:00 2001
From: goodbee <100511746+schoeneBiene@users.noreply.github.com>
Date: Tue, 21 May 2024 02:24:00 +0200
Subject: [PATCH 612/632] feat(BetterRoleContext): Add option to view role
 icons (#2482)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/betterRoleContext/README.md |  4 +--
 src/plugins/betterRoleContext/index.tsx | 48 ++++++++++++++++++++++---
 src/utils/constants.ts                  |  4 +++
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/plugins/betterRoleContext/README.md b/src/plugins/betterRoleContext/README.md
index 3f3086bdb..e54e1e313 100644
--- a/src/plugins/betterRoleContext/README.md
+++ b/src/plugins/betterRoleContext/README.md
@@ -1,6 +1,6 @@
 # BetterRoleContext
 
-Adds options to copy role color  and edit role when right clicking roles in the user profile
+Adds options to copy role color, edit role and view role icon when right clicking roles in the user profile
 
-![](https://github.com/Vendicated/Vencord/assets/45497981/d1765e9e-7db2-4a3c-b110-139c59235326)
+![](https://github.com/Vendicated/Vencord/assets/45497981/354220a4-09f3-4c5f-a28e-4b19ca775190)
 
diff --git a/src/plugins/betterRoleContext/index.tsx b/src/plugins/betterRoleContext/index.tsx
index 3db3494f9..ecb1ed400 100644
--- a/src/plugins/betterRoleContext/index.tsx
+++ b/src/plugins/betterRoleContext/index.tsx
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { definePluginSettings } from "@api/Settings";
+import { ImageIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
-import { getCurrentGuild } from "@utils/discord";
-import definePlugin from "@utils/types";
+import { getCurrentGuild, openImageModal } from "@utils/discord";
+import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { Clipboard, GuildStore, Menu, PermissionStore, TextAndImagesSettingsStores } from "@webpack/common";
 
@@ -34,10 +36,34 @@ function AppearanceIcon() {
     );
 }
 
+const settings = definePluginSettings({
+    roleIconFileFormat: {
+        type: OptionType.SELECT,
+        description: "File format to use when viewing role icons",
+        options: [
+            {
+                label: "png",
+                value: "png",
+                default: true
+            },
+            {
+                label: "webp",
+                value: "webp",
+            },
+            {
+                label: "jpg",
+                value: "jpg"
+            }
+        ]
+    }
+});
+
 export default definePlugin({
     name: "BetterRoleContext",
-    description: "Adds options to copy role color / edit role when right clicking roles in the user profile",
-    authors: [Devs.Ven],
+    description: "Adds options to copy role color / edit role / view role icon when right clicking roles in the user profile",
+    authors: [Devs.Ven, Devs.goodbee],
+
+    settings,
 
     start() {
         // DeveloperMode needs to be enabled for the context menu to be shown
@@ -63,6 +89,20 @@ export default definePlugin({
                 );
             }
 
+            if (role.icon) {
+                children.push(
+                    <Menu.MenuItem
+                        id="vc-view-role-icon"
+                        label="View Role Icon"
+                        action={() => {
+                            openImageModal(`${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/role-icons/${role.id}/${role.icon}.${settings.store.roleIconFileFormat}`);
+                        }}
+                        icon={ImageIcon}
+                    />
+
+                );
+            }
+
             if (PermissionStore.getGuildPermissionProps(guild).canManageRoles) {
                 children.push(
                     <Menu.MenuItem
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 44d13b54c..2f686d69d 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -498,6 +498,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "ScattrdBlade",
         id: 678007540608532491n
     },
+    goodbee: {
+        name: "goodbee",
+        id: 658968552606400512n
+    },
     Moxxie: {
         name: "Moxxie",
         id: 712653921692155965n,

From 08d7de06b27243ec58a4ec6f0598f563461ae57a Mon Sep 17 00:00:00 2001
From: dolfies <jeyalfie47@gmail.com>
Date: Mon, 20 May 2024 20:28:06 -0400
Subject: [PATCH 613/632] ShowHiddenThings: more effectively explode Algolia
 filters (#2484)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/showHiddenThings/index.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/plugins/showHiddenThings/index.ts b/src/plugins/showHiddenThings/index.ts
index 8de70aca9..db4fe5aa6 100644
--- a/src/plugins/showHiddenThings/index.ts
+++ b/src/plugins/showHiddenThings/index.ts
@@ -80,11 +80,19 @@ export default definePlugin({
             }
         },
         {
-            find: "auto_removed:",
+            find: "prod_discoverable_guilds",
             predicate: () => settings.store.disableDiscoveryFilters,
             replacement: {
-                match: /filters:\i\.join\(" AND "\),facets:\[/,
-                replace: "facets:["
+                match: /\{"auto_removed:.*?\}/,
+                replace: "{}"
+            }
+        },
+        {
+            find: "MINIMUM_MEMBER_COUNT:",
+            predicate: () => settings.store.disableDiscoveryFilters,
+            replacement: {
+                match: /MINIMUM_MEMBER_COUNT:function\(\)\{return \i}/,
+                replace: "MINIMUM_MEMBER_COUNT:() => \">0\""
             }
         },
         {

From 44d708129bb12463128044fc8d490f3dfa9167f8 Mon Sep 17 00:00:00 2001
From: k26pl <admin@k26.pl>
Date: Tue, 21 May 2024 02:44:29 +0200
Subject: [PATCH 614/632] fix(MessageLogger): correctly blur spoilered images
 (#2433)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/messageLogger/messageLogger.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/messageLogger/messageLogger.css b/src/plugins/messageLogger/messageLogger.css
index b5f58a55b..d5a9c5f17 100644
--- a/src/plugins/messageLogger/messageLogger.css
+++ b/src/plugins/messageLogger/messageLogger.css
@@ -8,7 +8,7 @@
     .emoji,
     [data-type="sticker"],
     iframe,
-    .messagelogger-deleted-attachment,
+    .messagelogger-deleted-attachment:not([class*="hiddenAttachment_"]),
     [class|="inlineMediaEmbed"]
 ) {
     filter: grayscale(1) !important;

From 0751722add7b99369b2a5848d98838813bac089a Mon Sep 17 00:00:00 2001
From: PWall <git@pwall.me>
Date: Tue, 21 May 2024 02:52:43 +0200
Subject: [PATCH 615/632] QuickReply: skip blocked messages if
 NoBlockedMessages enabled (#2476)

---
 src/plugins/quickReply/index.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/plugins/quickReply/index.ts b/src/plugins/quickReply/index.ts
index 620e1a33f..ac2a38705 100644
--- a/src/plugins/quickReply/index.ts
+++ b/src/plugins/quickReply/index.ts
@@ -24,6 +24,7 @@ import { ChannelStore, FluxDispatcher as Dispatcher, MessageStore, PermissionsBi
 import { Message } from "discord-types/general";
 
 const Kangaroo = findByPropsLazy("jumpToMessage");
+const RelationshipStore = findByPropsLazy("getRelationships", "isBlocked");
 
 const isMac = navigator.platform.includes("Mac"); // bruh
 let replyIdx = -1;
@@ -139,6 +140,10 @@ function getNextMessage(isUp: boolean, isReply: boolean) {
         messages = messages.filter(m => m.author.id === meId);
     }
 
+    if (Vencord.Plugins.isPluginEnabled("NoBlockedMessages")) {
+        messages = messages.filter(m => !RelationshipStore.isBlocked(m.author.id));
+    }
+
     const mutate = (i: number) => isUp
         ? Math.min(messages.length - 1, i + 1)
         : Math.max(-1, i - 1);

From afd56820db2b887177f296a9b7003daedcdb96b0 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 21 May 2024 23:58:37 -0300
Subject: [PATCH 616/632] Revert "MessageLinkEmbeds: No longer need to reset
 global regex"

It is still needed for messageLinkRegex.test
---
 src/plugins/messageLinkEmbeds/index.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index dea586478..6c8fd83e9 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -376,6 +376,9 @@ export default definePlugin({
             if (!messageLinkRegex.test(props.message.content))
                 return null;
 
+            // need to reset the regex because it's global
+            messageLinkRegex.lastIndex = 0;
+
             return (
                 <ErrorBoundary>
                     <MessageEmbedAccessory

From f469060ccfbf4c585802d7ebf20e0edcc7cea963 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 22 May 2024 00:47:12 -0300
Subject: [PATCH 617/632] Fix reporter false positive and
 DefaultExtractAndLoadChunksRegex not catching all cases

---
 scripts/generateReport.ts | 62 +++++++++++++++++++++++++++------------
 src/webpack/webpack.ts    |  8 +++--
 2 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 164e409df..8bb87d812 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -243,19 +243,27 @@ page.on("console", async e => {
         }
     }
 
-    if (isDebug) {
-        console.error(e.text());
-    } else if (level === "error") {
-        const text = await Promise.all(
-            e.args().map(async a => {
-                try {
+    async function getText() {
+        try {
+            return await Promise.all(
+                e.args().map(async a => {
                     return await maybeGetError(a) || await a.jsonValue();
-                } catch (e) {
-                    return a.toString();
-                }
-            })
-        ).then(a => a.join(" ").trim());
+                })
+            ).then(a => a.join(" ").trim());
+        } catch {
+            return e.text();
+        }
+    }
 
+    if (isDebug) {
+        const text = await getText();
+
+        console.error(text);
+        if (text.includes("A fatal error occurred:")) {
+            process.exit(1);
+        }
+    } else if (level === "error") {
+        const text = await getText();
 
         if (text.length && !text.startsWith("Failed to load resource: the server responded with a status of") && !text.includes("Webpack")) {
             console.error("[Unexpected Error]", text);
@@ -322,22 +330,31 @@ async function runtime(token: string) {
 
         const validChunks = new Set<string>();
         const invalidChunks = new Set<string>();
+        const deferredRequires = new Set<string>();
 
         let chunksSearchingResolve: (value: void | PromiseLike<void>) => void;
         const chunksSearchingDone = new Promise<void>(r => chunksSearchingResolve = r);
 
         // True if resolved, false otherwise
         const chunksSearchPromises = [] as Array<() => boolean>;
-        const lazyChunkRegex = canonicalizeMatch(/Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\)/g);
-        const chunkIdsRegex = canonicalizeMatch(/\("(.+?)"\)/g);
+
+        const LazyChunkRegex = canonicalizeMatch(/(?:Promise\.all\(\[(\i\.\i\("[^)]+?"\)[^\]]+?)\]\)|(\i\.\i\("[^)]+?"\)))\.then\(\i\.bind\(\i,"([^)]+?)"\)\)/g);
 
         async function searchAndLoadLazyChunks(factoryCode: string) {
-            const lazyChunks = factoryCode.matchAll(lazyChunkRegex);
+            const lazyChunks = factoryCode.matchAll(LazyChunkRegex);
             const validChunkGroups = new Set<[chunkIds: string[], entryPoint: string]>();
 
-            await Promise.all(Array.from(lazyChunks).map(async ([, rawChunkIds, entryPoint]) => {
-                const chunkIds = Array.from(rawChunkIds.matchAll(chunkIdsRegex)).map(m => m[1]);
-                if (chunkIds.length === 0) return;
+            // Workaround for a chunk that depends on the ChannelMessage component but may be be force loaded before
+            // the chunk containing the component
+            const shouldForceDefer = factoryCode.includes(".Messages.GUILD_FEED_UNFEATURE_BUTTON_TEXT");
+
+            await Promise.all(Array.from(lazyChunks).map(async ([, rawChunkIdsArray, rawChunkIdsSingle, entryPoint]) => {
+                const rawChunkIds = rawChunkIdsArray ?? rawChunkIdsSingle;
+                const chunkIds = rawChunkIds ? Array.from(rawChunkIds.matchAll(Vencord.Webpack.ChunkIdsRegex)).map(m => m[1]) : [];
+
+                if (chunkIds.length === 0) {
+                    return;
+                }
 
                 let invalidChunkGroup = false;
 
@@ -373,6 +390,11 @@ async function runtime(token: string) {
             // Requires the entry points for all valid chunk groups
             for (const [, entryPoint] of validChunkGroups) {
                 try {
+                    if (shouldForceDefer) {
+                        deferredRequires.add(entryPoint);
+                        continue;
+                    }
+
                     if (wreq.m[entryPoint]) wreq(entryPoint as any);
                 } catch (err) {
                     console.error(err);
@@ -435,6 +457,11 @@ async function runtime(token: string) {
 
         await chunksSearchingDone;
 
+        // Require deferred entry points
+        for (const deferredRequire of deferredRequires) {
+            wreq!(deferredRequire as any);
+        }
+
         // All chunks Discord has mapped to asset files, even if they are not used anymore
         const allChunks = [] as string[];
 
@@ -514,7 +541,6 @@ async function runtime(token: string) {
         setTimeout(() => console.log("[PUPPETEER_TEST_DONE_SIGNAL]"), 1000);
     } catch (e) {
         console.log("[PUP_DEBUG]", "A fatal error occurred:", e);
-        process.exit(1);
     }
 }
 
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 0bee08f32..854820851 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -402,7 +402,8 @@ export function findExportedComponentLazy<T extends object = any>(...props: stri
     });
 }
 
-const DefaultExtractAndLoadChunksRegex = /(?:Promise\.all\((\[\i\.\i\(".+?"\).+?\])\)|Promise\.resolve\(\)).then\(\i\.bind\(\i,"(.+?)"\)\)/;
+export const DefaultExtractAndLoadChunksRegex = /(?:Promise\.all\(\[(\i\.\i\("[^)]+?"\)[^\]]+?)\]\)|(\i\.\i\("[^)]+?"\))|Promise\.resolve\(\))\.then\(\i\.bind\(\i,"([^)]+?)"\)\)/;
+export const ChunkIdsRegex = /\("(.+?)"\)/g;
 
 /**
  * Extract and load chunks using their entry point
@@ -431,7 +432,7 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = Def
         return;
     }
 
-    const [, rawChunkIds, entryPointId] = match;
+    const [, rawChunkIdsArray, rawChunkIdsSingle, entryPointId] = match;
     if (Number.isNaN(Number(entryPointId))) {
         const err = new Error("extractAndLoadChunks: Matcher didn't return a capturing group with the chunk ids array, or the entry point id returned as the second group wasn't a number");
         logger.warn(err, "Code:", code, "Matcher:", matcher);
@@ -443,8 +444,9 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = Def
         return;
     }
 
+    const rawChunkIds = rawChunkIdsArray ?? rawChunkIdsSingle;
     if (rawChunkIds) {
-        const chunkIds = Array.from(rawChunkIds.matchAll(/\("(.+?)"\)/g)).map((m: any) => m[1]);
+        const chunkIds = Array.from(rawChunkIds.matchAll(ChunkIdsRegex)).map((m: any) => m[1]);
         await Promise.all(chunkIds.map(id => wreq.e(id)));
     }
 

From f686cba3988dcbefbc5d9d524bea832dfd46c7bf Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 22 May 2024 05:11:09 -0300
Subject: [PATCH 618/632] Fix not setting property on originalOnChunksLoaded

---
 src/webpack/patchWebpack.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index f891e38df..311e6f2bc 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -99,6 +99,16 @@ Object.defineProperty(Function.prototype, "O", {
             };
 
             onChunksLoaded.toString = originalOnChunksLoaded.toString.bind(originalOnChunksLoaded);
+
+            // Returns whether a chunk has been loaded
+            Object.defineProperty(onChunksLoaded, "j", {
+                set(v) {
+                    delete onChunksLoaded.j;
+                    onChunksLoaded.j = v;
+                    originalOnChunksLoaded.j = v;
+                },
+                configurable: true
+            });
         }
 
         Object.defineProperty(this, "O", {

From b335df7fe2d20f24e8d463b10b8ec64f51793a51 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 23 May 2024 03:25:02 +0200
Subject: [PATCH 619/632] MessageLogger: fix edit logging

---
 src/plugins/messageLogger/index.tsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index c3a25e1b6..892c819b7 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -295,12 +295,9 @@ export default definePlugin({
                 // },
                 {
                     // Pass through editHistory & deleted & original attachments to the "edited message" transformer
-                    match: /interactionData:(\i)\.interactionData/,
+                    match: /(?<=null!=\i\.edited_timestamp\)return )\i\(\i,\{reactions:(\i)\.reactions.{0,50}\}\)/,
                     replace:
-                        "interactionData:$1.interactionData," +
-                        "deleted:$1.deleted," +
-                        "editHistory:$1.editHistory," +
-                        "attachments:$1.attachments"
+                        "Object.assign($&,{ deleted:$1.deleted, editHistory:$1.editHistory, attachments:$1.attachments })"
                 },
 
                 // {

From 869e71112e1555097ba453e227f8404d7c18ad12 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 23 May 2024 03:26:23 +0200
Subject: [PATCH 620/632] fix AnonymiseFilenames

---
 src/plugins/anonymiseFileNames/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/anonymiseFileNames/index.tsx b/src/plugins/anonymiseFileNames/index.tsx
index b424b7a59..526ccd12e 100644
--- a/src/plugins/anonymiseFileNames/index.tsx
+++ b/src/plugins/anonymiseFileNames/index.tsx
@@ -73,13 +73,13 @@ export default definePlugin({
         {
             find: "instantBatchUpload:function",
             replacement: {
-                match: /uploadFiles:(.{1,2}),/,
+                match: /uploadFiles:(\i),/,
                 replace:
                     "uploadFiles:(...args)=>(args[0].uploads.forEach(f=>f.filename=$self.anonymise(f)),$1(...args)),",
             },
         },
         {
-            find: "message.attachments",
+            find: 'addFilesTo:"message.attachments"',
             replacement: {
                 match: /(\i.uploadFiles\((\i),)/,
                 replace: "$2.forEach(f=>f.filename=$self.anonymise(f)),$1"

From a0778f6a2e786889d11f2b627f2ac03f7696c2e5 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 23 May 2024 03:35:02 +0200
Subject: [PATCH 621/632] work around discord unloading in background

---
 src/main/patcher.ts | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/patcher.ts b/src/main/patcher.ts
index 0d79a96f6..a85702a27 100644
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@@ -73,6 +73,9 @@ if (!IS_VANILLA) {
                 const original = options.webPreferences.preload;
                 options.webPreferences.preload = join(__dirname, IS_DISCORD_DESKTOP ? "preload.js" : "vencordDesktopPreload.js");
                 options.webPreferences.sandbox = false;
+                // work around discord unloading when in background
+                options.webPreferences.backgroundThrottling = false;
+
                 if (settings.frameless) {
                     options.frame = false;
                 } else if (process.platform === "win32" && settings.winNativeTitleBar) {
@@ -128,14 +131,8 @@ if (!IS_VANILLA) {
 
     process.env.DATA_DIR = join(app.getPath("userData"), "..", "Vencord");
 
-    // Monkey patch commandLine to disable WidgetLayering: Fix DevTools context menus https://github.com/electron/electron/issues/38790
-    const originalAppend = app.commandLine.appendSwitch;
-    app.commandLine.appendSwitch = function (...args) {
-        if (args[0] === "disable-features" && !args[1]?.includes("WidgetLayering")) {
-            args[1] += ",WidgetLayering";
-        }
-        return originalAppend.apply(this, args);
-    };
+    // work around discord unloading when in background
+    app.commandLine.appendSwitch("disable-renderer-backgrounding");
 } else {
     console.log("[Vencord] Running in vanilla mode. Not loading Vencord");
 }

From 775877281ee2f0f439c45a6c0996f52327818754 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 23 May 2024 06:02:57 -0300
Subject: [PATCH 622/632] Revert removal of DevTools context menu fix

---
 src/main/patcher.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/patcher.ts b/src/main/patcher.ts
index a85702a27..f0e3c3ab4 100644
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@@ -131,7 +131,16 @@ if (!IS_VANILLA) {
 
     process.env.DATA_DIR = join(app.getPath("userData"), "..", "Vencord");
 
-    // work around discord unloading when in background
+    // Monkey patch commandLine to disable WidgetLayering: Fix DevTools context menus https://github.com/electron/electron/issues/38790
+    const originalAppend = app.commandLine.appendSwitch;
+    app.commandLine.appendSwitch = function (...args) {
+        if (args[0] === "disable-features" && !args[1]?.includes("WidgetLayering")) {
+            args[1] += ",WidgetLayering";
+        }
+        return originalAppend.apply(this, args);
+    };
+
+    // Work around discord unloading when in background
     app.commandLine.appendSwitch("disable-renderer-backgrounding");
 } else {
     console.log("[Vencord] Running in vanilla mode. Not loading Vencord");

From 349169e67a82fad9ebbaf0d42cc313f653ac0f4d Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 24 May 2024 01:05:17 +0200
Subject: [PATCH 623/632] discord why tf would u roll back to 10 days old
 build???

---
 src/plugins/_core/settings.tsx | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index b743b0066..fd221d27e 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -56,6 +56,26 @@ export default definePlugin({
                 }
             ]
         },
+        // Discord Stable
+        // FIXME: remove once change merged to stable
+        {
+            find: "Messages.ACTIVITY_SETTINGS",
+            replacement: {
+                get match() {
+                    switch (Settings.plugins.Settings.settingsLocation) {
+                        case "top": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.USER_SETTINGS/;
+                        case "aboveNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.BILLING_SETTINGS/;
+                        case "belowNitro": return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.APP_SETTINGS/;
+                        case "belowActivity": return /(?<=\{section:(\i\.\i)\.DIVIDER},)\{section:"changelog"/;
+                        case "bottom": return /\{section:(\i\.\i)\.CUSTOM,\s*element:.+?}/;
+                        case "aboveActivity":
+                        default:
+                            return /\{section:(\i\.\i)\.HEADER,\s*label:(\i)\.\i\.Messages\.ACTIVITY_SETTINGS/;
+                    }
+                },
+                replace: "...$self.makeSettingsCategories($1),$&"
+            }
+        },
         {
             find: "Messages.ACTIVITY_SETTINGS",
             replacement: {

From 1866e4d379831aef135cf152b805f7fe2c9a96ab Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 24 May 2024 01:07:07 +0200
Subject: [PATCH 624/632] Bump to v1.8.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a99b0ad70..04b811e9c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.8.5",
+    "version": "1.8.6",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 8f59cd8a1a0069a7579c22e424e4a3e983943313 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 23 May 2024 21:48:12 -0300
Subject: [PATCH 625/632] Optimize slowest patches

---
 src/plugins/_api/notices.ts              |  2 +-
 src/plugins/alwaysAnimate/index.ts       |  4 ++--
 src/plugins/betterFolders/index.tsx      |  4 ++--
 src/plugins/betterSettings/index.tsx     |  4 ++--
 src/plugins/colorSighted/index.ts        |  4 ++--
 src/plugins/fakeNitro/index.tsx          |  4 ++--
 src/plugins/ignoreActivities/index.tsx   |  8 ++++----
 src/plugins/memberCount/index.tsx        |  4 ++--
 src/plugins/pinDms/index.tsx             |  4 ++--
 src/plugins/resurrectHome/index.tsx      |  4 ++--
 src/plugins/showHiddenChannels/index.tsx | 12 ++++++------
 src/plugins/spotifyCrack/index.ts        |  4 ++--
 src/plugins/superReactionTweaks/index.ts |  4 ++--
 src/plugins/viewIcons/index.tsx          |  4 ++--
 14 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/plugins/_api/notices.ts b/src/plugins/_api/notices.ts
index 90ae6ded9..0c6f6e1db 100644
--- a/src/plugins/_api/notices.ts
+++ b/src/plugins/_api/notices.ts
@@ -29,7 +29,7 @@ export default definePlugin({
             find: '"NoticeStore"',
             replacement: [
                 {
-                    match: /\i=null;(?=.{0,80}getPremiumSubscription\(\))/g,
+                    match: /(?<=!1;)\i=null;(?=.{0,80}getPremiumSubscription\(\))/g,
                     replace: "if(Vencord.Api.Notices.currentNotice)return false;$&"
                 },
                 {
diff --git a/src/plugins/alwaysAnimate/index.ts b/src/plugins/alwaysAnimate/index.ts
index dbec3b4e3..20cb4f974 100644
--- a/src/plugins/alwaysAnimate/index.ts
+++ b/src/plugins/alwaysAnimate/index.ts
@@ -31,10 +31,10 @@ export default definePlugin({
             // Some modules match the find but the replacement is returned untouched
             noWarn: true,
             replacement: {
-                match: /canAnimate:.+?(?=([,}].*?\)))/g,
+                match: /canAnimate:.+?([,}].*?\))/g,
                 replace: (m, rest) => {
                     const destructuringMatch = rest.match(/}=.+/);
-                    if (destructuringMatch == null) return "canAnimate:!0";
+                    if (destructuringMatch == null) return `canAnimate:!0${rest}`;
                     return m;
                 }
             }
diff --git a/src/plugins/betterFolders/index.tsx b/src/plugins/betterFolders/index.tsx
index 795f19901..38e1b8412 100644
--- a/src/plugins/betterFolders/index.tsx
+++ b/src/plugins/betterFolders/index.tsx
@@ -112,8 +112,8 @@ export default definePlugin({
             replacement: [
                 // Create the isBetterFolders variable in the GuildsBar component
                 {
-                    match: /(?<=let{disableAppDownload:\i=\i\.isPlatformEmbedded,isOverlay:.+?)(?=}=\i,)/,
-                    replace: ",isBetterFolders"
+                    match: /let{disableAppDownload:\i=\i\.isPlatformEmbedded,isOverlay:.+?(?=}=\i,)/,
+                    replace: "$&,isBetterFolders"
                 },
                 // If we are rendering the Better Folders sidebar, we filter out guilds that are not in folders and unexpanded folders
                 {
diff --git a/src/plugins/betterSettings/index.tsx b/src/plugins/betterSettings/index.tsx
index e90e5c82a..e0267e4b0 100644
--- a/src/plugins/betterSettings/index.tsx
+++ b/src/plugins/betterSettings/index.tsx
@@ -111,8 +111,8 @@ export default definePlugin({
         { // Load menu TOC eagerly
             find: "Messages.USER_SETTINGS_WITH_BUILD_OVERRIDE.format",
             replacement: {
-                match: /(?<=(\i)\(this,"handleOpenSettingsContextMenu",.{0,100}?openContextMenuLazy.{0,100}?(await Promise\.all[^};]*?\)\)).*?,)(?=\1\(this)/,
-                replace: "(async ()=>$2)(),"
+                match: /(\i)\(this,"handleOpenSettingsContextMenu",.{0,100}?openContextMenuLazy.{0,100}?(await Promise\.all[^};]*?\)\)).*?,(?=\1\(this)/,
+                replace: "$&(async ()=>$2)(),"
             },
             predicate: () => settings.store.eagerLoad
         },
diff --git a/src/plugins/colorSighted/index.ts b/src/plugins/colorSighted/index.ts
index d741aaae6..025cfb94e 100644
--- a/src/plugins/colorSighted/index.ts
+++ b/src/plugins/colorSighted/index.ts
@@ -34,9 +34,9 @@ export default definePlugin({
         {
             find: ".AVATAR_STATUS_MOBILE_16;",
             replacement: {
-                match: /(?<=fromIsMobile:\i=!0,.+?)status:(\i)/,
+                match: /(fromIsMobile:\i=!0,.+?)status:(\i)/,
                 // Rename field to force it to always use "online"
-                replace: 'status_$:$1="online"'
+                replace: '$1status_$:$2="online"'
             }
         }
     ]
diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 9c8af1e7c..4ab0e18ee 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -344,8 +344,8 @@ export default definePlugin({
                 {
                     // Patch the stickers array to add fake nitro stickers
                     predicate: () => settings.store.transformStickers,
-                    match: /(?<=renderStickersAccessories\((\i)\){let (\i)=\(0,\i\.\i\)\(\i\).+?;)/,
-                    replace: (_, message, stickers) => `${stickers}=$self.patchFakeNitroStickers(${stickers},${message});`
+                    match: /renderStickersAccessories\((\i)\){let (\i)=\(0,\i\.\i\)\(\i\).+?;/,
+                    replace: (m, message, stickers) => `${m}${stickers}=$self.patchFakeNitroStickers(${stickers},${message});`
                 },
                 {
                     // Filter attachments to remove fake nitro stickers or emojis
diff --git a/src/plugins/ignoreActivities/index.tsx b/src/plugins/ignoreActivities/index.tsx
index e2262129d..f687a0caf 100644
--- a/src/plugins/ignoreActivities/index.tsx
+++ b/src/plugins/ignoreActivities/index.tsx
@@ -228,15 +228,15 @@ export default definePlugin({
         {
             find: ".activityTitleText,variant",
             replacement: {
-                match: /(?<=\i\.activityTitleText.+?children:(\i)\.name.*?}\),)/,
-                replace: (_, props) => `$self.renderToggleActivityButton(${props}),`
+                match: /\.activityTitleText.+?children:(\i)\.name.*?}\),/,
+                replace: (m, props) => `${m}$self.renderToggleActivityButton(${props}),`
             },
         },
         {
             find: ".activityCardDetails,children",
             replacement: {
-                match: /(?<=\i\.activityCardDetails.+?children:(\i\.application)\.name.*?}\),)/,
-                replace: (_, props) => `$self.renderToggleActivityButton(${props}),`
+                match: /\.activityCardDetails.+?children:(\i\.application)\.name.*?}\),/,
+                replace: (m, props) => `${m}$self.renderToggleActivityButton(${props}),`
             }
         }
     ],
diff --git a/src/plugins/memberCount/index.tsx b/src/plugins/memberCount/index.tsx
index 92e9a2057..28ecb9db7 100644
--- a/src/plugins/memberCount/index.tsx
+++ b/src/plugins/memberCount/index.tsx
@@ -70,8 +70,8 @@ export default definePlugin({
         {
             find: ".invitesDisabledTooltip",
             replacement: {
-                match: /(?<=\.VIEW_AS_ROLES_MENTIONS_WARNING.{0,100})]/,
-                replace: ",$self.renderTooltip(arguments[0].guild)]"
+                match: /\.VIEW_AS_ROLES_MENTIONS_WARNING.{0,100}(?=])/,
+                replace: "$&,$self.renderTooltip(arguments[0].guild)"
             },
             predicate: () => settings.store.toolTip
         }
diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index 60484561a..033552593 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -111,8 +111,8 @@ export default definePlugin({
                     replace: "$self.getScrollOffset(arguments[0],$1,this.props.padding,this.state.preRenderedChildren,$&)"
                 },
                 {
-                    match: /(?<=scrollToChannel\(\i\){.{1,300})this\.props\.privateChannelIds/,
-                    replace: "[...$&,...$self.getAllUncollapsedChannels()]"
+                    match: /(scrollToChannel\(\i\){.{1,300})(this\.props\.privateChannelIds)/,
+                    replace: "$1[...$2,...$self.getAllUncollapsedChannels()]"
                 },
 
             ]
diff --git a/src/plugins/resurrectHome/index.tsx b/src/plugins/resurrectHome/index.tsx
index 70827e08f..5193090ea 100644
--- a/src/plugins/resurrectHome/index.tsx
+++ b/src/plugins/resurrectHome/index.tsx
@@ -134,8 +134,8 @@ export default definePlugin({
         {
             find: '"MessageActionCreators"',
             replacement: {
-                match: /(?<=focusMessage\(\i\){.+?)(?=focus:{messageId:(\i)})/,
-                replace: "after:$1,"
+                match: /focusMessage\(\i\){.+?(?=focus:{messageId:(\i)})/,
+                replace: "$&after:$1,"
             }
         },
         // Force Server Home instead of Server Guide
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index f08bc2d1d..c120d72d8 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -89,8 +89,8 @@ export default definePlugin({
                 },
                 // Remove permission checking for getRenderLevel function
                 {
-                    match: /(?<=getRenderLevel\(\i\){.+?return)!\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL,this\.record\)\|\|/,
-                    replace: " "
+                    match: /(getRenderLevel\(\i\){.+?return)!\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL,this\.record\)\|\|/,
+                    replace: (_, rest) => `${rest} `
                 }
             ]
         },
@@ -159,8 +159,8 @@ export default definePlugin({
             replacement: [
                 // Make the channel appear as muted if it's hidden
                 {
-                    match: /(?<={channel:(\i),name:\i,muted:(\i).+?;)/,
-                    replace: (_, channel, muted) => `${muted}=$self.isHiddenChannel(${channel})?true:${muted};`
+                    match: /{channel:(\i),name:\i,muted:(\i).+?;/,
+                    replace: (m, channel, muted) => `${m}${muted}=$self.isHiddenChannel(${channel})?true:${muted};`
                 },
                 // Add the hidden eye icon if the channel is hidden
                 {
@@ -186,8 +186,8 @@ export default definePlugin({
                 {
                     // Hide unreads
                     predicate: () => settings.store.hideUnreads === true,
-                    match: /(?<={channel:(\i),name:\i,.+?unread:(\i).+?;)/,
-                    replace: (_, channel, unread) => `${unread}=$self.isHiddenChannel(${channel})?false:${unread};`
+                    match: /{channel:(\i),name:\i,.+?unread:(\i).+?;/,
+                    replace: (m, channel, unread) => `${m}${unread}=$self.isHiddenChannel(${channel})?false:${unread};`
                 }
             ]
         },
diff --git a/src/plugins/spotifyCrack/index.ts b/src/plugins/spotifyCrack/index.ts
index 1beccad60..37504be2e 100644
--- a/src/plugins/spotifyCrack/index.ts
+++ b/src/plugins/spotifyCrack/index.ts
@@ -60,8 +60,8 @@ export default definePlugin({
                 },
                 {
                     predicate: () => settings.store.keepSpotifyActivityOnIdle,
-                    match: /(?<=shouldShowActivity\(\){.{0,50})&&!\i\.\i\.isIdle\(\)/,
-                    replace: ""
+                    match: /(shouldShowActivity\(\){.{0,50})&&!\i\.\i\.isIdle\(\)/,
+                    replace: "$1"
                 }
             ]
         }
diff --git a/src/plugins/superReactionTweaks/index.ts b/src/plugins/superReactionTweaks/index.ts
index 89197b4c3..7878ba630 100644
--- a/src/plugins/superReactionTweaks/index.ts
+++ b/src/plugins/superReactionTweaks/index.ts
@@ -42,8 +42,8 @@ export default definePlugin({
         {
             find: ",BURST_REACTION_EFFECT_PLAY",
             replacement: {
-                match: /(?<=BURST_REACTION_EFFECT_PLAY:\i=>{.{50,100})(\i\(\i,\i\))>=\d+/,
-                replace: "!$self.shouldPlayBurstReaction($1)"
+                match: /(BURST_REACTION_EFFECT_PLAY:\i=>{.{50,100})(\i\(\i,\i\))>=\d+/,
+                replace: "$1!$self.shouldPlayBurstReaction($2)"
             }
         },
         {
diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index 359365ee4..09254d511 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -206,8 +206,8 @@ export default definePlugin({
         {
             find: ".avatarPositionPanel",
             replacement: {
-                match: /(?<=avatarWrapperNonUserBot.{0,50})onClick:(\i\|\|\i)\?void 0(?<=,avatarSrc:(\i).+?)/,
-                replace: "style:($1)?{cursor:\"pointer\"}:{},onClick:$1?()=>{$self.openImage($2)}"
+                match: /(avatarWrapperNonUserBot.{0,50})onClick:(\i\|\|\i)\?void 0(?<=,avatarSrc:(\i).+?)/,
+                replace: "$1style:($2)?{cursor:\"pointer\"}:{},onClick:$2?()=>{$self.openImage($3)}"
             }
         },
         // Group DMs top small & large icon

From a8e18f17e278f538f0d8dcab429220f0ac6bb60c Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 26 May 2024 01:11:36 -0300
Subject: [PATCH 626/632] ConsoleShortcuts: Start at Init

---
 src/plugins/consoleShortcuts/index.ts | 58 ++++++++++++++++++---------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/plugins/consoleShortcuts/index.ts b/src/plugins/consoleShortcuts/index.ts
index e25e7cb30..b0efe8a08 100644
--- a/src/plugins/consoleShortcuts/index.ts
+++ b/src/plugins/consoleShortcuts/index.ts
@@ -19,10 +19,10 @@
 import { Devs } from "@utils/constants";
 import { relaunch } from "@utils/native";
 import { canonicalizeMatch, canonicalizeReplace, canonicalizeReplacement } from "@utils/patches";
-import definePlugin from "@utils/types";
+import definePlugin, { StartAt } from "@utils/types";
 import * as Webpack from "@webpack";
-import { extract, filters, findAll, search } from "@webpack";
-import { React, ReactDOM } from "@webpack/common";
+import { extract, filters, findAll, findModuleId, search } from "@webpack";
+import * as Common from "@webpack/common";
 import type { ComponentType } from "react";
 
 const WEB_ONLY = (f: string) => () => {
@@ -34,7 +34,7 @@ export default definePlugin({
     description: "Adds shorter Aliases for many things on the window. Run `shortcutList` for a list.",
     authors: [Devs.Ven],
 
-    getShortcuts() {
+    getShortcuts(): Record<PropertyKey, any> {
         function newFindWrapper(filterFactory: (...props: any[]) => Webpack.FilterFn) {
             const cache = new Map<string, unknown>();
 
@@ -64,16 +64,17 @@ export default definePlugin({
         let fakeRenderWin: WeakRef<Window> | undefined;
         const find = newFindWrapper(f => f);
         const findByProps = newFindWrapper(filters.byProps);
+
         return {
-            ...Vencord.Webpack.Common,
-            wp: Vencord.Webpack,
-            wpc: Webpack.wreq.c,
-            wreq: Webpack.wreq,
+            ...Object.fromEntries(Object.keys(Common).map(key => [key, { getter: () => Common[key] }])),
+            wp: Webpack,
+            wpc: { getter: () => Webpack.cache },
+            wreq: { getter: () => Webpack.wreq },
             wpsearch: search,
             wpex: extract,
-            wpexs: (code: string) => extract(Webpack.findModuleId(code)!),
+            wpexs: (code: string) => extract(findModuleId(code)!),
             find,
-            findAll,
+            findAll: findAll,
             findByProps,
             findAllByProps: (...props: string[]) => findAll(filters.byProps(...props)),
             findByCode: newFindWrapper(filters.byCode),
@@ -82,10 +83,10 @@ export default definePlugin({
             findAllComponentsByCode: (...code: string[]) => findAll(filters.componentByCode(...code)),
             findExportedComponent: (...props: string[]) => findByProps(...props)[props[0]],
             findStore: newFindWrapper(filters.byStoreName),
-            PluginsApi: Vencord.Plugins,
-            plugins: Vencord.Plugins.plugins,
-            Settings: Vencord.Settings,
-            Api: Vencord.Api,
+            PluginsApi: { getter: () => Vencord.Plugins },
+            plugins: { getter: () => Vencord.Plugins.plugins },
+            Settings: { getter: () => Vencord.Settings },
+            Api: { getter: () => Vencord.Api },
             reload: () => location.reload(),
             restart: IS_WEB ? WEB_ONLY("restart") : relaunch,
             canonicalizeMatch,
@@ -115,21 +116,40 @@ export default definePlugin({
                     });
                 }
 
-                ReactDOM.render(React.createElement(component, props), doc.body.appendChild(document.createElement("div")));
+                Common.ReactDOM.render(Common.React.createElement(component, props), doc.body.appendChild(document.createElement("div")));
             }
         };
     },
 
+    startAt: StartAt.Init,
     start() {
         const shortcuts = this.getShortcuts();
-        window.shortcutList = shortcuts;
-        for (const [key, val] of Object.entries(shortcuts))
-            window[key] = val;
+        window.shortcutList = {};
+
+        for (const [key, val] of Object.entries(shortcuts)) {
+            if (val.getter != null) {
+                Object.defineProperty(window.shortcutList, key, {
+                    get: val.getter,
+                    configurable: true,
+                    enumerable: true
+                });
+
+                Object.defineProperty(window, key, {
+                    get: () => window.shortcutList[key],
+                    configurable: true,
+                    enumerable: true
+                });
+            } else {
+                window.shortcutList[key] = val;
+                window[key] = val;
+            }
+        }
     },
 
     stop() {
         delete window.shortcutList;
-        for (const key in this.getShortcuts())
+        for (const key in this.getShortcuts()) {
             delete window[key];
+        }
     }
 });

From 4f2c2b8e4ab507e91fca5ce6b80edbe01ab61510 Mon Sep 17 00:00:00 2001
From: Manti <67705577+mantikafasi@users.noreply.github.com>
Date: Sun, 26 May 2024 19:14:29 +0300
Subject: [PATCH 627/632] new plugin Summaries: show Discords AI-generated
 convo summaries (#2481)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/seeSummaries/README.md       |   7 ++
 src/plugins/seeSummaries/index.tsx       | 114 +++++++++++++++++++++++
 src/webpack/common/types/fluxEvents.d.ts |   2 +-
 3 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 src/plugins/seeSummaries/README.md
 create mode 100644 src/plugins/seeSummaries/index.tsx

diff --git a/src/plugins/seeSummaries/README.md b/src/plugins/seeSummaries/README.md
new file mode 100644
index 000000000..dfb90bab3
--- /dev/null
+++ b/src/plugins/seeSummaries/README.md
@@ -0,0 +1,7 @@
+# Summaries
+
+Enables Discord's experimental Summaries feature on every server, displaying AI generated summaries of conversations.
+
+Note that this plugin can't fetch old summaries, it can only display ones created while your Discord is running with the plugin enabled.
+
+![](https://github.com/Vendicated/Vencord/assets/45497981/bd931b0c-2e85-4c10-9f7c-8ba01eb55745)
diff --git a/src/plugins/seeSummaries/index.tsx b/src/plugins/seeSummaries/index.tsx
new file mode 100644
index 000000000..04a25198c
--- /dev/null
+++ b/src/plugins/seeSummaries/index.tsx
@@ -0,0 +1,114 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { DataStore } from "@api/index";
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+import { ChannelStore, GuildStore } from "@webpack/common";
+
+const SummaryStore = findByPropsLazy("allSummaries", "findSummary");
+const { createSummaryFromServer } = findByPropsLazy("createSummaryFromServer");
+
+const settings = definePluginSettings({
+    summaryExpiryThresholdDays: {
+        type: OptionType.SLIDER,
+        description: "The time in days before a summary is removed. Note that only up to 50 summaries are kept per channel",
+        markers: [1, 3, 5, 7, 10, 15, 20, 25, 30],
+        stickToMarkers: false,
+        default: 3,
+    }
+});
+
+interface Summary {
+    count: number;
+    end_id: string;
+    id: string;
+    message_ids: string[];
+    people: string[];
+    source: number;
+    start_id: string;
+    summ_short: string;
+    topic: string;
+    type: number;
+    unsafe: boolean;
+}
+
+interface ChannelSummaries {
+    type: string;
+    channel_id: string;
+    guild_id: string;
+    summaries: Summary[];
+
+    // custom property
+    time?: number;
+}
+
+export default definePlugin({
+    name: "Summaries",
+    description: "Enables Discord's experimental Summaries feature on every server, displaying AI generated summaries of conversations",
+    authors: [Devs.mantikafasi],
+    settings,
+    patches: [
+        {
+            find: "ChannelTypesSets.SUMMARIZEABLE.has",
+            replacement: {
+                match: /\i\.hasFeature\(\i\.GuildFeatures\.SUMMARIES_ENABLED\w+?\)/g,
+                replace: "true"
+            }
+        },
+        {
+            find: "RECEIVE_CHANNEL_SUMMARY(",
+            replacement: {
+                match: /shouldFetch\((\i),\i\){/,
+                replace: "$& if(!$self.shouldFetch($1)) return false;"
+            }
+        }
+    ],
+    flux: {
+        CONVERSATION_SUMMARY_UPDATE(data) {
+            const incomingSummaries: ChannelSummaries[] = data.summaries.map((summary: any) => ({ ...createSummaryFromServer(summary), time: Date.now() }));
+
+            // idk if this is good for performance but it doesnt seem to be a problem in my experience
+            DataStore.update("summaries-data", summaries => {
+                summaries ??= {};
+                summaries[data.channel_id] ? summaries[data.channel_id].unshift(...incomingSummaries) : (summaries[data.channel_id] = incomingSummaries);
+                if (summaries[data.channel_id].length > 50)
+                    summaries[data.channel_id] = summaries[data.channel_id].slice(0, 50);
+
+                return summaries;
+            });
+        }
+    },
+
+    async start() {
+        await DataStore.update("summaries-data", summaries => {
+            for (const key of Object.keys(summaries)) {
+                for (let i = summaries[key].length - 1; i >= 0; i--) {
+                    if (summaries[key][i].time < Date.now() - 1000 * 60 * 60 * 24 * settings.store.summaryExpiryThresholdDays) {
+                        summaries[key].splice(i, 1);
+                    }
+                }
+
+                if (summaries[key].length === 0) {
+                    delete summaries[key];
+                }
+            }
+
+            Object.assign(SummaryStore.allSummaries(), summaries);
+            return summaries;
+        });
+    },
+
+    shouldFetch(channelId: string) {
+        const channel = ChannelStore.getChannel(channelId);
+        // SUMMARIES_ENABLED feature is not in discord-types
+        const guild = GuildStore.getGuild(channel.guild_id);
+        // @ts-ignore
+        return guild.hasFeature("SUMMARIES_ENABLED_GA");
+    }
+});
diff --git a/src/webpack/common/types/fluxEvents.d.ts b/src/webpack/common/types/fluxEvents.d.ts
index 36bcb2cde..1bd50f461 100644
--- a/src/webpack/common/types/fluxEvents.d.ts
+++ b/src/webpack/common/types/fluxEvents.d.ts
@@ -37,4 +37,4 @@ function makeFluxEventList() {
 */
 
 // 46kb worth of events ???????
-export type FluxEvents = "ACCESSIBILITY_COLORBLIND_TOGGLE" | "ACCESSIBILITY_DARK_SIDEBAR_TOGGLE" | "ACCESSIBILITY_DESATURATE_ROLES_TOGGLE" | "ACCESSIBILITY_DETECTION_MODAL_SEEN" | "ACCESSIBILITY_FORCED_COLORS_MODAL_SEEN" | "ACCESSIBILITY_KEYBOARD_MODE_DISABLE" | "ACCESSIBILITY_KEYBOARD_MODE_ENABLE" | "ACCESSIBILITY_LOW_CONTRAST_TOGGLE" | "ACCESSIBILITY_RESET_TO_DEFAULT" | "ACCESSIBILITY_SET_ALWAYS_SHOW_LINK_DECORATIONS" | "ACCESSIBILITY_SET_FONT_SIZE" | "ACCESSIBILITY_SET_MESSAGE_GROUP_SPACING" | "ACCESSIBILITY_SET_PREFERS_REDUCED_MOTION" | "ACCESSIBILITY_SET_ROLE_STYLE" | "ACCESSIBILITY_SET_SATURATION" | "ACCESSIBILITY_SET_SYNC_FORCED_COLORS" | "ACCESSIBILITY_SET_ZOOM" | "ACCESSIBILITY_SUBMIT_BUTTON_TOGGLE" | "ACCESSIBILITY_SUPPORT_CHANGED" | "ACCESSIBILITY_SYNC_PROFILE_THEME_WITH_USER_THEME_TOGGLE" | "ACCESSIBILITY_SYSTEM_COLOR_PREFERENCES_CHANGED" | "ACCESSIBILITY_SYSTEM_PREFERS_CONTRAST_CHANGED" | "ACCESSIBILITY_SYSTEM_PREFERS_REDUCED_MOTION_CHANGED" | "ACK_APPROVED_GUILD_JOIN_REQUEST" | "ACTIVE_CHANNELS_FETCH_FAILURE" | "ACTIVE_CHANNELS_FETCH_START" | "ACTIVE_CHANNELS_FETCH_SUCCESS" | "ACTIVE_OUTBOUND_PROMOTIONS_FETCH" | "ACTIVE_OUTBOUND_PROMOTIONS_FETCH_FAIL" | "ACTIVE_OUTBOUND_PROMOTIONS_FETCH_SUCCESS" | "ACTIVITY_INVITE_EDUCATION_DISMISS" | "ACTIVITY_INVITE_MODAL_CLOSE" | "ACTIVITY_INVITE_MODAL_OPEN" | "ACTIVITY_JOIN" | "ACTIVITY_JOIN_FAILED" | "ACTIVITY_JOIN_LOADING" | "ACTIVITY_LAUNCH_FAIL" | "ACTIVITY_METADATA_UPDATE" | "ACTIVITY_PIP_MODE_UPDATE" | "ACTIVITY_PLAY" | "ACTIVITY_SCREEN_ORIENTATION_UPDATE" | "ACTIVITY_START" | "ACTIVITY_SYNC" | "ACTIVITY_SYNC_STOP" | "ACTIVITY_UPDATE_FAIL" | "ACTIVITY_UPDATE_START" | "ACTIVITY_UPDATE_SUCCESS" | "ADD_STICKER_PREVIEW" | "ADMIN_ONBOARDING_GUIDE_HIDE" | "AFK" | "AGE_GATE_FAILURE_MODAL_OPEN" | "AGE_GATE_LOGOUT_UNDERAGE_NEW_USER" | "AGE_GATE_MODAL_CLOSE" | "AGE_GATE_MODAL_OPEN" | "AGE_GATE_SUCCESS_MODAL_OPEN" | "ALLOW_SPAM_MESSAGES_FOR_USER" | "APPLICATIONS_FETCH" | "APPLICATIONS_FETCH_FAIL" | "APPLICATIONS_FETCH_SUCCESS" | "APPLICATION_ACTIVITY_STATISTICS_FETCH_FAIL" | "APPLICATION_ACTIVITY_STATISTICS_FETCH_START" | "APPLICATION_ACTIVITY_STATISTICS_FETCH_SUCCESS" | "APPLICATION_BRANCHES_FETCH_FAIL" | "APPLICATION_BRANCHES_FETCH_SUCCESS" | "APPLICATION_BUILD_FETCH_START" | "APPLICATION_BUILD_FETCH_SUCCESS" | "APPLICATION_BUILD_NOT_FOUND" | "APPLICATION_BUILD_SIZE_FETCH_FAIL" | "APPLICATION_BUILD_SIZE_FETCH_START" | "APPLICATION_BUILD_SIZE_FETCH_SUCCESS" | "APPLICATION_COMMANDS_FETCH" | "APPLICATION_COMMANDS_FETCH_FOR_APPLICATION" | "APPLICATION_COMMAND_AUTOCOMPLETE_REQUEST" | "APPLICATION_COMMAND_AUTOCOMPLETE_RESPONSE" | "APPLICATION_COMMAND_FETCH" | "APPLICATION_COMMAND_REGISTRY_UPDATE" | "APPLICATION_COMMAND_SEARCH_STORE_QUERY" | "APPLICATION_COMMAND_SEARCH_STORE_UI_UPDATE" | "APPLICATION_COMMAND_SEARCH_STORE_UPDATE" | "APPLICATION_COMMAND_SET_ACTIVE_COMMAND" | "APPLICATION_COMMAND_SET_PREFERRED_COMMAND" | "APPLICATION_COMMAND_UPDATE_CHANNEL_STATE" | "APPLICATION_COMMAND_UPDATE_OPTIONS" | "APPLICATION_COMMAND_USED" | "APPLICATION_FETCH" | "APPLICATION_FETCH_FAIL" | "APPLICATION_FETCH_SUCCESS" | "APPLICATION_STORE_ACCEPT_EULA" | "APPLICATION_STORE_ACCEPT_STORE_TERMS" | "APPLICATION_STORE_CLEAR_DATA" | "APPLICATION_STORE_DIRECTORY_FETCH_SUCCESS" | "APPLICATION_STORE_DIRECTORY_MUTE" | "APPLICATION_STORE_DIRECTORY_UNMUTE" | "APPLICATION_STORE_LOCATION_CHANGE" | "APPLICATION_STORE_MATURE_AGREE" | "APPLICATION_STORE_RESET_NAVIGATION" | "APPLICATION_SUBSCRIPTIONS_CHANNEL_NOTICE_DISMISSED" | "APPLICATION_SUBSCRIPTIONS_FETCH_ENTITLEMENTS" | "APPLICATION_SUBSCRIPTIONS_FETCH_ENTITLEMENTS_FAILURE" | "APPLICATION_SUBSCRIPTIONS_FETCH_ENTITLEMENTS_SUCCESS" | "APPLICATION_SUBSCRIPTIONS_FETCH_LISTINGS" | "APPLICATION_SUBSCRIPTIONS_FETCH_LISTINGS_FAILURE" | "APPLICATION_SUBSCRIPTIONS_FETCH_LISTINGS_SUCCESS" | "APPLICATION_SUBSCRIPTIONS_FETCH_LISTING_FOR_PLAN_SUCCESS" | "APPLIED_BOOSTS_COOLDOWN_FETCH_SUCCESS" | "APPLIED_GUILD_BOOST_COUNT_UPDATE" | "APP_STATE_UPDATE" | "APP_VIEW_SET_HOME_LINK" | "AUDIO_INPUT_DETECTED" | "AUDIO_RESET" | "AUDIO_SET_ATTENUATION" | "AUDIO_SET_AUTOMATIC_GAIN_CONTROL" | "AUDIO_SET_DEBUG_LOGGING" | "AUDIO_SET_DISPLAY_SILENCE_WARNING" | "AUDIO_SET_ECHO_CANCELLATION" | "AUDIO_SET_INPUT_DEVICE" | "AUDIO_SET_INPUT_VOLUME" | "AUDIO_SET_LOCAL_PAN" | "AUDIO_SET_LOCAL_VIDEO_DISABLED" | "AUDIO_SET_LOCAL_VOLUME" | "AUDIO_SET_LOOPBACK" | "AUDIO_SET_MODE" | "AUDIO_SET_NOISE_CANCELLATION" | "AUDIO_SET_NOISE_SUPPRESSION" | "AUDIO_SET_OUTPUT_DEVICE" | "AUDIO_SET_OUTPUT_VOLUME" | "AUDIO_SET_QOS" | "AUDIO_SET_SUBSYSTEM" | "AUDIO_SET_TEMPORARY_SELF_MUTE" | "AUDIO_TOGGLE_LOCAL_MUTE" | "AUDIO_TOGGLE_SELF_DEAF" | "AUDIO_TOGGLE_SELF_MUTE" | "AUDIO_VOLUME_CHANGE" | "AUDIT_LOG_FETCH_FAIL" | "AUDIT_LOG_FETCH_NEXT_PAGE_FAIL" | "AUDIT_LOG_FETCH_NEXT_PAGE_START" | "AUDIT_LOG_FETCH_NEXT_PAGE_SUCCESS" | "AUDIT_LOG_FETCH_START" | "AUDIT_LOG_FETCH_SUCCESS" | "AUDIT_LOG_FILTER_BY_ACTION" | "AUDIT_LOG_FILTER_BY_USER" | "AUTH_INVITE_UPDATE" | "AUTH_SESSION_CHANGE" | "AUTO_MODERATION_MENTION_RAID_DETECTION" | "AUTO_MODERATION_MENTION_RAID_NOTICE_DISMISS" | "BILLING_IP_COUNTRY_CODE_FAILURE" | "BILLING_IP_COUNTRY_CODE_FETCH_START" | "BILLING_LOCALIZED_PRICING_PROMO_FAILURE" | "BILLING_MOST_RECENT_SUBSCRIPTION_FETCH_SUCCESS" | "BILLING_PAYMENTS_FETCH_SUCCESS" | "BILLING_PAYMENT_FETCH_SUCCESS" | "BILLING_PAYMENT_SOURCES_FETCH_FAIL" | "BILLING_PAYMENT_SOURCES_FETCH_START" | "BILLING_PAYMENT_SOURCES_FETCH_SUCCESS" | "BILLING_PAYMENT_SOURCE_CREATE_FAIL" | "BILLING_PAYMENT_SOURCE_CREATE_START" | "BILLING_PAYMENT_SOURCE_CREATE_SUCCESS" | "BILLING_PAYMENT_SOURCE_REMOVE_CLEAR_ERROR" | "BILLING_PAYMENT_SOURCE_REMOVE_FAIL" | "BILLING_PAYMENT_SOURCE_REMOVE_START" | "BILLING_PAYMENT_SOURCE_REMOVE_SUCCESS" | "BILLING_PAYMENT_SOURCE_UPDATE_CLEAR_ERROR" | "BILLING_PAYMENT_SOURCE_UPDATE_FAIL" | "BILLING_PAYMENT_SOURCE_UPDATE_START" | "BILLING_PAYMENT_SOURCE_UPDATE_SUCCESS" | "BILLING_POPUP_BRIDGE_CALLBACK" | "BILLING_POPUP_BRIDGE_STATE_UPDATE" | "BILLING_PURCHASE_TOKEN_AUTH_CLEAR_STATE" | "BILLING_SET_IP_COUNTRY_CODE" | "BILLING_SET_LOCALIZED_PRICING_PROMO" | "BILLING_SUBSCRIPTION_CANCEL_FAIL" | "BILLING_SUBSCRIPTION_CANCEL_START" | "BILLING_SUBSCRIPTION_CANCEL_SUCCESS" | "BILLING_SUBSCRIPTION_FETCH_FAIL" | "BILLING_SUBSCRIPTION_FETCH_START" | "BILLING_SUBSCRIPTION_FETCH_SUCCESS" | "BILLING_SUBSCRIPTION_RESET" | "BILLING_SUBSCRIPTION_UPDATE_FAIL" | "BILLING_SUBSCRIPTION_UPDATE_START" | "BILLING_SUBSCRIPTION_UPDATE_SUCCESS" | "BILLING_USER_PREMIUM_LIKELIHOOD_FETCH" | "BILLING_USER_PREMIUM_LIKELIHOOD_FETCH_ERROR" | "BILLING_USER_PREMIUM_LIKELIHOOD_FETCH_SUCCESS" | "BILLING_USER_TRIAL_OFFER_ACKNOWLEDGED_SUCCESS" | "BILLING_USER_TRIAL_OFFER_FETCH_SUCCESS" | "BLOCKED_DOMAIN_LIST_FETCHED" | "BOOSTED_GUILD_GRACE_PERIOD_NOTICE_DISMISS" | "BRAINTREE_CREATE_CLIENT_SUCCESS" | "BRAINTREE_CREATE_PAYPAL_CLIENT_SUCCESS" | "BRAINTREE_CREATE_VENMO_CLIENT_SUCCESS" | "BRAINTREE_TEARDOWN_PAYPAL_CLIENT" | "BRAINTREE_TEARDOWN_VENMO_CLIENT" | "BRAINTREE_TOKENIZE_PAYPAL_START" | "BRAINTREE_TOKENIZE_PAYPAL_SUCCESS" | "BRAINTREE_TOKENIZE_VENMO_START" | "BRAINTREE_TOKENIZE_VENMO_SUCCESS" | "BROWSER_HANDOFF_BEGIN" | "BROWSER_HANDOFF_FROM_APP" | "BROWSER_HANDOFF_SET_USER" | "BROWSER_HANDOFF_UNAVAILABLE" | "BUILD_OVERRIDE_RESOLVED" | "BULK_ACK" | "BULK_CLEAR_RECENTS" | "BURST_REACTION_ADD" | "BURST_REACTION_ANIMATION_ADD" | "BURST_REACTION_EFFECT_CLEAR" | "BURST_REACTION_EFFECT_PLAY" | "BURST_REACTION_REMOVE" | "CACHE_LOADED" | "CACHE_LOADED_LAZY" | "CALL_CHAT_TOASTS_SET_ENABLED" | "CALL_CONNECT" | "CALL_CREATE" | "CALL_DELETE" | "CALL_ENQUEUE_RING" | "CALL_UPDATE" | "CANDIDATE_GAMES_CHANGE" | "CATEGORY_COLLAPSE" | "CATEGORY_COLLAPSE_ALL" | "CATEGORY_EXPAND" | "CATEGORY_EXPAND_ALL" | "CERTIFIED_DEVICES_SET" | "CHANGE_LOG_CLOSE" | "CHANGE_LOG_FETCH_SUCCESS" | "CHANGE_LOG_LOCK" | "CHANGE_LOG_OPEN" | "CHANGE_LOG_SET_OVERRIDE" | "CHANGE_LOG_UNLOCK" | "CHANNEL_ACK" | "CHANNEL_CALL_POPOUT_WINDOW_OPEN" | "CHANNEL_COLLAPSE" | "CHANNEL_CREATE" | "CHANNEL_DELETE" | "CHANNEL_FOLLOWER_CREATED" | "CHANNEL_FOLLOWER_STATS_FETCH_FAILURE" | "CHANNEL_FOLLOWER_STATS_FETCH_SUCCESS" | "CHANNEL_FOLLOWING_PUBLISH_BUMP_DISMISSED" | "CHANNEL_FOLLOWING_PUBLISH_BUMP_HIDE_PERMANENTLY" | "CHANNEL_HIGHLIGHTS_FETCH_START" | "CHANNEL_HIGHLIGHTS_FETCH_SUCCESS" | "CHANNEL_LOCAL_ACK" | "CHANNEL_MESSAGE_PREVIEW_LOAD_MESSAGES" | "CHANNEL_PINS_ACK" | "CHANNEL_PINS_UPDATE" | "CHANNEL_PRELOAD" | "CHANNEL_RECIPIENT_ADD" | "CHANNEL_RECIPIENT_REMOVE" | "CHANNEL_RTC_ACTIVE_CHANNELS" | "CHANNEL_RTC_SELECT_PARTICIPANT" | "CHANNEL_RTC_UPDATE_CHAT_OPEN" | "CHANNEL_RTC_UPDATE_LAYOUT" | "CHANNEL_RTC_UPDATE_PARTICIPANTS_OPEN" | "CHANNEL_RTC_UPDATE_STAGE_MUSIC_MUTED" | "CHANNEL_RTC_UPDATE_STAGE_STREAM_SIZE" | "CHANNEL_RTC_UPDATE_STAGE_VIDEO_LIMIT_BOOST_UPSELL_DISMISSED" | "CHANNEL_RTC_UPDATE_VOICE_PARTICIPANTS_HIDDEN" | "CHANNEL_SELECT" | "CHANNEL_SETTINGS_CLOSE" | "CHANNEL_SETTINGS_INIT" | "CHANNEL_SETTINGS_LOADED_INVITES" | "CHANNEL_SETTINGS_OPEN" | "CHANNEL_SETTINGS_OVERWRITE_SELECT" | "CHANNEL_SETTINGS_PERMISSIONS_INIT" | "CHANNEL_SETTINGS_PERMISSIONS_SAVE_SUCCESS" | "CHANNEL_SETTINGS_PERMISSIONS_SELECT_PERMISSION" | "CHANNEL_SETTINGS_PERMISSIONS_SET_ADVANCED_MODE" | "CHANNEL_SETTINGS_PERMISSIONS_SUBMITTING" | "CHANNEL_SETTINGS_PERMISSIONS_UPDATE_PERMISSION" | "CHANNEL_SETTINGS_SET_SECTION" | "CHANNEL_SETTINGS_SUBMIT" | "CHANNEL_SETTINGS_SUBMIT_FAILURE" | "CHANNEL_SETTINGS_SUBMIT_SUCCESS" | "CHANNEL_SETTINGS_UPDATE" | "CHANNEL_TOGGLE_MEMBERS_SECTION" | "CHANNEL_UPDATES" | "CHECKING_FOR_UPDATES" | "CHECK_LAUNCHABLE_GAME" | "CLEAR_AUTHENTICATION_ERRORS" | "CLEAR_CACHES" | "CLEAR_GUILD_CACHE" | "CLEAR_INTERACTION_MODAL_STATE" | "CLEAR_MESSAGES" | "CLEAR_OLDEST_UNREAD_MESSAGE" | "CLEAR_PENDING_CHANNEL_AND_ROLE_UPDATES" | "CLEAR_REMOTE_DISCONNECT_VOICE_CHANNEL_ID" | "CLEAR_STICKER_PREVIEW" | "CLIENT_THEMES_EDITOR_CLOSE" | "CLIENT_THEMES_EDITOR_OPEN" | "CLIPS_CLEAR_CLIPS_SESSION" | "CLIPS_SAVE_CLIP" | "CLIPS_SETTINGS_UPDATE" | "COMMANDS_MIGRATION_NOTICE_DISMISSED" | "COMMANDS_MIGRATION_OVERVIEW_TOOLTIP_DISMISSED" | "COMMANDS_MIGRATION_TOGGLE_TOOLTIP_DISMISSED" | "COMMANDS_MIGRATION_UPDATE_SUCCESS" | "CONNECTED_DEVICE_IGNORE" | "CONNECTED_DEVICE_NEVER_SHOW_MODAL" | "CONNECTED_DEVICE_SET" | "CONNECTIONS_GRID_MODAL_HIDE" | "CONNECTIONS_GRID_MODAL_SHOW" | "CONNECTION_CLOSED" | "CONNECTION_OPEN" | "CONNECTION_OPEN_SUPPLEMENTAL" | "CONNECTION_RESUMED" | "CONSOLE_COMMAND_UPDATE" | "CONTEXT_MENU_CLOSE" | "CONTEXT_MENU_OPEN" | "CREATE_PENDING_REPLY" | "CURRENT_BUILD_OVERRIDE_RESOLVED" | "CURRENT_USER_UPDATE" | "DECAY_READ_STATES" | "DELETED_ENTITY_IDS" | "DELETE_PENDING_REPLY" | "DETECTED_OFF_PLATFORM_PREMIUM_PERKS_DISMISS" | "DEVELOPER_ACTIVITY_SHELF_FETCH_FAIL" | "DEVELOPER_ACTIVITY_SHELF_FETCH_START" | "DEVELOPER_ACTIVITY_SHELF_FETCH_SUCCESS" | "DEVELOPER_ACTIVITY_SHELF_MARK_ACTIVITY_USED" | "DEVELOPER_ACTIVITY_SHELF_SET_ACTIVITY_URL_OVERRIDE" | "DEVELOPER_ACTIVITY_SHELF_TOGGLE_ENABLED" | "DEVELOPER_ACTIVITY_SHELF_TOGGLE_USE_ACTIVITY_URL_OVERRIDE" | "DEVELOPER_OPTIONS_UPDATE_SETTINGS" | "DEVELOPER_TEST_MODE_AUTHORIZATION_FAIL" | "DEVELOPER_TEST_MODE_AUTHORIZATION_START" | "DEVELOPER_TEST_MODE_AUTHORIZATION_SUCCESS" | "DEVELOPER_TEST_MODE_RESET" | "DEVELOPER_TEST_MODE_RESET_ERROR" | "DEV_TOOLS_SETTINGS_UPDATE" | "DISABLE_AUTOMATIC_ACK" | "DISCOVER_CHECKLIST_FETCH_FAILURE" | "DISCOVER_CHECKLIST_FETCH_START" | "DISCOVER_CHECKLIST_FETCH_SUCCESS" | "DISCOVER_GUILDS_FETCH_FAILURE" | "DISCOVER_GUILDS_FETCH_START" | "DISCOVER_GUILDS_FETCH_SUCCESS" | "DISMISS_FAVORITE_SUGGESTION" | "DISMISS_NITRODUCTION_TOOLTIP" | "DISPATCH_APPLICATION_ADD_TO_INSTALLATIONS" | "DISPATCH_APPLICATION_CANCEL" | "DISPATCH_APPLICATION_ERROR" | "DISPATCH_APPLICATION_INSTALL" | "DISPATCH_APPLICATION_INSTALL_SCRIPTS_PROGRESS_UPDATE" | "DISPATCH_APPLICATION_LAUNCH_SETUP_COMPLETE" | "DISPATCH_APPLICATION_LAUNCH_SETUP_START" | "DISPATCH_APPLICATION_MOVE_UP" | "DISPATCH_APPLICATION_REMOVE_FINISHED" | "DISPATCH_APPLICATION_REPAIR" | "DISPATCH_APPLICATION_STATE_UPDATE" | "DISPATCH_APPLICATION_UNINSTALL" | "DISPATCH_APPLICATION_UPDATE" | "DISPLAYED_INVITE_SHOW" | "DOMAIN_MIGRATION_FAILURE" | "DOMAIN_MIGRATION_SKIP" | "DOMAIN_MIGRATION_START" | "DRAFT_CHANGE" | "DRAFT_CLEAR" | "DRAFT_SAVE" | "DRAWER_CLOSE" | "DRAWER_OPEN" | "DRAWER_SELECT_TAB" | "DROPS_ELIGIBILITY_FETCH_SUCCESS" | "DROPS_ENROLLED_USER_FETCH_SUCCESS" | "DROPS_HEARTBEAT_FAILURE" | "DROPS_HEARTBEAT_SUCCESS" | "DROPS_PLATFORM_AVAILABILITY_SUCCESS" | "DROPS_USER_STATUS_FETCH_SUCCESS" | "EMAIL_SETTINGS_FETCH_SUCCESS" | "EMAIL_SETTINGS_UPDATE" | "EMAIL_SETTINGS_UPDATE_SUCCESS" | "EMBEDDED_ACTIVITY_CLOSE" | "EMBEDDED_ACTIVITY_DEFERRED_OPEN" | "EMBEDDED_ACTIVITY_DISCONNECT" | "EMBEDDED_ACTIVITY_DISMISS_FREE_INDICATOR" | "EMBEDDED_ACTIVITY_FETCH_SHELF" | "EMBEDDED_ACTIVITY_FETCH_SHELF_FAIL" | "EMBEDDED_ACTIVITY_FETCH_SHELF_SUCCESS" | "EMBEDDED_ACTIVITY_FREE_ACTIVITY_UPDATE" | "EMBEDDED_ACTIVITY_INBOUND_UPDATE" | "EMBEDDED_ACTIVITY_LAUNCH_FAIL" | "EMBEDDED_ACTIVITY_LAUNCH_START" | "EMBEDDED_ACTIVITY_LAUNCH_SUCCESS" | "EMBEDDED_ACTIVITY_OPEN" | "EMBEDDED_ACTIVITY_SET_CONFIG" | "EMBEDDED_ACTIVITY_SET_ORIENTATION_LOCK_STATE" | "EMOJI_DELETE" | "EMOJI_FETCH_FAILURE" | "EMOJI_FETCH_SUCCESS" | "EMOJI_TRACK_USAGE" | "EMOJI_UPLOAD_START" | "EMOJI_UPLOAD_STOP" | "ENABLE_AUTOMATIC_ACK" | "ENTITLEMENTS_FETCH_FOR_USER_SUCCESS" | "ENTITLEMENTS_GIFTABLE_FETCH_SUCCESS" | "ENTITLEMENT_CREATE" | "ENTITLEMENT_DELETE" | "ENTITLEMENT_FETCH_APPLICATION_FAIL" | "ENTITLEMENT_FETCH_APPLICATION_START" | "ENTITLEMENT_FETCH_APPLICATION_SUCCESS" | "ENTITLEMENT_UPDATE" | "EVENT_DIRECTORY_FETCH_FAILURE" | "EVENT_DIRECTORY_FETCH_START" | "EVENT_DIRECTORY_FETCH_SUCCESS" | "EXPERIMENTS_FETCH" | "EXPERIMENTS_FETCH_FAILURE" | "EXPERIMENTS_FETCH_SUCCESS" | "EXPERIMENT_OVERRIDE_BUCKET" | "EXPERIMENT_REGISTER_LEGACY" | "EXPERIMENT_TRIGGER" | "FETCH_AUTH_SESSIONS_SUCCESS" | "FETCH_GUILD_EVENTS_FOR_GUILD" | "FINGERPRINT" | "FORCE_INVISIBLE" | "FORGOT_PASSWORD_REQUEST" | "FORGOT_PASSWORD_SENT" | "FORUM_SEARCH_CLEAR" | "FORUM_SEARCH_FAILURE" | "FORUM_SEARCH_QUERY_UPDATED" | "FORUM_SEARCH_START" | "FORUM_SEARCH_SUCCESS" | "FORUM_UNREADS" | "FRIENDS_SET_INITIAL_SECTION" | "FRIENDS_SET_SECTION" | "FRIEND_INVITES_FETCH_REQUEST" | "FRIEND_INVITES_FETCH_RESPONSE" | "FRIEND_INVITE_CREATE_FAILURE" | "FRIEND_INVITE_CREATE_REQUEST" | "FRIEND_INVITE_CREATE_SUCCESS" | "FRIEND_INVITE_REVOKE_REQUEST" | "FRIEND_INVITE_REVOKE_SUCCESS" | "FRIEND_SUGGESTION_CREATE" | "FRIEND_SUGGESTION_DELETE" | "GAMES_DATABASE_FETCH" | "GAMES_DATABASE_FETCH_FAIL" | "GAMES_DATABASE_UPDATE" | "GAME_CLOUD_SYNC_COMPLETE" | "GAME_CLOUD_SYNC_CONFLICT" | "GAME_CLOUD_SYNC_ERROR" | "GAME_CLOUD_SYNC_START" | "GAME_CLOUD_SYNC_UPDATE" | "GAME_CONSOLE_FETCH_DEVICES_FAIL" | "GAME_CONSOLE_FETCH_DEVICES_START" | "GAME_CONSOLE_FETCH_DEVICES_SUCCESS" | "GAME_ICON_UPDATE" | "GAME_LAUNCHABLE_UPDATE" | "GAME_LAUNCH_FAIL" | "GAME_LAUNCH_START" | "GAME_LAUNCH_SUCCESS" | "GENERIC_PUSH_NOTIFICATION_SENT" | "GIFT_CODES_FETCH" | "GIFT_CODES_FETCH_FAILURE" | "GIFT_CODES_FETCH_SUCCESS" | "GIFT_CODE_CREATE" | "GIFT_CODE_CREATE_SUCCESS" | "GIFT_CODE_REDEEM" | "GIFT_CODE_REDEEM_FAILURE" | "GIFT_CODE_REDEEM_SUCCESS" | "GIFT_CODE_RESOLVE" | "GIFT_CODE_RESOLVE_FAILURE" | "GIFT_CODE_RESOLVE_SUCCESS" | "GIFT_CODE_REVOKE_SUCCESS" | "GIFT_CODE_UPDATE" | "GIF_PICKER_INITIALIZE" | "GIF_PICKER_QUERY" | "GIF_PICKER_QUERY_FAILURE" | "GIF_PICKER_QUERY_SUCCESS" | "GIF_PICKER_SUGGESTIONS_SUCCESS" | "GIF_PICKER_TRENDING_FETCH_SUCCESS" | "GIF_PICKER_TRENDING_SEARCH_TERMS_SUCCESS" | "GUILD_ACK" | "GUILD_ANALYTICS_ENGAGEMENT_OVERVIEW_FETCH_FAILURE" | "GUILD_ANALYTICS_ENGAGEMENT_OVERVIEW_FETCH_SUCCESS" | "GUILD_ANALYTICS_GROWTH_ACTIVATION_OVERVIEW_FETCH_FAILURE" | "GUILD_ANALYTICS_GROWTH_ACTIVATION_OVERVIEW_FETCH_SUCCESS" | "GUILD_ANALYTICS_GROWTH_ACTIVATION_RETENTION_FETCH_FAILURE" | "GUILD_ANALYTICS_GROWTH_ACTIVATION_RETENTION_FETCH_SUCCESS" | "GUILD_ANALYTICS_MEMBER_INSIGHTS_FETCH_SUCCESS" | "GUILD_APPLICATIONS_FETCH_SUCCESS" | "GUILD_APPLICATION_COMMAND_INDEX_UPDATE" | "GUILD_APPLIED_BOOSTS_FETCH_SUCCESS" | "GUILD_APPLY_BOOST_FAIL" | "GUILD_APPLY_BOOST_START" | "GUILD_APPLY_BOOST_SUCCESS" | "GUILD_BAN_ADD" | "GUILD_BAN_REMOVE" | "GUILD_BOOST_SLOTS_FETCH_SUCCESS" | "GUILD_BOOST_SLOT_CREATE" | "GUILD_BOOST_SLOT_UPDATE" | "GUILD_BOOST_SLOT_UPDATE_SUCCESS" | "GUILD_CREATE" | "GUILD_DELETE" | "GUILD_DIRECTORY_ADMIN_ENTRIES_FETCH_SUCCESS" | "GUILD_DIRECTORY_CACHED_SEARCH" | "GUILD_DIRECTORY_CATEGORY_SELECT" | "GUILD_DIRECTORY_COUNTS_FETCH_SUCCESS" | "GUILD_DIRECTORY_ENTRY_CREATE" | "GUILD_DIRECTORY_ENTRY_DELETE" | "GUILD_DIRECTORY_ENTRY_UPDATE" | "GUILD_DIRECTORY_FETCH_FAILURE" | "GUILD_DIRECTORY_FETCH_START" | "GUILD_DIRECTORY_FETCH_SUCCESS" | "GUILD_DIRECTORY_SEARCH_CLEAR" | "GUILD_DIRECTORY_SEARCH_FAILURE" | "GUILD_DIRECTORY_SEARCH_START" | "GUILD_DIRECTORY_SEARCH_SUCCESS" | "GUILD_DISCOVERY_CATEGORY_ADD" | "GUILD_DISCOVERY_CATEGORY_DELETE" | "GUILD_DISCOVERY_CATEGORY_FETCH_SUCCESS" | "GUILD_DISCOVERY_CATEGORY_UPDATE_FAIL" | "GUILD_DISCOVERY_CLEAR_SEARCH" | "GUILD_DISCOVERY_CLEAR_SEEN_GUILDS" | "GUILD_DISCOVERY_FETCH_FAILURE" | "GUILD_DISCOVERY_FETCH_START" | "GUILD_DISCOVERY_FETCH_SUCCESS" | "GUILD_DISCOVERY_GUILD_SEEN" | "GUILD_DISCOVERY_METADATA_FETCH_FAIL" | "GUILD_DISCOVERY_POPULAR_FETCH_FAILURE" | "GUILD_DISCOVERY_POPULAR_FETCH_START" | "GUILD_DISCOVERY_POPULAR_FETCH_SUCCESS" | "GUILD_DISCOVERY_SEARCH_COUNTS_FAIL" | "GUILD_DISCOVERY_SEARCH_FETCH_FAILURE" | "GUILD_DISCOVERY_SEARCH_FETCH_START" | "GUILD_DISCOVERY_SEARCH_FETCH_SUCCESS" | "GUILD_DISCOVERY_SEARCH_INIT" | "GUILD_DISCOVERY_SEARCH_UPDATE_COUNTS" | "GUILD_DISCOVERY_SELECT_CATEGORY" | "GUILD_DISCOVERY_SLUG_FETCH_SUCCESS" | "GUILD_EMOJIS_UPDATE" | "GUILD_FEATURE_ACK" | "GUILD_FEED_FEATURED_ITEMS_FETCH_FAILURE" | "GUILD_FEED_FEATURED_ITEMS_FETCH_SUCCESS" | "GUILD_FEED_FEATURE_ITEM" | "GUILD_FEED_FETCH_FAILURE" | "GUILD_FEED_FETCH_FRESH_START" | "GUILD_FEED_FETCH_PAGE_START" | "GUILD_FEED_FETCH_SUCCESS" | "GUILD_FEED_ITEM_HIDE" | "GUILD_FEED_ITEM_READ_ACK" | "GUILD_FEED_ITEM_REMOVE" | "GUILD_FEED_ITEM_UNHIDE" | "GUILD_FEED_UNFEATURE_ITEM" | "GUILD_FOLDER_COLLAPSE" | "GUILD_HOME_ENSURE_HOME_SESSION" | "GUILD_HOME_SET_SCROLL_POSITION" | "GUILD_HOME_SET_SOURCE" | "GUILD_IDENTITY_SETTINGS_CLEAR_ERRORS" | "GUILD_IDENTITY_SETTINGS_CLOSE" | "GUILD_IDENTITY_SETTINGS_INIT" | "GUILD_IDENTITY_SETTINGS_RESET_ALL_PENDING" | "GUILD_IDENTITY_SETTINGS_RESET_AND_CLOSE_FORM" | "GUILD_IDENTITY_SETTINGS_RESET_PENDING_MEMBER_CHANGES" | "GUILD_IDENTITY_SETTINGS_RESET_PENDING_PROFILE_CHANGES" | "GUILD_IDENTITY_SETTINGS_SET_DISABLE_SUBMIT" | "GUILD_IDENTITY_SETTINGS_SET_GUILD" | "GUILD_IDENTITY_SETTINGS_SET_PENDING_AVATAR" | "GUILD_IDENTITY_SETTINGS_SET_PENDING_BANNER" | "GUILD_IDENTITY_SETTINGS_SET_PENDING_BIO" | "GUILD_IDENTITY_SETTINGS_SET_PENDING_NICKNAME" | "GUILD_IDENTITY_SETTINGS_SET_PENDING_PRONOUNS" | "GUILD_IDENTITY_SETTINGS_SET_PENDING_THEME_COLORS" | "GUILD_IDENTITY_SETTINGS_SUBMIT" | "GUILD_IDENTITY_SETTINGS_SUBMIT_FAILURE" | "GUILD_IDENTITY_SETTINGS_SUBMIT_SUCCESS" | "GUILD_INTEGRATIONS_UPDATE" | "GUILD_JOIN" | "GUILD_JOIN_REQUESTS_BULK_ACTION" | "GUILD_JOIN_REQUESTS_FETCH_FAILURE" | "GUILD_JOIN_REQUESTS_FETCH_START" | "GUILD_JOIN_REQUESTS_FETCH_SUCCESS" | "GUILD_JOIN_REQUESTS_SET_APPLICATION_STATUS" | "GUILD_JOIN_REQUESTS_SET_SELECTED" | "GUILD_JOIN_REQUESTS_SET_SORT_ORDER" | "GUILD_JOIN_REQUEST_CREATE" | "GUILD_JOIN_REQUEST_DELETE" | "GUILD_JOIN_REQUEST_UPDATE" | "GUILD_MEMBERS_CHUNK" | "GUILD_MEMBERS_REQUEST" | "GUILD_MEMBER_ADD" | "GUILD_MEMBER_LIST_UPDATE" | "GUILD_MEMBER_PROFILE_UPDATE" | "GUILD_MEMBER_REMOVE" | "GUILD_MEMBER_UPDATE" | "GUILD_MEMBER_UPDATE_LOCAL" | "GUILD_MOVE" | "GUILD_MOVE_BY_ID" | "GUILD_NSFW_AGREE" | "GUILD_ONBOARDING_COMPLETE" | "GUILD_ONBOARDING_PROMPTS_FETCH_FAILURE" | "GUILD_ONBOARDING_PROMPTS_FETCH_START" | "GUILD_ONBOARDING_PROMPTS_FETCH_SUCCESS" | "GUILD_ONBOARDING_PROMPTS_LOCAL_UPDATE" | "GUILD_ONBOARDING_SELECT_OPTION" | "GUILD_ONBOARDING_SET_STEP" | "GUILD_ONBOARDING_START" | "GUILD_ONBOARDING_UPDATE_RESPONSES_SUCCESS" | "GUILD_POPOUT_FETCH_FAILURE" | "GUILD_POPOUT_FETCH_START" | "GUILD_POPOUT_FETCH_SUCCESS" | "GUILD_PROGRESS_COMPLETED_SEEN" | "GUILD_PROGRESS_DISMISS" | "GUILD_PROGRESS_INITIALIZE" | "GUILD_PROMPT_VIEWED" | "GUILD_RECOMMENDATION_FETCH" | "GUILD_RECOMMENDATION_FETCH_FAILURE" | "GUILD_RECOMMENDATION_FETCH_SUCCESS" | "GUILD_ROLE_CONNECTIONS_CONFIGURATIONS_FETCH_SUCCESS" | "GUILD_ROLE_CONNECTION_ELIGIBILITY_FETCH_SUCCESS" | "GUILD_ROLE_CREATE" | "GUILD_ROLE_DELETE" | "GUILD_ROLE_MEMBER_ADD" | "GUILD_ROLE_MEMBER_BULK_ADD" | "GUILD_ROLE_MEMBER_COUNT_FETCH_SUCCESS" | "GUILD_ROLE_MEMBER_COUNT_UPDATE" | "GUILD_ROLE_MEMBER_REMOVE" | "GUILD_ROLE_SUBSCRIPTIONS_CREATE_LISTING" | "GUILD_ROLE_SUBSCRIPTIONS_DELETE_GROUP_LISTING" | "GUILD_ROLE_SUBSCRIPTIONS_DELETE_LISTING" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_LISTINGS" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_LISTINGS_FAILURE" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_LISTINGS_SUCCESS" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_LISTING_FOR_PLAN" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_LISTING_FOR_PLAN_SUCCESS" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_RESTRICTIONS" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_RESTRICTIONS_ABORTED" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_RESTRICTIONS_FAILURE" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_RESTRICTIONS_SUCCESS" | "GUILD_ROLE_SUBSCRIPTIONS_UPDATE_GROUP_LISTING" | "GUILD_ROLE_SUBSCRIPTIONS_UPDATE_LISTING" | "GUILD_ROLE_SUBSCRIPTIONS_UPDATE_SUBSCRIPTIONS_SETTINGS" | "GUILD_ROLE_SUBSCRIPTIONS_UPDATE_SUBSCRIPTION_TRIAL" | "GUILD_ROLE_UPDATE" | "GUILD_SCHEDULED_EVENT_CREATE" | "GUILD_SCHEDULED_EVENT_DELETE" | "GUILD_SCHEDULED_EVENT_RSVPS_FETCH_SUCESS" | "GUILD_SCHEDULED_EVENT_UPDATE" | "GUILD_SCHEDULED_EVENT_USERS_FETCH_SUCCESS" | "GUILD_SCHEDULED_EVENT_USER_ADD" | "GUILD_SCHEDULED_EVENT_USER_REMOVE" | "GUILD_SETTINGS_CANCEL_CHANGES" | "GUILD_SETTINGS_CLOSE" | "GUILD_SETTINGS_DEFAULT_CHANNELS_RESET" | "GUILD_SETTINGS_DEFAULT_CHANNELS_SAVE_FAILED" | "GUILD_SETTINGS_DEFAULT_CHANNELS_SAVE_SUCCESS" | "GUILD_SETTINGS_DEFAULT_CHANNELS_SUBMIT" | "GUILD_SETTINGS_DEFAULT_CHANNELS_TOGGLE" | "GUILD_SETTINGS_INIT" | "GUILD_SETTINGS_LOADED_BANS" | "GUILD_SETTINGS_LOADED_INTEGRATIONS" | "GUILD_SETTINGS_LOADED_INTEGRATIONS_WITH_COMMANDS" | "GUILD_SETTINGS_LOADED_INVITES" | "GUILD_SETTINGS_ONBOARDING_EDUCATION_UPSELL_DISMISSED" | "GUILD_SETTINGS_ONBOARDING_PROMPTS_EDIT" | "GUILD_SETTINGS_ONBOARDING_PROMPTS_ERRORS" | "GUILD_SETTINGS_ONBOARDING_PROMPTS_RESET" | "GUILD_SETTINGS_ONBOARDING_PROMPTS_SAVE_FAILED" | "GUILD_SETTINGS_ONBOARDING_PROMPTS_SAVE_SUCCESS" | "GUILD_SETTINGS_ONBOARDING_PROMPTS_SUBMIT" | "GUILD_SETTINGS_ONBOARDING_STEP" | "GUILD_SETTINGS_OPEN" | "GUILD_SETTINGS_ROLES_CLEAR_PERMISSIONS" | "GUILD_SETTINGS_ROLES_EDIT_SECTION_UPDATE" | "GUILD_SETTINGS_ROLES_INIT" | "GUILD_SETTINGS_ROLES_SAVE_FAIL" | "GUILD_SETTINGS_ROLES_SAVE_SUCCESS" | "GUILD_SETTINGS_ROLES_SORT_UPDATE" | "GUILD_SETTINGS_ROLES_SUBMITTING" | "GUILD_SETTINGS_ROLES_UPDATE_COLOR" | "GUILD_SETTINGS_ROLES_UPDATE_DESCRIPTION" | "GUILD_SETTINGS_ROLES_UPDATE_NAME" | "GUILD_SETTINGS_ROLES_UPDATE_PERMISSIONS" | "GUILD_SETTINGS_ROLES_UPDATE_PERMISSION_SET" | "GUILD_SETTINGS_ROLES_UPDATE_ROLE_CONNECTION_CONFIGURATIONS" | "GUILD_SETTINGS_ROLES_UPDATE_ROLE_ICON" | "GUILD_SETTINGS_ROLES_UPDATE_SETTINGS" | "GUILD_SETTINGS_ROLE_SELECT" | "GUILD_SETTINGS_SAVE_ROUTE_STACK" | "GUILD_SETTINGS_SET_MFA_SUCCESS" | "GUILD_SETTINGS_SET_SEARCH_QUERY" | "GUILD_SETTINGS_SET_SECTION" | "GUILD_SETTINGS_SET_VANITY_URL" | "GUILD_SETTINGS_SET_WIDGET" | "GUILD_SETTINGS_SUBMIT" | "GUILD_SETTINGS_SUBMIT_FAILURE" | "GUILD_SETTINGS_SUBMIT_SUCCESS" | "GUILD_SETTINGS_UPDATE" | "GUILD_SETTINGS_VANITY_URL_CLOSE" | "GUILD_SETTINGS_VANITY_URL_ERROR" | "GUILD_SETTINGS_VANITY_URL_RESET" | "GUILD_SETTINGS_VANITY_URL_SET" | "GUILD_SOUNDBOARD_DELETE_SUCCESS" | "GUILD_SOUNDBOARD_FETCH" | "GUILD_SOUNDBOARD_FETCH_FAILURE" | "GUILD_SOUNDBOARD_FETCH_SUCCESS" | "GUILD_SOUNDBOARD_SOUND_PLAY_END" | "GUILD_SOUNDBOARD_SOUND_PLAY_START" | "GUILD_SOUNDBOARD_UPDATE_SUCCESS" | "GUILD_SOUNDBOARD_UPLOAD_SUCCESS" | "GUILD_STICKERS_CREATE_SUCCESS" | "GUILD_STICKERS_FETCH_SUCCESS" | "GUILD_STICKERS_UPDATE" | "GUILD_STOP_LURKING" | "GUILD_STOP_LURKING_FAILURE" | "GUILD_SUBSCRIPTIONS" | "GUILD_SUBSCRIPTIONS_CHANNEL" | "GUILD_SUBSCRIPTIONS_FLUSH" | "GUILD_SUBSCRIPTIONS_MEMBERS_ADD" | "GUILD_SUBSCRIPTIONS_MEMBERS_REMOVE" | "GUILD_TEMPLATE_ACCEPT" | "GUILD_TEMPLATE_ACCEPT_FAILURE" | "GUILD_TEMPLATE_ACCEPT_SUCCESS" | "GUILD_TEMPLATE_CREATE_SUCCESS" | "GUILD_TEMPLATE_DELETE_SUCCESS" | "GUILD_TEMPLATE_DIRTY_TOOLTIP_HIDE" | "GUILD_TEMPLATE_DIRTY_TOOLTIP_REFRESH" | "GUILD_TEMPLATE_LOAD_FOR_GUILD_SUCCESS" | "GUILD_TEMPLATE_MODAL_HIDE" | "GUILD_TEMPLATE_MODAL_SHOW" | "GUILD_TEMPLATE_PROMOTION_TOOLTIP_HIDE" | "GUILD_TEMPLATE_RESOLVE" | "GUILD_TEMPLATE_RESOLVE_FAILURE" | "GUILD_TEMPLATE_RESOLVE_SUCCESS" | "GUILD_TEMPLATE_SYNC_SUCCESS" | "GUILD_TOGGLE_COLLAPSE_MUTED" | "GUILD_TOP_READ_CHANNELS_FETCH_SUCCESS" | "GUILD_UNAPPLY_BOOST_FAIL" | "GUILD_UNAPPLY_BOOST_START" | "GUILD_UNAPPLY_BOOST_SUCCESS" | "GUILD_UNAVAILABLE" | "GUILD_UNREADS_SET_LAST_CLEARED" | "GUILD_UPDATE" | "GUILD_UPDATE_DISCOVERY_METADATA" | "GUILD_UPDATE_DISCOVERY_METADATA_FAIL" | "GUILD_UPDATE_DISCOVERY_METADATA_FROM_SERVER" | "GUILD_VERIFICATION_CHECK" | "HIDE_ACTION_SHEET" | "HIDE_ACTION_SHEET_QUICK_SWITCHER" | "HIDE_KEYBOARD_SHORTCUTS" | "HIDE_SPAM_MESSAGES_FOR_USER" | "HOTSPOT_HIDE" | "HOTSPOT_OVERRIDE_CLEAR" | "HOTSPOT_OVERRIDE_SET" | "HYPESQUAD_ONLINE_MEMBERSHIP_JOIN_SUCCESS" | "HYPESQUAD_ONLINE_MEMBERSHIP_LEAVE_SUCCESS" | "I18N_LOAD_ERROR" | "I18N_LOAD_START" | "I18N_LOAD_SUCCESS" | "IDLE" | "IMPERSONATE_STOP" | "IMPERSONATE_UPDATE" | "INBOX_OPEN" | "INCOMING_CALL_MOVE" | "INSTALLATION_LOCATION_ADD" | "INSTALLATION_LOCATION_FETCH_METADATA" | "INSTALLATION_LOCATION_REMOVE" | "INSTALLATION_LOCATION_UPDATE" | "INSTANT_INVITE_CREATE" | "INSTANT_INVITE_CREATE_FAILURE" | "INSTANT_INVITE_CREATE_SUCCESS" | "INSTANT_INVITE_REVOKE_SUCCESS" | "INTEGRATION_PERMISSION_SETTINGS_APPLICATION_PERMISSIONS_FETCH_FAILURE" | "INTEGRATION_PERMISSION_SETTINGS_CLEAR" | "INTEGRATION_PERMISSION_SETTINGS_COMMANDS_FETCH_FAILURE" | "INTEGRATION_PERMISSION_SETTINGS_COMMANDS_FETCH_SUCCESS" | "INTEGRATION_PERMISSION_SETTINGS_COMMAND_UPDATE" | "INTEGRATION_PERMISSION_SETTINGS_EDIT" | "INTEGRATION_PERMISSION_SETTINGS_INIT" | "INTEGRATION_PERMISSION_SETTINGS_RESET" | "INTEGRATION_QUERY" | "INTEGRATION_QUERY_FAILURE" | "INTEGRATION_QUERY_SUCCESS" | "INTEGRATION_SETTINGS_INIT" | "INTEGRATION_SETTINGS_SAVE_FAILURE" | "INTEGRATION_SETTINGS_SAVE_SUCCESS" | "INTEGRATION_SETTINGS_SET_SECTION" | "INTEGRATION_SETTINGS_START_EDITING_COMMAND" | "INTEGRATION_SETTINGS_START_EDITING_INTEGRATION" | "INTEGRATION_SETTINGS_START_EDITING_WEBHOOK" | "INTEGRATION_SETTINGS_STOP_EDITING_COMMAND" | "INTEGRATION_SETTINGS_STOP_EDITING_INTEGRATION" | "INTEGRATION_SETTINGS_STOP_EDITING_WEBHOOK" | "INTEGRATION_SETTINGS_SUBMITTING" | "INTEGRATION_SETTINGS_UPDATE_INTEGRATION" | "INTEGRATION_SETTINGS_UPDATE_WEBHOOK" | "INTERACTION_CREATE" | "INTERACTION_FAILURE" | "INTERACTION_MODAL_CREATE" | "INTERACTION_QUEUE" | "INTERACTION_SUCCESS" | "INVITE_ACCEPT" | "INVITE_ACCEPT_FAILURE" | "INVITE_ACCEPT_SUCCESS" | "INVITE_APP_NOT_OPENED" | "INVITE_APP_OPENED" | "INVITE_APP_OPENING" | "INVITE_MODAL_CLOSE" | "INVITE_MODAL_ERROR" | "INVITE_MODAL_OPEN" | "INVITE_RESOLVE" | "INVITE_RESOLVE_FAILURE" | "INVITE_RESOLVE_SUCCESS" | "KEYBINDS_ADD_KEYBIND" | "KEYBINDS_DELETE_KEYBIND" | "KEYBINDS_ENABLE_ALL_KEYBINDS" | "KEYBINDS_REGISTER_GLOBAL_KEYBIND_ACTIONS" | "KEYBINDS_SET_KEYBIND" | "KEYBOARD_NAVIGATION_EXPLAINER_MODAL_SEEN" | "LAYER_POP" | "LAYER_POP_ALL" | "LAYER_PUSH" | "LAYOUT_CREATE" | "LAYOUT_CREATE_WIDGETS" | "LAYOUT_DELETE_ALL_WIDGETS" | "LAYOUT_DELETE_WIDGET" | "LAYOUT_SET_PINNED" | "LAYOUT_SET_TOP_WIDGET" | "LAYOUT_UPDATE_WIDGET" | "LIBRARY_APPLICATIONS_TEST_MODE_ENABLED" | "LIBRARY_APPLICATION_ACTIVE_BRANCH_UPDATE" | "LIBRARY_APPLICATION_ACTIVE_LAUNCH_OPTION_UPDATE" | "LIBRARY_APPLICATION_FILTER_UPDATE" | "LIBRARY_APPLICATION_FLAGS_UPDATE_START" | "LIBRARY_APPLICATION_FLAGS_UPDATE_SUCCESS" | "LIBRARY_APPLICATION_UPDATE" | "LIBRARY_FETCH_SUCCESS" | "LIBRARY_TABLE_ACTIVE_ROW_ID_UPDATE" | "LIBRARY_TABLE_SORT_UPDATE" | "LIVE_CHANNEL_NOTICE_HIDE" | "LOAD_ARCHIVED_THREADS" | "LOAD_ARCHIVED_THREADS_FAIL" | "LOAD_ARCHIVED_THREADS_SUCCESS" | "LOAD_FORUM_POSTS" | "LOAD_FRIEND_SUGGESTIONS_FAILURE" | "LOAD_FRIEND_SUGGESTIONS_SUCCESS" | "LOAD_GUILD_AFFINITIES_SUCCESS" | "LOAD_MESSAGES" | "LOAD_MESSAGES_AROUND_SUCCESS" | "LOAD_MESSAGES_FAILURE" | "LOAD_MESSAGES_SUCCESS" | "LOAD_MESSAGES_SUCCESS_CACHED" | "LOAD_MESSAGE_INTERACTION_DATA_SUCCESS" | "LOAD_MESSAGE_REQUESTS_SUPPLEMENTAL_DATA_ERROR" | "LOAD_MESSAGE_REQUESTS_SUPPLEMENTAL_DATA_SUCCESS" | "LOAD_NOTIFICATION_CENTER_ITEMS" | "LOAD_NOTIFICATION_CENTER_ITEMS_FAILURE" | "LOAD_NOTIFICATION_CENTER_ITEMS_SUCCESS" | "LOAD_PINNED_MESSAGES" | "LOAD_PINNED_MESSAGES_FAILURE" | "LOAD_PINNED_MESSAGES_SUCCESS" | "LOAD_RECENT_MENTIONS" | "LOAD_RECENT_MENTIONS_FAILURE" | "LOAD_RECENT_MENTIONS_SUCCESS" | "LOAD_REGIONS" | "LOAD_RELATIONSHIPS_FAILURE" | "LOAD_RELATIONSHIPS_SUCCESS" | "LOAD_THREADS_SUCCESS" | "LOAD_USER_AFFINITIES" | "LOAD_USER_AFFINITIES_FAILURE" | "LOAD_USER_AFFINITIES_SUCCESS" | "LOBBY_CONNECT" | "LOBBY_CREATE" | "LOBBY_DELETE" | "LOBBY_DISCONNECT" | "LOBBY_MEMBER_CONNECT" | "LOBBY_MEMBER_DISCONNECT" | "LOBBY_MEMBER_UPDATE" | "LOBBY_MESSAGE" | "LOBBY_UPDATE" | "LOBBY_VOICE_CONNECT" | "LOBBY_VOICE_DISCONNECT" | "LOBBY_VOICE_SERVER_UPDATE" | "LOBBY_VOICE_STATE_UPDATE" | "LOCAL_ACTIVITY_UPDATE" | "LOGIN" | "LOGIN_ACCOUNT_DISABLED" | "LOGIN_ACCOUNT_SCHEDULED_FOR_DELETION" | "LOGIN_ATTEMPTED" | "LOGIN_FAILURE" | "LOGIN_MFA" | "LOGIN_MFA_FAILURE" | "LOGIN_MFA_SMS" | "LOGIN_MFA_SMS_FAILURE" | "LOGIN_MFA_SMS_REQUEST_SUCCESS" | "LOGIN_MFA_STEP" | "LOGIN_MFA_WEBAUTHN" | "LOGIN_MFA_WEBAUTHN_TO_TOTP" | "LOGIN_PASSWORD_RECOVERY_PHONE_VERIFICATION" | "LOGIN_PHONE_IP_AUTHORIZATION_REQUIRED" | "LOGIN_RESET" | "LOGIN_STATUS_RESET" | "LOGIN_SUCCESS" | "LOGOUT" | "LOGOUT_AUTH_SESSIONS_SUCCESS" | "MASKED_LINK_ADD_TRUSTED_DOMAIN" | "MASKED_LINK_ADD_TRUSTED_PROTOCOL" | "MAX_MEMBER_COUNT_NOTICE_DISMISS" | "MEDIA_ENGINE_APPLY_MEDIA_FILTER_SETTINGS" | "MEDIA_ENGINE_APPLY_MEDIA_FILTER_SETTINGS_ERROR" | "MEDIA_ENGINE_APPLY_MEDIA_FILTER_SETTINGS_START" | "MEDIA_ENGINE_DEVICES" | "MEDIA_ENGINE_ENABLE_SOUNDSHARE" | "MEDIA_ENGINE_INTERACTION_REQUIRED" | "MEDIA_ENGINE_NOISE_CANCELLATION_ERROR_RESET" | "MEDIA_ENGINE_PERMISSION" | "MEDIA_ENGINE_SET_AEC_DUMP" | "MEDIA_ENGINE_SET_AUDIO_ENABLED" | "MEDIA_ENGINE_SET_AV1" | "MEDIA_ENGINE_SET_DESKTOP_SOURCE" | "MEDIA_ENGINE_SET_EXPERIMENTAL_ENCODERS" | "MEDIA_ENGINE_SET_EXPERIMENTAL_SOUNDSHARE" | "MEDIA_ENGINE_SET_HARDWARE_H264" | "MEDIA_ENGINE_SET_OPEN_H264" | "MEDIA_ENGINE_SET_VIDEO_DEVICE" | "MEDIA_ENGINE_SET_VIDEO_ENABLED" | "MEDIA_ENGINE_SET_VIDEO_HOOK" | "MEDIA_ENGINE_SOUNDSHARE_FAILED" | "MEDIA_ENGINE_SOUNDSHARE_TRANSMITTING" | "MEDIA_ENGINE_VIDEO_SOURCE_QUALITY_CHANGED" | "MEDIA_ENGINE_VIDEO_STATE_CHANGED" | "MEMBER_VERIFICATION_FORM_FETCH_FAIL" | "MEMBER_VERIFICATION_FORM_UPDATE" | "MENTION_MODAL_CLOSE" | "MENTION_MODAL_OPEN" | "MESSAGE_ACK" | "MESSAGE_CREATE" | "MESSAGE_DELETE" | "MESSAGE_DELETE_BULK" | "MESSAGE_EDIT_FAILED_AUTOMOD" | "MESSAGE_END_EDIT" | "MESSAGE_LENGTH_UPSELL" | "MESSAGE_REACTION_ADD" | "MESSAGE_REACTION_ADD_USERS" | "MESSAGE_REACTION_REMOVE" | "MESSAGE_REACTION_REMOVE_ALL" | "MESSAGE_REACTION_REMOVE_EMOJI" | "MESSAGE_REQUEST_ACCEPT_OPTIMISTIC" | "MESSAGE_REVEAL" | "MESSAGE_SEND_FAILED" | "MESSAGE_SEND_FAILED_AUTOMOD" | "MESSAGE_START_EDIT" | "MESSAGE_TODO_ADD" | "MESSAGE_TODO_CLEANUP" | "MESSAGE_TODO_COMPLETE" | "MESSAGE_UPDATE" | "MESSAGE_UPDATE_EDIT" | "MFA_CLEAR_BACKUP_CODES" | "MFA_DISABLE_SUCCESS" | "MFA_ENABLE_SUCCESS" | "MFA_SEND_VERIFICATION_KEY" | "MFA_SMS_TOGGLE" | "MFA_SMS_TOGGLE_COMPLETE" | "MFA_VIEW_BACKUP_CODES" | "MFA_WEBAUTHN_CREDENTIALS_LOADED" | "MFA_WEBAUTHN_CREDENTIALS_LOADING" | "MFA_WEBAUTHN_CREDENTIAL_CREATE" | "MFA_WEBAUTHN_CREDENTIAL_DELETE" | "MOBILE_WEB_SIDEBAR_CLOSE" | "MOBILE_WEB_SIDEBAR_OPEN" | "MODAL_POP" | "MODAL_PUSH" | "MULTI_ACCOUNT_INVALIDATE_PUSH_SYNC_TOKENS" | "MULTI_ACCOUNT_MOBILE_EXPERIMENT_UPDATE" | "MULTI_ACCOUNT_MOVE_ACCOUNT" | "MULTI_ACCOUNT_REMOVE_ACCOUNT" | "MULTI_ACCOUNT_UPDATE_PUSH_SYNC_TOKEN" | "MULTI_ACCOUNT_VALIDATE_TOKEN_FAILURE" | "MULTI_ACCOUNT_VALIDATE_TOKEN_REQUEST" | "MULTI_ACCOUNT_VALIDATE_TOKEN_SUCCESS" | "MUTUAL_FRIENDS_FETCH_FAILURE" | "MUTUAL_FRIENDS_FETCH_START" | "MUTUAL_FRIENDS_FETCH_SUCCESS" | "NEWLY_ADDED_EMOJI_SEEN_ACKNOWLEDGED" | "NEWLY_ADDED_EMOJI_SEEN_PENDING" | "NEWLY_ADDED_EMOJI_SEEN_UPDATED" | "NEW_PAYMENT_SOURCE_ADDRESS_INFO_UPDATE" | "NEW_PAYMENT_SOURCE_CARD_INFO_UPDATE" | "NEW_PAYMENT_SOURCE_CLEAR_ERROR" | "NEW_PAYMENT_SOURCE_STRIPE_PAYMENT_REQUEST_UPDATE" | "NITRODUCTION_PERSISTENT_ONBOARDING_TOGGLE_COLLAPSE" | "NOTICE_DISABLE" | "NOTICE_DISMISS" | "NOTICE_SHOW" | "NOTIFICATIONS_SET_DESKTOP_TYPE" | "NOTIFICATIONS_SET_DISABLED_SOUNDS" | "NOTIFICATIONS_SET_DISABLE_UNREAD_BADGE" | "NOTIFICATIONS_SET_NOTIFY_MESSAGES_IN_SELECTED_CHANNEL" | "NOTIFICATIONS_SET_PERMISSION_STATE" | "NOTIFICATIONS_SET_TASKBAR_FLASH" | "NOTIFICATIONS_SET_TTS_TYPE" | "NOTIFICATIONS_TOGGLE_ALL_DISABLED" | "NOTIFICATION_CENTER_ITEMS_ACK" | "NOTIFICATION_CENTER_ITEMS_ACK_FAILURE" | "NOTIFICATION_CENTER_ITEMS_LOCAL_ACK" | "NOTIFICATION_CENTER_ITEM_COMPLETED" | "NOTIFICATION_CENTER_ITEM_CREATE" | "NOTIFICATION_CENTER_ITEM_DELETE" | "NOTIFICATION_CENTER_ITEM_DELETE_FAILURE" | "NOTIFICATION_CENTER_SET_ACTIVE" | "NOTIFICATION_CENTER_SET_TAB" | "NOTIFICATION_CLICK" | "NOTIFICATION_CREATE" | "NOW_PLAYING_MOUNTED" | "NOW_PLAYING_UNMOUNTED" | "NUF_COMPLETE" | "NUF_NEW_USER" | "OAUTH2_TOKEN_REVOKE" | "ONLINE_GUILD_MEMBER_COUNT_UPDATE" | "OUTBOUND_PROMOTIONS_SEEN" | "OUTBOUND_PROMOTION_NOTICE_DISMISS" | "OVERLAY_ACTIVATE_REGION" | "OVERLAY_CALL_PRIVATE_CHANNEL" | "OVERLAY_CRASHED" | "OVERLAY_DEACTIVATE_ALL_REGIONS" | "OVERLAY_DISABLE_EXTERNAL_LINK_ALERT" | "OVERLAY_FOCUSED" | "OVERLAY_GAMES_CHANGE" | "OVERLAY_INCOMPATIBLE_APP" | "OVERLAY_INITIALIZE" | "OVERLAY_JOIN_GAME" | "OVERLAY_READY" | "OVERLAY_SELECT_CALL" | "OVERLAY_SELECT_CHANNEL" | "OVERLAY_SET_AVATAR_SIZE_MODE" | "OVERLAY_SET_DISPLAY_NAME_MODE" | "OVERLAY_SET_DISPLAY_USER_MODE" | "OVERLAY_SET_ENABLED" | "OVERLAY_SET_INPUT_LOCKED" | "OVERLAY_SET_NOTIFICATION_POSITION_MODE" | "OVERLAY_SET_NOT_IDLE" | "OVERLAY_SET_PREVIEW_IN_GAME_MODE" | "OVERLAY_SET_TEXT_CHAT_NOTIFICATION_MODE" | "OVERLAY_SET_TEXT_WIDGET_OPACITY" | "OVERLAY_SET_UI_LOCKED" | "OVERLAY_START_SESSION" | "PARTNER_REQUIREMENTS_FETCH_FAILURE" | "PARTNER_REQUIREMENTS_FETCH_START" | "PARTNER_REQUIREMENTS_FETCH_SUCCESS" | "PASSIVE_UPDATE_V1" | "PASSWORD_UPDATED" | "PAYMENT_AUTHENTICATION_CLEAR_ERROR" | "PAYMENT_AUTHENTICATION_ERROR" | "PAYMENT_UPDATE" | "PERMISSION_CLEAR_ELEVATED_PROCESS" | "PERMISSION_CLEAR_PTT_ADMIN_WARNING" | "PERMISSION_CLEAR_SUPPRESS_WARNING" | "PERMISSION_CLEAR_VAD_WARNING" | "PERMISSION_CONTINUE_NONELEVATED_PROCESS" | "PERMISSION_REQUEST_ELEVATED_PROCESS" | "PHONE_SET_COUNTRY_CODE" | "PICTURE_IN_PICTURE_CLOSE" | "PICTURE_IN_PICTURE_HIDE" | "PICTURE_IN_PICTURE_MOVE" | "PICTURE_IN_PICTURE_OPEN" | "PICTURE_IN_PICTURE_SHOW" | "PICTURE_IN_PICTURE_UPDATE_RECT" | "PICTURE_IN_PICTURE_UPDATE_SELECTED_WINDOW" | "POGGERMODE_ACHIEVEMENT_UNLOCK" | "POGGERMODE_SETTINGS_UPDATE" | "POGGERMODE_TEMPORARILY_DISABLED" | "POGGERMODE_UPDATE_COMBO" | "POGGERMODE_UPDATE_MESSAGE_COMBO" | "POPOUT_WINDOW_CLOSE" | "POPOUT_WINDOW_OPEN" | "POPOUT_WINDOW_SET_ALWAYS_ON_TOP" | "POST_CONNECTION_OPEN" | "PREMIUM_PAYMENT_ERROR_CLEAR" | "PREMIUM_PAYMENT_MODAL_CLOSE" | "PREMIUM_PAYMENT_MODAL_OPEN" | "PREMIUM_PAYMENT_SUBSCRIBE_FAIL" | "PREMIUM_PAYMENT_SUBSCRIBE_START" | "PREMIUM_PAYMENT_SUBSCRIBE_SUCCESS" | "PREMIUM_PAYMENT_UPDATE_FAIL" | "PREMIUM_PAYMENT_UPDATE_SUCCESS" | "PREMIUM_REQUIRED_MODAL_CLOSE" | "PREMIUM_REQUIRED_MODAL_OPEN" | "PRESENCES_REPLACE" | "PRESENCE_UPDATES" | "PRIVATE_CHANNEL_RECIPIENTS_ADD_USER" | "PRIVATE_CHANNEL_RECIPIENTS_INVITE_CLOSE" | "PRIVATE_CHANNEL_RECIPIENTS_INVITE_OPEN" | "PRIVATE_CHANNEL_RECIPIENTS_INVITE_QUERY" | "PRIVATE_CHANNEL_RECIPIENTS_INVITE_SELECT" | "PRIVATE_CHANNEL_RECIPIENTS_REMOVE_USER" | "PROFILE_CUSTOMIZATION_OPEN_PREVIEW_MODAL" | "PROFILE_PANEL_TOGGLE_SECTION" | "PUBLIC_UPSELL_NOTICE_DISMISS" | "PURCHASE_CONFIRMATION_MODAL_CLOSE" | "PURCHASE_CONFIRMATION_MODAL_OPEN" | "PUSH_NOTIFICATION_CLICK" | "QUEUE_INTERACTION_COMPONENT_STATE" | "QUICKSWITCHER_HIDE" | "QUICKSWITCHER_SEARCH" | "QUICKSWITCHER_SELECT" | "QUICKSWITCHER_SHOW" | "QUICKSWITCHER_SWITCH_TO" | "RECENT_MENTION_DELETE" | "REGISTER" | "REGISTER_FAILURE" | "REGISTER_SAVE_FORM" | "REGISTER_SUCCESS" | "RELATIONSHIP_ADD" | "RELATIONSHIP_REMOVE" | "RELATIONSHIP_UPDATE" | "REMOTE_COMMAND" | "REMOTE_SESSION_CONNECT" | "REMOTE_SESSION_DISCONNECT" | "REMOVE_AUTOMOD_MESSAGE_NOTICE" | "REQUEST_FORUM_UNREADS" | "RESET_ALL_NITRODUCTION_TOOLTIPS" | "RESET_HAS_COMPLETED_STEP" | "RESET_NOTIFICATION_CENTER" | "RESET_PAYMENT_ID" | "RESORT_THREADS" | "RPC_APP_AUTHENTICATED" | "RPC_APP_CONNECTED" | "RPC_APP_DISCONNECTED" | "RPC_NOTIFICATION_CREATE" | "RPC_SERVER_READY" | "RTC_CONNECTION_LOSS_RATE" | "RTC_CONNECTION_PING" | "RTC_CONNECTION_STATE" | "RTC_CONNECTION_UPDATE_ID" | "RTC_CONNECTION_VIDEO" | "RTC_DEBUG_MODAL_CLOSE" | "RTC_DEBUG_MODAL_OPEN" | "RTC_DEBUG_MODAL_OPEN_REPLAY" | "RTC_DEBUG_MODAL_OPEN_REPLAY_AT_PATH" | "RTC_DEBUG_MODAL_SET_SECTION" | "RTC_DEBUG_MODAL_UPDATE" | "RTC_DEBUG_MODAL_UPDATE_VIDEO_OUTPUT" | "RTC_DEBUG_POPOUT_WINDOW_OPEN" | "RTC_DEBUG_SET_RECORDING_FLAG" | "RTC_LATENCY_TEST_COMPLETE" | "RUNNING_GAMES_CHANGE" | "RUNNING_GAME_ADD_OVERRIDE" | "RUNNING_GAME_DELETE_ENTRY" | "RUNNING_GAME_EDIT_NAME" | "RUNNING_GAME_TOGGLE_OVERLAY" | "RUNNING_STREAMER_TOOLS_CHANGE" | "SAVE_LAST_NON_VOICE_ROUTE" | "SAVE_LAST_ROUTE" | "SEARCH_AUTOCOMPLETE_QUERY_UPDATE" | "SEARCH_CLEAR_HISTORY" | "SEARCH_EDITOR_STATE_CHANGE" | "SEARCH_EDITOR_STATE_CLEAR" | "SEARCH_ENSURE_SEARCH_STATE" | "SEARCH_FINISH" | "SEARCH_INDEXING" | "SEARCH_MODAL_CLOSE" | "SEARCH_MODAL_OPEN" | "SEARCH_SET_SHOW_BLOCKED_RESULTS" | "SEARCH_START" | "SELECTIVELY_SYNCED_USER_SETTINGS_UPDATE" | "SELF_PRESENCE_STORE_UPDATE" | "SESSIONS_REPLACE" | "SET_CHANNEL_BITRATE" | "SET_CHANNEL_VIDEO_QUALITY_MODE" | "SET_CONSENT_REQUIRED" | "SET_GUILD_FOLDER_EXPANDED" | "SET_HAS_COMPLETED_STEP" | "SET_INTERACTION_COMPONENT_STATE" | "SET_LOCATION_METADATA" | "SET_LOGIN_CREDENTIALS" | "SET_NATIVE_PERMISSION" | "SET_PENDING_REPLY_SHOULD_MENTION" | "SET_RECENT_MENTIONS_FILTER" | "SET_RECENT_MENTIONS_STALE" | "SET_SOUNDPACK" | "SET_TTS_SPEECH_RATE" | "SET_VAD_PERMISSION" | "SHOW_ACTION_SHEET" | "SHOW_ACTION_SHEET_QUICK_SWITCHER" | "SHOW_KEYBOARD_SHORTCUTS" | "SIDEBAR_CLOSE" | "SIDEBAR_CREATE_THREAD" | "SIDEBAR_VIEW_CHANNEL" | "SKUS_FETCH_SUCCESS" | "SKU_FETCH_FAIL" | "SKU_FETCH_START" | "SKU_FETCH_SUCCESS" | "SKU_PURCHASE_CLEAR_ERROR" | "SKU_PURCHASE_FAIL" | "SKU_PURCHASE_MODAL_CLOSE" | "SKU_PURCHASE_MODAL_OPEN" | "SKU_PURCHASE_PREVIEW_FETCH_SUCCESS" | "SKU_PURCHASE_SHOW_CONFIRMATION_STEP" | "SKU_PURCHASE_START" | "SKU_PURCHASE_SUCCESS" | "SKU_PURCHASE_UPDATE_IS_GIFT" | "SLOWMODE_RESET_COOLDOWN" | "SLOWMODE_SET_COOLDOWN" | "SOUNDBOARD_ADD_FAVORITE_SOUND" | "SOUNDBOARD_REMOVE_FAVORITE_SOUND" | "SPEAKING" | "SPEAKING_MESSAGE" | "SPEAK_MESSAGE" | "SPEAK_TEXT" | "SPELLCHECK_LEARN_WORD" | "SPELLCHECK_TOGGLE" | "SPOTIFY_ACCOUNT_ACCESS_TOKEN" | "SPOTIFY_ACCOUNT_ACCESS_TOKEN_REVOKE" | "SPOTIFY_PLAYER_PAUSE" | "SPOTIFY_PLAYER_PLAY" | "SPOTIFY_PLAYER_STATE" | "SPOTIFY_PROFILE_UPDATE" | "SPOTIFY_SET_ACTIVE_DEVICE" | "SPOTIFY_SET_DEVICES" | "SPOTIFY_SET_PROTOCOL_REGISTERED" | "STAGE_INSTANCE_CREATE" | "STAGE_INSTANCE_DELETE" | "STAGE_INSTANCE_UPDATE" | "START_SESSION" | "STATUS_PAGE_INCIDENT" | "STATUS_PAGE_SCHEDULED_MAINTENANCE" | "STATUS_PAGE_SCHEDULED_MAINTENANCE_ACK" | "STICKER_FETCH_SUCCESS" | "STICKER_PACKS_FETCH_START" | "STICKER_PACKS_FETCH_SUCCESS" | "STICKER_PACK_FETCH_SUCCESS" | "STICKER_TRACK_USAGE" | "STOP_SPEAKING" | "STORE_APPLICATION_INTERACTION_FAKE_USER" | "STORE_LISTINGS_FETCH_SUCCESS" | "STORE_LISTING_FETCH_SUCCESS" | "STREAMER_MODE_UPDATE" | "STREAMING_UPDATE" | "STREAM_CLOSE" | "STREAM_CREATE" | "STREAM_DELETE" | "STREAM_LAYOUT_UPDATE" | "STREAM_PREVIEW_FETCH_FAIL" | "STREAM_PREVIEW_FETCH_START" | "STREAM_PREVIEW_FETCH_SUCCESS" | "STREAM_SERVER_UPDATE" | "STREAM_SET_PAUSED" | "STREAM_START" | "STREAM_STATS_UPDATE" | "STREAM_STOP" | "STREAM_TIMED_OUT" | "STREAM_UPDATE" | "STREAM_UPDATE_SELF_HIDDEN" | "STREAM_UPDATE_SETTINGS" | "STREAM_WATCH" | "STRIPE_TOKEN_FAILURE" | "SUBSCRIPTION_PLANS_FETCH" | "SUBSCRIPTION_PLANS_FETCH_FAILURE" | "SUBSCRIPTION_PLANS_FETCH_SUCCESS" | "SUBSCRIPTION_PLANS_RESET" | "SURVEY_FETCHED" | "SURVEY_HIDE" | "SURVEY_OVERRIDE" | "SYSTEM_THEME_CHANGE" | "THERMAL_STATE_CHANGE" | "THREAD_CREATE" | "THREAD_CREATE_LOCAL" | "THREAD_DELETE" | "THREAD_LIST_SYNC" | "THREAD_MEMBERS_UPDATE" | "THREAD_MEMBER_LIST_UPDATE" | "THREAD_MEMBER_LOCAL_UPDATE" | "THREAD_MEMBER_UPDATE" | "THREAD_SETTINGS_DRAFT_CHANGE" | "THREAD_UPDATE" | "TOGGLE_GUILD_FOLDER_EXPAND" | "TOP_EMOJIS_FETCH" | "TOP_EMOJIS_FETCH_SUCCESS" | "TRUNCATE_MENTIONS" | "TRUNCATE_MESSAGES" | "TUTORIAL_INDICATOR_DISMISS" | "TUTORIAL_INDICATOR_HIDE" | "TUTORIAL_INDICATOR_SHOW" | "TUTORIAL_INDICATOR_SUPPRESS_ALL" | "TYPING_START" | "TYPING_START_LOCAL" | "TYPING_STOP" | "TYPING_STOP_LOCAL" | "UNSYNCED_USER_SETTINGS_UPDATE" | "UNVERIFIED_GAME_UPDATE" | "UPDATE_APP_COLORS" | "UPDATE_AVAILABLE" | "UPDATE_CHANNEL_DIMENSIONS" | "UPDATE_CHANNEL_LIST_DIMENSIONS" | "UPDATE_CONSENTS" | "UPDATE_DOWNLOADED" | "UPDATE_ERROR" | "UPDATE_GUILD_LIST_DIMENSIONS" | "UPDATE_HAS_FLOW_START_EVENT_BEEN_EMITTED" | "UPDATE_MANUALLY" | "UPDATE_NOT_AVAILABLE" | "UPDATE_TOKEN" | "UPLOAD_ATTACHMENT_ADD_FILES" | "UPLOAD_ATTACHMENT_CLEAR_ALL_FILES" | "UPLOAD_ATTACHMENT_POP_FILE" | "UPLOAD_ATTACHMENT_REMOVE_FILE" | "UPLOAD_ATTACHMENT_REMOVE_FILES" | "UPLOAD_ATTACHMENT_SET_FILE" | "UPLOAD_ATTACHMENT_SET_UPLOADS" | "UPLOAD_ATTACHMENT_UPDATE_FILE" | "UPLOAD_CANCEL_REQUEST" | "UPLOAD_COMPLETE" | "UPLOAD_COMPRESSION_PROGRESS" | "UPLOAD_FAIL" | "UPLOAD_PROGRESS" | "UPLOAD_RESTORE_FAILED_UPLOAD" | "UPLOAD_START" | "USER_ACHIEVEMENT_UPDATE" | "USER_ACTIVITY_STATISTICS_FETCH_SUCCESS" | "USER_APPLIED_BOOSTS_FETCH_SUCCESS" | "USER_AUTHORIZED_APPS_UPDATE" | "USER_CONNECTIONS_INTEGRATION_JOINING" | "USER_CONNECTIONS_UPDATE" | "USER_CONNECTION_UPDATE" | "USER_GUILD_JOIN_REQUEST_UPDATE" | "USER_GUILD_SETTINGS_CHANNEL_UPDATE" | "USER_GUILD_SETTINGS_CHANNEL_UPDATE_BULK" | "USER_GUILD_SETTINGS_FULL_UPDATE" | "USER_GUILD_SETTINGS_GUILD_AND_CHANNELS_UPDATE" | "USER_GUILD_SETTINGS_GUILD_UPDATE" | "USER_GUILD_SETTINGS_REMOVE_PENDING_CHANNEL_UPDATES" | "USER_JOIN_REQUEST_GUILDS_FETCH" | "USER_NON_CHANNEL_ACK" | "USER_NOTE_LOADED" | "USER_NOTE_LOAD_START" | "USER_NOTE_UPDATE" | "USER_PAYMENT_CLIENT_ADD" | "USER_PROFILE_ACCESSIBILITY_TOOLTIP_VIEWED" | "USER_PROFILE_FETCH_FAILURE" | "USER_PROFILE_FETCH_START" | "USER_PROFILE_FETCH_SUCCESS" | "USER_PROFILE_MODAL_CLOSE" | "USER_PROFILE_MODAL_OPEN" | "USER_PROFILE_UPDATE_SUCCESS" | "USER_REQUIRED_ACTION_UPDATE" | "USER_SETTINGS_ACCOUNT_CLOSE" | "USER_SETTINGS_ACCOUNT_INIT" | "USER_SETTINGS_ACCOUNT_RESET_AND_CLOSE_FORM" | "USER_SETTINGS_ACCOUNT_SET_DISABLE_SUBMIT" | "USER_SETTINGS_ACCOUNT_SET_PENDING_ACCENT_COLOR" | "USER_SETTINGS_ACCOUNT_SET_PENDING_AVATAR" | "USER_SETTINGS_ACCOUNT_SET_PENDING_AVATAR_DECORATION" | "USER_SETTINGS_ACCOUNT_SET_PENDING_BANNER" | "USER_SETTINGS_ACCOUNT_SET_PENDING_BIO" | "USER_SETTINGS_ACCOUNT_SET_PENDING_PRONOUNS" | "USER_SETTINGS_ACCOUNT_SET_PENDING_THEME_COLORS" | "USER_SETTINGS_ACCOUNT_SET_TRY_IT_OUT_AVATAR" | "USER_SETTINGS_ACCOUNT_SET_TRY_IT_OUT_BANNER" | "USER_SETTINGS_ACCOUNT_SET_TRY_IT_OUT_THEME_COLORS" | "USER_SETTINGS_ACCOUNT_SUBMIT" | "USER_SETTINGS_ACCOUNT_SUBMIT_FAILURE" | "USER_SETTINGS_ACCOUNT_SUBMIT_SUCCESS" | "USER_SETTINGS_CLEAR_ERRORS" | "USER_SETTINGS_LOCALE_OVERRIDE" | "USER_SETTINGS_MODAL_CLEAR_SCROLL_POSITION" | "USER_SETTINGS_MODAL_CLEAR_SUBSECTION" | "USER_SETTINGS_MODAL_CLOSE" | "USER_SETTINGS_MODAL_INIT" | "USER_SETTINGS_MODAL_OPEN" | "USER_SETTINGS_MODAL_RESET" | "USER_SETTINGS_MODAL_SET_SECTION" | "USER_SETTINGS_MODAL_SUBMIT" | "USER_SETTINGS_MODAL_SUBMIT_COMPLETE" | "USER_SETTINGS_MODAL_SUBMIT_FAILURE" | "USER_SETTINGS_MODAL_UPDATE_ACCOUNT" | "USER_SETTINGS_OVERRIDE_APPLY" | "USER_SETTINGS_OVERRIDE_CLEAR" | "USER_SETTINGS_PROTO_ENQUEUE_UPDATE" | "USER_SETTINGS_PROTO_LOAD_IF_NECESSARY" | "USER_SETTINGS_PROTO_UPDATE" | "USER_SETTINGS_PROTO_UPDATE_EDIT_INFO" | "USER_SETTINGS_RESET_ALL_PENDING" | "USER_SETTINGS_RESET_ALL_TRY_IT_OUT" | "USER_SETTINGS_RESET_PENDING_ACCOUNT_CHANGES" | "USER_SETTINGS_RESET_PENDING_PROFILE_CHANGES" | "USER_SETTINGS_THEME_OVERRIDE" | "USER_UPDATE" | "VERIFY_FAILURE" | "VERIFY_SUCCESS" | "VIDEO_FILTER_ASSETS_FETCH_SUCCESS" | "VIDEO_FILTER_ASSET_DELETE_SUCCESS" | "VIDEO_FILTER_ASSET_UPLOAD_SUCCESS" | "VIDEO_SAVE_LAST_USED_BACKGROUND_OPTION" | "VIEW_HISTORY_MARK_VIEW" | "VOICE_CATEGORY_COLLAPSE" | "VOICE_CATEGORY_EXPAND" | "VOICE_CHANNEL_EFFECT_CLEAR" | "VOICE_CHANNEL_EFFECT_RECENT_EMOJI" | "VOICE_CHANNEL_EFFECT_SEND" | "VOICE_CHANNEL_EFFECT_SENT_LOCAL" | "VOICE_CHANNEL_EFFECT_TOGGLE_ANIMATION_TYPE" | "VOICE_CHANNEL_EFFECT_UPDATE_TIME_STAMP" | "VOICE_CHANNEL_SELECT" | "VOICE_SERVER_UPDATE" | "VOICE_STATE_UPDATES" | "WAIT_FOR_REMOTE_SESSION" | "WEBHOOKS_FETCHING" | "WEBHOOKS_UPDATE" | "WEBHOOK_CREATE" | "WEBHOOK_DELETE" | "WEBHOOK_UPDATE" | "WELCOME_SCREEN_FETCH_FAIL" | "WELCOME_SCREEN_FETCH_START" | "WELCOME_SCREEN_FETCH_SUCCESS" | "WELCOME_SCREEN_SETTINGS_CLEAR" | "WELCOME_SCREEN_SETTINGS_RESET" | "WELCOME_SCREEN_SETTINGS_UPDATE" | "WELCOME_SCREEN_SUBMIT" | "WELCOME_SCREEN_SUBMIT_FAILURE" | "WELCOME_SCREEN_SUBMIT_SUCCESS" | "WELCOME_SCREEN_UPDATE" | "WELCOME_SCREEN_VIEW" | "WINDOW_FOCUS" | "WINDOW_FULLSCREEN_CHANGE" | "WINDOW_HIDDEN" | "WINDOW_INIT" | "WINDOW_RESIZED" | "WINDOW_UNLOAD";
+export type FluxEvents = "ACCESSIBILITY_COLORBLIND_TOGGLE" | "ACCESSIBILITY_DARK_SIDEBAR_TOGGLE" | "ACCESSIBILITY_DESATURATE_ROLES_TOGGLE" | "ACCESSIBILITY_FORCED_COLORS_MODAL_SEEN" | "ACCESSIBILITY_KEYBOARD_MODE_DISABLE" | "ACCESSIBILITY_KEYBOARD_MODE_ENABLE" | "ACCESSIBILITY_LOW_CONTRAST_TOGGLE" | "ACCESSIBILITY_RESET_TO_DEFAULT" | "ACCESSIBILITY_SET_ALWAYS_SHOW_LINK_DECORATIONS" | "ACCESSIBILITY_SET_CONTRAST" | "ACCESSIBILITY_SET_FONT_SIZE" | "ACCESSIBILITY_SET_MESSAGE_GROUP_SPACING" | "ACCESSIBILITY_SET_PREFERS_REDUCED_MOTION" | "ACCESSIBILITY_SET_ROLE_STYLE" | "ACCESSIBILITY_SET_SATURATION" | "ACCESSIBILITY_SET_SYNC_FORCED_COLORS" | "ACCESSIBILITY_SET_ZOOM" | "ACCESSIBILITY_SUBMIT_BUTTON_TOGGLE" | "ACCESSIBILITY_SYNC_PROFILE_THEME_WITH_USER_THEME_TOGGLE" | "ACCESSIBILITY_SYSTEM_COLOR_PREFERENCES_CHANGED" | "ACCESSIBILITY_SYSTEM_PREFERS_CONTRAST_CHANGED" | "ACCESSIBILITY_SYSTEM_PREFERS_CROSSFADES_CHANGED" | "ACCESSIBILITY_SYSTEM_PREFERS_REDUCED_MOTION_CHANGED" | "ACKNOWLEDGE_CHANNEL_SAFETY_WARNING_TOOLTIP" | "ACK_APPROVED_GUILD_JOIN_REQUEST" | "ACTIVE_BOGO_PROMOTION_FETCH" | "ACTIVE_BOGO_PROMOTION_FETCH_FAIL" | "ACTIVE_BOGO_PROMOTION_FETCH_SUCCESS" | "ACTIVE_CHANNELS_FETCH_FAILURE" | "ACTIVE_CHANNELS_FETCH_START" | "ACTIVE_CHANNELS_FETCH_SUCCESS" | "ACTIVE_OUTBOUND_PROMOTIONS_FETCH" | "ACTIVE_OUTBOUND_PROMOTIONS_FETCH_FAIL" | "ACTIVE_OUTBOUND_PROMOTIONS_FETCH_SUCCESS" | "ACTIVITIES_WHATS_NEW_ACKNOWLEDGE_SECTION" | "ACTIVITIES_WHATS_NEW_MARK_OPENED_SECTION" | "ACTIVITY_INVITE_EDUCATION_DISMISS" | "ACTIVITY_INVITE_MODAL_CLOSE" | "ACTIVITY_INVITE_MODAL_OPEN" | "ACTIVITY_JOIN" | "ACTIVITY_JOIN_FAILED" | "ACTIVITY_JOIN_LOADING" | "ACTIVITY_LAUNCH_FAIL" | "ACTIVITY_LAYOUT_MODE_UPDATE" | "ACTIVITY_METADATA_UPDATE" | "ACTIVITY_PLAY" | "ACTIVITY_SCREEN_ORIENTATION_UPDATE" | "ACTIVITY_START" | "ACTIVITY_SYNC" | "ACTIVITY_SYNC_STOP" | "ACTIVITY_UPDATE_FAIL" | "ACTIVITY_UPDATE_START" | "ACTIVITY_UPDATE_SUCCESS" | "ADD_STICKER_PREVIEW" | "ADMIN_ONBOARDING_GUIDE_HIDE" | "ADYEN_CASH_APP_PAY_SUBMIT_SUCCESS" | "ADYEN_CREATE_CASH_APP_PAY_COMPONENT_SUCCESS" | "ADYEN_CREATE_CLIENT_SUCCESS" | "ADYEN_TEARDOWN_CLIENT" | "AFK" | "AGE_GATE_FAILURE_MODAL_OPEN" | "AGE_GATE_LOGOUT_UNDERAGE_NEW_USER" | "AGE_GATE_MODAL_CLOSE" | "AGE_GATE_MODAL_OPEN" | "AGE_GATE_SUCCESS_MODAL_OPEN" | "APPLICATIONS_FETCH" | "APPLICATIONS_FETCH_FAIL" | "APPLICATIONS_FETCH_SUCCESS" | "APPLICATIONS_SHELF_FETCH_FAIL" | "APPLICATIONS_SHELF_FETCH_START" | "APPLICATIONS_SHELF_FETCH_SUCCESS" | "APPLICATION_ACTIVITY_STATISTICS_FETCH_FAIL" | "APPLICATION_ACTIVITY_STATISTICS_FETCH_START" | "APPLICATION_ACTIVITY_STATISTICS_FETCH_SUCCESS" | "APPLICATION_ASSETS_FETCH" | "APPLICATION_ASSETS_FETCH_SUCCESS" | "APPLICATION_ASSETS_UPDATE" | "APPLICATION_BRANCHES_FETCH_FAIL" | "APPLICATION_BRANCHES_FETCH_SUCCESS" | "APPLICATION_BUILD_FETCH_START" | "APPLICATION_BUILD_FETCH_SUCCESS" | "APPLICATION_BUILD_NOT_FOUND" | "APPLICATION_BUILD_SIZE_FETCH_FAIL" | "APPLICATION_BUILD_SIZE_FETCH_START" | "APPLICATION_BUILD_SIZE_FETCH_SUCCESS" | "APPLICATION_COMMAND_AUTOCOMPLETE_REQUEST" | "APPLICATION_COMMAND_AUTOCOMPLETE_RESPONSE" | "APPLICATION_COMMAND_EXECUTE_BAD_VERSION" | "APPLICATION_COMMAND_INDEX_FETCH_FAILURE" | "APPLICATION_COMMAND_INDEX_FETCH_REQUEST" | "APPLICATION_COMMAND_INDEX_FETCH_SUCCESS" | "APPLICATION_COMMAND_SET_ACTIVE_COMMAND" | "APPLICATION_COMMAND_SET_PREFERRED_COMMAND" | "APPLICATION_COMMAND_UPDATE_CHANNEL_STATE" | "APPLICATION_COMMAND_UPDATE_OPTIONS" | "APPLICATION_COMMAND_USED" | "APPLICATION_DIRECTORY_FETCH_APPLICATION" | "APPLICATION_DIRECTORY_FETCH_APPLICATION_FAILURE" | "APPLICATION_DIRECTORY_FETCH_APPLICATION_SUCCESS" | "APPLICATION_DIRECTORY_FETCH_CATEGORIES_SUCCESS" | "APPLICATION_DIRECTORY_FETCH_COLLECTIONS" | "APPLICATION_DIRECTORY_FETCH_COLLECTIONS_FAILURE" | "APPLICATION_DIRECTORY_FETCH_COLLECTIONS_SUCCESS" | "APPLICATION_DIRECTORY_FETCH_SEARCH" | "APPLICATION_DIRECTORY_FETCH_SEARCH_FAILURE" | "APPLICATION_DIRECTORY_FETCH_SEARCH_SUCCESS" | "APPLICATION_DIRECTORY_FETCH_SIMILAR_APPLICATIONS" | "APPLICATION_DIRECTORY_FETCH_SIMILAR_APPLICATIONS_FAILURE" | "APPLICATION_DIRECTORY_FETCH_SIMILAR_APPLICATIONS_SUCCESS" | "APPLICATION_FETCH" | "APPLICATION_FETCH_FAIL" | "APPLICATION_FETCH_SUCCESS" | "APPLICATION_STORE_ACCEPT_EULA" | "APPLICATION_STORE_ACCEPT_STORE_TERMS" | "APPLICATION_STORE_CLEAR_DATA" | "APPLICATION_STORE_LOCATION_CHANGE" | "APPLICATION_STORE_MATURE_AGREE" | "APPLICATION_STORE_RESET_NAVIGATION" | "APPLICATION_SUBSCRIPTIONS_CHANNEL_NOTICE_DISMISSED" | "APPLICATION_SUBSCRIPTIONS_FETCH_ENTITLEMENTS" | "APPLICATION_SUBSCRIPTIONS_FETCH_ENTITLEMENTS_FAILURE" | "APPLICATION_SUBSCRIPTIONS_FETCH_ENTITLEMENTS_SUCCESS" | "APPLICATION_SUBSCRIPTIONS_FETCH_LISTINGS" | "APPLICATION_SUBSCRIPTIONS_FETCH_LISTINGS_FAILURE" | "APPLICATION_SUBSCRIPTIONS_FETCH_LISTINGS_SUCCESS" | "APPLICATION_SUBSCRIPTIONS_FETCH_LISTING_FOR_PLAN_SUCCESS" | "APPLIED_BOOSTS_COOLDOWN_FETCH_SUCCESS" | "APPLIED_GUILD_BOOST_COUNT_UPDATE" | "APP_ICON_EDITOR_CLOSE" | "APP_ICON_EDITOR_OPEN" | "APP_ICON_TRACK_IMPRESSION" | "APP_ICON_UPDATED" | "APP_LAUNCHER_DISMISS_APP_DETAIL" | "APP_LAUNCHER_DISMISS_POPUP" | "APP_LAUNCHER_SET_ACTIVE_COMMAND" | "APP_LAUNCHER_SHOW_APP_DETAIL" | "APP_LAUNCHER_SHOW_POPUP" | "APP_STATE_UPDATE" | "APP_VIEW_SET_HOME_LINK" | "AUDIO_INPUT_DETECTED" | "AUDIO_RESET" | "AUDIO_SET_ATTENUATION" | "AUDIO_SET_AUTOMATIC_GAIN_CONTROL" | "AUDIO_SET_DEBUG_LOGGING" | "AUDIO_SET_DISPLAY_SILENCE_WARNING" | "AUDIO_SET_ECHO_CANCELLATION" | "AUDIO_SET_INPUT_DEVICE" | "AUDIO_SET_INPUT_VOLUME" | "AUDIO_SET_LOCAL_PAN" | "AUDIO_SET_LOCAL_VIDEO_DISABLED" | "AUDIO_SET_LOCAL_VOLUME" | "AUDIO_SET_LOOPBACK" | "AUDIO_SET_MODE" | "AUDIO_SET_NOISE_CANCELLATION" | "AUDIO_SET_NOISE_SUPPRESSION" | "AUDIO_SET_OUTPUT_DEVICE" | "AUDIO_SET_OUTPUT_VOLUME" | "AUDIO_SET_QOS" | "AUDIO_SET_SELF_MUTE" | "AUDIO_SET_SUBSYSTEM" | "AUDIO_SET_TEMPORARY_SELF_MUTE" | "AUDIO_TOGGLE_LOCAL_MUTE" | "AUDIO_TOGGLE_LOCAL_SOUNDBOARD_MUTE" | "AUDIO_TOGGLE_SELF_DEAF" | "AUDIO_TOGGLE_SELF_MUTE" | "AUDIO_VOLUME_CHANGE" | "AUDIT_LOG_FETCH_FAIL" | "AUDIT_LOG_FETCH_NEXT_PAGE_FAIL" | "AUDIT_LOG_FETCH_NEXT_PAGE_START" | "AUDIT_LOG_FETCH_NEXT_PAGE_SUCCESS" | "AUDIT_LOG_FETCH_START" | "AUDIT_LOG_FETCH_SUCCESS" | "AUDIT_LOG_FILTER_BY_ACTION" | "AUDIT_LOG_FILTER_BY_TARGET" | "AUDIT_LOG_FILTER_BY_USER" | "AUTHENTICATOR_CREATE" | "AUTHENTICATOR_DELETE" | "AUTHENTICATOR_UPDATE" | "AUTH_INVITE_UPDATE" | "AUTH_SESSION_CHANGE" | "AUTO_MODERATION_MENTION_RAID_DETECTION" | "AUTO_MODERATION_MENTION_RAID_NOTICE_DISMISS" | "BACKGROUND_SYNC" | "BACKGROUND_SYNC_CHANNEL_MESSAGES" | "BILLING_ANNUAL_USER_OFFER_FETCH_FAIL" | "BILLING_ANNUAL_USER_OFFER_FETCH_SUCCESS" | "BILLING_CREATE_REFERRAL_PREVIEW_FAIL" | "BILLING_CREATE_REFERRAL_PREVIEW_START" | "BILLING_CREATE_REFERRAL_PREVIEW_SUCCESS" | "BILLING_CREATE_REFERRAL_SUCCESS" | "BILLING_IP_COUNTRY_CODE_FAILURE" | "BILLING_IP_COUNTRY_CODE_FETCH_START" | "BILLING_LOCALIZED_PRICING_PROMO_FAILURE" | "BILLING_MOST_RECENT_SUBSCRIPTION_FETCH_SUCCESS" | "BILLING_NITRO_AFFINITY_FETCHED" | "BILLING_NITRO_AFFINITY_FETCH_SUCCEEDED" | "BILLING_PAYMENTS_FETCH_SUCCESS" | "BILLING_PAYMENT_FETCH_SUCCESS" | "BILLING_PAYMENT_SOURCES_FETCH_FAIL" | "BILLING_PAYMENT_SOURCES_FETCH_START" | "BILLING_PAYMENT_SOURCES_FETCH_SUCCESS" | "BILLING_PAYMENT_SOURCE_CREATE_FAIL" | "BILLING_PAYMENT_SOURCE_CREATE_START" | "BILLING_PAYMENT_SOURCE_CREATE_SUCCESS" | "BILLING_PAYMENT_SOURCE_REMOVE_CLEAR_ERROR" | "BILLING_PAYMENT_SOURCE_REMOVE_FAIL" | "BILLING_PAYMENT_SOURCE_REMOVE_START" | "BILLING_PAYMENT_SOURCE_REMOVE_SUCCESS" | "BILLING_PAYMENT_SOURCE_UPDATE_CLEAR_ERROR" | "BILLING_PAYMENT_SOURCE_UPDATE_FAIL" | "BILLING_PAYMENT_SOURCE_UPDATE_START" | "BILLING_PAYMENT_SOURCE_UPDATE_SUCCESS" | "BILLING_PERKS_RELEVANCE_FETCH_FAIL" | "BILLING_PERKS_RELEVANCE_FETCH_START" | "BILLING_PERKS_RELEVANCE_FETCH_SUCCESS" | "BILLING_POPUP_BRIDGE_CALLBACK" | "BILLING_POPUP_BRIDGE_STATE_UPDATE" | "BILLING_PREVIOUS_PREMIUM_SUBSCRIPTION_FETCH_SUCCESS" | "BILLING_PURCHASE_TOKEN_AUTH_CLEAR_STATE" | "BILLING_REFERRALS_REMAINING_FETCH_FAIL" | "BILLING_REFERRALS_REMAINING_FETCH_START" | "BILLING_REFERRALS_REMAINING_FETCH_SUCCESS" | "BILLING_REFERRAL_RESOLVE_FAIL" | "BILLING_REFERRAL_RESOLVE_SUCCESS" | "BILLING_REFERRAL_TRIAL_OFFER_UPDATE" | "BILLING_SET_IP_COUNTRY_CODE" | "BILLING_SET_LOCALIZED_PRICING_PROMO" | "BILLING_SUBSCRIPTION_CANCEL_FAIL" | "BILLING_SUBSCRIPTION_CANCEL_START" | "BILLING_SUBSCRIPTION_CANCEL_SUCCESS" | "BILLING_SUBSCRIPTION_FETCH_FAIL" | "BILLING_SUBSCRIPTION_FETCH_START" | "BILLING_SUBSCRIPTION_FETCH_SUCCESS" | "BILLING_SUBSCRIPTION_RESET" | "BILLING_SUBSCRIPTION_UPDATE_FAIL" | "BILLING_SUBSCRIPTION_UPDATE_START" | "BILLING_SUBSCRIPTION_UPDATE_SUCCESS" | "BILLING_USER_OFFER_ACKNOWLEDGED_SUCCESS" | "BILLING_USER_OFFER_FETCH_FAIL" | "BILLING_USER_OFFER_FETCH_SUCCESS" | "BILLING_USER_PREMIUM_LIKELIHOOD_FETCH" | "BILLING_USER_PREMIUM_LIKELIHOOD_FETCH_ERROR" | "BILLING_USER_PREMIUM_LIKELIHOOD_FETCH_SUCCESS" | "BILLING_USER_TRIAL_OFFER_ACKNOWLEDGED_SUCCESS" | "BILLING_USER_TRIAL_OFFER_FETCH_SUCCESS" | "BLOCKED_DOMAIN_LIST_FETCHED" | "BOOSTED_GUILD_GRACE_PERIOD_NOTICE_DISMISS" | "BRAINTREE_CREATE_CLIENT_SUCCESS" | "BRAINTREE_CREATE_PAYPAL_CLIENT_SUCCESS" | "BRAINTREE_CREATE_VENMO_CLIENT_SUCCESS" | "BRAINTREE_TEARDOWN_PAYPAL_CLIENT" | "BRAINTREE_TEARDOWN_VENMO_CLIENT" | "BRAINTREE_TOKENIZE_PAYPAL_FAIL" | "BRAINTREE_TOKENIZE_PAYPAL_START" | "BRAINTREE_TOKENIZE_PAYPAL_SUCCESS" | "BRAINTREE_TOKENIZE_VENMO_FAIL" | "BRAINTREE_TOKENIZE_VENMO_START" | "BRAINTREE_TOKENIZE_VENMO_SUCCESS" | "BROADCASTER_BUCKETS_RECEIVED" | "BROADCAST_START" | "BROADCAST_STOP" | "BROADCAST_VIEWERS_UPDATE" | "BROWSER_HANDOFF_BEGIN" | "BROWSER_HANDOFF_FROM_APP" | "BROWSER_HANDOFF_SET_USER" | "BROWSER_HANDOFF_UNAVAILABLE" | "BUILD_OVERRIDE_RESOLVED" | "BULK_ACK" | "BULK_CLEAR_RECENTS" | "BURST_REACTION_ANIMATION_ADD" | "BURST_REACTION_EFFECT_CLEAR" | "BURST_REACTION_EFFECT_PLAY" | "BURST_REACTION_PICKER_ANIMATION_ADD" | "BURST_REACTION_PICKER_ANIMATION_CLEAR" | "CACHED_EMOJIS_LOADED" | "CACHED_STICKERS_LOADED" | "CACHE_LOADED" | "CACHE_LOADED_LAZY" | "CACHE_LOADED_LAZY_NO_CACHE" | "CALL_CHAT_TOASTS_SET_ENABLED" | "CALL_CONNECT" | "CALL_CONNECT_MULTIPLE" | "CALL_CREATE" | "CALL_DELETE" | "CALL_ENQUEUE_RING" | "CALL_UPDATE" | "CANDIDATE_GAMES_CHANGE" | "CATEGORY_COLLAPSE" | "CATEGORY_COLLAPSE_ALL" | "CATEGORY_EXPAND" | "CATEGORY_EXPAND_ALL" | "CERTIFIED_DEVICES_SET" | "CHANGE_LOG_FETCH_FAILED" | "CHANGE_LOG_FETCH_SUCCESS" | "CHANGE_LOG_LOCK" | "CHANGE_LOG_MARK_SEEN" | "CHANGE_LOG_SET_CONFIG" | "CHANGE_LOG_SET_OVERRIDE" | "CHANGE_LOG_UNLOCK" | "CHANNEL_ACK" | "CHANNEL_CALL_POPOUT_WINDOW_OPEN" | "CHANNEL_COLLAPSE" | "CHANNEL_CREATE" | "CHANNEL_DELETE" | "CHANNEL_FOLLOWER_CREATED" | "CHANNEL_FOLLOWER_STATS_FETCH_FAILURE" | "CHANNEL_FOLLOWER_STATS_FETCH_SUCCESS" | "CHANNEL_FOLLOWING_PUBLISH_BUMP_DISMISSED" | "CHANNEL_FOLLOWING_PUBLISH_BUMP_HIDE_PERMANENTLY" | "CHANNEL_LOCAL_ACK" | "CHANNEL_MUTE_EXPIRED" | "CHANNEL_PINS_ACK" | "CHANNEL_PINS_UPDATE" | "CHANNEL_PRELOAD" | "CHANNEL_RECIPIENT_ADD" | "CHANNEL_RECIPIENT_REMOVE" | "CHANNEL_RTC_ACTIVE_CHANNELS" | "CHANNEL_RTC_SELECT_PARTICIPANT" | "CHANNEL_RTC_UPDATE_CHAT_OPEN" | "CHANNEL_RTC_UPDATE_LAYOUT" | "CHANNEL_RTC_UPDATE_PARTICIPANTS_OPEN" | "CHANNEL_RTC_UPDATE_STAGE_STREAM_SIZE" | "CHANNEL_RTC_UPDATE_STAGE_VIDEO_LIMIT_BOOST_UPSELL_DISMISSED" | "CHANNEL_RTC_UPDATE_VOICE_PARTICIPANTS_HIDDEN" | "CHANNEL_SAFETY_WARNING_FEEDBACK" | "CHANNEL_SELECT" | "CHANNEL_SETTINGS_CLOSE" | "CHANNEL_SETTINGS_INIT" | "CHANNEL_SETTINGS_LOADED_INVITES" | "CHANNEL_SETTINGS_OPEN" | "CHANNEL_SETTINGS_OVERWRITE_SELECT" | "CHANNEL_SETTINGS_PERMISSIONS_INIT" | "CHANNEL_SETTINGS_PERMISSIONS_SAVE_SUCCESS" | "CHANNEL_SETTINGS_PERMISSIONS_SELECT_PERMISSION" | "CHANNEL_SETTINGS_PERMISSIONS_SET_ADVANCED_MODE" | "CHANNEL_SETTINGS_PERMISSIONS_SUBMITTING" | "CHANNEL_SETTINGS_PERMISSIONS_UPDATE_PERMISSION" | "CHANNEL_SETTINGS_SET_SECTION" | "CHANNEL_SETTINGS_SUBMIT" | "CHANNEL_SETTINGS_SUBMIT_FAILURE" | "CHANNEL_SETTINGS_SUBMIT_SUCCESS" | "CHANNEL_SETTINGS_UPDATE" | "CHANNEL_STATUSES" | "CHANNEL_TOGGLE_MEMBERS_SECTION" | "CHANNEL_TOGGLE_SUMMARIES_SECTION" | "CHANNEL_UPDATES" | "CHECKING_FOR_UPDATES" | "CHECK_LAUNCHABLE_GAME" | "CLAN_SETUP_ERROR" | "CLAN_SETUP_RESET" | "CLAN_SETUP_SUBMIT" | "CLAN_SETUP_SUCCESS" | "CLAN_SETUP_UPDATE" | "CLEAR_AUTHENTICATION_ERRORS" | "CLEAR_CACHES" | "CLEAR_CHANNEL_SAFETY_WARNINGS" | "CLEAR_CONVERSATION_SUMMARIES" | "CLEAR_HANG_STATUS" | "CLEAR_INTERACTION_MODAL_STATE" | "CLEAR_LAST_SESSION_VOICE_CHANNEL_ID" | "CLEAR_MENTIONS" | "CLEAR_MESSAGES" | "CLEAR_OLDEST_UNREAD_MESSAGE" | "CLEAR_PENDING_CHANNEL_AND_ROLE_UPDATES" | "CLEAR_REMOTE_DISCONNECT_VOICE_CHANNEL_ID" | "CLEAR_STICKER_PREVIEW" | "CLIENT_THEMES_EDITOR_CLOSE" | "CLIENT_THEMES_EDITOR_OPEN" | "CLIPS_CLASSIFY_HARDWARE" | "CLIPS_CLEAR_CLIPS_SESSION" | "CLIPS_CLEAR_NEW_CLIP_IDS" | "CLIPS_DELETE_CLIP" | "CLIPS_DISMISS_EDUCATION" | "CLIPS_INIT" | "CLIPS_INIT_FAILURE" | "CLIPS_LOAD_DIRECTORY_SUCCESS" | "CLIPS_RESTART" | "CLIPS_SAVE_ANIMATION_END" | "CLIPS_SAVE_CLIP" | "CLIPS_SAVE_CLIP_ERROR" | "CLIPS_SAVE_CLIP_PLACEHOLDER" | "CLIPS_SAVE_CLIP_PLACEHOLDER_ERROR" | "CLIPS_SAVE_CLIP_START" | "CLIPS_SETTINGS_UPDATE" | "CLIPS_SHOW_CALL_WARNING" | "CLIPS_UPDATE_METADATA" | "CLOSE_SUSPENDED_USER" | "COLLECTIBLES_CATEGORIES_FETCH" | "COLLECTIBLES_CATEGORIES_FETCH_FAILURE" | "COLLECTIBLES_CATEGORIES_FETCH_SUCCESS" | "COLLECTIBLES_CATEGORY_ITEMS_VIEWED" | "COLLECTIBLES_CLAIM" | "COLLECTIBLES_CLAIM_FAILURE" | "COLLECTIBLES_CLAIM_SUCCESS" | "COLLECTIBLES_PRODUCT_DETAILS_OPEN" | "COLLECTIBLES_PRODUCT_FETCH" | "COLLECTIBLES_PRODUCT_FETCH_FAILURE" | "COLLECTIBLES_PRODUCT_FETCH_SUCCESS" | "COLLECTIBLES_PURCHASES_FETCH" | "COLLECTIBLES_PURCHASES_FETCH_FAILURE" | "COLLECTIBLES_PURCHASES_FETCH_SUCCESS" | "COLLECTIBLES_SHOP_CLOSE" | "COLLECTIBLES_SHOP_OPEN" | "COMMANDS_MIGRATION_NOTICE_DISMISSED" | "COMMANDS_MIGRATION_OVERVIEW_TOOLTIP_DISMISSED" | "COMMANDS_MIGRATION_TOGGLE_TOOLTIP_DISMISSED" | "COMMANDS_MIGRATION_UPDATE_SUCCESS" | "COMPLETE_NEW_MEMBER_ACTION" | "COMPLETE_SIGN_UP" | "CONNECTED_DEVICE_IGNORE" | "CONNECTED_DEVICE_NEVER_SHOW_MODAL" | "CONNECTED_DEVICE_SET" | "CONNECTIONS_GRID_MODAL_HIDE" | "CONNECTIONS_GRID_MODAL_SHOW" | "CONNECTION_CLOSED" | "CONNECTION_INTERRUPTED" | "CONNECTION_OPEN" | "CONNECTION_OPEN_SUPPLEMENTAL" | "CONNECTION_RESUMED" | "CONSOLE_COMMAND_UPDATE" | "CONTENT_INVENTORY_CLEAR_FEED" | "CONTENT_INVENTORY_DEBUG_CLEAR_IMPRESSIONS" | "CONTENT_INVENTORY_DEBUG_LOG_IMPRESSIONS" | "CONTENT_INVENTORY_DEBUG_TOGGLE_FAST_IMPRESSION_CAPPING" | "CONTENT_INVENTORY_DEBUG_TOGGLE_IMPRESSION_CAPPING" | "CONTENT_INVENTORY_MANUAL_REFRESH" | "CONTENT_INVENTORY_SET_FEED" | "CONTENT_INVENTORY_SET_FILTERS" | "CONTENT_INVENTORY_TOGGLE_FEED_HIDDEN" | "CONTENT_INVENTORY_TOGGLE_REPLY_MODE" | "CONTENT_INVENTORY_TRACK_ITEM_IMPRESSIONS" | "CONTEXT_MENU_CLOSE" | "CONTEXT_MENU_OPEN" | "CONVERSATION_SUMMARY_UPDATE" | "CREATE_PENDING_REPLY" | "CREATE_REFERRALS_SUCCESS" | "CREATE_SHALLOW_PENDING_REPLY" | "CREATOR_MONETIZATION_NAG_ACTIVATE_ELIGIBLITY_FETCH_SUCCESS" | "CREATOR_MONETIZATION_PRICE_TIERS_FETCH" | "CREATOR_MONETIZATION_PRICE_TIERS_FETCH_FAILURE" | "CREATOR_MONETIZATION_PRICE_TIERS_FETCH_SUCCESS" | "CURRENT_BUILD_OVERRIDE_RESOLVED" | "CURRENT_USER_UPDATE" | "DCF_DAILY_CAP_OVERRIDE" | "DCF_HANDLE_DC_DISMISSED" | "DCF_HANDLE_DC_SHOWN" | "DCF_RESET" | "DECAY_READ_STATES" | "DELETED_ENTITY_IDS" | "DELETE_PENDING_REPLY" | "DELETE_SUMMARY" | "DETECTABLE_GAME_SUPPLEMENTAL_FETCH" | "DETECTABLE_GAME_SUPPLEMENTAL_FETCH_FAILURE" | "DETECTABLE_GAME_SUPPLEMENTAL_FETCH_SUCCESS" | "DETECTED_OFF_PLATFORM_PREMIUM_PERKS_DISMISS" | "DEVELOPER_ACTIVITY_SHELF_FETCH_FAIL" | "DEVELOPER_ACTIVITY_SHELF_FETCH_START" | "DEVELOPER_ACTIVITY_SHELF_FETCH_SUCCESS" | "DEVELOPER_ACTIVITY_SHELF_MARK_ACTIVITY_USED" | "DEVELOPER_ACTIVITY_SHELF_SET_ACTIVITY_URL_OVERRIDE" | "DEVELOPER_ACTIVITY_SHELF_TOGGLE_USE_ACTIVITY_URL_OVERRIDE" | "DEVELOPER_ACTIVITY_SHELF_UPDATE_FILTER" | "DEVELOPER_OPTIONS_UPDATE_SETTINGS" | "DEVELOPER_TEST_MODE_AUTHORIZATION_FAIL" | "DEVELOPER_TEST_MODE_AUTHORIZATION_START" | "DEVELOPER_TEST_MODE_AUTHORIZATION_SUCCESS" | "DEVELOPER_TEST_MODE_RESET" | "DEVELOPER_TEST_MODE_RESET_ERROR" | "DEV_TOOLS_DESIGN_TOGGLE_SET" | "DEV_TOOLS_DESIGN_TOGGLE_WEB_SET" | "DEV_TOOLS_DEV_SETTING_SET" | "DEV_TOOLS_SETTINGS_UPDATE" | "DISABLE_AUTOMATIC_ACK" | "DISCOVER_CHECKLIST_FETCH_FAILURE" | "DISCOVER_CHECKLIST_FETCH_START" | "DISCOVER_CHECKLIST_FETCH_SUCCESS" | "DISMISS_CHANNEL_SAFETY_WARNINGS" | "DISMISS_FAVORITE_SUGGESTION" | "DISMISS_MEDIA_POST_SHARE_PROMPT" | "DISMISS_SIGN_UP" | "DISPATCH_APPLICATION_ADD_TO_INSTALLATIONS" | "DISPATCH_APPLICATION_CANCEL" | "DISPATCH_APPLICATION_ERROR" | "DISPATCH_APPLICATION_INSTALL" | "DISPATCH_APPLICATION_INSTALL_SCRIPTS_PROGRESS_UPDATE" | "DISPATCH_APPLICATION_LAUNCH_SETUP_COMPLETE" | "DISPATCH_APPLICATION_LAUNCH_SETUP_START" | "DISPATCH_APPLICATION_MOVE_UP" | "DISPATCH_APPLICATION_REMOVE_FINISHED" | "DISPATCH_APPLICATION_REPAIR" | "DISPATCH_APPLICATION_STATE_UPDATE" | "DISPATCH_APPLICATION_UNINSTALL" | "DISPATCH_APPLICATION_UPDATE" | "DISPLAYED_INVITE_SHOW" | "DOMAIN_MIGRATION_FAILURE" | "DOMAIN_MIGRATION_SKIP" | "DOMAIN_MIGRATION_START" | "DRAFT_CHANGE" | "DRAFT_CLEAR" | "DRAFT_SAVE" | "DRAWER_CLOSE" | "DRAWER_OPEN" | "DRAWER_SELECT_TAB" | "DROPS_ELIGIBILITY_FETCH_SUCCESS" | "DROPS_ENROLLED_USER_FETCH_SUCCESS" | "DROPS_FETCH_PROGRESS_FAILURE" | "DROPS_FETCH_PROGRESS_SUCCESS" | "DROPS_HEARTBEAT_FAILURE" | "DROPS_HEARTBEAT_SUCCESS" | "DROPS_PLATFORM_AVAILABILITY_SUCCESS" | "DROPS_UNENROLL_USER" | "DROPS_USER_STATUS_FETCH_FAILURE" | "DROPS_USER_STATUS_FETCH_SUCCESS" | "EMAIL_SETTINGS_FETCH_SUCCESS" | "EMAIL_SETTINGS_UPDATE" | "EMAIL_SETTINGS_UPDATE_SUCCESS" | "EMBEDDED_ACTIVITY_CLOSE" | "EMBEDDED_ACTIVITY_DEFERRED_OPEN" | "EMBEDDED_ACTIVITY_DISCONNECT" | "EMBEDDED_ACTIVITY_DISMISS_NEW_INDICATOR" | "EMBEDDED_ACTIVITY_FETCH_SHELF" | "EMBEDDED_ACTIVITY_FETCH_SHELF_FAIL" | "EMBEDDED_ACTIVITY_FETCH_SHELF_SUCCESS" | "EMBEDDED_ACTIVITY_LAUNCH_FAIL" | "EMBEDDED_ACTIVITY_LAUNCH_START" | "EMBEDDED_ACTIVITY_LAUNCH_SUCCESS" | "EMBEDDED_ACTIVITY_OPEN" | "EMBEDDED_ACTIVITY_SET_CONFIG" | "EMBEDDED_ACTIVITY_SET_FOCUSED_LAYOUT" | "EMBEDDED_ACTIVITY_SET_ORIENTATION_LOCK_STATE" | "EMBEDDED_ACTIVITY_SET_PANEL_MODE" | "EMBEDDED_ACTIVITY_UPDATE" | "EMBEDDED_ACTIVITY_UPDATE_V2" | "EMOJI_AUTOSUGGESTION_UPDATE" | "EMOJI_CAPTIONS_FETCH" | "EMOJI_CAPTIONS_FETCH_ERROR" | "EMOJI_CAPTIONS_FETCH_SUCCESS" | "EMOJI_INTERACTION_INITIATED" | "EMOJI_TRACK_USAGE" | "ENABLE_AUTOMATIC_ACK" | "ENABLE_GUILD_SIGN_UP" | "ENABLE_USER_SIGN_UP" | "ENTITLEMENTS_FETCH_FOR_USER_FAIL" | "ENTITLEMENTS_FETCH_FOR_USER_START" | "ENTITLEMENTS_FETCH_FOR_USER_SUCCESS" | "ENTITLEMENTS_GIFTABLE_FETCH_SUCCESS" | "ENTITLEMENT_CREATE" | "ENTITLEMENT_DELETE" | "ENTITLEMENT_FETCH_APPLICATION_FAIL" | "ENTITLEMENT_FETCH_APPLICATION_START" | "ENTITLEMENT_FETCH_APPLICATION_SUCCESS" | "ENTITLEMENT_UPDATE" | "EVENT_DIRECTORY_FETCH_FAILURE" | "EVENT_DIRECTORY_FETCH_START" | "EVENT_DIRECTORY_FETCH_SUCCESS" | "EXPERIMENTS_FETCH" | "EXPERIMENTS_FETCH_FAILURE" | "EXPERIMENTS_FETCH_SUCCESS" | "EXPERIMENT_OVERRIDE_BUCKET" | "EXPERIMENT_REGISTER_LEGACY" | "FAMILY_CENTER_FETCH_START" | "FAMILY_CENTER_HANDLE_TAB_SELECT" | "FAMILY_CENTER_INITIAL_LOAD" | "FAMILY_CENTER_LINKED_USERS_FETCH_SUCCESS" | "FAMILY_CENTER_LINK_CODE_FETCH_SUCCESS" | "FAMILY_CENTER_REQUEST_LINK_REMOVE_SUCCESS" | "FAMILY_CENTER_REQUEST_LINK_SUCCESS" | "FAMILY_CENTER_REQUEST_LINK_UPDATE_SUCCESS" | "FAMILY_CENTER_TEEN_ACTIVITY_FETCH_SUCCESS" | "FAMILY_CENTER_TEEN_ACTIVITY_MORE_FETCH_SUCCESS" | "FETCH_AUTH_SESSIONS_SUCCESS" | "FETCH_CLAN_DISCOVERY_SEARCH_RESULT_SUCCESS" | "FETCH_GUILD_EVENT" | "FETCH_GUILD_EVENTS_FOR_GUILD" | "FETCH_GUILD_MEMBER_SUPPLEMENTAL_SUCCESS" | "FETCH_INTEGRATION_APPLICATION_IDS_FOR_MY_GUILDS" | "FETCH_INTEGRATION_APPLICATION_IDS_FOR_MY_GUILDS_FAILURE" | "FETCH_INTEGRATION_APPLICATION_IDS_FOR_MY_GUILDS_SUCCESS" | "FETCH_PRIVATE_CHANNEL_INTEGRATIONS_FAIL" | "FETCH_PRIVATE_CHANNEL_INTEGRATIONS_START" | "FETCH_PRIVATE_CHANNEL_INTEGRATIONS_SUCCESS" | "FETCH_STATIC_CLAN_LIST_SUCCESS" | "FINGERPRINT" | "FORCE_INVISIBLE" | "FORGOT_PASSWORD_REQUEST" | "FORGOT_PASSWORD_SENT" | "FORUM_SEARCH_CLEAR" | "FORUM_SEARCH_FAILURE" | "FORUM_SEARCH_QUERY_UPDATED" | "FORUM_SEARCH_START" | "FORUM_SEARCH_SUCCESS" | "FORUM_UNREADS" | "FRIENDS_SET_INITIAL_SECTION" | "FRIENDS_SET_SECTION" | "FRIEND_INVITES_FETCH_REQUEST" | "FRIEND_INVITES_FETCH_RESPONSE" | "FRIEND_INVITE_CREATE_FAILURE" | "FRIEND_INVITE_CREATE_REQUEST" | "FRIEND_INVITE_CREATE_SUCCESS" | "FRIEND_INVITE_REVOKE_REQUEST" | "FRIEND_INVITE_REVOKE_SUCCESS" | "FRIEND_SUGGESTION_CREATE" | "FRIEND_SUGGESTION_DELETE" | "GAMES_DATABASE_FETCH" | "GAMES_DATABASE_FETCH_FAIL" | "GAMES_DATABASE_UPDATE" | "GAME_CLOUD_SYNC_COMPLETE" | "GAME_CLOUD_SYNC_CONFLICT" | "GAME_CLOUD_SYNC_ERROR" | "GAME_CLOUD_SYNC_START" | "GAME_CLOUD_SYNC_UPDATE" | "GAME_CONSOLE_FETCH_DEVICES_FAIL" | "GAME_CONSOLE_FETCH_DEVICES_START" | "GAME_CONSOLE_FETCH_DEVICES_SUCCESS" | "GAME_CONSOLE_SELECT_DEVICE" | "GAME_DETECTION_WATCH_CANDIDATE_GAMES_START" | "GAME_ICON_UPDATE" | "GAME_INVITE_CLEAR_UNSEEN" | "GAME_INVITE_CREATE" | "GAME_INVITE_DELETE" | "GAME_INVITE_DELETE_MANY" | "GAME_INVITE_UPDATE_STATUS" | "GAME_LAUNCHABLE_UPDATE" | "GAME_LAUNCH_FAIL" | "GAME_LAUNCH_START" | "GAME_LAUNCH_SUCCESS" | "GENERIC_PUSH_NOTIFICATION_SENT" | "GIFT_CODES_FETCH" | "GIFT_CODES_FETCH_FAILURE" | "GIFT_CODES_FETCH_SUCCESS" | "GIFT_CODE_CREATE" | "GIFT_CODE_CREATE_SUCCESS" | "GIFT_CODE_REDEEM" | "GIFT_CODE_REDEEM_FAILURE" | "GIFT_CODE_REDEEM_SUCCESS" | "GIFT_CODE_RESOLVE" | "GIFT_CODE_RESOLVE_FAILURE" | "GIFT_CODE_RESOLVE_SUCCESS" | "GIFT_CODE_REVOKE_SUCCESS" | "GIFT_CODE_UPDATE" | "GIF_PICKER_INITIALIZE" | "GIF_PICKER_QUERY" | "GIF_PICKER_QUERY_FAILURE" | "GIF_PICKER_QUERY_SUCCESS" | "GIF_PICKER_SUGGESTIONS_SUCCESS" | "GIF_PICKER_TRENDING_FETCH_SUCCESS" | "GIF_PICKER_TRENDING_SEARCH_TERMS_SUCCESS" | "GUILD_ACK" | "GUILD_APPLICATIONS_FETCH_SUCCESS" | "GUILD_APPLICATION_COMMAND_INDEX_UPDATE" | "GUILD_APPLIED_BOOSTS_FETCH_SUCCESS" | "GUILD_APPLY_BOOST_FAIL" | "GUILD_APPLY_BOOST_START" | "GUILD_APPLY_BOOST_SUCCESS" | "GUILD_BAN_ADD" | "GUILD_BAN_REMOVE" | "GUILD_BOOST_SLOTS_FETCH_SUCCESS" | "GUILD_BOOST_SLOT_CREATE" | "GUILD_BOOST_SLOT_UPDATE" | "GUILD_BOOST_SLOT_UPDATE_SUCCESS" | "GUILD_CREATE" | "GUILD_DELETE" | "GUILD_DIRECTORY_ADMIN_ENTRIES_FETCH_SUCCESS" | "GUILD_DIRECTORY_CACHED_SEARCH" | "GUILD_DIRECTORY_CATEGORY_SELECT" | "GUILD_DIRECTORY_COUNTS_FETCH_SUCCESS" | "GUILD_DIRECTORY_ENTRY_CREATE" | "GUILD_DIRECTORY_ENTRY_DELETE" | "GUILD_DIRECTORY_ENTRY_UPDATE" | "GUILD_DIRECTORY_FETCH_FAILURE" | "GUILD_DIRECTORY_FETCH_START" | "GUILD_DIRECTORY_FETCH_SUCCESS" | "GUILD_DIRECTORY_SEARCH_CLEAR" | "GUILD_DIRECTORY_SEARCH_FAILURE" | "GUILD_DIRECTORY_SEARCH_START" | "GUILD_DIRECTORY_SEARCH_SUCCESS" | "GUILD_DISCOVERY_CATEGORY_ADD" | "GUILD_DISCOVERY_CATEGORY_DELETE" | "GUILD_DISCOVERY_CATEGORY_FETCH_SUCCESS" | "GUILD_DISCOVERY_CATEGORY_UPDATE_FAIL" | "GUILD_DISCOVERY_CLEAR_SEARCH" | "GUILD_DISCOVERY_CLEAR_SEEN_GUILDS" | "GUILD_DISCOVERY_FETCH_FAILURE" | "GUILD_DISCOVERY_FETCH_START" | "GUILD_DISCOVERY_FETCH_SUCCESS" | "GUILD_DISCOVERY_GUILD_SEEN" | "GUILD_DISCOVERY_METADATA_FETCH_FAIL" | "GUILD_DISCOVERY_POPULAR_FETCH_FAILURE" | "GUILD_DISCOVERY_POPULAR_FETCH_START" | "GUILD_DISCOVERY_POPULAR_FETCH_SUCCESS" | "GUILD_DISCOVERY_SEARCH_COUNTS_FAIL" | "GUILD_DISCOVERY_SEARCH_FETCH_FAILURE" | "GUILD_DISCOVERY_SEARCH_FETCH_START" | "GUILD_DISCOVERY_SEARCH_FETCH_SUCCESS" | "GUILD_DISCOVERY_SEARCH_INIT" | "GUILD_DISCOVERY_SEARCH_UPDATE_COUNTS" | "GUILD_DISCOVERY_SELECT_CATEGORY" | "GUILD_DISCOVERY_SLUG_FETCH_FAIL" | "GUILD_DISCOVERY_SLUG_FETCH_SUCCESS" | "GUILD_EMOJIS_UPDATE" | "GUILD_FEATURE_ACK" | "GUILD_FEED_FEATURED_ITEMS_FETCH_FAILURE" | "GUILD_FEED_FEATURED_ITEMS_FETCH_SUCCESS" | "GUILD_FEED_FEATURE_ITEM" | "GUILD_FEED_FETCH_FAILURE" | "GUILD_FEED_FETCH_FRESH_START" | "GUILD_FEED_FETCH_PAGE_START" | "GUILD_FEED_FETCH_SUCCESS" | "GUILD_FEED_ITEM_HIDE" | "GUILD_FEED_ITEM_READ_ACK" | "GUILD_FEED_ITEM_REMOVE" | "GUILD_FEED_ITEM_UNHIDE" | "GUILD_FEED_UNFEATURE_ITEM" | "GUILD_FOLDER_COLLAPSE" | "GUILD_FOLDER_CREATE_LOCAL" | "GUILD_FOLDER_DELETE_LOCAL" | "GUILD_FOLDER_EDIT_LOCAL" | "GUILD_GEO_RESTRICTED" | "GUILD_HOME_ENSURE_HOME_SESSION" | "GUILD_HOME_SETTINGS_FETCH_FAIL" | "GUILD_HOME_SETTINGS_FETCH_START" | "GUILD_HOME_SETTINGS_FETCH_SUCCESS" | "GUILD_HOME_SETTINGS_TOGGLE_ENABLED" | "GUILD_HOME_SETTINGS_UPDATE_SUCCESS" | "GUILD_HOME_SET_SCROLL_POSITION" | "GUILD_HOME_SET_SOURCE" | "GUILD_IDENTITY_SETTINGS_CLEAR_ERRORS" | "GUILD_IDENTITY_SETTINGS_CLOSE" | "GUILD_IDENTITY_SETTINGS_INIT" | "GUILD_IDENTITY_SETTINGS_RESET_ALL_PENDING" | "GUILD_IDENTITY_SETTINGS_RESET_AND_CLOSE_FORM" | "GUILD_IDENTITY_SETTINGS_RESET_PENDING_MEMBER_CHANGES" | "GUILD_IDENTITY_SETTINGS_RESET_PENDING_PROFILE_CHANGES" | "GUILD_IDENTITY_SETTINGS_SET_GUILD" | "GUILD_IDENTITY_SETTINGS_SET_PENDING_AVATAR" | "GUILD_IDENTITY_SETTINGS_SET_PENDING_AVATAR_DECORATION" | "GUILD_IDENTITY_SETTINGS_SET_PENDING_BANNER" | "GUILD_IDENTITY_SETTINGS_SET_PENDING_BIO" | "GUILD_IDENTITY_SETTINGS_SET_PENDING_NICKNAME" | "GUILD_IDENTITY_SETTINGS_SET_PENDING_PROFILE_EFFECT_ID" | "GUILD_IDENTITY_SETTINGS_SET_PENDING_PRONOUNS" | "GUILD_IDENTITY_SETTINGS_SET_PENDING_THEME_COLORS" | "GUILD_IDENTITY_SETTINGS_SUBMIT" | "GUILD_IDENTITY_SETTINGS_SUBMIT_FAILURE" | "GUILD_IDENTITY_SETTINGS_SUBMIT_SUCCESS" | "GUILD_INTEGRATIONS_UPDATE" | "GUILD_JOIN" | "GUILD_JOIN_REQUESTS_BULK_ACTION" | "GUILD_JOIN_REQUESTS_FETCH_FAILURE" | "GUILD_JOIN_REQUESTS_FETCH_START" | "GUILD_JOIN_REQUESTS_FETCH_SUCCESS" | "GUILD_JOIN_REQUESTS_SET_APPLICATION_TAB" | "GUILD_JOIN_REQUESTS_SET_SELECTED" | "GUILD_JOIN_REQUESTS_SET_SORT_ORDER" | "GUILD_JOIN_REQUEST_BY_ID_FETCH_SUCCESS" | "GUILD_JOIN_REQUEST_CREATE" | "GUILD_JOIN_REQUEST_DELETE" | "GUILD_JOIN_REQUEST_UPDATE" | "GUILD_MEMBERS_CHUNK_BATCH" | "GUILD_MEMBERS_REQUEST" | "GUILD_MEMBER_ADD" | "GUILD_MEMBER_LIST_UPDATE" | "GUILD_MEMBER_PROFILE_UPDATE" | "GUILD_MEMBER_REMOVE" | "GUILD_MEMBER_UPDATE" | "GUILD_MEMBER_UPDATE_LOCAL" | "GUILD_MOVE_BY_ID" | "GUILD_MUTE_EXPIRED" | "GUILD_NEW_MEMBER_ACTIONS_DELETE_SUCCESS" | "GUILD_NEW_MEMBER_ACTIONS_FETCH_FAIL" | "GUILD_NEW_MEMBER_ACTIONS_FETCH_START" | "GUILD_NEW_MEMBER_ACTIONS_FETCH_SUCCESS" | "GUILD_NEW_MEMBER_ACTION_UPDATE_SUCCESS" | "GUILD_NSFW_AGREE" | "GUILD_ONBOARDING_COMPLETE" | "GUILD_ONBOARDING_PROMPTS_FETCH_FAILURE" | "GUILD_ONBOARDING_PROMPTS_FETCH_START" | "GUILD_ONBOARDING_PROMPTS_FETCH_SUCCESS" | "GUILD_ONBOARDING_PROMPTS_LOCAL_UPDATE" | "GUILD_ONBOARDING_SELECT_OPTION" | "GUILD_ONBOARDING_SET_STEP" | "GUILD_ONBOARDING_START" | "GUILD_ONBOARDING_UPDATE_RESPONSES_SUCCESS" | "GUILD_POPOUT_FETCH_FAILURE" | "GUILD_POPOUT_FETCH_START" | "GUILD_POPOUT_FETCH_SUCCESS" | "GUILD_PRODUCTS_FETCH" | "GUILD_PRODUCTS_FETCH_FAILURE" | "GUILD_PRODUCTS_FETCH_SUCCESS" | "GUILD_PRODUCT_CREATE" | "GUILD_PRODUCT_DELETE" | "GUILD_PRODUCT_FETCH" | "GUILD_PRODUCT_FETCH_FAILURE" | "GUILD_PRODUCT_FETCH_SUCCESS" | "GUILD_PRODUCT_UPDATE" | "GUILD_PROGRESS_COMPLETED_SEEN" | "GUILD_PROGRESS_DISMISS" | "GUILD_PROGRESS_INITIALIZE" | "GUILD_PROMPT_VIEWED" | "GUILD_RECOMMENDATION_FETCH" | "GUILD_RECOMMENDATION_FETCH_FAILURE" | "GUILD_RECOMMENDATION_FETCH_SUCCESS" | "GUILD_RESOURCE_CHANNEL_UPDATE_SUCCESS" | "GUILD_ROLE_CONNECTION_ELIGIBILITY_FETCH_SUCCESS" | "GUILD_ROLE_CREATE" | "GUILD_ROLE_DELETE" | "GUILD_ROLE_MEMBER_ADD" | "GUILD_ROLE_MEMBER_BULK_ADD" | "GUILD_ROLE_MEMBER_COUNT_FETCH_SUCCESS" | "GUILD_ROLE_MEMBER_COUNT_UPDATE" | "GUILD_ROLE_MEMBER_REMOVE" | "GUILD_ROLE_SUBSCRIPTIONS_CREATE_LISTING" | "GUILD_ROLE_SUBSCRIPTIONS_DELETE_GROUP_LISTING" | "GUILD_ROLE_SUBSCRIPTIONS_DELETE_LISTING" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_LISTINGS" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_LISTINGS_FAILURE" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_LISTINGS_SUCCESS" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_LISTING_FOR_PLAN" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_LISTING_FOR_PLAN_SUCCESS" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_RESTRICTIONS" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_RESTRICTIONS_ABORTED" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_RESTRICTIONS_FAILURE" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_RESTRICTIONS_SUCCESS" | "GUILD_ROLE_SUBSCRIPTIONS_FETCH_TEMPLATES" | "GUILD_ROLE_SUBSCRIPTIONS_STASH_TEMPLATE_CHANNELS" | "GUILD_ROLE_SUBSCRIPTIONS_UPDATE_GROUP_LISTING" | "GUILD_ROLE_SUBSCRIPTIONS_UPDATE_LISTING" | "GUILD_ROLE_SUBSCRIPTIONS_UPDATE_SUBSCRIPTIONS_SETTINGS" | "GUILD_ROLE_SUBSCRIPTIONS_UPDATE_SUBSCRIPTION_TRIAL" | "GUILD_ROLE_UPDATE" | "GUILD_SCHEDULED_EVENT_CREATE" | "GUILD_SCHEDULED_EVENT_DELETE" | "GUILD_SCHEDULED_EVENT_EXCEPTIONS_DELETE" | "GUILD_SCHEDULED_EVENT_EXCEPTION_CREATE" | "GUILD_SCHEDULED_EVENT_EXCEPTION_DELETE" | "GUILD_SCHEDULED_EVENT_EXCEPTION_UPDATE" | "GUILD_SCHEDULED_EVENT_RSVPS_FETCH_SUCESS" | "GUILD_SCHEDULED_EVENT_UPDATE" | "GUILD_SCHEDULED_EVENT_USERS_FETCH_SUCCESS" | "GUILD_SCHEDULED_EVENT_USER_ADD" | "GUILD_SCHEDULED_EVENT_USER_COUNTS_FETCH_SUCCESS" | "GUILD_SCHEDULED_EVENT_USER_REMOVE" | "GUILD_SEARCH_RECENT_MEMBERS" | "GUILD_SETTINGS_CANCEL_CHANGES" | "GUILD_SETTINGS_CLOSE" | "GUILD_SETTINGS_DEFAULT_CHANNELS_SAVE_SUCCESS" | "GUILD_SETTINGS_INIT" | "GUILD_SETTINGS_LOADED_BANS" | "GUILD_SETTINGS_LOADED_BANS_BATCH" | "GUILD_SETTINGS_LOADED_INTEGRATIONS" | "GUILD_SETTINGS_LOADED_INVITES" | "GUILD_SETTINGS_ONBOARDING_PROMPTS_SAVE_SUCCESS" | "GUILD_SETTINGS_ONBOARDING_SET_MODE" | "GUILD_SETTINGS_OPEN" | "GUILD_SETTINGS_ROLE_SELECT" | "GUILD_SETTINGS_SAVE_ROUTE_STACK" | "GUILD_SETTINGS_SET_MFA_SUCCESS" | "GUILD_SETTINGS_SET_SEARCH_QUERY" | "GUILD_SETTINGS_SET_SECTION" | "GUILD_SETTINGS_SET_VANITY_URL" | "GUILD_SETTINGS_SET_WIDGET" | "GUILD_SETTINGS_SUBMIT" | "GUILD_SETTINGS_SUBMIT_FAILURE" | "GUILD_SETTINGS_SUBMIT_SUCCESS" | "GUILD_SETTINGS_UPDATE" | "GUILD_SOUNDBOARD_FETCH" | "GUILD_SOUNDBOARD_SOUNDS_UPDATE" | "GUILD_SOUNDBOARD_SOUND_CREATE" | "GUILD_SOUNDBOARD_SOUND_DELETE" | "GUILD_SOUNDBOARD_SOUND_PLAY_END" | "GUILD_SOUNDBOARD_SOUND_PLAY_LOCALLY" | "GUILD_SOUNDBOARD_SOUND_PLAY_START" | "GUILD_SOUNDBOARD_SOUND_UPDATE" | "GUILD_STICKERS_CREATE_SUCCESS" | "GUILD_STICKERS_FETCH_SUCCESS" | "GUILD_STICKERS_UPDATE" | "GUILD_STOP_LURKING" | "GUILD_STOP_LURKING_FAILURE" | "GUILD_SUBSCRIPTIONS" | "GUILD_SUBSCRIPTIONS_ADD_MEMBER_UPDATES" | "GUILD_SUBSCRIPTIONS_CHANNEL" | "GUILD_SUBSCRIPTIONS_FLUSH" | "GUILD_SUBSCRIPTIONS_MEMBERS_ADD" | "GUILD_SUBSCRIPTIONS_MEMBERS_REMOVE" | "GUILD_SUBSCRIPTIONS_REMOVE_MEMBER_UPDATES" | "GUILD_TEMPLATE_ACCEPT" | "GUILD_TEMPLATE_ACCEPT_FAILURE" | "GUILD_TEMPLATE_ACCEPT_SUCCESS" | "GUILD_TEMPLATE_CREATE_SUCCESS" | "GUILD_TEMPLATE_DELETE_SUCCESS" | "GUILD_TEMPLATE_DIRTY_TOOLTIP_HIDE" | "GUILD_TEMPLATE_DIRTY_TOOLTIP_REFRESH" | "GUILD_TEMPLATE_LOAD_FOR_GUILD_SUCCESS" | "GUILD_TEMPLATE_MODAL_HIDE" | "GUILD_TEMPLATE_MODAL_SHOW" | "GUILD_TEMPLATE_PROMOTION_TOOLTIP_HIDE" | "GUILD_TEMPLATE_RESOLVE" | "GUILD_TEMPLATE_RESOLVE_FAILURE" | "GUILD_TEMPLATE_RESOLVE_SUCCESS" | "GUILD_TEMPLATE_SYNC_SUCCESS" | "GUILD_TOGGLE_COLLAPSE_MUTED" | "GUILD_UNAPPLY_BOOST_FAIL" | "GUILD_UNAPPLY_BOOST_START" | "GUILD_UNAPPLY_BOOST_SUCCESS" | "GUILD_UNAVAILABLE" | "GUILD_UPDATE" | "GUILD_UPDATE_DISCOVERY_METADATA" | "GUILD_UPDATE_DISCOVERY_METADATA_FAIL" | "GUILD_UPDATE_DISCOVERY_METADATA_FROM_SERVER" | "GUILD_VERIFICATION_CHECK" | "HABITUAL_DND_CLEAR" | "HIDE_ACTION_SHEET" | "HIDE_ACTION_SHEET_QUICK_SWITCHER" | "HIDE_KEYBOARD_SHORTCUTS" | "HIGH_FIVE_COMPLETE" | "HIGH_FIVE_COMPLETE_CLEAR" | "HIGH_FIVE_QUEUE" | "HIGH_FIVE_REMOVE" | "HIGH_FIVE_SET_ENABLED" | "HOTSPOT_HIDE" | "HOTSPOT_OVERRIDE_CLEAR" | "HOTSPOT_OVERRIDE_SET" | "HYPESQUAD_ONLINE_MEMBERSHIP_JOIN_SUCCESS" | "HYPESQUAD_ONLINE_MEMBERSHIP_LEAVE_SUCCESS" | "I18N_LOAD_ERROR" | "I18N_LOAD_START" | "I18N_LOAD_SUCCESS" | "IDLE" | "IMPERSONATE_STOP" | "IMPERSONATE_UPDATE" | "INBOX_OPEN" | "INCOMING_CALL_MOVE" | "INITIALIZE_MEMBER_SAFETY_STORE" | "INSTALLATION_LOCATION_ADD" | "INSTALLATION_LOCATION_FETCH_METADATA" | "INSTALLATION_LOCATION_REMOVE" | "INSTALLATION_LOCATION_UPDATE" | "INSTANT_INVITE_CLEAR" | "INSTANT_INVITE_CREATE" | "INSTANT_INVITE_CREATE_FAILURE" | "INSTANT_INVITE_CREATE_SUCCESS" | "INSTANT_INVITE_REVOKE_SUCCESS" | "INTEGRATION_CREATE" | "INTEGRATION_DELETE" | "INTEGRATION_QUERY" | "INTEGRATION_QUERY_FAILURE" | "INTEGRATION_QUERY_SUCCESS" | "INTEGRATION_SETTINGS_INIT" | "INTEGRATION_SETTINGS_SAVE_FAILURE" | "INTEGRATION_SETTINGS_SAVE_SUCCESS" | "INTEGRATION_SETTINGS_SET_SECTION" | "INTEGRATION_SETTINGS_START_EDITING_WEBHOOK" | "INTEGRATION_SETTINGS_STOP_EDITING_WEBHOOK" | "INTEGRATION_SETTINGS_SUBMITTING" | "INTEGRATION_SETTINGS_UPDATE_WEBHOOK" | "INTERACTION_CREATE" | "INTERACTION_FAILURE" | "INTERACTION_IFRAME_MODAL_CLOSE" | "INTERACTION_IFRAME_MODAL_CREATE" | "INTERACTION_IFRAME_MODAL_KEY_CREATE" | "INTERACTION_MODAL_CREATE" | "INTERACTION_QUEUE" | "INTERACTION_SUCCESS" | "INVITE_ACCEPT" | "INVITE_ACCEPT_FAILURE" | "INVITE_ACCEPT_SUCCESS" | "INVITE_APP_NOT_OPENED" | "INVITE_APP_OPENED" | "INVITE_APP_OPENING" | "INVITE_MODAL_CLOSE" | "INVITE_MODAL_ERROR" | "INVITE_MODAL_OPEN" | "INVITE_RESOLVE" | "INVITE_RESOLVE_FAILURE" | "INVITE_RESOLVE_SUCCESS" | "KEYBINDS_ADD_KEYBIND" | "KEYBINDS_DELETE_KEYBIND" | "KEYBINDS_ENABLE_ALL_KEYBINDS" | "KEYBINDS_REGISTER_GLOBAL_KEYBIND_ACTIONS" | "KEYBINDS_SET_KEYBIND" | "KEYBOARD_NAVIGATION_EXPLAINER_MODAL_SEEN" | "LAYER_POP" | "LAYER_POP_ALL" | "LAYER_PUSH" | "LAYOUT_CREATE" | "LAYOUT_CREATE_WIDGETS" | "LAYOUT_DELETE_ALL_WIDGETS" | "LAYOUT_DELETE_WIDGET" | "LAYOUT_SET_PINNED" | "LAYOUT_SET_TOP_WIDGET" | "LAYOUT_UPDATE_WIDGET" | "LIBRARY_APPLICATIONS_TEST_MODE_ENABLED" | "LIBRARY_APPLICATION_ACTIVE_BRANCH_UPDATE" | "LIBRARY_APPLICATION_ACTIVE_LAUNCH_OPTION_UPDATE" | "LIBRARY_APPLICATION_FILTER_UPDATE" | "LIBRARY_APPLICATION_FLAGS_UPDATE_START" | "LIBRARY_APPLICATION_FLAGS_UPDATE_SUCCESS" | "LIBRARY_APPLICATION_UPDATE" | "LIBRARY_FETCH_SUCCESS" | "LIBRARY_TABLE_ACTIVE_ROW_ID_UPDATE" | "LIBRARY_TABLE_SORT_UPDATE" | "LIGHTNING_CHECKOUT_CLOSE" | "LIGHTNING_CHECKOUT_OPEN" | "LIVE_CHANNEL_NOTICE_HIDE" | "LOAD_ARCHIVED_THREADS" | "LOAD_ARCHIVED_THREADS_FAIL" | "LOAD_ARCHIVED_THREADS_SUCCESS" | "LOAD_CHANNELS" | "LOAD_FORUM_POSTS" | "LOAD_FRIEND_SUGGESTIONS_FAILURE" | "LOAD_FRIEND_SUGGESTIONS_SUCCESS" | "LOAD_GUILD_AFFINITIES_SUCCESS" | "LOAD_MESSAGES" | "LOAD_MESSAGES_AROUND_SUCCESS" | "LOAD_MESSAGES_FAILURE" | "LOAD_MESSAGES_SUCCESS" | "LOAD_MESSAGES_SUCCESS_CACHED" | "LOAD_MESSAGE_INTERACTION_DATA_SUCCESS" | "LOAD_MESSAGE_REQUESTS_SUPPLEMENTAL_DATA_ERROR" | "LOAD_MESSAGE_REQUESTS_SUPPLEMENTAL_DATA_SUCCESS" | "LOAD_NOTIFICATION_CENTER_ITEMS" | "LOAD_NOTIFICATION_CENTER_ITEMS_FAILURE" | "LOAD_NOTIFICATION_CENTER_ITEMS_SUCCESS" | "LOAD_PINNED_MESSAGES" | "LOAD_PINNED_MESSAGES_FAILURE" | "LOAD_PINNED_MESSAGES_SUCCESS" | "LOAD_RECENT_MENTIONS" | "LOAD_RECENT_MENTIONS_FAILURE" | "LOAD_RECENT_MENTIONS_SUCCESS" | "LOAD_REGIONS" | "LOAD_RELATIONSHIPS_FAILURE" | "LOAD_RELATIONSHIPS_SUCCESS" | "LOAD_THREADS_SUCCESS" | "LOAD_USER_AFFINITIES" | "LOAD_USER_AFFINITIES_FAILURE" | "LOAD_USER_AFFINITIES_SUCCESS" | "LOCAL_ACTIVITY_UPDATE" | "LOCAL_MESSAGES_LOADED" | "LOCAL_MESSAGE_CREATE" | "LOGIN" | "LOGIN_ACCOUNT_DISABLED" | "LOGIN_ACCOUNT_SCHEDULED_FOR_DELETION" | "LOGIN_ATTEMPTED" | "LOGIN_FAILURE" | "LOGIN_MFA" | "LOGIN_MFA_FAILURE" | "LOGIN_MFA_SMS" | "LOGIN_MFA_SMS_FAILURE" | "LOGIN_MFA_SMS_REQUEST_SUCCESS" | "LOGIN_MFA_STEP" | "LOGIN_PASSWORD_RECOVERY_PHONE_VERIFICATION" | "LOGIN_PHONE_IP_AUTHORIZATION_REQUIRED" | "LOGIN_RESET" | "LOGIN_STATUS_RESET" | "LOGIN_SUCCESS" | "LOGIN_SUSPENDED_USER" | "LOGOUT" | "LOGOUT_AUTH_SESSIONS_SUCCESS" | "MASKED_LINK_ADD_TRUSTED_DOMAIN" | "MASKED_LINK_ADD_TRUSTED_PROTOCOL" | "MAX_MEMBER_COUNT_NOTICE_DISMISS" | "MEDIA_ENGINE_APPLY_MEDIA_FILTER_SETTINGS" | "MEDIA_ENGINE_APPLY_MEDIA_FILTER_SETTINGS_ERROR" | "MEDIA_ENGINE_APPLY_MEDIA_FILTER_SETTINGS_START" | "MEDIA_ENGINE_DEVICES" | "MEDIA_ENGINE_INTERACTION_REQUIRED" | "MEDIA_ENGINE_NOISE_CANCELLATION_ERROR_RESET" | "MEDIA_ENGINE_PERMISSION" | "MEDIA_ENGINE_SET_AEC_DUMP" | "MEDIA_ENGINE_SET_AUDIO_ENABLED" | "MEDIA_ENGINE_SET_EXPERIMENTAL_ENCODERS" | "MEDIA_ENGINE_SET_EXPERIMENTAL_SOUNDSHARE" | "MEDIA_ENGINE_SET_GO_LIVE_SOURCE" | "MEDIA_ENGINE_SET_HARDWARE_H264" | "MEDIA_ENGINE_SET_OPEN_H264" | "MEDIA_ENGINE_SET_VIDEO_DEVICE" | "MEDIA_ENGINE_SET_VIDEO_ENABLED" | "MEDIA_ENGINE_SET_VIDEO_HOOK" | "MEDIA_ENGINE_SOUNDSHARE_FAILED" | "MEDIA_ENGINE_SOUNDSHARE_TRANSMITTING" | "MEDIA_ENGINE_VIDEO_SOURCE_QUALITY_CHANGED" | "MEDIA_ENGINE_VIDEO_STATE_CHANGED" | "MEDIA_POST_EMBED_FETCH" | "MEDIA_POST_EMBED_FETCH_FAILURE" | "MEDIA_POST_EMBED_FETCH_SUCCESS" | "MEDIA_SESSION_JOINED" | "MEMBER_SAFETY_GUILD_MEMBER_SEARCH_SUCCESS" | "MEMBER_SAFETY_GUILD_MEMBER_UPDATE_BATCH" | "MEMBER_SAFETY_NEW_MEMBER_TIMESTAMP_REFRESH" | "MEMBER_SAFETY_PAGINATION_TOKEN_UPDATE" | "MEMBER_SAFETY_PAGINATION_UPDATE" | "MEMBER_SAFETY_SEARCH_STATE_UPDATE" | "MEMBER_VERIFICATION_FORM_FETCH_FAIL" | "MEMBER_VERIFICATION_FORM_UPDATE" | "MENTION_MODAL_CLOSE" | "MENTION_MODAL_OPEN" | "MESSAGE_ACK" | "MESSAGE_ACKED" | "MESSAGE_CREATE" | "MESSAGE_DELETE" | "MESSAGE_DELETE_BULK" | "MESSAGE_EDIT_FAILED_AUTOMOD" | "MESSAGE_END_EDIT" | "MESSAGE_EXPLICIT_CONTENT_FP_CREATE" | "MESSAGE_EXPLICIT_CONTENT_FP_SUBMIT" | "MESSAGE_EXPLICIT_CONTENT_SCAN_TIMEOUT" | "MESSAGE_LENGTH_UPSELL" | "MESSAGE_NOTIFICATION_SHOWN" | "MESSAGE_PREVIEWS_LOADED" | "MESSAGE_PREVIEWS_LOCALLY_LOADED" | "MESSAGE_REACTION_ADD" | "MESSAGE_REACTION_ADD_MANY" | "MESSAGE_REACTION_ADD_USERS" | "MESSAGE_REACTION_REMOVE" | "MESSAGE_REACTION_REMOVE_ALL" | "MESSAGE_REACTION_REMOVE_EMOJI" | "MESSAGE_REMINDER_NOTIFIED" | "MESSAGE_REMINDER_TOGGLE" | "MESSAGE_REQUEST_ACCEPT_OPTIMISTIC" | "MESSAGE_REVEAL" | "MESSAGE_SEND_FAILED" | "MESSAGE_SEND_FAILED_AUTOMOD" | "MESSAGE_START_EDIT" | "MESSAGE_UPDATE" | "MESSAGE_UPDATE_EDIT" | "MFA_CLEAR_BACKUP_CODES" | "MFA_DISABLE_SUCCESS" | "MFA_ENABLE_EMAIL_TOKEN" | "MFA_ENABLE_SUCCESS" | "MFA_SEEN_BACKUP_CODE_PROMPT" | "MFA_SEND_VERIFICATION_KEY" | "MFA_SMS_TOGGLE" | "MFA_SMS_TOGGLE_COMPLETE" | "MFA_VIEW_BACKUP_CODES" | "MFA_WEBAUTHN_CREDENTIALS_LOADED" | "MFA_WEBAUTHN_CREDENTIALS_LOADING" | "MOBILE_NATIVE_UPDATE_CHECK_FINISHED" | "MOBILE_WEB_SIDEBAR_CLOSE" | "MOBILE_WEB_SIDEBAR_OPEN" | "MODAL_POP" | "MODAL_PUSH" | "MOD_VIEW_SEARCH_FINISH" | "MULTI_ACCOUNT_INVALIDATE_PUSH_SYNC_TOKENS" | "MULTI_ACCOUNT_MOBILE_EXPERIMENT_UPDATE" | "MULTI_ACCOUNT_MOVE_ACCOUNT" | "MULTI_ACCOUNT_REMOVE_ACCOUNT" | "MULTI_ACCOUNT_UPDATE_PUSH_SYNC_TOKEN" | "MULTI_ACCOUNT_VALIDATE_TOKEN_FAILURE" | "MULTI_ACCOUNT_VALIDATE_TOKEN_REQUEST" | "MULTI_ACCOUNT_VALIDATE_TOKEN_SUCCESS" | "MUTUAL_FRIENDS_FETCH_FAILURE" | "MUTUAL_FRIENDS_FETCH_START" | "MUTUAL_FRIENDS_FETCH_SUCCESS" | "NEWLY_ADDED_EMOJI_SEEN_ACKNOWLEDGED" | "NEWLY_ADDED_EMOJI_SEEN_PENDING" | "NEWLY_ADDED_EMOJI_SEEN_UPDATED" | "NEW_PAYMENT_SOURCE_ADDRESS_INFO_UPDATE" | "NEW_PAYMENT_SOURCE_CARD_INFO_UPDATE" | "NEW_PAYMENT_SOURCE_CLEAR_ERROR" | "NEW_PAYMENT_SOURCE_STRIPE_PAYMENT_REQUEST_UPDATE" | "NOTICE_DISABLE" | "NOTICE_DISMISS" | "NOTICE_SHOW" | "NOTIFICATIONS_SET_DESKTOP_TYPE" | "NOTIFICATIONS_SET_DISABLED_SOUNDS" | "NOTIFICATIONS_SET_DISABLE_UNREAD_BADGE" | "NOTIFICATIONS_SET_NOTIFY_MESSAGES_IN_SELECTED_CHANNEL" | "NOTIFICATIONS_SET_PERMISSION_STATE" | "NOTIFICATIONS_SET_TASKBAR_FLASH" | "NOTIFICATIONS_SET_TTS_TYPE" | "NOTIFICATIONS_TOGGLE_ALL_DISABLED" | "NOTIFICATION_CENTER_CLEAR_GUILD_MENTIONS" | "NOTIFICATION_CENTER_ITEMS_ACK" | "NOTIFICATION_CENTER_ITEMS_ACK_FAILURE" | "NOTIFICATION_CENTER_ITEMS_LOCAL_ACK" | "NOTIFICATION_CENTER_ITEM_COMPLETED" | "NOTIFICATION_CENTER_ITEM_CREATE" | "NOTIFICATION_CENTER_ITEM_DELETE" | "NOTIFICATION_CENTER_ITEM_DELETE_FAILURE" | "NOTIFICATION_CENTER_REFRESH" | "NOTIFICATION_CENTER_SET_ACTIVE" | "NOTIFICATION_CENTER_SET_TAB" | "NOTIFICATION_CENTER_TAB_FOCUSED" | "NOTIFICATION_CLICK" | "NOTIFICATION_CREATE" | "NOTIFICATION_SETTINGS_UPDATE" | "NOW_PLAYING_MOUNTED" | "NOW_PLAYING_UNMOUNTED" | "NUF_COMPLETE" | "NUF_NEW_USER" | "OAUTH2_TOKEN_REVOKE" | "ONLINE_GUILD_MEMBER_COUNT_UPDATE" | "OUTBOUND_PROMOTIONS_SEEN" | "OUTBOUND_PROMOTION_NOTICE_DISMISS" | "OVERLAY_ACTIVATE_REGION" | "OVERLAY_CALL_PRIVATE_CHANNEL" | "OVERLAY_CRASHED" | "OVERLAY_DEACTIVATE_ALL_REGIONS" | "OVERLAY_DISABLE_EXTERNAL_LINK_ALERT" | "OVERLAY_FOCUSED" | "OVERLAY_INCOMPATIBLE_APP" | "OVERLAY_INITIALIZE" | "OVERLAY_JOIN_GAME" | "OVERLAY_MESSAGE_EVENT_ACTION" | "OVERLAY_NOTIFICATION_EVENT" | "OVERLAY_NOTIFY_READY_TO_SHOW" | "OVERLAY_READY" | "OVERLAY_SELECT_CALL" | "OVERLAY_SELECT_CHANNEL" | "OVERLAY_SET_ASSOCIATED_GAME" | "OVERLAY_SET_AVATAR_SIZE_MODE" | "OVERLAY_SET_CLICK_ZONES" | "OVERLAY_SET_DISPLAY_NAME_MODE" | "OVERLAY_SET_DISPLAY_USER_MODE" | "OVERLAY_SET_ENABLED" | "OVERLAY_SET_INPUT_LOCKED" | "OVERLAY_SET_NOTIFICATION_POSITION_MODE" | "OVERLAY_SET_NOT_IDLE" | "OVERLAY_SET_PREVIEW_IN_GAME_MODE" | "OVERLAY_SET_SHOW_KEYBIND_INDICATORS" | "OVERLAY_SET_TEXT_CHAT_NOTIFICATION_MODE" | "OVERLAY_SET_TEXT_WIDGET_OPACITY" | "OVERLAY_SET_UI_LOCKED" | "OVERLAY_SOUNDBOARD_SOUNDS_FETCH_REQUEST" | "OVERLAY_START_SESSION" | "OVERLAY_SUCCESSFULLY_SHOWN" | "OVERLAY_WIDGET_CHANGED" | "PASSIVE_UPDATE_V1" | "PASSWORD_UPDATED" | "PAYMENT_AUTHENTICATION_CLEAR_ERROR" | "PAYMENT_AUTHENTICATION_ERROR" | "PAYMENT_UPDATE" | "PERMISSION_CLEAR_ELEVATED_PROCESS" | "PERMISSION_CLEAR_PTT_ADMIN_WARNING" | "PERMISSION_CLEAR_SUPPRESS_WARNING" | "PERMISSION_CLEAR_VAD_WARNING" | "PERMISSION_CONTINUE_NONELEVATED_PROCESS" | "PERMISSION_REQUEST_ELEVATED_PROCESS" | "PHONE_SET_COUNTRY_CODE" | "PICTURE_IN_PICTURE_CLOSE" | "PICTURE_IN_PICTURE_HIDE" | "PICTURE_IN_PICTURE_MOVE" | "PICTURE_IN_PICTURE_OPEN" | "PICTURE_IN_PICTURE_SHOW" | "PICTURE_IN_PICTURE_UPDATE_RECT" | "PICTURE_IN_PICTURE_UPDATE_SELECTED_WINDOW" | "POGGERMODE_ACHIEVEMENT_UNLOCK" | "POGGERMODE_SETTINGS_UPDATE" | "POGGERMODE_TEMPORARILY_DISABLED" | "POGGERMODE_UPDATE_COMBO" | "POGGERMODE_UPDATE_MESSAGE_COMBO" | "POPOUT_WINDOW_CLOSE" | "POPOUT_WINDOW_OPEN" | "POPOUT_WINDOW_SET_ALWAYS_ON_TOP" | "POST_CONNECTION_OPEN" | "PREMIUM_MARKETING_DATA_READY" | "PREMIUM_MARKETING_PREVIEW" | "PREMIUM_PAYMENT_ERROR_CLEAR" | "PREMIUM_PAYMENT_MODAL_CLOSE" | "PREMIUM_PAYMENT_MODAL_OPEN" | "PREMIUM_PAYMENT_SUBSCRIBE_FAIL" | "PREMIUM_PAYMENT_SUBSCRIBE_START" | "PREMIUM_PAYMENT_SUBSCRIBE_SUCCESS" | "PREMIUM_PAYMENT_UPDATE_FAIL" | "PREMIUM_PAYMENT_UPDATE_SUCCESS" | "PREMIUM_PERKS_DEMOS_FETCH_FAILURE" | "PREMIUM_PERKS_DEMOS_FETCH_SUCCESS" | "PREMIUM_PERKS_DEMO_ACTIVATE_FAILURE" | "PREMIUM_PERKS_DEMO_ACTIVATE_SUCCESS" | "PREMIUM_PERKS_DEMO_COMPLETE" | "PREMIUM_PERKS_DEMO_OVERRIDE" | "PREMIUM_REQUIRED_MODAL_CLOSE" | "PREMIUM_REQUIRED_MODAL_OPEN" | "PRESENCES_REPLACE" | "PRESENCE_UPDATES" | "PRIVATE_CHANNEL_INTEGRATION_CREATE" | "PRIVATE_CHANNEL_INTEGRATION_DELETE" | "PRIVATE_CHANNEL_INTEGRATION_UPDATE" | "PRIVATE_CHANNEL_RECIPIENTS_ADD_USER" | "PRIVATE_CHANNEL_RECIPIENTS_INVITE_CLOSE" | "PRIVATE_CHANNEL_RECIPIENTS_INVITE_OPEN" | "PRIVATE_CHANNEL_RECIPIENTS_INVITE_QUERY" | "PRIVATE_CHANNEL_RECIPIENTS_INVITE_SELECT" | "PRIVATE_CHANNEL_RECIPIENTS_REMOVE_USER" | "PROFILE_CUSTOMIZATION_OPEN_PREVIEW_MODAL" | "PROFILE_EFFECTS_SET_TRY_IT_OUT" | "PROFILE_PANEL_TOGGLE_SECTION" | "PROXY_BLOCKED_REQUEST" | "PUBLIC_UPSELL_NOTICE_DISMISS" | "PURCHASED_ITEMS_FESTIVITY_FETCH_WOW_MOMENT_MEDIA_SUCCESS" | "PURCHASED_ITEMS_FESTIVITY_IS_FETCHING_WOW_MOMENT_MEDIA" | "PURCHASED_ITEMS_FESTIVITY_SET_CAN_PLAY_WOW_MOMENT" | "PURCHASE_CONFIRMATION_MODAL_CLOSE" | "PURCHASE_CONFIRMATION_MODAL_OPEN" | "PUSH_NOTIFICATION_CLICK" | "QUESTS_CLAIM_REWARD_BEGIN" | "QUESTS_CLAIM_REWARD_CODE_BEGIN" | "QUESTS_CLAIM_REWARD_CODE_FAILURE" | "QUESTS_CLAIM_REWARD_CODE_SUCCESS" | "QUESTS_CLAIM_REWARD_FAILURE" | "QUESTS_CLAIM_REWARD_SUCCESS" | "QUESTS_DELIVERY_OVERRIDE" | "QUESTS_DISMISS_CONTENT_BEGIN" | "QUESTS_DISMISS_CONTENT_FAILURE" | "QUESTS_DISMISS_CONTENT_SUCCESS" | "QUESTS_DISMISS_PROGRESS_TRACKING_FAILURE_NOTICE" | "QUESTS_ENROLL_BEGIN" | "QUESTS_ENROLL_FAILURE" | "QUESTS_ENROLL_SUCCESS" | "QUESTS_FETCH_CURRENT_QUESTS_BEGIN" | "QUESTS_FETCH_CURRENT_QUESTS_FAILURE" | "QUESTS_FETCH_CURRENT_QUESTS_SUCCESS" | "QUESTS_FETCH_REWARD_CODE_BEGIN" | "QUESTS_FETCH_REWARD_CODE_FAILURE" | "QUESTS_FETCH_REWARD_CODE_SUCCESS" | "QUESTS_OPTIMISTIC_PROGRESS_UPDATE" | "QUESTS_PREVIEW_UPDATE_SUCCESS" | "QUESTS_SEND_HEARTBEAT_FAILURE" | "QUESTS_SEND_HEARTBEAT_SUCCESS" | "QUEUE_INTERACTION_COMPONENT_STATE" | "QUICKSWITCHER_HIDE" | "QUICKSWITCHER_SEARCH" | "QUICKSWITCHER_SELECT" | "QUICKSWITCHER_SHOW" | "QUICKSWITCHER_SWITCH_TO" | "RECEIVE_CHANNEL_AFFINITIES" | "RECEIVE_CHANNEL_SUMMARIES" | "RECEIVE_CHANNEL_SUMMARIES_BULK" | "RECEIVE_CHANNEL_SUMMARY" | "RECENT_MENTION_DELETE" | "RECOMPUTE_READ_STATES" | "REFERRALS_FETCH_ELIGIBLE_USER_FAIL" | "REFERRALS_FETCH_ELIGIBLE_USER_START" | "REFERRALS_FETCH_ELIGIBLE_USER_SUCCESS" | "REGISTER" | "REGISTER_FAILURE" | "REGISTER_SAVE_FORM" | "REGISTER_SUCCESS" | "RELATIONSHIP_ADD" | "RELATIONSHIP_PENDING_INCOMING_REMOVED" | "RELATIONSHIP_REMOVE" | "RELATIONSHIP_UPDATE" | "REMOTE_COMMAND" | "REMOTE_SESSION_CONNECT" | "REMOTE_SESSION_DISCONNECT" | "REMOVE_AUTOMOD_MESSAGE_NOTICE" | "REQUEST_CHANNEL_AFFINITIES" | "REQUEST_CHANNEL_SUMMARIES" | "REQUEST_CHANNEL_SUMMARIES_BULK" | "REQUEST_CHANNEL_SUMMARY" | "REQUEST_FORUM_UNREADS" | "REQUEST_SOUNDBOARD_SOUNDS" | "RESET_NOTIFICATION_CENTER" | "RESET_PAYMENT_ID" | "RESET_PREVIEW_CLIENT_THEME" | "RESET_SOCKET" | "RESORT_THREADS" | "RPC_APP_AUTHENTICATED" | "RPC_APP_CONNECTED" | "RPC_APP_DISCONNECTED" | "RPC_NOTIFICATION_CREATE" | "RPC_SERVER_READY" | "RTC_CONNECTION_FLAGS" | "RTC_CONNECTION_LOSS_RATE" | "RTC_CONNECTION_PING" | "RTC_CONNECTION_PLATFORM" | "RTC_CONNECTION_STATE" | "RTC_CONNECTION_UPDATE_ID" | "RTC_CONNECTION_USER_CREATE" | "RTC_CONNECTION_VIDEO" | "RTC_DEBUG_MODAL_CLOSE" | "RTC_DEBUG_MODAL_OPEN" | "RTC_DEBUG_MODAL_OPEN_REPLAY" | "RTC_DEBUG_MODAL_OPEN_REPLAY_AT_PATH" | "RTC_DEBUG_MODAL_SET_SECTION" | "RTC_DEBUG_MODAL_UPDATE" | "RTC_DEBUG_MODAL_UPDATE_VIDEO_OUTPUT" | "RTC_DEBUG_POPOUT_WINDOW_OPEN" | "RTC_DEBUG_SET_RECORDING_FLAG" | "RTC_LATENCY_TEST_COMPLETE" | "RTC_SPEED_TEST_START_TEST" | "RTC_SPEED_TEST_STOP_TEST" | "RUNNING_GAMES_CHANGE" | "RUNNING_GAME_ADD_OVERRIDE" | "RUNNING_GAME_DELETE_ENTRY" | "RUNNING_GAME_EDIT_NAME" | "RUNNING_GAME_TOGGLE_DETECTION" | "RUNNING_GAME_TOGGLE_OVERLAY" | "RUNNING_STREAMER_TOOLS_CHANGE" | "SAFETY_HUB_APPEAL_CLOSE" | "SAFETY_HUB_APPEAL_OPEN" | "SAFETY_HUB_APPEAL_SIGNAL_CUSTOM_INPUT_CHANGE" | "SAFETY_HUB_APPEAL_SIGNAL_SELECT" | "SAFETY_HUB_FETCH_CLASSIFICATION_FAILURE" | "SAFETY_HUB_FETCH_CLASSIFICATION_START" | "SAFETY_HUB_FETCH_CLASSIFICATION_SUCCESS" | "SAFETY_HUB_FETCH_FAILURE" | "SAFETY_HUB_FETCH_START" | "SAFETY_HUB_FETCH_SUCCESS" | "SAFETY_HUB_REQUEST_REVIEW_FAILURE" | "SAFETY_HUB_REQUEST_REVIEW_START" | "SAFETY_HUB_REQUEST_REVIEW_SUCCESS" | "SAVED_MESSAGES_UPDATE" | "SAVE_LAST_NON_VOICE_ROUTE" | "SAVE_LAST_ROUTE" | "SEARCH_ADD_HISTORY" | "SEARCH_AUTOCOMPLETE_QUERY_UPDATE" | "SEARCH_CLEAR_HISTORY" | "SEARCH_EDITOR_STATE_CHANGE" | "SEARCH_EDITOR_STATE_CLEAR" | "SEARCH_ENSURE_SEARCH_STATE" | "SEARCH_FINISH" | "SEARCH_INDEXING" | "SEARCH_MODAL_CLOSE" | "SEARCH_MODAL_OPEN" | "SEARCH_REMOVE_HISTORY" | "SEARCH_SCREEN_OPEN" | "SEARCH_SET_SHOW_BLOCKED_RESULTS" | "SEARCH_START" | "SELECTIVELY_SYNCED_USER_SETTINGS_UPDATE" | "SELECT_HOME_RESOURCE_CHANNEL" | "SELECT_NEW_MEMBER_ACTION_CHANNEL" | "SELF_PRESENCE_STORE_UPDATE" | "SESSIONS_REPLACE" | "SET_CHANNEL_BITRATE" | "SET_CHANNEL_VIDEO_QUALITY_MODE" | "SET_CONSENT_REQUIRED" | "SET_CREATED_AT_OVERRIDE" | "SET_GUILD_FOLDER_EXPANDED" | "SET_HIGHLIGHTED_SUMMARY" | "SET_INTERACTION_COMPONENT_STATE" | "SET_LOCATION_METADATA" | "SET_LOGIN_CREDENTIALS" | "SET_NATIVE_PERMISSION" | "SET_PENDING_REPLY_SHOULD_MENTION" | "SET_PREMIUM_TYPE_OVERRIDE" | "SET_RECENTLY_ACTIVE_COLLAPSED" | "SET_RECENT_MENTIONS_FILTER" | "SET_RECENT_MENTIONS_STALE" | "SET_SELECTED_SUMMARY" | "SET_SOUNDPACK" | "SET_STREAM_APP_INTENT" | "SET_SUMMARY_FEEDBACK" | "SET_TTS_SPEECH_RATE" | "SET_VAD_PERMISSION" | "SHARED_CANVAS_CLEAR_DRAWABLES" | "SHARED_CANVAS_DRAW_LINE_POINT" | "SHARED_CANVAS_SET_DRAW_MODE" | "SHARED_CANVAS_UPDATE_EMOJI_HOSE" | "SHARED_CANVAS_UPDATE_LINE_POINTS" | "SHOW_ACTION_SHEET" | "SHOW_ACTION_SHEET_QUICK_SWITCHER" | "SHOW_KEYBOARD_SHORTCUTS" | "SIDEBAR_CLOSE" | "SIDEBAR_CLOSE_GUILD" | "SIDEBAR_CREATE_THREAD" | "SIDEBAR_VIEW_CHANNEL" | "SIDEBAR_VIEW_GUILD" | "SKUS_FETCH_SUCCESS" | "SKU_FETCH_FAIL" | "SKU_FETCH_START" | "SKU_FETCH_SUCCESS" | "SKU_PURCHASE_AWAIT_CONFIRMATION" | "SKU_PURCHASE_CLEAR_ERROR" | "SKU_PURCHASE_FAIL" | "SKU_PURCHASE_MODAL_CLOSE" | "SKU_PURCHASE_MODAL_OPEN" | "SKU_PURCHASE_PREVIEW_FETCH" | "SKU_PURCHASE_PREVIEW_FETCH_FAILURE" | "SKU_PURCHASE_PREVIEW_FETCH_SUCCESS" | "SKU_PURCHASE_SHOW_CONFIRMATION_STEP" | "SKU_PURCHASE_START" | "SKU_PURCHASE_SUCCESS" | "SKU_PURCHASE_UPDATE_IS_GIFT" | "SLOWMODE_RESET_COOLDOWN" | "SLOWMODE_SET_COOLDOWN" | "SOUNDBOARD_FETCH_DEFAULT_SOUNDS" | "SOUNDBOARD_FETCH_DEFAULT_SOUNDS_SUCCESS" | "SOUNDBOARD_MUTE_JOIN_SOUND" | "SOUNDBOARD_SET_OVERLAY_ENABLED" | "SOUNDBOARD_SOUNDS_RECEIVED" | "SPEAKING" | "SPEAKING_MESSAGE" | "SPEAK_MESSAGE" | "SPEAK_TEXT" | "SPEED_TEST_CREATE" | "SPEED_TEST_DELETE" | "SPEED_TEST_SERVER_UPDATE" | "SPELLCHECK_LEARN_WORD" | "SPELLCHECK_TOGGLE" | "SPELLCHECK_UNLEARN_WORD" | "SPOTIFY_ACCOUNT_ACCESS_TOKEN" | "SPOTIFY_ACCOUNT_ACCESS_TOKEN_REVOKE" | "SPOTIFY_NEW_TRACK" | "SPOTIFY_PLAYER_PAUSE" | "SPOTIFY_PLAYER_PLAY" | "SPOTIFY_PLAYER_STATE" | "SPOTIFY_PROFILE_UPDATE" | "SPOTIFY_SET_ACTIVE_DEVICE" | "SPOTIFY_SET_DEVICES" | "SPOTIFY_SET_PROTOCOL_REGISTERED" | "STAGE_INSTANCE_CREATE" | "STAGE_INSTANCE_DELETE" | "STAGE_INSTANCE_UPDATE" | "STAGE_MUSIC_MUTE" | "STAGE_MUSIC_PLAY" | "START_BROADCAST_STREAM" | "START_SESSION" | "STATUS_PAGE_INCIDENT" | "STATUS_PAGE_SCHEDULED_MAINTENANCE" | "STATUS_PAGE_SCHEDULED_MAINTENANCE_ACK" | "STICKER_FETCH_SUCCESS" | "STICKER_PACKS_FETCH_START" | "STICKER_PACKS_FETCH_SUCCESS" | "STICKER_PACK_FETCH_SUCCESS" | "STICKER_TRACK_USAGE" | "STOP_SPEAKING" | "STORE_LISTINGS_FETCH_SUCCESS" | "STORE_LISTING_FETCH_SUCCESS" | "STREAMER_MODE_UPDATE" | "STREAMING_UPDATE" | "STREAM_CLOSE" | "STREAM_CREATE" | "STREAM_DELETE" | "STREAM_LAYOUT_UPDATE" | "STREAM_PREVIEW_FETCH_FAIL" | "STREAM_PREVIEW_FETCH_START" | "STREAM_PREVIEW_FETCH_SUCCESS" | "STREAM_SERVER_UPDATE" | "STREAM_SET_PAUSED" | "STREAM_START" | "STREAM_STATS_UPDATE" | "STREAM_STOP" | "STREAM_TIMED_OUT" | "STREAM_UPDATE" | "STREAM_UPDATE_SELF_HIDDEN" | "STREAM_UPDATE_SETTINGS" | "STREAM_WATCH" | "STRIPE_TOKEN_FAILURE" | "SUBSCRIPTION_PLANS_FETCH" | "SUBSCRIPTION_PLANS_FETCH_FAILURE" | "SUBSCRIPTION_PLANS_FETCH_SUCCESS" | "SUBSCRIPTION_PLANS_RESET" | "SURVEY_FETCHED" | "SURVEY_HIDE" | "SURVEY_OVERRIDE" | "SURVEY_SEEN" | "SYSTEM_THEME_CHANGE" | "THERMAL_STATE_CHANGE" | "THREAD_CREATE" | "THREAD_CREATE_LOCAL" | "THREAD_DELETE" | "THREAD_LIST_SYNC" | "THREAD_MEMBERS_UPDATE" | "THREAD_MEMBER_LIST_UPDATE" | "THREAD_MEMBER_LOCAL_UPDATE" | "THREAD_MEMBER_UPDATE" | "THREAD_SETTINGS_DRAFT_CHANGE" | "THREAD_UPDATE" | "TOGGLE_GUILD_FOLDER_EXPAND" | "TOGGLE_OVERLAY_CANVAS" | "TOGGLE_TOPICS_BAR" | "TOP_EMOJIS_FETCH" | "TOP_EMOJIS_FETCH_SUCCESS" | "TRUNCATE_MENTIONS" | "TRUNCATE_MESSAGES" | "TRY_ACK" | "TUTORIAL_INDICATOR_DISMISS" | "TUTORIAL_INDICATOR_HIDE" | "TUTORIAL_INDICATOR_SHOW" | "TUTORIAL_INDICATOR_SUPPRESS_ALL" | "TYPING_START" | "TYPING_START_LOCAL" | "TYPING_STOP" | "TYPING_STOP_LOCAL" | "UNREAD_SETTING_NOTICE_CHANNEL_VISIT" | "UNREAD_SETTING_NOTICE_RENDERED" | "UNSYNCED_USER_SETTINGS_UPDATE" | "UNVERIFIED_GAME_UPDATE" | "UPCOMING_GUILD_EVENT_NOTICE_HIDE" | "UPCOMING_GUILD_EVENT_NOTICE_SEEN" | "UPDATE_AVAILABLE" | "UPDATE_BACKGROUND_GRADIENT_PRESET" | "UPDATE_CHANNEL_DIMENSIONS" | "UPDATE_CHANNEL_LIST_DIMENSIONS" | "UPDATE_CHANNEL_LIST_SUBTITLES" | "UPDATE_CLIENT_PREMIUM_TYPE" | "UPDATE_CONSENTS" | "UPDATE_DOWNLOADED" | "UPDATE_ERROR" | "UPDATE_GUILD_LIST_DIMENSIONS" | "UPDATE_HANG_STATUS" | "UPDATE_HANG_STATUS_CUSTOM" | "UPDATE_MANUALLY" | "UPDATE_MOBILE_PENDING_THEME_INDEX" | "UPDATE_NOT_AVAILABLE" | "UPDATE_TOKEN" | "UPDATE_VISIBLE_MESSAGES" | "UPLOAD_ATTACHMENT_ADD_FILES" | "UPLOAD_ATTACHMENT_CLEAR_ALL_FILES" | "UPLOAD_ATTACHMENT_POP_FILE" | "UPLOAD_ATTACHMENT_REMOVE_FILE" | "UPLOAD_ATTACHMENT_REMOVE_FILES" | "UPLOAD_ATTACHMENT_SET_FILE" | "UPLOAD_ATTACHMENT_SET_UPLOADS" | "UPLOAD_ATTACHMENT_UPDATE_FILE" | "UPLOAD_CANCEL_REQUEST" | "UPLOAD_COMPLETE" | "UPLOAD_COMPRESSION_PROGRESS" | "UPLOAD_FAIL" | "UPLOAD_FILE_UPDATE" | "UPLOAD_ITEM_CANCEL_REQUEST" | "UPLOAD_PROGRESS" | "UPLOAD_RESTORE_FAILED_UPLOAD" | "UPLOAD_START" | "USER_ACHIEVEMENT_UPDATE" | "USER_ACTIVITY_STATISTICS_FETCH_SUCCESS" | "USER_APPLICATION_REMOVE" | "USER_APPLICATION_UPDATE" | "USER_APPLIED_BOOSTS_FETCH_START" | "USER_APPLIED_BOOSTS_FETCH_SUCCESS" | "USER_AUTHORIZED_APPS_UPDATE" | "USER_CONNECTIONS_INTEGRATION_JOINING" | "USER_CONNECTIONS_INTEGRATION_JOINING_ERROR" | "USER_CONNECTIONS_UPDATE" | "USER_CONNECTION_UPDATE" | "USER_GUILD_JOIN_REQUEST_UPDATE" | "USER_GUILD_SETTINGS_CHANNEL_UPDATE" | "USER_GUILD_SETTINGS_CHANNEL_UPDATE_BULK" | "USER_GUILD_SETTINGS_FULL_UPDATE" | "USER_GUILD_SETTINGS_GUILD_AND_CHANNELS_UPDATE" | "USER_GUILD_SETTINGS_GUILD_UPDATE" | "USER_GUILD_SETTINGS_REMOVE_PENDING_CHANNEL_UPDATES" | "USER_JOIN_REQUEST_GUILDS_FETCH" | "USER_NON_CHANNEL_ACK" | "USER_NOTE_LOADED" | "USER_NOTE_LOAD_START" | "USER_NOTE_UPDATE" | "USER_PAYMENT_BROWSER_CHECKOUT_DONE" | "USER_PAYMENT_BROWSER_CHECKOUT_STARTED" | "USER_PAYMENT_CLIENT_ADD" | "USER_PROFILE_ACCESSIBILITY_TOOLTIP_VIEWED" | "USER_PROFILE_EFFECTS_FETCH" | "USER_PROFILE_EFFECTS_FETCH_FAILURE" | "USER_PROFILE_EFFECTS_FETCH_SUCCESS" | "USER_PROFILE_FETCH_FAILURE" | "USER_PROFILE_FETCH_START" | "USER_PROFILE_FETCH_SUCCESS" | "USER_PROFILE_MODAL_CLOSE" | "USER_PROFILE_MODAL_OPEN" | "USER_PROFILE_UPDATE_FAILURE" | "USER_PROFILE_UPDATE_START" | "USER_PROFILE_UPDATE_SUCCESS" | "USER_RECENT_GAMES_FETCH_ERROR" | "USER_RECENT_GAMES_FETCH_START" | "USER_RECENT_GAMES_FETCH_SUCCESS" | "USER_RECENT_GAMES_UPDATE_LOCAL" | "USER_REQUIRED_ACTION_UPDATE" | "USER_SETTINGS_ACCOUNT_CLOSE" | "USER_SETTINGS_ACCOUNT_INIT" | "USER_SETTINGS_ACCOUNT_RESET_AND_CLOSE_FORM" | "USER_SETTINGS_ACCOUNT_SET_PENDING_ACCENT_COLOR" | "USER_SETTINGS_ACCOUNT_SET_PENDING_AVATAR" | "USER_SETTINGS_ACCOUNT_SET_PENDING_AVATAR_DECORATION" | "USER_SETTINGS_ACCOUNT_SET_PENDING_BANNER" | "USER_SETTINGS_ACCOUNT_SET_PENDING_BIO" | "USER_SETTINGS_ACCOUNT_SET_PENDING_GLOBAL_NAME" | "USER_SETTINGS_ACCOUNT_SET_PENDING_PROFILE_EFFECT_ID" | "USER_SETTINGS_ACCOUNT_SET_PENDING_PRONOUNS" | "USER_SETTINGS_ACCOUNT_SET_PENDING_THEME_COLORS" | "USER_SETTINGS_ACCOUNT_SET_SINGLE_TRY_IT_OUT_COLLECTIBLES_ITEM" | "USER_SETTINGS_ACCOUNT_SET_TRY_IT_OUT_AVATAR" | "USER_SETTINGS_ACCOUNT_SET_TRY_IT_OUT_AVATAR_DECORATION" | "USER_SETTINGS_ACCOUNT_SET_TRY_IT_OUT_BANNER" | "USER_SETTINGS_ACCOUNT_SET_TRY_IT_OUT_PROFILE_EFFECT_ID" | "USER_SETTINGS_ACCOUNT_SET_TRY_IT_OUT_THEME_COLORS" | "USER_SETTINGS_ACCOUNT_SUBMIT" | "USER_SETTINGS_ACCOUNT_SUBMIT_FAILURE" | "USER_SETTINGS_ACCOUNT_SUBMIT_SUCCESS" | "USER_SETTINGS_CLEAR_ERRORS" | "USER_SETTINGS_LOCALE_OVERRIDE" | "USER_SETTINGS_MODAL_CLEAR_SCROLL_POSITION" | "USER_SETTINGS_MODAL_CLEAR_SUBSECTION" | "USER_SETTINGS_MODAL_CLOSE" | "USER_SETTINGS_MODAL_INIT" | "USER_SETTINGS_MODAL_OPEN" | "USER_SETTINGS_MODAL_RESET" | "USER_SETTINGS_MODAL_SET_SECTION" | "USER_SETTINGS_MODAL_SUBMIT" | "USER_SETTINGS_MODAL_SUBMIT_COMPLETE" | "USER_SETTINGS_MODAL_SUBMIT_FAILURE" | "USER_SETTINGS_MODAL_UPDATE_ACCOUNT" | "USER_SETTINGS_OVERRIDE_APPLY" | "USER_SETTINGS_OVERRIDE_CLEAR" | "USER_SETTINGS_PROTO_ENQUEUE_UPDATE" | "USER_SETTINGS_PROTO_LOAD_IF_NECESSARY" | "USER_SETTINGS_PROTO_UPDATE" | "USER_SETTINGS_PROTO_UPDATE_EDIT_INFO" | "USER_SETTINGS_RESET_ALL_PENDING" | "USER_SETTINGS_RESET_ALL_TRY_IT_OUT" | "USER_SETTINGS_RESET_PENDING_ACCOUNT_CHANGES" | "USER_SETTINGS_RESET_PENDING_AVATAR_DECORATION" | "USER_SETTINGS_RESET_PENDING_PROFILE_CHANGES" | "USER_SOUNDBOARD_SET_VOLUME" | "USER_TENURE_REWARD_STATUS_DELETE" | "USER_TENURE_REWARD_STATUS_RESET" | "USER_TENURE_REWARD_SYNC_START" | "USER_TENURE_REWARD_SYNC_SUCCESS" | "USER_UPDATE" | "VERIFY_FAILURE" | "VERIFY_SUCCESS" | "VIDEO_FILTER_ASSETS_FETCH_SUCCESS" | "VIDEO_FILTER_ASSET_DELETE_SUCCESS" | "VIDEO_FILTER_ASSET_UPLOAD_SUCCESS" | "VIDEO_SAVE_LAST_USED_BACKGROUND_OPTION" | "VIEW_HISTORY_MARK_VIEW" | "VOICE_CATEGORY_COLLAPSE" | "VOICE_CATEGORY_EXPAND" | "VOICE_CHANNEL_EFFECT_CLEAR" | "VOICE_CHANNEL_EFFECT_RECENT_EMOJI" | "VOICE_CHANNEL_EFFECT_SEND" | "VOICE_CHANNEL_EFFECT_SENT_LOCAL" | "VOICE_CHANNEL_EFFECT_TOGGLE_ANIMATION_TYPE" | "VOICE_CHANNEL_EFFECT_UPDATE_TIME_STAMP" | "VOICE_CHANNEL_SELECT" | "VOICE_CHANNEL_STATUS_UPDATE" | "VOICE_SERVER_UPDATE" | "VOICE_STATE_UPDATES" | "WAIT_FOR_REMOTE_SESSION" | "WEBHOOKS_FETCHING" | "WEBHOOKS_UPDATE" | "WEBHOOK_CREATE" | "WEBHOOK_DELETE" | "WEBHOOK_UPDATE" | "WELCOME_SCREEN_FETCH_FAIL" | "WELCOME_SCREEN_FETCH_START" | "WELCOME_SCREEN_FETCH_SUCCESS" | "WELCOME_SCREEN_SUBMIT_SUCCESS" | "WELCOME_SCREEN_UPDATE" | "WELCOME_SCREEN_VIEW" | "WINDOW_FOCUS" | "WINDOW_FULLSCREEN_CHANGE" | "WINDOW_HIDDEN" | "WINDOW_INIT" | "WINDOW_RESIZED" | "WINDOW_UNLOAD" | "WINDOW_VISIBILITY_CHANGE" | "WRITE_CACHES";

From c83627032091d3265ca22f8089b4857df9832087 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 26 May 2024 18:24:02 +0200
Subject: [PATCH 628/632] fix minor bugs in various plugins

- FriendsSince: Don't show for friend requests
- FakeNitro: Fix attempting to bypass unicode emojis #2503
- MessageLatency: ignore bots #2504
- CtrlEnterSend: use cmd+enter on macOS #2502
- ReplaceGoogleSearch: trim LF character #2488

Co-authored-by: AutumnVN <autumnvnchino@gmail.com>
Co-authored-by: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com>
Co-authored-by: Lumap <lumap@duck.com>
Co-authored-by: Mylloon <kennel.anri@tutanota.com>
---
 src/plugins/ctrlEnterSend/index.ts        | 4 ++--
 src/plugins/fakeNitro/index.tsx           | 2 +-
 src/plugins/friendsSince/index.tsx        | 4 ++++
 src/plugins/messageLatency/index.tsx      | 3 +++
 src/plugins/replaceGoogleSearch/index.tsx | 2 +-
 src/webpack/common/types/stores.d.ts      | 4 ++--
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/plugins/ctrlEnterSend/index.ts b/src/plugins/ctrlEnterSend/index.ts
index 4b9dd8e06..817da0532 100644
--- a/src/plugins/ctrlEnterSend/index.ts
+++ b/src/plugins/ctrlEnterSend/index.ts
@@ -18,7 +18,7 @@ export default definePlugin({
             type: OptionType.SELECT,
             options: [
                 {
-                    label: "Ctrl+Enter (Enter or Shift+Enter for new line)",
+                    label: "Ctrl+Enter (Enter or Shift+Enter for new line) (cmd+enter on macOS)",
                     value: "ctrl+enter"
                 },
                 {
@@ -54,7 +54,7 @@ export default definePlugin({
                 result = event.shiftKey;
                 break;
             case "ctrl+enter":
-                result = event.ctrlKey;
+                result = navigator.platform.includes("Mac") ? event.metaKey : event.ctrlKey;
                 break;
             case "enter":
                 result = !event.shiftKey && !event.ctrlKey;
diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 4ab0e18ee..427f36ce8 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -813,7 +813,7 @@ export default definePlugin({
     },
 
     canUseEmote(e: Emoji, channelId: string) {
-        if (e.type === "UNICODE") return true;
+        if (e.type === 0) return true;
         if (e.available === false) return false;
 
         const isUnusableRoleSubEmoji = RoleSubscriptionEmojiUtils.isUnusableRoleSubscriptionEmojiOriginal ?? RoleSubscriptionEmojiUtils.isUnusableRoleSubscriptionEmoji;
diff --git a/src/plugins/friendsSince/index.tsx b/src/plugins/friendsSince/index.tsx
index 8ad9dc7f4..eb59fff25 100644
--- a/src/plugins/friendsSince/index.tsx
+++ b/src/plugins/friendsSince/index.tsx
@@ -52,6 +52,8 @@ export default definePlugin({
 
     getFriendSince(userId: string) {
         try {
+            if (!RelationshipStore.isFriend(userId)) return null;
+
             return RelationshipStore.getSince(userId);
         } catch (err) {
             new Logger("FriendsSince").error(err);
@@ -60,6 +62,8 @@ export default definePlugin({
     },
 
     friendsSince: ErrorBoundary.wrap(({ userId, textClassName }: { userId: string; textClassName?: string; }) => {
+        if (!RelationshipStore.isFriend(userId)) return null;
+
         const friendsSince = RelationshipStore.getSince(userId);
         if (!friendsSince) return null;
 
diff --git a/src/plugins/messageLatency/index.tsx b/src/plugins/messageLatency/index.tsx
index d517c0e01..e4e5b8771 100644
--- a/src/plugins/messageLatency/index.tsx
+++ b/src/plugins/messageLatency/index.tsx
@@ -97,6 +97,9 @@ export default definePlugin({
         // Message wasn't received through gateway
         if (!isNonNullish(nonce)) return null;
 
+        // Bots basically never send a nonce, and if someone does do it then it's usually not a snowflake
+        if (message.bot) return null;
+
         let isDiscordKotlin = false;
         let delta = SnowflakeUtils.extractTimestamp(id) - SnowflakeUtils.extractTimestamp(nonce); // milliseconds
         if (!showMillis) {
diff --git a/src/plugins/replaceGoogleSearch/index.tsx b/src/plugins/replaceGoogleSearch/index.tsx
index dff593a3b..9882809f7 100644
--- a/src/plugins/replaceGoogleSearch/index.tsx
+++ b/src/plugins/replaceGoogleSearch/index.tsx
@@ -37,7 +37,7 @@ const settings = definePluginSettings({
 });
 
 function search(src: string, engine: string) {
-    open(engine + encodeURIComponent(src), "_blank");
+    open(engine + encodeURIComponent(src.trim()), "_blank");
 }
 
 function makeSearchItem(src: string) {
diff --git a/src/webpack/common/types/stores.d.ts b/src/webpack/common/types/stores.d.ts
index 059924f5a..083ec2694 100644
--- a/src/webpack/common/types/stores.d.ts
+++ b/src/webpack/common/types/stores.d.ts
@@ -63,7 +63,7 @@ export interface CustomEmoji {
     originalName?: string;
     require_colons: boolean;
     roles: string[];
-    type: "GUILD_EMOJI";
+    type: 1;
 }
 
 export interface UnicodeEmoji {
@@ -75,7 +75,7 @@ export interface UnicodeEmoji {
     };
     index: number;
     surrogates: string;
-    type: "UNICODE";
+    type: 0;
     uniqueName: string;
     useSpriteSheet: boolean;
     get allNamesString(): string;

From 9ec671819d27a7800c3c47287db7c29553120c7b Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 26 May 2024 19:12:18 +0200
Subject: [PATCH 629/632] build: improve fileInclude plugin

---
 .eslintrc.json                               |   2 +-
 browser/VencordNativeStub.ts                 |   4 +-
 package.json                                 |   6 +-
 pnpm-lock.yaml                               | 156 +++++++++++++++++++
 scripts/build/common.mjs                     |  61 ++++++--
 src/main/ipcMain.ts                          |   3 +-
 src/modules.d.ts                             |   2 +-
 src/plugins/shikiCodeblocks.desktop/index.ts |   3 +-
 8 files changed, 218 insertions(+), 19 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 2ee24e8b3..918edca0c 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,7 +1,7 @@
 {
     "root": true,
     "parser": "@typescript-eslint/parser",
-    "ignorePatterns": ["dist", "browser"],
+    "ignorePatterns": ["dist", "browser", "packages/vencord-types"],
     "plugins": [
         "@typescript-eslint",
         "simple-header",
diff --git a/browser/VencordNativeStub.ts b/browser/VencordNativeStub.ts
index 77c72369c..79f0f2cd3 100644
--- a/browser/VencordNativeStub.ts
+++ b/browser/VencordNativeStub.ts
@@ -19,8 +19,8 @@
 /// <reference path="../src/modules.d.ts" />
 /// <reference path="../src/globals.d.ts" />
 
-import monacoHtmlLocal from "~fileContent/monacoWin.html";
-import monacoHtmlCdn from "~fileContent/../src/main/monacoWin.html";
+import monacoHtmlLocal from "file://monacoWin.html?minify";
+import monacoHtmlCdn from "file://../src/main/monacoWin.html?minify";
 import * as DataStore from "../src/api/DataStore";
 import { debounce } from "../src/utils";
 import { EXTENSION_BASE_URL } from "../src/utils/web-metadata";
diff --git a/package.json b/package.json
index 04b811e9c..29b1506e2 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,9 @@
     },
     "scripts": {
         "build": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/build.mjs",
+        "buildStandalone": "pnpm build --standalone",
         "buildWeb": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/buildWeb.mjs",
-        "watch": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/build.mjs --watch",
+        "watch": "pnpm build --watch",
         "generatePluginJson": "tsx scripts/generatePluginList.ts",
         "generateTypes": "tspc --emitDeclarationOnly --declaration --outDir packages/vencord-types",
         "inject": "node scripts/runInstaller.mjs",
@@ -27,7 +28,7 @@
         "lint": "eslint . --ext .js,.jsx,.ts,.tsx --ignore-pattern src/userplugins",
         "lint-styles": "stylelint \"src/**/*.css\" --ignore-pattern src/userplugins",
         "lint:fix": "pnpm lint --fix",
-        "test": "pnpm build && pnpm lint && pnpm lint-styles && pnpm testTsc && pnpm generatePluginJson",
+        "test": "pnpm buildStandalone && pnpm lint && pnpm lint-styles && pnpm testTsc && pnpm generatePluginJson",
         "testWeb": "pnpm lint && pnpm buildWeb && pnpm testTsc",
         "testTsc": "tsc --noEmit"
     },
@@ -61,6 +62,7 @@
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-unused-imports": "^2.0.0",
         "highlight.js": "10.6.0",
+        "html-minifier-terser": "^7.2.0",
         "moment": "^2.29.4",
         "puppeteer-core": "^19.11.1",
         "standalone-electron-types": "^1.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 065d5d4e7..b03585799 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -98,6 +98,9 @@ importers:
       highlight.js:
         specifier: 10.6.0
         version: 10.6.0
+      html-minifier-terser:
+        specifier: ^7.2.0
+        version: 7.2.0
       moment:
         specifier: ^2.29.4
         version: 2.29.4
@@ -393,6 +396,27 @@ packages:
   '@humanwhocodes/object-schema@1.2.1':
     resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
 
+  '@jridgewell/gen-mapping@0.3.5':
+    resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/resolve-uri@3.1.2':
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/set-array@1.2.1':
+    resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/source-map@0.3.6':
+    resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
+
+  '@jridgewell/sourcemap-codec@1.4.15':
+    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
+
+  '@jridgewell/trace-mapping@0.3.25':
+    resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
+
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -688,6 +712,9 @@ packages:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
+  camel-case@4.1.2:
+    resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
+
   camelcase-keys@6.2.2:
     resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
     engines: {node: '>=8'}
@@ -716,6 +743,10 @@ packages:
     resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
     engines: {node: '>=0.10.0'}
 
+  clean-css@5.3.3:
+    resolution: {integrity: sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==}
+    engines: {node: '>= 10.0'}
+
   cliui@8.0.1:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
     engines: {node: '>=12'}
@@ -740,6 +771,13 @@ packages:
   colord@2.9.3:
     resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}
 
+  commander@10.0.1:
+    resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
+    engines: {node: '>=14'}
+
+  commander@2.20.3:
+    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
+
   component-emitter@1.3.0:
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
 
@@ -871,12 +909,19 @@ packages:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
     engines: {node: '>=6.0.0'}
 
+  dot-case@3.0.4:
+    resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
+
   emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
   end-of-stream@1.4.4:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
 
+  entities@4.5.0:
+    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
+    engines: {node: '>=0.12'}
+
   error-ex@1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
 
@@ -1402,6 +1447,11 @@ packages:
     resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
     engines: {node: '>=10'}
 
+  html-minifier-terser@7.2.0:
+    resolution: {integrity: sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==}
+    engines: {node: ^14.13.1 || >=16.0.0}
+    hasBin: true
+
   html-tags@3.3.1:
     resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
     engines: {node: '>=8'}
@@ -1673,6 +1723,9 @@ packages:
   lodash.truncate@4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
 
+  lower-case@2.0.2:
+    resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
+
   lru-cache@6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
@@ -1770,6 +1823,9 @@ packages:
   natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
 
+  no-case@3.0.4:
+    resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
+
   node-fetch@2.6.7:
     resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
     engines: {node: 4.x || >=6.0.0}
@@ -1855,6 +1911,9 @@ packages:
   pako@1.0.11:
     resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
 
+  param-case@3.0.4:
+    resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
+
   parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
@@ -1863,6 +1922,9 @@ packages:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
 
+  pascal-case@3.1.2:
+    resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
+
   pascalcase@0.1.1:
     resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
     engines: {node: '>=0.10.0'}
@@ -1985,6 +2047,10 @@ packages:
     resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
     engines: {node: '>= 0.4'}
 
+  relateurl@0.2.7:
+    resolution: {integrity: sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==}
+    engines: {node: '>= 0.10'}
+
   require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -2228,6 +2294,11 @@ packages:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
     engines: {node: '>=6'}
 
+  terser@5.31.0:
+    resolution: {integrity: sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   text-table@0.2.0:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
 
@@ -2263,6 +2334,9 @@ packages:
   tslib@1.14.1:
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
 
+  tslib@2.6.2:
+    resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
+
   tsutils@3.21.0:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -2599,6 +2673,28 @@ snapshots:
 
   '@humanwhocodes/object-schema@1.2.1': {}
 
+  '@jridgewell/gen-mapping@0.3.5':
+    dependencies:
+      '@jridgewell/set-array': 1.2.1
+      '@jridgewell/sourcemap-codec': 1.4.15
+      '@jridgewell/trace-mapping': 0.3.25
+
+  '@jridgewell/resolve-uri@3.1.2': {}
+
+  '@jridgewell/set-array@1.2.1': {}
+
+  '@jridgewell/source-map@0.3.6':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
+
+  '@jridgewell/sourcemap-codec@1.4.15': {}
+
+  '@jridgewell/trace-mapping@0.3.25':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.4.15
+
   '@nodelib/fs.scandir@2.1.5':
     dependencies:
       '@nodelib/fs.stat': 2.0.5
@@ -2958,6 +3054,11 @@ snapshots:
 
   callsites@3.1.0: {}
 
+  camel-case@4.1.2:
+    dependencies:
+      pascal-case: 3.1.2
+      tslib: 2.6.2
+
   camelcase-keys@6.2.2:
     dependencies:
       camelcase: 5.3.1
@@ -2991,6 +3092,10 @@ snapshots:
       isobject: 3.0.1
       static-extend: 0.1.2
 
+  clean-css@5.3.3:
+    dependencies:
+      source-map: 0.6.1
+
   cliui@8.0.1:
     dependencies:
       string-width: 4.2.3
@@ -3016,6 +3121,10 @@ snapshots:
 
   colord@2.9.3: {}
 
+  commander@10.0.1: {}
+
+  commander@2.20.3: {}
+
   component-emitter@1.3.0: {}
 
   concat-map@0.0.1: {}
@@ -3139,12 +3248,19 @@ snapshots:
     dependencies:
       esutils: 2.0.3
 
+  dot-case@3.0.4:
+    dependencies:
+      no-case: 3.0.4
+      tslib: 2.6.2
+
   emoji-regex@8.0.0: {}
 
   end-of-stream@1.4.4:
     dependencies:
       once: 1.4.0
 
+  entities@4.5.0: {}
+
   error-ex@1.3.2:
     dependencies:
       is-arrayish: 0.2.1
@@ -3733,6 +3849,16 @@ snapshots:
     dependencies:
       lru-cache: 6.0.0
 
+  html-minifier-terser@7.2.0:
+    dependencies:
+      camel-case: 4.1.2
+      clean-css: 5.3.3
+      commander: 10.0.1
+      entities: 4.5.0
+      param-case: 3.0.4
+      relateurl: 0.2.7
+      terser: 5.31.0
+
   html-tags@3.3.1: {}
 
   https-proxy-agent@5.0.1:
@@ -3974,6 +4100,10 @@ snapshots:
 
   lodash.truncate@4.4.2: {}
 
+  lower-case@2.0.2:
+    dependencies:
+      tslib: 2.6.2
+
   lru-cache@6.0.0:
     dependencies:
       yallist: 4.0.0
@@ -4071,6 +4201,11 @@ snapshots:
 
   natural-compare@1.4.0: {}
 
+  no-case@3.0.4:
+    dependencies:
+      lower-case: 2.0.2
+      tslib: 2.6.2
+
   node-fetch@2.6.7:
     dependencies:
       whatwg-url: 5.0.0
@@ -4168,6 +4303,11 @@ snapshots:
 
   pako@1.0.11: {}
 
+  param-case@3.0.4:
+    dependencies:
+      dot-case: 3.0.4
+      tslib: 2.6.2
+
   parent-module@1.0.1:
     dependencies:
       callsites: 3.1.0
@@ -4179,6 +4319,11 @@ snapshots:
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
 
+  pascal-case@3.1.2:
+    dependencies:
+      no-case: 3.0.4
+      tslib: 2.6.2
+
   pascalcase@0.1.1: {}
 
   path-exists@4.0.0: {}
@@ -4296,6 +4441,8 @@ snapshots:
       es-errors: 1.3.0
       set-function-name: 2.0.2
 
+  relateurl@0.2.7: {}
+
   require-directory@2.1.1: {}
 
   require-from-string@2.0.2: {}
@@ -4605,6 +4752,13 @@ snapshots:
       inherits: 2.0.4
       readable-stream: 3.6.2
 
+  terser@5.31.0:
+    dependencies:
+      '@jridgewell/source-map': 0.3.6
+      acorn: 8.10.0
+      commander: 2.20.3
+      source-map-support: 0.5.21
+
   text-table@0.2.0: {}
 
   through@2.3.8: {}
@@ -4646,6 +4800,8 @@ snapshots:
 
   tslib@1.14.1: {}
 
+  tslib@2.6.2: {}
+
   tsutils@3.21.0(typescript@5.4.5):
     dependencies:
       tslib: 1.14.1
diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
index e2c901226..457f3f22d 100644
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@@ -20,8 +20,10 @@ import "../suppressExperimentalWarnings.js";
 import "../checkNodeVersion.js";
 
 import { exec, execSync } from "child_process";
+import esbuild from "esbuild";
 import { constants as FsConstants, readFileSync } from "fs";
 import { access, readdir, readFile } from "fs/promises";
+import { minify as minifyHtml } from "html-minifier-terser";
 import { join, relative } from "path";
 import { promisify } from "util";
 
@@ -161,21 +163,62 @@ export const gitRemotePlugin = {
 /**
  * @type {import("esbuild").Plugin}
  */
-export const fileIncludePlugin = {
-    name: "file-include-plugin",
+export const fileUrlPlugin = {
+    name: "file-uri-plugin",
     setup: build => {
-        const filter = /^~fileContent\/.+$/;
+        const filter = /^file:\/\/.+$/;
         build.onResolve({ filter }, args => ({
-            namespace: "include-file",
+            namespace: "file-uri",
             path: args.path,
             pluginData: {
-                path: join(args.resolveDir, args.path.slice("include-file/".length))
+                uri: args.path,
+                path: join(args.resolveDir, args.path.slice("file://".length).split("?")[0])
             }
         }));
-        build.onLoad({ filter, namespace: "include-file" }, async ({ pluginData: { path } }) => {
-            const [name, format] = path.split(";");
+        build.onLoad({ filter, namespace: "file-uri" }, async ({ pluginData: { path, uri } }) => {
+            const { searchParams } = new URL(uri);
+            const base64 = searchParams.has("base64");
+            const minify = isStandalone === "true" && searchParams.has("minify");
+            const noTrim = searchParams.get("trim") === "false";
+
+            const encoding = base64 ? "base64" : "utf-8";
+
+            let content;
+            if (!minify) {
+                content = await readFile(path, encoding);
+                if (!noTrim) content = content.trimEnd();
+            } else {
+                if (path.endsWith(".html")) {
+                    content = await minifyHtml(await readFile(path, "utf-8"), {
+                        collapseWhitespace: true,
+                        removeComments: true,
+                        minifyCSS: true,
+                        minifyJS: true,
+                        removeEmptyAttributes: true,
+                        removeRedundantAttributes: true,
+                        removeScriptTypeAttributes: true,
+                        removeStyleLinkTypeAttributes: true,
+                        useShortDoctype: true
+                    });
+                } else if (/[mc]?[jt]sx?$/.test(path)) {
+                    const res = await esbuild.build({
+                        entryPoints: [path],
+                        write: false,
+                        minify: true,
+                        bundle: true,
+                        format: "esm"
+                    });
+                    content = res.outputFiles[0].text;
+                } else {
+                    throw new Error(`Don't know how to minify file type: ${path}`);
+                }
+
+                if (base64)
+                    content = Buffer.from(content).toString("base64");
+            }
+
             return {
-                contents: `export default ${JSON.stringify(await readFile(name, format ?? "utf-8"))}`
+                contents: `export default ${JSON.stringify(content)}`
             };
         });
     }
@@ -217,7 +260,7 @@ export const commonOpts = {
     sourcemap: watch ? "inline" : "",
     legalComments: "linked",
     banner,
-    plugins: [fileIncludePlugin, gitHashPlugin, gitRemotePlugin, stylePlugin],
+    plugins: [fileUrlPlugin, gitHashPlugin, gitRemotePlugin, stylePlugin],
     external: ["~plugins", "~git-hash", "~git-remote", "/assets/*"],
     inject: ["./scripts/build/inject/react.mjs"],
     jsxFactory: "VencordCreateElement",
diff --git a/src/main/ipcMain.ts b/src/main/ipcMain.ts
index 9c9741db5..62785867e 100644
--- a/src/main/ipcMain.ts
+++ b/src/main/ipcMain.ts
@@ -23,12 +23,11 @@ import "./settings";
 import { debounce } from "@shared/debounce";
 import { IpcEvents } from "@shared/IpcEvents";
 import { BrowserWindow, ipcMain, shell, systemPreferences } from "electron";
+import monacoHtml from "file://monacoWin.html?minify&base64";
 import { FSWatcher, mkdirSync, watch, writeFileSync } from "fs";
 import { open, readdir, readFile } from "fs/promises";
 import { join, normalize } from "path";
 
-import monacoHtml from "~fileContent/monacoWin.html;base64";
-
 import { getThemeInfo, stripBOM, UserThemeHeader } from "./themes";
 import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, THEMES_DIR } from "./utils/constants";
 import { makeLinksOpenExternally } from "./utils/externalLinks";
diff --git a/src/modules.d.ts b/src/modules.d.ts
index 489799256..83a512b00 100644
--- a/src/modules.d.ts
+++ b/src/modules.d.ts
@@ -38,7 +38,7 @@ declare module "~git-remote" {
     export default remote;
 }
 
-declare module "~fileContent/*" {
+declare module "file://*" {
     const content: string;
     export default content;
 }
diff --git a/src/plugins/shikiCodeblocks.desktop/index.ts b/src/plugins/shikiCodeblocks.desktop/index.ts
index ef1b5d3df..27463195d 100644
--- a/src/plugins/shikiCodeblocks.desktop/index.ts
+++ b/src/plugins/shikiCodeblocks.desktop/index.ts
@@ -21,8 +21,7 @@ import "./shiki.css";
 import { enableStyle } from "@api/Styles";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-
-import previewExampleText from "~fileContent/previewExample.tsx";
+import previewExampleText from "file://previewExample.tsx";
 
 import { shiki } from "./api/shiki";
 import { createHighlighter } from "./components/Highlighter";

From 41c5bbd9521eb0584b0516174247fe38f0069871 Mon Sep 17 00:00:00 2001
From: Luna <imlvnaa@gmail.com>
Date: Sun, 26 May 2024 15:44:04 -0400
Subject: [PATCH 630/632] new plugin WatchTogetherAdblock: block ads in youtube
 activity (#2021)

Co-authored-by: vee <vendicated@riseup.net>
---
 scripts/build/common.mjs                      |   4 +-
 .../watchTogetherAdblock.desktop/README.md    |   6 +
 .../watchTogetherAdblock.desktop/adguard.js   | 262 ++++++++++++++++++
 .../watchTogetherAdblock.desktop/index.ts     |  15 +
 .../watchTogetherAdblock.desktop/native.ts    |  21 ++
 5 files changed, 305 insertions(+), 3 deletions(-)
 create mode 100644 src/plugins/watchTogetherAdblock.desktop/README.md
 create mode 100644 src/plugins/watchTogetherAdblock.desktop/adguard.js
 create mode 100644 src/plugins/watchTogetherAdblock.desktop/index.ts
 create mode 100644 src/plugins/watchTogetherAdblock.desktop/native.ts

diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
index 457f3f22d..3b1473e1c 100644
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@@ -204,9 +204,7 @@ export const fileUrlPlugin = {
                     const res = await esbuild.build({
                         entryPoints: [path],
                         write: false,
-                        minify: true,
-                        bundle: true,
-                        format: "esm"
+                        minify: true
                     });
                     content = res.outputFiles[0].text;
                 } else {
diff --git a/src/plugins/watchTogetherAdblock.desktop/README.md b/src/plugins/watchTogetherAdblock.desktop/README.md
new file mode 100644
index 000000000..4c64df67b
--- /dev/null
+++ b/src/plugins/watchTogetherAdblock.desktop/README.md
@@ -0,0 +1,6 @@
+# WatchTogetherAdblock
+
+Block ads in the YouTube WatchTogether activity via AdGuard
+
+Note that this only works for yourself, other users in the activity will still see ads.
+Powered by a modified version of [Adguard's BlockYoutubeAdsShortcut](https://github.com/AdguardTeam/BlockYouTubeAdsShortcut)
diff --git a/src/plugins/watchTogetherAdblock.desktop/adguard.js b/src/plugins/watchTogetherAdblock.desktop/adguard.js
new file mode 100644
index 000000000..945f76bd5
--- /dev/null
+++ b/src/plugins/watchTogetherAdblock.desktop/adguard.js
@@ -0,0 +1,262 @@
+/* eslint-disable */
+
+/**
+ * This file is part of AdGuard's Block YouTube Ads (https://github.com/AdguardTeam/BlockYouTubeAdsShortcut).
+ *
+ * Copyright (C) AdGuard Team
+ *
+ * AdGuard's Block YouTube Ads 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.
+ *
+ * AdGuard's Block YouTube Ads 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 AdGuard's Block YouTube Ads.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+const LOGO_ID = "block-youtube-ads-logo";
+const hiddenCSS = [
+    "#__ffYoutube1",
+    "#__ffYoutube2",
+    "#__ffYoutube3",
+    "#__ffYoutube4",
+    "#feed-pyv-container",
+    "#feedmodule-PRO",
+    "#homepage-chrome-side-promo",
+    "#merch-shelf",
+    "#offer-module",
+    '#pla-shelf > ytd-pla-shelf-renderer[class="style-scope ytd-watch"]',
+    "#pla-shelf",
+    "#premium-yva",
+    "#promo-info",
+    "#promo-list",
+    "#promotion-shelf",
+    "#related > ytd-watch-next-secondary-results-renderer > #items > ytd-compact-promoted-video-renderer.ytd-watch-next-secondary-results-renderer",
+    "#search-pva",
+    "#shelf-pyv-container",
+    "#video-masthead",
+    "#watch-branded-actions",
+    "#watch-buy-urls",
+    "#watch-channel-brand-div",
+    "#watch7-branded-banner",
+    "#YtKevlarVisibilityIdentifier",
+    "#YtSparklesVisibilityIdentifier",
+    ".carousel-offer-url-container",
+    ".companion-ad-container",
+    ".GoogleActiveViewElement",
+    '.list-view[style="margin: 7px 0pt;"]',
+    ".promoted-sparkles-text-search-root-container",
+    ".promoted-videos",
+    ".searchView.list-view",
+    ".sparkles-light-cta",
+    ".watch-extra-info-column",
+    ".watch-extra-info-right",
+    ".ytd-carousel-ad-renderer",
+    ".ytd-compact-promoted-video-renderer",
+    ".ytd-companion-slot-renderer",
+    ".ytd-merch-shelf-renderer",
+    ".ytd-player-legacy-desktop-watch-ads-renderer",
+    ".ytd-promoted-sparkles-text-search-renderer",
+    ".ytd-promoted-video-renderer",
+    ".ytd-search-pyv-renderer",
+    ".ytd-video-masthead-ad-v3-renderer",
+    ".ytp-ad-action-interstitial-background-container",
+    ".ytp-ad-action-interstitial-slot",
+    ".ytp-ad-image-overlay",
+    ".ytp-ad-overlay-container",
+    ".ytp-ad-progress",
+    ".ytp-ad-progress-list",
+    '[class*="ytd-display-ad-"]',
+    '[layout*="display-ad-"]',
+    'a[href^="http://www.youtube.com/cthru?"]',
+    'a[href^="https://www.youtube.com/cthru?"]',
+    "ytd-action-companion-ad-renderer",
+    "ytd-banner-promo-renderer",
+    "ytd-compact-promoted-video-renderer",
+    "ytd-companion-slot-renderer",
+    "ytd-display-ad-renderer",
+    "ytd-promoted-sparkles-text-search-renderer",
+    "ytd-promoted-sparkles-web-renderer",
+    "ytd-search-pyv-renderer",
+    "ytd-single-option-survey-renderer",
+    "ytd-video-masthead-ad-advertiser-info-renderer",
+    "ytd-video-masthead-ad-v3-renderer",
+    "YTM-PROMOTED-VIDEO-RENDERER",
+];
+/**
+* Adds CSS to the page
+*/
+const hideElements = () => {
+    const selectors = hiddenCSS;
+    if (!selectors) {
+        return;
+    }
+    const rule = selectors.join(", ") + " { display: none!important; }";
+    const style = document.createElement("style");
+    style.innerHTML = rule;
+    document.head.appendChild(style);
+};
+/**
+* Calls the "callback" function on every DOM change, but not for the tracked events
+* @param {Function} callback callback function
+*/
+const observeDomChanges = callback => {
+    const domMutationObserver = new MutationObserver(mutations => {
+        callback(mutations);
+    });
+    domMutationObserver.observe(document.documentElement, {
+        childList: true,
+        subtree: true,
+    });
+};
+/**
+* This function is supposed to be called on every DOM change
+*/
+const hideDynamicAds = () => {
+    const elements = document.querySelectorAll("#contents > ytd-rich-item-renderer ytd-display-ad-renderer");
+    if (elements.length === 0) {
+        return;
+    }
+    elements.forEach(el => {
+        if (el.parentNode && el.parentNode.parentNode) {
+            const parent = el.parentNode.parentNode;
+            if (parent.localName === "ytd-rich-item-renderer") {
+                parent.style.display = "none";
+            }
+        }
+    });
+};
+/**
+* This function checks if the video ads are currently running
+* and auto-clicks the skip button.
+*/
+const autoSkipAds = () => {
+    // If there's a video that plays the ad at this moment, scroll this ad
+    if (document.querySelector(".ad-showing")) {
+        const video = document.querySelector("video");
+        if (video && video.duration) {
+            video.currentTime = video.duration;
+            // Skip button should appear after that,
+            // now simply click it automatically
+            setTimeout(() => {
+                const skipBtn = document.querySelector("button.ytp-ad-skip-button");
+                if (skipBtn) {
+                    skipBtn.click();
+                }
+            }, 100);
+        }
+    }
+};
+/**
+* This function overrides a property on the specified object.
+*
+* @param {object} obj object to look for properties in
+* @param {string} propertyName property to override
+* @param {*} overrideValue value to set
+*/
+const overrideObject = (obj, propertyName, overrideValue) => {
+    if (!obj) {
+        return false;
+    }
+    let overriden = false;
+    for (const key in obj) {
+        // eslint-disable-next-line no-prototype-builtins
+        if (obj.hasOwnProperty(key) && key === propertyName) {
+            obj[key] = overrideValue;
+            overriden = true;
+            // eslint-disable-next-line no-prototype-builtins
+        } else if (obj.hasOwnProperty(key) && typeof obj[key] === "object") {
+            if (overrideObject(obj[key], propertyName, overrideValue)) {
+                overriden = true;
+            }
+        }
+    }
+    return overriden;
+};
+/**
+* Overrides JSON.parse and Response.json functions.
+* Examines these functions arguments, looks for properties with the specified name there
+* and if it exists, changes it's value to what was specified.
+*
+* @param {string} propertyName name of the property
+* @param {*} overrideValue new value for the property
+*/
+const jsonOverride = (propertyName, overrideValue) => {
+    const nativeJSONParse = JSON.parse;
+    JSON.parse = (...args) => {
+        const obj = nativeJSONParse.apply(this, args);
+        // Override it's props and return back to the caller
+        overrideObject(obj, propertyName, overrideValue);
+        return obj;
+    };
+    // Override Response.prototype.json
+    const nativeResponseJson = Response.prototype.json;
+    Response.prototype.json = new Proxy(nativeResponseJson, {
+        apply(...args) {
+            // Call the target function, get the original Promise
+            const promise = Reflect.apply(...args);
+            // Create a new one and override the JSON inside
+            return new Promise((resolve, reject) => {
+                promise.then(data => {
+                    overrideObject(data, propertyName, overrideValue);
+                    resolve(data);
+                }).catch(error => reject(error));
+            });
+        },
+    });
+};
+const addAdGuardLogoStyle = () => { };
+const addAdGuardLogo = () => {
+    if (document.getElementById(LOGO_ID)) {
+        return;
+    }
+    const logo = document.createElement("span");
+    logo.innerHTML = "__logo_text__";
+    logo.setAttribute("id", LOGO_ID);
+    if (window.location.hostname === "m.youtube.com") {
+        const btn = document.querySelector("header.mobile-topbar-header > button");
+        if (btn) {
+            btn.parentNode?.insertBefore(logo, btn.nextSibling);
+            addAdGuardLogoStyle();
+        }
+    } else if (window.location.hostname === "www.youtube.com") {
+        const code = document.getElementById("country-code");
+        if (code) {
+            code.innerHTML = "";
+            code.appendChild(logo);
+            addAdGuardLogoStyle();
+        }
+    } else if (window.location.hostname === "music.youtube.com") {
+        const el = document.querySelector(".ytmusic-nav-bar#left-content");
+        if (el) {
+            el.appendChild(logo);
+            addAdGuardLogoStyle();
+        }
+    } else if (window.location.hostname === "www.youtube-nocookie.com") {
+        const code = document.querySelector("#yt-masthead #logo-container .content-region");
+        if (code) {
+            code.innerHTML = "";
+            code.appendChild(logo);
+            addAdGuardLogoStyle();
+        }
+    }
+};
+// Removes ads metadata from YouTube XHR requests
+jsonOverride("adPlacements", []);
+jsonOverride("playerAds", []);
+// Applies CSS that hides YouTube ad elements
+hideElements();
+// Some changes should be re-evaluated on every page change
+addAdGuardLogo();
+hideDynamicAds();
+autoSkipAds();
+observeDomChanges(() => {
+    addAdGuardLogo();
+    hideDynamicAds();
+    autoSkipAds();
+});
diff --git a/src/plugins/watchTogetherAdblock.desktop/index.ts b/src/plugins/watchTogetherAdblock.desktop/index.ts
new file mode 100644
index 000000000..2dbc13d4a
--- /dev/null
+++ b/src/plugins/watchTogetherAdblock.desktop/index.ts
@@ -0,0 +1,15 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+// The entire code of this plugin can be found in native.ts
+export default definePlugin({
+    name: "WatchTogetherAdblock",
+    description: "Block ads in the YouTube WatchTogether activity via AdGuard",
+    authors: [Devs.ImLvna],
+});
diff --git a/src/plugins/watchTogetherAdblock.desktop/native.ts b/src/plugins/watchTogetherAdblock.desktop/native.ts
new file mode 100644
index 000000000..c4106c349
--- /dev/null
+++ b/src/plugins/watchTogetherAdblock.desktop/native.ts
@@ -0,0 +1,21 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2023 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { RendererSettings } from "@main/settings";
+import { app } from "electron";
+import adguard from "file://adguard.js?minify";
+
+app.on("browser-window-created", (_, win) => {
+    win.webContents.on("frame-created", (_, { frame }) => {
+        frame.once("dom-ready", () => {
+            if (frame.url.includes("discordsays") && frame.url.includes("youtube.com")) {
+                if (!RendererSettings.store.plugins?.WatchTogetherAdblock?.enabled) return;
+
+                frame.executeJavaScript(adguard);
+            }
+        });
+    });
+});

From 6b4899804a64d7b2255d5b56fd19f8631dfc3600 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 26 May 2024 21:16:12 -0300
Subject: [PATCH 631/632] Summaries: Fix start error if no summaries-data exist

---
 src/plugins/seeSummaries/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/seeSummaries/index.tsx b/src/plugins/seeSummaries/index.tsx
index 04a25198c..68c4f4a61 100644
--- a/src/plugins/seeSummaries/index.tsx
+++ b/src/plugins/seeSummaries/index.tsx
@@ -87,6 +87,7 @@ export default definePlugin({
 
     async start() {
         await DataStore.update("summaries-data", summaries => {
+            summaries ??= {};
             for (const key of Object.keys(summaries)) {
                 for (let i = summaries[key].length - 1; i >= 0; i--) {
                     if (summaries[key][i].time < Date.now() - 1000 * 60 * 60 * 24 * settings.store.summaryExpiryThresholdDays) {

From 8bda3a1e6aa3285f3cd12c80821d72dac55e040d Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <ulysseszhan@pm.me>
Date: Mon, 27 May 2024 09:36:09 -0700
Subject: [PATCH 632/632] LoadingQuotes: more customization & custom quotes
 support (#1795)

Co-authored-by: lewisakura <lewi@lewisakura.moe>
Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/loadingQuotes/index.ts   | 106 +++++++++++++--------------
 src/plugins/loadingQuotes/quotes.txt |  37 ++++++++++
 2 files changed, 87 insertions(+), 56 deletions(-)
 create mode 100644 src/plugins/loadingQuotes/quotes.txt

diff --git a/src/plugins/loadingQuotes/index.ts b/src/plugins/loadingQuotes/index.ts
index 97178979c..7d85cc90b 100644
--- a/src/plugins/loadingQuotes/index.ts
+++ b/src/plugins/loadingQuotes/index.ts
@@ -18,88 +18,82 @@
 
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
+import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
+import presetQuotesText from "file://quotes.txt";
 
-// These are Xor encrypted to prevent you from spoiling yourself when you read the source code.
-// don't worry about it :P
-const quotes = [
-    "Eyrokac",
-    "Rdcg$l`'k|~n",
-    'H`tf$d&iajo+d`{"',
-    "Sucqplh`(Eclhualva()&",
-    "Lncgmka'8KNMDC,shpanf'`x./,",
-    "Ioqweijnfn*IeuvfvAotkfxo./,",
-    'Hd{#cp\x7Ft$)nbd!{lq%mig~*\x7Fh`v#mk&sm{gx nd#idjb(a\x7Ffao"bja&amdkge!Rloìkhf)hyedfjjb*\'^hzdrdmm$lu\'|ao+mnqw$fijxh~bbmg#Tjmîefd+fnp#lpkffz5',
-    "h",
-    "sijklm&cam*rot\"hjjq'|ak\x7F xmv#wc'ep*mawmvvlrb(|ynr>\"Aqq&cgg-\x7F ugoh%rom)e\x7Fhdpp%$",
-    'Tnfb}"u\'~`nno!kp$vvhfzeyee"a}%Tfam*Xh`fls%Jboldos-"lj`&hn)~ce!`jcbct|)gdbhnf$wikm$zgaxkmc%afely+og"144?\'ign+iu%p$qisiefr gpfa$',
-    "Ndtfv%ahfgk+ghtf$|ir(|z' Oguaw&`ggdj mgw$|ir(me|n",
-    "(!ͣ³$͙ʐ'ͩ¹#",
-    "(ﾈ◗ロ◑,ﾏ-2ｬﾕ✬",
-    "Ynw#hjil(ze+psgwp|&sgmkr!",
-    "Tikmolh`(fl+a!dvjk\x7F'y|e\x7Fe/,-",
-    "3/3750?5><9>885:7",
-    "mdmt",
-    "Wdn`khc+(oxbeof",
-    'Ig"zkp*\'g{*xolglj`&~g|*gowg/$mgt(Eclm`.#ticf{l*xed"wl`&Kangj igbhqn\'d`dn `v#lqrw{3%$bhv-h|)kangj_imwhlhb',
-    "Tscmw%Tnoa~x",
-    "I‘f#npus(ec`e!vl$lhsm{`ncu\"ekw&f(defeov-$Rnf|)sdu‘pf$wcam{ceg!vl$du'D`d~x-\"jw%oi(okht-\"DJP)Kags,!mq$du'A‐|n sg`akrkq)~jkdl#pj&diefbnf\"jp)&@F\\*{ltq#Hlhrp'",
-    "Ynw$v`&cg`dl fml`%rhlhs*",
-    "Dnl$p%qhz{s' hv$w%hh|aceg!;#gpvt(fl+cndea`&dg|fon&v#wjjqm(",
-    "\ud83d)pft`gs(ec`e!13$qojmz#",
-    "a!njcmr'ide~nu\"lb%rheoedldpz$lu'gbkr",
-    "dn\"zkp&kgo4",
-    "hnpqkw",
-    "sn\"fau",
-    "Sn\"tmqnh}}*musvkaw&flf&+ldv$w%lr{}*aulr#vlao|)cetn\"jp$",
-    "Dxkmc%ot(hhxomwwai'{hln",
-    "hd{#}js&(pe~'sg#gprb(3#\"",
-    "hd{b${",
-    "<;vqkijbq33271:56<3799?24944:",
-    "Thof$lu'ofdn,!qsefc'az*bnrcma+&Om{o+iu\"`khct$)bnrd\"bcdoi&",
-    "snofplkb{)c'r\"lod'|f*aurv#cpno`abchijklmno",
-    "Wdn`khc'|f*eghl{%"
-];
+const presetQuotes = presetQuotesText.split("\n").map(quote => /^\s*[^#\s]/.test(quote) && quote.trim()).filter(Boolean) as string[];
+const noQuotesQuote = "Did you really disable all loading quotes? What a buffoon you are...";
 
 const settings = definePluginSettings({
     replaceEvents: {
-        description: "Replace Event Quotes too",
+        description: "Should this plugin also apply during events with special event themed quotes? (e.g. Halloween)",
         type: OptionType.BOOLEAN,
         default: true
-    }
+    },
+    enablePluginPresetQuotes: {
+        description: "Enable the quotes preset by this plugin",
+        type: OptionType.BOOLEAN,
+        default: true
+    },
+    enableDiscordPresetQuotes: {
+        description: "Enable Discord's preset quotes (including event quotes, during events)",
+        type: OptionType.BOOLEAN,
+        default: false
+    },
+    additionalQuotes: {
+        description: "Additional custom quotes to possibly appear, separated by the below delimiter",
+        type: OptionType.STRING,
+        default: "",
+    },
+    additionalQuotesDelimiter: {
+        description: "Delimiter for additional quotes",
+        type: OptionType.STRING,
+        default: "|",
+    },
 });
 
 export default definePlugin({
     name: "LoadingQuotes",
     description: "Replace Discords loading quotes",
-    authors: [Devs.Ven, Devs.KraXen72],
+    authors: [Devs.Ven, Devs.KraXen72, Devs.UlyssesZhan],
 
     settings,
 
     patches: [
         {
-            find: ".LOADING_DID_YOU_KNOW}",
+            find: ".LOADING_DID_YOU_KNOW",
             replacement: [
                 {
-                    match: /"_loadingText",function\(\)\{/,
-                    replace: "$&return $self.quote;",
+                    match: /"_loadingText".+?(?=(\i)\[.{0,10}\.random)/,
+                    replace: "$&$self.mutateQuotes($1),"
                 },
                 {
-                    match: /"_eventLoadingText",function\(\)\{/,
-                    replace: "$&return $self.quote;",
+                    match: /"_eventLoadingText".+?(?=(\i)\[.{0,10}\.random)/,
+                    replace: "$&$self.mutateQuotes($1),",
                     predicate: () => settings.store.replaceEvents
                 }
-            ],
+            ]
         },
     ],
 
-    xor(quote: string) {
-        const key = "read if cute";
-        const codes = Array.from(quote, (s, i) => s.charCodeAt(0) ^ (i % key.length));
-        return String.fromCharCode(...codes);
-    },
+    mutateQuotes(quotes: string[]) {
+        try {
+            const { enableDiscordPresetQuotes, additionalQuotes, additionalQuotesDelimiter, enablePluginPresetQuotes } = settings.store;
 
-    get quote() {
-        return this.xor(quotes[Math.floor(Math.random() * quotes.length)]);
+            if (!enableDiscordPresetQuotes)
+                quotes.length = 0;
+
+
+            if (enablePluginPresetQuotes)
+                quotes.push(...presetQuotes);
+
+            quotes.push(...additionalQuotes.split(additionalQuotesDelimiter).filter(Boolean));
+
+            if (!quotes.length)
+                quotes.push(noQuotesQuote);
+        } catch (e) {
+            new Logger("LoadingQuotes").error("Failed to mutate quotes", e);
+        }
     }
 });
diff --git a/src/plugins/loadingQuotes/quotes.txt b/src/plugins/loadingQuotes/quotes.txt
new file mode 100644
index 000000000..cfb01350e
--- /dev/null
+++ b/src/plugins/loadingQuotes/quotes.txt
@@ -0,0 +1,37 @@
+# Blank lines and lines starting with "#" are ignored
+
+Explode
+Read if cute
+Have a nice day!
+Starting Lightcord...
+Loading 0BDFDB.plugin.js...
+Installing BetterDiscord...
+h
+shhhhh did you know that you're my favourite user? But don't tell the others!!
+Today's video is sponsored by Raid Shadow Legends, one of the biggest mobile role-playing games of 2019 and it's totally free!
+Never gonna give you up, Never gonna let you down
+( ͡° ͜ʖ ͡°)
+(ﾉ◕ヮ◕)ﾉ*:･ﾟ✧
+You look so pretty today!
+Thinking of a funny quote...
+3.141592653589793
+meow
+Welcome, friend
+If you, or someone you love, has Ligma, please see the Ligma health line at https://bit.ly/ligma_hotline
+Trans Rights
+I’d just like to interject for a moment. What you’re refering to as Linux, is in fact, GNU/Linux, or as I’ve recently taken to calling it, GNU plus Linux.
+You're doing good today!
+Don't worry, it's nothing 9 cups of coffee couldn't solve!
+�(repeat like 30 times)
+a light amount of tomfoolery is okay
+do you love?
+horror
+so eepy
+So without further ado, let's just jump right into it!
+Dying is absolutely safe
+hey you! you're cute :))
+heya ~
+<:trolley:997086295010594867>
+Time is gone, space is insane. Here it comes, here again.
+sometimes it's okay to just guhhhhhhhhhhhhhh
+Welcome to nginx!