From 727297ec4efc2b43a953a68bfed0efe6c6fffaf3 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 2 Mar 2023 18:49:09 +0100
Subject: [PATCH 001/147] Fix messageLinkEmbeds

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

diff --git a/src/plugins/messageLinkEmbeds.tsx b/src/plugins/messageLinkEmbeds.tsx
index a6b63d82c..75b99e149 100644
--- a/src/plugins/messageLinkEmbeds.tsx
+++ b/src/plugins/messageLinkEmbeds.tsx
@@ -158,11 +158,11 @@ export default definePlugin({
         {
             find: ".embedCard",
             replacement: [{
-                match: /{"use strict";(.{0,10})\(\)=>(.{1,2})}\);/,
-                replace: '{"use strict";$1()=>$2,me:()=>messageEmbed});'
+                match: /{"use strict";(.{0,10})\(\)=>(\i)}\);/,
+                replace: '{"use strict";$1()=>$2,me:()=>typeof messageEmbed !== "undefined" ? messageEmbed : null});'
             }, {
-                match: /function (.{1,2})\(.{1,2}\){var .{1,2}=.{1,2}\.message,.{1,2}=.{1,2}\.channel.{0,300}\.embedCard.{0,500}}\)}/,
-                replace: "$&;var messageEmbed={mle_AutomodEmbed:$1};"
+                match: /function (\i)\(\i\){var \i=\i\.message,\i=\i\.channel.{0,200}\.hideTimestamp/,
+                replace: "var messageEmbed={mle_AutomodEmbed:$1};$&"
             }]
         }
     ],

From d6a3edefd9f4cf71fcd96cbc44c55bfc31b088a6 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 2 Mar 2023 21:01:31 +0100
Subject: [PATCH 002/147] Rewrite MessageLinkEmbeds to improve Code Quality

---
 src/plugins/messageLinkEmbeds.tsx | 527 ++++++++++++++++--------------
 1 file changed, 283 insertions(+), 244 deletions(-)

diff --git a/src/plugins/messageLinkEmbeds.tsx b/src/plugins/messageLinkEmbeds.tsx
index 75b99e149..e7b3f7217 100644
--- a/src/plugins/messageLinkEmbeds.tsx
+++ b/src/plugins/messageLinkEmbeds.tsx
@@ -17,11 +17,13 @@
 */
 
 import { addAccessory } from "@api/MessageAccessories";
-import { Settings } from "@api/settings";
+import { definePluginSettings } from "@api/settings";
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants.js";
+import { classes, LazyComponent } from "@utils/misc";
 import { Queue } from "@utils/Queue";
 import definePlugin, { OptionType } from "@utils/types";
-import { filters, findByPropsLazy, waitFor } from "@webpack";
+import { find, findByCode, findByPropsLazy } from "@webpack";
 import {
     Button,
     ChannelStore,
@@ -36,41 +38,20 @@ import {
 } from "@webpack/common";
 import { Channel, Guild, Message } from "discord-types/general";
 
-let messageCache: { [id: string]: { message?: Message, fetched: boolean; }; } = {};
+const messageCache = new Map<string, {
+    message?: Message;
+    fetched: boolean;
+}>();
 
-let AutomodEmbed: React.ComponentType<any>,
-    Embed: React.ComponentType<any>,
-    ChannelMessage: React.ComponentType<any>,
-    Endpoints: Record<string, any>;
+const Embed = LazyComponent(() => findByCode(".inlineMediaEmbed"));
+const ChannelMessage = LazyComponent(() => find(m => m.type?.toString()?.includes('["message","compact","className",')));
 
-waitFor(["mle_AutomodEmbed"], m => (AutomodEmbed = m.mle_AutomodEmbed));
-waitFor(filters.byCode(".inlineMediaEmbed"), m => Embed = m);
-waitFor(m => m.type?.toString()?.includes('["message","compact","className",'), m => ChannelMessage = m);
-waitFor(["MESSAGE_CREATE_ATTACHMENT_UPLOAD"], _ => Endpoints = _);
 const SearchResultClasses = findByPropsLazy("message", "searchResult");
 
-const messageFetchQueue = new Queue();
-async function fetchMessage(channelID: string, messageID: string): Promise<Message | void> {
-    if (messageID in messageCache && !messageCache[messageID].fetched) return Promise.resolve();
-    if (messageCache[messageID]?.fetched) return Promise.resolve(messageCache[messageID].message);
+let AutoModEmbed: React.ComponentType<any> = () => null;
 
-    messageCache[messageID] = { fetched: false };
-    const res = await RestAPI.get({
-        url: Endpoints.MESSAGES(channelID),
-        query: {
-            limit: 1,
-            around: messageID
-        },
-        retries: 2
-    }).catch(() => { });
-    const apiMessage = res.body?.[0];
-    const message: Message = MessageStore.getMessages(apiMessage.channel_id).receiveMessage(apiMessage).get(apiMessage.id);
-    messageCache[message.id] = {
-        message: message,
-        fetched: true
-    };
-    return Promise.resolve(message);
-}
+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 {
     height: number;
@@ -79,66 +60,133 @@ interface Attachment {
     proxyURL?: string;
 }
 
-const isTenorGif = /https:\/\/(?:www.)?tenor\.com/;
-function getImages(message: Message): Attachment[] {
-    const attachments: Attachment[] = [];
-    message.attachments?.forEach(a => {
-        if (a.content_type!.startsWith("image/")) attachments.push({
-            height: a.height!,
-            width: a.width!,
-            url: a.url,
-            proxyURL: a.proxy_url!
-        });
-    });
-    message.embeds?.forEach(e => {
-        if (e.type === "image") attachments.push(
-            e.image ? { ...e.image } : { ...e.thumbnail! }
-        );
-        if (e.type === "gifv" && !isTenorGif.test(e.url!)) {
-            attachments.push({
-                height: e.thumbnail!.height,
-                width: e.thumbnail!.width,
-                url: e.url!
-            });
-        }
-    });
-    return attachments;
-}
-
-const noContent = (attachments: number, embeds: number): string => {
-    if (!attachments && !embeds) return "";
-    if (!attachments) return `[no content, ${embeds} embed${embeds !== 1 ? "s" : ""}]`;
-    if (!embeds) return `[no content, ${attachments} attachment${attachments !== 1 ? "s" : ""}]`;
-    return `[no content, ${attachments} attachment${attachments !== 1 ? "s" : ""} and ${embeds} embed${embeds !== 1 ? "s" : ""}]`;
-};
-
-function requiresRichEmbed(message: Message) {
-    if (message.attachments.every(a => a.content_type?.startsWith("image/"))
-        && message.embeds.every(e => e.type === "image" || (e.type === "gifv" && !isTenorGif.test(e.url!)))
-        && !message.components.length
-    ) return false;
-    return true;
-}
-
-const computeWidthAndHeight = (width: number, height: number) => {
-    const maxWidth = 400, maxHeight = 300;
-    let newWidth: number, newHeight: number;
-    if (width > height) {
-        newWidth = Math.min(width, maxWidth);
-        newHeight = Math.round(height / (width / newWidth));
-    } else {
-        newHeight = Math.min(height, maxHeight);
-        newWidth = Math.round(width / (height / newHeight));
-    }
-    return { width: newWidth, height: newHeight };
-};
-
 interface MessageEmbedProps {
     message: Message;
     channel: Channel;
     guildID: string;
 }
 
+const messageFetchQueue = new Queue();
+
+const settings = definePluginSettings({
+    messageBackgroundColor: {
+        description: "Background color for messages in rich embeds",
+        type: OptionType.BOOLEAN
+    },
+    automodEmbeds: {
+        description: "Use automod embeds instead of rich embeds (smaller but less info)",
+        type: OptionType.SELECT,
+        options: [
+            {
+                label: "Always use automod embeds",
+                value: "always"
+            },
+            {
+                label: "Prefer automod embeds, but use rich embeds if some content can't be shown",
+                value: "prefer"
+            },
+            {
+                label: "Never use automod embeds",
+                value: "never",
+                default: true
+            }
+        ]
+    },
+    clearMessageCache: {
+        type: OptionType.COMPONENT,
+        description: "Clear the linked message cache",
+        component: () =>
+            <Button onClick={() => messageCache.clear()}>
+                Clear the linked message cache
+            </Button>
+    }
+});
+
+
+async function fetchMessage(channelID: string, messageID: string) {
+    const cached = messageCache.get(messageID);
+    if (cached) return cached.message;
+
+    messageCache.set(messageID, { fetched: false });
+
+    const res = await RestAPI.get({
+        url: `/channels/${channelID}/messages`,
+        query: {
+            limit: 1,
+            around: messageID
+        },
+        retries: 2
+    }).catch(() => null);
+
+    const msg = res?.body?.[0];
+    if (!msg) return;
+
+    const message: Message = MessageStore.getMessages(msg.channel_id).receiveMessage(msg).get(msg.id);
+
+    messageCache.set(message.id, {
+        message,
+        fetched: true
+    });
+
+    return message;
+}
+
+
+function getImages(message: Message): Attachment[] {
+    const attachments: Attachment[] = [];
+
+    for (const { content_type, height, width, url, proxy_url } of message.attachments ?? []) {
+        if (content_type?.startsWith("image/"))
+            attachments.push({
+                height: height!,
+                width: width!,
+                url: url,
+                proxyURL: proxy_url!
+            });
+    }
+
+    for (const { type, image, thumbnail, url } of message.embeds ?? []) {
+        if (type === "image")
+            attachments.push({ ...(image ?? thumbnail!) });
+        else if (url && type === "gifv" && !tenorRegex.test(url))
+            attachments.push({
+                height: thumbnail!.height,
+                width: thumbnail!.width,
+                url
+            });
+    }
+
+    return attachments;
+}
+
+function noContent(attachments: number, embeds: number) {
+    if (!attachments && !embeds) return "";
+    if (!attachments) return `[no content, ${embeds} embed${embeds !== 1 ? "s" : ""}]`;
+    if (!embeds) return `[no content, ${attachments} attachment${attachments !== 1 ? "s" : ""}]`;
+    return `[no content, ${attachments} attachment${attachments !== 1 ? "s" : ""} and ${embeds} embed${embeds !== 1 ? "s" : ""}]`;
+}
+
+function requiresRichEmbed(message: Message) {
+    if (message.components.length) return true;
+    if (message.attachments.some(a => a.content_type?.startsWith("image/"))) return true;
+    if (message.embeds.some(e => e.type === "image" || (e.type === "gifv" && !tenorRegex.test(e.url!)))) return true;
+
+    return false;
+}
+
+function computeWidthAndHeight(width: number, height: number) {
+    const maxWidth = 400;
+    const maxHeight = 300;
+
+    if (width > height) {
+        const adjustedWidth = Math.min(width, maxWidth);
+        return { width: adjustedWidth, height: Math.round(height / (width / adjustedWidth)) };
+    }
+
+    const adjustedHeight = Math.min(height, maxHeight);
+    return { width: Math.round(width / (height / adjustedHeight)), height: adjustedHeight };
+}
+
 function withEmbeddedBy(message: Message, embeddedBy: string[]) {
     return new Proxy(message, {
         get(_, prop) {
@@ -149,181 +197,172 @@ function withEmbeddedBy(message: Message, embeddedBy: string[]) {
     });
 }
 
+
+function MessageEmbedAccessory({ message }: { message: Message; }) {
+    // @ts-ignore
+    const embeddedBy: string[] = message.vencordEmbeddedBy ?? [];
+
+    const accessories = [] as (JSX.Element | null)[];
+
+    let match = null as RegExpMatchArray | null;
+    while ((match = messageLinkRegex.exec(message.content!)) !== null) {
+        const [_, guildID, channelID, messageID] = match;
+        if (embeddedBy.includes(messageID)) {
+            continue;
+        }
+
+        const linkedChannel = ChannelStore.getChannel(channelID);
+        if (!linkedChannel || (guildID !== "@me" && !PermissionStore.can(1024n /* view channel */, linkedChannel))) {
+            continue;
+        }
+
+        let linkedMessage = messageCache.get(messageID)?.message;
+        if (!linkedMessage) {
+            linkedMessage ??= MessageStore.getMessage(channelID, messageID);
+            if (linkedMessage) {
+                messageCache.set(messageID, { message: linkedMessage, fetched: true });
+            } else {
+                const msg = { ...message } as any;
+                delete msg.embeds;
+                messageFetchQueue.push(() => fetchMessage(channelID, messageID)
+                    .then(m => m && FluxDispatcher.dispatch({
+                        type: "MESSAGE_UPDATE",
+                        message: msg
+                    }))
+                );
+                continue;
+            }
+        }
+
+        const messageProps: MessageEmbedProps = {
+            message: withEmbeddedBy(linkedMessage, [...embeddedBy, message.id]),
+            channel: linkedChannel,
+            guildID
+        };
+
+        const type = settings.store.automodEmbeds;
+        accessories.push(
+            type === "always" || (type === "prefer" && !requiresRichEmbed(linkedMessage))
+                ? <AutomodEmbedAccessory {...messageProps} />
+                : <ChannelMessageEmbedAccessory {...messageProps} />
+        );
+    }
+
+    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);
+    const dmReceiver = UserStore.getUser(ChannelStore.getChannel(channel.id).recipients?.[0]);
+
+
+    return <Embed
+        embed={{
+            rawDescription: "",
+            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}>`)
+                    }
+                </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>
+        )}
+    />;
+}
+
+function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
+    const { message, channel, guildID } = props;
+
+    const isDM = guildID === "@me";
+    const images = getImages(message);
+    const { parse } = Parser;
+
+    return <AutoModEmbed
+        channel={channel}
+        childrenAccessories={
+            <Text color="text-muted" variant="text-xs/medium" tag="span">
+                {isDM
+                    ? parse(`<@${ChannelStore.getChannel(channel.id).recipients[0]}>`)
+                    : parse(`<#${channel.id}>`)
+                },
+                <span>{isDM ? " - Direct Message" : " - " + GuildStore.getGuild(channel.guild_id)?.name}</span>
+            </Text>
+        }
+        compact={false}
+        content={
+            <>
+                {message.content || message.attachments.length <= images.length
+                    ? parse(message.content)
+                    : [noContent(message.attachments.length, message.embeds.length)]
+                }
+                {images.map(a => {
+                    const { width, height } = computeWidthAndHeight(a.width, a.height);
+                    return (
+                        <div>
+                            <img src={a.url} width={width} height={height} />
+                        </div>
+                    );
+                })}
+            </>
+        }
+        hideTimestamp={false}
+        message={message}
+        _messageEmbed="automod"
+    />;
+}
+
 export default definePlugin({
     name: "MessageLinkEmbeds",
     description: "Adds a preview to messages that link another message",
-    authors: [Devs.TheSun],
+    authors: [Devs.TheSun, Devs.Ven],
     dependencies: ["MessageAccessoriesAPI"],
     patches: [
         {
             find: ".embedCard",
             replacement: [{
-                match: /{"use strict";(.{0,10})\(\)=>(\i)}\);/,
-                replace: '{"use strict";$1()=>$2,me:()=>typeof messageEmbed !== "undefined" ? messageEmbed : null});'
-            }, {
                 match: /function (\i)\(\i\){var \i=\i\.message,\i=\i\.channel.{0,200}\.hideTimestamp/,
-                replace: "var messageEmbed={mle_AutomodEmbed:$1};$&"
+                replace: "$self.AutoModEmbed=$1;$&"
             }]
         }
     ],
-    options: {
-        messageBackgroundColor: {
-            description: "Background color for messages in rich embeds",
-            type: OptionType.BOOLEAN
-        },
-        automodEmbeds: {
-            description: "Use automod embeds instead of rich embeds (smaller but less info)",
-            type: OptionType.SELECT,
-            options: [{
-                label: "Always use automod embeds",
-                value: "always"
-            }, {
-                label: "Prefer automod embeds, but use rich embeds if some content can't be shown",
-                value: "prefer"
-            }, {
-                label: "Never use automod embeds",
-                value: "never",
-                default: true
-            }]
-        },
-        clearMessageCache: {
-            type: OptionType.COMPONENT,
-            description: "Clear the linked message cache",
-            component: () =>
-                <Button onClick={() => messageCache = {}}>
-                    Clear the linked message cache
-                </Button>
-        }
+
+    set AutoModEmbed(e: any) {
+        AutoModEmbed = e;
     },
 
+    settings,
+
     start() {
-        addAccessory("messageLinkEmbed", props => this.messageEmbedAccessory(props), 4 /* just above rich embeds*/);
-    },
+        addAccessory("messageLinkEmbed", props => {
+            if (!messageLinkRegex.test(props.message.content))
+                return null;
 
-    messageLinkRegex: /(?<!<)https?:\/\/(?:\w+\.)?discord(?:app)?\.com\/channels\/(\d{17,19}|@me)\/(\d{17,19})\/(\d{17,19})/g,
+            // need to reset the regex because it's global
+            messageLinkRegex.lastIndex = 0;
 
-    messageEmbedAccessory(props) {
-        const { message }: { message: Message; } = props;
-        // @ts-ignore
-        const embeddedBy: string[] = message.vencordEmbeddedBy ?? [];
-
-        const accessories = [] as (JSX.Element | null)[];
-
-        let match = null as RegExpMatchArray | null;
-        while ((match = this.messageLinkRegex.exec(message.content!)) !== null) {
-            const [_, guildID, channelID, messageID] = match;
-            if (embeddedBy.includes(messageID)) {
-                continue;
-            }
-
-            const linkedChannel = ChannelStore.getChannel(channelID);
-            if (!linkedChannel || (guildID !== "@me" && !PermissionStore.can(1024n /* view channel */, linkedChannel))) {
-                continue;
-            }
-
-            let linkedMessage = messageCache[messageID]?.message;
-            if (!linkedMessage) {
-                linkedMessage ??= MessageStore.getMessage(channelID, messageID);
-                if (linkedMessage) messageCache[messageID] = { message: linkedMessage, fetched: true };
-                else {
-                    const msg = { ...message } as any;
-                    delete msg.embeds;
-                    messageFetchQueue.push(() => fetchMessage(channelID, messageID)
-                        .then(m => m && FluxDispatcher.dispatch({
-                            type: "MESSAGE_UPDATE",
-                            message: msg
-                        }))
-                    );
-                    continue;
-                }
-            }
-            const messageProps: MessageEmbedProps = {
-                message: withEmbeddedBy(linkedMessage, [...embeddedBy, message.id]),
-                channel: linkedChannel,
-                guildID
-            };
-
-            const type = Settings.plugins[this.name].automodEmbeds;
-            accessories.push(
-                type === "always" || (type === "prefer" && !requiresRichEmbed(linkedMessage))
-                    ? this.automodEmbedAccessory(messageProps)
-                    : this.channelMessageEmbedAccessory(messageProps)
+            return (
+                <ErrorBoundary>
+                    <MessageEmbedAccessory message={props.message} />
+                </ErrorBoundary>
             );
-        }
-        return accessories;
-    },
-
-    channelMessageEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
-        const { message, channel, guildID } = props;
-
-        const isDM = guildID === "@me";
-        const guild = !isDM && GuildStore.getGuild(channel.guild_id);
-        const dmReceiver = UserStore.getUser(ChannelStore.getChannel(channel.id).recipients?.[0]);
-        const classNames = [SearchResultClasses.message];
-        if (Settings.plugins[this.name].messageBackgroundColor) classNames.push(SearchResultClasses.searchResult);
-
-        return <Embed
-            embed={{
-                rawDescription: "",
-                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}>`)
-                            )
-                        ]}
-                    </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={() => {
-                return <div key={message.id} className={classNames.join(" ")}>
-                    <ChannelMessage
-                        id={`message-link-embeds-${message.id}`}
-                        message={message}
-                        channel={channel}
-                        subscribeToComponentDispatch={false}
-                    />
-                </div >;
-            }}
-        />;
-    },
-
-    automodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
-        const { message, channel, guildID } = props;
-
-        const isDM = guildID === "@me";
-        const images = getImages(message);
-        const { parse } = Parser;
-
-        return <AutomodEmbed
-            channel={channel}
-            childrenAccessories={<Text color="text-muted" variant="text-xs/medium" tag="span">
-                {[
-                    ...(isDM ? parse(`<@${ChannelStore.getChannel(channel.id).recipients[0]}>`) : parse(`<#${channel.id}>`)),
-                    <span>{isDM ? " - Direct Message" : " - " + GuildStore.getGuild(channel.guild_id)?.name}</span>
-                ]}
-            </Text>}
-            compact={false}
-            content={[
-                ...(message.content || !(message.attachments.length > images.length)
-                    ? parse(message.content)
-                    : [noContent(message.attachments.length, message.embeds.length)]
-                ),
-                ...(images.map<JSX.Element>(a => {
-                    const { width, height } = computeWidthAndHeight(a.width, a.height);
-                    return <div><img src={a.url} width={width} height={height} /></div>;
-                }
-                ))
-            ]}
-            hideTimestamp={false}
-            message={message}
-            _messageEmbed="automod"
-        />;
+        }, 4 /* just above rich embeds */);
     },
 });

From ab8c93fbacb78d9358dfc5e8f5b2deb75e12d283 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 2 Mar 2023 21:05:09 +0100
Subject: [PATCH 003/147] Rewrite MessageLinkEmbeds part 2

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

diff --git a/src/plugins/messageLinkEmbeds.tsx b/src/plugins/messageLinkEmbeds.tsx
index e7b3f7217..7ca579410 100644
--- a/src/plugins/messageLinkEmbeds.tsx
+++ b/src/plugins/messageLinkEmbeds.tsx
@@ -168,8 +168,8 @@ function noContent(attachments: number, embeds: number) {
 
 function requiresRichEmbed(message: Message) {
     if (message.components.length) return true;
-    if (message.attachments.some(a => a.content_type?.startsWith("image/"))) return true;
-    if (message.embeds.some(e => e.type === "image" || (e.type === "gifv" && !tenorRegex.test(e.url!)))) return true;
+    if (message.attachments.some(a => !a.content_type?.startsWith("image/"))) return true;
+    if (message.embeds.some(e => e.type !== "image" && (e.type !== "gifv" || tenorRegex.test(e.url!)))) return true;
 
     return false;
 }

From 5e2ec368ad6136b8b6e4d71011e1d4187ea81aa8 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 2 Mar 2023 21:16:03 +0100
Subject: [PATCH 004/147] patches: Make $self more robust

---
 src/utils/patches.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/utils/patches.ts b/src/utils/patches.ts
index 8ecd68e80..0f83d4003 100644
--- a/src/utils/patches.ts
+++ b/src/utils/patches.ts
@@ -27,9 +27,13 @@ export function canonicalizeMatch(match: RegExp | string) {
     return new RegExp(canonSource, match.flags);
 }
 
-export function canonicalizeReplace(replace: string | ReplaceFn, pluginName: string) {
-    if (typeof replace === "function") return replace;
-    return replace.replaceAll("$self", `Vencord.Plugins.plugins.${pluginName}`);
+export function canonicalizeReplace(replace: string | ReplaceFn, pluginName: string): string | ReplaceFn {
+    const self = `Vencord.Plugins.plugins[${JSON.stringify(pluginName)}]`;
+
+    if (typeof replace !== "function")
+        return replace.replaceAll("$self", self);
+
+    return (...args) => replace(...args).replaceAll("$self", self);
 }
 
 export function canonicalizeDescriptor<T>(descriptor: TypedPropertyDescriptor<T>, canonicalize: (value: T) => T) {

From 03915b7533b1548a971a0aca7c862dc7fcae4f0d Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 2 Mar 2023 21:19:33 +0100
Subject: [PATCH 005/147] Bump to v1.1.0

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

diff --git a/package.json b/package.json
index b077380d1..97ce55c4e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.0.9",
+    "version": "1.1.0",
     "description": "The cutest Discord client mod",
     "keywords": [],
     "homepage": "https://github.com/Vendicated/Vencord#readme",

From 6747276a875567e90be059da63ff1734a9fd4910 Mon Sep 17 00:00:00 2001
From: megumin <megumin.bakaretsurie@gmail.com>
Date: Fri, 3 Mar 2023 23:07:48 +0000
Subject: [PATCH 006/147] Add admin warnings to INSTALLING.md (#561)

---
 docs/1_INSTALLING.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/1_INSTALLING.md b/docs/1_INSTALLING.md
index 96f1bed56..643a1e7a4 100644
--- a/docs/1_INSTALLING.md
+++ b/docs/1_INSTALLING.md
@@ -31,12 +31,14 @@ Welcome to Megu's Installation Guide! In this file, you will learn about how to
 
 Install `pnpm`:
 
-> :exclamation: this may need to be run as admin depending on your system, and you may need to close and reopen your terminal.
+> :exclamation: This next command may need to be run as admin/sudo depending on your system, and you may need to close and reopen your terminal for pnpm to be in your PATH.
 
 ```shell
 npm i -g pnpm
 ```
 
+> :exclamation: **IMPORTANT** Make sure you aren't using an admin/sudo terminal from here onwards. It **will** mess up your Discord/Vencord instance and you **will** most likely have to reinstall.
+
 Clone Vencord:
 
 ```shell

From 92372bde1d422e2daf2e24dd05ae5f4d73f5ebcb Mon Sep 17 00:00:00 2001
From: Berlin <39058370+somerandomcloud@users.noreply.github.com>
Date: Sat, 4 Mar 2023 00:55:21 +0100
Subject: [PATCH 007/147] Update 1_INSTALLING.md (#562)

---
 docs/1_INSTALLING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/1_INSTALLING.md b/docs/1_INSTALLING.md
index 643a1e7a4..7fcd57abd 100644
--- a/docs/1_INSTALLING.md
+++ b/docs/1_INSTALLING.md
@@ -37,7 +37,7 @@ Install `pnpm`:
 npm i -g pnpm
 ```
 
-> :exclamation: **IMPORTANT** Make sure you aren't using an admin/sudo terminal from here onwards. It **will** mess up your Discord/Vencord instance and you **will** most likely have to reinstall.
+> :exclamation: **IMPORTANT** Make sure you aren't using an admin/root terminal from here onwards. It **will** mess up your Discord/Vencord instance and you **will** most likely have to reinstall.
 
 Clone Vencord:
 

From cab72e1be627fb7cb06725d0a3e262e214de170f Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 4 Mar 2023 18:40:37 +0100
Subject: [PATCH 008/147] Strongly type useSettings (supersedes #559)

---
 src/api/settings.ts                     | 18 +++++++++++++++---
 src/components/PluginSettings/index.tsx |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/api/settings.ts b/src/api/settings.ts
index c551df03b..1ca26116b 100644
--- a/src/api/settings.ts
+++ b/src/api/settings.ts
@@ -167,11 +167,11 @@ export const Settings = makeProxy(settings);
  * @returns Settings
  */
 // TODO: Representing paths as essentially "string[].join('.')" wont allow dots in paths, change to "paths?: string[][]" later
-export function useSettings(paths?: string[]) {
+export function useSettings(paths?: UseSettings<Settings>[]) {
     const [, forceUpdate] = React.useReducer(() => ({}), {});
 
     const onUpdate: SubscriptionCallback = paths
-        ? (value, path) => paths.includes(path) && forceUpdate()
+        ? (value, path) => paths.includes(path as UseSettings<Settings>) && forceUpdate()
         : forceUpdate;
 
     React.useEffect(() => {
@@ -229,7 +229,7 @@ export function definePluginSettings<D extends SettingsDefinition, C extends Set
             return Settings.plugins[definedSettings.pluginName] as any;
         },
         use: settings => useSettings(
-            settings?.map(name => `plugins.${definedSettings.pluginName}.${name}`)
+            settings?.map(name => `plugins.${definedSettings.pluginName}.${name}`) as UseSettings<Settings>[]
         ).plugins[definedSettings.pluginName] as any,
         def,
         checks: checks ?? {},
@@ -237,3 +237,15 @@ export function definePluginSettings<D extends SettingsDefinition, C extends Set
     };
     return definedSettings;
 }
+
+type UseSettings<T extends object> = ResolveUseSettings<T>[keyof T];
+
+type ResolveUseSettings<T extends object> = {
+    [Key in keyof T]:
+    Key extends string
+    ? T[Key] extends Record<string, unknown>
+    // @ts-ignore "Type instantiation is excessively deep and possibly infinite"
+    ? UseSettings<T[Key]> extends string ? `${Key}.${UseSettings<T[Key]>}` : never
+    : Key
+    : never;
+};
diff --git a/src/components/PluginSettings/index.tsx b/src/components/PluginSettings/index.tsx
index 3d69a607d..02d89f81f 100644
--- a/src/components/PluginSettings/index.tsx
+++ b/src/components/PluginSettings/index.tsx
@@ -93,7 +93,7 @@ interface PluginCardProps extends React.HTMLProps<HTMLDivElement> {
 }
 
 function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, onMouseLeave, isNew }: PluginCardProps) {
-    const settings = useSettings([`plugins.${plugin.name}`]).plugins[plugin.name];
+    const settings = useSettings([`plugins.${plugin.name}.enabled`]).plugins[plugin.name];
 
     const isEnabled = () => settings.enabled ?? false;
 

From e219aaa062563202c6b723ada06f115437ab35a7 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 4 Mar 2023 14:49:15 -0300
Subject: [PATCH 009/147] Notifications: Permanent option and close button
 (#563)

Co-authored-by: Ven <vendicated@riseup.net>
---
 .../Notifications/NotificationComponent.tsx   | 33 ++++++++++++++++---
 src/api/Notifications/Notifications.tsx       |  2 ++
 src/api/Notifications/styles.css              | 33 ++++++++++++++++---
 3 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/src/api/Notifications/NotificationComponent.tsx b/src/api/Notifications/NotificationComponent.tsx
index 036cacd00..29cd68f35 100644
--- a/src/api/Notifications/NotificationComponent.tsx
+++ b/src/api/Notifications/NotificationComponent.tsx
@@ -20,7 +20,7 @@ import "./styles.css";
 
 import { useSettings } from "@api/settings";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { Forms, React, useEffect, useMemo, useState, useStateFromStores, WindowStore } from "@webpack/common";
+import { React, useEffect, useMemo, useState, useStateFromStores, WindowStore } from "@webpack/common";
 
 import { NotificationData } from "./Notifications";
 
@@ -32,7 +32,8 @@ export default ErrorBoundary.wrap(function NotificationComponent({
     icon,
     onClick,
     onClose,
-    image
+    image,
+    permanent
 }: NotificationData) {
     const { timeout, position } = useSettings(["notifications.timeout", "notifications.position"]).notifications;
     const hasFocus = useStateFromStores([WindowStore], () => WindowStore.isFocused());
@@ -43,7 +44,7 @@ export default ErrorBoundary.wrap(function NotificationComponent({
     const start = useMemo(() => Date.now(), [timeout, isHover, hasFocus]);
 
     useEffect(() => {
-        if (isHover || !hasFocus || timeout === 0) return void setElapsed(0);
+        if (isHover || !hasFocus || timeout === 0 || permanent) return void setElapsed(0);
 
         const intervalId = setInterval(() => {
             const elapsed = Date.now() - start;
@@ -74,14 +75,36 @@ export default ErrorBoundary.wrap(function NotificationComponent({
             <div className="vc-notification">
                 {icon && <img className="vc-notification-icon" src={icon} alt="" />}
                 <div className="vc-notification-content">
-                    <Forms.FormTitle tag="h2">{title}</Forms.FormTitle>
+                    <div className="vc-notification-header">
+                        <h2 className="vc-notification-title">{title}</h2>
+                        <button
+                            style={{ all: "unset", cursor: "pointer" }}
+                            onClick={e => {
+                                e.preventDefault();
+                                e.stopPropagation();
+                                onClose!();
+                            }}
+                        >
+                            <svg
+                                className="vc-notification-close-btn"
+                                width="24"
+                                height="24"
+                                viewBox="0 0 24 24"
+                                role="img"
+                                aria-labelledby="vc-notification-dismiss-title"
+                            >
+                                <title id="vc-notification-dismiss-title">Dismiss Notification</title>
+                                <path fill="currentColor" d="M18.4 4L12 10.4L5.6 4L4 5.6L10.4 12L4 18.4L5.6 20L12 13.6L18.4 20L20 18.4L13.6 12L20 5.6L18.4 4Z" />
+                            </svg>
+                        </button>
+                    </div>
                     <div>
                         {richBody ?? <p className="vc-notification-p">{body}</p>}
                     </div>
                 </div>
             </div>
             {image && <img className="vc-notification-img" src={image} alt="" />}
-            {timeout !== 0 && (
+            {timeout !== 0 && !permanent && (
                 <div
                     className="vc-notification-progressbar"
                     style={{ width: `${(1 - timeoutProgress) * 100}%`, backgroundColor: color || "var(--brand-experiment)" }}
diff --git a/src/api/Notifications/Notifications.tsx b/src/api/Notifications/Notifications.tsx
index 46472ad36..a6b2ccd97 100644
--- a/src/api/Notifications/Notifications.tsx
+++ b/src/api/Notifications/Notifications.tsx
@@ -54,6 +54,8 @@ export interface NotificationData {
     onClick?(): void;
     onClose?(): void;
     color?: string;
+    /** Whether this notification should not have a timeout */
+    permanent?: boolean;
 }
 
 function _showNotification(notification: NotificationData, id: number) {
diff --git a/src/api/Notifications/styles.css b/src/api/Notifications/styles.css
index 84d8ff777..a3db81e6a 100644
--- a/src/api/Notifications/styles.css
+++ b/src/api/Notifications/styles.css
@@ -22,17 +22,40 @@
     gap: 1.25rem;
 }
 
+.vc-notification-content {
+    width: 100%;
+}
+
+.vc-notification-header {
+    display: flex;
+    justify-content: space-between;
+}
+
+.vc-notification-title {
+    color: var(--header-primary);
+    font-size: 1rem;
+    font-weight: 600;
+    line-height: 1.25rem;
+    text-transform: uppercase;
+}
+
+.vc-notification-close-btn {
+    color: var(--interactive-normal);
+    opacity: 0.5;
+    transition: opacity 0.2s ease-in-out, color 0.2s ease-in-out;
+}
+
+.vc-notification-close-btn:hover {
+    color: var(--interactive-hover);
+    opacity: 1;
+}
+
 .vc-notification-icon {
     height: 4rem;
     width: 4rem;
     border-radius: 6px;
 }
 
-/* Discord adding 3km margin to generic tags */
-.vc-notification h2 {
-    margin: unset;
-}
-
 .vc-notification-progressbar {
     height: 0.25rem;
     border-radius: 5px;

From abbd298b31508b9519294dc23b7b19e3df38956b Mon Sep 17 00:00:00 2001
From: Sammy <sammy@sammcheese.net>
Date: Sun, 5 Mar 2023 22:05:46 +0100
Subject: [PATCH 010/147] Fix(InvisibleChat) Fix chatbar icon patch (closes
 #560) (#566)

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

diff --git a/src/plugins/invisibleChat/index.tsx b/src/plugins/invisibleChat/index.tsx
index a83d47b84..d3358be43 100644
--- a/src/plugins/invisibleChat/index.tsx
+++ b/src/plugins/invisibleChat/index.tsx
@@ -91,8 +91,8 @@ function ChatBarIcon() {
                             <svg
                                 aria-hidden
                                 role="img"
-                                width="24"
-                                height="24"
+                                width="32"
+                                height="32"
                                 viewBox={"0 0 64 64"}
                                 style={{ scale: "1.1" }}
                             >
@@ -131,8 +131,8 @@ export default definePlugin({
         {
             find: ".activeCommandOption",
             replacement: {
-                match: /.=.\.activeCommand,.=.\.activeCommandOption,.{1,133}(.)=\[\];/,
-                replace: "$&;$1.push($self.chatBarIcon());",
+                match: /(.)\.push.{1,50}\(\i,\{.{1,30}\},"gift"\)\)/,
+                replace: "$&;try{$1.push($self.chatBarIcon())}catch{}",
             }
         },
     ],

From a5392e5c53675e5206a4d5fcf97b9d6a8d07727b Mon Sep 17 00:00:00 2001
From: Nico <nico@d3sox.me>
Date: Sun, 5 Mar 2023 22:30:37 +0100
Subject: [PATCH 011/147] fix(silentTyping): fix chatbar icon patch (#570)

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

diff --git a/src/plugins/silentTyping.tsx b/src/plugins/silentTyping.tsx
index 78bb92ea0..83f64153f 100644
--- a/src/plugins/silentTyping.tsx
+++ b/src/plugins/silentTyping.tsx
@@ -82,8 +82,8 @@ export default definePlugin({
             find: ".activeCommandOption",
             predicate: () => settings.store.showIcon,
             replacement: {
-                match: /\i=\i\.activeCommand,\i=\i\.activeCommandOption,.{1,133}(.)=\[\];/,
-                replace: "$&;$1.push($self.chatBarIcon());",
+                match: /(.)\.push.{1,50}\(\i,\{.{1,30}\},"gift"\)\)/,
+                replace: "$&;try{$1.push($self.chatBarIcon())}catch{}",
             }
         },
     ],

From bed5e98bb03a2c7073f9f421a396fa7616d56ac5 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 5 Mar 2023 18:49:59 -0300
Subject: [PATCH 012/147] Misc fixes and improvements (#555)

Co-authored-by: Ven <vendicated@riseup.net>
---
 src/plugins/fakeNitro.ts                       |  6 +++---
 src/plugins/noScreensharePreview.ts            |  6 +++---
 .../components/HiddenChannelLockScreen.tsx     | 18 ++++++++++++++----
 src/plugins/showHiddenChannels/index.tsx       | 13 ++++++++-----
 src/plugins/typingTweaks.tsx                   |  2 +-
 src/plugins/webhookTags.ts                     |  4 ++--
 6 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/plugins/fakeNitro.ts b/src/plugins/fakeNitro.ts
index 22ffb8009..a09a95a39 100644
--- a/src/plugins/fakeNitro.ts
+++ b/src/plugins/fakeNitro.ts
@@ -87,11 +87,11 @@ export default definePlugin({
                 },
                 {
                     match: /(?<=\.(?:canUseEmojisEverywhere|canUseAnimatedEmojis)\(\i)(?=\))/g,
-                    replace: ",fakeNitroIntention"
+                    replace: ',typeof fakeNitroIntention!=="undefined"?fakeNitroIntention:void 0'
                 },
                 {
                     match: /(?<=&&!\i&&)!(?<canUseExternal>\i)(?=\)return \i\.\i\.DISALLOW_EXTERNAL;)/,
-                    replace: `(!$<canUseExternal>&&![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention))`
+                    replace: `(!$<canUseExternal>&&(typeof fakeNitroIntention==="undefined"||![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)))`
                 }
             ]
         },
@@ -100,7 +100,7 @@ export default definePlugin({
             predicate: () => Settings.plugins.FakeNitro.enableEmojiBypass === true,
             replacement: {
                 match: /(?<=(?:canUseEmojisEverywhere|canUseAnimatedEmojis):function\((?<user>\i))\){(?<premiumCheck>.+?\))/g,
-                replace: `,fakeNitroIntention){$<premiumCheck>||fakeNitroIntention===undefined||[${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)`
+                replace: `,fakeNitroIntention){$<premiumCheck>||fakeNitroIntention==null||[${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)`
             }
         },
         {
diff --git a/src/plugins/noScreensharePreview.ts b/src/plugins/noScreensharePreview.ts
index 5641ea3d7..b09f20636 100644
--- a/src/plugins/noScreensharePreview.ts
+++ b/src/plugins/noScreensharePreview.ts
@@ -27,10 +27,10 @@ export default definePlugin({
         {
             find: '("ApplicationStreamPreviewUploadManager")',
             replacement: [
-                ".\\.default\\.makeChunkedRequest\\(",
-                ".{1,2}\\..\\.post\\({url:"
+                "\\i\\.default\\.makeChunkedRequest\\(",
+                "\\i\\.\\i\\.post\\({url:"
             ].map(match => ({
-                match: new RegExp(`return\\[(?<code>\\d),${match}.\\..{1,3}\\.STREAM_PREVIEW.+?}\\)\\];`),
+                match: new RegExp(`return\\[(?<code>\\d),${match}\\i\\.\\i\\.STREAM_PREVIEW.+?}\\)\\];`),
                 replace: 'return[$<code>,Promise.resolve({body:"",status:204})];'
             }))
         },
diff --git a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
index 7e66a6a1c..01bc3a7c6 100644
--- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
+++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
@@ -19,9 +19,11 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { LazyComponent } from "@utils/misc";
 import { formatDuration } from "@utils/text";
-import { find, findByCode, findByPropsLazy } from "@webpack";
+import { find, findByPropsLazy } from "@webpack";
 import { FluxDispatcher, GuildMemberStore, GuildStore, moment, Parser, SnowflakeUtils, Text, Timestamp, Tooltip } from "@webpack/common";
 import { Channel } from "discord-types/general";
+import type { ComponentType } from "react";
+
 
 enum SortOrderTypes {
     LATEST_ACTIVITY = 0,
@@ -73,6 +75,17 @@ enum ChannelFlags {
     REQUIRE_TAG = 1 << 4
 }
 
+let EmojiComponent: ComponentType<any>;
+let ChannelBeginHeader: ComponentType<any>;
+
+export function setEmojiComponent(component: ComponentType<any>) {
+    EmojiComponent = component;
+}
+
+export function setChannelBeginHeaderComponent(component: ComponentType<any>) {
+    ChannelBeginHeader = component;
+}
+
 const ChatScrollClasses = findByPropsLazy("auto", "content", "scrollerBase");
 const TagComponent = LazyComponent(() => find(m => {
     if (typeof m !== "function") return false;
@@ -81,9 +94,6 @@ const TagComponent = LazyComponent(() => find(m => {
     // Get the component which doesn't include increasedActivity logic
     return code.includes(".Messages.FORUM_TAG_A11Y_FILTER_BY_TAG") && !code.includes("increasedActivityPill");
 }));
-const EmojiComponent = LazyComponent(() => findByCode('.jumboable?"jumbo":"default"'));
-// The component for the beggining of a channel, but we patched it so it only returns the allowed users and roles components for hidden channels
-const ChannelBeginHeader = LazyComponent(() => findByCode(".Messages.ROLE_REQUIRED_SINGLE_USER_MESSAGE"));
 
 const ChannelTypesToChannelNames = {
     [ChannelTypes.GUILD_TEXT]: "text",
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index fe14fe68b..60e0c51fa 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -26,7 +26,7 @@ import { findByPropsLazy } from "@webpack";
 import { ChannelStore, PermissionStore, Tooltip } from "@webpack/common";
 import { Channel } from "discord-types/general";
 
-import HiddenChannelLockScreen from "./components/HiddenChannelLockScreen";
+import HiddenChannelLockScreen, { setChannelBeginHeaderComponent, setEmojiComponent } from "./components/HiddenChannelLockScreen";
 
 const ChannelListClasses = findByPropsLazy("channelName", "subtitle", "modeMuted", "iconContainer");
 
@@ -239,8 +239,8 @@ export default definePlugin({
         {
             find: 'jumboable?"jumbo":"default"',
             replacement: {
-                match: /(?<=\i:\(\)=>\i)(?=}.+?(?<component>\i)=function.{1,20}node,\i=\i.isInteracting)/,
-                replace: ",hc1:()=>$<component>" // Blame Ven length check for the small name :pensive_cry:
+                match: /(?<=(?<component>\i)=function.{1,20}node,\i=\i.isInteracting.+?}}\)},)/,
+                replace: "shcEmojiComponentExport=($self.setEmojiComponent($<component>),void 0),"
             }
         },
         {
@@ -248,8 +248,8 @@ export default definePlugin({
             replacement: [
                 {
                     // Export the channel beggining header
-                    match: /(?<=\i:\(\)=>\i)(?=}.+?function (?<component>\i).{1,600}computePermissionsForRoles)/,
-                    replace: ",hc2:()=>$<component>"
+                    match: /(?<=function (?<component>\i)\(.{1,600}computePermissionsForRoles.+?}\)})(?=var)/,
+                    replace: "$self.setChannelBeginHeaderComponent($<component>);"
                 },
                 {
                     // Patch the header to only return allowed users and roles if it's a hidden channel (Like when it's used on the HiddenChannelLockScreen)
@@ -325,6 +325,9 @@ export default definePlugin({
         }
     ],
 
+    setEmojiComponent,
+    setChannelBeginHeaderComponent,
+
     isHiddenChannel(channel: Channel & { channelId?: string; }) {
         if (!channel) return false;
 
diff --git a/src/plugins/typingTweaks.tsx b/src/plugins/typingTweaks.tsx
index c3f8f871d..3eb4fadec 100644
--- a/src/plugins/typingTweaks.tsx
+++ b/src/plugins/typingTweaks.tsx
@@ -70,7 +70,7 @@ export default definePlugin({
         {
             find: "getCooldownTextStyle",
             replacement: {
-                match: /return \i\.Z\.getName\(.,.\.props\.channel\.id,(.)\)/,
+                match: /return \i\.\i\.getName\(.,.\.props\.channel\.id,(.)\)/,
                 replace: "return $1"
             }
         },
diff --git a/src/plugins/webhookTags.ts b/src/plugins/webhookTags.ts
index 51d68fa3b..96cbf3854 100644
--- a/src/plugins/webhookTags.ts
+++ b/src/plugins/webhookTags.ts
@@ -42,9 +42,9 @@ export default definePlugin({
         {
             find: ".Types.ORIGINAL_POSTER",
             replacement: {
-                match: /return null==(.)\?null:\(0,.{1,3}\.jsxs?\)\((.{1,3})\.Z/,
+                match: /return null==(.)\?null:\(0,.{1,3}\.jsxs?\)\((.{1,3}\.\i)/,
                 replace: (orig, type, BotTag) =>
-                    `if(arguments[0].message.webhookId&&arguments[0].user.isNonUserBot()){${type}=${BotTag}.Z.Types.WEBHOOK}${orig}`,
+                    `if(arguments[0].message.webhookId&&arguments[0].user.isNonUserBot()){${type}=${BotTag}.Types.WEBHOOK}${orig}`,
             },
         },
     ],

From 95db6c32a38b946abf90ebce165de82681159d68 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 5 Mar 2023 20:12:52 -0300
Subject: [PATCH 013/147] Fix Ignore Activities button on platforms different
 than Windows (#528)

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

diff --git a/src/plugins/ignoreActivities.tsx b/src/plugins/ignoreActivities.tsx
index 56a0a8dba..3d53bbc0a 100644
--- a/src/plugins/ignoreActivities.tsx
+++ b/src/plugins/ignoreActivities.tsx
@@ -145,8 +145,11 @@ export default definePlugin({
     patches: [{
         find: ".Messages.SETTINGS_GAMES_TOGGLE_OVERLAY",
         replacement: {
-            match: /var .=(?<props>.)\.overlay.+?"aria-label":.\..\.Messages\.SETTINGS_GAMES_TOGGLE_OVERLAY.+?}}\)/,
-            replace: "$&,$self.renderToggleGameActivityButton($<props>)"
+            match: /!(\i)\|\|(null==\i\)return null;var \i=(\i)\.overlay.+?children:)(\[.{0,70}overlayStatusText.+?\])(?=}\)}\(\))/,
+            replace: (_, platformCheck, restWithoutPlatformCheck, props, children) => ""
+                + `${restWithoutPlatformCheck}`
+                + `(${platformCheck}?${children}:[])`
+                + `.concat(Vencord.Plugins.plugins.IgnoreActivities.renderToggleGameActivityButton(${props}))`
         }
     }, {
         find: ".overlayBadge",

From 36c27f1111d3a56536d21d2bbeade3f44da7eee0 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 5 Mar 2023 22:39:53 -0300
Subject: [PATCH 014/147] VCDoubleClick: Fix applying to non voice channels
 (#572)

---
 src/plugins/vcDoubleClick.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/plugins/vcDoubleClick.ts b/src/plugins/vcDoubleClick.ts
index 695e8c51f..6d124a6cd 100644
--- a/src/plugins/vcDoubleClick.ts
+++ b/src/plugins/vcDoubleClick.ts
@@ -19,7 +19,7 @@
 import { migratePluginSettings } from "@api/settings";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { SelectedChannelStore } from "@webpack/common";
+import { ChannelStore, SelectedChannelStore } from "@webpack/common";
 
 const timers = {} as Record<string, {
     timeout?: NodeJS.Timeout;
@@ -50,12 +50,19 @@ export default definePlugin({
             // channel mentions
             find: ".shouldCloseDefaultModals",
             replacement: {
-                match: /onClick:(\i)(?=,.{0,30}className:"channelMention")/,
-                replace: "onClick:(_vcEv)=>(_vcEv.detail>=2||_vcEv.target.className.includes('MentionText'))&&($1)()",
+                match: /onClick:(\i)(?=,.{0,30}className:"channelMention".+?(\i)\.inContent)/,
+                replace: (_, onClick, props) => ""
+                    + `onClick:(vcDoubleClickEvt)=>$self.shouldRunOnClick(vcDoubleClickEvt,${props})&&${onClick}()`,
             }
         }
     ],
 
+    shouldRunOnClick(e: MouseEvent, { channelId }) {
+        const channel = ChannelStore.getChannel(channelId);
+        if (!channel || ![2, 13].includes(channel.type)) return true;
+        return e.detail >= 2;
+    },
+
     schedule(cb: () => void, e: any) {
         const id = e.props.channel.id as string;
         if (SelectedChannelStore.getVoiceChannelId() === id) {

From 7322c3af047489e122b59b01825ba5473dc96a62 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Mon, 6 Mar 2023 18:54:01 -0300
Subject: [PATCH 015/147] Fix Crash Loops and prevent metrics (#580)

---
 src/plugins/crashHandler.ts | 19 ++++++++++++++++++-
 src/plugins/noTrack.ts      | 13 +++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/plugins/crashHandler.ts b/src/plugins/crashHandler.ts
index 6f030b12f..79db7820c 100644
--- a/src/plugins/crashHandler.ts
+++ b/src/plugins/crashHandler.ts
@@ -41,6 +41,8 @@ const settings = definePluginSettings({
     }
 });
 
+let crashCount: number = 0;
+
 export default definePlugin({
     name: "CrashHandler",
     description: "Utility plugin for handling and possibly recovering from Crashes without a restart",
@@ -69,8 +71,22 @@ export default definePlugin({
     ],
 
     handleCrash(_this: ReactElement & { forceUpdate: () => void; }) {
+        if (++crashCount > 5) {
+            try {
+                showNotification({
+                    color: "#eed202",
+                    title: "Discord has crashed!",
+                    body: "Awn :( Discord has crashed more than five times, not attempting to recover.",
+                });
+            } catch { }
+
+            return false;
+        }
+
+        setTimeout(() => crashCount--, 60_000);
+
         try {
-            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 (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);
@@ -80,6 +96,7 @@ export default definePlugin({
             return false;
         } catch (err) {
             CrashHandlerLogger.error("Failed to handle crash", err);
+            return false;
         }
     },
 
diff --git a/src/plugins/noTrack.ts b/src/plugins/noTrack.ts
index 27ff430bd..617ab8b49 100644
--- a/src/plugins/noTrack.ts
+++ b/src/plugins/noTrack.ts
@@ -38,6 +38,19 @@ export default definePlugin({
                 match: /window\.DiscordSentry=function.+\}\(\)/,
                 replace: "",
             }
+        },
+        {
+            find: ".METRICS,",
+            replacement: [
+                {
+                    match: /this\._intervalId.+?12e4\)/,
+                    replace: ""
+                },
+                {
+                    match: /(?<=increment=function\(\i\){)/,
+                    replace: "return;"
+                }
+            ]
         }
     ]
 });

From 40395d562aeadaeaa88c5bc106797ea5a4ee51e4 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 8 Mar 2023 00:11:59 -0300
Subject: [PATCH 016/147] Improvements for patches and misc stuff (#582)

---
 src/plugins/apiNotices.ts                |   7 +-
 src/plugins/crashHandler.ts              |   4 +-
 src/plugins/disableDMCallIdle.ts         |  10 +-
 src/plugins/experiments.tsx              |  90 +++++++----
 src/plugins/fakeNitro.ts                 |  22 +--
 src/plugins/ignoreActivities.tsx         |  65 ++++----
 src/plugins/moyai.ts                     |  53 +++----
 src/plugins/noScreensharePreview.ts      |   8 +-
 src/plugins/pronoundb/index.ts           |  10 +-
 src/plugins/revealAllSpoilers.ts         |   4 +-
 src/plugins/showHiddenChannels/index.tsx | 191 ++++++++++++-----------
 src/plugins/spotifyCrack.ts              |  78 ++++-----
 src/plugins/typingIndicator.tsx          |   4 +-
 src/plugins/volumeBooster.ts             |  56 +++----
 src/plugins/whoReacted.tsx               |   4 +-
 15 files changed, 324 insertions(+), 282 deletions(-)

diff --git a/src/plugins/apiNotices.ts b/src/plugins/apiNotices.ts
index 8922aceed..af7cb15e8 100644
--- a/src/plugins/apiNotices.ts
+++ b/src/plugins/apiNotices.ts
@@ -29,13 +29,12 @@ export default definePlugin({
             find: 'displayName="NoticeStore"',
             replacement: [
                 {
-                    match: /;.{1,2}=null;.{0,70}getPremiumSubscription/g,
-                    replace:
-                        ";if(Vencord.Api.Notices.currentNotice)return false$&"
+                    match: /(?=;\i=null;.{0,70}getPremiumSubscription)/g,
+                    replace: ";if(Vencord.Api.Notices.currentNotice)return false"
                 },
                 {
                     match: /(?<=,NOTICE_DISMISS:function\(\i\){)(?=if\(null==(\i)\))/,
-                    replace: 'if($1?.id=="VencordNotice")return($1=null,Vencord.Api.Notices.nextNotice(),true);'
+                    replace: (_, notice) => `if(${notice}.id=="VencordNotice")return(${notice}=null,Vencord.Api.Notices.nextNotice(),true);`
                 }
             ]
         }
diff --git a/src/plugins/crashHandler.ts b/src/plugins/crashHandler.ts
index 79db7820c..e35dfed6e 100644
--- a/src/plugins/crashHandler.ts
+++ b/src/plugins/crashHandler.ts
@@ -64,8 +64,8 @@ export default definePlugin({
         {
             find: 'dispatch({type:"MODAL_POP_ALL"})',
             replacement: {
-                match: /(?<=(?<popAll>\i)=function\(\){\(0,\i\.\i\)\(\);\i\.\i\.dispatch\({type:"MODAL_POP_ALL"}\).+};)/,
-                replace: "$self.popAllModals=$<popAll>;"
+                match: /"MODAL_POP_ALL".+?};(?<=(\i)=function.+?)/,
+                replace: (m, popAll) => `${m}$self.popAllModals=${popAll};`
             }
         }
     ],
diff --git a/src/plugins/disableDMCallIdle.ts b/src/plugins/disableDMCallIdle.ts
index c620f5447..2ba861cf2 100644
--- a/src/plugins/disableDMCallIdle.ts
+++ b/src/plugins/disableDMCallIdle.ts
@@ -27,9 +27,9 @@ export default definePlugin({
         {
             find: ".Messages.BOT_CALL_IDLE_DISCONNECT",
             replacement: {
-                match: /function (?<functionName>.{1,3})\(\){.{1,100}\.Messages\.BOT_CALL_IDLE_DISCONNECT.+?}}/,
-                replace: "function $<functionName>(){}",
-            },
-        },
-    ],
+                match: /(?<=function \i\(\){)(?=.{1,100}\.Messages\.BOT_CALL_IDLE_DISCONNECT)/,
+                replace: "return;"
+            }
+        }
+    ]
 });
diff --git a/src/plugins/experiments.tsx b/src/plugins/experiments.tsx
index a3125ae74..686b822d7 100644
--- a/src/plugins/experiments.tsx
+++ b/src/plugins/experiments.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Settings } from "@api/settings";
+import { definePluginSettings } from "@api/settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
@@ -24,49 +24,71 @@ import { Forms, React } from "@webpack/common";
 
 const KbdStyles = findByPropsLazy("key", "removeBuildOverride");
 
+const settings = definePluginSettings({
+    enableIsStaff: {
+        description: "Enable isStaff",
+        type: OptionType.BOOLEAN,
+        default: false,
+        restartNeeded: true
+    },
+    forceStagingBanner: {
+        description: "Whether to force Staging banner under user area.",
+        type: OptionType.BOOLEAN,
+        default: false,
+        restartNeeded: true
+    }
+});
+
 export default definePlugin({
     name: "Experiments",
+    description: "Enable Access to Experiments in Discord!",
     authors: [
         Devs.Megu,
         Devs.Ven,
         Devs.Nickyux,
-        Devs.BanTheNons
+        Devs.BanTheNons,
+        Devs.Nuckyz
     ],
-    description: "Enable Access to Experiments in Discord!",
-    patches: [{
-        find: "Object.defineProperties(this,{isDeveloper",
-        replacement: {
-            match: /(?<={isDeveloper:\{[^}]+,get:function\(\)\{return )\w/,
-            replace: "true"
+    settings,
+
+    patches: [
+        {
+            find: "Object.defineProperties(this,{isDeveloper",
+            replacement: {
+                match: /(?<={isDeveloper:\{[^}]+?,get:function\(\)\{return )\w/,
+                replace: "true"
+            }
         },
-    }, {
-        find: 'type:"user",revision',
-        replacement: {
-            match: /!(\w{1,3})&&"CONNECTION_OPEN".+?;/g,
-            replace: "$1=!0;"
+        {
+            find: 'type:"user",revision',
+            replacement: {
+                match: /!(\i)&&"CONNECTION_OPEN".+?;/g,
+                replace: "$1=!0;"
+            }
         },
-    }, {
-        find: ".isStaff=function(){",
-        predicate: () => Settings.plugins.Experiments.enableIsStaff === true,
-        replacement: [
-            {
-                match: /return\s*(\w+)\.hasFlag\((.+?)\.STAFF\)}/,
-                replace: "return Vencord.Webpack.Common.UserStore.getCurrentUser().id===$1.id||$1.hasFlag($2.STAFF)}"
-            },
-            {
-                match: /hasFreePremium=function\(\){return this.isStaff\(\)\s*\|\|/,
-                replace: "hasFreePremium=function(){return ",
-            },
-        ],
-    }],
-    options: {
-        enableIsStaff: {
-            description: "Enable isStaff (requires restart)",
-            type: OptionType.BOOLEAN,
-            default: false,
-            restartNeeded: true,
+        {
+            find: ".isStaff=function(){",
+            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: /hasFreePremium=function\(\){return this.isStaff\(\)\s*?\|\|/,
+                    replace: "hasFreePremium=function(){return ",
+                }
+            ]
+        },
+        {
+            find: ".Messages.DEV_NOTICE_STAGING",
+            predicate: () => settings.store.forceStagingBanner,
+            replacement: {
+                match: /"staging"===window\.GLOBAL_ENV\.RELEASE_CHANNEL/,
+                replace: "true"
+            }
         }
-    },
+    ],
 
     settingsAboutComponent: () => {
         const isMacOS = navigator.platform.includes("Mac");
diff --git a/src/plugins/fakeNitro.ts b/src/plugins/fakeNitro.ts
index a09a95a39..e9b19ca1d 100644
--- a/src/plugins/fakeNitro.ts
+++ b/src/plugins/fakeNitro.ts
@@ -72,7 +72,7 @@ migratePluginSettings("FakeNitro", "NitroBypass");
 
 export default definePlugin({
     name: "FakeNitro",
-    authors: [Devs.Arjix, Devs.D3SOX, Devs.Ven, Devs.obscurity, Devs.captain],
+    authors: [Devs.Arjix, Devs.D3SOX, Devs.Ven, Devs.obscurity, Devs.captain, Devs.Nuckyz],
     description: "Allows you to stream in nitro quality, send fake emojis/stickers and use client themes.",
     dependencies: ["MessageEventsAPI"],
 
@@ -82,16 +82,16 @@ export default definePlugin({
             predicate: () => Settings.plugins.FakeNitro.enableEmojiBypass === true,
             replacement: [
                 {
-                    match: /(?<=(?<intention>\i)=\i\.intention)/,
-                    replace: ",fakeNitroIntention=$<intention>"
+                    match: /(?<=(\i)=\i\.intention)/,
+                    replace: (_, intention) => `,fakeNitroIntention=${intention}`
                 },
                 {
                     match: /(?<=\.(?:canUseEmojisEverywhere|canUseAnimatedEmojis)\(\i)(?=\))/g,
                     replace: ',typeof fakeNitroIntention!=="undefined"?fakeNitroIntention:void 0'
                 },
                 {
-                    match: /(?<=&&!\i&&)!(?<canUseExternal>\i)(?=\)return \i\.\i\.DISALLOW_EXTERNAL;)/,
-                    replace: `(!$<canUseExternal>&&(typeof fakeNitroIntention==="undefined"||![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)))`
+                    match: /(?<=&&!\i&&)!(\i)(?=\)return \i\.\i\.DISALLOW_EXTERNAL;)/,
+                    replace: (_, canUseExternal) => `(!${canUseExternal}&&(typeof fakeNitroIntention==="undefined"||![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)))`
                 }
             ]
         },
@@ -99,16 +99,16 @@ export default definePlugin({
             find: "canUseAnimatedEmojis:function",
             predicate: () => Settings.plugins.FakeNitro.enableEmojiBypass === true,
             replacement: {
-                match: /(?<=(?:canUseEmojisEverywhere|canUseAnimatedEmojis):function\((?<user>\i))\){(?<premiumCheck>.+?\))/g,
-                replace: `,fakeNitroIntention){$<premiumCheck>||fakeNitroIntention==null||[${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)`
+                match: /(?<=(?:canUseEmojisEverywhere|canUseAnimatedEmojis):function\(\i)\){(.+?\))/g,
+                replace: (_, premiumCheck) => `,fakeNitroIntention){${premiumCheck}||fakeNitroIntention==null||[${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)`
             }
         },
         {
             find: "canUseStickersEverywhere:function",
             predicate: () => Settings.plugins.FakeNitro.enableStickerBypass === true,
             replacement: {
-                match: /canUseStickersEverywhere:function\(.+?\{/,
-                replace: "$&return true;"
+                match: /(?<=canUseStickersEverywhere:function\(\i\){)/,
+                replace: "return true;"
             },
         },
         {
@@ -128,8 +128,8 @@ export default definePlugin({
                 "canStreamMidQuality"
             ].map(func => {
                 return {
-                    match: new RegExp(`${func}:function\\(.+?\\{`),
-                    replace: "$&return true;"
+                    match: new RegExp(`(?<=${func}:function\\(\\i\\){)`),
+                    replace: "return true;"
                 };
             })
         },
diff --git a/src/plugins/ignoreActivities.tsx b/src/plugins/ignoreActivities.tsx
index 3d53bbc0a..07b458f80 100644
--- a/src/plugins/ignoreActivities.tsx
+++ b/src/plugins/ignoreActivities.tsx
@@ -21,7 +21,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { useForceUpdater } from "@utils/misc";
 import definePlugin from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
 import { Tooltip } from "webpack/common";
 
 enum ActivitiesTypes {
@@ -37,7 +37,7 @@ interface IgnoredActivity {
 const RegisteredGamesClasses = findByPropsLazy("overlayToggleIconOff", "overlayToggleIconOn");
 const TryItOutClasses = findByPropsLazy("tryItOutBadge", "tryItOutBadgeIcon");
 const BaseShapeRoundClasses = findByPropsLazy("baseShapeRound", "baseShapeRoundLeft", "baseShapeRoundRight");
-const RunningGameStore = findByPropsLazy("getRunningGames", "getGamesSeen");
+const RunningGameStore = findStoreLazy("RunningGameStore");
 
 function ToggleIconOff() {
     return (
@@ -71,7 +71,7 @@ function ToggleIconOff() {
     );
 }
 
-function ToggleIconOn() {
+function ToggleIconOn({ forceWhite }: { forceWhite?: boolean; }) {
     return (
         <svg
             className={RegisteredGamesClasses.overlayToggleIconOn}
@@ -80,14 +80,15 @@ function ToggleIconOn() {
             viewBox="0 0 32 26"
         >
             <path
-                className={RegisteredGamesClasses.fill}
+                className={forceWhite ? "" : RegisteredGamesClasses.fill}
+                fill={forceWhite ? "var(--white-500)" : ""}
                 d="M 16 8 C 7.664063 8 1.25 15.34375 1.25 15.34375 L 0.65625 16 L 1.25 16.65625 C 1.25 16.65625 7.097656 23.324219 14.875 23.9375 C 15.246094 23.984375 15.617188 24 16 24 C 16.382813 24 16.753906 23.984375 17.125 23.9375 C 24.902344 23.324219 30.75 16.65625 30.75 16.65625 L 31.34375 16 L 30.75 15.34375 C 30.75 15.34375 24.335938 8 16 8 Z M 16 10 C 18.203125 10 20.234375 10.601563 22 11.40625 C 22.636719 12.460938 23 13.675781 23 15 C 23 18.613281 20.289063 21.582031 16.78125 21.96875 C 16.761719 21.972656 16.738281 21.964844 16.71875 21.96875 C 16.480469 21.980469 16.242188 22 16 22 C 15.734375 22 15.476563 21.984375 15.21875 21.96875 C 11.710938 21.582031 9 18.613281 9 15 C 9 13.695313 9.351563 12.480469 9.96875 11.4375 L 9.9375 11.4375 C 11.71875 10.617188 13.773438 10 16 10 Z M 16 12 C 14.34375 12 13 13.34375 13 15 C 13 16.65625 14.34375 18 16 18 C 17.65625 18 19 16.65625 19 15 C 19 13.34375 17.65625 12 16 12 Z M 7.25 12.9375 C 7.09375 13.609375 7 14.285156 7 15 C 7 16.753906 7.5 18.394531 8.375 19.78125 C 5.855469 18.324219 4.105469 16.585938 3.53125 16 C 4.011719 15.507813 5.351563 14.203125 7.25 12.9375 Z M 24.75 12.9375 C 26.648438 14.203125 27.988281 15.507813 28.46875 16 C 27.894531 16.585938 26.144531 18.324219 23.625 19.78125 C 24.5 18.394531 25 16.753906 25 15 C 25 14.285156 24.90625 13.601563 24.75 12.9375 Z"
             />
         </svg>
     );
 }
 
-function ToggleActivityComponent({ activity }: { activity: IgnoredActivity; }) {
+function ToggleActivityComponent({ activity, forceWhite }: { activity: IgnoredActivity; forceWhite?: boolean; }) {
     const forceUpdate = useForceUpdater();
 
     return (
@@ -105,7 +106,7 @@ function ToggleActivityComponent({ activity }: { activity: IgnoredActivity; }) {
                     {
                         ignoredActivitiesCache.has(activity.id)
                             ? <ToggleIconOff />
-                            : <ToggleIconOn />
+                            : <ToggleIconOn forceWhite={forceWhite} />
                     }
                 </div>
             )}
@@ -117,9 +118,9 @@ function ToggleActivityComponentWithBackground({ activity }: { activity: Ignored
     return (
         <div
             className={`${TryItOutClasses.tryItOutBadge} ${BaseShapeRoundClasses.baseShapeRound}`}
-            style={{ padding: "0 2px" }}
+            style={{ padding: "0px 2px" }}
         >
-            <ToggleActivityComponent activity={activity} />
+            <ToggleActivityComponent activity={activity} forceWhite={true} />
         </div>
     );
 }
@@ -142,28 +143,32 @@ export default definePlugin({
     name: "IgnoreActivities",
     authors: [Devs.Nuckyz],
     description: "Ignore certain activities (like games and actual activities) from showing up on your status. You can configure which ones are ignored from the Registered Games and Activities tabs.",
-    patches: [{
-        find: ".Messages.SETTINGS_GAMES_TOGGLE_OVERLAY",
-        replacement: {
-            match: /!(\i)\|\|(null==\i\)return null;var \i=(\i)\.overlay.+?children:)(\[.{0,70}overlayStatusText.+?\])(?=}\)}\(\))/,
-            replace: (_, platformCheck, restWithoutPlatformCheck, props, children) => ""
-                + `${restWithoutPlatformCheck}`
-                + `(${platformCheck}?${children}:[])`
-                + `.concat(Vencord.Plugins.plugins.IgnoreActivities.renderToggleGameActivityButton(${props}))`
+    patches: [
+        {
+            find: ".Messages.SETTINGS_GAMES_TOGGLE_OVERLAY",
+            replacement: {
+                match: /!(\i)\|\|(null==\i\)return null;var \i=(\i)\.overlay.+?children:)(\[.{0,70}overlayStatusText.+?\])(?=}\)}\(\))/,
+                replace: (_, platformCheck, restWithoutPlatformCheck, props, children) => ""
+                    + `${restWithoutPlatformCheck}`
+                    + `(${platformCheck}?${children}:[])`
+                    + `.concat(Vencord.Plugins.plugins.IgnoreActivities.renderToggleGameActivityButton(${props}))`
+            }
+        },
+        {
+            find: ".overlayBadge",
+            replacement: {
+                match: /(?<=\(\)\.badgeContainer.+?(\i)\.name}\):null)/,
+                replace: (_, props) => `,$self.renderToggleActivityButton(${props})`
+            }
+        },
+        {
+            find: '.displayName="LocalActivityStore"',
+            replacement: {
+                match: /LISTENING.+?\)\);(?<=(\i)\.push.+?)/,
+                replace: (m, activities) => `${m}${activities}=${activities}.filter($self.isActivityNotIgnored);`
+            }
         }
-    }, {
-        find: ".overlayBadge",
-        replacement: {
-            match: /.badgeContainer.+?.\?\(0,.\.jsx\)\(.{1,2},{name:(?<props>.)\.name}\):null/,
-            replace: "$&,$self.renderToggleActivityButton($<props>)"
-        }
-    }, {
-        find: '.displayName="LocalActivityStore"',
-        replacement: {
-            match: /(?<activities>.)\.push\(.\({type:.\..{1,3}\.LISTENING.+?\)\)/,
-            replace: "$&;$<activities>=$<activities>.filter($self.isActivityNotIgnored);"
-        }
-    }],
+    ],
 
     async start() {
         const ignoredActivitiesData = await DataStore.get<string[] | Map<IgnoredActivity["id"], IgnoredActivity>>("IgnoreActivities_ignoredActivities") ?? new Map<IgnoredActivity["id"], IgnoredActivity>();
@@ -217,5 +222,5 @@ export default definePlugin({
             }
         }
         return true;
-    },
+    }
 });
diff --git a/src/plugins/moyai.ts b/src/plugins/moyai.ts
index fabc97fb4..146ac3f63 100644
--- a/src/plugins/moyai.ts
+++ b/src/plugins/moyai.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Settings } from "@api/settings";
+import { definePluginSettings } from "@api/settings";
 import { makeRange } from "@components/PluginSettings/components/SettingSliderComponent";
 import { Devs } from "@utils/constants";
 import { sleep } from "@utils/misc";
@@ -54,15 +54,36 @@ const MOYAI = "🗿";
 const MOYAI_URL =
     "https://raw.githubusercontent.com/MeguminSama/VencordPlugins/main/plugins/moyai/moyai.mp3";
 
+const settings = definePluginSettings({
+    volume: {
+        description: "Volume of the 🗿🗿🗿",
+        type: OptionType.SLIDER,
+        markers: makeRange(0, 1, 0.1),
+        default: 0.5,
+        stickToMarkers: false
+    },
+    triggerWhenUnfocused: {
+        description: "Trigger the 🗿 even when the window is unfocused",
+        type: OptionType.BOOLEAN,
+        default: true
+    },
+    ignoreBots: {
+        description: "Ignore bots",
+        type: OptionType.BOOLEAN,
+        default: true
+    }
+});
+
 export default definePlugin({
     name: "Moyai",
     authors: [Devs.Megu, Devs.Nuckyz],
     description: "🗿🗿🗿🗿🗿🗿🗿🗿",
+    settings,
 
     async onMessage(e: IMessageCreate) {
         if (e.optimistic || e.type !== "MESSAGE_CREATE") return;
         if (e.message.state === "SENDING") return;
-        if (Settings.plugins.Moyai.ignoreBots && e.message.author?.bot) return;
+        if (settings.store.ignoreBots && e.message.author?.bot) return;
         if (!e.message.content) return;
         if (e.channelId !== SelectedChannelStore.getChannelId()) return;
 
@@ -76,7 +97,7 @@ export default definePlugin({
 
     onReaction(e: IReactionAdd) {
         if (e.optimistic || e.type !== "MESSAGE_REACTION_ADD") return;
-        if (Settings.plugins.Moyai.ignoreBots && UserStore.getUser(e.userId)?.bot) return;
+        if (settings.store.ignoreBots && UserStore.getUser(e.userId)?.bot) return;
         if (e.channelId !== SelectedChannelStore.getChannelId()) return;
 
         const name = e.emoji.name.toLowerCase();
@@ -103,28 +124,6 @@ export default definePlugin({
         FluxDispatcher.unsubscribe("MESSAGE_CREATE", this.onMessage);
         FluxDispatcher.unsubscribe("MESSAGE_REACTION_ADD", this.onReaction);
         FluxDispatcher.unsubscribe("VOICE_CHANNEL_EFFECT_SEND", this.onVoiceChannelEffect);
-    },
-
-    options: {
-        volume: {
-            description: "Volume of the 🗿🗿🗿",
-            type: OptionType.SLIDER,
-            markers: makeRange(0, 1, 0.1),
-            default: 0.5,
-            stickToMarkers: false,
-        },
-        triggerWhenUnfocused: {
-            description: "Trigger the 🗿 even when the window is unfocused",
-            type: OptionType.BOOLEAN,
-            default: true,
-            restartNeeded: false,
-        },
-        ignoreBots: {
-            description: "Ignore bots",
-            type: OptionType.BOOLEAN,
-            default: true,
-            restartNeeded: false,
-        }
     }
 });
 
@@ -158,9 +157,9 @@ function getMoyaiCount(message: string) {
 }
 
 function boom() {
-    if (!Settings.plugins.Moyai.triggerWhenUnfocused && !document.hasFocus()) return;
+    if (!settings.store.triggerWhenUnfocused && !document.hasFocus()) return;
     const audioElement = document.createElement("audio");
     audioElement.src = MOYAI_URL;
-    audioElement.volume = Settings.plugins.Moyai.volume;
+    audioElement.volume = settings.store.volume;
     audioElement.play();
 }
diff --git a/src/plugins/noScreensharePreview.ts b/src/plugins/noScreensharePreview.ts
index b09f20636..50b2a964f 100644
--- a/src/plugins/noScreensharePreview.ts
+++ b/src/plugins/noScreensharePreview.ts
@@ -30,9 +30,9 @@ export default definePlugin({
                 "\\i\\.default\\.makeChunkedRequest\\(",
                 "\\i\\.\\i\\.post\\({url:"
             ].map(match => ({
-                match: new RegExp(`return\\[(?<code>\\d),${match}\\i\\.\\i\\.STREAM_PREVIEW.+?}\\)\\];`),
-                replace: 'return[$<code>,Promise.resolve({body:"",status:204})];'
+                match: new RegExp(`(?=return\\[(\\d),${match}\\i\\.\\i\\.STREAM_PREVIEW.+?}\\)\\];)`),
+                replace: (_, code) => `return[${code},Promise.resolve({body:"",status:204})];`
             }))
-        },
-    ],
+        }
+    ]
 });
diff --git a/src/plugins/pronoundb/index.ts b/src/plugins/pronoundb/index.ts
index 7ebe91921..820b66eca 100644
--- a/src/plugins/pronoundb/index.ts
+++ b/src/plugins/pronoundb/index.ts
@@ -41,7 +41,7 @@ export default definePlugin({
                 replace: "[$1, $self.PronounsChatComponent(e)]"
             }
         },
-        // Hijack the discord pronouns section (hidden without experiment) and add a wrapper around the text section
+        // Hijack the discord pronouns section and add a wrapper around the text section
         {
             find: ".Messages.BOT_PROFILE_SLASH_COMMANDS",
             replacement: {
@@ -49,12 +49,12 @@ export default definePlugin({
                 replace: "$<fullProps>&&$self.PronounsProfileWrapper($<PronounComponent>,$<pronounProps>,$<fullProps>)"
             }
         },
-        // Make pronouns experiment be enabled by default
+        // Force enable pronouns component ignoring the experiment value
         {
-            find: "2022-01_pronouns",
+            find: ".Messages.USER_POPOUT_PRONOUNS",
             replacement: {
-                match: "!1", // false
-                replace: "!0"
+                match: /\i\.\i\.useExperiment\({}\)\.showPronouns/,
+                replace: "true"
             }
         }
     ],
diff --git a/src/plugins/revealAllSpoilers.ts b/src/plugins/revealAllSpoilers.ts
index ead169fce..9cb7b6b45 100644
--- a/src/plugins/revealAllSpoilers.ts
+++ b/src/plugins/revealAllSpoilers.ts
@@ -32,8 +32,8 @@ export default definePlugin({
         {
             find: ".removeObscurity=function",
             replacement: {
-                match: /\.removeObscurity=function\((\i)\){/,
-                replace: ".removeObscurity=function($1){$self.reveal($1);"
+                match: /(?<=\.removeObscurity=function\((\i)\){)/,
+                replace: (_, event) => `$self.reveal(${event});`
             }
         }
     ],
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 60e0c51fa..70c5045ba 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -64,29 +64,29 @@ export default definePlugin({
     patches: [
         {
             // RenderLevel defines if a channel is hidden, collapsed in category, visible, etc
-            find: ".CannotShow",
+            find: ".CannotShow=",
             // These replacements only change the necessary CannotShow's
             replacement: [
                 {
-                    match: /(?<=isChannelGatedAndVisible\(this\.record\.guild_id,this\.record\.id\).+?renderLevel:)(?<RenderLevels>\i)\..+?(?=,)/,
-                    replace: "this.category.isCollapsed?$<RenderLevels>.WouldShowIfUncollapsed:$<RenderLevels>.Show"
+                    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: /(?<=(?<permissionCheck>if\(!\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL.+?{)if\(this\.id===\i\).+?};)(?<isChannelGatedAndVisibleCondition>if\(!\i\.\i\.isChannelGatedAndVisible\(.+?})(?<restOfFunction>.+?)(?=return{renderLevel:\i\.Show.{1,40}return \i)/,
-                    replace: "$<restOfFunction>$<permissionCheck>$<isChannelGatedAndVisibleCondition>}"
+                    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: /(?<=renderLevel:(?<renderLevelExpression>\i\(this,\i\)\?\i\.Show:\i\.WouldShowIfUncollapsed).+?renderLevel:).+?(?=,)/,
-                    replace: "$<renderLevelExpression>"
+                    match: /(?<=renderLevel:(\i\(this,\i\)\?\i\.Show:\i\.WouldShowIfUncollapsed).+?renderLevel:).+?(?=,)/,
+                    replace: (_, renderLevelExpression) => renderLevelExpression
                 },
                 {
-                    match: /(?<=activeJoinedRelevantThreads.+?renderLevel:.+?,threadIds:\i\(this.record.+?renderLevel:)(?<RenderLevels>\i)\..+?(?=,)/,
-                    replace: "$<RenderLevels>.Show"
+                    match: /(?<=activeJoinedRelevantThreads.+?renderLevel:.+?,threadIds:\i\(this.record.+?renderLevel:)(\i)\..+?(?=,)/,
+                    replace: (_, RenderLevels) => `${RenderLevels}.Show`
                 },
                 {
-                    match: /(?<=getRenderLevel=function.+?return ).+?\?(?<renderLevelExpressionWithoutPermCheck>.+?):\i\.CannotShow(?=})/,
-                    replace: "$<renderLevelExpressionWithoutPermCheck>"
+                    match: /(?<=getRenderLevel=function.+?return ).+?\?(.+?):\i\.CannotShow(?=})/,
+                    replace: (_, renderLevelExpressionWithoutPermCheck) => renderLevelExpressionWithoutPermCheck
                 }
             ]
         },
@@ -95,18 +95,18 @@ 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\()(?=.+?\((?<channel>\i)\))/,
-                    replace: "!$self.isHiddenChannel($<channel>)&&"
+                    match: /(?<=getCurrentClientVoiceChannelId\((\i)\.guild_id\);if\()/,
+                    replace: (_, channel) => `!$self.isHiddenChannel(${channel})&&`
                 },
                 {
                     // Make Discord think we are connected to a voice channel so it shows us inside it
-                    match: /(?=\|\|\i\.default\.selectVoiceChannel\((?<channel>\i)\.id\))/,
-                    replace: "||$self.isHiddenChannel($<channel>)"
+                    match: /(?=\|\|\i\.default\.selectVoiceChannel\((\i)\.id\))/,
+                    replace: (_, channel) => `||$self.isHiddenChannel(${channel})`
                 },
                 {
                     // Make Discord think we are connected to a voice channel so it shows us inside it
-                    match: /(?<=\|\|\i\.default\.selectVoiceChannel\((?<channel>\i)\.id\);!__OVERLAY__&&\()/,
-                    replace: "$self.isHiddenChannel($<channel>)||"
+                    match: /(?<=\|\|\i\.default\.selectVoiceChannel\((\i)\.id\);!__OVERLAY__&&\()/,
+                    replace: (_, channel) => `$self.isHiddenChannel(${channel})||`
                 }
             ]
         },
@@ -119,7 +119,7 @@ export default definePlugin({
                     "renderInviteButton",
                     "renderOpenChatButton"
                 ].map(func => ({
-                    match: new RegExp(`(?<=\\i\\.${func}=function\\(\\){)`, "g"), // Global because Discord has multiple declarations of the same functions
+                    match: new RegExp(`(?<=${func}=function\\(\\){)`, "g"), // Global because Discord has multiple declarations of the same functions
                     replace: "if($self.isHiddenChannel(this.props.channel))return null;"
                 }))
             ]
@@ -129,17 +129,8 @@ export default definePlugin({
             predicate: () => settings.store.showMode === ShowMode.LockIcon,
             replacement: {
                 // Lock Icon
-                match: /(?=switch\((?<channel>\i)\.type\).{1,30}\.GUILD_ANNOUNCEMENT.{1,30}\(0,\i\.\i\))/,
-                replace: "if($self.isHiddenChannel($<channel>))return $self.LockIcon;"
-            }
-        },
-        {
-            find: ".UNREAD_HIGHLIGHT",
-            predicate: () => settings.store.hideUnreads === true,
-            replacement: {
-                // Hide unreads
-                match: /(?<=\i\.connected,\i=)(?=(?<props>\i)\.unread)/,
-                replace: "$self.isHiddenChannel($<props>.channel)?false:"
+                match: /(?=switch\((\i)\.type\).{0,30}\.GUILD_ANNOUNCEMENT.{0,30}\(0,\i\.\i\))/,
+                replace: (_, channel) => `if($self.isHiddenChannel(${channel}))return $self.LockIcon;`
             }
         },
         {
@@ -148,36 +139,44 @@ export default definePlugin({
             replacement: [
                 // Make the channel appear as muted if it's hidden
                 {
-                    match: /(?<=\i\.name,\i=)(?=(?<props>\i)\.muted)/,
-                    replace: "$self.isHiddenChannel($<props>.channel)?true:"
+                    match: /(?<=\i\.name,\i=)(?=(\i)\.muted)/,
+                    replace: (_, props) => `$self.isHiddenChannel(${props}.channel)?true:`
                 },
                 // Add the hidden eye icon if the channel is hidden
                 {
-                    match: /(?<=(?<channel>\i)=\i\.channel,.+?\(\)\.children.+?:null)/,
-                    replace: ",$self.isHiddenChannel($<channel>)?$self.HiddenChannelIcon():null"
+                    match: /\(\).children.+?:null(?<=(\i)=\i\.channel,.+?)/,
+                    replace: (m, channel) => `${m},$self.isHiddenChannel(${channel})?$self.HiddenChannelIcon():null`
                 },
                 // Make voice channels also appear as muted if they are muted
                 {
-                    match: /(?<=\i\(\)\.wrapper:\i\(\)\.notInteractive,)(?<otherClasses>.+?)(?<mutedClassExpression>(?<isMuted>\i)\?\i\.MUTED)/,
-                    replace: "$<mutedClassExpression>:\"\",$<otherClasses>$<isMuted>?\"\""
+                    match: /(?<=\.wrapper:\i\(\)\.notInteractive,)(.+?)((\i)\?\i\.MUTED)/,
+                    replace: (_, otherClasses, mutedClassExpression, isMuted) => `${mutedClassExpression}:"",${otherClasses}${isMuted}?""`
                 }
             ]
         },
-        // Make muted channels also appear as unread if hide unreads is false, using the HiddenIconWithMutedStyle and the channel is hidden
         {
             find: ".UNREAD_HIGHLIGHT",
-            predicate: () => settings.store.hideUnreads === false && settings.store.showMode === ShowMode.HiddenIconWithMutedStyle,
-            replacement: {
-                match: /(?<=(?<channel>\i)=\i\.channel,.+?\.LOCKED:\i)/,
-                replace: "&&!($self.settings.store.hideUnreads===false&&$self.isHiddenChannel($<channel>))"
-            }
+            replacement: [
+                {
+                    // 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})`
+                },
+                {
+                    // Hide unreads
+                    predicate: () => settings.store.hideUnreads === true,
+                    match: /(?<=\i\.connected,\i=)(?=(\i)\.unread)/,
+                    replace: (_, props) => `$self.isHiddenChannel(${props}.channel)?false:`
+                }
+            ]
         },
         {
             // Hide New unreads box for hidden channels
             find: '.displayName="ChannelListUnreadsStore"',
             replacement: {
-                match: /(?<=return null!=(?<channel>\i))(?=.{1,130}hasRelevantUnread\(\i\))/g, // Global because Discord has multiple methods like that in the same module
-                replace: "&&!$self.isHiddenChannel($<channel>)"
+                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})`
             }
         },
         // Only render the channel header and buttons that work when transitioning to a hidden channel
@@ -185,20 +184,20 @@ export default definePlugin({
             find: "Missing channel in Channel.renderHeaderToolbar",
             replacement: [
                 {
-                    match: /(?<=renderHeaderToolbar=function.+?case \i\.\i\.GUILD_TEXT:)(?=.+?;(?<pushNotificationButtonExpression>.+?{channel:(?<channel>\i)},"notifications"\)\);))/,
-                    replace: "if($self.isHiddenChannel($<channel>)){$<pushNotificationButtonExpression>break;}"
+                    match: /(?<=renderHeaderToolbar=function.+?case \i\.\i\.GUILD_TEXT:)(?=.+?;(.+?{channel:(\i)},"notifications"\)\);))/,
+                    replace: (_, pushNotificationButtonExpression, channel) => `if($self.isHiddenChannel(${channel})){${pushNotificationButtonExpression}break;}`
                 },
                 {
-                    match: /(?<=renderHeaderToolbar=function.+?case \i\.\i\.GUILD_FORUM:if\(!\i\){)(?=.+?;(?<pushNotificationButtonExpression>.+?{channel:(?<channel>\i)},"notifications"\)\)))/,
-                    replace: "if($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: /(?<=(?<this>\i)\.renderMobileToolbar=function.+?case \i\.\i\.GUILD_FORUM:)/,
-                    replace: "if($self.isHiddenChannel($<this>.props.channel))break;"
+                    match: /renderMobileToolbar=function.+?case \i\.\i\.GUILD_FORUM:(?<=(\i)\.renderMobileToolbar.+?)/,
+                    replace: (m, that) => `${m}if($self.isHiddenChannel(${that}.props.channel))break;`
                 },
                 {
-                    match: /(?<=renderHeaderBar=function.+?hideSearch:(?<channel>\i)\.isDirectory\(\))/,
-                    replace: "||$self.isHiddenChannel($<channel>)"
+                    match: /(?<=renderHeaderBar=function.+?hideSearch:(\i)\.isDirectory\(\))/,
+                    replace: (_, channel) => `||$self.isHiddenChannel(${channel})`
                 },
                 {
                     match: /(?<=renderSidebar=function\(\){)/,
@@ -213,25 +212,23 @@ export default definePlugin({
         // Avoid trying to fetch messages from hidden channels
         {
             find: '"MessageManager"',
-            replacement: [
-                {
-                    match: /(?<=if\(null!=(?<channelId>\i)\).{1,100}"Skipping fetch because channelId is a static route".{1,10}else{)/,
-                    replace: "if($self.isHiddenChannel({channelId:$<channelId>}))return;"
-                },
-            ]
+            replacement: {
+                match: /"Skipping fetch because channelId is a static route"\);else{(?=.+?getChannel\((\i)\))/,
+                replace: (m, channelId) => `${m}if($self.isHiddenChannel({channelId:${channelId}}))return;`
+            }
         },
         // Patch keybind handlers so you can't accidentally jump to hidden channels
         {
             find: '"alt+shift+down"',
             replacement: {
-                match: /(?<=getChannel\(\i\);return null!=(?<channel>\i))(?=.{1,130}hasRelevantUnread\(\i\))/,
-                replace: "&&!$self.isHiddenChannel($<channel>)"
+                match: /(?<=getChannel\(\i\);return null!=(\i))(?=.{0,130}?hasRelevantUnread\(\i\))/,
+                replace: (_, channel) => `&&!$self.isHiddenChannel(${channel})`
             }
         },
         {
             find: '"alt+down"',
             replacement: {
-                match: /(?<=getState\(\)\.channelId.{1,30}\(0,\i\.\i\)\(\i\))(?=\.map\()/,
+                match: /(?<=getState\(\)\.channelId.{0,30}?\(0,\i\.\i\)\(\i\))(?=\.map\()/,
                 replace: ".filter(ch=>!$self.isHiddenChannel(ch))"
             }
         },
@@ -239,8 +236,8 @@ export default definePlugin({
         {
             find: 'jumboable?"jumbo":"default"',
             replacement: {
-                match: /(?<=(?<component>\i)=function.{1,20}node,\i=\i.isInteracting.+?}}\)},)/,
-                replace: "shcEmojiComponentExport=($self.setEmojiComponent($<component>),void 0),"
+                match: /jumboable\?"jumbo":"default",emojiId.+?}}\)},(?<=(\i)=function\(\i\){var \i=\i\.node.+?)/,
+                replace: (m, component) => `${m}shcEmojiComponentExport=($self.setEmojiComponent(${component}),void 0),`
             }
         },
         {
@@ -248,13 +245,13 @@ export default definePlugin({
             replacement: [
                 {
                     // Export the channel beggining header
-                    match: /(?<=function (?<component>\i)\(.{1,600}computePermissionsForRoles.+?}\)})(?=var)/,
-                    replace: "$self.setChannelBeginHeaderComponent($<component>);"
+                    match: /computePermissionsForRoles.+?}\)}(?<=function (\i)\(.+?)(?=var)/,
+                    replace: (m, component) => `${m}$self.setChannelBeginHeaderComponent(${component});`
                 },
                 {
                     // Patch the header to only return allowed users and roles if it's a hidden channel (Like when it's used on the HiddenChannelLockScreen)
-                    match: /(?<=MANAGE_ROLES.{1,60}return)(?=\(.+?(?<component>\(0,\i\.jsxs\)\("div",{className:\i\(\)\.members.+?guildId:(?<channel>\i)\.guild_id.+?roleColor.+?]}\)))/,
-                    replace: " $self.isHiddenChannel($<channel>)?$<component>:"
+                    match: /MANAGE_ROLES.{0,60}?return(?=\(.+?(\(0,\i\.jsxs\)\("div",{className:\i\(\)\.members.+?guildId:(\i)\.guild_id.+?roleColor.+?]}\)))/,
+                    replace: (m, component, channel) => `${m} $self.isHiddenChannel(${channel})?${component}:`
                 }
             ]
         },
@@ -263,23 +260,23 @@ export default definePlugin({
             replacement: [
                 {
                     // Remove the divider and the open chat button for the HiddenChannelLockScreen
-                    match: /(?<=function \i\((?<props>\i)\).{1,2000}"more-options-popout"\)\);if\()/,
-                    replace: "(!$self.isHiddenChannel($<props>.channel)||$<props>.inCall)&&"
+                    match: /"more-options-popout"\)\);if\((?<=function \i\((\i)\).+?)/,
+                    replace: (m, props) => `${m}(!$self.isHiddenChannel(${props}.channel)||${props}.inCall)&&`
                 },
                 {
                     // Render our HiddenChannelLockScreen component instead of the main voice channel component
-                    match: /(?<=renderContent=function.{1,1700}children:)/,
-                    replace: "!this.props.inCall&&$self.isHiddenChannel(this.props.channel)?$self.HiddenChannelLockScreen(this.props.channel):"
+                    match: /this\.renderVoiceChannelEffects.+?children:(?<=renderContent=function.+?)/,
+                    replace: "$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel)?$self.HiddenChannelLockScreen(this.props.channel):"
                 },
                 {
                     // Disable gradients for the HiddenChannelLockScreen of voice channels
-                    match: /(?<=renderContent=function.{1,1600}disableGradients:)/,
-                    replace: "!this.props.inCall&&$self.isHiddenChannel(this.props.channel)||"
+                    match: /this\.renderVoiceChannelEffects.+?disableGradients:(?<=renderContent=function.+?)/,
+                    replace: "$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel)||"
                 },
                 {
                     // Disable useless components for the HiddenChannelLockScreen of voice channels
-                    match: /(?<=renderContent=function.{1,800}render(?!Header).{0,30}:)(?!void)/g,
-                    replace: "!this.props.inCall&&$self.isHiddenChannel(this.props.channel)?null:"
+                    match: /(?:{|,)render(?!Header|ExternalHeader).{0,30}?:(?<=renderContent=function.+?)(?!void)/g,
+                    replace: "$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel)?null:"
                 }
             ]
         },
@@ -288,40 +285,58 @@ export default definePlugin({
             replacement: [
                 {
                     // Render our HiddenChannelLockScreen component instead of the main stage channel component
-                    match: /(?<=(?<channel>\i)\.getGuildId\(\).{1,30}Guild voice channel without guild id\..{1,1400}children:)(?=.{1,20}}\)}function)/,
-                    replace: "$self.isHiddenChannel($<channel>)?$self.HiddenChannelLockScreen($<channel>):"
+                    match: /Guild voice channel without guild id.+?children:(?<=(\i)\.getGuildId\(\).+?)(?=.{0,20}?}\)}function)/,
+                    replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?$self.HiddenChannelLockScreen(${channel}):`
                 },
                 {
                     // Disable useless components for the HiddenChannelLockScreen of stage channels
-                    match: /(?<=(?<channel>\i)\.getGuildId\(\).{1,30}Guild voice channel without guild id\..{1,1000}render(?!Header).{0,30}:)/g,
-                    replace: "$self.isHiddenChannel($<channel>)?null:"
+                    match: /render(?!Header).{0,30}?:(?<=(\i)\.getGuildId\(\).+?Guild voice channel without guild id.+?)/g,
+                    replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?null:`
                 },
                 // Prevent Discord from replacing our route if we aren't connected to the stage channel
                 {
-                    match: /(?<=if\()(?=!\i&&!\i&&!\i.{1,80}(?<channel>\i)\.getGuildId\(\).{1,50}Guild voice channel without guild id\.)/,
-                    replace: "!$self.isHiddenChannel($<channel>)&&"
+                    match: /(?=!\i&&!\i&&!\i.{0,80}?(\i)\.getGuildId\(\).{0,50}?Guild voice channel without guild id)(?<=if\()/,
+                    replace: (_, channel) => `!$self.isHiddenChannel(${channel})&&`
                 },
                 {
                     // Disable gradients for the HiddenChannelLockScreen of stage channels
-                    match: /(?<=(?<channel>\i)\.getGuildId\(\).{1,30}Guild voice channel without guild id\..{1,600}disableGradients:)/,
-                    replace: "$self.isHiddenChannel($<channel>)||"
+                    match: /Guild voice channel without guild id.+?disableGradients:(?<=(\i)\.getGuildId\(\).+?)/,
+                    replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})||`
                 },
                 {
                     // Disable strange styles applied to the header for the HiddenChannelLockScreen of stage channels
-                    match: /(?<=(?<channel>\i)\.getGuildId\(\).{1,30}Guild voice channel without guild id\..{1,600}style:)/,
-                    replace: "$self.isHiddenChannel($<channel>)?undefined:"
+                    match: /Guild voice channel without guild id.+?style:(?<=(\i)\.getGuildId\(\).+?)/,
+                    replace: (m, channel) => `${m}$self.isHiddenChannel(${channel})?undefined:`
                 },
                 {
                     // Remove the divider and amount of users in stage channel components for the HiddenChannelLockScreen
-                    match: /\(0,\i\.jsx\)\(\i\.\i\.Divider.+?}\)]}\)(?=.+?:(?<channel>\i)\.guild_id)/,
-                    replace: "$self.isHiddenChannel($<channel>)?null:($&)"
+                    match: /\(0,\i\.jsx\)\(\i\.\i\.Divider.+?}\)]}\)(?=.+?:(\i)\.guild_id)/,
+                    replace: (m, channel) => `$self.isHiddenChannel(${channel})?null:(${m})`
                 },
                 {
                     // Remove the open chat button for the HiddenChannelLockScreen
-                    match: /(?<=null,)(?=.{1,120}channelId:(?<channel>\i)\.id,.+?toggleRequestToSpeakSidebar:\i,iconClassName:\i\(\)\.buttonIcon)/,
-                    replace: "!$self.isHiddenChannel($<channel>)&&"
+                    match: /"recents".+?null,(?=.{0,120}?channelId:(\i)\.id)/,
+                    replace: (m, channel) => `${m}!$self.isHiddenChannel(${channel})&&`
                 }
             ],
+        },
+        {
+            // The module wasn't being found, so lets just escape everything
+            // eslint-disable-next-line no-useless-escape
+            find: "\^https\:\/\/\(\?\:canary\.\|ptb\.\)\?discord.com\/channels\/\(\\\\\d\+\|",
+            replacement: {
+                // Make mentions of hidden channels work
+                match: /\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL,\i\)/,
+                replace: "true"
+            },
+        },
+        {
+            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}})`
+            }
         }
     ],
 
diff --git a/src/plugins/spotifyCrack.ts b/src/plugins/spotifyCrack.ts
index c64154aaf..2682ccb46 100644
--- a/src/plugins/spotifyCrack.ts
+++ b/src/plugins/spotifyCrack.ts
@@ -16,53 +16,55 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { migratePluginSettings, Settings } from "@api/settings";
+import { definePluginSettings, migratePluginSettings } from "@api/settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 
+const settings = definePluginSettings({
+    noSpotifyAutoPause: {
+        description: "Disable Spotify auto-pause",
+        type: OptionType.BOOLEAN,
+        default: true,
+        restartNeeded: true
+    },
+    keepSpotifyActivityOnIdle: {
+        description: "Keep Spotify activity playing when idling",
+        type: OptionType.BOOLEAN,
+        default: false,
+        restartNeeded: true
+    }
+});
+
 migratePluginSettings("SpotifyCrack", "Ify");
 export default definePlugin({
     name: "SpotifyCrack",
     description: "Free listen along, no auto-pausing in voice chat, and allows activity to continue playing when idling",
-    authors: [
-        Devs.Cyn,
-        Devs.Nuckyz
-    ],
+    authors: [Devs.Cyn, Devs.Nuckyz],
+    settings,
 
-    patches: [{
-        find: 'dispatch({type:"SPOTIFY_PROFILE_UPDATE"',
-        replacement: [{
-            match: /(function\((.{1,2})\){)(.{1,6}dispatch\({type:"SPOTIFY_PROFILE_UPDATE")/,
-            replace: (_, functionStart, data, functionBody) => `${functionStart}${data}.body.product="premium";${functionBody}`
-        }],
-    }, {
-        find: '.displayName="SpotifyStore"',
-        predicate: () => Settings.plugins.SpotifyCrack.noSpotifyAutoPause,
-        replacement: {
-            match: /function (.{1,2})\(\).{0,200}SPOTIFY_AUTO_PAUSED\);.{0,}}}}/,
-            replace: "function $1(){}"
-        }
-    }, {
-        find: '.displayName="SpotifyStore"',
-        predicate: () => Settings.plugins.SpotifyCrack.keepSpotifyActivityOnIdle,
-        replacement: {
-            match: /(shouldShowActivity=function\(\){.{1,50})&&!.{1,6}\.isIdle\(\)(.{0,}?})/,
-            replace: (_, functionDeclarationAndExpression, restOfFunction) => `${functionDeclarationAndExpression}${restOfFunction}`
-        }
-    }],
+    patches: [
+        {
 
-    options: {
-        noSpotifyAutoPause: {
-            description: "Disable Spotify auto-pause",
-            type: OptionType.BOOLEAN,
-            default: true,
-            restartNeeded: true,
+            find: 'dispatch({type:"SPOTIFY_PROFILE_UPDATE"',
+            replacement: {
+                match: /SPOTIFY_PROFILE_UPDATE.+?isPremium:(?="premium"===(\i)\.body\.product)/,
+                replace: (m, req) => `${m}(${req}.body.product="premium")&&`
+            },
         },
-        keepSpotifyActivityOnIdle: {
-            description: "Keep Spotify activity playing when idling",
-            type: OptionType.BOOLEAN,
-            default: false,
-            restartNeeded: true,
+        {
+            find: '.displayName="SpotifyStore"',
+            replacement: [
+                {
+                    predicate: () => settings.store.noSpotifyAutoPause,
+                    match: /(?<=function \i\(\){)(?=.{0,200}SPOTIFY_AUTO_PAUSED\))/,
+                    replace: "return;"
+                },
+                {
+                    predicate: () => settings.store.keepSpotifyActivityOnIdle,
+                    match: /(?<=shouldShowActivity=function\(\){.{0,50})&&!\i\.\i\.isIdle\(\)/,
+                    replace: ""
+                }
+            ]
         }
-    }
+    ]
 });
diff --git a/src/plugins/typingIndicator.tsx b/src/plugins/typingIndicator.tsx
index 27c143b02..9af09bca6 100644
--- a/src/plugins/typingIndicator.tsx
+++ b/src/plugins/typingIndicator.tsx
@@ -121,8 +121,8 @@ export default definePlugin({
         {
             find: ".UNREAD_HIGHLIGHT",
             replacement: {
-                match: /(?<=(?<channel>\i)=\i\.channel,.+?\(\)\.children.+?:null)/,
-                replace: ",$self.TypingIndicator($<channel>.id)"
+                match: /\(\).children.+?:null(?<=(\i)=\i\.channel,.+?)/,
+                replace: (m, channel) => `${m},$self.TypingIndicator(${channel}.id)`
             }
         }
     ],
diff --git a/src/plugins/volumeBooster.ts b/src/plugins/volumeBooster.ts
index 6553a5c78..7d8144912 100644
--- a/src/plugins/volumeBooster.ts
+++ b/src/plugins/volumeBooster.ts
@@ -16,14 +16,26 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { makeRange } from "@components/PluginSettings/components/SettingSliderComponent";
+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({
+    multiplier: {
+        description: "Volume Multiplier",
+        type: OptionType.SLIDER,
+        markers: makeRange(1, 5, 1),
+        default: 2,
+        stickToMarkers: true,
+    }
+});
+
 export default definePlugin({
     name: "VolumeBooster",
     authors: [Devs.Nuckyz],
     description: "Allows you to set the user and stream volume above the default maximum.",
+    settings,
 
     patches: [
         // Change the max volume for sliders to allow for values above 200
@@ -33,11 +45,10 @@ export default definePlugin({
         ].map(find => ({
             find,
             replacement: {
-                match: /maxValue:(?<defaultMaxVolumePredicate>\i\.\i)\?(?<higherMaxVolume>\d+?):(?<minorMaxVolume>\d+?),/,
-                replace: ""
-                    + "maxValue:$<defaultMaxVolumePredicate>"
-                    + "?$<higherMaxVolume>*Vencord.Settings.plugins.VolumeBooster.multiplier"
-                    + ":$<minorMaxVolume>*Vencord.Settings.plugins.VolumeBooster.multiplier,"
+                match: /(?<=maxValue:\i\.\i)\?(\d+?):(\d+?)(?=,)/,
+                replace: (_, higherMaxVolume, minorMaxVolume) => ""
+                    + `?${higherMaxVolume}*$self.settings.store.multiplier`
+                    + `:${minorMaxVolume}*$self.settings.store.multiplier`
             }
         })),
         // Prevent Audio Context Settings sync from trying to sync with values above 200, changing them to 200 before we send to Discord
@@ -45,16 +56,16 @@ export default definePlugin({
             find: "AudioContextSettingsMigrated",
             replacement: [
                 {
-                    match: /(?<restOfFunction>updateAsync\("audioContextSettings".{1,50})(?<volumeChangeExpression>return (?<volumeOptions>\i)\.volume=(?<newVolume>\i))/,
-                    replace: "$<restOfFunction>if($<newVolume>>200)return $<volumeOptions>.volume=200;$<volumeChangeExpression>"
+                    match: /(?<=updateAsync\("audioContextSettings".{0,50})(?=return (\i)\.volume=(\i))/,
+                    replace: (_, volumeOptions, newVolume) => `if(${newVolume}>200)return ${volumeOptions}.volume=200;`
                 },
                 {
-                    match: /(?<restOfFunction>Object\.entries\(\i\.localMutes\).+?)volume:(?<volumeExpression>.+?),/,
-                    replace: "$<restOfFunction>volume:$<volumeExpression>>200?200:$<volumeExpression>,"
+                    match: /(?<=Object\.entries\(\i\.localMutes\).+?volume:).+?(?=,)/,
+                    replace: "$&>200?200:$&"
                 },
                 {
-                    match: /(?<restOfFunction>Object\.entries\(\i\.localVolumes\).+?)volume:(?<volumeExpression>.+?)}\)/,
-                    replace: "$<restOfFunction>volume:$<volumeExpression>>200?200:$<volumeExpression>})"
+                    match: /(?<=Object\.entries\(\i\.localVolumes\).+?volume:).+?(?=})/,
+                    replace: "$&>200?200:$&"
                 }
             ]
         },
@@ -63,24 +74,13 @@ export default definePlugin({
             find: '.displayName="MediaEngineStore"',
             replacement: [
                 {
-                    match: /(?<restOfFunction>\.settings\.audioContextSettings.+?)(?<localVolume>\i\[\i\])=(?<syncVolume>\i\.volume)(?<secondRestOfFunction>.+?)setLocalVolume\((?<id>.+?),.+?\)/,
-                    replace: ""
-                        + "$<restOfFunction>"
-                        + "($<localVolume>>200?undefined:$<localVolume>=$<syncVolume>)"
-                        + "$<secondRestOfFunction>"
-                        + "setLocalVolume($<id>,$<localVolume>??$<syncVolume>)"
+                    match: /(?<=\.settings\.audioContextSettings.+?)(\i\[\i\])=(\i\.volume)(.+?setLocalVolume\(\i,).+?\)/,
+                    replace: (_, localVolume, syncVolume, rest) => ""
+                        + `(${localVolume}>200?void 0:${localVolume}=${syncVolume})`
+                        + rest
+                        + `${localVolume}??${syncVolume})`
                 }
             ]
         }
     ],
-
-    options: {
-        multiplier: {
-            description: "Volume Multiplier",
-            type: OptionType.SLIDER,
-            markers: makeRange(1, 5, 1),
-            default: 2,
-            stickToMarkers: true,
-        }
-    }
 });
diff --git a/src/plugins/whoReacted.tsx b/src/plugins/whoReacted.tsx
index 8ab1c5f7d..4b1c828fd 100644
--- a/src/plugins/whoReacted.tsx
+++ b/src/plugins/whoReacted.tsx
@@ -93,8 +93,8 @@ export default definePlugin({
     patches: [{
         find: ",reactionRef:",
         replacement: {
-            match: /((.)=(.{1,3})\.hideCount)(,.+?reactionCount.+?\}\))/,
-            replace: "$1,whoReactedProps=$3$4,$2?null:$self.renderUsers(whoReactedProps)"
+            match: /(?<=(\i)=(\i)\.hideCount,)(.+?reactionCount.+?\}\))/,
+            replace: (_, hideCount, props, rest) => `whoReactedProps=${props},${rest},${hideCount}?null:$self.renderUsers(whoReactedProps)`
         }
     }],
 

From 1b199ec5d8e0ca3805a9960323ddd267561b4cf6 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 8 Mar 2023 01:59:50 -0300
Subject: [PATCH 017/147] feat: Context Menu API (#496)

---
 src/api/ContextMenu.ts        | 141 ++++++++++++++++++++++++++++++++++
 src/api/index.ts              |   6 ++
 src/plugins/apiContextMenu.ts |  69 +++++++++++++++++
 src/webpack/patchWebpack.ts   |  10 ++-
 src/webpack/webpack.ts        |  23 +++---
 5 files changed, 236 insertions(+), 13 deletions(-)
 create mode 100644 src/api/ContextMenu.ts
 create mode 100644 src/plugins/apiContextMenu.ts

diff --git a/src/api/ContextMenu.ts b/src/api/ContextMenu.ts
new file mode 100644
index 000000000..64671177b
--- /dev/null
+++ b/src/api/ContextMenu.ts
@@ -0,0 +1,141 @@
+/*
+ * 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 Logger from "@utils/Logger";
+import type { ReactElement } from "react";
+
+/**
+ * @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
+ */
+export type NavContextMenuPatchCallback = (children: Array<React.ReactElement>, args?: Array<any>) => void;
+/**
+ * @param 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
+ */
+export type GlobalContextMenuPatchCallback = (navId: string, children: Array<React.ReactElement>, args?: Array<any>) => void;
+
+const ContextMenuLogger = new Logger("ContextMenu");
+
+export const navPatches = new Map<string, Set<NavContextMenuPatchCallback>>();
+export const globalPatches = new Set<GlobalContextMenuPatchCallback>();
+
+/**
+ * Add a context menu patch
+ * @param navId The navId(s) for the context menu(s) to patch
+ * @param patch The patch to be applied
+ */
+export function addContextMenuPatch(navId: string | Array<string>, patch: NavContextMenuPatchCallback) {
+    if (!Array.isArray(navId)) navId = [navId];
+    for (const id of navId) {
+        let contextMenuPatches = navPatches.get(id);
+        if (!contextMenuPatches) {
+            contextMenuPatches = new Set();
+            navPatches.set(id, contextMenuPatches);
+        }
+
+        contextMenuPatches.add(patch);
+    }
+}
+
+/**
+ * Add a global context menu patch that fires the patch for all context menus
+ * @param patch The patch to be applied
+ */
+export function addGlobalContextMenuPatch(patch: GlobalContextMenuPatchCallback) {
+    globalPatches.add(patch);
+}
+
+/**
+ * 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)
+ */
+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];
+
+    const results = navIds.map(id => navPatches.get(id)?.delete(patch) ?? false);
+
+    return (Array.isArray(navId) ? results : results[0]) as T extends string ? boolean : Array<boolean>;
+}
+
+/**
+ * Remove a global context menu patch
+ * @returns Wheter the patch was sucessfully removed
+ */
+export function removeGlobalContextMenuPatch(patch: GlobalContextMenuPatchCallback): boolean {
+    return globalPatches.delete(patch);
+}
+
+/**
+ * A helper function for finding the children array of a group nested inside a context menu based on the id of one of its childs
+ * @param id The id of the child
+ */
+export function findGroupChildrenByChildId(id: string, children: Array<React.ReactElement>, itemsArray?: Array<React.ReactElement>): Array<React.ReactElement> | null {
+    for (const child of children) {
+        if (child === null) continue;
+
+        if (child.props?.id === id) return itemsArray ?? null;
+
+        let nextChildren = child.props?.children;
+        if (nextChildren) {
+            if (!Array.isArray(nextChildren)) {
+                nextChildren = [nextChildren];
+                child.props.children = nextChildren;
+            }
+
+            const found = findGroupChildrenByChildId(id, nextChildren, nextChildren);
+            if (found !== null) return found;
+        }
+    }
+
+    return null;
+}
+
+interface ContextMenuProps {
+    contextMenuApiArguments?: Array<any>;
+    navId: string;
+    children: Array<ReactElement>;
+    "aria-label": string;
+    onSelect: (() => void) | undefined;
+    onClose: (callback: (...args: Array<any>) => any) => void;
+}
+
+export function _patchContextMenu(props: ContextMenuProps) {
+    const contextMenuPatches = navPatches.get(props.navId);
+
+    if (contextMenuPatches) {
+        for (const patch of contextMenuPatches) {
+            try {
+                patch(props.children, props.contextMenuApiArguments);
+            } catch (err) {
+                ContextMenuLogger.error(`Patch for ${props.navId} errored,`, err);
+            }
+        }
+    }
+
+    for (const patch of globalPatches) {
+        try {
+            patch(props.navId, props.children, props.contextMenuApiArguments);
+        } catch (err) {
+            ContextMenuLogger.error("Global patch errored,", err);
+        }
+    }
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index abb509348..e4b87bfce 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -18,6 +18,7 @@
 
 import * as $Badges from "./Badges";
 import * as $Commands from "./Commands";
+import * as $ContextMenu from "./ContextMenu";
 import * as $DataStore from "./DataStore";
 import * as $MemberListDecorators from "./MemberListDecorators";
 import * as $MessageAccessories from "./MessageAccessories";
@@ -93,3 +94,8 @@ export const Styles = $Styles;
  * An API allowing you to display notifications
  */
 export const Notifications = $Notifications;
+
+/**
+ * An api allowing you to patch and add/remove items to/from context menus
+ */
+export const ContextMenu = $ContextMenu;
diff --git a/src/plugins/apiContextMenu.ts b/src/plugins/apiContextMenu.ts
new file mode 100644
index 000000000..131c209ed
--- /dev/null
+++ b/src/plugins/apiContextMenu.ts
@@ -0,0 +1,69 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Settings } from "@api/settings";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { addListener, removeListener } from "@webpack";
+
+function listener(exports: any, id: number) {
+    if (typeof exports !== "object" || exports === null) return;
+
+    for (const key in exports) if (key.length <= 3) {
+        const prop = exports[key];
+        if (typeof prop !== "function") continue;
+
+        const str = Function.prototype.toString.call(prop);
+        if (str.includes('path:["empty"]')) {
+            Vencord.Plugins.patches.push({
+                plugin: "ContextMenuAPI",
+                all: true,
+                noWarn: true,
+                find: "navId:",
+                replacement: {
+                    /** Regex explanation
+                     * Use of https://blog.stevenlevithan.com/archives/mimic-atomic-groups to mimick atomic groups: (?=(...))\1
+                     * Match ${id} and look behind it for the first match of `<variable name>=`: ${id}(?=(\i)=.+?)
+                     * Match rest of the code until it finds `<variable name>.${key},{`: .+?\2\.${key},{
+                     */
+                    match: RegExp(`(?=(${id}(?<=(\\i)=.+?).+?\\2\\.${key},{))\\1`, "g"),
+                    replace: "$&contextMenuApiArguments:arguments,"
+                }
+            });
+
+            removeListener(listener);
+        }
+    }
+}
+
+if (Settings.plugins.ContextMenuAPI.enabled) addListener(listener);
+
+export default definePlugin({
+    name: "ContextMenuAPI",
+    description: "API for adding/removing items to/from context menus.",
+    authors: [Devs.Nuckyz],
+    patches: [
+        {
+            find: "♫ (つ｡◕‿‿◕｡)つ ♪",
+            replacement: {
+                match: /(?<=function \i\((\i)\){)(?=var \i,\i=\i\.navId)/,
+                replace: (_, props) => `Vencord.Api.ContextMenu._patchContextMenu(${props});`
+            }
+        }
+    ]
+});
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index 19ca9517b..697ce9496 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -92,9 +92,11 @@ function patchPush() {
                         return;
                     }
 
+                    const numberId = Number(id);
+
                     for (const callback of listeners) {
                         try {
-                            callback(exports);
+                            callback(exports, numberId);
                         } catch (err) {
                             logger.error("Error in webpack listener", err);
                         }
@@ -104,17 +106,17 @@ function patchPush() {
                         try {
                             if (filter(exports)) {
                                 subscriptions.delete(filter);
-                                callback(exports);
+                                callback(exports, numberId);
                             } else if (typeof exports === "object") {
                                 if (exports.default && filter(exports.default)) {
                                     subscriptions.delete(filter);
-                                    callback(exports.default);
+                                    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]);
+                                        callback(exports[nested], numberId);
                                     }
                                 }
                             }
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 98a0ea89f..0d9558790 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -57,7 +57,7 @@ export const filters = {
 export const subscriptions = new Map<FilterFn, CallbackFn>();
 export const listeners = new Set<CallbackFn>();
 
-export type CallbackFn = (mod: any) => void;
+export type CallbackFn = (mod: any, id: number) => void;
 
 export function _initWebpack(instance: typeof window.webpackChunkdiscord_app) {
     if (cache !== void 0) throw "no.";
@@ -86,18 +86,23 @@ export const find = traceFunction("find", function find(filter: FilterFn, getDef
         const mod = cache[key];
         if (!mod?.exports) continue;
 
-        if (filter(mod.exports))
-            return mod.exports;
+        if (filter(mod.exports)) {
+            return isWaitFor ? [mod.exports, Number(key)] : mod.exports;
+        }
 
         if (typeof mod.exports !== "object") continue;
 
-        if (mod.exports.default && filter(mod.exports.default))
-            return getDefault ? mod.exports.default : mod.exports;
+        if (mod.exports.default && filter(mod.exports.default)) {
+            const found = getDefault ? mod.exports.default : mod.exports;
+            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 nested;
+            if (nested && filter(nested)) {
+                return isWaitFor ? [nested, Number(key)] : nested;
+            }
         }
     }
 
@@ -112,7 +117,7 @@ export const find = traceFunction("find", function find(filter: FilterFn, getDef
         }
     }
 
-    return null;
+    return isWaitFor ? [null, null] : null;
 });
 
 /**
@@ -347,8 +352,8 @@ 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 = find(filter!, true, true);
-    if (existing) return void callback(existing);
+    const [existing, id] = find(filter!, true, true);
+    if (existing) return void callback(existing, id);
 
     subscriptions.set(filter, callback);
 }

From 0fb3901a185327f3de39682ea9fc6e809b935807 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 8 Mar 2023 03:01:15 -0300
Subject: [PATCH 018/147] Fix Context Menu API (#583)

---
 src/plugins/apiContextMenu.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/apiContextMenu.ts b/src/plugins/apiContextMenu.ts
index 131c209ed..77afead84 100644
--- a/src/plugins/apiContextMenu.ts
+++ b/src/plugins/apiContextMenu.ts
@@ -22,6 +22,8 @@ import definePlugin from "@utils/types";
 import { addListener, removeListener } from "@webpack";
 
 function listener(exports: any, id: number) {
+    if (!Settings.plugins.ContextMenuAPI.enabled) return removeListener(listener);
+
     if (typeof exports !== "object" || exports === null) return;
 
     for (const key in exports) if (key.length <= 3) {
@@ -51,7 +53,7 @@ function listener(exports: any, id: number) {
     }
 }
 
-if (Settings.plugins.ContextMenuAPI.enabled) addListener(listener);
+addListener(listener);
 
 export default definePlugin({
     name: "ContextMenuAPI",

From 253183a16a78ce0ebc183af7e078b61eb0d4d758 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 8 Mar 2023 04:01:24 -0300
Subject: [PATCH 019/147] Fix Emote Cloner and improve ReverseImageSearch
 (#489)

---
 src/api/ContextMenu.ts             |   2 +-
 src/plugins/apiContextMenu.ts      |   4 +-
 src/plugins/emoteCloner.tsx        | 128 +++++++++++++++--------------
 src/plugins/reverseImageSearch.tsx |  76 ++++++++---------
 4 files changed, 107 insertions(+), 103 deletions(-)

diff --git a/src/api/ContextMenu.ts b/src/api/ContextMenu.ts
index 64671177b..9a8d7b66f 100644
--- a/src/api/ContextMenu.ts
+++ b/src/api/ContextMenu.ts
@@ -90,7 +90,7 @@ export function removeGlobalContextMenuPatch(patch: GlobalContextMenuPatchCallba
  */
 export function findGroupChildrenByChildId(id: string, children: Array<React.ReactElement>, itemsArray?: Array<React.ReactElement>): Array<React.ReactElement> | null {
     for (const child of children) {
-        if (child === null) continue;
+        if (child == null) continue;
 
         if (child.props?.id === id) return itemsArray ?? null;
 
diff --git a/src/plugins/apiContextMenu.ts b/src/plugins/apiContextMenu.ts
index 77afead84..69dfde4a4 100644
--- a/src/plugins/apiContextMenu.ts
+++ b/src/plugins/apiContextMenu.ts
@@ -37,7 +37,7 @@ function listener(exports: any, id: number) {
                 all: true,
                 noWarn: true,
                 find: "navId:",
-                replacement: {
+                replacement: [{
                     /** Regex explanation
                      * Use of https://blog.stevenlevithan.com/archives/mimic-atomic-groups to mimick atomic groups: (?=(...))\1
                      * Match ${id} and look behind it for the first match of `<variable name>=`: ${id}(?=(\i)=.+?)
@@ -45,7 +45,7 @@ function listener(exports: any, id: number) {
                      */
                     match: RegExp(`(?=(${id}(?<=(\\i)=.+?).+?\\2\\.${key},{))\\1`, "g"),
                     replace: "$&contextMenuApiArguments:arguments,"
-                }
+                }]
             });
 
             removeListener(listener);
diff --git a/src/plugins/emoteCloner.tsx b/src/plugins/emoteCloner.tsx
index e252fe5fb..7db5efddf 100644
--- a/src/plugins/emoteCloner.tsx
+++ b/src/plugins/emoteCloner.tsx
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { migratePluginSettings, Settings } from "@api/settings";
+import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { migratePluginSettings } from "@api/settings";
 import { CheckedTextInput } from "@components/CheckedTextInput";
 import { Devs } from "@utils/constants";
 import Logger from "@utils/Logger";
 import { Margins } from "@utils/margins";
-import { makeLazy } from "@utils/misc";
 import { ModalContent, ModalHeader, ModalRoot, openModal } from "@utils/modal";
 import definePlugin from "@utils/types";
 import { findByCodeLazy, findByPropsLazy } from "@webpack";
@@ -176,72 +176,74 @@ function CloneModal({ id, name: emojiName, isAnimated }: { id: string; name: str
     );
 }
 
+const messageContextMenuPatch: NavContextMenuPatchCallback = (children, args) => {
+    if (!args?.[0]) return;
+    const { favoriteableId, emoteClonerDataAlt, itemHref, itemSrc, favoriteableType } = args[0];
+
+    if (!emoteClonerDataAlt || favoriteableType !== "emoji") return;
+
+    const name = emoteClonerDataAlt.match(/:(.*)(?:~\d+)?:/)?.[1];
+    if (!name || !favoriteableId) return;
+
+    const src = itemHref ?? itemSrc;
+    const isAnimated = new URL(src).pathname.endsWith(".gif");
+
+    const group = findGroupChildrenByChildId("save-image", children);
+    if (group && !group.some(child => child?.props?.id === "emote-cloner")) {
+        group.push((
+            <Menu.MenuItem
+                id="emote-cloner"
+                key="emote-cloner"
+                label="Clone"
+                action={() =>
+                    openModal(modalProps => (
+                        <ModalRoot {...modalProps}>
+                            <ModalHeader>
+                                <img
+                                    role="presentation"
+                                    aria-hidden
+                                    src={`${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/emojis/${favoriteableId}.${isAnimated ? "gif" : "png"}`}
+                                    alt=""
+                                    height={24}
+                                    width={24}
+                                    style={{ marginRight: "0.5em" }}
+                                />
+                                <Forms.FormText>Clone {name}</Forms.FormText>
+                            </ModalHeader>
+                            <ModalContent>
+                                <CloneModal id={favoriteableId} name={name} isAnimated={isAnimated} />
+                            </ModalContent>
+                        </ModalRoot>
+                    ))
+                }
+            >
+            </Menu.MenuItem>
+        ));
+    }
+};
+
 migratePluginSettings("EmoteCloner", "EmoteYoink");
 export default definePlugin({
     name: "EmoteCloner",
     description: "Adds a Clone context menu item to emotes to clone them your own server",
-    authors: [Devs.Ven],
-    dependencies: ["MenuItemDeobfuscatorAPI"],
+    authors: [Devs.Ven, Devs.Nuckyz],
+    dependencies: ["MenuItemDeobfuscatorAPI", "ContextMenuAPI"],
 
-    patches: [{
-        // Literally copy pasted from ReverseImageSearch lol
-        find: "open-native-link",
-        replacement: {
-            match: /id:"open-native-link".{0,200}\(\{href:(.{0,3}),.{0,200}\},"open-native-link"\)/,
-            replace: "$&,$self.makeMenu(arguments[2])"
-        },
-
-    },
-    // Also copy pasted from Reverse Image Search
-    {
-        // pass the target to the open link menu so we can grab its data
-        find: "REMOVE_ALL_REACTIONS_CONFIRM_BODY,",
-        predicate: makeLazy(() => !Settings.plugins.ReverseImageSearch.enabled),
-        noWarn: true,
-        replacement: {
-            match: /(?<props>.).onHeightUpdate.{0,200}(.)=(.)=.\.url;.+?\(null!=\3\?\3:\2[^)]+/,
-            replace: "$&,$<props>.target"
-        }
-    }],
-
-    makeMenu(htmlElement: HTMLImageElement) {
-        if (htmlElement?.dataset.type !== "emoji")
-            return null;
-
-        const { id } = htmlElement.dataset;
-        const name = htmlElement.alt.match(/:(.*)(?:~\d+)?:/)?.[1];
-
-        if (!name || !id)
-            return null;
-
-        const isAnimated = new URL(htmlElement.src).pathname.endsWith(".gif");
-
-        return <Menu.MenuItem
-            id="emote-cloner"
-            key="emote-cloner"
-            label="Clone"
-            action={() =>
-                openModal(modalProps => (
-                    <ModalRoot {...modalProps}>
-                        <ModalHeader>
-                            <img
-                                role="presentation"
-                                aria-hidden
-                                src={`${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/emojis/${id}.${isAnimated ? "gif" : "png"}`}
-                                alt=""
-                                height={24}
-                                width={24}
-                                style={{ marginRight: "0.5em" }}
-                            />
-                            <Forms.FormText>Clone {name}</Forms.FormText>
-                        </ModalHeader>
-                        <ModalContent>
-                            <CloneModal id={id} name={name} isAnimated={isAnimated} />
-                        </ModalContent>
-                    </ModalRoot>
-                ))
+    patches: [
+        {
+            find: ".Messages.MESSAGE_ACTIONS_MENU_LABEL",
+            replacement: {
+                match: /(?<=favoriteableType:\i,)(?<=(\i)\.getAttribute\("data-type"\).+?)/,
+                replace: (_, target) => `emoteClonerDataAlt:${target}.alt,`
             }
-        >
-        </Menu.MenuItem>;
+        }
+    ],
+
+    start() {
+        addContextMenuPatch("message", messageContextMenuPatch);
     },
+
+    stop() {
+        removeContextMenuPatch("message", messageContextMenuPatch);
+    }
 });
diff --git a/src/plugins/reverseImageSearch.tsx b/src/plugins/reverseImageSearch.tsx
index 4d9f040b1..6335fbd9f 100644
--- a/src/plugins/reverseImageSearch.tsx
+++ b/src/plugins/reverseImageSearch.tsx
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { Menu } from "@webpack/common";
@@ -29,39 +30,21 @@ const Engines = {
     ImgOps: "https://imgops.com/start?url="
 };
 
-export default definePlugin({
-    name: "ReverseImageSearch",
-    description: "Adds ImageSearch to image context menus",
-    authors: [Devs.Ven],
-    dependencies: ["MenuItemDeobfuscatorAPI"],
-    patches: [{
-        find: "open-native-link",
-        replacement: {
-            match: /id:"open-native-link".{0,200}\(\{href:(.{0,3}),.{0,200}\},"open-native-link"\)/,
-            replace: (m, src) =>
-                `${m},Vencord.Plugins.plugins.ReverseImageSearch.makeMenu(${src}, arguments[2])`
-        }
-    }, {
-        // pass the target to the open link menu so we can check if it's an image
-        find: ".Messages.MESSAGE_ACTIONS_MENU_LABEL",
-        replacement: [
-            {
-                match: /ariaLabel:\i\.Z\.Messages\.MESSAGE_ACTIONS_MENU_LABEL/,
-                replace: "$&,_vencordTarget:arguments[0].target"
-            },
-            {
-                // var f = props.itemHref, .... MakeNativeMenu(null != f ? f : blah)
-                match: /(\i)=\i\.itemHref,.+?\(null!=\1\?\1:.{1,10}(?=\))/,
-                replace: "$&,arguments[0]._vencordTarget"
-            }
-        ]
-    }],
+function search(src: string, engine: string) {
+    open(engine + encodeURIComponent(src), "_blank");
+}
 
-    makeMenu(src: string, target: HTMLElement) {
-        if (target && !(target instanceof HTMLImageElement) && target.attributes["data-role"]?.value !== "img")
-            return null;
+const imageContextMenuPatch: NavContextMenuPatchCallback = (children, args) => {
+    if (!args?.[0]) return;
+    const { reverseImageSearchType, itemHref, itemSrc } = args[0];
 
-        return (
+    if (!reverseImageSearchType || reverseImageSearchType !== "img") return;
+
+    const src = itemHref ?? itemSrc;
+
+    const group = findGroupChildrenByChildId("save-image", children);
+    if (group && !group.some(child => child?.props?.id === "search-image")) {
+        group.push((
             <Menu.MenuItem
                 label="Search Image"
                 key="search-image"
@@ -74,7 +57,7 @@ export default definePlugin({
                             key={key}
                             id={key}
                             label={engine}
-                            action={() => this.search(src, Engines[engine])}
+                            action={() => search(src, Engines[engine])}
                         />
                     );
                 })}
@@ -82,14 +65,33 @@ export default definePlugin({
                     key="search-image-all"
                     id="search-image-all"
                     label="All"
-                    action={() => Object.values(Engines).forEach(e => this.search(src, e))}
+                    action={() => Object.values(Engines).forEach(e => search(src, e))}
                 />
             </Menu.MenuItem>
-        );
+        ));
+    }
+};
+
+export default definePlugin({
+    name: "ReverseImageSearch",
+    description: "Adds ImageSearch to image context menus",
+    authors: [Devs.Ven, Devs.Nuckyz],
+    dependencies: ["MenuItemDeobfuscatorAPI", "ContextMenuAPI"],
+    patches: [
+        {
+            find: ".Messages.MESSAGE_ACTIONS_MENU_LABEL",
+            replacement: {
+                match: /(?<=favoriteableType:\i,)(?<=(\i)\.getAttribute\("data-type"\).+?)/,
+                replace: (_, target) => `reverseImageSearchType:${target}.getAttribute("data-role"),`
+            }
+        }
+    ],
+
+    start() {
+        addContextMenuPatch("message", imageContextMenuPatch);
     },
 
-    // openUrl is a mangled export, so just match it in the module and pass it
-    search(src: string, engine: string) {
-        open(engine + encodeURIComponent(src), "_blank");
+    stop() {
+        removeContextMenuPatch("message", imageContextMenuPatch);
     }
 });

From bff67885461a60ddd533b1dcec353efb66d4f1a0 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 8 Mar 2023 21:19:28 -0300
Subject: [PATCH 020/147] feat(plugins): SilentMessageToggle (#586)

Co-authored-by: Ven <vendicated@riseup.net>
---
 src/plugins/apiContextMenu.ts       | 12 ++--
 src/plugins/emoteCloner.tsx         |  4 +-
 src/plugins/reverseImageSearch.tsx  |  4 +-
 src/plugins/silentMessageToggle.tsx | 85 +++++++++++++++++++++++++++++
 4 files changed, 94 insertions(+), 11 deletions(-)
 create mode 100644 src/plugins/silentMessageToggle.tsx

diff --git a/src/plugins/apiContextMenu.ts b/src/plugins/apiContextMenu.ts
index 69dfde4a4..1874f5f05 100644
--- a/src/plugins/apiContextMenu.ts
+++ b/src/plugins/apiContextMenu.ts
@@ -38,13 +38,11 @@ function listener(exports: any, id: number) {
                 noWarn: true,
                 find: "navId:",
                 replacement: [{
-                    /** Regex explanation
-                     * Use of https://blog.stevenlevithan.com/archives/mimic-atomic-groups to mimick atomic groups: (?=(...))\1
-                     * Match ${id} and look behind it for the first match of `<variable name>=`: ${id}(?=(\i)=.+?)
-                     * Match rest of the code until it finds `<variable name>.${key},{`: .+?\2\.${key},{
-                     */
-                    match: RegExp(`(?=(${id}(?<=(\\i)=.+?).+?\\2\\.${key},{))\\1`, "g"),
-                    replace: "$&contextMenuApiArguments:arguments,"
+                    match: RegExp(`${id}(?<=(\\i)=.+?).+$`),
+                    replace: (code, varName) => {
+                        const regex = RegExp(`${key},{(?<=${varName}\\.${key},{)`, "g");
+                        return code.replace(regex, "$&contextMenuApiArguments:arguments,");
+                    }
                 }]
             });
 
diff --git a/src/plugins/emoteCloner.tsx b/src/plugins/emoteCloner.tsx
index 7db5efddf..eba77c752 100644
--- a/src/plugins/emoteCloner.tsx
+++ b/src/plugins/emoteCloner.tsx
@@ -233,8 +233,8 @@ export default definePlugin({
         {
             find: ".Messages.MESSAGE_ACTIONS_MENU_LABEL",
             replacement: {
-                match: /(?<=favoriteableType:\i,)(?<=(\i)\.getAttribute\("data-type"\).+?)/,
-                replace: (_, target) => `emoteClonerDataAlt:${target}.alt,`
+                match: /favoriteableType:\i,(?<=(\i)\.getAttribute\("data-type"\).+?)/,
+                replace: (m, target) => `${m}emoteClonerDataAlt:${target}.alt,`
             }
         }
     ],
diff --git a/src/plugins/reverseImageSearch.tsx b/src/plugins/reverseImageSearch.tsx
index 6335fbd9f..47954ba0f 100644
--- a/src/plugins/reverseImageSearch.tsx
+++ b/src/plugins/reverseImageSearch.tsx
@@ -81,8 +81,8 @@ export default definePlugin({
         {
             find: ".Messages.MESSAGE_ACTIONS_MENU_LABEL",
             replacement: {
-                match: /(?<=favoriteableType:\i,)(?<=(\i)\.getAttribute\("data-type"\).+?)/,
-                replace: (_, target) => `reverseImageSearchType:${target}.getAttribute("data-role"),`
+                match: /favoriteableType:\i,(?<=(\i)\.getAttribute\("data-type"\).+?)/,
+                replace: (m, target) => `${m}reverseImageSearchType:${target}.getAttribute("data-role"),`
             }
         }
     ],
diff --git a/src/plugins/silentMessageToggle.tsx b/src/plugins/silentMessageToggle.tsx
new file mode 100644
index 000000000..09fb4e75c
--- /dev/null
+++ b/src/plugins/silentMessageToggle.tsx
@@ -0,0 +1,85 @@
+/*
+ * 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 { addPreSendListener, removePreSendListener, SendListener } from "@api/MessageEvents";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { Button, ButtonLooks, ButtonWrapperClasses, React, Tooltip } from "@webpack/common";
+
+function SilentMessageToggle() {
+    const [enabled, setEnabled] = React.useState(false);
+
+    React.useEffect(() => {
+        const listener: SendListener = (_, message) => {
+            if (enabled) {
+                setEnabled(false);
+                if (!message.content.startsWith("@silent ")) message.content = "@silent " + message.content;
+            }
+        };
+
+        addPreSendListener(listener);
+        return () => void removePreSendListener(listener);
+    }, [enabled]);
+
+    return (
+        <Tooltip text="Toggle Silent Message">
+            {tooltipProps => (
+                <Button
+                    {...tooltipProps}
+                    onClick={() => setEnabled(prev => !prev)}
+                    size=""
+                    look={ButtonLooks.BLANK}
+                    innerClassName={ButtonWrapperClasses.button}
+                    style={{ margin: "0px 8px" }}
+                >
+                    <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>
+                    </div>
+                </Button>
+            )}
+        </Tooltip>
+    );
+}
+
+export default definePlugin({
+    name: "SilentMessageToggle",
+    authors: [Devs.Nuckyz],
+    description: "Adds a button to the chat bar to toggle sending a silent message.",
+    patches: [
+        {
+            find: ".activeCommandOption",
+            replacement: {
+                match: /"gift"\)\);(?<=(\i)\.push.+?)/,
+                replace: (m, array) => `${m}${array}.push($self.SilentMessageToggle());`
+            }
+        }
+    ],
+
+    SilentMessageToggle: ErrorBoundary.wrap(SilentMessageToggle, { noop: true }),
+});

From d5c05d857f35f1eb101cbbd9d2b646994333d3b1 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 11 Mar 2023 00:25:32 +0100
Subject: [PATCH 021/147] Add DevOnly plugin capability

---
 scripts/build/common.mjs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
index c6a082dc9..16894707d 100644
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@@ -69,9 +69,9 @@ export const globPlugins = {
                 const files = await readdir(`./src/${dir}`);
                 for (const file of files) {
                     if (file.startsWith(".")) continue;
-                    if (file === "index.ts") {
-                        continue;
-                    }
+                    if (file === "index.ts") continue;
+                    if (!watch && (file.endsWith(".dev.ts") || file.endsWith(".dev.tsx"))) continue;
+
                     const mod = `p${i}`;
                     code += `import ${mod} from "./${dir}/${file.replace(/\.tsx?$/, "")}";\n`;
                     plugins += `[${mod}.name]:${mod},\n`;

From 983414d0241e1a2b691866d74dca632c9fb9576a Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 11 Mar 2023 00:25:49 +0100
Subject: [PATCH 022/147] Add DevCompanion plugin
 (https://github.com/Vencord/Companion)

---
 src/plugins/devCompanion.dev.tsx | 250 +++++++++++++++++++++++++++++++
 1 file changed, 250 insertions(+)
 create mode 100644 src/plugins/devCompanion.dev.tsx

diff --git a/src/plugins/devCompanion.dev.tsx b/src/plugins/devCompanion.dev.tsx
new file mode 100644
index 000000000..eaf13b7d2
--- /dev/null
+++ b/src/plugins/devCompanion.dev.tsx
@@ -0,0 +1,250 @@
+/*
+ * 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 } from "@api/ContextMenu";
+import { showNotification } from "@api/Notifications";
+import { Devs } from "@utils/constants";
+import Logger from "@utils/Logger";
+import { canonicalizeMatch, canonicalizeReplace } from "@utils/patches";
+import definePlugin from "@utils/types";
+import { filters, findAll, search } from "@webpack";
+import { Menu } from "@webpack/common";
+
+const PORT = 8485;
+const NAV_ID = "dev-companion-reconnect";
+
+const logger = new Logger("DevCompanion");
+
+let socket: WebSocket | undefined;
+
+type Node = StringNode | RegexNode | FunctionNode;
+
+interface StringNode {
+    type: "string";
+    value: string;
+}
+
+interface RegexNode {
+    type: "regex";
+    value: {
+        pattern: string;
+        flags: string;
+    };
+}
+
+interface FunctionNode {
+    type: "function";
+    value: string;
+}
+
+interface PatchData {
+    find: string;
+    replacement: {
+        match: StringNode | RegexNode;
+        replace: StringNode | FunctionNode;
+    }[];
+}
+
+interface FindData {
+    type: string;
+    args: Array<StringNode | FunctionNode>;
+}
+
+function parseNode(node: Node) {
+    switch (node.type) {
+        case "string":
+            return node.value;
+        case "regex":
+            return new RegExp(node.value.pattern, node.value.flags);
+        case "function":
+            // We LOVE remote code execution
+            // Safety: This comes from localhost only, which actually means we have less permissions than the source,
+            // since we're running in the browser sandbox, whereas the sender has host access
+            return (0, eval)(node.value);
+        default:
+            throw new Error("Unknown Node Type " + (node as any).type);
+    }
+}
+
+function initWs(isManual = false) {
+    let wasConnected = isManual;
+    let hasErrored = false;
+    const ws = socket = new WebSocket(`ws://localhost:${PORT}`);
+
+    ws.addEventListener("open", () => {
+        wasConnected = true;
+
+        logger.info("Connected to WebSocket");
+
+        showNotification({
+            title: "Dev Companion Connected",
+            body: "Connected to WebSocket"
+        });
+    });
+
+    ws.addEventListener("error", e => {
+        if (!wasConnected) return;
+
+        hasErrored = true;
+
+        logger.error("Dev Companion Error:", e);
+
+        showNotification({
+            title: "Dev Companion Error",
+            body: (e as ErrorEvent).message || "No Error Message",
+            color: "var(--status-danger, red)"
+        });
+    });
+
+    ws.addEventListener("close", e => {
+        if (!wasConnected && !hasErrored) return;
+
+        logger.info("Dev Companion Disconnected:", e.code, e.reason);
+
+        showNotification({
+            title: "Dev Companion Disconnected",
+            body: e.reason || "No Reason provided",
+            color: "var(--status-danger, red)"
+        });
+    });
+
+    ws.addEventListener("message", e => {
+        try {
+            var { nonce, type, data } = JSON.parse(e.data);
+        } catch (err) {
+            logger.error("Invalid JSON:", err, "\n" + e.data);
+            return;
+        }
+
+        function reply(error?: string) {
+            const data = { nonce, ok: !error } as Record<string, unknown>;
+            if (error) data.error = error;
+
+            ws.send(JSON.stringify(data));
+        }
+
+        logger.info("Received Message:", type, "\n", data);
+
+        switch (type) {
+            case "testPatch": {
+                const { find, replacement } = data as PatchData;
+
+                const candidates = search(find);
+                const keys = Object.keys(candidates);
+                if (keys.length !== 1)
+                    return reply("Expected exactly one 'find' matches, found " + keys.length);
+
+                let src = String(candidates[keys[0]]);
+
+                let i = 0;
+
+                for (const { match, replace } of replacement) {
+                    i++;
+
+                    try {
+                        const matcher = canonicalizeMatch(parseNode(match));
+                        const replacement = canonicalizeReplace(parseNode(replace), "PlaceHolderPluginName");
+
+                        const newSource = src.replace(matcher, replacement as string);
+
+                        if (src === newSource) throw "Had no effect";
+                        Function(newSource);
+
+                        src = newSource;
+                    } catch (err) {
+                        return reply(`Replacement ${i} failed: ${err}`);
+                    }
+                }
+
+                reply();
+                break;
+            }
+            case "testFind": {
+                const { type, args } = data as FindData;
+                try {
+                    var parsedArgs = args.map(parseNode);
+                } catch (err) {
+                    return reply("Failed to parse args: " + err);
+                }
+
+                try {
+                    let results: any[];
+                    switch (type.replace("find", "").replace("Lazy", "")) {
+                        case "":
+                            results = findAll(parsedArgs[0]);
+                            break;
+                        case "ByProps":
+                            results = findAll(filters.byProps(...parsedArgs));
+                            break;
+                        case "Store":
+                            results = findAll(filters.byStoreName(parsedArgs[0]));
+                            break;
+                        case "ByCode":
+                            results = findAll(filters.byCode(...parsedArgs));
+                            break;
+                        case "ModuleId":
+                            results = Object.keys(search(parsedArgs[0]));
+                            break;
+                        default:
+                            return reply("Unknown Find Type " + type);
+                    }
+
+                    if (results.length === 0) throw "No results";
+                    if (results.length > 1) throw "Found more than one result! Make this filter more specific";
+                } catch (err) {
+                    return reply("Failed to find: " + err);
+                }
+
+                reply();
+                break;
+            }
+            default:
+                reply("Unknown Type " + type);
+                break;
+        }
+    });
+}
+
+export default definePlugin({
+    name: "DevCompanion",
+    description: "Dev Companion Plugin",
+    authors: [Devs.Ven],
+
+    start() {
+        initWs();
+        addContextMenuPatch("user-settings-cog", kids => {
+            if (kids.some(k => k?.props?.id === NAV_ID)) return;
+
+            kids.unshift(
+                <Menu.MenuItem
+                    id={NAV_ID}
+                    label="Reconnect Dev Companion"
+                    action={() => {
+                        socket?.close(1000, "Reconnecting");
+                        initWs(true);
+                    }}
+                />
+            );
+        });
+    },
+
+    stop() {
+        socket?.close(1000, "Plugin Stopped");
+        socket = void 0;
+    }
+});

From 990adf752767de7e6c45270c5fcae8d1a467f325 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 11 Mar 2023 00:27:02 +0100
Subject: [PATCH 023/147] Fix casing in filename

---
 src/plugins/{FixInbox.tsx => fixInbox.tsx} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/plugins/{FixInbox.tsx => fixInbox.tsx} (100%)

diff --git a/src/plugins/FixInbox.tsx b/src/plugins/fixInbox.tsx
similarity index 100%
rename from src/plugins/FixInbox.tsx
rename to src/plugins/fixInbox.tsx

From 19c762f9c10e933be8b568be9738d3abc84b995e Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 11 Mar 2023 00:28:27 +0100
Subject: [PATCH 024/147] DevCompanion: Fix Deps

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

diff --git a/src/plugins/devCompanion.dev.tsx b/src/plugins/devCompanion.dev.tsx
index eaf13b7d2..1dbf4ca68 100644
--- a/src/plugins/devCompanion.dev.tsx
+++ b/src/plugins/devCompanion.dev.tsx
@@ -224,6 +224,7 @@ export default definePlugin({
     name: "DevCompanion",
     description: "Dev Companion Plugin",
     authors: [Devs.Ven],
+    dependencies: ["ContextMenuAPI"],
 
     start() {
         initWs();

From 3b945b87b8dc0901dd3f93230afdbb70b5ccd8c8 Mon Sep 17 00:00:00 2001
From: Ven <vendicated@riseup.net>
Date: Sat, 11 Mar 2023 12:26:54 +0100
Subject: [PATCH 025/147] Delete src/plugins/reviewDB directory

Api owner refusing to properly moderate hate speech and related illegal / ToS infringing content
---
 src/plugins/reviewDB/Utils/ReviewDBAPI.ts     |  95 -------------
 src/plugins/reviewDB/Utils/Utils.tsx          |  95 -------------
 .../reviewDB/components/MessageButton.tsx     |  43 ------
 .../reviewDB/components/ReviewBadge.tsx       |  45 -------
 .../reviewDB/components/ReviewComponent.tsx   | 125 ------------------
 .../reviewDB/components/ReviewsView.tsx       |  94 -------------
 src/plugins/reviewDB/entities/Badge.ts        |  26 ----
 src/plugins/reviewDB/entities/Review.ts       |  30 -----
 src/plugins/reviewDB/index.tsx                |  80 -----------
 9 files changed, 633 deletions(-)
 delete mode 100644 src/plugins/reviewDB/Utils/ReviewDBAPI.ts
 delete mode 100644 src/plugins/reviewDB/Utils/Utils.tsx
 delete mode 100644 src/plugins/reviewDB/components/MessageButton.tsx
 delete mode 100644 src/plugins/reviewDB/components/ReviewBadge.tsx
 delete mode 100644 src/plugins/reviewDB/components/ReviewComponent.tsx
 delete mode 100644 src/plugins/reviewDB/components/ReviewsView.tsx
 delete mode 100644 src/plugins/reviewDB/entities/Badge.ts
 delete mode 100644 src/plugins/reviewDB/entities/Review.ts
 delete mode 100644 src/plugins/reviewDB/index.tsx

diff --git a/src/plugins/reviewDB/Utils/ReviewDBAPI.ts b/src/plugins/reviewDB/Utils/ReviewDBAPI.ts
deleted file mode 100644
index a4c8dbfdb..000000000
--- a/src/plugins/reviewDB/Utils/ReviewDBAPI.ts
+++ /dev/null
@@ -1,95 +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 { Review } from "../entities/Review";
-import { authorize, showToast } from "./Utils";
-
-const API_URL = "https://manti.vendicated.dev";
-
-const getToken = () => Settings.plugins.ReviewDB.token;
-
-enum Response {
-    "Added your review" = 0,
-    "Updated your review" = 1,
-    "Error" = 2,
-}
-
-export async function getReviews(id: string): Promise<Review[]> {
-    const res = await fetch(API_URL + "/getUserReviews?snowflakeFormat=string&discordid=" + id);
-    return await res.json() as Review[];
-}
-
-export async function addReview(review: any): Promise<Response> {
-    review.token = getToken();
-
-    if (!review.token) {
-        showToast("Please authorize to add a review.");
-        authorize();
-        return Response.Error;
-    }
-
-    return fetch(API_URL + "/addUserReview", {
-        method: "POST",
-        body: JSON.stringify(review),
-        headers: {
-            "Content-Type": "application/json",
-        }
-    })
-        .then(r => r.text())
-        .then(res => {
-            showToast(res);
-            return Response[res] ?? Response.Error;
-        });
-}
-
-export function deleteReview(id: number): Promise<any> {
-    return fetch(API_URL + "/deleteReview", {
-        method: "POST",
-        headers: new Headers({
-            "Content-Type": "application/json",
-            Accept: "application/json",
-        }),
-        body: JSON.stringify({
-            token: getToken(),
-            reviewid: id
-        })
-    }).then(r => r.json());
-}
-
-export async function reportReview(id: number) {
-    const res = await fetch(API_URL + "/reportReview", {
-        method: "POST",
-        headers: new Headers({
-            "Content-Type": "application/json",
-            Accept: "application/json",
-        }),
-        body: JSON.stringify({
-            reviewid: id,
-            token: getToken()
-        })
-    });
-    showToast(await res.text());
-}
-
-export function getLastReviewID(id: string): Promise<number> {
-    return fetch(API_URL + "/getLastReviewID?discordid=" + id)
-        .then(r => r.text())
-        .then(Number);
-}
diff --git a/src/plugins/reviewDB/Utils/Utils.tsx b/src/plugins/reviewDB/Utils/Utils.tsx
deleted file mode 100644
index 79d768c8b..000000000
--- a/src/plugins/reviewDB/Utils/Utils.tsx
+++ /dev/null
@@ -1,95 +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 Logger from "@utils/Logger";
-import { openModal } from "@utils/modal";
-import { findByProps } from "@webpack";
-import { FluxDispatcher, React, SelectedChannelStore, Toasts, UserUtils } from "@webpack/common";
-
-import { Review } from "../entities/Review";
-
-export async function openUserProfileModal(userId: string) {
-    await UserUtils.fetchUser(userId);
-
-    await FluxDispatcher.dispatch({
-        type: "USER_PROFILE_MODAL_OPEN",
-        userId,
-        channelId: SelectedChannelStore.getChannelId(),
-        analyticsLocation: "Explosive Hotel"
-    });
-}
-
-export function authorize(callback?: any) {
-    const { OAuth2AuthorizeModal } = findByProps("OAuth2AuthorizeModal");
-
-    openModal((props: any) =>
-        <OAuth2AuthorizeModal
-            {...props}
-            scopes={["identify"]}
-            responseType="code"
-            redirectUri="https://manti.vendicated.dev/URauth"
-            permissions={0n}
-            clientId="915703782174752809"
-            cancelCompletesFlow={false}
-            callback={async (u: string) => {
-                try {
-                    const url = new URL(u);
-                    url.searchParams.append("returnType", "json");
-                    url.searchParams.append("clientMod", "vencord");
-                    const res = await fetch(url, {
-                        headers: new Headers({ Accept: "application/json" })
-                    });
-                    const { token, status } = await res.json();
-                    if (status === 0) {
-                        Settings.plugins.ReviewDB.token = token;
-                        showToast("Successfully logged in!");
-                        callback?.();
-                    } else if (res.status === 1) {
-                        showToast("An Error occurred while logging in.");
-                    }
-                } catch (e) {
-                    new Logger("ReviewDB").error("Failed to authorise", e);
-                }
-            }}
-        />
-    );
-}
-
-export function showToast(text: string) {
-    Toasts.show({
-        type: Toasts.Type.MESSAGE,
-        message: text,
-        id: Toasts.genId(),
-        options: {
-            position: Toasts.Position.BOTTOM
-        },
-    });
-}
-
-export const sleep = (ms: number) => new Promise(r => setTimeout(r, ms));
-
-export function canDeleteReview(review: Review, userId: string) {
-    if (review.senderdiscordid === userId) return true;
-
-    const myId = BigInt(userId);
-    return myId === Devs.mantikafasi.id ||
-        myId === Devs.Ven.id ||
-        myId === Devs.rushii.id;
-}
diff --git a/src/plugins/reviewDB/components/MessageButton.tsx b/src/plugins/reviewDB/components/MessageButton.tsx
deleted file mode 100644
index c334ddd31..000000000
--- a/src/plugins/reviewDB/components/MessageButton.tsx
+++ /dev/null
@@ -1,43 +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 { classes, LazyComponent } from "@utils/misc";
-import { findByProps } from "@webpack";
-
-export default LazyComponent(() => {
-    const { button, dangerous } = findByProps("button", "wrapper", "disabled");
-
-    return function MessageButton(props) {
-        return props.type === "delete"
-            ? (
-                <div className={classes(button, dangerous)} aria-label="Delete Review" onClick={props.callback}>
-                    <svg aria-hidden="false" width="16" height="16" viewBox="0 0 20 20">
-                        <path fill="currentColor" d="M15 3.999V2H9V3.999H3V5.999H21V3.999H15Z"></path>
-                        <path fill="currentColor" d="M5 6.99902V18.999C5 20.101 5.897 20.999 7 20.999H17C18.103 20.999 19 20.101 19 18.999V6.99902H5ZM11 17H9V11H11V17ZM15 17H13V11H15V17Z"></path>
-                    </svg>
-                </div>
-            )
-            : (
-                <div className={button} aria-label="Report Review" onClick={() => props.callback()}>
-                    <svg aria-hidden="false" width="16" height="16" viewBox="0 0 20 20">
-                        <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"></path>
-                    </svg>
-                </div>
-            );
-    };
-});
diff --git a/src/plugins/reviewDB/components/ReviewBadge.tsx b/src/plugins/reviewDB/components/ReviewBadge.tsx
deleted file mode 100644
index 4a3c0c4c1..000000000
--- a/src/plugins/reviewDB/components/ReviewBadge.tsx
+++ /dev/null
@@ -1,45 +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 { MaskedLinkStore, Tooltip } from "@webpack/common";
-
-import { Badge } from "../entities/Badge";
-
-export default function ReviewBadge(badge: Badge) {
-    return (
-        <Tooltip
-            text={badge.badge_name}>
-            {({ onMouseEnter, onMouseLeave }) => (
-                <img
-                    width="24px"
-                    height="24px"
-                    onMouseEnter={onMouseEnter}
-                    onMouseLeave={onMouseLeave}
-                    src={badge.badge_icon}
-                    alt={badge.badge_description}
-                    style={{ verticalAlign: "middle", marginLeft: "4px" }}
-                    onClick={() =>
-                        MaskedLinkStore.openUntrustedLink({
-                            href: badge.redirect_url,
-                        })
-                    }
-                />
-            )}
-        </Tooltip>
-    );
-}
diff --git a/src/plugins/reviewDB/components/ReviewComponent.tsx b/src/plugins/reviewDB/components/ReviewComponent.tsx
deleted file mode 100644
index ddb49223d..000000000
--- a/src/plugins/reviewDB/components/ReviewComponent.tsx
+++ /dev/null
@@ -1,125 +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 { classes, LazyComponent } from "@utils/misc";
-import { filters, findBulk } from "@webpack";
-import { Alerts, UserStore } from "@webpack/common";
-
-import { Review } from "../entities/Review";
-import { deleteReview, reportReview } from "../Utils/ReviewDBAPI";
-import { canDeleteReview, openUserProfileModal, showToast } from "../Utils/Utils";
-import MessageButton from "./MessageButton";
-import ReviewBadge from "./ReviewBadge";
-
-export default LazyComponent(() => {
-    // this is terrible, blame mantika
-    const p = filters.byProps;
-    const [
-        { cozyMessage, buttons, message, groupStart },
-        { container, isHeader },
-        { avatar, clickable, username, messageContent, wrapper, cozy },
-        { contents },
-        buttonClasses,
-        { defaultColor }
-    ] = findBulk(
-        p("cozyMessage"),
-        p("container", "isHeader"),
-        p("avatar", "zalgo"),
-        p("contents"),
-        p("button", "wrapper", "disabled"),
-        p("defaultColor")
-    );
-
-    return function ReviewComponent({ review, refetch }: { review: Review; refetch(): void; }) {
-        function openModal() {
-            openUserProfileModal(review.senderdiscordid);
-        }
-
-        function delReview() {
-            Alerts.show({
-                title: "Are you sure?",
-                body: "Do you really want to delete this review?",
-                confirmText: "Delete",
-                cancelText: "Nevermind",
-                onConfirm: () => {
-                    deleteReview(review.id).then(res => {
-                        if (res.successful) {
-                            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: () => reportReview(review.id)
-            });
-        }
-
-        return (
-            <div className={classes(cozyMessage, wrapper, message, groupStart, cozy, "user-review")} style={
-                {
-                    marginLeft: "0px",
-                    paddingLeft: "52px",
-                    paddingRight: "16px"
-                }
-            }>
-
-                <div className={contents} style={{ paddingLeft: "0px" }}>
-                    <img
-                        className={classes(avatar, clickable)}
-                        onClick={openModal}
-                        src={review.profile_photo || "/assets/1f0bfc0865d324c2587920a7d80c609b.png?size=128"}
-                        style={{ left: "0px" }}
-                    />
-                    <span
-                        className={classes(clickable, username)}
-                        style={{ color: "var(--channels-default)", fontSize: "14px" }}
-                        onClick={() => openModal()}
-                    >
-                        {review.username}
-                    </span>
-                    {review.badges.map(badge => <ReviewBadge {...badge} />)}
-                    <p
-                        className={classes(messageContent, defaultColor)}
-                        style={{ fontSize: 15, marginTop: 4 }}
-                    >
-                        {review.comment}
-                    </p>
-                    <div className={classes(container, isHeader, buttons)} style={{
-                        padding: "0px",
-                    }}>
-                        <div className={buttonClasses.wrapper} >
-                            <MessageButton type="report" callback={reportRev} />
-                            {canDeleteReview(review, UserStore.getCurrentUser().id) && (
-                                <MessageButton type="delete" callback={delReview} />
-                            )}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        );
-    };
-});
diff --git a/src/plugins/reviewDB/components/ReviewsView.tsx b/src/plugins/reviewDB/components/ReviewsView.tsx
deleted file mode 100644
index c62065f7e..000000000
--- a/src/plugins/reviewDB/components/ReviewsView.tsx
+++ /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 { classes, useAwaiter } from "@utils/misc";
-import { findLazy } from "@webpack";
-import { Forms, React, Text, UserStore } from "@webpack/common";
-import type { KeyboardEvent } from "react";
-
-import { addReview, getReviews } from "../Utils/ReviewDBAPI";
-import ReviewComponent from "./ReviewComponent";
-
-const Classes = findLazy(m => typeof m.textarea === "string");
-
-export default function ReviewsView({ userId }: { userId: string; }) {
-    const [refetchCount, setRefetchCount] = React.useState(0);
-    const [reviews, _, isLoading] = useAwaiter(() => getReviews(userId), {
-        fallbackValue: [],
-        deps: [refetchCount],
-    });
-    const username = UserStore.getUser(userId)?.username ?? "";
-
-    const dirtyRefetch = () => setRefetchCount(refetchCount + 1);
-
-    if (isLoading) return null;
-
-    function onKeyPress({ key, target }: KeyboardEvent<HTMLTextAreaElement>) {
-        if (key === "Enter") {
-            addReview({
-                userid: userId,
-                comment: (target as HTMLInputElement).value,
-                star: -1
-            }).then(res => {
-                if (res === 0 || res === 1) {
-                    (target as HTMLInputElement).value = ""; // clear the input
-                    dirtyRefetch();
-                }
-            });
-        }
-    }
-
-    return (
-        <div className="ReviewDB">
-            <Text
-                tag="h2"
-                variant="eyebrow"
-                style={{
-                    marginBottom: "12px",
-                    color: "var(--header-primary)"
-                }}
-            >
-                User Reviews
-            </Text>
-            {reviews?.map(review =>
-                <ReviewComponent
-                    key={review.id}
-                    review={review}
-                    refetch={dirtyRefetch}
-                />
-            )}
-            {reviews?.length === 0 && (
-                <Forms.FormText style={{ padding: "12px", paddingTop: "0px", paddingLeft: "4px", fontWeight: "bold", fontStyle: "italic" }}>
-                    Looks like nobody reviewed this user yet. You could be the first!
-                </Forms.FormText>
-            )}
-            <textarea
-                className={classes(Classes.textarea.replace("textarea", ""), "enter-comment")}
-                // this produces something like '-_59yqs ...' but since no class exists with that name its fine
-                placeholder={reviews?.some(r => r.senderdiscordid === UserStore.getCurrentUser().id) ? `Update review for @${username}` : `Review @${username}`}
-                onKeyDown={onKeyPress}
-                style={{
-                    marginTop: "6px",
-                    resize: "none",
-                    marginBottom: "12px",
-                    overflow: "hidden",
-                }}
-            />
-        </div>
-    );
-}
diff --git a/src/plugins/reviewDB/entities/Badge.ts b/src/plugins/reviewDB/entities/Badge.ts
deleted file mode 100644
index 4c3bd1eb5..000000000
--- a/src/plugins/reviewDB/entities/Badge.ts
+++ /dev/null
@@ -1,26 +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/>.
-*/
-
-
-export interface Badge {
-    badge_name: string;
-    badge_description: string;
-    badge_icon: string;
-    redirect_url: string;
-    badge_type: number;
-}
diff --git a/src/plugins/reviewDB/entities/Review.ts b/src/plugins/reviewDB/entities/Review.ts
deleted file mode 100644
index 12c3d5066..000000000
--- a/src/plugins/reviewDB/entities/Review.ts
+++ /dev/null
@@ -1,30 +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 { Badge } from "./Badge";
-
-export interface Review {
-    comment: string,
-    id: number,
-    senderdiscordid: string,
-    senderuserid: number,
-    star: number,
-    username: string,
-    profile_photo: string;
-    badges: Badge[];
-}
diff --git a/src/plugins/reviewDB/index.tsx b/src/plugins/reviewDB/index.tsx
deleted file mode 100644
index 8e8398344..000000000
--- a/src/plugins/reviewDB/index.tsx
+++ /dev/null
@@ -1,80 +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 ErrorBoundary from "@components/ErrorBoundary";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-import { Button, UserStore } from "@webpack/common";
-import { User } from "discord-types/general";
-
-import ReviewsView from "./components/ReviewsView";
-import { getLastReviewID } from "./Utils/ReviewDBAPI";
-import { authorize, showToast } from "./Utils/Utils";
-
-export default definePlugin({
-    name: "ReviewDB",
-    description: "Review other users (Adds a new settings to profiles)",
-    authors: [Devs.mantikafasi, Devs.Ven],
-
-    patches: [
-        {
-            find: "disableBorderColor:!0",
-            replacement: {
-                match: /\(.{0,10}\{user:(.),setNote:.,canDM:.,.+?\}\)/,
-                replace: "$&,$self.getReviewsComponent($1)"
-            },
-        }
-    ],
-
-    options: {
-        authorize: {
-            type: OptionType.COMPONENT,
-            description: "Authorise with ReviewDB",
-            component: () => (
-                <Button onClick={authorize}>
-                    Authorise with ReviewDB
-                </Button>
-            )
-        },
-        notifyReviews: {
-            type: OptionType.BOOLEAN,
-            description: "Notify about new reviews on startup",
-            default: true,
-        }
-    },
-
-    async start() {
-        const settings = Settings.plugins.ReviewDB;
-        if (!settings.lastReviewId || !settings.notifyReviews) return;
-
-        setTimeout(async () => {
-            const id = await getLastReviewID(UserStore.getCurrentUser().id);
-            if (settings.lastReviewId < id) {
-                showToast("You have new reviews on your profile!");
-                settings.lastReviewId = id;
-            }
-        }, 4000);
-    },
-
-    getReviewsComponent: (user: User) => (
-        <ErrorBoundary message="Failed to render Reviews">
-            <ReviewsView userId={user.id} />
-        </ErrorBoundary>
-    )
-});

From 5d1283bd85471f160d5220c67ad521379804f9d1 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 11 Mar 2023 14:18:32 +0100
Subject: [PATCH 026/147] Add Web/Desktop specific plugin capabilities; misc
 fixes

---
 scripts/build/common.mjs                      |  10 +-
 src/globals.d.ts                              |   3 +-
 src/plugins/{arRPC.tsx => arRPC.web.tsx}      |   4 +-
 src/plugins/consoleShortcuts.ts               |   8 +-
 src/plugins/devCompanion.dev.tsx              |   7 +-
 src/plugins/{noRPC.ts => noRPC.desktop.ts}    |   1 -
 ...ystemBadge.ts => noSystemBadge.desktop.ts} |   1 -
 ...icherCider.tsx => richerCider.desktop.tsx} | 134 +++++++++---------
 ...umeBooster.ts => volumeBooster.desktop.ts} |   0
 ...ContextMenus.ts => webContextMenus.web.ts} |   2 +-
 src/utils/types.ts                            |   4 -
 11 files changed, 89 insertions(+), 85 deletions(-)
 rename src/plugins/{arRPC.tsx => arRPC.web.tsx} (96%)
 rename src/plugins/{noRPC.ts => noRPC.desktop.ts} (98%)
 rename src/plugins/{noSystemBadge.ts => noSystemBadge.desktop.ts} (98%)
 rename src/plugins/{richerCider.tsx => richerCider.desktop.tsx} (97%)
 rename src/plugins/{volumeBooster.ts => volumeBooster.desktop.ts} (100%)
 rename src/plugins/{webContextMenus.ts => webContextMenus.web.ts} (98%)

diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
index 16894707d..80c9ae1ad 100644
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@@ -33,6 +33,8 @@ export const banner = {
 `.trim()
 };
 
+const isWeb = process.argv.slice(0, 2).some(f => f.endsWith("buildWeb.mjs"));
+
 // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
 /**
  * @type {import("esbuild").Plugin}
@@ -70,7 +72,13 @@ export const globPlugins = {
                 for (const file of files) {
                     if (file.startsWith(".")) continue;
                     if (file === "index.ts") continue;
-                    if (!watch && (file.endsWith(".dev.ts") || file.endsWith(".dev.tsx"))) continue;
+                    const fileBits = file.split(".");
+                    if (fileBits.length > 2 && ["ts", "tsx"].includes(fileBits.at(-1))) {
+                        const mod = fileBits.at(-2);
+                        if (mod === "dev" && !watch) continue;
+                        if (mod === "web" && !isWeb) continue;
+                        if (mod === "desktop" && isWeb) continue;
+                    }
 
                     const mod = `p${i}`;
                     code += `import ${mod} from "./${dir}/${file.replace(/\.tsx?$/, "")}";\n`;
diff --git a/src/globals.d.ts b/src/globals.d.ts
index 6c5b4376b..7c494e282 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -51,8 +51,7 @@ declare global {
      * Only available when running in Electron, undefined on web.
      * Thus, avoid using this or only use it inside an {@link IS_WEB} guard.
      *
-     * If you really must use it, mark your plugin as Desktop App only via
-     * `target: "DESKTOP"`
+     * If you really must use it, mark your plugin as Desktop App only by naming it Foo.desktop.ts(x)
      */
     export var DiscordNative: any;
 
diff --git a/src/plugins/arRPC.tsx b/src/plugins/arRPC.web.tsx
similarity index 96%
rename from src/plugins/arRPC.tsx
rename to src/plugins/arRPC.web.tsx
index ca94a0ecd..9a16c6409 100644
--- a/src/plugins/arRPC.tsx
+++ b/src/plugins/arRPC.web.tsx
@@ -48,7 +48,6 @@ export default definePlugin({
     name: "WebRichPresence (arRPC)",
     description: "Client plugin for arRPC to enable RPC on Discord Web (experimental)",
     authors: [Devs.Ducko],
-    target: "WEB",
 
     settingsAboutComponent: () => (
         <>
@@ -60,6 +59,9 @@ export default definePlugin({
     ),
 
     async start() {
+        // ArmCord comes with its own arRPC implementation, so this plugin just confuses users
+        if ("armcord" in window) return;
+
         if (ws) ws.close();
         ws = new WebSocket("ws://127.0.0.1:1337"); // try to open WebSocket
 
diff --git a/src/plugins/consoleShortcuts.ts b/src/plugins/consoleShortcuts.ts
index 83b52916f..70a9875d3 100644
--- a/src/plugins/consoleShortcuts.ts
+++ b/src/plugins/consoleShortcuts.ts
@@ -32,14 +32,14 @@ export default definePlugin({
     authors: [Devs.Ven],
 
     getShortcuts() {
-        function newFindWrapper(filterFactory: (props: any) => Webpack.FilterFn) {
-            const cache = new Map<string, any>();
+        function newFindWrapper(filterFactory: (...props: any[]) => Webpack.FilterFn) {
+            const cache = new Map<string, unknown>();
 
-            return function (filterProps: any) {
+            return function (...filterProps: unknown[]) {
                 const cacheKey = String(filterProps);
                 if (cache.has(cacheKey)) return cache.get(cacheKey);
 
-                const matches = findAll(filterFactory(filterProps));
+                const matches = findAll(filterFactory(...filterProps));
 
                 const result = (() => {
                     switch (matches.length) {
diff --git a/src/plugins/devCompanion.dev.tsx b/src/plugins/devCompanion.dev.tsx
index 1dbf4ca68..cea71e03f 100644
--- a/src/plugins/devCompanion.dev.tsx
+++ b/src/plugins/devCompanion.dev.tsx
@@ -112,7 +112,7 @@ function initWs(isManual = false) {
     });
 
     ws.addEventListener("close", e => {
-        if (!wasConnected && !hasErrored) return;
+        if (!wasConnected || hasErrored) return;
 
         logger.info("Dev Companion Disconnected:", e.code, e.reason);
 
@@ -204,8 +204,9 @@ function initWs(isManual = false) {
                             return reply("Unknown Find Type " + type);
                     }
 
-                    if (results.length === 0) throw "No results";
-                    if (results.length > 1) throw "Found more than one result! Make this filter more specific";
+                    const uniqueResultsCount = new Set(results).size;
+                    if (uniqueResultsCount === 0) throw "No results";
+                    if (uniqueResultsCount > 1) throw "Found more than one result! Make this filter more specific";
                 } catch (err) {
                     return reply("Failed to find: " + err);
                 }
diff --git a/src/plugins/noRPC.ts b/src/plugins/noRPC.desktop.ts
similarity index 98%
rename from src/plugins/noRPC.ts
rename to src/plugins/noRPC.desktop.ts
index a78cc27ed..ebd7b1a34 100644
--- a/src/plugins/noRPC.ts
+++ b/src/plugins/noRPC.desktop.ts
@@ -25,7 +25,6 @@ export default definePlugin({
     name: "NoRPC",
     description: "Disables Discord's RPC server.",
     authors: [Devs.Cyn],
-    target: "DESKTOP",
     patches: [
         {
             find: '.ensureModule("discord_rpc")',
diff --git a/src/plugins/noSystemBadge.ts b/src/plugins/noSystemBadge.desktop.ts
similarity index 98%
rename from src/plugins/noSystemBadge.ts
rename to src/plugins/noSystemBadge.desktop.ts
index e487a9745..591a0be03 100644
--- a/src/plugins/noSystemBadge.ts
+++ b/src/plugins/noSystemBadge.desktop.ts
@@ -23,7 +23,6 @@ export default definePlugin({
     name: "NoSystemBadge",
     description: "Disables the taskbar and system tray unread count badge.",
     authors: [Devs.rushii],
-    target: "DESKTOP",
     patches: [
         {
             find: "setSystemTrayApplications:function",
diff --git a/src/plugins/richerCider.tsx b/src/plugins/richerCider.desktop.tsx
similarity index 97%
rename from src/plugins/richerCider.tsx
rename to src/plugins/richerCider.desktop.tsx
index 08b0096e9..8b6fb5eb8 100644
--- a/src/plugins/richerCider.tsx
+++ b/src/plugins/richerCider.desktop.tsx
@@ -1,67 +1,67 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 OpenAsar
- *
- * 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 { Link } from "@components/Link";
-import definePlugin from "@utils/types";
-import { Forms } from "@webpack/common";
-const appIds = [
-    "911790844204437504",
-    "886578863147192350",
-    "1020414178047041627",
-    "1032800329332445255"
-];
-export default definePlugin({
-    name: "richerCider",
-    description: "Enhances Cider (More details in info button) by adding the \"Listening to\" type prefix to the user's rich presence when an applicable ID is found.",
-    authors: [{
-        id: 191621342473224192n,
-        name: "cryptofyre",
-    }],
-    patches: [
-        {
-            find: '.displayName="LocalActivityStore"',
-            replacement: {
-                match: /LOCAL_ACTIVITY_UPDATE:function\((\i)\)\{/,
-                replace: "$&$self.patchActivity($1.activity);",
-            }
-        }
-    ],
-    settingsAboutComponent: () => (
-        <>
-            <Forms.FormTitle tag="h3">Install Cider to use this Plugin</Forms.FormTitle>
-            <Forms.FormText>
-                <Link href="https://cider.sh">Follow the link to our website</Link> to get Cider up and running, and then enable the plugin.
-            </Forms.FormText>
-            <br></br>
-            <Forms.FormTitle tag="h3">What is Cider?</Forms.FormTitle>
-            <Forms.FormText>
-                Cider is an open-source and community oriented Apple Music client for Windows, macOS, and Linux.
-            </Forms.FormText>
-            <br></br>
-            <Forms.FormTitle tag="h3">Recommended Optional Plugins</Forms.FormTitle>
-            <Forms.FormText>
-                I'd recommend using TimeBarAllActivities alongside this plugin to give off a much better visual to the eye (Keep in mind this only affects your client and will not show for other users)
-            </Forms.FormText>
-        </>
-    ),
-    patchActivity(activity: any) {
-        if (appIds.includes(activity.application_id)) {
-            activity.type = 2; /* LISTENING type */
-        }
-    },
-});
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 OpenAsar
+ *
+ * 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 { Link } from "@components/Link";
+import definePlugin from "@utils/types";
+import { Forms } from "@webpack/common";
+const appIds = [
+    "911790844204437504",
+    "886578863147192350",
+    "1020414178047041627",
+    "1032800329332445255"
+];
+export default definePlugin({
+    name: "richerCider",
+    description: "Enhances Cider (More details in info button) by adding the \"Listening to\" type prefix to the user's rich presence when an applicable ID is found.",
+    authors: [{
+        id: 191621342473224192n,
+        name: "cryptofyre",
+    }],
+    patches: [
+        {
+            find: '.displayName="LocalActivityStore"',
+            replacement: {
+                match: /LOCAL_ACTIVITY_UPDATE:function\((\i)\)\{/,
+                replace: "$&$self.patchActivity($1.activity);",
+            }
+        }
+    ],
+    settingsAboutComponent: () => (
+        <>
+            <Forms.FormTitle tag="h3">Install Cider to use this Plugin</Forms.FormTitle>
+            <Forms.FormText>
+                <Link href="https://cider.sh">Follow the link to our website</Link> to get Cider up and running, and then enable the plugin.
+            </Forms.FormText>
+            <br></br>
+            <Forms.FormTitle tag="h3">What is Cider?</Forms.FormTitle>
+            <Forms.FormText>
+                Cider is an open-source and community oriented Apple Music client for Windows, macOS, and Linux.
+            </Forms.FormText>
+            <br></br>
+            <Forms.FormTitle tag="h3">Recommended Optional Plugins</Forms.FormTitle>
+            <Forms.FormText>
+                I'd recommend using TimeBarAllActivities alongside this plugin to give off a much better visual to the eye (Keep in mind this only affects your client and will not show for other users)
+            </Forms.FormText>
+        </>
+    ),
+    patchActivity(activity: any) {
+        if (appIds.includes(activity.application_id)) {
+            activity.type = 2; /* LISTENING type */
+        }
+    },
+});
diff --git a/src/plugins/volumeBooster.ts b/src/plugins/volumeBooster.desktop.ts
similarity index 100%
rename from src/plugins/volumeBooster.ts
rename to src/plugins/volumeBooster.desktop.ts
diff --git a/src/plugins/webContextMenus.ts b/src/plugins/webContextMenus.web.ts
similarity index 98%
rename from src/plugins/webContextMenus.ts
rename to src/plugins/webContextMenus.web.ts
index 6419cfd91..56990e1ba 100644
--- a/src/plugins/webContextMenus.ts
+++ b/src/plugins/webContextMenus.web.ts
@@ -23,7 +23,7 @@ export default definePlugin({
     name: "WebContextMenus",
     description: "Re-adds some of context menu items missing on the web version of Discord, namely Copy/Open Link",
     authors: [Devs.Ven],
-    target: "WEB",
+    enabledByDefault: true,
 
     patches: [{
         // There is literally no reason for Discord to make this Desktop only.
diff --git a/src/utils/types.ts b/src/utils/types.ts
index 96aa4ab6f..76a3d7401 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -79,10 +79,6 @@ export interface PluginDef {
      * Whether this plugin should be enabled by default, but can be disabled
      */
     enabledByDefault?: boolean;
-    /**
-     * Set this if your plugin only works on Browser or Desktop, not both
-     */
-    target?: "WEB" | "DESKTOP" | "BOTH";
     /**
      * Optionally provide settings that the user can configure in the Plugins tab of settings.
      * @deprecated Use `settings` instead

From 471761209081f5184b4310cea5c7c4441995011d Mon Sep 17 00:00:00 2001
From: Ven <vendicated@riseup.net>
Date: Sun, 12 Mar 2023 16:37:41 +0100
Subject: [PATCH 027/147] :shipit:

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

diff --git a/README.md b/README.md
index 334f33533..9b0b757b3 100644
--- a/README.md
+++ b/README.md
@@ -41,3 +41,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) and [Megu's Plugin Guide!](docs/2_PLUGINS
 [join]: https://discord.gg/D9uwnFnqmd
 
 [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join] [join]
+
+## Disclaimer
+
+Discord is trademark of Discord Inc. and solely mentioned for the sake of descriptivity.
+Mention of it does not imply any affiliation with or endorsement by Discord Inc.

From d8a553feb08b9708c5ea1a0930b52a4c7345ee4c Mon Sep 17 00:00:00 2001
From: LordElias <55048695+LordEliasTM@users.noreply.github.com>
Date: Tue, 14 Mar 2023 18:48:36 +0100
Subject: [PATCH 028/147] improve MessageLogger deleted image hover animation
 (#603)

---
 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 f93f33088..a33a33efc 100644
--- a/src/plugins/messageLogger/messageLogger.css
+++ b/src/plugins/messageLogger/messageLogger.css
@@ -4,11 +4,11 @@
 
 .messagelogger-deleted-attachment {
     filter: grayscale(1);
+    transition: 150ms filter ease-in-out;
 }
 
 .messagelogger-deleted-attachment:hover {
     filter: grayscale(0);
-    transition: 250ms filter linear;
 }
 
 .theme-dark .messagelogger-edited {

From ed873ef9de609b9d92429235e39a0feabe09e980 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 15 Mar 2023 18:01:04 +0100
Subject: [PATCH 029/147] Bump to v1.1.1

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

diff --git a/package.json b/package.json
index 97ce55c4e..6e1ec6fbd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "The cutest Discord client mod",
     "keywords": [],
     "homepage": "https://github.com/Vendicated/Vencord#readme",

From 4c5a56a8a5730f4dca318fc7ee417a80168075a3 Mon Sep 17 00:00:00 2001
From: Lewis Crichton <lewi@lewisakura.moe>
Date: Thu, 16 Mar 2023 01:27:46 +0000
Subject: [PATCH 030/147] fix(RoleColorEverywhere): Chat mentions (#605)

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

diff --git a/src/plugins/roleColorEverywhere.tsx b/src/plugins/roleColorEverywhere.tsx
index 5d48da06c..4085b2542 100644
--- a/src/plugins/roleColorEverywhere.tsx
+++ b/src/plugins/roleColorEverywhere.tsx
@@ -52,8 +52,8 @@ export default definePlugin({
             find: 'className:"mention"',
             replacement: [
                 {
-                    match: /user:(\i),channelId:(\i).{0,300}?"@"\.concat\(.+?\)/,
-                    replace: "$&,color:$self.getUserColor($1.id,{channelId:$2})"
+                    match: /user:(\i),channel:(\i).{0,300}?"@"\.concat\(.+?\)/,
+                    replace: "$&,color:$self.getUserColor($1.id,{channelId:$2.id})"
                 }
             ],
             predicate: () => settings.store.chatMentions,

From de53bc799134c15b8cf98064b97e3a08e88a7afb Mon Sep 17 00:00:00 2001
From: LordElias <55048695+LordEliasTM@users.noreply.github.com>
Date: Sat, 18 Mar 2023 04:37:55 +0100
Subject: [PATCH 031/147] messageLogger: fix edited timestamp styling & add
 i18n (#607)

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

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index 9242ce2f8..ef05cf35d 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -24,11 +24,15 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import Logger from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
+import { findByPropsLazy, findLazy } from "@webpack";
 import { moment, Parser, Timestamp, UserStore } from "@webpack/common";
 
 import overlayStyle from "./deleteStyleOverlay.css?managed";
 import textStyle from "./deleteStyleText.css?managed";
 
+const i18n = findLazy(m => m.Messages?.["en-US"]);
+const styles = findByPropsLazy("edited", "communicationDisabled", "isSystemMessage");
+
 function addDeleteStyle() {
     if (Settings.plugins.MessageLogger.deleteStyle === "text") {
         enableStyle(textStyle);
@@ -65,7 +69,7 @@ export default definePlugin({
                         isEdited={true}
                         isInline={false}
                     >
-                        <span>{" "}(edited)</span>
+                        <span className={styles.edited}>{" "}({i18n.Messages.MESSAGE_EDITED})</span>
                     </Timestamp>
                 </div>
             </ErrorBoundary>

From 6b493bc7d95a2bdd0f9b9b7c049ff2e886a0bbf1 Mon Sep 17 00:00:00 2001
From: Lewis Crichton <lewi@lewisakura.moe>
Date: Sat, 18 Mar 2023 03:54:19 +0000
Subject: [PATCH 032/147] feat(plugin): F8Break (#581)

Co-authored-by: Ven <vendicated@riseup.net>
---
 src/plugins/f8break.ts | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 src/plugins/f8break.ts

diff --git a/src/plugins/f8break.ts b/src/plugins/f8break.ts
new file mode 100644
index 000000000..89dd2c92f
--- /dev/null
+++ b/src/plugins/f8break.ts
@@ -0,0 +1,42 @@
+/*
+ * 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: "F8Break",
+    description: "Pause the client when you press F8 with DevTools (+ breakpoints) open.",
+    authors: [Devs.lewisakura],
+
+    start() {
+        window.addEventListener("keydown", this.event);
+    },
+
+    stop() {
+        window.removeEventListener("keydown", this.event);
+    },
+
+    event(e: KeyboardEvent) {
+        if (e.code === "F8") {
+            // Hi! You've just paused the client. Pressing F8 in DevTools or in the main window will unpause it again.
+            // It's up to you on what to do, friend. Happy travels!
+            debugger;
+        }
+    }
+});

From 0b793878000476d8d04f7cfedf9d84b583b1dbc2 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 18 Mar 2023 00:58:49 -0300
Subject: [PATCH 033/147] feat(PlatformIndicators): Colored mobile indicator
 option (#536)

Co-authored-by: Ven <vendicated@riseup.net>
---
 src/plugins/platformIndicators.tsx | 65 +++++++++++++++++++++++++++---
 1 file changed, 60 insertions(+), 5 deletions(-)

diff --git a/src/plugins/platformIndicators.tsx b/src/plugins/platformIndicators.tsx
index 0e3d61a99..6ffc25999 100644
--- a/src/plugins/platformIndicators.tsx
+++ b/src/plugins/platformIndicators.tsx
@@ -23,11 +23,11 @@ import { Settings } from "@api/settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { findByCodeLazy, findStoreLazy } from "@webpack";
 import { PresenceStore, Tooltip, UserStore } from "@webpack/common";
 import { User } from "discord-types/general";
 
-const SessionStore = findByPropsLazy("getActiveSession");
+const SessionsStore = findStoreLazy("SessionsStore");
 
 function Icon(path: string, viewBox = "0 0 24 24") {
     return ({ color, tooltip }: { color: string; tooltip: string; }) => (
@@ -70,7 +70,7 @@ const PlatformIndicator = ({ user, inline = false, marginLeft = "4px" }: { user:
     if (!user || user.bot) return null;
 
     if (user.id === UserStore.getCurrentUser().id) {
-        const sessions = SessionStore.getSessions();
+        const sessions = SessionsStore.getSessions();
         if (typeof sessions !== "object") return null;
         const sortedSessions = Object.values(sessions).sort(({ status: a }: any, { status: b }: any) => {
             if (a === b) return 0;
@@ -156,7 +156,7 @@ const indicatorLocations = {
 export default definePlugin({
     name: "PlatformIndicators",
     description: "Adds platform indicators (Desktop, Mobile, Web...) to users",
-    authors: [Devs.kemo, Devs.TheSun],
+    authors: [Devs.kemo, Devs.TheSun, Devs.Nuckyz],
     dependencies: ["MessageDecorationsAPI", "MemberListDecoratorsAPI"],
 
     start() {
@@ -185,6 +185,55 @@ export default definePlugin({
         });
     },
 
+    patches: [
+        {
+            find: ".Masks.STATUS_ONLINE_MOBILE",
+            predicate: () => Settings.plugins.PlatformIndicators.colorMobileIndicator,
+            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}`
+                },
+                {
+                    // 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}`
+                }
+            ]
+        },
+        {
+            find: ".AVATAR_STATUS_MOBILE_16;",
+            predicate: () => Settings.plugins.PlatformIndicators.colorMobileIndicator,
+            replacement: [
+                {
+                    // Return the AVATAR_STATUS_MOBILE size mask if the user is on mobile, no matter the status
+                    match: /\i===\i\.\i\.ONLINE&&(?=.{0,70}\.AVATAR_STATUS_MOBILE_16;)/,
+                    replace: ""
+                },
+                {
+                    // Fix sizes for mobile indicators which aren't online
+                    match: /(?<=\(\i\.status,)(\i)(?=,(\i),\i\))/,
+                    replace: (_, userStatus, isMobile) => `${isMobile}?"online":${userStatus}`
+                },
+                {
+                    // Make isMobile true no matter the status
+                    match: /(?<=\i&&!\i)&&\i===\i\.\i\.ONLINE/,
+                    replace: ""
+                }
+            ]
+        },
+        {
+            find: "isMobileOnline=function",
+            predicate: () => Settings.plugins.PlatformIndicators.colorMobileIndicator,
+            replacement: {
+                // Make isMobileOnline return true no matter what is the user status
+                match: /(?<=\i\[\i\.\i\.MOBILE\])===\i\.\i\.ONLINE/,
+                replace: "!= null"
+            }
+        }
+    ],
+
     options: {
         ...Object.fromEntries(
             Object.entries(indicatorLocations).map(([key, value]) => {
@@ -196,6 +245,12 @@ export default definePlugin({
                     default: true
                 }];
             })
-        )
+        ),
+        colorMobileIndicator: {
+            type: OptionType.BOOLEAN,
+            description: "Whether to make the mobile indicator match the color of the user status.",
+            default: true,
+            restartNeeded: true
+        }
     }
 });

From 5873bde6a62857f92f3fb3d756914cc1efd0ec25 Mon Sep 17 00:00:00 2001
From: whqwert <94757998+whqwert@users.noreply.github.com>
Date: Sat, 18 Mar 2023 16:38:08 -0500
Subject: [PATCH 034/147] fix(apiMessagePopover): fix match (#608)

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

diff --git a/src/plugins/apiMessagePopover.ts b/src/plugins/apiMessagePopover.ts
index 7e297f273..0463c5912 100644
--- a/src/plugins/apiMessagePopover.ts
+++ b/src/plugins/apiMessagePopover.ts
@@ -27,7 +27,7 @@ export default definePlugin({
         find: "Messages.MESSAGE_UTILITIES_A11Y_LABEL",
         replacement: {
             // foo && !bar ? createElement(blah,...makeElement(addReactionData))
-            match: /(\i&&!\i)\?\(0,\i\.jsxs?\)\(.{0,20}renderPopout:.{0,300}?(\i)\(.{3,20}\{key:"add-reaction".+?\}/,
+            match: /(\i&&!\i)\?\(0,\i\.jsxs?\)\(.{0,200}renderPopout:.{0,300}?(\i)\(.{3,20}\{key:"add-reaction".+?\}/,
             replace: (m, bools, makeElement) => {
                 const msg = m.match(/message:(.{1,3}),/)?.[1];
                 if (!msg) throw new Error("Could not find message variable");

From 0fb79b763d797d70d2eb6d847b0bf711c9927337 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 19 Mar 2023 04:53:00 -0300
Subject: [PATCH 035/147] Improvements, changes and fixes (#611)

---
 src/api/ContextMenu.ts                        |  9 ++--
 src/plugins/apiContextMenu.ts                 | 46 ++++++++++++++---
 src/plugins/devCompanion.dev.tsx              | 33 ++++++------
 src/plugins/emoteCloner.tsx                   |  6 +--
 src/plugins/invisibleChat/index.tsx           |  4 +-
 src/plugins/messageActions.ts                 | 10 ++--
 src/plugins/reverseImageSearch.tsx            |  6 +--
 src/plugins/showHiddenChannels/index.tsx      |  4 +-
 src/plugins/silentMessageToggle.tsx           | 50 ++++++++++---------
 src/plugins/silentTyping.tsx                  |  4 +-
 ...umeBooster.desktop.ts => volumeBooster.ts} |  4 +-
 11 files changed, 105 insertions(+), 71 deletions(-)
 rename src/plugins/{volumeBooster.desktop.ts => volumeBooster.ts} (95%)

diff --git a/src/api/ContextMenu.ts b/src/api/ContextMenu.ts
index 9a8d7b66f..3f73a41ea 100644
--- a/src/api/ContextMenu.ts
+++ b/src/api/ContextMenu.ts
@@ -23,13 +23,13 @@ import type { ReactElement } from "react";
  * @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
  */
-export type NavContextMenuPatchCallback = (children: Array<React.ReactElement>, args?: Array<any>) => void;
+export type NavContextMenuPatchCallback = (children: Array<React.ReactElement>, ...args: Array<any>) => void;
 /**
  * @param 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
  */
-export type GlobalContextMenuPatchCallback = (navId: string, children: Array<React.ReactElement>, args?: Array<any>) => void;
+export type GlobalContextMenuPatchCallback = (navId: string, children: Array<React.ReactElement>, ...args: Array<any>) => void;
 
 const ContextMenuLogger = new Logger("ContextMenu");
 
@@ -119,12 +119,13 @@ interface ContextMenuProps {
 }
 
 export function _patchContextMenu(props: ContextMenuProps) {
+    props.contextMenuApiArguments ??= [];
     const contextMenuPatches = navPatches.get(props.navId);
 
     if (contextMenuPatches) {
         for (const patch of contextMenuPatches) {
             try {
-                patch(props.children, props.contextMenuApiArguments);
+                patch(props.children, ...props.contextMenuApiArguments);
             } catch (err) {
                 ContextMenuLogger.error(`Patch for ${props.navId} errored,`, err);
             }
@@ -133,7 +134,7 @@ export function _patchContextMenu(props: ContextMenuProps) {
 
     for (const patch of globalPatches) {
         try {
-            patch(props.navId, props.children, props.contextMenuApiArguments);
+            patch(props.navId, props.children, ...props.contextMenuApiArguments);
         } catch (err) {
             ContextMenuLogger.error("Global patch errored,", err);
         }
diff --git a/src/plugins/apiContextMenu.ts b/src/plugins/apiContextMenu.ts
index 1874f5f05..88a1eb9cc 100644
--- a/src/plugins/apiContextMenu.ts
+++ b/src/plugins/apiContextMenu.ts
@@ -18,9 +18,28 @@
 
 import { Settings } from "@api/settings";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import definePlugin, { type PatchReplacement } from "@utils/types";
 import { addListener, removeListener } from "@webpack";
 
+/**
+ * The last var name corresponding to the Context Menu API (Discord, not ours) module
+ */
+let lastVarName = "";
+
+/**
+ * @param target The patch replacement object
+ * @param exportKey The key exporting the build Context Menu component function
+ */
+function makeReplacementProxy(target: PatchReplacement, exportKey: string) {
+    return new Proxy(target, {
+        get(_, p) {
+            if (p === "match") return RegExp(`${exportKey},{(?<=${lastVarName}\\.${exportKey},{)`, "g");
+            // @ts-expect-error
+            return Reflect.get(...arguments);
+        }
+    });
+}
+
 function listener(exports: any, id: number) {
     if (!Settings.plugins.ContextMenuAPI.enabled) return removeListener(listener);
 
@@ -37,13 +56,24 @@ function listener(exports: any, id: number) {
                 all: true,
                 noWarn: true,
                 find: "navId:",
-                replacement: [{
-                    match: RegExp(`${id}(?<=(\\i)=.+?).+$`),
-                    replace: (code, varName) => {
-                        const regex = RegExp(`${key},{(?<=${varName}\\.${key},{)`, "g");
-                        return code.replace(regex, "$&contextMenuApiArguments:arguments,");
-                    }
-                }]
+                replacement: [
+                    {
+                        // Set the lastVarName for our proxy to use
+                        match: RegExp(`${id}(?<=(\\i)=.+?)`),
+                        replace: (id, varName) => {
+                            lastVarName = varName;
+                            return id;
+                        }
+                    },
+                    /**
+                     * We are using a proxy here to utilize the whole code the patcher gives us, instead of matching the entire module (which is super slow)
+                     * Our proxy returns the corresponding match for that module utilizing lastVarName, which is set by the patch before
+                     */
+                    makeReplacementProxy({
+                        match: "", // Needed to canonicalizeDescriptor
+                        replace: "$&contextMenuApiArguments:arguments,",
+                    }, key)
+                ]
             });
 
             removeListener(listener);
diff --git a/src/plugins/devCompanion.dev.tsx b/src/plugins/devCompanion.dev.tsx
index cea71e03f..c3d4d6a2a 100644
--- a/src/plugins/devCompanion.dev.tsx
+++ b/src/plugins/devCompanion.dev.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { addContextMenuPatch } from "@api/ContextMenu";
+import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
 import { showNotification } from "@api/Notifications";
 import { Devs } from "@utils/constants";
 import Logger from "@utils/Logger";
@@ -221,6 +221,21 @@ function initWs(isManual = false) {
     });
 }
 
+const contextMenuPatch: NavContextMenuPatchCallback = kids => {
+    if (kids.some(k => k?.props?.id === NAV_ID)) return;
+
+    kids.unshift(
+        <Menu.MenuItem
+            id={NAV_ID}
+            label="Reconnect Dev Companion"
+            action={() => {
+                socket?.close(1000, "Reconnecting");
+                initWs(true);
+            }}
+        />
+    );
+};
+
 export default definePlugin({
     name: "DevCompanion",
     description: "Dev Companion Plugin",
@@ -229,24 +244,12 @@ export default definePlugin({
 
     start() {
         initWs();
-        addContextMenuPatch("user-settings-cog", kids => {
-            if (kids.some(k => k?.props?.id === NAV_ID)) return;
-
-            kids.unshift(
-                <Menu.MenuItem
-                    id={NAV_ID}
-                    label="Reconnect Dev Companion"
-                    action={() => {
-                        socket?.close(1000, "Reconnecting");
-                        initWs(true);
-                    }}
-                />
-            );
-        });
+        addContextMenuPatch("user-settings-cog", contextMenuPatch);
     },
 
     stop() {
         socket?.close(1000, "Plugin Stopped");
         socket = void 0;
+        removeContextMenuPatch("user-settings-cog", contextMenuPatch);
     }
 });
diff --git a/src/plugins/emoteCloner.tsx b/src/plugins/emoteCloner.tsx
index eba77c752..609ef0831 100644
--- a/src/plugins/emoteCloner.tsx
+++ b/src/plugins/emoteCloner.tsx
@@ -176,9 +176,9 @@ function CloneModal({ id, name: emojiName, isAnimated }: { id: string; name: str
     );
 }
 
-const messageContextMenuPatch: NavContextMenuPatchCallback = (children, args) => {
-    if (!args?.[0]) return;
-    const { favoriteableId, emoteClonerDataAlt, itemHref, itemSrc, favoriteableType } = args[0];
+const messageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => {
+    if (!props) return;
+    const { favoriteableId, emoteClonerDataAlt, itemHref, itemSrc, favoriteableType } = props;
 
     if (!emoteClonerDataAlt || favoriteableType !== "emoji") return;
 
diff --git a/src/plugins/invisibleChat/index.tsx b/src/plugins/invisibleChat/index.tsx
index d3358be43..d30bb7ccb 100644
--- a/src/plugins/invisibleChat/index.tsx
+++ b/src/plugins/invisibleChat/index.tsx
@@ -131,8 +131,8 @@ export default definePlugin({
         {
             find: ".activeCommandOption",
             replacement: {
-                match: /(.)\.push.{1,50}\(\i,\{.{1,30}\},"gift"\)\)/,
-                replace: "$&;try{$1.push($self.chatBarIcon())}catch{}",
+                match: /(.)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
+                replace: "$&;try{$2||$1.push($self.chatBarIcon())}catch{}",
             }
         },
     ],
diff --git a/src/plugins/messageActions.ts b/src/plugins/messageActions.ts
index b71a9f162..f24455432 100644
--- a/src/plugins/messageActions.ts
+++ b/src/plugins/messageActions.ts
@@ -20,13 +20,15 @@ import { addClickListener, removeClickListener } from "@api/MessageEvents";
 import { migratePluginSettings } from "@api/settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findLazy } from "@webpack";
-import { UserStore } from "@webpack/common";
+import { findByPropsLazy } from "@webpack";
+import { PermissionStore, UserStore } from "@webpack/common";
 
 let isDeletePressed = false;
 const keydown = (e: KeyboardEvent) => e.key === "Backspace" && (isDeletePressed = true);
 const keyup = (e: KeyboardEvent) => e.key === "Backspace" && (isDeletePressed = false);
 
+const MANAGE_CHANNELS = 1n << 4n;
+
 migratePluginSettings("MessageClickActions", "MessageQuickActions");
 
 export default definePlugin({
@@ -50,8 +52,6 @@ export default definePlugin({
 
     start() {
         const MessageActions = findByPropsLazy("deleteMessage", "startEditMessage");
-        const PermissionStore = findByPropsLazy("can", "initialize");
-        const Permissions = findLazy(m => typeof m.MANAGE_MESSAGES === "bigint");
         const EditStore = findByPropsLazy("isEditing", "isEditingAny");
 
         document.addEventListener("keydown", keydown);
@@ -64,7 +64,7 @@ export default definePlugin({
                     MessageActions.startEditMessage(chan.id, msg.id, msg.content);
                     event.preventDefault();
                 }
-            } else if (Vencord.Settings.plugins.MessageClickActions.enableDeleteOnClick && (isMe || PermissionStore.can(Permissions.MANAGE_MESSAGES, chan))) {
+            } else if (Vencord.Settings.plugins.MessageClickActions.enableDeleteOnClick && (isMe || PermissionStore.can(MANAGE_CHANNELS, chan))) {
                 MessageActions.deleteMessage(chan.id, msg.id);
                 event.preventDefault();
             }
diff --git a/src/plugins/reverseImageSearch.tsx b/src/plugins/reverseImageSearch.tsx
index 47954ba0f..88c0b1652 100644
--- a/src/plugins/reverseImageSearch.tsx
+++ b/src/plugins/reverseImageSearch.tsx
@@ -34,9 +34,9 @@ function search(src: string, engine: string) {
     open(engine + encodeURIComponent(src), "_blank");
 }
 
-const imageContextMenuPatch: NavContextMenuPatchCallback = (children, args) => {
-    if (!args?.[0]) return;
-    const { reverseImageSearchType, itemHref, itemSrc } = args[0];
+const imageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => {
+    if (!props) return;
+    const { reverseImageSearchType, itemHref, itemSrc } = props;
 
     if (!reverseImageSearchType || reverseImageSearchType !== "img") return;
 
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 70c5045ba..eb494682f 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -321,9 +321,7 @@ export default definePlugin({
             ],
         },
         {
-            // The module wasn't being found, so lets just escape everything
-            // eslint-disable-next-line no-useless-escape
-            find: "\^https\:\/\/\(\?\:canary\.\|ptb\.\)\?discord.com\/channels\/\(\\\\\d\+\|",
+            find: "\"^/guild-stages/(\\\\d+)(?:/)?(\\\\d+)?\"",
             replacement: {
                 // Make mentions of hidden channels work
                 match: /\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL,\i\)/,
diff --git a/src/plugins/silentMessageToggle.tsx b/src/plugins/silentMessageToggle.tsx
index 09fb4e75c..8d33f81c7 100644
--- a/src/plugins/silentMessageToggle.tsx
+++ b/src/plugins/silentMessageToggle.tsx
@@ -40,28 +40,30 @@ function SilentMessageToggle() {
     return (
         <Tooltip text="Toggle Silent Message">
             {tooltipProps => (
-                <Button
-                    {...tooltipProps}
-                    onClick={() => setEnabled(prev => !prev)}
-                    size=""
-                    look={ButtonLooks.BLANK}
-                    innerClassName={ButtonWrapperClasses.button}
-                    style={{ margin: "0px 8px" }}
-                >
-                    <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>
-                    </div>
-                </Button>
+                <div style={{ display: "flex" }}>
+                    <Button
+                        {...tooltipProps}
+                        onClick={() => setEnabled(prev => !prev)}
+                        size=""
+                        look={ButtonLooks.BLANK}
+                        innerClassName={ButtonWrapperClasses.button}
+                        style={{ margin: "0px 8px" }}
+                    >
+                        <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>
+                        </div>
+                    </Button>
+                </div>
             )}
         </Tooltip>
     );
@@ -75,8 +77,8 @@ export default definePlugin({
         {
             find: ".activeCommandOption",
             replacement: {
-                match: /"gift"\)\);(?<=(\i)\.push.+?)/,
-                replace: (m, array) => `${m}${array}.push($self.SilentMessageToggle());`
+                match: /"gift"\)\);(?<=(\i)\.push.+?disabled:(\i),.+?)/,
+                replace: (m, array, disabled) => `${m}${disabled}||${array}.push($self.SilentMessageToggle());`
             }
         }
     ],
diff --git a/src/plugins/silentTyping.tsx b/src/plugins/silentTyping.tsx
index 83f64153f..d0edaac2a 100644
--- a/src/plugins/silentTyping.tsx
+++ b/src/plugins/silentTyping.tsx
@@ -82,8 +82,8 @@ export default definePlugin({
             find: ".activeCommandOption",
             predicate: () => settings.store.showIcon,
             replacement: {
-                match: /(.)\.push.{1,50}\(\i,\{.{1,30}\},"gift"\)\)/,
-                replace: "$&;try{$1.push($self.chatBarIcon())}catch{}",
+                match: /(.)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
+                replace: "$&;try{$2||$1.push($self.chatBarIcon())}catch{}",
             }
         },
     ],
diff --git a/src/plugins/volumeBooster.desktop.ts b/src/plugins/volumeBooster.ts
similarity index 95%
rename from src/plugins/volumeBooster.desktop.ts
rename to src/plugins/volumeBooster.ts
index 7d8144912..3f692c7f1 100644
--- a/src/plugins/volumeBooster.desktop.ts
+++ b/src/plugins/volumeBooster.ts
@@ -56,8 +56,8 @@ export default definePlugin({
             find: "AudioContextSettingsMigrated",
             replacement: [
                 {
-                    match: /(?<=updateAsync\("audioContextSettings".{0,50})(?=return (\i)\.volume=(\i))/,
-                    replace: (_, volumeOptions, newVolume) => `if(${newVolume}>200)return ${volumeOptions}.volume=200;`
+                    match: /(?<=updateAsync\("audioContextSettings".{0,350}return \i\.volume=)\i(?=})/,
+                    replace: "$&>200?200:$&"
                 },
                 {
                     match: /(?<=Object\.entries\(\i\.localMutes\).+?volume:).+?(?=,)/,

From 17c3496542adc9ddfe46e3bc73c0fe7776c30f78 Mon Sep 17 00:00:00 2001
From: fawn <fawn@envs.net>
Date: Sun, 19 Mar 2023 08:13:17 +0000
Subject: [PATCH 036/147] feat(typingIndicator): Option to not show indicator
 for blocked users (#513)

---
 src/components/PatchHelper.tsx  |  3 ++-
 src/plugins/typingIndicator.tsx | 13 +++++++++----
 src/utils/patches.ts            |  4 +---
 src/utils/types.ts              |  4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/components/PatchHelper.tsx b/src/components/PatchHelper.tsx
index 652452838..f1fe22c0c 100644
--- a/src/components/PatchHelper.tsx
+++ b/src/components/PatchHelper.tsx
@@ -19,7 +19,8 @@
 import { debounce } from "@utils/debounce";
 import { Margins } from "@utils/margins";
 import { makeCodeblock } from "@utils/misc";
-import { canonicalizeMatch, canonicalizeReplace, ReplaceFn } from "@utils/patches";
+import { canonicalizeMatch, canonicalizeReplace } from "@utils/patches";
+import { ReplaceFn } from "@utils/types";
 import { search } from "@webpack";
 import { Button, Clipboard, Forms, Parser, React, Switch, Text, TextInput } from "@webpack/common";
 
diff --git a/src/plugins/typingIndicator.tsx b/src/plugins/typingIndicator.tsx
index 9af09bca6..4b0d16224 100644
--- a/src/plugins/typingIndicator.tsx
+++ b/src/plugins/typingIndicator.tsx
@@ -22,7 +22,7 @@ import { Devs } from "@utils/constants";
 import { LazyComponent } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
 import { find, findLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, GuildMemberStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
+import { ChannelStore, GuildMemberStore, RelationshipStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
 
 import { buildSeveralUsers } from "./typingTweaks";
 
@@ -57,9 +57,9 @@ function TypingIndicator({ channelId }: { channelId: string; }) {
         if (isChannelMuted) return null;
     }
 
-    delete typingUsers[UserStore.getCurrentUser().id];
+    const myId = UserStore.getCurrentUser().id;
 
-    const typingUsersArray = Object.keys(typingUsers);
+    const typingUsersArray = Object.keys(typingUsers).filter(id => id !== myId && !(RelationshipStore.isBlocked(id) && !settings.store.includeBlockedUsers));
     let tooltipText: string;
 
     switch (typingUsersArray.length) {
@@ -108,13 +108,18 @@ const settings = definePluginSettings({
         type: OptionType.BOOLEAN,
         description: "Whether to show the typing indicator for muted channels.",
         default: false
+    },
+    includeBlockedUsers: {
+        type: OptionType.BOOLEAN,
+        description: "Whether to show the typing indicator for blocked users.",
+        default: false
     }
 });
 
 export default definePlugin({
     name: "TypingIndicator",
     description: "Adds an indicator if someone is typing on a channel.",
-    authors: [Devs.Nuckyz],
+    authors: [Devs.Nuckyz, Devs.obscurity],
     settings,
 
     patches: [
diff --git a/src/utils/patches.ts b/src/utils/patches.ts
index 0f83d4003..c30f7b17c 100644
--- a/src/utils/patches.ts
+++ b/src/utils/patches.ts
@@ -16,9 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { PatchReplacement } from "./types";
-
-export type ReplaceFn = (match: string, ...groups: string[]) => string;
+import { PatchReplacement, ReplaceFn } from "./types";
 
 export function canonicalizeMatch(match: RegExp | string) {
     if (typeof match === "string") return match;
diff --git a/src/utils/types.ts b/src/utils/types.ts
index 76a3d7401..54c9674b3 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -19,13 +19,13 @@
 import { Command } from "@api/Commands";
 import { Promisable } from "type-fest";
 
-import type { ReplaceFn } from "./patches";
-
 // exists to export default definePlugin({...})
 export default function definePlugin<P extends PluginDef>(p: P & Record<string, any>) {
     return p;
 }
 
+export type ReplaceFn = (match: string, ...groups: string[]) => string;
+
 export interface PatchReplacement {
     match: string | RegExp;
     replace: string | ReplaceFn;

From ea642d9e901d42f0f5f73ba1f9cfeb3d1e595332 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 19 Mar 2023 05:44:11 -0300
Subject: [PATCH 037/147] Fix #598 (#612)

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

diff --git a/src/plugins/fakeNitro.ts b/src/plugins/fakeNitro.ts
index e9b19ca1d..580d69e7e 100644
--- a/src/plugins/fakeNitro.ts
+++ b/src/plugins/fakeNitro.ts
@@ -20,6 +20,7 @@ import { addPreEditListener, addPreSendListener, removePreEditListener, removePr
 import { migratePluginSettings, Settings } from "@api/settings";
 import { Devs } from "@utils/constants";
 import { ApngDisposeOp, getGifEncoder, importApngJs } from "@utils/dependencies";
+import { getCurrentGuild } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy } from "@webpack";
 import { ChannelStore, PermissionStore, UserStore } from "@webpack/common";
@@ -184,7 +185,7 @@ export default definePlugin({
     },
 
     get guildId() {
-        return window.location.href.split("channels/")[1].split("/")[0];
+        return getCurrentGuild()?.id;
     },
 
     get canUseEmotes() {

From 4aff11421f1cccaf34a7c983fd8dc9a841042947 Mon Sep 17 00:00:00 2001
From: Xinto <48173186+X1nto@users.noreply.github.com>
Date: Sun, 19 Mar 2023 13:21:26 +0400
Subject: [PATCH 038/147] Replace update notices with notifications (#558)

---
 src/Vencord.ts                             | 34 ++++++++++------------
 src/api/settings.ts                        |  2 ++
 src/components/VencordSettings/Updater.tsx | 12 ++++++--
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/Vencord.ts b/src/Vencord.ts
index ba7d01fe6..98bc83a61 100644
--- a/src/Vencord.ts
+++ b/src/Vencord.ts
@@ -27,7 +27,7 @@ export { PlainSettings, Settings };
 import "./utils/quickCss";
 import "./webpack/patchWebpack";
 
-import { popNotice, showNotice } from "./api/Notices";
+import { showNotification } from "./api/Notifications";
 import { PlainSettings, Settings } from "./api/settings";
 import { patches, PMLogger, startAllPlugins } from "./plugins";
 import { checkForUpdates, rebuild, update, UpdateLogger } from "./utils/updater";
@@ -49,32 +49,30 @@ async function init() {
             if (Settings.autoUpdate) {
                 await update();
                 const needsFullRestart = await rebuild();
-                setTimeout(() => {
-                    showNotice(
-                        "Vencord has been updated!",
-                        "Restart",
-                        () => {
+                if (Settings.autoUpdateNotification)
+                    showNotification({
+                        title: "Vencord has been updated!",
+                        body: "Click here to restart",
+                        permanent: true,
+                        onClick() {
                             if (needsFullRestart)
                                 window.DiscordNative.app.relaunch();
                             else
                                 location.reload();
                         }
-                    );
-                }, 10_000);
+                    });
                 return;
             }
 
             if (Settings.notifyAboutUpdates)
-                setTimeout(() => {
-                    showNotice(
-                        "A Vencord update is available!",
-                        "View Update",
-                        () => {
-                            popNotice();
-                            SettingsRouter.open("VencordUpdater");
-                        }
-                    );
-                }, 10_000);
+                showNotification({
+                    title: "A Vencord update is available!",
+                    body: "Click here to view the update",
+                    permanent: true,
+                    onClick() {
+                        SettingsRouter.open("VencordUpdater");
+                    }
+                });
         } catch (err) {
             UpdateLogger.error("Failed to check for updates", err);
         }
diff --git a/src/api/settings.ts b/src/api/settings.ts
index 1ca26116b..0ebfe1d3f 100644
--- a/src/api/settings.ts
+++ b/src/api/settings.ts
@@ -28,6 +28,7 @@ const logger = new Logger("Settings");
 export interface Settings {
     notifyAboutUpdates: boolean;
     autoUpdate: boolean;
+    autoUpdateNotification: boolean,
     useQuickCss: boolean;
     enableReactDevtools: boolean;
     themeLinks: string[];
@@ -52,6 +53,7 @@ export interface Settings {
 const DefaultSettings: Settings = {
     notifyAboutUpdates: true,
     autoUpdate: false,
+    autoUpdateNotification: true,
     useQuickCss: true,
     themeLinks: [],
     enableReactDevtools: false,
diff --git a/src/components/VencordSettings/Updater.tsx b/src/components/VencordSettings/Updater.tsx
index caed4f7ef..3c3eb91b3 100644
--- a/src/components/VencordSettings/Updater.tsx
+++ b/src/components/VencordSettings/Updater.tsx
@@ -185,7 +185,7 @@ function Newer(props: CommonProps) {
 }
 
 function Updater() {
-    const settings = useSettings(["notifyAboutUpdates", "autoUpdate"]);
+    const settings = useSettings(["notifyAboutUpdates", "autoUpdate", "autoUpdateNotification"]);
 
     const [repo, err, repoPending] = useAwaiter(getRepo, { fallbackValue: "Loading..." });
 
@@ -205,7 +205,7 @@ function Updater() {
             <Switch
                 value={settings.notifyAboutUpdates}
                 onChange={(v: boolean) => settings.notifyAboutUpdates = v}
-                note="Shows a toast on startup"
+                note="Shows a notification on startup"
                 disabled={settings.autoUpdate}
             >
                 Get notified about new updates
@@ -217,6 +217,14 @@ function Updater() {
             >
                 Automatically update
             </Switch>
+            <Switch
+                value={settings.autoUpdateNotification}
+                onChange={(v: boolean) => settings.autoUpdateNotification = v}
+                note="Shows a notification when Vencord automatically updates"
+                disabled={!settings.autoUpdate}
+            >
+                Get notified when an automatic update completes
+            </Switch>
 
             <Forms.FormTitle tag="h5">Repo</Forms.FormTitle>
 

From e36f4e5b0aed93f6b24a42eb738fc5f38579bf3c Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 19 Mar 2023 22:03:33 -0300
Subject: [PATCH 039/147] Fixes and make guild tooltip show users inside hidden
 voice channels (#613)

* Fix #509

* Fix #597

* Fix #594
---
 src/Vencord.ts                           |  8 ++++----
 src/components/Switch.tsx                |  3 ++-
 src/plugins/messageLogger/index.tsx      |  1 +
 src/plugins/noBlockedMessages.ts         | 13 ++++++++-----
 src/plugins/showHiddenChannels/index.tsx |  8 ++++++++
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/Vencord.ts b/src/Vencord.ts
index 98bc83a61..af6ca088a 100644
--- a/src/Vencord.ts
+++ b/src/Vencord.ts
@@ -50,7 +50,7 @@ async function init() {
                 await update();
                 const needsFullRestart = await rebuild();
                 if (Settings.autoUpdateNotification)
-                    showNotification({
+                    setTimeout(() => showNotification({
                         title: "Vencord has been updated!",
                         body: "Click here to restart",
                         permanent: true,
@@ -60,19 +60,19 @@ async function init() {
                             else
                                 location.reload();
                         }
-                    });
+                    }), 10_000);
                 return;
             }
 
             if (Settings.notifyAboutUpdates)
-                showNotification({
+                setTimeout(() => showNotification({
                     title: "A Vencord update is available!",
                     body: "Click here to view the update",
                     permanent: true,
                     onClick() {
                         SettingsRouter.open("VencordUpdater");
                     }
-                });
+                }), 10_000);
         } catch (err) {
             UpdateLogger.error("Failed to check for updates", err);
         }
diff --git a/src/components/Switch.tsx b/src/components/Switch.tsx
index 11a3fe02e..10904e141 100644
--- a/src/components/Switch.tsx
+++ b/src/components/Switch.tsx
@@ -18,6 +18,7 @@
 
 import "./Switch.css";
 
+import { classes } from "@utils/misc";
 import { findByPropsLazy } from "@webpack";
 
 interface SwitchProps {
@@ -33,7 +34,7 @@ const SwitchClasses = findByPropsLazy("slider", "input", "container");
 export function Switch({ checked, onChange, disabled }: SwitchProps) {
     return (
         <div>
-            <div className={`${SwitchClasses.container} default-colors`} style={{
+            <div className={classes(SwitchClasses.container, "default-colors", checked ? SwitchClasses.checked : void 0)} style={{
                 backgroundColor: checked ? SWITCH_ON : SWITCH_OFF,
                 opacity: disabled ? 0.3 : 1
             }}>
diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index ef05cf35d..e13da353b 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -174,6 +174,7 @@ export default definePlugin({
                     match: /(MESSAGE_UPDATE:function\((\w)\).+?)\.update\((\w)/,
                     replace: "$1" +
                         ".update($3,m =>" +
+                        "   (($2.message.flags & 64) === 64 || (Vencord.Settings.plugins.MessageLogger.ignoreBots && $2.message.author?.bot) || (Vencord.Settings.plugins.MessageLogger.ignoreSelf && $2.message.author?.id === Vencord.Webpack.Common.UserStore.getCurrentUser().id)) ? m :" +
                         "   $2.message.content !== m.editHistory?.[0]?.content && $2.message.content !== m.content ?" +
                         "       m.set('editHistory',[...(m.editHistory || []), $self.makeEdit($2.message, m)]) :" +
                         "       m" +
diff --git a/src/plugins/noBlockedMessages.ts b/src/plugins/noBlockedMessages.ts
index 6937041a8..d91572a8b 100644
--- a/src/plugins/noBlockedMessages.ts
+++ b/src/plugins/noBlockedMessages.ts
@@ -37,16 +37,19 @@ export default definePlugin({
                 }
             ]
         },
-        {
-            find: "displayName=\"MessageStore\"",
+        ...[
+            'displayName="MessageStore"',
+            'displayName="ReadStateStore"'
+        ].map(find => ({
+            find,
             predicate: () => Settings.plugins.NoBlockedMessages.ignoreBlockedMessages === true,
             replacement: [
                 {
-                    match: /(?<=MESSAGE_CREATE:function\((\w)\){var \w=\w\.channelId,\w=\w\.message,\w=\w\.isPushNotification,\w=\w\.\w\.getOrCreate\(\w\));/,
-                    replace: ";if($self.isBlocked(n))return;"
+                    match: /(?<=MESSAGE_CREATE:function\((\i)\){)/,
+                    replace: (_, props) => `if($self.isBlocked(${props}.message))return;`
                 }
             ]
-        }
+        }))
     ],
     options: {
         ignoreBlockedMessages: {
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index eb494682f..318bad251 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -335,6 +335,14 @@ export default definePlugin({
                 match: /(?<=getChannel\((\i)\)\)(?=.{0,100}?selectVoiceChannel))/,
                 replace: (_, channelId) => `&&!$self.isHiddenChannel({channelId:${channelId}})`
             }
+        },
+        {
+            find: '.displayName="GuildChannelStore"',
+            replacement: {
+                // Make GuildChannelStore contain hidden channels for users in voice channels to appear in the guild tooltip
+                match: /isChannelGated\(.+?\)(?=\|\|)/,
+                replace: m => `${m}||true`
+            }
         }
     ],
 

From 87e46f5a5a2349efd123333c3b70bdfa3db77ef4 Mon Sep 17 00:00:00 2001
From: afn <hey@afn.lol>
Date: Mon, 20 Mar 2023 22:13:11 -0400
Subject: [PATCH 040/147] chore(friendInvites): improve descriptions formatting
 (#628)

---
 src/plugins/friendInvites.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/friendInvites.ts b/src/plugins/friendInvites.ts
index 73dffd126..2ad47d939 100644
--- a/src/plugins/friendInvites.ts
+++ b/src/plugins/friendInvites.ts
@@ -23,7 +23,7 @@ import { findByProps } from "@webpack";
 
 export default definePlugin({
     name: "FriendInvites",
-    description: "Generate and manage friend invite links.",
+    description: "Create and manage friend invite links via slash commands (/create friend invite, /view friend invites, /revoke friend invites).",
     authors: [Devs.afn],
     dependencies: ["CommandsAPI"],
     commands: [
@@ -37,8 +37,8 @@ export default definePlugin({
 
                 return void sendBotMessage(ctx.channel.id, {
                     content: `
-                        discord.gg/${createInvite.code}
-                        Expires: <t:${new Date(createInvite.expires_at).getTime() / 1000}:R>
+                        discord.gg/${createInvite.code} ·
+                        Expires: <t:${new Date(createInvite.expires_at).getTime() / 1000}:R> ·
                         Max uses: \`${createInvite.max_uses}\`
                     `.trim().replace(/\s+/g, " ")
                 });
@@ -52,25 +52,25 @@ export default definePlugin({
                 const friendInvites = findByProps("createFriendInvite");
                 const invites = await friendInvites.getAllFriendInvites();
                 const friendInviteList = invites.map(i =>
-                    `_discord.gg/${i.code}_
-                    Expires: <t:${new Date(i.expires_at).getTime() / 1000}:R>
+                    `_discord.gg/${i.code}_ ·
+                    Expires: <t:${new Date(i.expires_at).getTime() / 1000}:R> ·
                     Times used: \`${i.uses}/${i.max_uses}\``.trim().replace(/\s+/g, " ")
                 );
 
                 return void sendBotMessage(ctx.channel.id, {
-                    content: friendInviteList.join("\n\n") || "You have no active friend invites!"
+                    content: friendInviteList.join("\n") || "You have no active friend invites!"
                 });
             },
         },
         {
             name: "revoke friend invites",
-            description: "Revokes ALL generated friend invite links.",
+            description: "Revokes all generated friend invites.",
             inputType: ApplicationCommandInputType.BOT,
             execute: async (_, ctx) => {
                 await findByProps("createFriendInvite").revokeFriendInvites();
 
                 return void sendBotMessage(ctx.channel.id, {
-                    content: "All friend links have been revoked."
+                    content: "All friend invites have been revoked."
                 });
             },
         },

From 265547213cc67cc0c1615302367593ce888fb899 Mon Sep 17 00:00:00 2001
From: Dossy Shiobara <dossy@panoptic.com>
Date: Mon, 20 Mar 2023 22:14:27 -0400
Subject: [PATCH 041/147] docs: clarify empty patches array behavior (#610)

Co-authored-by: Ven <vendicated@riseup.net>
---
 docs/2_PLUGINS.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/2_PLUGINS.md b/docs/2_PLUGINS.md
index 705ea89d6..7b5e3e181 100644
--- a/docs/2_PLUGINS.md
+++ b/docs/2_PLUGINS.md
@@ -26,6 +26,10 @@ export default definePlugin({
             name: "Your Name",
         },
     ],
+    // Delete `patches` if you are not using code patches, as it will make
+    // your plugin require restarts, and your stop() method will not be
+    // invoked at all.  The presence of the key in the object alone is
+    // enough to trigger this behavior, even if the value is an empty array.
     patches: [],
     // Delete these two below if you are only using code patches
     start() {},

From 37c2a8a5de74af1bc5671566877763ba1fb7cb40 Mon Sep 17 00:00:00 2001
From: Dossy Shiobara <dossy@panoptic.com>
Date: Mon, 20 Mar 2023 22:16:01 -0400
Subject: [PATCH 042/147] fix: settings input validation and error handling
 (#609)

Co-authored-by: Ven <vendicated@riseup.net>
---
 .../PluginSettings/components/SettingNumericComponent.tsx    | 5 ++++-
 .../PluginSettings/components/SettingSelectComponent.tsx     | 1 +
 .../PluginSettings/components/SettingTextComponent.tsx       | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/PluginSettings/components/SettingNumericComponent.tsx b/src/components/PluginSettings/components/SettingNumericComponent.tsx
index 12e8e3600..446d2504b 100644
--- a/src/components/PluginSettings/components/SettingNumericComponent.tsx
+++ b/src/components/PluginSettings/components/SettingNumericComponent.tsx
@@ -38,9 +38,12 @@ export function SettingNumericComponent({ option, pluginSettings, definedSetting
 
     function handleChange(newValue) {
         const isValid = option.isValid?.call(definedSettings, newValue) ?? true;
+
+        setError(null);
         if (typeof isValid === "string") setError(isValid);
         else if (!isValid) setError("Invalid input provided.");
-        else if (option.type === OptionType.NUMBER && BigInt(newValue) >= MAX_SAFE_NUMBER) {
+
+        if (option.type === OptionType.NUMBER && BigInt(newValue) >= MAX_SAFE_NUMBER) {
             setState(`${Number.MAX_SAFE_INTEGER}`);
             onChange(serialize(newValue));
         } else {
diff --git a/src/components/PluginSettings/components/SettingSelectComponent.tsx b/src/components/PluginSettings/components/SettingSelectComponent.tsx
index 164a29a4c..97c17071b 100644
--- a/src/components/PluginSettings/components/SettingSelectComponent.tsx
+++ b/src/components/PluginSettings/components/SettingSelectComponent.tsx
@@ -36,6 +36,7 @@ export function SettingSelectComponent({ option, pluginSettings, definedSettings
         if (typeof isValid === "string") setError(isValid);
         else if (!isValid) setError("Invalid input provided.");
         else {
+            setError(null);
             setState(newValue);
             onChange(newValue);
         }
diff --git a/src/components/PluginSettings/components/SettingTextComponent.tsx b/src/components/PluginSettings/components/SettingTextComponent.tsx
index 599593faf..9eccb10f2 100644
--- a/src/components/PluginSettings/components/SettingTextComponent.tsx
+++ b/src/components/PluginSettings/components/SettingTextComponent.tsx
@@ -34,6 +34,7 @@ export function SettingTextComponent({ option, pluginSettings, definedSettings,
         if (typeof isValid === "string") setError(isValid);
         else if (!isValid) setError("Invalid input provided.");
         else {
+            setError(null);
             setState(newValue);
             onChange(newValue);
         }

From d482d33d6f93632b1277524efc5aa392f596f095 Mon Sep 17 00:00:00 2001
From: Ven <vendicated@riseup.net>
Date: Tue, 21 Mar 2023 03:19:02 +0100
Subject: [PATCH 043/147] Fix the infamous MessageClickActions bug

---
 src/plugins/{messageActions.ts => messageClickActions.ts} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/plugins/{messageActions.ts => messageClickActions.ts} (97%)

diff --git a/src/plugins/messageActions.ts b/src/plugins/messageClickActions.ts
similarity index 97%
rename from src/plugins/messageActions.ts
rename to src/plugins/messageClickActions.ts
index f24455432..c54a09c02 100644
--- a/src/plugins/messageActions.ts
+++ b/src/plugins/messageClickActions.ts
@@ -33,7 +33,7 @@ migratePluginSettings("MessageClickActions", "MessageQuickActions");
 
 export default definePlugin({
     name: "MessageClickActions",
-    description: "Hold Delete and click to delete, double click to edit",
+    description: "Hold Backspace and click to delete, double click to edit",
     authors: [Devs.Ven],
     dependencies: ["MessageEventsAPI"],
 

From 586b26d2d4736e401beba41a29cf03d27e69ca7f Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 21 Mar 2023 03:07:16 -0300
Subject: [PATCH 044/147] Fixes and ShowHiddenChannels improvements (#634)

~ Fixes #630
~ Fixes #618
---
 .../Notifications/NotificationComponent.tsx   |   8 +-
 src/api/Notifications/styles.css              |   2 +
 src/plugins/crashHandler.ts                   |  20 ++--
 src/plugins/devCompanion.dev.tsx              |  14 ++-
 src/plugins/emoteCloner.tsx                   |   2 +-
 src/plugins/fakeNitro.ts                      |  24 ++--
 src/plugins/reverseImageSearch.tsx            |   2 +-
 .../components/HiddenChannelLockScreen.tsx    |   8 +-
 src/plugins/showHiddenChannels/index.tsx      | 107 +++++++++++++++---
 src/plugins/showHiddenChannels/style.css      |   1 +
 ...umeBooster.ts => volumeBooster.desktop.ts} |   6 +-
 11 files changed, 147 insertions(+), 47 deletions(-)
 rename src/plugins/{volumeBooster.ts => volumeBooster.desktop.ts} (93%)

diff --git a/src/api/Notifications/NotificationComponent.tsx b/src/api/Notifications/NotificationComponent.tsx
index 29cd68f35..53c1b8137 100644
--- a/src/api/Notifications/NotificationComponent.tsx
+++ b/src/api/Notifications/NotificationComponent.tsx
@@ -63,7 +63,10 @@ export default ErrorBoundary.wrap(function NotificationComponent({
         <button
             className="vc-notification-root"
             style={position === "bottom-right" ? { bottom: "1rem" } : { top: "3rem" }}
-            onClick={onClick}
+            onClick={() => {
+                onClose!();
+                onClick?.();
+            }}
             onContextMenu={e => {
                 e.preventDefault();
                 e.stopPropagation();
@@ -78,7 +81,7 @@ export default ErrorBoundary.wrap(function NotificationComponent({
                     <div className="vc-notification-header">
                         <h2 className="vc-notification-title">{title}</h2>
                         <button
-                            style={{ all: "unset", cursor: "pointer" }}
+                            className="vc-notification-close-btn"
                             onClick={e => {
                                 e.preventDefault();
                                 e.stopPropagation();
@@ -86,7 +89,6 @@ export default ErrorBoundary.wrap(function NotificationComponent({
                             }}
                         >
                             <svg
-                                className="vc-notification-close-btn"
                                 width="24"
                                 height="24"
                                 viewBox="0 0 24 24"
diff --git a/src/api/Notifications/styles.css b/src/api/Notifications/styles.css
index a3db81e6a..cd3714282 100644
--- a/src/api/Notifications/styles.css
+++ b/src/api/Notifications/styles.css
@@ -40,6 +40,8 @@
 }
 
 .vc-notification-close-btn {
+    all: unset;
+    cursor: pointer;
     color: var(--interactive-normal);
     opacity: 0.5;
     transition: opacity 0.2s ease-in-out, color 0.2s ease-in-out;
diff --git a/src/plugins/crashHandler.ts b/src/plugins/crashHandler.ts
index e35dfed6e..6457e09d2 100644
--- a/src/plugins/crashHandler.ts
+++ b/src/plugins/crashHandler.ts
@@ -42,6 +42,7 @@ const settings = definePluginSettings({
 });
 
 let crashCount: number = 0;
+let lastCrashTimestamp: number = 0;
 
 export default definePlugin({
     name: "CrashHandler",
@@ -80,6 +81,7 @@ export default definePlugin({
                 });
             } catch { }
 
+            lastCrashTimestamp = Date.now();
             return false;
         }
 
@@ -97,17 +99,21 @@ export default definePlugin({
         } catch (err) {
             CrashHandlerLogger.error("Failed to handle crash", err);
             return false;
+        } finally {
+            lastCrashTimestamp = Date.now();
         }
     },
 
     handlePreventCrash(_this: ReactElement & { forceUpdate: () => void; }) {
-        try {
-            showNotification({
-                color: "#eed202",
-                title: "Discord has crashed!",
-                body: "Attempting to recover...",
-            });
-        } catch { }
+        if (Date.now() - lastCrashTimestamp >= 1_000) {
+            try {
+                showNotification({
+                    color: "#eed202",
+                    title: "Discord has crashed!",
+                    body: "Attempting to recover...",
+                });
+            } catch { }
+        }
 
         try {
             FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" });
diff --git a/src/plugins/devCompanion.dev.tsx b/src/plugins/devCompanion.dev.tsx
index c3d4d6a2a..8dbf59e2d 100644
--- a/src/plugins/devCompanion.dev.tsx
+++ b/src/plugins/devCompanion.dev.tsx
@@ -18,10 +18,11 @@
 
 import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
 import { showNotification } from "@api/Notifications";
+import { definePluginSettings } from "@api/settings";
 import { Devs } from "@utils/constants";
 import Logger from "@utils/Logger";
 import { canonicalizeMatch, canonicalizeReplace } from "@utils/patches";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 import { filters, findAll, search } from "@webpack";
 import { Menu } from "@webpack/common";
 
@@ -65,6 +66,14 @@ interface FindData {
     args: Array<StringNode | FunctionNode>;
 }
 
+const settings = definePluginSettings({
+    notifyOnAutoConnect: {
+        description: "Wheter to notify when Dev Companion has automatically connected.",
+        type: OptionType.BOOLEAN,
+        default: true
+    }
+});
+
 function parseNode(node: Node) {
     switch (node.type) {
         case "string":
@@ -91,7 +100,7 @@ function initWs(isManual = false) {
 
         logger.info("Connected to WebSocket");
 
-        showNotification({
+        (settings.store.notifyOnAutoConnect || isManual) && showNotification({
             title: "Dev Companion Connected",
             body: "Connected to WebSocket"
         });
@@ -241,6 +250,7 @@ export default definePlugin({
     description: "Dev Companion Plugin",
     authors: [Devs.Ven],
     dependencies: ["ContextMenuAPI"],
+    settings,
 
     start() {
         initWs();
diff --git a/src/plugins/emoteCloner.tsx b/src/plugins/emoteCloner.tsx
index 609ef0831..afbb3987d 100644
--- a/src/plugins/emoteCloner.tsx
+++ b/src/plugins/emoteCloner.tsx
@@ -188,7 +188,7 @@ const messageContextMenuPatch: NavContextMenuPatchCallback = (children, props) =
     const src = itemHref ?? itemSrc;
     const isAnimated = new URL(src).pathname.endsWith(".gif");
 
-    const group = findGroupChildrenByChildId("save-image", children);
+    const group = findGroupChildrenByChildId("copy-link", children);
     if (group && !group.some(child => child?.props?.id === "emote-cloner")) {
         group.push((
             <Menu.MenuItem
diff --git a/src/plugins/fakeNitro.ts b/src/plugins/fakeNitro.ts
index 580d69e7e..494edc8ba 100644
--- a/src/plugins/fakeNitro.ts
+++ b/src/plugins/fakeNitro.ts
@@ -87,12 +87,12 @@ export default definePlugin({
                     replace: (_, intention) => `,fakeNitroIntention=${intention}`
                 },
                 {
-                    match: /(?<=\.(?:canUseEmojisEverywhere|canUseAnimatedEmojis)\(\i)(?=\))/g,
-                    replace: ',typeof fakeNitroIntention!=="undefined"?fakeNitroIntention:void 0'
+                    match: /\.(?:canUseEmojisEverywhere|canUseAnimatedEmojis)\(\i(?=\))/g,
+                    replace: '$&,typeof fakeNitroIntention!=="undefined"?fakeNitroIntention:void 0'
                 },
                 {
-                    match: /(?<=&&!\i&&)!(\i)(?=\)return \i\.\i\.DISALLOW_EXTERNAL;)/,
-                    replace: (_, canUseExternal) => `(!${canUseExternal}&&(typeof fakeNitroIntention==="undefined"||![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention)))`
+                    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)))`
                 }
             ]
         },
@@ -100,16 +100,16 @@ export default definePlugin({
             find: "canUseAnimatedEmojis:function",
             predicate: () => Settings.plugins.FakeNitro.enableEmojiBypass === true,
             replacement: {
-                match: /(?<=(?:canUseEmojisEverywhere|canUseAnimatedEmojis):function\(\i)\){(.+?\))/g,
-                replace: (_, premiumCheck) => `,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)`
             }
         },
         {
             find: "canUseStickersEverywhere:function",
             predicate: () => Settings.plugins.FakeNitro.enableStickerBypass === true,
             replacement: {
-                match: /(?<=canUseStickersEverywhere:function\(\i\){)/,
-                replace: "return true;"
+                match: /canUseStickersEverywhere:function\(\i\){/,
+                replace: "$&return true;"
             },
         },
         {
@@ -129,8 +129,8 @@ export default definePlugin({
                 "canStreamMidQuality"
             ].map(func => {
                 return {
-                    match: new RegExp(`(?<=${func}:function\\(\\i\\){)`),
-                    replace: "return true;"
+                    match: new RegExp(`${func}:function\\(\\i\\){`),
+                    replace: "$&return true;"
                 };
             })
         },
@@ -145,8 +145,8 @@ export default definePlugin({
         {
             find: "canUseClientThemes:function",
             replacement: {
-                match: /(?<=canUseClientThemes:function\(\i\){)/,
-                replace: "return true;"
+                match: /canUseClientThemes:function\(\i\){/,
+                replace: "$&return true;"
             }
         }
     ],
diff --git a/src/plugins/reverseImageSearch.tsx b/src/plugins/reverseImageSearch.tsx
index 88c0b1652..7a3d6d986 100644
--- a/src/plugins/reverseImageSearch.tsx
+++ b/src/plugins/reverseImageSearch.tsx
@@ -42,7 +42,7 @@ const imageContextMenuPatch: NavContextMenuPatchCallback = (children, props) =>
 
     const src = itemHref ?? itemSrc;
 
-    const group = findGroupChildrenByChildId("save-image", children);
+    const group = findGroupChildrenByChildId("copy-link", children);
     if (group && !group.some(child => child?.props?.id === "search-image")) {
         group.push((
             <Menu.MenuItem
diff --git a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
index 01bc3a7c6..d2adbb00b 100644
--- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
+++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
@@ -20,10 +20,12 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { LazyComponent } from "@utils/misc";
 import { formatDuration } from "@utils/text";
 import { find, findByPropsLazy } from "@webpack";
-import { FluxDispatcher, GuildMemberStore, GuildStore, moment, Parser, SnowflakeUtils, Text, Timestamp, Tooltip } from "@webpack/common";
-import { Channel } from "discord-types/general";
+import { FluxDispatcher, GuildMemberStore, GuildStore, moment, Parser, PermissionStore, SnowflakeUtils, Text, Timestamp, Tooltip } from "@webpack/common";
+import type { Channel } from "discord-types/general";
 import type { ComponentType } from "react";
 
+import { VIEW_CHANNEL } from "..";
+
 
 enum SortOrderTypes {
     LATEST_ACTIVITY = 0,
@@ -167,7 +169,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 hidden {ChannelTypesToChannelNames[type]} channel.</Text>
+                    <Text variant="heading-xxl/bold">This is a {!PermissionStore.can(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 318bad251..38ce52d8e 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -21,6 +21,7 @@ import "./style.css";
 import { definePluginSettings } from "@api/settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
+import { canonicalizeMatch } from "@utils/patches";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { ChannelStore, PermissionStore, Tooltip } from "@webpack/common";
@@ -30,7 +31,8 @@ import HiddenChannelLockScreen, { setChannelBeginHeaderComponent, setEmojiCompon
 
 const ChannelListClasses = findByPropsLazy("channelName", "subtitle", "modeMuted", "iconContainer");
 
-const VIEW_CHANNEL = 1n << 10n;
+export const VIEW_CHANNEL = 1n << 10n;
+const CONNECT = 1n << 20n;
 
 enum ShowMode {
     LockIcon,
@@ -99,14 +101,14 @@ export default definePlugin({
                     replace: (_, channel) => `!$self.isHiddenChannel(${channel})&&`
                 },
                 {
-                    // Make Discord think we are connected to a voice channel so it shows us inside it
+                    // Prevent Discord from trying to connect to hidden channels
                     match: /(?=\|\|\i\.default\.selectVoiceChannel\((\i)\.id\))/,
                     replace: (_, channel) => `||$self.isHiddenChannel(${channel})`
                 },
                 {
-                    // Make Discord think we are connected to a voice channel so it shows us inside it
+                    // Make Discord show inside the channel if clicking on a hidden or locked channel
                     match: /(?<=\|\|\i\.default\.selectVoiceChannel\((\i)\.id\);!__OVERLAY__&&\()/,
-                    replace: (_, channel) => `$self.isHiddenChannel(${channel})||`
+                    replace: (_, channel) => `$self.isHiddenChannel(${channel},true)||`
                 }
             ]
         },
@@ -249,9 +251,49 @@ export default definePlugin({
                     replace: (m, component) => `${m}$self.setChannelBeginHeaderComponent(${component});`
                 },
                 {
-                    // Patch the header to only return allowed users and roles if it's a hidden channel (Like when it's used on the HiddenChannelLockScreen)
+                    // Change the role permission check to CONNECT if the channel is locked
+                    match: /ADMINISTRATOR\)\|\|(?=(.+?\((\i),\i\.\i\.)VIEW_CHANNEL)/,
+                    replace: (m, permCheck, channel) => `${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):.+?\i=(?=(.+?)VIEW_CHANNEL)/,
+                    replace: (m, channel, permCheck) => `${m}!Vencord.Webpack.Common.PermissionStore.can(${CONNECT}n,${channel})?${permCheck}CONNECT):`
+                },
+                {
+                    // 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.+?]}\)))/,
-                    replace: (m, component, channel) => `${m} $self.isHiddenChannel(${channel})?${component}:`
+                    replace: (m, component, channel) => {
+                        // Export the channel for the users allowed component patch
+                        component = component.replace(canonicalizeMatch(/(?<=users:\i)/), `,channel:${channel}`);
+
+                        return `${m} $self.isHiddenChannel(${channel},true)?${component}:`;
+                    }
+                }
+            ]
+        },
+        {
+            find: "().avatars),children",
+            replacement: [
+                {
+                    // Create a variable for the channel prop
+                    match: /=(\i)\.maxUsers,/,
+                    replace: (m, props) => `${m}channel=${props}.channel,`
+                },
+                {
+                    // 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})`
+                },
+                {
+                    // 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)`
+                },
+                {
+                    // 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}`
                 }
             ]
         },
@@ -261,22 +303,22 @@ export default definePlugin({
                 {
                     // Remove the divider and the open chat button for the HiddenChannelLockScreen
                     match: /"more-options-popout"\)\);if\((?<=function \i\((\i)\).+?)/,
-                    replace: (m, props) => `${m}(!$self.isHiddenChannel(${props}.channel)||${props}.inCall)&&`
+                    replace: (m, props) => `${m}!${props}.inCall&&$self.isHiddenChannel(${props}.channel,true)){}else if(`
                 },
                 {
                     // Render our HiddenChannelLockScreen component instead of the main voice channel component
                     match: /this\.renderVoiceChannelEffects.+?children:(?<=renderContent=function.+?)/,
-                    replace: "$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel)?$self.HiddenChannelLockScreen(this.props.channel):"
+                    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.+?)/,
-                    replace: "$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel)||"
+                    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)?null:"
+                    replace: "$&!this.props.inCall&&$self.isHiddenChannel(this.props.channel,true)?null:"
                 }
             ]
         },
@@ -338,10 +380,25 @@ export default definePlugin({
         },
         {
             find: '.displayName="GuildChannelStore"',
+            replacement: [
+                {
+                    // Make GuildChannelStore contain hidden channels
+                    match: /isChannelGated\(.+?\)(?=\|\|)/,
+                    replace: m => `${m}||true`
+                },
+                {
+                    // 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);`
+                }
+            ]
+        },
+        {
+            find: ".Messages.FORM_LABEL_MUTED",
             replacement: {
-                // Make GuildChannelStore contain hidden channels for users in voice channels to appear in the guild tooltip
-                match: /isChannelGated\(.+?\)(?=\|\|)/,
-                replace: m => `${m}||true`
+                // Make GuildChannelStore.getChannels return hidden channels
+                match: /(?<=getChannels\(\i)(?=\))/,
+                replace: ",true"
             }
         }
     ],
@@ -349,13 +406,33 @@ export default definePlugin({
     setEmojiComponent,
     setChannelBeginHeaderComponent,
 
-    isHiddenChannel(channel: Channel & { channelId?: string; }) {
+    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);
+        return !PermissionStore.can(VIEW_CHANNEL, channel) || checkConnect && !PermissionStore.can(CONNECT, channel);
+    },
+
+    resolveGuildChannels(channels: Record<string | number, Array<{ channel: Channel; comparator: number; }> | string | number>, shouldIncludeHidden: boolean) {
+        if (shouldIncludeHidden) return channels;
+
+        const res = {};
+        for (const [key, maybeObjChannels] of Object.entries(channels)) {
+            if (!Array.isArray(maybeObjChannels)) {
+                res[key] = maybeObjChannels;
+                continue;
+            }
+
+            res[key] ??= [];
+
+            for (const objChannel of maybeObjChannels) {
+                if (objChannel.channel.id === null || !this.isHiddenChannel(objChannel.channel)) res[key].push(objChannel);
+            }
+        }
+
+        return res;
     },
 
     HiddenChannelLockScreen: (channel: any) => <HiddenChannelLockScreen channel={channel} />,
diff --git a/src/plugins/showHiddenChannels/style.css b/src/plugins/showHiddenChannels/style.css
index 0f85b5084..01903ce9e 100644
--- a/src/plugins/showHiddenChannels/style.css
+++ b/src/plugins/showHiddenChannels/style.css
@@ -103,4 +103,5 @@
 .shc-lock-screen-allowed-users-and-roles-container > [class^="members"] {
     margin-left: 10px;
     flex-wrap: wrap;
+    justify-content: center;
 }
diff --git a/src/plugins/volumeBooster.ts b/src/plugins/volumeBooster.desktop.ts
similarity index 93%
rename from src/plugins/volumeBooster.ts
rename to src/plugins/volumeBooster.desktop.ts
index 3f692c7f1..b77af570a 100644
--- a/src/plugins/volumeBooster.ts
+++ b/src/plugins/volumeBooster.desktop.ts
@@ -74,10 +74,10 @@ export default definePlugin({
             find: '.displayName="MediaEngineStore"',
             replacement: [
                 {
-                    match: /(?<=\.settings\.audioContextSettings.+?)(\i\[\i\])=(\i\.volume)(.+?setLocalVolume\(\i,).+?\)/,
-                    replace: (_, localVolume, syncVolume, rest) => ""
+                    match: /(\.settings\.audioContextSettings.+?)(\i\[\i\])=(\i\.volume)(.+?setLocalVolume\(\i,).+?\)/,
+                    replace: (_, rest1, localVolume, syncVolume, rest2) => rest1
                         + `(${localVolume}>200?void 0:${localVolume}=${syncVolume})`
-                        + rest
+                        + rest2
                         + `${localVolume}??${syncVolume})`
                 }
             ]

From 6f200e9218d0764555fd0e676d02b63a53702e6c Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 21 Mar 2023 03:30:09 -0300
Subject: [PATCH 045/147] Fix grammar and SHC patches matching wrong var (#636)

---
 src/plugins/devCompanion.dev.tsx         | 2 +-
 src/plugins/showHiddenChannels/index.tsx | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/devCompanion.dev.tsx b/src/plugins/devCompanion.dev.tsx
index 8dbf59e2d..5c3c58eda 100644
--- a/src/plugins/devCompanion.dev.tsx
+++ b/src/plugins/devCompanion.dev.tsx
@@ -68,7 +68,7 @@ interface FindData {
 
 const settings = definePluginSettings({
     notifyOnAutoConnect: {
-        description: "Wheter to notify when Dev Companion has automatically connected.",
+        description: "Whether to notify when Dev Companion has automatically connected.",
         type: OptionType.BOOLEAN,
         default: true
     }
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 38ce52d8e..e0c12455f 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -246,18 +246,18 @@ export default definePlugin({
             find: ".Messages.ROLE_REQUIRED_SINGLE_USER_MESSAGE",
             replacement: [
                 {
-                    // Export the channel beggining header
+                    // 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\)\|\|(?=(.+?\((\i),\i\.\i\.)VIEW_CHANNEL)/,
-                    replace: (m, permCheck, channel) => `${m}!Vencord.Webpack.Common.PermissionStore.can(${CONNECT}n,${channel})?${permCheck}CONNECT):`
+                    match: /ADMINISTRATOR\)\|\|(?<=context:(\i)}.+?)(?=(.+?)VIEW_CHANNEL)/,
+                    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):.+?\i=(?=(.+?)VIEW_CHANNEL)/,
+                    match: /permissionOverwrites\[.+?\i=(?<=context:(\i)}.+?)(?=(.+?)VIEW_CHANNEL)/,
                     replace: (m, channel, permCheck) => `${m}!Vencord.Webpack.Common.PermissionStore.can(${CONNECT}n,${channel})?${permCheck}CONNECT):`
                 },
                 {

From 0ba3e9f469711e56abae42a07e63dd4474aac5e3 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 21 Mar 2023 03:41:11 -0300
Subject: [PATCH 046/147] I'm sorry for hurting you Fake Nitro (#637)

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

diff --git a/src/plugins/fakeNitro.ts b/src/plugins/fakeNitro.ts
index 494edc8ba..bba6aca2b 100644
--- a/src/plugins/fakeNitro.ts
+++ b/src/plugins/fakeNitro.ts
@@ -91,7 +91,7 @@ export default definePlugin({
                     replace: '$&,typeof fakeNitroIntention!=="undefined"?fakeNitroIntention:void 0'
                 },
                 {
-                    match: /(&&!\i&&!)(\i)(?=\)return \i\.\i\.DISALLOW_EXTERNAL;)/,
+                    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)))`
                 }
             ]

From e29bbf73aa789f5560e37eaee0a146facd69e354 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 21 Mar 2023 06:03:28 -0300
Subject: [PATCH 047/147] Fix Nitro Themes with FakeNitro (#639)

---
 src/plugins/fakeNitro.ts | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/plugins/fakeNitro.ts b/src/plugins/fakeNitro.ts
index bba6aca2b..7e583d706 100644
--- a/src/plugins/fakeNitro.ts
+++ b/src/plugins/fakeNitro.ts
@@ -22,11 +22,12 @@ import { Devs } from "@utils/constants";
 import { ApngDisposeOp, getGifEncoder, importApngJs } from "@utils/dependencies";
 import { getCurrentGuild } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { findByCodeLazy, findByPropsLazy, findStoreLazy } from "@webpack";
 import { ChannelStore, PermissionStore, UserStore } from "@webpack/common";
 
 const DRAFT_TYPE = 0;
 const promptToUpload = findByCodeLazy("UPLOAD_FILE_LIMIT_ERROR");
+const UserSettingsProtoStore = findStoreLazy("UserSettingsProtoStore");
 
 const USE_EXTERNAL_EMOJIS = 1n << 18n;
 const USE_EXTERNAL_STICKERS = 1n << 37n;
@@ -148,6 +149,19 @@ export default definePlugin({
                 match: /canUseClientThemes:function\(\i\){/,
                 replace: "$&return true;"
             }
+        },
+        {
+            find: '.displayName="UserSettingsProtoStore"',
+            replacement: [
+                {
+                    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);`
+                }
+            ]
         }
     ],
 
@@ -196,6 +210,21 @@ export default definePlugin({
         return (UserStore.getCurrentUser().premiumType ?? 0) > 1;
     },
 
+    handleProtoChange(proto: any, user: any) {
+        const premiumType = user?.premium_type ?? UserStore.getCurrentUser().premiumType ?? 0;
+
+        if (premiumType === 0) {
+            const themeId = UserSettingsProtoStore.settings.appearance?.clientThemeSettings?.backgroundGradientPresetId?.value;
+
+            if (themeId != null) {
+                proto.appearance ??= {};
+                proto.appearance.clientThemeSettings ??= {};
+                proto.appearance.clientThemeSettings.backgroundGradientPresetId ??= {};
+                proto.appearance.clientThemeSettings.backgroundGradientPresetId.value = themeId;
+            }
+        }
+    },
+
     hasPermissionToUseExternalEmojis(channelId: string) {
         const channel = ChannelStore.getChannel(channelId);
 

From a2f0c912f0f3c18e19ce2f3f62414421b3fe73cb Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 21 Mar 2023 06:41:31 -0300
Subject: [PATCH 048/147] Fix Fake Nitro making Discord unusable and
 ColorSighted not working sometimes (#640)

---
 src/plugins/colorSighted.ts | 9 +++++++--
 src/plugins/fakeNitro.ts    | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/plugins/colorSighted.ts b/src/plugins/colorSighted.ts
index 659e341d9..d2fb0d653 100644
--- a/src/plugins/colorSighted.ts
+++ b/src/plugins/colorSighted.ts
@@ -27,11 +27,16 @@ export default definePlugin({
         {
             find: "Masks.STATUS_ONLINE",
             replacement: {
-                // we can use global replacement here - these are specific to the status icons and are used nowhere else,
-                // so it keeps the patch and plugin small and simple
                 match: /Masks\.STATUS_(?:IDLE|DND|STREAMING|OFFLINE)/g,
                 replace: "Masks.STATUS_ONLINE"
             }
+        },
+        {
+            find: ".AVATAR_STATUS_MOBILE_16;",
+            replacement: {
+                match: /(\.fromIsMobile,.+?)\i.status/,
+                replace: (_, rest) => `${rest}"online"`
+            }
         }
     ]
 });
diff --git a/src/plugins/fakeNitro.ts b/src/plugins/fakeNitro.ts
index 7e583d706..df8ac770c 100644
--- a/src/plugins/fakeNitro.ts
+++ b/src/plugins/fakeNitro.ts
@@ -211,7 +211,7 @@ export default definePlugin({
     },
 
     handleProtoChange(proto: any, user: any) {
-        const premiumType = user?.premium_type ?? UserStore.getCurrentUser().premiumType ?? 0;
+        const premiumType = user?.premium_type ?? UserStore.getCurrentUser()?.premiumType ?? 0;
 
         if (premiumType === 0) {
             const themeId = UserSettingsProtoStore.settings.appearance?.clientThemeSettings?.backgroundGradientPresetId?.value;

From 55a66dbb39259e5fa004b18385594c4c75d28483 Mon Sep 17 00:00:00 2001
From: Lewis Crichton <lewi@lewisakura.moe>
Date: Wed, 22 Mar 2023 02:57:53 +0000
Subject: [PATCH 049/147] fix(RoleColorEverywhere): MessageLinkEmbeds DM error
 (#648)

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

diff --git a/src/plugins/roleColorEverywhere.tsx b/src/plugins/roleColorEverywhere.tsx
index 4085b2542..65a1cc060 100644
--- a/src/plugins/roleColorEverywhere.tsx
+++ b/src/plugins/roleColorEverywhere.tsx
@@ -53,7 +53,7 @@ export default definePlugin({
             replacement: [
                 {
                     match: /user:(\i),channel:(\i).{0,300}?"@"\.concat\(.+?\)/,
-                    replace: "$&,color:$self.getUserColor($1.id,{channelId:$2.id})"
+                    replace: "$&,color:$self.getUserColor($1.id,{channelId:$2?.id})"
                 }
             ],
             predicate: () => settings.store.chatMentions,
@@ -65,7 +65,7 @@ export default definePlugin({
             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}),"
+                    replace: "$&color:$self.getUserColor($1.id,{guildId:$1?.guildId}),"
                 }
             ],
             predicate: () => settings.store.chatMentions,

From a1c1fec8cb33ad5312701f286422b308289a7cfb Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 22 Mar 2023 00:01:32 -0300
Subject: [PATCH 050/147] Improve Fake Nitro client themes bypass (#654)

---
 src/plugins/fakeNitro.ts | 65 ++++++++++++++++++++++++++++++++++------
 1 file changed, 56 insertions(+), 9 deletions(-)

diff --git a/src/plugins/fakeNitro.ts b/src/plugins/fakeNitro.ts
index df8ac770c..e49dda1a4 100644
--- a/src/plugins/fakeNitro.ts
+++ b/src/plugins/fakeNitro.ts
@@ -22,12 +22,13 @@ import { Devs } from "@utils/constants";
 import { ApngDisposeOp, getGifEncoder, importApngJs } from "@utils/dependencies";
 import { getCurrentGuild } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy, findByPropsLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, PermissionStore, UserStore } from "@webpack/common";
+import { findByCodeLazy, findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
+import { ChannelStore, FluxDispatcher, PermissionStore, UserStore } from "@webpack/common";
 
 const DRAFT_TYPE = 0;
 const promptToUpload = findByCodeLazy("UPLOAD_FILE_LIMIT_ERROR");
 const UserSettingsProtoStore = findStoreLazy("UserSettingsProtoStore");
+const ProtoPreloadedUserSettings = findLazy(m => m.typeName === "discord_protos.discord_users.v1.PreloadedUserSettings");
 
 const USE_EXTERNAL_EMOJIS = 1n << 18n;
 const USE_EXTERNAL_STICKERS = 1n << 37n;
@@ -162,6 +163,13 @@ export default definePlugin({
                     replace: (m, props) => `${m}${props}.local||$self.handleProtoChange(${props}.settings.proto);`
                 }
             ]
+        },
+        {
+            find: "updateTheme:function",
+            replacement: {
+                match: /(function \i\(\i\){var (\i)=\i\.backgroundGradientPresetId.+?)\i\.\i\.updateAsync.+?theme=(.+?);.+?\),\i\)/,
+                replace: (_, rest, backgroundGradientPresetId, theme) => `${rest}$self.handleGradientThemeSelect(${backgroundGradientPresetId},${theme});`
+            }
         }
     ],
 
@@ -211,20 +219,59 @@ export default definePlugin({
     },
 
     handleProtoChange(proto: any, user: any) {
-        const premiumType = user?.premium_type ?? UserStore.getCurrentUser()?.premiumType ?? 0;
+        const premiumType: number = user?.premium_type ?? UserStore.getCurrentUser()?.premiumType ?? 0;
 
         if (premiumType === 0) {
-            const themeId = UserSettingsProtoStore.settings.appearance?.clientThemeSettings?.backgroundGradientPresetId?.value;
+            const appearanceDummyProto = ProtoPreloadedUserSettings.create({
+                appearance: {}
+            });
 
-            if (themeId != null) {
-                proto.appearance ??= {};
-                proto.appearance.clientThemeSettings ??= {};
-                proto.appearance.clientThemeSettings.backgroundGradientPresetId ??= {};
-                proto.appearance.clientThemeSettings.backgroundGradientPresetId.value = themeId;
+            proto.appearance ??= appearanceDummyProto.appearance;
+
+            if (UserSettingsProtoStore.settings.appearance?.theme != null) {
+                proto.appearance.theme = UserSettingsProtoStore.settings.appearance.theme;
+            }
+
+            if (UserSettingsProtoStore.settings.appearance?.clientThemeSettings?.backgroundGradientPresetId?.value != null) {
+                const clientThemeSettingsDummyProto = ProtoPreloadedUserSettings.create({
+                    appearance: {
+                        clientThemeSettings: {
+                            backgroundGradientPresetId: {
+                                value: UserSettingsProtoStore.settings.appearance.clientThemeSettings.backgroundGradientPresetId.value
+                            }
+                        }
+                    }
+                });
+
+                proto.appearance.clientThemeSettings ??= clientThemeSettingsDummyProto.appearance.clientThemeSettings;
+                proto.appearance.clientThemeSettings.backgroundGradientPresetId = clientThemeSettingsDummyProto.appearance.clientThemeSettings.backgroundGradientPresetId;
             }
         }
     },
 
+    handleGradientThemeSelect(backgroundGradientPresetId: number | undefined, theme: number) {
+        const proto = ProtoPreloadedUserSettings.create({
+            appearance: {
+                theme,
+                clientThemeSettings: {
+                    backgroundGradientPresetId: backgroundGradientPresetId != null ? {
+                        value: backgroundGradientPresetId
+                    } : void 0
+                }
+            }
+        });
+
+        FluxDispatcher.dispatch({
+            type: "USER_SETTINGS_PROTO_UPDATE",
+            local: true,
+            partial: true,
+            settings: {
+                type: 1,
+                proto
+            }
+        });
+    },
+
     hasPermissionToUseExternalEmojis(channelId: string) {
         const channel = ChannelStore.getChannel(channelId);
 

From cae8b1a93bf044da35116cea081ef2135ef7e3b4 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 22 Mar 2023 04:07:12 +0100
Subject: [PATCH 051/147] Bump to v1.1.2

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 6e1ec6fbd..763189eec 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "description": "The cutest Discord client mod",
-    "keywords": [],
+    "keywords": [ ],
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {
         "url": "https://github.com/Vendicated/Vencord/issues"

From d0b3678ad60dc758c05fa3f77456eb94024e6876 Mon Sep 17 00:00:00 2001
From: iwa <19956672+iwa@users.noreply.github.com>
Date: Wed, 22 Mar 2023 04:37:04 +0100
Subject: [PATCH 052/147] fix messagelogger deleted styles (#642)

Co-authored-by: Ven <vendicated@riseup.net>
---
 src/plugins/messageLogger/deleteStyleText.css | 5 +++++
 src/plugins/messageLogger/messageLogger.css   | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/plugins/messageLogger/deleteStyleText.css b/src/plugins/messageLogger/deleteStyleText.css
index 9f2d731fc..ad97664b4 100644
--- a/src/plugins/messageLogger/deleteStyleText.css
+++ b/src/plugins/messageLogger/deleteStyleText.css
@@ -1,3 +1,8 @@
 .messagelogger-deleted div {
     color: #f04747;
 }
+
+.messagelogger-deleted a {
+    color: #be3535;
+    text-decoration: underline;
+}
diff --git a/src/plugins/messageLogger/messageLogger.css b/src/plugins/messageLogger/messageLogger.css
index a33a33efc..cf85397c6 100644
--- a/src/plugins/messageLogger/messageLogger.css
+++ b/src/plugins/messageLogger/messageLogger.css
@@ -2,12 +2,14 @@
     display: none;
 }
 
-.messagelogger-deleted-attachment {
+.messagelogger-deleted-attachment,
+.messagelogger-deleted div iframe {
     filter: grayscale(1);
     transition: 150ms filter ease-in-out;
 }
 
-.messagelogger-deleted-attachment:hover {
+.messagelogger-deleted-attachment:hover,
+.messagelogger-deleted div iframe:hover {
     filter: grayscale(0);
 }
 

From 1368c25824f3a0ef43457a5473085184a52f1523 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 23 Mar 2023 04:37:32 +0100
Subject: [PATCH 053/147] ci: Auto generate plugin json

---
 .github/workflows/build.yml               |   3 +
 .github/workflows/reportBrokenPlugins.yml |   2 +-
 package.json                              |   2 +
 pnpm-lock.yaml                            | 290 ++++++++++++++++++++++
 scripts/generatePluginList.ts             | 191 ++++++++++++++
 {test => scripts}/generateReport.ts       |   0
 src/plugins/richerCider.desktop.tsx       |  67 -----
 src/plugins/viewIcons.tsx                 |  20 +-
 8 files changed, 497 insertions(+), 78 deletions(-)
 create mode 100644 scripts/generatePluginList.ts
 rename {test => scripts}/generateReport.ts (100%)
 delete mode 100644 src/plugins/richerCider.desktop.tsx

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c264821e3..b7a95cf05 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,6 +37,9 @@ jobs:
             - name: Build
               run: pnpm build --standalone
 
+            - name: Generate plugin list
+              run: pnpm generatePluginJson dist/plugins.json
+
             - name: Clean up obsolete files
               run: |
                 rm -rf dist/extension* Vencord.user.css
diff --git a/.github/workflows/reportBrokenPlugins.yml b/.github/workflows/reportBrokenPlugins.yml
index 719eca753..2e927bb82 100644
--- a/.github/workflows/reportBrokenPlugins.yml
+++ b/.github/workflows/reportBrokenPlugins.yml
@@ -36,7 +36,7 @@ jobs:
                 export PATH="$PWD/node_modules/.bin:$PATH"
                 export CHROMIUM_BIN=$(which chromium-browser)
 
-                esbuild test/generateReport.ts > dist/report.mjs
+                esbuild scripts/generateReport.ts > dist/report.mjs
                 node dist/report.mjs >> $GITHUB_STEP_SUMMARY
               env:
                 DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
diff --git a/package.json b/package.json
index 763189eec..c6975a41f 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "scripts": {
         "build": "node scripts/build/build.mjs",
         "buildWeb": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/buildWeb.mjs",
+        "generatePluginJson": "tsx scripts/generatePluginList.ts",
         "inject": "node scripts/runInstaller.mjs",
         "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
         "lint-styles": "stylelint \"src/**/*.css\"",
@@ -59,6 +60,7 @@
         "standalone-electron-types": "^1.0.0",
         "stylelint": "^14.16.1",
         "stylelint-config-standard": "^29.0.0",
+        "tsx": "^3.12.6",
         "type-fest": "^3.5.3",
         "typescript": "^4.9.4"
     },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ac7aca771..30ce7bba0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,6 +35,7 @@ specifiers:
   standalone-electron-types: ^1.0.0
   stylelint: ^14.16.1
   stylelint-config-standard: ^29.0.0
+  tsx: ^3.12.6
   type-fest: ^3.5.3
   typescript: ^4.9.4
 
@@ -67,6 +68,7 @@ devDependencies:
   standalone-electron-types: 1.0.0
   stylelint: 14.16.1
   stylelint-config-standard: 29.0.0_stylelint@14.16.1
+  tsx: 3.12.6
   type-fest: 3.5.3
   typescript: 4.9.4
 
@@ -104,6 +106,27 @@ packages:
       postcss-selector-parser: 6.0.11
     dev: true
 
+  /@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.4.0
+    dev: true
+
+  /@esbuild-kit/core-utils/3.1.0:
+    resolution: {integrity: sha512-Uuk8RpCg/7fdHSceR1M6XbSZFSuMrxcePFuGgyvsBn+u339dk5OeL4jv2EojwTN2st/unJGsVm4qHWjWNmJ/tw==}
+    dependencies:
+      esbuild: 0.17.12
+      source-map-support: 0.5.21
+    dev: true
+
+  /@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.4.0
+    dev: true
+
   /@esbuild/android-arm/0.15.18:
     resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==}
     engines: {node: '>=12'}
@@ -113,6 +136,96 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/android-arm/0.17.12:
+    resolution: {integrity: sha512-E/sgkvwoIfj4aMAPL2e35VnUJspzVYl7+M1B2cqeubdBhADV4uPon0KCc8p2G+LqSJ6i8ocYPCqY3A4GGq0zkQ==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/android-arm64/0.17.12:
+    resolution: {integrity: sha512-WQ9p5oiXXYJ33F2EkE3r0FRDFVpEdcDiwNX3u7Xaibxfx6vQE0Sb8ytrfQsA5WO6kDn6mDfKLh6KrPBjvkk7xA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/android-x64/0.17.12:
+    resolution: {integrity: sha512-m4OsaCr5gT+se25rFPHKQXARMyAehHTQAz4XX1Vk3d27VtqiX0ALMBPoXZsGaB6JYryCLfgGwUslMqTfqeLU0w==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/darwin-arm64/0.17.12:
+    resolution: {integrity: sha512-O3GCZghRIx+RAN0NDPhyyhRgwa19MoKlzGonIb5hgTj78krqp9XZbYCvFr9N1eUxg0ZQEpiiZ4QvsOQwBpP+lg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/darwin-x64/0.17.12:
+    resolution: {integrity: sha512-5D48jM3tW27h1qjaD9UNRuN+4v0zvksqZSPZqeSWggfMlsVdAhH3pwSfQIFJwcs9QJ9BRibPS4ViZgs3d2wsCA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/freebsd-arm64/0.17.12:
+    resolution: {integrity: sha512-OWvHzmLNTdF1erSvrfoEBGlN94IE6vCEaGEkEH29uo/VoONqPnoDFfShi41Ew+yKimx4vrmmAJEGNoyyP+OgOQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/freebsd-x64/0.17.12:
+    resolution: {integrity: sha512-A0Xg5CZv8MU9xh4a+7NUpi5VHBKh1RaGJKqjxe4KG87X+mTjDE6ZvlJqpWoeJxgfXHT7IMP9tDFu7IZ03OtJAw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-arm/0.17.12:
+    resolution: {integrity: sha512-WsHyJ7b7vzHdJ1fv67Yf++2dz3D726oO3QCu8iNYik4fb5YuuReOI9OtA+n7Mk0xyQivNTPbl181s+5oZ38gyA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-arm64/0.17.12:
+    resolution: {integrity: sha512-cK3AjkEc+8v8YG02hYLQIQlOznW+v9N+OI9BAFuyqkfQFR+DnDLhEM5N8QRxAUz99cJTo1rLNXqRrvY15gbQUg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-ia32/0.17.12:
+    resolution: {integrity: sha512-jdOBXJqcgHlah/nYHnj3Hrnl9l63RjtQ4vn9+bohjQPI2QafASB5MtHAoEv0JQHVb/xYQTFOeuHnNYE1zF7tYw==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-loong64/0.15.18:
     resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==}
     engines: {node: '>=12'}
@@ -122,6 +235,114 @@ packages:
     dev: true
     optional: true
 
+  /@esbuild/linux-loong64/0.17.12:
+    resolution: {integrity: sha512-GTOEtj8h9qPKXCyiBBnHconSCV9LwFyx/gv3Phw0pa25qPYjVuuGZ4Dk14bGCfGX3qKF0+ceeQvwmtI+aYBbVA==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-mips64el/0.17.12:
+    resolution: {integrity: sha512-o8CIhfBwKcxmEENOH9RwmUejs5jFiNoDw7YgS0EJTF6kgPgcqLFjgoc5kDey5cMHRVCIWc6kK2ShUePOcc7RbA==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-ppc64/0.17.12:
+    resolution: {integrity: sha512-biMLH6NR/GR4z+ap0oJYb877LdBpGac8KfZoEnDiBKd7MD/xt8eaw1SFfYRUeMVx519kVkAOL2GExdFmYnZx3A==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-riscv64/0.17.12:
+    resolution: {integrity: sha512-jkphYUiO38wZGeWlfIBMB72auOllNA2sLfiZPGDtOBb1ELN8lmqBrlMiucgL8awBw1zBXN69PmZM6g4yTX84TA==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-s390x/0.17.12:
+    resolution: {integrity: sha512-j3ucLdeY9HBcvODhCY4b+Ds3hWGO8t+SAidtmWu/ukfLLG/oYDMaA+dnugTVAg5fnUOGNbIYL9TOjhWgQB8W5g==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-x64/0.17.12:
+    resolution: {integrity: sha512-uo5JL3cgaEGotaqSaJdRfFNSCUJOIliKLnDGWaVCgIKkHxwhYMm95pfMbWZ9l7GeW9kDg0tSxcy9NYdEtjwwmA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/netbsd-x64/0.17.12:
+    resolution: {integrity: sha512-DNdoRg8JX+gGsbqt2gPgkgb00mqOgOO27KnrWZtdABl6yWTST30aibGJ6geBq3WM2TIeW6COs5AScnC7GwtGPg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/openbsd-x64/0.17.12:
+    resolution: {integrity: sha512-aVsENlr7B64w8I1lhHShND5o8cW6sB9n9MUtLumFlPhG3elhNWtE7M1TFpj3m7lT3sKQUMkGFjTQBrvDDO1YWA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/sunos-x64/0.17.12:
+    resolution: {integrity: sha512-qbHGVQdKSwi0JQJuZznS4SyY27tYXYF0mrgthbxXrZI3AHKuRvU+Eqbg/F0rmLDpW/jkIZBlCO1XfHUBMNJ1pg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/win32-arm64/0.17.12:
+    resolution: {integrity: sha512-zsCp8Ql+96xXTVTmm6ffvoTSZSV2B/LzzkUXAY33F/76EajNw1m+jZ9zPfNJlJ3Rh4EzOszNDHsmG/fZOhtqDg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/win32-ia32/0.17.12:
+    resolution: {integrity: sha512-FfrFjR4id7wcFYOdqbDfDET3tjxCozUgbqdkOABsSFzoZGFC92UK7mg4JKRc/B3NNEf1s2WHxJ7VfTdVDPN3ng==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/win32-x64/0.17.12:
+    resolution: {integrity: sha512-JOOxw49BVZx2/5tW3FqkdjSD/5gXYeVGPDcB0lvap0gLQshkh1Nyel1QazC+wNxus3xPlsYAgqU1BUmrmCvWtw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@eslint/eslintrc/1.3.3:
     resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -563,6 +784,10 @@ packages:
     resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
     dev: true
 
+  /buffer-from/1.1.2:
+    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+    dev: true
+
   /buffer/5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
     dependencies:
@@ -1047,6 +1272,36 @@ packages:
       esbuild-windows-arm64: 0.15.18
     dev: true
 
+  /esbuild/0.17.12:
+    resolution: {integrity: sha512-bX/zHl7Gn2CpQwcMtRogTTBf9l1nl+H6R8nUbjk+RuKqAE3+8FDulLA+pHvX7aA7Xe07Iwa+CWvy9I8Y2qqPKQ==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/android-arm': 0.17.12
+      '@esbuild/android-arm64': 0.17.12
+      '@esbuild/android-x64': 0.17.12
+      '@esbuild/darwin-arm64': 0.17.12
+      '@esbuild/darwin-x64': 0.17.12
+      '@esbuild/freebsd-arm64': 0.17.12
+      '@esbuild/freebsd-x64': 0.17.12
+      '@esbuild/linux-arm': 0.17.12
+      '@esbuild/linux-arm64': 0.17.12
+      '@esbuild/linux-ia32': 0.17.12
+      '@esbuild/linux-loong64': 0.17.12
+      '@esbuild/linux-mips64el': 0.17.12
+      '@esbuild/linux-ppc64': 0.17.12
+      '@esbuild/linux-riscv64': 0.17.12
+      '@esbuild/linux-s390x': 0.17.12
+      '@esbuild/linux-x64': 0.17.12
+      '@esbuild/netbsd-x64': 0.17.12
+      '@esbuild/openbsd-x64': 0.17.12
+      '@esbuild/sunos-x64': 0.17.12
+      '@esbuild/win32-arm64': 0.17.12
+      '@esbuild/win32-ia32': 0.17.12
+      '@esbuild/win32-x64': 0.17.12
+    dev: true
+
   /escape-string-regexp/1.0.5:
     resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
     engines: {node: '>=0.8.0'}
@@ -1400,6 +1655,14 @@ packages:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
     dev: true
 
+  /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
+    optional: true
+
   /function-bind/1.1.1:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
     dev: true
@@ -1411,6 +1674,10 @@ packages:
       pump: 3.0.0
     dev: true
 
+  /get-tsconfig/4.4.0:
+    resolution: {integrity: sha512-0Gdjo/9+FzsYhXCEFueo2aY1z1tpXrxWZzP7k8ul9qt1U5o8rYJwTJYmaeHdrVosYIVYkOy2iwCJ9FdpocJhPQ==}
+    dev: true
+
   /get-value/2.0.6:
     resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
     engines: {node: '>=0.10.0'}
@@ -2467,6 +2734,13 @@ packages:
       urix: 0.1.0
     dev: true
 
+  /source-map-support/0.5.21:
+    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
+    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
@@ -2477,6 +2751,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /source-map/0.6.1:
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /spdx-correct/3.1.1:
     resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==}
     dependencies:
@@ -2739,6 +3018,17 @@ packages:
       typescript: 4.9.4
     dev: true
 
+  /tsx/3.12.6:
+    resolution: {integrity: sha512-q93WgS3lBdHlPgS0h1i+87Pt6n9K/qULIMNYZo07nSeu2z5QE2CellcAZfofVXBo2tQg9av2ZcRMQ2S2i5oadQ==}
+    hasBin: true
+    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'}
diff --git a/scripts/generatePluginList.ts b/scripts/generatePluginList.ts
new file mode 100644
index 000000000..1f66c3dc8
--- /dev/null
+++ b/scripts/generatePluginList.ts
@@ -0,0 +1,191 @@
+/*
+ * 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 { Dirent, readdirSync, readFileSync, writeFileSync } from "fs";
+import { access, readFile } from "fs/promises";
+import { join } from "path";
+import { BigIntLiteral, createSourceFile, Identifier, isArrayLiteralExpression, isCallExpression, isExportAssignment, isIdentifier, isObjectLiteralExpression, isPropertyAccessExpression, isPropertyAssignment, isStringLiteral, isVariableStatement, NamedDeclaration, NodeArray, ObjectLiteralExpression, ScriptTarget, StringLiteral, SyntaxKind } from "typescript";
+
+interface Dev {
+    name: string;
+    id: string;
+}
+
+interface PluginData {
+    name: string;
+    description: string;
+    authors: Dev[];
+    dependencies: string[];
+    hasPatches: boolean;
+    hasCommands: boolean;
+    required: boolean;
+    enabledByDefault: boolean;
+    target: "desktop" | "web" | "dev";
+}
+
+const devs = {} as Record<string, Dev>;
+
+function getName(node: NamedDeclaration) {
+    return node.name && isIdentifier(node.name) ? node.name.text : undefined;
+}
+
+function hasName(node: NamedDeclaration, name: string) {
+    return getName(node) === name;
+}
+
+function getObjectProp(node: ObjectLiteralExpression, name: string) {
+    const prop = node.properties.find(p => hasName(p, name));
+    if (prop && isPropertyAssignment(prop)) return prop.initializer;
+    return prop;
+}
+
+function parseDevs() {
+    const file = createSourceFile("constants.ts", readFileSync("src/utils/constants.ts", "utf8"), ScriptTarget.Latest);
+
+    for (const child of file.getChildAt(0).getChildren()) {
+        if (!isVariableStatement(child)) continue;
+
+        const devsDeclaration = child.declarationList.declarations.find(d => hasName(d, "Devs"));
+        if (!devsDeclaration?.initializer || !isCallExpression(devsDeclaration.initializer)) continue;
+
+        const value = devsDeclaration.initializer.arguments[0];
+
+        if (!isObjectLiteralExpression(value)) return;
+
+        for (const prop of value.properties) {
+            const name = (prop.name as Identifier).text;
+            const value = isPropertyAssignment(prop) ? prop.initializer : prop;
+
+            if (!isObjectLiteralExpression(value)) throw new Error(`Failed to parse devs: ${name} is not an object literal`);
+
+            devs[name] = {
+                name: (getObjectProp(value, "name") as StringLiteral).text,
+                id: (getObjectProp(value, "id") as BigIntLiteral).text.slice(0, -1)
+            };
+        }
+
+        return;
+    }
+
+    throw new Error("Could not find Devs constant");
+}
+
+async function parseFile(fileName: string) {
+    const file = createSourceFile(fileName, await readFile(fileName, "utf8"), ScriptTarget.Latest);
+
+    const fail = (reason: string) => {
+        return new Error(`Invalid plugin ${fileName}, because ${reason}`);
+    };
+
+    for (const node of file.getChildAt(0).getChildren()) {
+        if (!isExportAssignment(node) || !isCallExpression(node.expression)) continue;
+
+        const call = node.expression;
+        if (!isIdentifier(call.expression) || call.expression.text !== "definePlugin") continue;
+
+        const pluginObj = node.expression.arguments[0];
+        if (!isObjectLiteralExpression(pluginObj)) throw fail("no object literal passed to definePlugin");
+
+        const data = {
+            hasPatches: false,
+            hasCommands: false,
+            enabledByDefault: false,
+            required: false,
+        } as PluginData;
+
+        for (const prop of pluginObj.properties) {
+            const key = getName(prop);
+            const value = isPropertyAssignment(prop) ? prop.initializer : prop;
+
+            switch (key) {
+                case "name":
+                case "description":
+                    if (!isStringLiteral(value)) throw fail(`${key} is not a string literal`);
+                    data[key] = value.text;
+                    break;
+                case "patches":
+                    data.hasPatches = true;
+                    break;
+                case "commands":
+                    data.hasCommands = true;
+                    break;
+                case "authors":
+                    if (!isArrayLiteralExpression(value)) throw fail("authors is not an array literal");
+                    data.authors = value.elements.map(e => {
+                        if (!isPropertyAccessExpression(e)) throw fail("authors array contains non-property access expressions");
+                        return devs[getName(e)!];
+                    });
+                    break;
+                case "dependencies":
+                    if (!isArrayLiteralExpression(value)) throw fail("dependencies is not an array literal");
+                    const { elements } = value;
+                    if (elements.some(e => !isStringLiteral(e))) throw fail("dependencies array contains non-string elements");
+                    data.dependencies = (elements as NodeArray<StringLiteral>).map(e => e.text);
+                    break;
+                case "required":
+                case "enabledByDefault":
+                    data[key] = value.kind === SyntaxKind.TrueKeyword;
+                    if (!data[key] && value.kind !== SyntaxKind.FalseKeyword) throw fail(`${key} is not a boolean literal`);
+                    break;
+            }
+        }
+
+        if (!data.name || !data.description || !data.authors) throw fail("name, description or authors are missing");
+
+        const fileBits = fileName.split(".");
+        if (fileBits.length > 2 && ["ts", "tsx"].includes(fileBits.at(-1)!)) {
+            const mod = fileBits.at(-2)!;
+            if (!["web", "desktop", "dev"].includes(mod)) throw fail(`invalid target ${fileBits.at(-2)}`);
+            data.target = mod as any;
+        }
+
+        return data;
+    }
+
+    throw fail("no default export called 'definePlugin' found");
+}
+
+async function getEntryPoint(dirent: Dirent) {
+    const base = join("./src/plugins", dirent.name);
+    if (!dirent.isDirectory()) return base;
+
+    for (const name of ["index.ts", "index.tsx"]) {
+        const full = join(base, name);
+        try {
+            await access(full);
+            return full;
+        } catch { }
+    }
+
+    throw new Error(`${dirent.name}: Couldn't find entry point`);
+}
+
+(async () => {
+    parseDevs();
+    const plugins = readdirSync("./src/plugins", { withFileTypes: true }).filter(d => d.name !== "index.ts");
+
+    const promises = plugins.map(async dirent => parseFile(await getEntryPoint(dirent)));
+
+    const data = JSON.stringify(await Promise.all(promises));
+
+    if (process.argv.length > 2) {
+        writeFileSync(process.argv[2], data);
+    } else {
+        console.log(data);
+    }
+})();
diff --git a/test/generateReport.ts b/scripts/generateReport.ts
similarity index 100%
rename from test/generateReport.ts
rename to scripts/generateReport.ts
diff --git a/src/plugins/richerCider.desktop.tsx b/src/plugins/richerCider.desktop.tsx
deleted file mode 100644
index 8b6fb5eb8..000000000
--- a/src/plugins/richerCider.desktop.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 OpenAsar
- *
- * 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 { Link } from "@components/Link";
-import definePlugin from "@utils/types";
-import { Forms } from "@webpack/common";
-const appIds = [
-    "911790844204437504",
-    "886578863147192350",
-    "1020414178047041627",
-    "1032800329332445255"
-];
-export default definePlugin({
-    name: "richerCider",
-    description: "Enhances Cider (More details in info button) by adding the \"Listening to\" type prefix to the user's rich presence when an applicable ID is found.",
-    authors: [{
-        id: 191621342473224192n,
-        name: "cryptofyre",
-    }],
-    patches: [
-        {
-            find: '.displayName="LocalActivityStore"',
-            replacement: {
-                match: /LOCAL_ACTIVITY_UPDATE:function\((\i)\)\{/,
-                replace: "$&$self.patchActivity($1.activity);",
-            }
-        }
-    ],
-    settingsAboutComponent: () => (
-        <>
-            <Forms.FormTitle tag="h3">Install Cider to use this Plugin</Forms.FormTitle>
-            <Forms.FormText>
-                <Link href="https://cider.sh">Follow the link to our website</Link> to get Cider up and running, and then enable the plugin.
-            </Forms.FormText>
-            <br></br>
-            <Forms.FormTitle tag="h3">What is Cider?</Forms.FormTitle>
-            <Forms.FormText>
-                Cider is an open-source and community oriented Apple Music client for Windows, macOS, and Linux.
-            </Forms.FormText>
-            <br></br>
-            <Forms.FormTitle tag="h3">Recommended Optional Plugins</Forms.FormTitle>
-            <Forms.FormText>
-                I'd recommend using TimeBarAllActivities alongside this plugin to give off a much better visual to the eye (Keep in mind this only affects your client and will not show for other users)
-            </Forms.FormText>
-        </>
-    ),
-    patchActivity(activity: any) {
-        if (appIds.includes(activity.application_id)) {
-            activity.type = 2; /* LISTENING type */
-        }
-    },
-});
diff --git a/src/plugins/viewIcons.tsx b/src/plugins/viewIcons.tsx
index 26f29029d..7d56538ce 100644
--- a/src/plugins/viewIcons.tsx
+++ b/src/plugins/viewIcons.tsx
@@ -19,7 +19,7 @@
 import { Devs } from "@utils/constants";
 import { LazyComponent } from "@utils/misc";
 import { ModalRoot, ModalSize, openModal } from "@utils/modal";
-import { PluginDef } from "@utils/types";
+import definePlugin from "@utils/types";
 import { find, findByCode, findByPropsLazy } from "@webpack";
 import { Menu } from "@webpack/common";
 import type { Guild } from "discord-types/general";
@@ -30,12 +30,12 @@ const MaskedLink = LazyComponent(() => find(m => m.type?.toString().includes("MA
 const GuildBannerStore = findByPropsLazy("getGuildBannerURL");
 
 const OPEN_URL = "Vencord.Plugins.plugins.ViewIcons.openImage(";
-export default new class ViewIcons implements PluginDef {
-    name = "ViewIcons";
-    authors = [Devs.Ven];
-    description = "Makes Avatars/Banners in user profiles clickable, and adds Guild Context Menu Entries to View Banner/Icon.";
+export default definePlugin({
+    name: "ViewIcons",
+    authors: [Devs.Ven],
+    description: "Makes Avatars/Banners in user profiles clickable, and adds Guild Context Menu Entries to View Banner/Icon.",
 
-    dependencies = ["MenuItemDeobfuscatorAPI"];
+    dependencies: ["MenuItemDeobfuscatorAPI"],
 
     openImage(url: string) {
         const u = new URL(url);
@@ -52,9 +52,9 @@ export default new class ViewIcons implements PluginDef {
                 />
             </ModalRoot>
         ));
-    }
+    },
 
-    patches = [
+    patches: [
         {
             find: "onAddFriend:",
             replacement: {
@@ -83,7 +83,7 @@ export default new class ViewIcons implements PluginDef {
                 }
             ]
         }
-    ];
+    ],
 
     buildGuildContextMenuEntries(guild: Guild) {
         return (
@@ -107,4 +107,4 @@ export default new class ViewIcons implements PluginDef {
             </Menu.MenuGroup>
         );
     }
-};
+});

From 7923a790e6c90847337d888bb906ab8222193248 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 23 Mar 2023 02:11:28 -0300
Subject: [PATCH 054/147] Fix MessagePopoverAPI and any error Fake Nitro client
 theme bypass might have (#665)

---
 src/plugins/apiMessagePopover.ts |  6 +--
 src/plugins/fakeNitro.ts         | 79 +++++++++++++++++++++-----------
 2 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/src/plugins/apiMessagePopover.ts b/src/plugins/apiMessagePopover.ts
index 0463c5912..a17cac315 100644
--- a/src/plugins/apiMessagePopover.ts
+++ b/src/plugins/apiMessagePopover.ts
@@ -27,11 +27,11 @@ export default definePlugin({
         find: "Messages.MESSAGE_UTILITIES_A11Y_LABEL",
         replacement: {
             // foo && !bar ? createElement(blah,...makeElement(addReactionData))
-            match: /(\i&&!\i)\?\(0,\i\.jsxs?\)\(.{0,200}renderPopout:.{0,300}?(\i)\(.{3,20}\{key:"add-reaction".+?\}/,
-            replace: (m, bools, makeElement) => {
+            match: /\i&&!\i\?\(0,\i\.jsxs?\)\(.{0,200}renderPopout:.{0,300}?(\i)\(.{3,20}\{key:"add-reaction".+?\}/,
+            replace: (m, makeElement) => {
                 const msg = m.match(/message:(.{1,3}),/)?.[1];
                 if (!msg) throw new Error("Could not find message variable");
-                return `...(${bools}?Vencord.Api.MessagePopover._buildPopoverElements(${msg},${makeElement}):[]),${m}`;
+                return `...Vencord.Api.MessagePopover._buildPopoverElements(${msg},${makeElement}),${m}`;
             }
         }
     }],
diff --git a/src/plugins/fakeNitro.ts b/src/plugins/fakeNitro.ts
index e49dda1a4..71757b579 100644
--- a/src/plugins/fakeNitro.ts
+++ b/src/plugins/fakeNitro.ts
@@ -21,6 +21,7 @@ import { migratePluginSettings, Settings } from "@api/settings";
 import { Devs } from "@utils/constants";
 import { ApngDisposeOp, getGifEncoder, importApngJs } from "@utils/dependencies";
 import { getCurrentGuild } from "@utils/discord";
+import { proxyLazy } from "@utils/proxyLazy";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
 import { ChannelStore, FluxDispatcher, PermissionStore, UserStore } from "@webpack/common";
@@ -28,7 +29,21 @@ import { ChannelStore, FluxDispatcher, PermissionStore, UserStore } from "@webpa
 const DRAFT_TYPE = 0;
 const promptToUpload = findByCodeLazy("UPLOAD_FILE_LIMIT_ERROR");
 const UserSettingsProtoStore = findStoreLazy("UserSettingsProtoStore");
-const ProtoPreloadedUserSettings = findLazy(m => m.typeName === "discord_protos.discord_users.v1.PreloadedUserSettings");
+const PreloadedUserSettingsProtoHandler = findLazy(m => m.ProtoClass?.typeName === "discord_protos.discord_users.v1.PreloadedUserSettings");
+const ReaderFactory = findByPropsLazy("readerFactory");
+
+function searchProtoClass(localName: string, parentProtoClass: any) {
+    if (!parentProtoClass) return;
+
+    const field = parentProtoClass.fields.find(field => field.localName === localName);
+    if (!field) return;
+
+    const getter: any = Object.values(field).find(value => typeof value === "function");
+    return getter?.();
+}
+
+const AppearanceSettingsProto = proxyLazy(() => searchProtoClass("appearance", PreloadedUserSettingsProtoHandler.ProtoClass));
+const ClientThemeSettingsProto = proxyLazy(() => searchProtoClass("clientThemeSettings", AppearanceSettingsProto));
 
 const USE_EXTERNAL_EMOJIS = 1n << 18n;
 const USE_EXTERNAL_STICKERS = 1n << 37n;
@@ -167,8 +182,8 @@ export default definePlugin({
         {
             find: "updateTheme:function",
             replacement: {
-                match: /(function \i\(\i\){var (\i)=\i\.backgroundGradientPresetId.+?)\i\.\i\.updateAsync.+?theme=(.+?);.+?\),\i\)/,
-                replace: (_, rest, backgroundGradientPresetId, theme) => `${rest}$self.handleGradientThemeSelect(${backgroundGradientPresetId},${theme});`
+                match: /(function \i\(\i\){var (\i)=\i\.backgroundGradientPresetId.+?)(\i\.\i\.updateAsync.+?theme=(.+?);.+?\),\i\))/,
+                replace: (_, rest, backgroundGradientPresetId, originalCall, theme) => `${rest}$self.handleGradientThemeSelect(${backgroundGradientPresetId},${theme},()=>${originalCall});`
             }
         }
     ],
@@ -219,48 +234,56 @@ export default definePlugin({
     },
 
     handleProtoChange(proto: any, user: any) {
-        const premiumType: number = user?.premium_type ?? UserStore.getCurrentUser()?.premiumType ?? 0;
+        if ((!proto.appearance && !AppearanceSettingsProto) || !UserSettingsProtoStore) return;
 
-        if (premiumType === 0) {
-            const appearanceDummyProto = ProtoPreloadedUserSettings.create({
-                appearance: {}
-            });
+        const premiumType: number = user?.premium_type ?? UserStore?.getCurrentUser()?.premiumType ?? 0;
 
-            proto.appearance ??= appearanceDummyProto.appearance;
+        if (premiumType !== 2) {
+            proto.appearance ??= AppearanceSettingsProto.create();
 
             if (UserSettingsProtoStore.settings.appearance?.theme != null) {
                 proto.appearance.theme = UserSettingsProtoStore.settings.appearance.theme;
             }
 
-            if (UserSettingsProtoStore.settings.appearance?.clientThemeSettings?.backgroundGradientPresetId?.value != null) {
-                const clientThemeSettingsDummyProto = ProtoPreloadedUserSettings.create({
-                    appearance: {
-                        clientThemeSettings: {
-                            backgroundGradientPresetId: {
-                                value: UserSettingsProtoStore.settings.appearance.clientThemeSettings.backgroundGradientPresetId.value
-                            }
-                        }
+            if (UserSettingsProtoStore.settings.appearance?.clientThemeSettings?.backgroundGradientPresetId?.value != null && ClientThemeSettingsProto) {
+                const clientThemeSettingsDummyProto = ClientThemeSettingsProto.create({
+                    backgroundGradientPresetId: {
+                        value: UserSettingsProtoStore.settings.appearance.clientThemeSettings.backgroundGradientPresetId.value
                     }
                 });
 
-                proto.appearance.clientThemeSettings ??= clientThemeSettingsDummyProto.appearance.clientThemeSettings;
-                proto.appearance.clientThemeSettings.backgroundGradientPresetId = clientThemeSettingsDummyProto.appearance.clientThemeSettings.backgroundGradientPresetId;
+                proto.appearance.clientThemeSettings ??= clientThemeSettingsDummyProto;
+                proto.appearance.clientThemeSettings.backgroundGradientPresetId = clientThemeSettingsDummyProto.backgroundGradientPresetId;
             }
         }
     },
 
-    handleGradientThemeSelect(backgroundGradientPresetId: number | undefined, theme: number) {
-        const proto = ProtoPreloadedUserSettings.create({
-            appearance: {
-                theme,
-                clientThemeSettings: {
-                    backgroundGradientPresetId: backgroundGradientPresetId != null ? {
-                        value: backgroundGradientPresetId
-                    } : void 0
-                }
+    handleGradientThemeSelect(backgroundGradientPresetId: number | undefined, theme: number, original: () => void) {
+        const premiumType = UserStore?.getCurrentUser()?.premiumType ?? 0;
+        if (premiumType === 2 || backgroundGradientPresetId == null) return original();
+
+        if (!AppearanceSettingsProto || !ClientThemeSettingsProto || !ReaderFactory) return;
+
+        const currentAppearanceProto = PreloadedUserSettingsProtoHandler.getCurrentValue().appearance;
+
+        const newAppearanceProto = currentAppearanceProto != null
+            ? AppearanceSettingsProto.fromBinary(AppearanceSettingsProto.toBinary(currentAppearanceProto), ReaderFactory)
+            : AppearanceSettingsProto.create();
+
+        newAppearanceProto.theme = theme;
+
+        const clientThemeSettingsDummyProto = ClientThemeSettingsProto.create({
+            backgroundGradientPresetId: {
+                value: backgroundGradientPresetId
             }
         });
 
+        newAppearanceProto.clientThemeSettings ??= clientThemeSettingsDummyProto;
+        newAppearanceProto.clientThemeSettings.backgroundGradientPresetId = clientThemeSettingsDummyProto.backgroundGradientPresetId;
+
+        const proto = PreloadedUserSettingsProtoHandler.ProtoClass.create();
+        proto.appearance = newAppearanceProto;
+
         FluxDispatcher.dispatch({
             type: "USER_SETTINGS_PROTO_UPDATE",
             local: true,

From 082ac62edaa9eabf56b6e84e0b06bae64dc9844c Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 23 Mar 2023 07:45:39 -0300
Subject: [PATCH 055/147] feat(FakeNitro): Transform fake emojis into real ones
 (#669)

---
 src/plugins/{fakeNitro.ts => fakeNitro.tsx} | 69 +++++++++++++++++++++
 1 file changed, 69 insertions(+)
 rename src/plugins/{fakeNitro.ts => fakeNitro.tsx} (87%)

diff --git a/src/plugins/fakeNitro.ts b/src/plugins/fakeNitro.tsx
similarity index 87%
rename from src/plugins/fakeNitro.ts
rename to src/plugins/fakeNitro.tsx
index 71757b579..5e8c38197 100644
--- a/src/plugins/fakeNitro.ts
+++ b/src/plugins/fakeNitro.tsx
@@ -185,6 +185,36 @@ export default definePlugin({
                 match: /(function \i\(\i\){var (\i)=\i\.backgroundGradientPresetId.+?)(\i\.\i\.updateAsync.+?theme=(.+?);.+?\),\i\))/,
                 replace: (_, rest, backgroundGradientPresetId, originalCall, theme) => `${rest}$self.handleGradientThemeSelect(${backgroundGradientPresetId},${theme},()=>${originalCall});`
             }
+        },
+        {
+            find: 'jumboable?"jumbo":"default"',
+            predicate: () => Settings.plugins.FakeNitro.transformEmojis === true,
+            replacement: {
+                match: /jumboable\?"jumbo":"default",emojiId.+?}}\)},(?<=(\i)=function\(\i\){var \i=\i\.node.+?)/,
+                replace: (m, component) => `${m}fakeNitroEmojiComponentExport=($self.EmojiComponent=${component},void 0),`
+            }
+        },
+        {
+            find: '["strong","em","u","text","inlineCode","s","spoiler"]',
+            predicate: () => Settings.plugins.FakeNitro.transformEmojis === true,
+            replacement: [
+                {
+                    match: /1!==(\i)\.length\|\|1!==\i\.length/,
+                    replace: (m, content) => `${m}||${content}[0].target?.startsWith("https://cdn.discordapp.com/emojis/")`
+                },
+                {
+                    match: /(?=return{hasSpoilerEmbeds:\i,content:(\i)})/,
+                    replace: (_, content) => `${content}=$self.patchFakeNitroEmojis(${content});`
+                }
+            ]
+        },
+        {
+            find: "renderEmbeds=function",
+            predicate: () => Settings.plugins.FakeNitro.transformEmojis === true,
+            replacement: {
+                match: /renderEmbeds=function\(\i\){.+?embeds\.map\(\(function\((\i)\){/,
+                replace: (m, embed) => `${m}if(${embed}.url?.startsWith("https://cdn.discordapp.com/emojis/"))return null;`
+            }
         }
     ],
 
@@ -201,6 +231,12 @@ export default definePlugin({
             default: 48,
             markers: [32, 48, 64, 128, 160, 256, 512],
         },
+        transformEmojis: {
+            description: "Whether to transform fake emojis into real ones",
+            type: OptionType.BOOLEAN,
+            default: true,
+            restartNeeded: true,
+        },
         enableStickerBypass: {
             description: "Allow sending fake stickers",
             type: OptionType.BOOLEAN,
@@ -295,6 +331,39 @@ export default definePlugin({
         });
     },
 
+    EmojiComponent: null as any,
+
+    patchFakeNitroEmojis(content: Array<any>) {
+        if (!this.EmojiComponent) return content;
+
+        const newContent: Array<any> = [];
+
+        for (const element of content) {
+            if (element.props?.trusted == null) {
+                newContent.push(element);
+                continue;
+            }
+
+            const fakeNitroMatch = element.props.href.match(/https:\/\/cdn\.discordapp\.com\/emojis\/(\d+?)\.(png|webp|gif).+?(?=\s|$)/);
+            if (!fakeNitroMatch) {
+                newContent.push(element);
+                continue;
+            }
+
+            newContent.push((
+                <this.EmojiComponent node={{
+                    type: "customEmoji",
+                    jumboable: content.length === 1,
+                    animated: fakeNitroMatch[2] === "gif",
+                    name: ":FakeNitroEmoji:",
+                    emojiId: fakeNitroMatch[1]
+                }} />
+            ));
+        }
+
+        return newContent;
+    },
+
     hasPermissionToUseExternalEmojis(channelId: string) {
         const channel = ChannelStore.getChannel(channelId);
 

From 8d8cedd72cf8eebd456dd0ea4d78ed022cb133e8 Mon Sep 17 00:00:00 2001
From: Ven <vendicated@riseup.net>
Date: Fri, 24 Mar 2023 03:42:38 +0100
Subject: [PATCH 056/147] Also add Emote Cloner to Emote picker rightclick menu
 (#664)

---
 src/api/ContextMenu.ts      |   2 +
 src/plugins/emoteCloner.tsx | 105 ++++++++++++++++++------------------
 2 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/src/api/ContextMenu.ts b/src/api/ContextMenu.ts
index 3f73a41ea..16f9f32b5 100644
--- a/src/api/ContextMenu.ts
+++ b/src/api/ContextMenu.ts
@@ -122,6 +122,8 @@ export function _patchContextMenu(props: ContextMenuProps) {
     props.contextMenuApiArguments ??= [];
     const contextMenuPatches = navPatches.get(props.navId);
 
+    if (!Array.isArray(props.children)) props.children = [props.children];
+
     if (contextMenuPatches) {
         for (const patch of contextMenuPatches) {
             try {
diff --git a/src/plugins/emoteCloner.tsx b/src/plugins/emoteCloner.tsx
index afbb3987d..3bcc69446 100644
--- a/src/plugins/emoteCloner.tsx
+++ b/src/plugins/emoteCloner.tsx
@@ -17,7 +17,6 @@
 */
 
 import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
-import { migratePluginSettings } from "@api/settings";
 import { CheckedTextInput } from "@components/CheckedTextInput";
 import { Devs } from "@utils/constants";
 import Logger from "@utils/Logger";
@@ -176,74 +175,78 @@ function CloneModal({ id, name: emojiName, isAnimated }: { id: string; name: str
     );
 }
 
+function buildMenuItem(id: string, name: string, isAnimated: boolean) {
+    return (
+        <Menu.MenuItem
+            id="emote-cloner"
+            key="emote-cloner"
+            label="Clone Emote"
+            action={() =>
+                openModal(modalProps => (
+                    <ModalRoot {...modalProps}>
+                        <ModalHeader>
+                            <img
+                                role="presentation"
+                                aria-hidden
+                                src={`${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/emojis/${id}.${isAnimated ? "gif" : "png"}`}
+                                alt=""
+                                height={24}
+                                width={24}
+                                style={{ marginRight: "0.5em" }}
+                            />
+                            <Forms.FormText>Clone {name}</Forms.FormText>
+                        </ModalHeader>
+                        <ModalContent>
+                            <CloneModal id={id} name={name} isAnimated={isAnimated} />
+                        </ModalContent>
+                    </ModalRoot>
+                ))
+            }
+        />
+    );
+}
+
+function isGifUrl(url: string) {
+    return new URL(url).pathname.endsWith(".gif");
+}
+
 const messageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => {
-    if (!props) return;
-    const { favoriteableId, emoteClonerDataAlt, itemHref, itemSrc, favoriteableType } = props;
+    const { favoriteableId, itemHref, itemSrc, favoriteableType } = props ?? {};
 
-    if (!emoteClonerDataAlt || favoriteableType !== "emoji") return;
+    if (!favoriteableId || favoriteableType !== "emoji") return;
 
-    const name = emoteClonerDataAlt.match(/:(.*)(?:~\d+)?:/)?.[1];
-    if (!name || !favoriteableId) return;
-
-    const src = itemHref ?? itemSrc;
-    const isAnimated = new URL(src).pathname.endsWith(".gif");
+    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 group = findGroupChildrenByChildId("copy-link", children);
-    if (group && !group.some(child => child?.props?.id === "emote-cloner")) {
-        group.push((
-            <Menu.MenuItem
-                id="emote-cloner"
-                key="emote-cloner"
-                label="Clone"
-                action={() =>
-                    openModal(modalProps => (
-                        <ModalRoot {...modalProps}>
-                            <ModalHeader>
-                                <img
-                                    role="presentation"
-                                    aria-hidden
-                                    src={`${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/emojis/${favoriteableId}.${isAnimated ? "gif" : "png"}`}
-                                    alt=""
-                                    height={24}
-                                    width={24}
-                                    style={{ marginRight: "0.5em" }}
-                                />
-                                <Forms.FormText>Clone {name}</Forms.FormText>
-                            </ModalHeader>
-                            <ModalContent>
-                                <CloneModal id={favoriteableId} name={name} isAnimated={isAnimated} />
-                            </ModalContent>
-                        </ModalRoot>
-                    ))
-                }
-            >
-            </Menu.MenuItem>
-        ));
-    }
+    if (group && !group.some(child => child?.props?.id === "emote-cloner"))
+        group.push(buildMenuItem(favoriteableId, name, isGifUrl(itemHref ?? itemSrc)));
+};
+
+const expressionPickerPatch: NavContextMenuPatchCallback = (children, props: { target: HTMLElement; }) => {
+    const { id, name, type } = props?.target?.dataset ?? {};
+    if (!id || !name || type !== "emoji") return;
+
+    const firstChild = props.target.firstChild as HTMLImageElement;
+
+    if (!children.some(c => c?.props?.id === "emote-cloner"))
+        children.push(buildMenuItem(id, name, firstChild && isGifUrl(firstChild.src)));
 };
 
-migratePluginSettings("EmoteCloner", "EmoteYoink");
 export default definePlugin({
     name: "EmoteCloner",
     description: "Adds a Clone context menu item to emotes to clone them your own server",
     authors: [Devs.Ven, Devs.Nuckyz],
     dependencies: ["MenuItemDeobfuscatorAPI", "ContextMenuAPI"],
 
-    patches: [
-        {
-            find: ".Messages.MESSAGE_ACTIONS_MENU_LABEL",
-            replacement: {
-                match: /favoriteableType:\i,(?<=(\i)\.getAttribute\("data-type"\).+?)/,
-                replace: (m, target) => `${m}emoteClonerDataAlt:${target}.alt,`
-            }
-        }
-    ],
-
     start() {
         addContextMenuPatch("message", messageContextMenuPatch);
+        addContextMenuPatch("expression-picker", expressionPickerPatch);
     },
 
     stop() {
         removeContextMenuPatch("message", messageContextMenuPatch);
+        removeContextMenuPatch("expression-picker", expressionPickerPatch);
     }
 });

From 644c5c4faa95c4979b15b6b89bcbe4f61876db8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90=E1=BB=97=20V=C4=83n=20Ho=C3=A0i=20Tu=C3=A2n?=
 <htuan03@gmail.com>
Date: Fri, 24 Mar 2023 17:42:18 -0700
Subject: [PATCH 057/147] Make Vencord title look consistent with Discord
 (#685)

closes (#649)
---
 src/components/VencordSettings/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VencordSettings/index.tsx b/src/components/VencordSettings/index.tsx
index 6c946a11a..0171979fe 100644
--- a/src/components/VencordSettings/index.tsx
+++ b/src/components/VencordSettings/index.tsx
@@ -59,7 +59,7 @@ function Settings(props: SettingsProps) {
     const CurrentTab = SettingsTabs[tab]?.component;
 
     return <Forms.FormSection>
-        <Text variant="heading-md/normal" tag="h2">Vencord Settings</Text>
+        <Text variant="heading-lg/semibold" style={{ color: "var(--header-primary)" }} tag="h2">Vencord Settings</Text>
 
         <TabBar
             type="top"

From e143260891e25bc133ab5e2f94b5831bdf63f3dc Mon Sep 17 00:00:00 2001
From: Ven <vendicated@riseup.net>
Date: Sat, 25 Mar 2023 01:55:40 +0100
Subject: [PATCH 058/147] MessageLogger: Add context menu entry to remove
 history (#693)

---
 src/plugins/messageLogger/index.tsx | 51 +++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index e13da353b..e33739300 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -18,6 +18,7 @@
 
 import "./messageLogger.css";
 
+import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
 import { Settings } from "@api/settings";
 import { disableStyle, enableStyle } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
@@ -25,7 +26,7 @@ import { Devs } from "@utils/constants";
 import Logger from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy, findLazy } from "@webpack";
-import { moment, Parser, Timestamp, UserStore } from "@webpack/common";
+import { FluxDispatcher, Menu, moment, Parser, Timestamp, UserStore } from "@webpack/common";
 
 import overlayStyle from "./deleteStyleOverlay.css?managed";
 import textStyle from "./deleteStyleText.css?managed";
@@ -43,20 +44,48 @@ function addDeleteStyle() {
     }
 }
 
+const MENU_ITEM_ID = "message-logger-remove-history";
+const patchMessageContextMenu: NavContextMenuPatchCallback = (children, props) => {
+    const { message } = props;
+    const { deleted, editHistory, id, channel_id } = message;
+
+    if (!deleted && !editHistory?.length) return;
+    if (children.some(c => c?.props?.id === MENU_ITEM_ID)) return;
+
+    children.push((
+        <Menu.MenuItem
+            id={MENU_ITEM_ID}
+            key={MENU_ITEM_ID}
+            label="Remove Message History"
+            action={() => {
+                if (message.deleted) {
+                    FluxDispatcher.dispatch({
+                        type: "MESSAGE_DELETE",
+                        channelId: channel_id,
+                        id,
+                        mlDeleted: true
+                    });
+                } else {
+                    message.editHistory = [];
+                }
+            }}
+        />
+    ));
+};
+
 export default definePlugin({
     name: "MessageLogger",
     description: "Temporarily logs deleted and edited messages.",
     authors: [Devs.rushii, Devs.Ven],
+    dependencies: ["ContextMenuAPI", "MenuItemDeobfuscatorAPI"],
 
     start() {
         addDeleteStyle();
+        addContextMenuPatch("message", patchMessageContextMenu);
     },
 
     stop() {
-        document.querySelectorAll(".messagelogger-deleted").forEach(e => e.remove());
-        document.querySelectorAll(".messagelogger-edited").forEach(e => e.remove());
-        document.body.classList.remove("messagelogger-red-overlay");
-        document.body.classList.remove("messagelogger-red-text");
+        removeContextMenuPatch("message", patchMessageContextMenu);
     },
 
     renderEdit(edit: { timestamp: any, content: string; }) {
@@ -106,7 +135,7 @@ export default definePlugin({
         }
     },
 
-    handleDelete(cache: any, data: { ids: string[], id: string; }, isBulk: boolean) {
+    handleDelete(cache: any, data: { ids: string[], id: string; mlDeleted?: boolean; }, isBulk: boolean) {
         try {
             if (cache == null || (!isBulk && !cache.has(data.id))) return cache;
 
@@ -118,7 +147,8 @@ export default definePlugin({
                 if (!msg) return;
 
                 const EPHEMERAL = 64;
-                const shouldIgnore = (msg.flags & EPHEMERAL) === EPHEMERAL ||
+                const shouldIgnore = data.mlDeleted ||
+                    (msg.flags & EPHEMERAL) === EPHEMERAL ||
                     ignoreBots && msg.author?.bot ||
                     ignoreSelf && msg.author?.id === myId;
 
@@ -271,15 +301,10 @@ export default definePlugin({
             // Module 748241
             find: "Message must not be a thread starter message",
             replacement: [
-                {
-                    // Write message.deleted to deleted var
-                    match: /var (\w)=(\w).id,(?=\w=\w.message)/,
-                    replace: "var $1=$2.id,deleted=$2.message.deleted,"
-                },
                 {
                     // Append messagelogger-deleted to classNames if deleted
                     match: /\)\("li",\{(.+?),className:/,
-                    replace: ")(\"li\",{$1,className:(deleted ? \"messagelogger-deleted \" : \"\")+"
+                    replace: ")(\"li\",{$1,className:(arguments[0].message.deleted ? \"messagelogger-deleted \" : \"\")+"
                 }
             ]
         },

From b90392576e81fe2d0e665039ec832d47dc6a731c Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Sat, 25 Mar 2023 01:30:24 +0000
Subject: [PATCH 059/147] PronounDB: Add support for compact mode & clean up
 (#604)

---
 .../components/PronounsChatComponent.tsx      | 50 ++++++++++++++-----
 .../components/PronounsProfileWrapper.tsx     | 20 ++++----
 src/plugins/pronoundb/index.ts                | 35 ++++++++++---
 src/plugins/pronoundb/pronoundbUtils.ts       | 14 ++++++
 src/plugins/pronoundb/styles.css              |  9 ++++
 src/utils/constants.ts                        |  4 ++
 6 files changed, 102 insertions(+), 30 deletions(-)
 create mode 100644 src/plugins/pronoundb/styles.css

diff --git a/src/plugins/pronoundb/components/PronounsChatComponent.tsx b/src/plugins/pronoundb/components/PronounsChatComponent.tsx
index ce67754e4..70a2bf3b0 100644
--- a/src/plugins/pronoundb/components/PronounsChatComponent.tsx
+++ b/src/plugins/pronoundb/components/PronounsChatComponent.tsx
@@ -17,39 +17,63 @@
 */
 
 import { Settings } from "@api/settings";
-import { classes, useAwaiter } from "@utils/misc";
+import { classes } from "@utils/misc";
 import { findByPropsLazy } from "@webpack";
 import { UserStore } from "@webpack/common";
 import { Message } from "discord-types/general";
 
-import { fetchPronouns, formatPronouns } from "../pronoundbUtils";
-import { PronounMapping } from "../types";
+import { awaitAndFormatPronouns } from "../pronoundbUtils";
 
 const styles: Record<string, string> = findByPropsLazy("timestampInline");
 
-export default function PronounsChatComponentWrapper({ message }: { message: Message; }) {
+function shouldShow(message: Message): boolean {
+    // Respect showInMessages
+    if (!Settings.plugins.PronounDB.showInMessages)
+        return false;
     // Don't bother fetching bot or system users
     if (message.author.bot || message.author.system)
-        return null;
+        return false;
     // Respect showSelf options
     if (!Settings.plugins.PronounDB.showSelf && message.author.id === UserStore.getCurrentUser().id)
+        return false;
+
+    return true;
+}
+
+export function PronounsChatComponentWrapper({ message }: { message: Message; }) {
+    if (!shouldShow(message))
         return null;
 
     return <PronounsChatComponent message={message} />;
 }
 
-function PronounsChatComponent({ message }: { message: Message; }) {
-    const [result, , isPending] = useAwaiter(() => fetchPronouns(message.author.id), {
-        fallbackValue: null,
-        onError: e => console.error("Fetching pronouns failed: ", e)
-    });
+export function CompactPronounsChatComponentWrapper({ message }: { message: Message; }) {
+    if (!shouldShow(message))
+        return null;
 
-    // If the promise completed, the result was not "unspecified", and there is a mapping for the code, then return a span with the pronouns
-    if (!isPending && result && result !== "unspecified" && PronounMapping[result]) {
+    return <CompactPronounsChatComponent message={message} />;
+}
+
+function PronounsChatComponent({ message }: { message: Message; }) {
+    const result = awaitAndFormatPronouns(message.author.id);
+    if (result != null) {
         return (
             <span
                 className={classes(styles.timestampInline, styles.timestamp)}
-            >• {formatPronouns(result)}</span>
+            >• {result}</span>
+        );
+    }
+
+    return null;
+}
+
+export function CompactPronounsChatComponent({ message }: { message: Message; }) {
+    const result = awaitAndFormatPronouns(message.author.id);
+    if (result != null) {
+        return (
+            <span
+                className={classes(styles.timestampInline, styles.timestamp, "vc-pronoundb-compact")}
+            >• {result}</span>
         );
     }
 
diff --git a/src/plugins/pronoundb/components/PronounsProfileWrapper.tsx b/src/plugins/pronoundb/components/PronounsProfileWrapper.tsx
index 79fce23a1..34cfab5a5 100644
--- a/src/plugins/pronoundb/components/PronounsProfileWrapper.tsx
+++ b/src/plugins/pronoundb/components/PronounsProfileWrapper.tsx
@@ -17,16 +17,19 @@
 */
 
 import { Settings } from "@api/settings";
-import { useAwaiter } from "@utils/misc";
 import { UserStore } from "@webpack/common";
 
-import { fetchPronouns, formatPronouns } from "../pronoundbUtils";
-import { PronounMapping, UserProfilePronounsProps, UserProfileProps } from "../types";
+import { awaitAndFormatPronouns } from "../pronoundbUtils";
+import { UserProfilePronounsProps, UserProfileProps } from "../types";
 
 export default function PronounsProfileWrapper(PronounsComponent: React.ElementType<UserProfilePronounsProps>, props: UserProfilePronounsProps, profileProps: UserProfileProps) {
     const user = UserStore.getUser(profileProps.userId) ?? {};
+    // Respect showInProfile
+    if (!Settings.plugins.PronounDB.showInProfile)
+        return null;
     // Don't bother fetching bot or system users
-    if (user.bot || user.system) return null;
+    if (user.bot || user.system)
+        return null;
     // Respect showSelf options
     if (!Settings.plugins.PronounDB.showSelf && user.id === UserStore.getCurrentUser().id)
         return null;
@@ -45,15 +48,12 @@ function ProfilePronouns(
         leProps: UserProfilePronounsProps;
     }
 ) {
-    const [result, , isPending] = useAwaiter(() => fetchPronouns(userId), {
-        fallbackValue: null,
-        onError: e => console.error("Fetching pronouns failed: ", e),
-    });
+    const result = awaitAndFormatPronouns(userId);
 
     // If the promise completed, the result was not "unspecified", and there is a mapping for the code, then render
-    if (!isPending && result && result !== "unspecified" && PronounMapping[result]) {
+    if (result != null) {
         // First child is the header, second is a div with the actual text
-        leProps.currentPronouns ||= formatPronouns(result);
+        leProps.currentPronouns ||= result;
         return <Component {...leProps} />;
     }
 
diff --git a/src/plugins/pronoundb/index.ts b/src/plugins/pronoundb/index.ts
index 820b66eca..55871912c 100644
--- a/src/plugins/pronoundb/index.ts
+++ b/src/plugins/pronoundb/index.ts
@@ -16,11 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import "./styles.css";
+
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 
 import PronounsAboutComponent from "./components/PronounsAboutComponent";
-import PronounsChatComponent from "./components/PronounsChatComponent";
+import { CompactPronounsChatComponentWrapper, PronounsChatComponentWrapper } from "./components/PronounsChatComponent";
 import PronounsProfileWrapper from "./components/PronounsProfileWrapper";
 
 export enum PronounsFormat {
@@ -30,22 +32,30 @@ export enum PronounsFormat {
 
 export default definePlugin({
     name: "PronounDB",
-    authors: [Devs.Tyman],
+    authors: [Devs.Tyman, Devs.TheKodeToad],
     description: "Adds pronouns to user messages using pronoundb",
     patches: [
-        // Patch the chat timestamp element
+        // Add next to username (compact mode)
         {
             find: "showCommunicationDisabledStyles",
             replacement: {
-                match: /(?<=return\s*\(0,\w{1,3}\.jsxs?\)\(.+!\w{1,3}&&)(\(0,\w{1,3}.jsxs?\)\(.+?\{.+?\}\))/,
-                replace: "[$1, $self.PronounsChatComponent(e)]"
+                match: /("span",{id:\i,className:\i,children:\i}\))/,
+                replace: "$1, $self.CompactPronounsChatComponentWrapper(e)"
+            }
+        },
+        // Patch the chat timestamp element (normal mode)
+        {
+            find: "showCommunicationDisabledStyles",
+            replacement: {
+                match: /(?<=return\s*\(0,\i\.jsxs?\)\(.+!\i&&)(\(0,\i.jsxs?\)\(.+?\{.+?\}\))/,
+                replace: "[$1, $self.PronounsChatComponentWrapper(e)]"
             }
         },
         // Hijack the discord pronouns section and add a wrapper around the text section
         {
             find: ".Messages.BOT_PROFILE_SLASH_COMMANDS",
             replacement: {
-                match: /\(0,.\.jsx\)\((?<PronounComponent>.{1,2}\..),(?<pronounProps>{currentPronouns.+?:(?<fullProps>.{1,2})\.pronouns.+?})\)/,
+                match: /\(0,.\.jsx\)\((?<PronounComponent>\i\..),(?<pronounProps>{currentPronouns.+?:(?<fullProps>\i)\.pronouns.+?})\)/,
                 replace: "$<fullProps>&&$self.PronounsProfileWrapper($<PronounComponent>,$<pronounProps>,$<fullProps>)"
             }
         },
@@ -79,10 +89,21 @@ export default definePlugin({
             type: OptionType.BOOLEAN,
             description: "Enable or disable showing pronouns for the current user",
             default: true
+        },
+        showInMessages: {
+            type: OptionType.BOOLEAN,
+            description: "Show in messages",
+            default: true
+        },
+        showInProfile: {
+            type: OptionType.BOOLEAN,
+            description: "Show in profile",
+            default: true
         }
     },
     settingsAboutComponent: PronounsAboutComponent,
     // Re-export the components on the plugin object so it is easily accessible in patches
-    PronounsChatComponent,
+    PronounsChatComponentWrapper,
+    CompactPronounsChatComponentWrapper,
     PronounsProfileWrapper
 });
diff --git a/src/plugins/pronoundb/pronoundbUtils.ts b/src/plugins/pronoundb/pronoundbUtils.ts
index afeea9584..74664315c 100644
--- a/src/plugins/pronoundb/pronoundbUtils.ts
+++ b/src/plugins/pronoundb/pronoundbUtils.ts
@@ -19,6 +19,7 @@
 import { Settings } from "@api/settings";
 import { VENCORD_USER_AGENT } from "@utils/constants";
 import { debounce } from "@utils/debounce";
+import { useAwaiter } from "@utils/misc";
 
 import { PronounsFormat } from ".";
 import { PronounCode, PronounMapping, PronounsResponse } from "./types";
@@ -39,6 +40,19 @@ const bulkFetch = debounce(async () => {
     }
 });
 
+export function awaitAndFormatPronouns(id: string): string | null {
+    const [result, , isPending] = useAwaiter(() => fetchPronouns(id), {
+        fallbackValue: null,
+        onError: e => console.error("Fetching pronouns failed: ", e)
+    });
+
+    // If the promise completed, the result was not "unspecified", and there is a mapping for the code, then return the mappings
+    if (!isPending && result && result !== "unspecified" && PronounMapping[result])
+        return formatPronouns(result);
+
+    return null;
+}
+
 // Fetches the pronouns for one id, returning a promise that resolves if it was cached, or once the request is completed
 export function fetchPronouns(id: string): Promise<PronounCode> {
     return new Promise(res => {
diff --git a/src/plugins/pronoundb/styles.css b/src/plugins/pronoundb/styles.css
new file mode 100644
index 000000000..a7d9eb9e5
--- /dev/null
+++ b/src/plugins/pronoundb/styles.css
@@ -0,0 +1,9 @@
+.vc-pronoundb-compact {
+    display: none;
+}
+
+[class*="compact"] .vc-pronoundb-compact {
+    display: inline-block;
+    margin-left: -2px;
+    margin-right: 0.25rem;
+}
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index d5faa43d9..57fc8164c 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -205,5 +205,9 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     cloudburst: {
         name: "cloudburst",
         id: 892128204150685769n
+    },
+    TheKodeToad: {
+        name: "TheKodeToad",
+        id: 706152404072267788n
     }
 });

From 0b4ae729a3fecf017583fb968b11ab46e584e0ce Mon Sep 17 00:00:00 2001
From: Syncx <47534062+Syncxv@users.noreply.github.com>
Date: Sat, 25 Mar 2023 13:37:29 +1100
Subject: [PATCH 060/147] feat(plugin): SearchReply (#551)

Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/messageLogger/index.tsx      |  5 +-
 src/plugins/searchReply.tsx              | 80 ++++++++++++++++++++++++
 src/utils/constants.ts                   |  4 ++
 src/webpack/common/types/i18nMessages.ts | 24 +++++++
 src/webpack/common/types/utils.d.ts      | 28 +++++++++
 src/webpack/common/utils.ts              |  4 +-
 6 files changed, 141 insertions(+), 4 deletions(-)
 create mode 100644 src/plugins/searchReply.tsx
 create mode 100644 src/webpack/common/types/i18nMessages.ts

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index e33739300..4b4e0e911 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -25,13 +25,12 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import Logger from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findLazy } from "@webpack";
-import { FluxDispatcher, Menu, moment, Parser, Timestamp, UserStore } from "@webpack/common";
+import { findByPropsLazy } from "@webpack";
+import { FluxDispatcher, i18n, Menu, moment, Parser, Timestamp, UserStore } from "@webpack/common";
 
 import overlayStyle from "./deleteStyleOverlay.css?managed";
 import textStyle from "./deleteStyleText.css?managed";
 
-const i18n = findLazy(m => m.Messages?.["en-US"]);
 const styles = findByPropsLazy("edited", "communicationDisabled", "isSystemMessage");
 
 function addDeleteStyle() {
diff --git a/src/plugins/searchReply.tsx b/src/plugins/searchReply.tsx
new file mode 100644
index 000000000..8c7b473da
--- /dev/null
+++ b/src/plugins/searchReply.tsx
@@ -0,0 +1,80 @@
+/*
+ * 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 { Devs } from "@utils/constants";
+import { LazyComponent } from "@utils/misc";
+import definePlugin from "@utils/types";
+import { findByCode, findByCodeLazy } from "@webpack";
+import { ChannelStore, i18n, Menu, SelectedChannelStore } from "@webpack/common";
+import { Message } from "discord-types/general";
+
+const ReplyIcon = LazyComponent(() => findByCode("M10 8.26667V4L3 11.4667L10 18.9333V14.56C15 14.56 18.5 16.2667 21 20C20 14.6667 17 9.33333 10 8.26667Z"));
+
+const replyFn = findByCodeLazy("showMentionToggle", "TEXTAREA_FOCUS", "shiftKey");
+
+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);
+    if (!channel) return;
+
+    // dms and group chats
+    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, (
+            <Menu.MenuItem
+                id="reply"
+                label={i18n.Messages.MESSAGE_ACTION_REPLY}
+                icon={ReplyIcon}
+                action={(e: React.MouseEvent) => replyFn(channel, message, e)}
+            />
+        ));
+    }
+
+    // servers
+    const serverGroup = findGroupChildrenByChildId("mark-unread", children);
+    if (serverGroup && !serverGroup.some(child => child?.props?.id === "reply")) {
+        return serverGroup.unshift((
+            <Menu.MenuItem
+                id="reply"
+                label={i18n.Messages.MESSAGE_ACTION_REPLY}
+                icon={ReplyIcon}
+                action={(e: React.MouseEvent) => replyFn(channel, message, e)}
+            />
+        ));
+    }
+
+};
+
+
+export default definePlugin({
+    name: "SearchReply",
+    description: "Adds a reply button to search results",
+    authors: [Devs.Aria],
+
+    start() {
+        addContextMenuPatch("message", messageContextMenuPatch);
+    },
+
+    stop() {
+        removeContextMenuPatch("message", messageContextMenuPatch);
+    }
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 57fc8164c..4021c811f 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -206,6 +206,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "cloudburst",
         id: 892128204150685769n
     },
+    Aria: {
+        name: "Syncxv",
+        id: 549244932213309442n,
+    },
     TheKodeToad: {
         name: "TheKodeToad",
         id: 706152404072267788n
diff --git a/src/webpack/common/types/i18nMessages.ts b/src/webpack/common/types/i18nMessages.ts
new file mode 100644
index 000000000..fdf677fc0
--- /dev/null
+++ b/src/webpack/common/types/i18nMessages.ts
@@ -0,0 +1,24 @@
+/*
+ * 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 { LiteralUnion } from "type-fest";
+
+export type i18nMessages = LiteralUnion<
+    "TITLE_BAR_CLOSE_WINDOW" | "TITLE_BAR_MAXIMIZE_WINDOW" | "TITLE_BAR_MINIMIZE_WINDOW" | "en-US" | "en-GB" | "zh-CN" | "zh-TW" | "cs" | "da" | "nl" | "fr" | "de" | "el" | "hu" | "it" | "ja" | "ko" | "pl" | "pt-BR" | "ru" | "es-ES" | "sv-SE" | "tr" | "bg" | "uk" | "fi" | "no" | "hr" | "ro" | "lt" | "th" | "vi" | "hi" | "KEYBIND_DESCRIPTION_MODAL_NAVIGATE_SERVERS" | "KEYBIND_DESCRIPTION_MODAL_NAVIGATE_CHANNELS" | "KEYBIND_DESCRIPTION_MODAL_NAVIGATE_BACK_FORWARD" | "KEYBIND_DESCRIPTION_MODAL_UNREAD_CHANNELS" | "KEYBIND_DESCRIPTION_MODAL_UNREAD_MENTION_CHANNELS" | "KEYBIND_DESCRIPTION_MODAL_NAVIGATE_TO_CALL" | "KEYBIND_DESCRIPTION_MODAL_TOGGLE_PREVIOUS_GUILD" | "KEYBIND_DESCRIPTION_MODAL_QUICKSWITCHER" | "KEYBIND_DESCRIPTION_MODAL_CREATE_GUILD" | "DND_OPERATION_LABEL_START" | "DND_OPERATION_LABEL_MOVE" | "DND_OPERATION_LABEL_DROP" | "DND_OPERATION_LABEL_CANCEL" | "KEYBIND_DESCRIPTION_MODAL_MARK_SERVER_READ" | "KEYBIND_DESCRIPTION_MODAL_MARK_CHANNEL_READ" | "KEYBIND_DESCRIPTION_MODAL_CREATE_DM_GROUP" | "KEYBIND_DESCRIPTION_MODAL_TOGGLE_PINS" | "KEYBIND_DESCRIPTION_MODAL_TOGGLE_INBOX" | "KEYBIND_DESCRIPTION_MODAL_MARK_TOP_INBOX_CHANNEL_READ" | "KEYBIND_DESCRIPTION_MODAL_TOGGLE_USERS" | "KEYBIND_DESCRIPTION_MODAL_SEARCH_EMOJIS" | "KEYBIND_DESCRIPTION_MODAL_SEARCH_GIFS" | "KEYBIND_DESCRIPTION_MODAL_SEARCH_STICKERS" | "KEYBIND_DESCRIPTION_MODAL_SCROLL_CHAT" | "KEYBIND_DESCRIPTION_MODAL_JUMP_TO_FIRST_UNREAD" | "KEYBIND_DESCRIPTION_MODAL_FOCUS_TEXT_AREA" | "KEYBIND_DESCRIPTION_MODAL_UPLOAD_FILE" | "KEYBIND_DESCRIPTION_MODAL_TOGGLE_MUTE" | "KEYBIND_DESCRIPTION_MODAL_TOGGLE_DEAFEN" | "KEYBIND_DESCRIPTION_MODAL_CALL_ACCEPT" | "KEYBIND_DESCRIPTION_MODAL_CALL_DECLINE" | "KEYBIND_DESCRIPTION_MODAL_CALL_START" | "KEYBIND_DESCRIPTION_MODAL_TOGGLE_HELP" | "KEYBIND_DESCRIPTION_MODAL_SEARCH" | "KEYBIND_DESCRIPTION_MODAL_EASTER_EGG" | "EDIT_MESSAGE" | "DELETE_MESSAGE" | "PIN_MESSAGE" | "ADD_REACTION" | "MESSAGE_ACTION_REPLY" | "COPY_TEXT" | "MARK_UNREAD" | "GUILDS_BAR_A11Y_LABEL" | "SERVERS" | "NEW" | "ADD_A_SERVER" | "GUILD_DISCOVERY_TOOLTIP" | "ACCOUNT_A11Y_LABEL" | "GUILD_SIDEBAR_A11Y_LABEL" | "UNKNOWN_USER" | "LOADING" | "LOADING_DID_YOU_KNOW" | "CONNECTING_PROBLEMS_CTA" | "TWEET_US" | "SERVER_STATUS" | "NOTIFICATION_CENTER_INCOMING_FRIEND_REQUEST" | "COMMAND_SHRUG_MESSAGE_DESCRIPTION" | "DIRECT_MESSAGES" | "GUILD_TOOLTIP_A11Y_LABEL" | "FAVORITES_GUILD_NAME" | "MEMBER_VERIFICATION_FOLDER_NAME" | "DND_DROP_ABOVE" | "DND_DROP_COMBINE" | "GUILD_FOLDER_TOOLTIP_A11Y_LABEL" | "DND_END_OF_LIST" | "GUILD_SIDEBAR_ACTIONS_BUTTON" | "PREMIUM_GUILD_TIER_3" | "PREMIUM_GUILD_SUBSCRIPTION_SUBSCRIBER_COUNT_TOOLTIP" | "CHANNELS" | "NEW_UNREADS" | "NEW_MENTIONS" | "UNMUTE" | "MUTE" | "DEAFEN" | "SET_STATUS" | "LABEL_WITH_ONLINE_STATUS" | "STATUS_ONLINE" | "USER_SETTINGS" | "CHANNEL_HEADER_BAR_A11Y_LABEL" | "TEXT_CHANNEL" | "UPLOAD_TO" | "UPLOAD_AREA_HELP" | "THREADS" | "NOTIFICATION_SETTINGS" | "PINNED_MESSAGES" | "MEMBER_LIST_SHOWN" | "SEARCH" | "SEARCH_CLEAR" | "INBOX" | "HELP" | "TEXTAREA_PLACEHOLDER" | "TEXTAREA_TEXT_CHANNEL_A11Y_LABEL" | "CHANNEL_A11Y_LABEL" | "CHANNEL_CHAT_HEADING" | "CHANNEL_MESSAGES_A11Y_LABEL" | "CHANNEL_MESSAGES_A11Y_DESCRIPTION" | "CHAT_ATTACH_UPLOAD_A_FILE" | "CHAT_ATTACH_UPLOAD_TEXT_AS_FILE" | "CREATE_THREAD" | "CHAT_ATTACH_USE_SLASH_COMMAND" | "CHAT_ATTACH_UPLOAD_OR_INVITE" | "PREMIUM_GIFT_BUTTON_TOOLTIP" | "PREMIUM_GIFT_BUTTON_LABEL" | "GIF_BUTTON_LABEL" | "STICKER_BUTTON_LABEL" | "SELECT_EMOJI" | "CHARACTER_COUNT_CLOSE_TO_LIMIT" | "MEMBERS_LIST_LANDMARK_LABEL" | "MEMBERS" | "PREMIUM_GUILD_SUBSCRIPTIONS_GOAL" | "PREMIUM_GUILD_TIER_3_SHORT" | "PREMIUM_GUILD_SUBSCRIPTIONS_PROGRESS_BAR_BLURB" | "PREMIUM_GUILD_SUBSCRIPTIONS_PROGRESS_BAR_COMPLETED_BLURB" | "PREMIUM_GUILD_SUBSCRIPTIONS_NUDGE_TOOLTIP_COMPLETE" | "PREMIUM_GUILD_SUBSCRIPTIONS_PROGRESS_BAR_TADA_ICON_ALT_TEXT" | "GUILD_EVENTS" | "GUILD_SIDEBAR_DEFAULT_CHANNEL_A11Y_LABEL" | "CHANNEL_TOOLTIP_TEXT_LIMITED" | "CREATE_INSTANT_INVITE" | "EDIT_CHANNEL" | "CHANNEL_TOOLTIP_TEXT" | "CATEGORY_A11Y_LABEL" | "CREATE_CHANNEL" | "CHANNEL_TOOLTIP_RULES" | "GUILD_SIDEBAR_ANNOUNCEMENT_CHANNEL_A11Y_LABEL" | "CHANNEL_TOOLTIP_ANNOUNCEMENTS" | "GUILD_SIDEBAR_STAGE_CHANNEL_A11Y_LABEL" | "OPEN_CHAT" | "CHANNEL_TOOLTIP_STAGE_LIMITED" | "CHANNEL_TOOLTIP_TEXT_ACTIVE_THREADS" | "THREAD_GROUP_A11Y_LABEL" | "GUILD_SIDEBAR_THREAD_A11Y_LABEL" | "GUILD_SIDEBAR_VOICE_CHANNEL_A11Y_LABEL" | "GUILD_SIDEBAR_CHANNEL_A11Y_LABEL_UNREAD" | "GUILD_SIDEBAR_VOICE_CHANNEL_A11Y_LABEL_USERS" | "CHANNEL_TOOLTIP_VOICE" | "STATUS_UNKNOWN" | "MESSAGE_A11Y_ROLE_DESCRIPTION" | "ROLE_ICON_ALT_TEXT" | "CHANNEL_MESSAGE_REPLY_A11Y_LABEL" | "IMAGE" | "MESSAGE_EDITED" | "MESSAGE_EDITED_TIMESTAMP_A11Y_LABEL" | "EMOJI_TOOLTIP_CLICK_CTA" | "REMOVE_MESSAGE_ATTACHMENT" | "VERIFIED_BOT_TOOLTIP" | "SUPPRESS_ALL_EMBEDS" | "CHANNEL_MEMBERS_A11Y_LABEL" | "GUILD_OWNER" | "PREMIUM_GUILD_SUBSCRIPTION_TOOLTIP" | "STATUS_ONLINE_MOBILE" | "STATUS_IDLE" | "STREAMING" | "LISTENING_TO" | "WATCHING" | "COMPETING" | "PLAYING_GAME" | "STATUS_DND" | "CHAT_ATTACH_INVITE_TO_LISTEN" | "ACTIVITY_PANEL_GO_LIVE_STREAM_GAME" | "SEARCH_ANSWER_HAS_LINK" | "SEARCH_ANSWER_HAS_EMBED" | "SEARCH_ANSWER_HAS_ATTACHMENT" | "SEARCH_ANSWER_HAS_VIDEO" | "SEARCH_ANSWER_HAS_IMAGE" | "SEARCH_ANSWER_HAS_SOUND" | "SEARCH_ANSWER_HAS_STICKER" | "SEARCH_FILTER_FROM" | "SEARCH_FILTER_MENTIONS" | "SEARCH_FILTER_HAS" | "SEARCH_FILTER_FILE_TYPE" | "SEARCH_FILTER_FILE_NAME" | "SEARCH_FILTER_BEFORE" | "SEARCH_FILTER_ON" | "SEARCH_FILTER_DURING" | "SEARCH_FILTER_AFTER" | "SEARCH_FILTER_IN" | "SEARCH_FILTER_PINNED" | "MESSAGE_UTILITIES_A11Y_LABEL" | "EDIT" | "MORE" | "SEARCH_SHORTCUT_TODAY" | "SEARCH_SHORTCUT_YESTERDAY" | "SEARCH_SHORTCUT_WEEK" | "SEARCH_SHORTCUT_MONTH" | "SEARCH_SHORTCUT_YEAR" | "SEARCH_GROUP_HEADER_SEARCH_OPTIONS" | "SEARCH_GROUP_HEADER_HISTORY" | "LEARN_MORE" | "SEARCH_ANSWER_FROM" | "SEARCH_ANSWER_MENTIONS" | "SEARCH_ANSWER_HAS" | "SEARCH_ANSWER_DATE" | "SEARCH_ANSWER_IN" | "SEARCH_ANSWER_BOOLEAN" | "SEARCH_CLEAR_HISTORY" | "SEARCH_FROM_SUGGESTIONS" | "MEMBER_LIST_HIDDEN" | "SEARCH_RESULTS_SECTION_LABEL" | "SEARCH_NEWEST_SHORT" | "SEARCH_OLDEST_SHORT" | "SEARCH_MOST_RELEVANT_SHORT" | "SEARCHING" | "TOTAL_RESULTS" | "JUMP" | "REPLY_QUOTE_MESSAGE_NOT_LOADED" | "COPY_MESSAGE_LINK" | "COPY_ID" | "MESSAGE_ACTIONS_MENU_LABEL" | "ACTIVE_THREADS_POPOUT_HEADER" | "ACTIVE_THREADS_POPOUT_LINK" | "THREAD_BROWSER_TIMESTAMP_MINUTES" | "THREAD_BROWSER_TIMESTAMP_HOURS" | "THREAD_BROWSER_TIMESTAMP_DAYS" | "THREAD_BROWSER_TIMESTAMP_MORE_THAN_MONTH" | "OPEN_CHANNEL_TOPIC" | "VIDEO" | "REPLY_QUOTE_NO_TEXT_CONTENT" | "PLAY" | "NEW_MEMBER_BADGE_TOOLTIP_TEXT" | "USER_SETTINGS_MY_ACCOUNT" | "USER_SETTINGS_PROFILES" | "PRIVACY_AND_SAFETY" | "AUTHORIZED_APPS" | "AUTH_SESSIONS" | "CONNECTIONS" | "CLIPS" | "FRIEND_REQUESTS" | "BILLING_SETTINGS" | "PREMIUM" | "PREMIUM_GUILD_SUBSCRIPTION_TITLE" | "SUBSCRIPTIONS_TITLE" | "GIFT_INVENTORY" | "BILLING" | "APP_SETTINGS" | "APPEARANCE" | "ACCESSIBILITY" | "VOICE_AND_VIDEO" | "POGGERMODE" | "TEXT_AND_IMAGES" | "NOTIFICATIONS" | "KEYBINDS" | "LANGUAGE" | "USER_SETTINGS_WINDOWS_SETTINGS" | "USER_SETTINGS_LINUX_SETTINGS" | "STREAMER_MODE" | "SETTINGS_ADVANCED" | "ACTIVITY_SETTINGS" | "ACTIVITY_PRIVACY" | "REGISTERED_GAMES" | "OVERLAY" | "WHATS_NEW" | "USER_SETTINGS_HYPESQUAD" | "LOGOUT" | "BETA" | "USER_SETTINGS_ACCOUNT_PASSWORD_AND_AUTHENTICATION" | "CHANGE_PASSWORD" | "USER_SETTINGS_EDIT_USER_PROFILE" | "ACTIONS" | "HYPESQUAD_ONLINE_BADGE_TOOLTIP" | "HYPESQUAD_HOUSE_1" | "ACTIVE_DEVELOPER_BADGE_TOOLTIP" | "PROFILE_USER_BADGES" | "USER_SETTINGS_LABEL_USERNAME" | "USER_SETTINGS_ACCOUNT_EDIT_USERNAME_A11Y_LABEL" | "USER_SETTINGS_ACCOUNT_EDIT_EMAIL_A11Y_LABEL" | "USER_SETTINGS_ACCOUNT_REVEAL_EMAIL_A11Y_LABEL" | "USER_SETTINGS_ACCOUNT_HIDE_EMAIL_A11Y_LABEL" | "USER_SETTINGS_LABEL_EMAIL" | "REVEAL" | "USER_SETTINGS_ACCOUNT_REVEAL_PHONE_A11Y_LABEL" | "USER_SETTINGS_ACCOUNT_HIDE_PHONE_A11Y_LABEL" | "USER_SETTINGS_LABEL_PHONE_NUMBER" | "USER_SETTINGS_ACCOUNT_REMOVE_PHONE_A11Y_LABEL" | "REMOVE" | "USER_SETTINGS_ACCOUNT_EDIT_PHONE_A11Y_LABEL" | "TWO_FA_VIEW_BACKUP_CODES" | "TWO_FA_ENABLED" | "TWO_FA_DESCRIPTION" | "TWO_FA_DISABLED_FOR_SERVER_SUBSCRIPTION_MOD" | "MFA_SMS_AUTH_CURRENT_PHONE" | "MFA_SMS_PHONE_NUMBER_REVEAL" | "MFA_SMS_ENABLE" | "CHANGE_PHONE_NUMBER" | "MFA_SMS_AUTH" | "MFA_SMS_AUTH_SALES_PITCH" | "TWO_FA_REMOVE" | "USER_SETTINGS_ACCOUNT_REMOVAL_SECTION" | "USER_SETTINGS_ACCOUNT_REMOVAL_DESCRIPTION" | "DISABLE_ACCOUNT" | "DELETE_ACCOUNT" | "CLOSE" | "PREMIUM_BADGE_TOOLTIP" | "SELECT" | "REPLYING_TO" | "SUPER_REACTION_NITRO_TOOLTIP" | "YOURE_VIEWING_OLDER_MESSAGES" | "JUMP_TO_PRESENT" | "REACT_WITH_COUNT_A11Y_LABEL" | "SEARCH_NO_RESULTS" | "GUILD_SIDEBAR_CHANNEL_A11Y_LABEL_LIMIT" | "COPY_LINK" | "DELETE" | "GUILD_SIDEBAR_DEFAULT_CHANNEL_A11Y_LABEL_WITH_MENTIONS" | "NEW_MESSAGES" | "NEW_MESSAGES_PILL" | "JUMP_TO_LAST_UNREAD_MESSAGE" | "MARK_AS_READ",
+    string
+>;
diff --git a/src/webpack/common/types/utils.d.ts b/src/webpack/common/types/utils.d.ts
index 0e2a6ca84..59233a480 100644
--- a/src/webpack/common/types/utils.d.ts
+++ b/src/webpack/common/types/utils.d.ts
@@ -19,6 +19,7 @@
 import type { ReactNode } from "react";
 
 import type { FluxEvents } from "./fluxEvents";
+import { i18nMessages } from "./i18nMessages";
 
 export { FluxEvents };
 
@@ -82,3 +83,30 @@ export type RestAPI = Record<"delete" | "get" | "patch" | "post" | "put", (data:
     V8APIError: Error;
     getAPIBaseURL(withVersion?: boolean): string;
 };
+
+export interface Locale {
+    name: string;
+    value: string;
+    localizedName: string;
+}
+
+export interface LocaleInfo {
+    code: string;
+    enabled: boolean;
+    name: string;
+    englishName: string;
+    postgresLang: string;
+}
+
+export interface i18n {
+    getAvailableLocales(): Locale[];
+    getLanguages(): LocaleInfo[];
+    getDefaultLocale(): string;
+    getLocale(): string;
+    getLocaleInfo(): LocaleInfo;
+    setLocale(locale: string): void;
+
+    loadPromise: Promise<void>;
+
+    Messages: Record<i18nMessages, string>;
+}
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index b53c34082..083e8d739 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -19,7 +19,7 @@
 import type { User } from "discord-types/general";
 
 // eslint-disable-next-line path-alias/no-relative
-import { _resolveReady,filters, findByCodeLazy, findByPropsLazy, mapMangledModuleLazy, waitFor } from "../webpack";
+import { _resolveReady, filters, findByCodeLazy, findByPropsLazy, findLazy, mapMangledModuleLazy, waitFor } from "../webpack";
 import type * as t from "./types/utils";
 
 export let FluxDispatcher: t.FluxDispatcher;
@@ -29,6 +29,8 @@ export const moment: typeof import("moment") = findByPropsLazy("parseTwoDigitYea
 
 export const hljs: typeof import("highlight.js") = findByPropsLazy("highlight");
 
+export const i18n: t.i18n = findLazy(m => m.Messages?.["en-US"]);
+
 export let SnowflakeUtils: t.SnowflakeUtils;
 waitFor(["fromTimestamp", "extractTimestamp"], m => SnowflakeUtils = m);
 

From 93cb51a975ce457d6091dc7b0230610f3b958bef Mon Sep 17 00:00:00 2001
From: hunter <61890674+hunt-g@users.noreply.github.com>
Date: Fri, 24 Mar 2023 20:54:20 -0600
Subject: [PATCH 061/147] feat(MessageEvents): Promisable send/edit listeners
 (#514)

* promisable send/edit listeners

* added self

* Apply suggestions from code review

Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>

* fix patches

---------

Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Co-authored-by: Ven <vendicated@riseup.net>
---
 src/api/MessageEvents.ts        | 13 +++++++------
 src/plugins/apiMessageEvents.ts | 14 +++++++-------
 src/utils/constants.ts          |  4 ++++
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/api/MessageEvents.ts b/src/api/MessageEvents.ts
index 1bf6b0bcb..aaf8d40b6 100644
--- a/src/api/MessageEvents.ts
+++ b/src/api/MessageEvents.ts
@@ -19,6 +19,7 @@
 import Logger from "@utils/Logger";
 import { MessageStore } from "@webpack/common";
 import type { Channel, Message } from "discord-types/general";
+import type { Promisable } from "type-fest";
 
 const MessageEventsLogger = new Logger("MessageEvents", "#e5c890");
 
@@ -41,16 +42,16 @@ export interface MessageExtra {
     stickerIds?: string[];
 }
 
-export type SendListener = (channelId: string, messageObj: MessageObject, extra: MessageExtra) => void | { cancel: boolean; };
-export type EditListener = (channelId: string, messageId: string, messageObj: MessageObject) => void;
+export type SendListener = (channelId: string, messageObj: MessageObject, extra: MessageExtra) => Promisable<void | { cancel: boolean; }>;
+export type EditListener = (channelId: string, messageId: string, messageObj: MessageObject) => Promisable<void>;
 
 const sendListeners = new Set<SendListener>();
 const editListeners = new Set<EditListener>();
 
-export function _handlePreSend(channelId: string, messageObj: MessageObject, extra: MessageExtra) {
+export async function _handlePreSend(channelId: string, messageObj: MessageObject, extra: MessageExtra) {
     for (const listener of sendListeners) {
         try {
-            const result = listener(channelId, messageObj, extra);
+            const result = await listener(channelId, messageObj, extra);
             if (result && result.cancel === true) {
                 return true;
             }
@@ -61,10 +62,10 @@ export function _handlePreSend(channelId: string, messageObj: MessageObject, ext
     return false;
 }
 
-export function _handlePreEdit(channelId: string, messageId: string, messageObj: MessageObject) {
+export async function _handlePreEdit(channelId: string, messageId: string, messageObj: MessageObject) {
     for (const listener of editListeners) {
         try {
-            listener(channelId, messageId, messageObj);
+            await listener(channelId, messageId, messageObj);
         } catch (e) {
             MessageEventsLogger.error("MessageEditHandler: Listener encountered an unknown error\n", e);
         }
diff --git a/src/plugins/apiMessageEvents.ts b/src/plugins/apiMessageEvents.ts
index 13fbc4c34..6843200d4 100644
--- a/src/plugins/apiMessageEvents.ts
+++ b/src/plugins/apiMessageEvents.ts
@@ -22,22 +22,22 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "MessageEventsAPI",
     description: "Api required by anything using message events.",
-    authors: [Devs.Arjix],
+    authors: [Devs.Arjix, Devs.hunt],
     patches: [
         {
-            find: "sendMessage:function",
+            find: '"MessageActionCreators"',
             replacement: [{
-                match: /(?<=_sendMessage:function\([^)]+\)){/,
-                replace: "{if(Vencord.Api.MessageEvents._handlePreSend(...arguments)){return;};"
+                match: /_sendMessage:(function\([^)]+\)){/,
+                replace: "_sendMessage:async $1{if(await Vencord.Api.MessageEvents._handlePreSend(...arguments))return;"
             }, {
-                match: /(?<=\beditMessage:function\([^)]+\)){/,
-                replace: "{Vencord.Api.MessageEvents._handlePreEdit(...arguments);"
+                match: /\beditMessage:(function\([^)]+\)){/,
+                replace: "editMessage:async $1{await Vencord.Api.MessageEvents._handlePreEdit(...arguments);"
             }]
         },
         {
             find: '("interactionUsernameProfile',
             replacement: {
-                match: /var \w=(\w)\.id,\w=(\w)\.id;return .{1,2}\.useCallback\(\(?function\((.{1,2})\){/,
+                match: /var \i=(\i)\.id,\i=(\i)\.id;return \i\.useCallback\(\(?function\((\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});`
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 4021c811f..bacf914eb 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -202,6 +202,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "lewisakura",
         id: 96269247411400704n
     },
+    hunt: {
+        name: "hunt-g",
+        id: 222800179697287168n
+    },
     cloudburst: {
         name: "cloudburst",
         id: 892128204150685769n

From bbf3c74cb206e427877f65cbb52f318abeb0cda0 Mon Sep 17 00:00:00 2001
From: RuiNtD <RuiNtD@outlook.com>
Date: Fri, 24 Mar 2023 21:00:27 -0600
Subject: [PATCH 062/147] Update LastFM plugin (#483)

Co-authored-by: Ven <vendicated@riseup.net>
Co-authored-by: Sofia Lima <me@dzshn.xyz>
---
 src/plugins/customRPC.tsx |   3 +-
 src/plugins/lastfm.tsx    | 210 ++++++++++++++++++++++++++------------
 src/utils/constants.ts    |   4 +
 3 files changed, 150 insertions(+), 67 deletions(-)

diff --git a/src/plugins/customRPC.tsx b/src/plugins/customRPC.tsx
index fe6d574db..ecd77e9b2 100644
--- a/src/plugins/customRPC.tsx
+++ b/src/plugins/customRPC.tsx
@@ -215,7 +215,8 @@ async function setRpc(disable?: boolean) {
 
     FluxDispatcher.dispatch({
         type: "LOCAL_ACTIVITY_UPDATE",
-        activity: !disable ? activity : {}
+        activity: !disable ? activity : null,
+        socketId: "CustomRPC",
     });
 }
 
diff --git a/src/plugins/lastfm.tsx b/src/plugins/lastfm.tsx
index 9a0647c76..c001a5977 100644
--- a/src/plugins/lastfm.tsx
+++ b/src/plugins/lastfm.tsx
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Settings } from "@api/settings";
+import { definePluginSettings } from "@api/settings";
 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";
@@ -30,6 +31,12 @@ interface ActivityAssets {
     small_text?: string;
 }
 
+
+interface ActivityButton {
+    label: string;
+    url: string;
+}
+
 interface Activity {
     state: string;
     details?: string;
@@ -66,6 +73,9 @@ enum ActivityFlag {
 }
 
 const applicationId = "1043533871037284423";
+const placeholderId = "2a96cbd8b46e442fc41c2b86b821562f";
+
+const logger = new Logger("LastFMRichPresence");
 
 const presenceStore = findByPropsLazy("getLocalPresence");
 const assetManager = mapMangledModuleLazy(
@@ -79,14 +89,64 @@ async function getApplicationAsset(key: string): Promise<string> {
     return (await assetManager.getAsset(applicationId, [key, undefined]))[0];
 }
 
-function setActivity(activity?: Activity) {
-    FluxDispatcher.dispatch({ type: "LOCAL_ACTIVITY_UPDATE", activity: activity });
+function setActivity(activity: Activity | null) {
+    FluxDispatcher.dispatch({
+        type: "LOCAL_ACTIVITY_UPDATE",
+        activity,
+        socketId: "LastFM",
+    });
 }
 
+const settings = definePluginSettings({
+    username: {
+        description: "last.fm username",
+        type: OptionType.STRING,
+    },
+    apiKey: {
+        description: "last.fm api key",
+        type: OptionType.STRING,
+    },
+    shareUsername: {
+        description: "show link to last.fm profile",
+        type: OptionType.BOOLEAN,
+        default: false,
+    },
+    hideWithSpotify: {
+        description: "hide last.fm presence if spotify is running",
+        type: OptionType.BOOLEAN,
+        default: true,
+    },
+    statusName: {
+        description: "text shown in status",
+        type: OptionType.STRING,
+        default: "some music",
+    },
+    useListeningStatus: {
+        description: 'show "Listening to" status instead of "Playing"',
+        type: OptionType.BOOLEAN,
+        default: false,
+    },
+    missingArt: {
+        description: "When album or album art is missing",
+        type: OptionType.SELECT,
+        options: [
+            {
+                label: "Use large Last.fm logo",
+                value: "lastfmLogo",
+                default: true
+            },
+            {
+                label: "Use generic placeholder",
+                value: "placeholder"
+            }
+        ],
+    }
+});
+
 export default definePlugin({
     name: "LastFMRichPresence",
     description: "Little plugin for Last.fm rich presence",
-    authors: [Devs.dzshn],
+    authors: [Devs.dzshn, Devs.RuiNtD],
 
     settingsAboutComponent: () => (
         <>
@@ -104,30 +164,9 @@ export default definePlugin({
         </>
     ),
 
-    options: {
-        username: {
-            description: "last.fm username",
-            type: OptionType.STRING,
-        },
-        apiKey: {
-            description: "last.fm api key",
-            type: OptionType.STRING,
-        },
-        hideWithSpotify: {
-            description: "hide last.fm presence if spotify is running",
-            type: OptionType.BOOLEAN,
-            default: true,
-        },
-        useListeningStatus: {
-            description: 'show "Listening to" status instead of "Playing"',
-            type: OptionType.BOOLEAN,
-            default: false,
-        }
-    },
+    settings,
 
     start() {
-        this.settings = Settings.plugins.LastFMRichPresence;
-
         this.updateInterval = setInterval(() => { this.updatePresence(); }, 16000);
     },
 
@@ -136,73 +175,112 @@ export default definePlugin({
     },
 
     async fetchTrackData(): Promise<TrackData | null> {
-        if (!this.settings.username || !this.settings.apiKey) return null;
+        if (!settings.store.username || !settings.store.apiKey)
+            return null;
 
-        const response = await fetch(`https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&api_key=${this.settings.apiKey}&user=${this.settings.username}&limit=1&format=json`);
-        const trackData = (await response.json()).recenttracks.track[0];
+        try {
+            const params = new URLSearchParams({
+                method: "user.getrecenttracks",
+                api_key: settings.store.apiKey,
+                user: settings.store.username,
+                limit: "1",
+                format: "json"
+            });
 
-        if (!trackData["@attr"]?.nowplaying) return null;
+            const res = await fetch(`https://ws.audioscrobbler.com/2.0/?${params}`);
+            if (!res.ok) throw `${res.status} ${res.statusText}`;
 
-        // why does the json api have xml structure
-        return {
-            name: trackData.name || "Unknown",
-            album: trackData.album["#text"],
-            artist: trackData.artist["#text"] || "Unknown",
-            url: trackData.url,
-            imageUrl: (trackData.image || []).filter(x => x.size === "large")[0]?.["#text"]
-        };
+            const json = await res.json();
+            if (json.error) {
+                logger.error("Error from Last.fm API", `${json.error}: ${json.message}`);
+                return null;
+            }
+
+            const trackData = json.recenttracks?.track[0];
+
+            if (!trackData || !trackData["@attr"]?.nowplaying)
+                return null;
+
+            // why does the json api have xml structure
+            return {
+                name: trackData.name || "Unknown",
+                album: trackData.album["#text"],
+                artist: trackData.artist["#text"] || "Unknown",
+                url: trackData.url,
+                imageUrl: trackData.image?.find((x: any) => x.size === "large")?.["#text"]
+            };
+        } catch (e) {
+            logger.error("Failed to query Last.fm API", e);
+            // will clear the rich presence if API fails
+            return null;
+        }
     },
 
     async updatePresence() {
-        if (this.settings.hideWithSpotify) {
+        setActivity(await this.getActivity());
+    },
+
+    getLargeImage(track: TrackData): string | undefined {
+        if (track.imageUrl && !track.imageUrl.includes(placeholderId))
+            return track.imageUrl;
+
+        if (settings.store.missingArt === "placeholder")
+            return "placeholder";
+    },
+
+    async getActivity(): Promise<Activity | null> {
+        if (settings.store.hideWithSpotify) {
             for (const activity of presenceStore.getActivities()) {
                 if (activity.type === ActivityType.LISTENING && activity.application_id !== applicationId) {
-                    // there is already music status (probably only spotify can do this currently)
-                    setActivity();
-                    return;
+                    // there is already music status because of Spotify or richerCider (probably more)
+                    return null;
                 }
             }
         }
 
         const trackData = await this.fetchTrackData();
+        if (!trackData) return null;
 
-        if (!trackData) {
-            setActivity();
-            return;
-        }
-
-        const hideAlbumName = !trackData.album || trackData.album === trackData.name;
-
-        let assets: ActivityAssets;
-        if (trackData.imageUrl) {
-            assets = {
-                large_image: await getApplicationAsset(trackData.imageUrl),
-                large_text: trackData.name,
+        const largeImage = this.getLargeImage(trackData);
+        const assets: ActivityAssets = largeImage ?
+            {
+                large_image: await getApplicationAsset(largeImage),
+                large_text: trackData.album || undefined,
                 small_image: await getApplicationAsset("lastfm-small"),
                 small_text: "Last.fm",
-            };
-        } else {
-            assets = {
+            } : {
                 large_image: await getApplicationAsset("lastfm-large"),
-                large_text: "Last.fm",
+                large_text: trackData.album || undefined,
             };
-        }
 
-        setActivity({
+        const buttons: ActivityButton[] = [
+            {
+                label: "View Song",
+                url: trackData.url,
+            },
+        ];
+
+        if (settings.store.shareUsername)
+            buttons.push({
+                label: "Last.fm Profile",
+                url: `https://www.last.fm/user/${settings.store.username}`,
+            });
+
+        return {
             application_id: applicationId,
-            name: "some music",
+            name: settings.store.statusName,
 
             details: trackData.name,
-            state: hideAlbumName ? trackData.artist : `${trackData.artist} - ${trackData.album}`,
+            state: trackData.artist,
             assets,
 
-            buttons: ["Open in Last.fm"],
+            buttons: buttons.map(v => v.label),
             metadata: {
-                button_urls: [trackData.url]
+                button_urls: buttons.map(v => v.url),
             },
 
-            type: this.settings.useListeningStatus ? ActivityType.LISTENING : ActivityType.PLAYING,
+            type: settings.store.useListeningStatus ? ActivityType.LISTENING : ActivityType.PLAYING,
             flags: ActivityFlag.INSTANCE,
-        });
+        };
     }
 });
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index bacf914eb..e7ac09aa7 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -202,6 +202,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "lewisakura",
         id: 96269247411400704n
     },
+    RuiNtD: {
+        name: "RuiNtD",
+        id: 157917665162297344n
+    },
     hunt: {
         name: "hunt-g",
         id: 222800179697287168n

From 92b84a9e947ead3e90f297c8bbbbe3079a389e35 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 25 Mar 2023 05:42:26 -0300
Subject: [PATCH 063/147] Fix broken patches (#701)

---
 src/plugins/alwaysTrust.ts   | 6 +++---
 src/plugins/betterRoleDot.ts | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/alwaysTrust.ts b/src/plugins/alwaysTrust.ts
index 8dde07fbf..79193b0af 100644
--- a/src/plugins/alwaysTrust.ts
+++ b/src/plugins/alwaysTrust.ts
@@ -32,10 +32,10 @@ export default definePlugin({
             }
         },
         {
-            find: "\"github.com\":new RegExp(\"\\\\/releases\\\\S*\\\\/download\"),",
+            find: '"7z","ade","adp"',
             replacement: {
-                match: /const o=JSON.parse\('\[.+?'\)/,
-                replace: "const o=[]"
+                match: /JSON\.parse\('\[.+?'\)/,
+                replace: "[]"
             }
         }
     ]
diff --git a/src/plugins/betterRoleDot.ts b/src/plugins/betterRoleDot.ts
index 6ef92a863..62068c782 100644
--- a/src/plugins/betterRoleDot.ts
+++ b/src/plugins/betterRoleDot.ts
@@ -37,11 +37,11 @@ export default definePlugin({
             },
         },
         {
-            find: '"username"===',
+            find: '"dot"===',
             all: true,
             predicate: () => Settings.plugins.BetterRoleDot.bothStyles,
             replacement: {
-                match: /"(?:username|dot)"===\w(?!\.\w)/g,
+                match: /"(?:username|dot)"===\i(?!\.\i)/g,
                 replace: "true",
             },
         },

From c574f53417959dc061a7dcdd8cda24c92459dcd2 Mon Sep 17 00:00:00 2001
From: Ven <vendicated@riseup.net>
Date: Sat, 25 Mar 2023 13:41:39 +0100
Subject: [PATCH 064/147] Add Code of Conduct (#680)

---
 CODE_OF_CONDUCT.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 CODE_OF_CONDUCT.md

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000..725af1e2f
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,20 @@
+# Code of Conduct
+
+Our community is welcoming to everyone, regardless of their characteristics.
+
+As such, we expect you to treat everyone with respect and contribute to an open and welcoming community.
+
+DO
+- have empathy and be nice to others
+- be respectful of differing opinions, even if you disagree
+- give and accept constructive criticism
+
+DON'T
+- use offensive or derogatory language
+- troll or spam
+- personally attack or harass others
+
+Repetitive violations of these guidelines might get your access to the repository restricted.
+
+
+If you feel like a user is violating these guidelines or feel treated unfairly, please refrain from publicly challenging them and instead contact a Moderator on our Discord server or send an email to vendicated+conduct@riseup.net!

From 24aa90bd9cf20b5c0d668552f9fffec942db3948 Mon Sep 17 00:00:00 2001
From: Lewis Crichton <lewi@lewisakura.moe>
Date: Sat, 25 Mar 2023 15:20:00 +0000
Subject: [PATCH 065/147] fix API plugins being force enabled unconditionally
 (#704)

* only enable dependencies if required

* fixme note
---
 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 6ac221da5..d0d16c234 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -43,8 +43,11 @@ export function isPluginEnabled(p: string) {
 
 const pluginsValues = Object.values(Plugins);
 
-// First roundtrip to mark and force enable dependencies
-for (const p of pluginsValues) {
+// First roundtrip to mark and force enable dependencies (only for enabled plugins)
+//
+// FIXME: might need to revisit this if there's ever nested (dependencies of dependencies) dependencies since this only
+// goes for the top level and their children, but for now this works okay with the current API plugins
+for (const p of pluginsValues) if (settings[p.name]?.enabled) {
     p.dependencies?.forEach(d => {
         const dep = Plugins[d];
         if (dep) {

From 041a13c9d305b95c9a48f02487db6804e2cf2fe2 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 26 Mar 2023 01:27:01 +0100
Subject: [PATCH 066/147] DevCompanion: Always use original

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

diff --git a/src/plugins/devCompanion.dev.tsx b/src/plugins/devCompanion.dev.tsx
index 5c3c58eda..b9a7e4d82 100644
--- a/src/plugins/devCompanion.dev.tsx
+++ b/src/plugins/devCompanion.dev.tsx
@@ -158,7 +158,8 @@ function initWs(isManual = false) {
                 if (keys.length !== 1)
                     return reply("Expected exactly one 'find' matches, found " + keys.length);
 
-                let src = String(candidates[keys[0]]);
+                const mod = candidates[keys[0]];
+                let src = String(mod.original ?? mod);
 
                 let i = 0;
 

From a00542b61b4f2c582744268610561fdd9b018204 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 26 Mar 2023 01:27:30 +0100
Subject: [PATCH 067/147] MessageLinkEmbeds: Fix weird commas in title

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

diff --git a/src/plugins/messageLinkEmbeds.tsx b/src/plugins/messageLinkEmbeds.tsx
index 7ca579410..e3a28a737 100644
--- a/src/plugins/messageLinkEmbeds.tsx
+++ b/src/plugins/messageLinkEmbeds.tsx
@@ -264,7 +264,7 @@ 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>,
+                    <span>{isDM ? "Direct Message - " : (guild as Guild).name + " - "}</span>
                     {isDM
                         ? Parser.parse(`<@${dmReceiver.id}>`)
                         : Parser.parse(`<#${channel.id}>`)
@@ -302,7 +302,7 @@ function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
                 {isDM
                     ? parse(`<@${ChannelStore.getChannel(channel.id).recipients[0]}>`)
                     : parse(`<#${channel.id}>`)
-                },
+                }
                 <span>{isDM ? " - Direct Message" : " - " + GuildStore.getGuild(channel.guild_id)?.name}</span>
             </Text>
         }

From ee794d140f34cadcb6202dfbaeacd04f688fc16b Mon Sep 17 00:00:00 2001
From: Lewis Crichton <lewi@lewisakura.moe>
Date: Tue, 28 Mar 2023 17:20:06 +0100
Subject: [PATCH 068/147] fix: no more theme box obliteration (#707)

Co-authored-by: Ven <vendicated@riseup.net>
---
 src/components/VencordSettings/ThemesTab.tsx      | 6 +-----
 src/components/VencordSettings/settingsStyles.css | 8 ++++++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/VencordSettings/ThemesTab.tsx b/src/components/VencordSettings/ThemesTab.tsx
index b8381f718..f254afffb 100644
--- a/src/components/VencordSettings/ThemesTab.tsx
+++ b/src/components/VencordSettings/ThemesTab.tsx
@@ -116,13 +116,9 @@ export default ErrorBoundary.wrap(function () {
             </Card>
             <Forms.FormTitle tag="h5">Themes</Forms.FormTitle>
             <TextArea
-                style={{
-                    padding: ".5em",
-                    border: "1px solid var(--background-modifier-accent)"
-                }}
                 value={themeText}
                 onChange={e => setThemeText(e.currentTarget.value)}
-                className={TextAreaProps.textarea}
+                className={`${TextAreaProps.textarea} vc-settings-theme-links`}
                 placeholder="Theme Links"
                 spellCheck={false}
                 onBlur={onBlur}
diff --git a/src/components/VencordSettings/settingsStyles.css b/src/components/VencordSettings/settingsStyles.css
index 76064be14..709c8236f 100644
--- a/src/components/VencordSettings/settingsStyles.css
+++ b/src/components/VencordSettings/settingsStyles.css
@@ -38,3 +38,11 @@
     color: var(--info-warning-text);
     margin-top: 0;
 }
+
+.vc-settings-theme-links {
+    /* Needed to fix bad themes that hide certain textarea elements for whatever eldritch reason */
+    display: inline-block !important;
+    color: var(--text-normal) !important;
+    padding: 0.5em;
+    border: 1px solid var(--background-modifier-accent);
+}

From 8cb349108629d735a03f746c4ac44de05666285a Mon Sep 17 00:00:00 2001
From: Skye <me@skye.vg>
Date: Wed, 29 Mar 2023 01:23:51 +0900
Subject: [PATCH 069/147] feat(uwuify): improve uwuification algorithm (#706)

Co-authored-by: Ven <vendicated@riseup.net>
---
 src/plugins/uwuify.ts | 132 +++++++++++++++++++-----------------------
 1 file changed, 58 insertions(+), 74 deletions(-)

diff --git a/src/plugins/uwuify.ts b/src/plugins/uwuify.ts
index 1c7d2cb37..e4b10e84d 100644
--- a/src/plugins/uwuify.ts
+++ b/src/plugins/uwuify.ts
@@ -21,87 +21,71 @@ import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 
 const endings = [
-    "owo", "UwU", ">w<", "^w^", "●w●", "☆w☆", "𝗨𝘄𝗨", "(ᗒᗨᗕ)", "(▰˘v˘▰)",
-    "( ´ ▽ ` ).｡ｏ♡", "*unbuttons shirt*", ">3<", ">:3", ":3", "murr~",
-    "♥(。U ω U。)", "(˘ε˘)", "*screams*", "*twerks*", "*sweats*",
+    "rawr x3",
+    "OwO",
+    "UwU",
+    "o.O",
+    "-.-",
+    ">w<",
+    "(⑅˘꒳˘)",
+    "(ꈍᴗꈍ)",
+    "(˘ω˘)",
+    "(U ᵕ U❁)",
+    "σωσ",
+    "òωó",
+    "(///ˬ///✿)",
+    "(U ﹏ U)",
+    "( ͡o ω ͡o )",
+    "ʘwʘ",
+    ":3",
+    ":3", // important enough to have twice
+    "XD",
+    "nyaa~~",
+    "mya",
+    ">_<",
+    "😳",
+    "🥺",
+    "😳😳😳",
+    "rawr",
+    "^^",
+    "^^;;",
+    "(ˆ ﻌ ˆ)♡",
+    "^•ﻌ•^",
+    "/(^•ω•^)",
+    "(✿oωo)"
 ];
 
 const replacements = [
-    ["love", "wuv"],
-    ["mr", "mistuh"],
-    ["dog", "doggo"],
-    ["cat", "kitteh"],
-    ["hello", "henwo"],
-    ["hell", "heck"],
-    ["fuck", "fwick"],
-    ["fuk", "fwick"],
-    ["shit", "shoot"],
-    ["friend", "fwend"],
-    ["stop", "stawp"],
-    ["god", "gosh"],
-    ["dick", "peepee"],
-    ["penis", "bulge"],
-    ["damn", "darn"],
+    ["small", "smol"],
+    ["cute", "kawaii~"],
+    ["fluff", "floof"],
+    ["love", "luv"],
+    ["stupid", "baka"],
+    ["what", "nani"],
+    ["meow", "nya~"],
 ];
 
+function selectRandomElement(arr) {
+    // generate a random index based on the length of the array
+    const randomIndex = Math.floor(Math.random() * arr.length);
+
+    // return the element at the randomly generated index
+    return arr[randomIndex];
+}
+
 
 function uwuify(message: string): string {
-    return message
-        .split(" ")
-        .map(w => {
-            let owofied = false;
-            const lowerCase = w.toLowerCase();
-            // return if the word is too short - uwuifying short words makes them unreadable
-            if (w.length < 4) {
-                return w;
-            }
-
-            // replacing the words based on the array on line 29
-            for (const [find, replace] of replacements) {
-                if (w.includes(find)) {
-                    w = w.replace(find, replace);
-                    owofied = true;
-                }
-            }
-            // these are the biggest word changes. if any of these are done we dont do the
-            // ones after the isowo check. to keep the words somewhat readable
-            if (lowerCase.includes("u") && !lowerCase.includes("uwu")) {
-                w = w.replace("u", "UwU");
-                owofied = true;
-            }
-            if (lowerCase.includes("o") && !lowerCase.includes("owo")) {
-                w = w.replace("o", "OwO");
-                owofied = true;
-            }
-            if (lowerCase.endsWith("y") && w.length < 7) {
-                w = w + " " + "w" + w.slice(1);
-                owofied = true;
-            }
-
-            // returning if word has been already uwuified - to prevent over-uwuifying
-            if (owofied) {
-                return w;
-            }
-
-            // more tiny changes - to keep the words that passed through the latter changes uwuified
-            if (!lowerCase.endsWith("n")) {
-                w = w.replace("n", "ny");
-            }
-            if (Math.floor(Math.random() * 2) === 1) {
-                w.replace("s", "sh");
-            }
-            if (Math.floor(Math.random() * 5) === 3 && !owofied) {
-                w = w[0] + "-" + w[0] + "-" + w;
-            }
-            if (Math.floor(Math.random() * 5) === 3) {
-                w =
-                    w +
-                    " " +
-                    endings[Math.floor(Math.random() * endings.length)];
-            }
-            w = w.replaceAll("r", "w").replaceAll("l", "w");
-            return w;
-        }).join(" ");
+    message = message.toLowerCase();
+    // words
+    for (const pair of replacements) {
+        message = message.replaceAll(pair[0], pair[1]);
+    }
+    message = message
+        .replaceAll(/([ \t\n])n/g, "$1ny") // nyaify
+        .replaceAll(/[lr]/g, "w") // [lr] > w
+        .replaceAll(/([ \t\n])([a-z])/g, (_, p1, p2) => Math.random() < .5 ? `${p1}${p2}-${p2}` : `${p1}${p2}`) // stutter
+        .replaceAll(/([^.,!][.,!])([ \t\n])/g, (_, p1, p2) => `${p1} ${selectRandomElement(endings)}${p2}`); // endings
+    return message;
 }
 
 

From ab911b48b5608d0a6781c325a123138815282f74 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 28 Mar 2023 18:43:45 +0200
Subject: [PATCH 070/147] TypingTweaks: Make names open profile on click

Closes #718
---
 src/plugins/typingTweaks.tsx | 65 ++++++++++++++++++++++++++----------
 src/plugins/uwuify.ts        |  2 +-
 src/utils/constants.ts       |  4 +++
 3 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/src/plugins/typingTweaks.tsx b/src/plugins/typingTweaks.tsx
index 3eb4fadec..0d72ca001 100644
--- a/src/plugins/typingTweaks.tsx
+++ b/src/plugins/typingTweaks.tsx
@@ -21,10 +21,11 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy } from "@webpack";
-import { GuildMemberStore, React, RelationshipStore } from "@webpack/common";
+import { GuildMemberStore, React, RelationshipStore, SelectedChannelStore } from "@webpack/common";
 import { User } from "discord-types/general";
 
 const Avatar = findByCodeLazy('"top",spacing:');
+const openProfile = findByCodeLazy("friendToken", "USER_PROFILE_MODAL_OPEN");
 
 const settings = definePluginSettings({
     showAvatars: {
@@ -53,6 +54,46 @@ export function buildSeveralUsers({ a, b, c }: { a: string, b: string, c: number
     ];
 }
 
+interface Props {
+    user: User;
+    guildId: string;
+}
+
+const TypingUser = ErrorBoundary.wrap(function ({ user, guildId }: Props) {
+    return (
+        <strong
+            role="button"
+            onClick={() => {
+                openProfile({
+                    userId: user.id,
+                    guildId,
+                    channelId: SelectedChannelStore.getChannelId(),
+                    analyticsLocation: {
+                        page: guildId ? "Guild Channel" : "DM Channel",
+                        section: "Profile Popout"
+                    }
+                });
+            }}
+            style={{
+                display: "grid",
+                gridAutoFlow: "column",
+                gap: "4px",
+                color: settings.store.showRoleColors ? GuildMemberStore.getMember(guildId, user.id)?.colorString : undefined,
+                cursor: "pointer"
+            }}
+        >
+            {settings.store.showAvatars && (
+                <div style={{ marginTop: "4px" }}>
+                    <Avatar
+                        size="SIZE_16"
+                        src={user.getAvatarURL(guildId, 128)} />
+                </div>
+            )}
+            {GuildMemberStore.getNick(guildId!, user.id) || !guildId && RelationshipStore.getNickname(user.id) || user.username}
+        </strong>
+    );
+}, { noop: true });
+
 export default definePlugin({
     name: "TypingTweaks",
     description: "Show avatars and role colours in the typing indicator",
@@ -93,22 +134,10 @@ export default definePlugin({
 
         let element = 0;
 
-        return children.map(c => c.type === "strong" ? <this.TypingUser {...props} user={users[element++]} /> : c);
+        return children.map(c =>
+            c.type === "strong"
+                ? <TypingUser {...props} user={users[element++]} />
+                : c
+        );
     },
-
-    TypingUser: ErrorBoundary.wrap(({ user, guildId }: { user: User, guildId: string; }) => {
-        return <strong style={{
-            display: "grid",
-            gridAutoFlow: "column",
-            gap: "4px",
-            color: settings.store.showRoleColors ? GuildMemberStore.getMember(guildId, user.id)?.colorString : undefined
-        }}>
-            {settings.store.showAvatars && <div style={{ marginTop: "4px" }}>
-                <Avatar
-                    size="SIZE_16"
-                    src={user.getAvatarURL(guildId, 128)} />
-            </div>}
-            {GuildMemberStore.getNick(guildId!, user.id) || !guildId && RelationshipStore.getNickname(user.id) || user.username}
-        </strong>;
-    }, { noop: true })
 });
diff --git a/src/plugins/uwuify.ts b/src/plugins/uwuify.ts
index e4b10e84d..c3a879c79 100644
--- a/src/plugins/uwuify.ts
+++ b/src/plugins/uwuify.ts
@@ -94,7 +94,7 @@ function uwuify(message: string): string {
 export default definePlugin({
     name: "UwUifier",
     description: "Simply uwuify commands",
-    authors: [Devs.echo],
+    authors: [Devs.echo, Devs.skyevg],
     dependencies: ["CommandsAPI"],
 
     commands: [
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index e7ac09aa7..c6277f557 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -221,5 +221,9 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     TheKodeToad: {
         name: "TheKodeToad",
         id: 706152404072267788n
+    },
+    skyevg: {
+        name: "skyevg",
+        id: 1090310844283363348n
     }
 });

From 081df6beb79a48ed970aaca7a5dde852651a6d61 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 28 Mar 2023 18:56:12 +0200
Subject: [PATCH 071/147] Fix SilentMessage/SilentTyping toggles showing in
 wrong sections

Closes #656
---
 src/plugins/silentMessageToggle.tsx | 10 ++++++++--
 src/plugins/silentTyping.tsx        | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/plugins/silentMessageToggle.tsx b/src/plugins/silentMessageToggle.tsx
index 8d33f81c7..3151e5c9c 100644
--- a/src/plugins/silentMessageToggle.tsx
+++ b/src/plugins/silentMessageToggle.tsx
@@ -22,7 +22,11 @@ import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { Button, ButtonLooks, ButtonWrapperClasses, React, Tooltip } from "@webpack/common";
 
-function SilentMessageToggle() {
+function SilentMessageToggle(chatBoxProps: {
+    type: {
+        analyticsName: string;
+    };
+}) {
     const [enabled, setEnabled] = React.useState(false);
 
     React.useEffect(() => {
@@ -37,6 +41,8 @@ function SilentMessageToggle() {
         return () => void removePreSendListener(listener);
     }, [enabled]);
 
+    if (chatBoxProps.type.analyticsName !== "normal") return null;
+
     return (
         <Tooltip text="Toggle Silent Message">
             {tooltipProps => (
@@ -78,7 +84,7 @@ export default definePlugin({
             find: ".activeCommandOption",
             replacement: {
                 match: /"gift"\)\);(?<=(\i)\.push.+?disabled:(\i),.+?)/,
-                replace: (m, array, disabled) => `${m}${disabled}||${array}.push($self.SilentMessageToggle());`
+                replace: (m, array, disabled) => `${m};try{${disabled}||${array}.push($self.SilentMessageToggle(arguments[0]));}catch{}`
             }
         }
     ],
diff --git a/src/plugins/silentTyping.tsx b/src/plugins/silentTyping.tsx
index d0edaac2a..6d82840ce 100644
--- a/src/plugins/silentTyping.tsx
+++ b/src/plugins/silentTyping.tsx
@@ -37,10 +37,16 @@ const settings = definePluginSettings({
     }
 });
 
-function SilentTypingToggle() {
+function SilentTypingToggle(chatBoxProps: {
+    type: {
+        analyticsName: string;
+    };
+}) {
     const { isEnabled } = settings.use(["isEnabled"]);
     const toggle = () => settings.store.isEnabled = !settings.store.isEnabled;
 
+    if (chatBoxProps.type.analyticsName !== "normal") return null;
+
     return (
         <Tooltip text={isEnabled ? "Disable silent typing" : "Enable silent typing"}>
             {(tooltipProps: any) => (
@@ -83,7 +89,7 @@ export default definePlugin({
             predicate: () => settings.store.showIcon,
             replacement: {
                 match: /(.)\.push.{1,30}disabled:(\i),.{1,20}\},"gift"\)\)/,
-                replace: "$&;try{$2||$1.push($self.chatBarIcon())}catch{}",
+                replace: "$&;try{$2||$1.push($self.chatBarIcon(arguments[0]))}catch{}",
             }
         },
     ],

From eb318c678f52269bfd159a8f11dcc6a3c9296e80 Mon Sep 17 00:00:00 2001
From: Elliott Tallis <tallis.elliott@gmail.com>
Date: Tue, 28 Mar 2023 17:59:30 +0100
Subject: [PATCH 072/147] feat(ViewRaw): Improve View Raw action icon (#720)

Co-authored-by: Ven <vendicated@riseup.net>
---
 src/plugins/viewRaw.tsx | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/plugins/viewRaw.tsx b/src/plugins/viewRaw.tsx
index e0e3c9b00..d1ef7174e 100644
--- a/src/plugins/viewRaw.tsx
+++ b/src/plugins/viewRaw.tsx
@@ -29,15 +29,9 @@ import { Message } from "discord-types/general";
 
 
 const CopyIcon = () => {
-    return <svg viewBox="0 0 512.002 512.002" fill="currentColor" aria-hidden="true" width="22" height="22">
-        <path d="M462.002,92.002h-42.001V50c0-27.57-22.43-50-50-50h-320c-27.57,0-50,22.43-50,50v320.002c0,27.57,22.43,50,50,50h42.001    v42c0,27.57,22.43,50,50,50h320c27.57,0,50-22.43,50-50v-320C512.001,114.432,489.573,92.002,462.002,92.002z M50.001,400.002    c-16.542,0-30-13.458-30-30V50c0-16.542,13.458-30,30-30h320c16.542,0,30,13.458,30,30v320.002c0,16.542-13.458,30-30,30H50.001z     M492.002,462.002c0,16.542-13.458,30-30,30h-320c-16.542,0-30-13.458-30-30v-42h257.999c27.57,0,50-22.43,50-50v-258h42.001    c16.542,0,30,13.458,30,30V462.002z" />
-        <path d="M462.024,457.002H170.98c-5.522,0-10,4.478-10,10c0,5.523,4.478,10,10,10h291.043c5.522,0,10-4.477,10-10    S467.546,457.002,462.024,457.002z" />
-        <path d="M142.25,457.002h-0.27c-5.522,0-10,4.478-10,10c0,5.523,4.478,10,10,10h0.27c5.523,0,10-4.477,10-10    S147.773,457.002,142.25,457.002z" />
-        <path d="M110.035,35h-0.27c-5.522,0-10,4.478-10,10s4.478,10,10,10h0.27c5.522,0,10-4.478,10-10S115.558,35,110.035,35z" />
-        <path d="M81.036,35H50.001c-5.522,0-10,4.478-10,10s4.478,10,10,10h31.034c5.523,0,10.001-4.478,10.001-10S86.558,35,81.036,35z" />
-        <path d="M122.084,246.829l-0.008-0.008l-14.8-30.002c5.407-2.305,10.07-5.975,13.466-10.537c3.725-5.006,5.931-11.08,5.931-17.604    c0-8.588-3.248-15.902-9.743-21.965c-3.196-2.992-6.739-5.242-10.627-6.744c-3.891-1.506-8.097-2.258-12.612-2.258H64.936    c-2.793,0-5.327,1.145-7.163,2.996c-1.832,1.85-2.968,4.396-2.968,7.205v82.777c0,2.896,1.137,5.338,2.893,7.105    c0.962,0.969,2.107,1.728,3.349,2.246c1.249,0.52,2.597,0.797,3.953,0.797c2.49,0,5.028-0.92,7.096-2.967    c1.004-0.99,1.761-2.09,2.271-3.297c0.516-1.221,0.771-2.516,0.771-3.885v-31.139h10.844l17.862,36.184l-0.004,0.005    c1.315,2.699,3.416,4.4,5.763,5.201c1.275,0.434,2.616,0.596,3.938,0.502c1.317-0.094,2.618-0.44,3.812-1.022    c2.307-1.123,4.237-3.123,5.179-5.881h0.002c0.45-1.307,0.639-2.609,0.564-3.904C123.023,249.327,122.684,248.058,122.084,246.829    z M106.124,190.85c-0.438,1.795-1.473,3.546-3.189,5.07c-1.205,1.039-2.538,1.838-3.996,2.395c-1.45,0.553-3.02,0.865-4.704,0.934    v-0.006H75.138v-21.221H93.69c3.19,0,5.9,0.893,7.984,2.328c1.83,1.26,3.187,2.939,3.96,4.791    C106.393,186.957,106.591,188.942,106.124,190.85z" />
-        <path d="M364.199,163.706c-1.12-2.354-3.136-4.285-5.777-5.254l-0.055-0.016c-2.721-0.916-5.49-0.688-7.823,0.439    c-2.349,1.135-4.243,3.172-5.193,5.861v0.008l-19.568,55.744l-19.571-55.816h-0.001c-0.705-2.352-2.14-4.141-3.935-5.322    c-1.589-1.047-3.458-1.609-5.345-1.656c-1.887-0.047-3.801,0.42-5.479,1.43c-1.938,1.164-3.553,3.031-4.445,5.637h0.002    l-19.564,55.73l-19.569-55.746l-0.008-0.016c-0.997-2.779-2.938-4.752-5.235-5.846c-1.222-0.584-2.552-0.918-3.899-0.99    c-1.34-0.074-2.701,0.115-3.991,0.578c-2.347,0.842-4.429,2.57-5.701,5.24c-1.206,2.529-1.354,5.119-0.441,7.766l0.005,0.009    l29.181,83.133l0.016,0.047c1.186,3.139,3.318,5.213,5.775,6.234c1.141,0.473,2.355,0.717,3.581,0.73    c1.219,0.016,2.438-0.197,3.595-0.635c2.602-0.982,4.914-3.084,6.238-6.268l0.039-0.109l19.595-55.779l20.043,56.877l0.047,0.125    c0.967,2.25,2.404,3.912,4.071,4.99c1.666,1.078,3.544,1.563,5.408,1.465c1.854-0.096,3.686-0.764,5.274-1.992    c1.666-1.289,3.059-3.191,3.899-5.686l29.251-83.133C365.546,168.825,365.317,166.053,364.199,163.706z" />
-        <path d="M226.7,247.37l-0.008-0.031l-8.818-21.24l-0.003,0.002l-25.528-61.617h0.001c-1.024-2.709-3.167-4.654-5.674-5.645    c-1.165-0.461-2.429-0.715-3.708-0.742c-1.28-0.027-2.565,0.178-3.773,0.635c-2.393,0.906-4.479,2.764-5.647,5.719l0.005,0.002    l-25.54,61.719h-0.003l-8.818,21.168v0.008c-1.076,2.607-1,5.383-0.008,7.783c0.994,2.408,2.91,4.433,5.51,5.527l0.038,0.023    c2.619,1.035,5.435,1.064,7.886,0.041c2.295-0.955,4.242-2.813,5.384-5.6l6.147-14.877h37.566l6.148,14.877    c1.175,2.844,3.171,4.674,5.459,5.609c1.261,0.518,2.601,0.752,3.932,0.73c1.324-0.021,2.642-0.295,3.865-0.801    c2.418-0.998,4.496-2.9,5.579-5.547l0.008-0.016C227.723,252.523,227.723,249.945,226.7,247.37z M172.552,219.938l10.344-25.01    l10.416,25.01H172.552z" />
+    return <svg viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" width="22" height="22">
+        <path d="M12.9297 3.25007C12.7343 3.05261 12.4154 3.05226 12.2196 3.24928L11.5746 3.89824C11.3811 4.09297 11.3808 4.40733 11.5739 4.60245L16.5685 9.64824C16.7614 9.84309 16.7614 10.1569 16.5685 10.3517L11.5739 15.3975C11.3808 15.5927 11.3811 15.907 11.5746 16.1017L12.2196 16.7507C12.4154 16.9477 12.7343 16.9474 12.9297 16.7499L19.2604 10.3517C19.4532 10.1568 19.4532 9.84314 19.2604 9.64832L12.9297 3.25007Z" />
+        <path d="M8.42616 4.60245C8.6193 4.40733 8.61898 4.09297 8.42545 3.89824L7.78047 3.24928C7.58466 3.05226 7.26578 3.05261 7.07041 3.25007L0.739669 9.64832C0.5469 9.84314 0.546901 10.1568 0.739669 10.3517L7.07041 16.7499C7.26578 16.9474 7.58465 16.9477 7.78047 16.7507L8.42545 16.1017C8.61898 15.907 8.6193 15.5927 8.42616 15.3975L3.43155 10.3517C3.23869 10.1569 3.23869 9.84309 3.43155 9.64824L8.42616 4.60245Z" />
     </svg>;
 };
 

From 337b3709d6c9640991a210194b0c20afd855e4c2 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 28 Mar 2023 19:06:58 +0200
Subject: [PATCH 073/147] types: Make ErrorBoundary.wrap explicitly return
 Function

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

diff --git a/src/components/ErrorBoundary.tsx b/src/components/ErrorBoundary.tsx
index 62b92a03f..c34b47d20 100644
--- a/src/components/ErrorBoundary.tsx
+++ b/src/components/ErrorBoundary.tsx
@@ -105,7 +105,7 @@ const ErrorBoundary = LazyComponent(() => {
     };
 }) as
     React.ComponentType<React.PropsWithChildren<Props>> & {
-        wrap<T extends object = any>(Component: React.ComponentType<T>, errorBoundaryProps?: Omit<Props<T>, "wrappedProps">): React.ComponentType<T>;
+        wrap<T extends object = any>(Component: React.ComponentType<T>, errorBoundaryProps?: Omit<Props<T>, "wrappedProps">): React.FunctionComponent<T>;
     };
 
 ErrorBoundary.wrap = (Component, errorBoundaryProps) => props => (

From ee943c428431bd26e4a00b02c3c68bd9a4535a6a Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 28 Mar 2023 19:09:48 +0200
Subject: [PATCH 074/147] Bump to v1.1.3

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

diff --git a/package.json b/package.json
index c6975a41f..6033de408 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "description": "The cutest Discord client mod",
     "keywords": [ ],
     "homepage": "https://github.com/Vendicated/Vencord#readme",

From 420b06809432e90a82d2d957fd54e3698dcf9c20 Mon Sep 17 00:00:00 2001
From: Phil <letsphil12@gmail.com>
Date: Tue, 28 Mar 2023 20:26:57 +0200
Subject: [PATCH 075/147] Fix makeProxy returning stale proxies after assigning
 objects (#722)

---
 src/api/settings.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/api/settings.ts b/src/api/settings.ts
index 0ebfe1d3f..0aaa4907e 100644
--- a/src/api/settings.ts
+++ b/src/api/settings.ts
@@ -133,6 +133,7 @@ function makeProxy(settings: any, root = settings, path = ""): Settings {
             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._path || subscription._path === setPath) {
                     subscription(v, setPath);

From 12cbd73e7f775179e42b500a2b3bdb0e7f32e3d1 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 30 Mar 2023 01:29:34 +0200
Subject: [PATCH 076/147] SpotifyControls: Add right click menus to
 title/album/artists

---
 .../spotifyControls/PlayerComponent.tsx       | 36 ++++++++++++++++++-
 src/plugins/spotifyControls/SpotifyStore.ts   |  7 +++-
 src/plugins/spotifyControls/index.tsx         |  5 +++
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/plugins/spotifyControls/PlayerComponent.tsx b/src/plugins/spotifyControls/PlayerComponent.tsx
index 439ecc249..3276be17b 100644
--- a/src/plugins/spotifyControls/PlayerComponent.tsx
+++ b/src/plugins/spotifyControls/PlayerComponent.tsx
@@ -22,7 +22,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { Link } from "@components/Link";
 import { debounce } from "@utils/debounce";
-import { classes, LazyComponent } from "@utils/misc";
+import { classes, copyWithToast, LazyComponent } from "@utils/misc";
 import { filters, find } from "@webpack";
 import { ContextMenu, FluxDispatcher, Forms, Menu, React, useEffect, useState, useStateFromStores } from "@webpack/common";
 
@@ -74,6 +74,37 @@ function Button(props: React.ButtonHTMLAttributes<HTMLButtonElement>) {
     );
 }
 
+function CopyContextMenu({ name, path }: { name: string; path: string; }) {
+    const copyId = `spotify-copy-${name}`;
+    const openId = `spotify-open-${name}`;
+
+    return (
+        <Menu.ContextMenu
+            navId={`spotify-${name}-menu`}
+            onClose={() => FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" })}
+            aria-label={`Spotify ${name} Menu`}
+        >
+            <Menu.MenuItem
+                key={copyId}
+                id={copyId}
+                label={`Copy ${name} Link`}
+                action={() => copyWithToast("https://open.spotify.com" + path)}
+            />
+            <Menu.MenuItem
+                key={openId}
+                id={openId}
+                label={`Open ${name} in Spotify`}
+                action={() => SpotifyStore.openExternal(path)}
+            />
+        </Menu.ContextMenu>
+    );
+}
+
+function makeContextMenu(name: string, path: string) {
+    return (e: React.MouseEvent<HTMLElement, MouseEvent>) =>
+        ContextMenu.open(e, () => <CopyContextMenu name={name} path={path} />);
+}
+
 function Controls() {
     const [isPlaying, shuffle, repeat] = useStateFromStores(
         [SpotifyStore],
@@ -263,6 +294,7 @@ function Info({ track }: { track: Track; }) {
                     onClick={track.id ? () => {
                         SpotifyStore.openExternal(`/track/${track.id}`);
                     } : void 0}
+                    onContextMenu={track.id ? makeContextMenu("Song", `/track/${track.id}`) : void 0}
                 >
                     {track.name}
                 </Forms.FormText>
@@ -277,6 +309,7 @@ function Info({ track }: { track: Track; }) {
                                     href={`https://open.spotify.com/artist/${a.id}`}
                                     style={{ fontSize: "inherit" }}
                                     title={a.name}
+                                    onContextMenu={makeContextMenu("Artist", `/artist/${a.id}`)}
                                 >
                                     {a.name}
                                 </Link>
@@ -295,6 +328,7 @@ function Info({ track }: { track: Track; }) {
                             disabled={!track.album.id}
                             style={{ fontSize: "inherit" }}
                             title={track.album.name}
+                            onContextMenu={makeContextMenu("Album", `/album/${track.album.id}`)}
                         >
                             {track.album.name}
                         </Link>
diff --git a/src/plugins/spotifyControls/SpotifyStore.ts b/src/plugins/spotifyControls/SpotifyStore.ts
index ceac57707..723bc4cf8 100644
--- a/src/plugins/spotifyControls/SpotifyStore.ts
+++ b/src/plugins/spotifyControls/SpotifyStore.ts
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { Settings } from "@api/settings";
 import IpcEvents from "@utils/IpcEvents";
 import { proxyLazy } from "@utils/proxyLazy";
 import { findByPropsLazy } from "@webpack";
@@ -89,7 +90,11 @@ export const SpotifyStore = proxyLazy(() => {
         public isSettingPosition = false;
 
         public openExternal(path: string) {
-            VencordNative.ipc.invoke(IpcEvents.OPEN_EXTERNAL, "https://open.spotify.com" + path);
+            const url = Settings.plugins.SpotifyControls.useSpotifyUris
+                ? "spotify:" + path.replaceAll("/", (_, idx) => idx === 0 ? "" : ":")
+                : "https://open.spotify.com" + path;
+
+            VencordNative.ipc.invoke(IpcEvents.OPEN_EXTERNAL, url);
         }
 
         // Need to keep track of this manually
diff --git a/src/plugins/spotifyControls/index.tsx b/src/plugins/spotifyControls/index.tsx
index 5d82998df..ce1bf6759 100644
--- a/src/plugins/spotifyControls/index.tsx
+++ b/src/plugins/spotifyControls/index.tsx
@@ -47,6 +47,11 @@ export default definePlugin({
             default: false,
             onChange: v => toggleHoverControls(v)
         },
+        useSpotifyUris: {
+            type: OptionType.BOOLEAN,
+            description: "Open Spotify URIs instead of Spotify URLs. Will only work if you have Spotify installed and might not work on all platforms",
+            default: false
+        }
     },
     patches: [
         {

From 9d41b360c9190b8c62061b302155cfb6742044b2 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 30 Mar 2023 01:35:42 +0200
Subject: [PATCH 077/147] Fix NoTrack

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

diff --git a/src/plugins/noTrack.ts b/src/plugins/noTrack.ts
index 617ab8b49..3287e6a67 100644
--- a/src/plugins/noTrack.ts
+++ b/src/plugins/noTrack.ts
@@ -35,8 +35,8 @@ export default definePlugin({
         {
             find: "window.DiscordSentry=",
             replacement: {
-                match: /window\.DiscordSentry=function.+\}\(\)/,
-                replace: "",
+                match: /^.+$/,
+                replace: "()=>{}",
             }
         },
         {

From 6acdaf207d4c62918217be3ab692646cdb5ace11 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 30 Mar 2023 01:41:18 +0200
Subject: [PATCH 078/147] NoTrack: Update description & authors

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

diff --git a/src/plugins/noTrack.ts b/src/plugins/noTrack.ts
index 3287e6a67..4920ce20c 100644
--- a/src/plugins/noTrack.ts
+++ b/src/plugins/noTrack.ts
@@ -21,8 +21,8 @@ import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "NoTrack",
-    description: "Disable Discord's tracking and crash reporting",
-    authors: [Devs.Cyn],
+    description: "Disable Discord's tracking ('science'), metrics and Sentry crash reporting",
+    authors: [Devs.Cyn, Devs.Ven, Devs.Nuckyz],
     required: true,
     patches: [
         {

From 48e9b1be7a638d7b2f0ac01f8244dab43836cbdf Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 30 Mar 2023 15:58:20 +0200
Subject: [PATCH 079/147] new Plugin: GifPaste - Insert Gif links instead of
 sending

---
 src/plugins/gifPaste.ts | 47 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 src/plugins/gifPaste.ts

diff --git a/src/plugins/gifPaste.ts b/src/plugins/gifPaste.ts
new file mode 100644
index 000000000..9b6e8a99b
--- /dev/null
+++ b/src/plugins/gifPaste.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 { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { filters, findLazy, mapMangledModuleLazy } from "@webpack";
+
+const ExpressionPickerState = mapMangledModuleLazy('name:"expression-picker-last-active-view"', {
+    close: filters.byCode("activeView:null", "setState")
+});
+const ComponentDispatch = findLazy(m => m.emitter?._events?.INSERT_TEXT);
+
+export default definePlugin({
+    name: "GifPaste",
+    description: "Makes picking a gif in the gif picker insert a link into the chatbox instead of instantly sending it",
+    authors: [Devs.Ven],
+
+    patches: [{
+        find: ".handleSelectGIF=",
+        replacement: {
+            match: /\.handleSelectGIF=function.+?\{/,
+            replace: ".handleSelectGIF=function(gif){return $self.handleSelect(gif);"
+        }
+    }],
+
+    handleSelect(gif?: { url: string; }) {
+        if (gif) {
+            ComponentDispatch.dispatchToLastSubscribed("INSERT_TEXT", { rawText: gif.url + " " });
+            ExpressionPickerState.close();
+        }
+    }
+});

From 035d1e24b2fc146d8bf8a621a57974008193eae7 Mon Sep 17 00:00:00 2001
From: whqwert <94757998+whqwert@users.noreply.github.com>
Date: Thu, 30 Mar 2023 10:09:04 -0500
Subject: [PATCH 080/147] feat(SpotifyControls): Fix background color for
 built-in themes (#731)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/spotifyControls/spotifyStyles.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/plugins/spotifyControls/spotifyStyles.css b/src/plugins/spotifyControls/spotifyStyles.css
index 63a06e3b0..18fb1754d 100644
--- a/src/plugins/spotifyControls/spotifyStyles.css
+++ b/src/plugins/spotifyControls/spotifyStyles.css
@@ -5,6 +5,14 @@
     --vc-spotify-green: #1db954; /* so cusotm themes can easily change it */
 }
 
+.theme-light #vc-spotify-player {
+    background: var(--bg-overlay-3, var(--background-secondary-alt));
+}
+
+.theme-dark #vc-spotify-player {
+    background: var(--bg-overlay-1, var(--background-secondary-alt));
+}
+
 .vc-spotify-button {
     background: none;
     color: var(--interactive-normal);

From 708c16176b9a8353a7460dd313a0cc441f679c21 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 30 Mar 2023 23:47:22 +0200
Subject: [PATCH 081/147] Remove transparency feature

This not only causes incredibly confusion among users because they
expect it to work without themes, it also causes freezes/whitescreens
for some users. Thus, this feature is disabled for now until someone
contributes a fix!
---
 src/components/VencordSettings/VencordTab.tsx | 2 +-
 src/patcher.ts                                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx
index 5ac120d7c..120f4c520 100644
--- a/src/components/VencordSettings/VencordTab.tsx
+++ b/src/components/VencordSettings/VencordTab.tsx
@@ -72,7 +72,7 @@ function VencordSettings() {
                 title: "Use Windows' native title bar instead of Discord's custom one",
                 note: "Requires a full restart"
             }),
-            !IS_WEB && {
+            !IS_WEB && false /* This causes electron to freeze / white screen for some people */ && {
                 key: "transparent",
                 title: "Enable window transparency",
                 note: "Requires a full restart"
diff --git a/src/patcher.ts b/src/patcher.ts
index 9752a0441..ba906d5c5 100644
--- a/src/patcher.ts
+++ b/src/patcher.ts
@@ -83,10 +83,12 @@ if (!process.argv.includes("--vanilla")) {
                     delete options.frame;
                 }
 
+                /* This causes electron to freeze / white screen for some people
                 if (settings.transparent) {
                     options.transparent = true;
                     options.backgroundColor = "#00000000";
                 }
+                */
 
                 process.env.DISCORD_PRELOAD = original;
 

From 906c265aea19c3e25a1d9ddb49d11e3d341f50c4 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 31 Mar 2023 00:15:51 +0200
Subject: [PATCH 082/147] FakeNitro: Fix fake emote rendering incorrectly in
 thread previews

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

diff --git a/src/plugins/fakeNitro.tsx b/src/plugins/fakeNitro.tsx
index 5e8c38197..e703af563 100644
--- a/src/plugins/fakeNitro.tsx
+++ b/src/plugins/fakeNitro.tsx
@@ -204,7 +204,7 @@ export default definePlugin({
                 },
                 {
                     match: /(?=return{hasSpoilerEmbeds:\i,content:(\i)})/,
-                    replace: (_, content) => `${content}=$self.patchFakeNitroEmojis(${content});`
+                    replace: (_, content) => `${content}=$self.patchFakeNitroEmojis(${content},arguments[2]?.formatInline);`
                 }
             ]
         },
@@ -333,7 +333,7 @@ export default definePlugin({
 
     EmojiComponent: null as any,
 
-    patchFakeNitroEmojis(content: Array<any>) {
+    patchFakeNitroEmojis(content: Array<any>, inline: boolean) {
         if (!this.EmojiComponent) return content;
 
         const newContent: Array<any> = [];
@@ -353,7 +353,7 @@ export default definePlugin({
             newContent.push((
                 <this.EmojiComponent node={{
                     type: "customEmoji",
-                    jumboable: content.length === 1,
+                    jumboable: !inline && content.length === 1,
                     animated: fakeNitroMatch[2] === "gif",
                     name: ":FakeNitroEmoji:",
                     emojiId: fakeNitroMatch[1]

From ff16513f217bd55920e0a26ca24c7c5cf7f4b270 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 31 Mar 2023 01:18:57 +0200
Subject: [PATCH 083/147] Fix onHeadersReceived clashes when using OpenAsar
 (fix github raw styles)

---
 src/patcher.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/patcher.ts b/src/patcher.ts
index ba906d5c5..89c636c71 100644
--- a/src/patcher.ts
+++ b/src/patcher.ts
@@ -17,7 +17,7 @@
 */
 
 import { onceDefined } from "@utils/onceDefined";
-import electron, { app, BrowserWindowConstructorOptions, Menu } from "electron";
+import electron, { app, BrowserWindowConstructorOptions, Menu, protocol, session } from "electron";
 import { dirname, join } from "path";
 
 import { initIpc } from "./ipcMain";
@@ -118,10 +118,10 @@ if (!process.argv.includes("--vanilla")) {
 
     process.env.DATA_DIR = join(app.getPath("userData"), "..", "Vencord");
 
-    electron.app.whenReady().then(() => {
+    app.whenReady().then(() => {
         // Source Maps! Maybe there's a better way but since the renderer is executed
         // from a string I don't think any other form of sourcemaps would work
-        electron.protocol.registerFileProtocol("vencord", ({ url: unsafeUrl }, cb) => {
+        protocol.registerFileProtocol("vencord", ({ url: unsafeUrl }, cb) => {
             let url = unsafeUrl.slice("vencord://".length);
             if (url.endsWith("/")) url = url.slice(0, -1);
             switch (url) {
@@ -177,7 +177,7 @@ if (!process.argv.includes("--vanilla")) {
             }
         }
 
-        electron.session.defaultSession.webRequest.onHeadersReceived(({ responseHeaders, resourceType }, cb) => {
+        session.defaultSession.webRequest.onHeadersReceived(({ responseHeaders, resourceType }, cb) => {
             if (responseHeaders) {
                 if (resourceType === "mainFrame")
                     patchCsp(responseHeaders, "content-security-policy");
@@ -189,6 +189,11 @@ if (!process.argv.includes("--vanilla")) {
             }
             cb({ cancel: false, responseHeaders });
         });
+
+        // assign a noop to onHeadersReceived to prevent other mods from adding their own incompatible ones.
+        // For instance, OpenAsar adds their own that doesn't fix content-type for stylesheets which makes it
+        // impossible to load css from github raw despite our fix above
+        session.defaultSession.webRequest.onHeadersReceived = () => { };
     });
 } else {
     console.log("[Vencord] Running in vanilla mode. Not loading Vencord");

From c86a34a15d189c67ce8edd2f23aec37f2440d07c Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Fri, 31 Mar 2023 05:30:45 +0200
Subject: [PATCH 084/147] Update 1_INSTALLING.md

---
 docs/1_INSTALLING.md | 102 +------------------------------------------
 1 file changed, 1 insertion(+), 101 deletions(-)

diff --git a/docs/1_INSTALLING.md b/docs/1_INSTALLING.md
index 7fcd57abd..e69dcc109 100644
--- a/docs/1_INSTALLING.md
+++ b/docs/1_INSTALLING.md
@@ -27,11 +27,9 @@ Welcome to Megu's Installation Guide! In this file, you will learn about how to
 
 ## Installing Vencord
 
-> :exclamation: If this doesn't work, see [Manually Installing Vencord](#manually-installing-vencord)
-
 Install `pnpm`:
 
-> :exclamation: This next command may need to be run as admin/sudo depending on your system, and you may need to close and reopen your terminal for pnpm to be in your PATH.
+> :exclamation: This next command may need to be run as admin/root depending on your system, and you may need to close and reopen your terminal for pnpm to be in your PATH.
 
 ```shell
 npm i -g pnpm
@@ -103,102 +101,4 @@ Simply run:
 pnpm uninject
 ```
 
-The above command may ask you to also run:
-
-```shell
-pnpm install --frozen-lockfile
-pnpm uninject
-```
-
-## Manually Installing Vencord
-
--   [Windows](#on-windows)
--   [Linux](#on-linux)
--   [MacOS](#on-macos)
-
-### On Windows
-
-Press Win+R and enter: `%LocalAppData%` and hit enter. In this page, find the page (Discord, DiscordPTB, DiscordCanary, etc) that you want to patch.
-
-Now follow the instructions at [Manual Patching](#manual-patching)
-
-### On Linux
-
-The Discord folder is usually in one of the following paths:
-
--   /usr/share
--   /usr/lib64
--   /opt
--   /home/$USER/.local/share
-
-If you use flatpak, it will usually be in one of the following paths:
-
--   /var/lib/flatpak/app/com.discordapp.Discord/current/active/files
--   /home/$USER/.local/share/flatpak/app/com.discordapp.Discord/current/active/files
-
-You will need to give flatpak access to vencord with one of the following commands:
-
-> :exclamation: If not on stable, replace `com.discordapp.Discord` with your branch name, e.g., `com.discordapp.DiscordCanary`
-
-> :exclamation: Replace `/path/to/vencord/` with the path to your vencord folder (NOT the dist folder)
-
-If Discord flatpak install is in /home/:
-
-```shell
-flatpak override --user com.discordapp.Discord --filesystem="/path/to/vencord/"
-```
-
-If Discord flatpak install not in /home/:
-
-```shell
-sudo flatpak override com.discordapp.Discord --filesystem="/path/to/vencord"
-```
-
-Now follow the instructions at [Manual Patching](#manual-patching)
-
-### On MacOS
-
-Open finder and go to your Applications folder. Right-Click on the Discord application you want to patch, and view contents.
-
-Go to the `Contents/Resources` folder.
-
-Now follow the instructions at [Manual Patching](#manual-patching)
-
-### Manual Patching
-
-> :exclamation: If using Flatpak on linux, go to the folder that contains the `app.asar` file, and skip to where we create the `app` folder below.
-
-> :exclamation: On Linux/MacOS, there's a chance there won't be an `app-<number>` folder, but there probably is a `resources` folder, so keep reading :)
-
-Inside there, look for the `app-<number>` folders. If you have multiple, use the highest number. If that doesn't work, do it for the rest of the `app-<number>` folders.
-
-Inside there, go to the `resources` folder. There should be a file called `app.asar`. If there isn't, look at a different `app-<number>` folder instead.
-
-Make a new folder in `resources` called `app`. In here, we will make two files:
-
-`package.json` and `index.js`
-
-In `index.js`:
-
-> :exclamation: Replace the path in the first line with the path to `patcher.js` in your vencord dist folder.
-> On Windows, you can get this by shift-rightclicking the patcher.js file and selecting "copy as path"
-
-```js
-require("C:/Users/<your user>/path/to/vencord/dist/patcher.js");
-```
-
-And in `package.json`:
-
-```json
-{ "name": "discord", "main": "index.js" }
-```
-
-Finally, fully close & reopen your Discord client and check to see that `Vencord` appears in settings!
-
-### Manually Uninstalling Vencord
-
-> :exclamation: Do not delete `app.asar` - Only delete the `app` folder we created.
-
-Use the instructions above to find the `app` folder, and delete it. Then Close & Reopen Discord.
-
 If you need more help, ask in the support channel in our [Discord Server](https://discord.gg/D9uwnFnqmd).

From efd99276961ffeaf9440521f2a902ee4f9b5f5ed Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 31 Mar 2023 05:55:17 +0200
Subject: [PATCH 085/147] Fix broken plugins

---
 src/plugins/apiMessagePopover.ts | 6 +++---
 src/plugins/pronoundb/index.ts   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/apiMessagePopover.ts b/src/plugins/apiMessagePopover.ts
index a17cac315..be4b6393a 100644
--- a/src/plugins/apiMessagePopover.ts
+++ b/src/plugins/apiMessagePopover.ts
@@ -22,12 +22,12 @@ import definePlugin from "@utils/types";
 export default definePlugin({
     name: "MessagePopoverAPI",
     description: "API to add buttons to message popovers.",
-    authors: [Devs.KingFish, Devs.Ven],
+    authors: [Devs.KingFish, Devs.Ven, Devs.Nuckyz],
     patches: [{
         find: "Messages.MESSAGE_UTILITIES_A11Y_LABEL",
         replacement: {
-            // foo && !bar ? createElement(blah,...makeElement(addReactionData))
-            match: /\i&&!\i\?\(0,\i\.jsxs?\)\(.{0,200}renderPopout:.{0,300}?(\i)\(.{3,20}\{key:"add-reaction".+?\}/,
+            // foo && !bar ? createElement(reactionStuffs)... createElement(blah,...makeElement(reply-other))
+            match: /\i&&!\i\?\(0,\i\.jsxs?\)\(.{0,200}renderEmojiPicker:.{0,500}\?(\i)\(\{key:"reply-other"/,
             replace: (m, makeElement) => {
                 const msg = m.match(/message:(.{1,3}),/)?.[1];
                 if (!msg) throw new Error("Could not find message variable");
diff --git a/src/plugins/pronoundb/index.ts b/src/plugins/pronoundb/index.ts
index 55871912c..59ade8da8 100644
--- a/src/plugins/pronoundb/index.ts
+++ b/src/plugins/pronoundb/index.ts
@@ -63,8 +63,8 @@ export default definePlugin({
         {
             find: ".Messages.USER_POPOUT_PRONOUNS",
             replacement: {
-                match: /\i\.\i\.useExperiment\({}\)\.showPronouns/,
-                replace: "true"
+                match: /\.showPronouns/,
+                replace: ".showPronouns||true"
             }
         }
     ],

From 84a649a6716ca7634f2dc1629c7b5e0bec84881d Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 31 Mar 2023 05:56:08 +0200
Subject: [PATCH 086/147] docs: fix ToC

---
 docs/1_INSTALLING.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/1_INSTALLING.md b/docs/1_INSTALLING.md
index e69dcc109..5bce6b79d 100644
--- a/docs/1_INSTALLING.md
+++ b/docs/1_INSTALLING.md
@@ -13,12 +13,6 @@ Welcome to Megu's Installation Guide! In this file, you will learn about how to
   - [Installing Vencord](#installing-vencord)
   - [Updating Vencord](#updating-vencord)
   - [Uninstalling Vencord](#uninstalling-vencord)
-  - [Manually Installing Vencord](#manually-installing-vencord)
-    - [On Windows](#on-windows)
-    - [On Linux](#on-linux)
-    - [On MacOS](#on-macos)
-    - [Manual Patching](#manual-patching)
-    - [Manually Uninstalling Vencord](#manually-uninstalling-vencord)
 
 ## Dependencies
 

From 5340ea7ba0b2eed5acd18c1c48715542a05ac248 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 31 Mar 2023 05:59:45 +0200
Subject: [PATCH 087/147] Add back window transparency with temporary unsafe
 settings key

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

diff --git a/src/patcher.ts b/src/patcher.ts
index 89c636c71..b1f47b0d1 100644
--- a/src/patcher.ts
+++ b/src/patcher.ts
@@ -83,12 +83,11 @@ if (!process.argv.includes("--vanilla")) {
                     delete options.frame;
                 }
 
-                /* This causes electron to freeze / white screen for some people
-                if (settings.transparent) {
+                // This causes electron to freeze / white screen for some people
+                if ((settings as any).transparentUNSAFE_USE_AT_OWN_RISK) {
                     options.transparent = true;
                     options.backgroundColor = "#00000000";
                 }
-                */
 
                 process.env.DISCORD_PRELOAD = original;
 

From 081b01b667e9b114e90281cc215184e9b03d5482 Mon Sep 17 00:00:00 2001
From: Berlin <39058370+somerandomcloud@users.noreply.github.com>
Date: Fri, 31 Mar 2023 06:09:19 +0200
Subject: [PATCH 088/147] feat(plugin): Wikisearch (#585)

Co-authored-by: Ven <vendicated@riseup.net>
---
 src/plugins/wikisearch.ts | 110 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 src/plugins/wikisearch.ts

diff --git a/src/plugins/wikisearch.ts b/src/plugins/wikisearch.ts
new file mode 100644
index 000000000..81dc37af1
--- /dev/null
+++ b/src/plugins/wikisearch.ts
@@ -0,0 +1,110 @@
+/*
+ * 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 { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, sendBotMessage } from "@api/Commands";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "Wikisearch",
+    description: "Searches Wikipedia for your requested query. (/wikisearch)",
+    authors: [Devs.Samu],
+    dependencies: ["CommandsAPI"],
+    commands: [
+        {
+            name: "wikisearch",
+            description: "Searches Wikipedia for your request.",
+            inputType: ApplicationCommandInputType.BUILT_IN,
+            options: [
+                {
+                    name: "search",
+                    description: "Word to search for",
+                    type: ApplicationCommandOptionType.STRING,
+                    required: true
+                },
+            ],
+            execute: async (_, ctx) => {
+                const word = findOption(_, "search", "");
+
+                if (!word) {
+                    return sendBotMessage(ctx.channel.id, {
+                        content: "No word was defined!"
+                    });
+                }
+
+                const dataSearchParams = new URLSearchParams({
+                    action: "query",
+                    format: "json",
+                    list: "search",
+                    formatversion: "2",
+                    origin: "*",
+                    srsearch: word
+                });
+
+                const data = await fetch("https://en.wikipedia.org/w/api.php?" + dataSearchParams).then(response => response.json())
+                    .catch(err => {
+                        console.log(err);
+                        sendBotMessage(ctx.channel.id, { content: "There was an error. Check the console for more info" });
+                        return null;
+                    });
+
+                if (!data) return;
+
+                if (!data.query?.search?.length) {
+                    console.log(data);
+                    return sendBotMessage(ctx.channel.id, { content: "No results given" });
+                }
+
+                const altData = await fetch(`https://en.wikipedia.org/w/api.php?action=query&format=json&prop=info%7Cdescription%7Cimages%7Cimageinfo%7Cpageimages&list=&meta=&indexpageids=1&pageids=${data.query.search[0].pageid}&formatversion=2&origin=*`)
+                    .then(res => res.json())
+                    .then(data => data.query.pages[0])
+                    .catch(err => {
+                        console.log(err);
+                        sendBotMessage(ctx.channel.id, { content: "There was an error. Check the console for more info" });
+                        return null;
+                    });
+
+                if (!altData) return;
+
+                const thumbnailData = altData.thumbnail;
+
+                const thumbnail = thumbnailData && {
+                    url: thumbnailData.source.replace(/(50px-)/ig, "1000px-"),
+                    height: thumbnailData.height * 100,
+                    width: thumbnailData.width * 100
+                };
+
+                sendBotMessage(ctx.channel.id, {
+                    embeds: [
+                        {
+                            type: "rich",
+                            title: data.query.search[0].title,
+                            url: `https://wikipedia.org/w/index.php?curid=${data.query.search[0].pageid}`,
+                            color: "0x8663BE",
+                            description: data.query.search[0].snippet.replace(/(&nbsp;|<([^>]+)>)/ig, "").replace(/(&quot;)/ig, "\"") + "...",
+                            image: thumbnail,
+                            footer: {
+                                text: "Powered by the Wikimedia API",
+                            },
+                        }
+                    ] as any
+                });
+            }
+        }
+    ]
+});

From dae7cb67efbc2b8a7483d87e7200711edc224e3b Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 31 Mar 2023 01:11:15 -0300
Subject: [PATCH 089/147] Fix IgnoreActivities broken patch (#743)

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

diff --git a/src/plugins/ignoreActivities.tsx b/src/plugins/ignoreActivities.tsx
index 07b458f80..ec64a99b8 100644
--- a/src/plugins/ignoreActivities.tsx
+++ b/src/plugins/ignoreActivities.tsx
@@ -147,8 +147,8 @@ export default definePlugin({
         {
             find: ".Messages.SETTINGS_GAMES_TOGGLE_OVERLAY",
             replacement: {
-                match: /!(\i)\|\|(null==\i\)return null;var \i=(\i)\.overlay.+?children:)(\[.{0,70}overlayStatusText.+?\])(?=}\)}\(\))/,
-                replace: (_, platformCheck, restWithoutPlatformCheck, props, children) => ""
+                match: /!(\i)(\)return null;var \i=(\i)\.overlay.+?children:)(\[.{0,70}overlayStatusText.+?\])(?=}\)}\(\))/,
+                replace: (_, platformCheck, restWithoutPlatformCheck, props, children) => "false"
                     + `${restWithoutPlatformCheck}`
                     + `(${platformCheck}?${children}:[])`
                     + `.concat(Vencord.Plugins.plugins.IgnoreActivities.renderToggleGameActivityButton(${props}))`

From 2c8ebdce7d9715dbf59e5b8335911c701edda0fd Mon Sep 17 00:00:00 2001
From: nick <69434290+lelboatz@users.noreply.github.com>
Date: Fri, 31 Mar 2023 01:07:35 -0400
Subject: [PATCH 090/147] feat(plugin): RelationshipNotifier (#450)

Co-authored-by: Ven <vendicated@riseup.net>
---
 src/plugins/relationshipNotifier/events.ts    |  40 +++++
 src/plugins/relationshipNotifier/functions.ts |  87 ++++++++++
 src/plugins/relationshipNotifier/index.ts     |  70 ++++++++
 src/plugins/relationshipNotifier/settings.ts  |  53 +++++++
 src/plugins/relationshipNotifier/types.ts     |  62 ++++++++
 src/plugins/relationshipNotifier/utils.ts     | 149 ++++++++++++++++++
 src/utils/constants.ts                        |   4 +
 7 files changed, 465 insertions(+)
 create mode 100644 src/plugins/relationshipNotifier/events.ts
 create mode 100644 src/plugins/relationshipNotifier/functions.ts
 create mode 100644 src/plugins/relationshipNotifier/index.ts
 create mode 100644 src/plugins/relationshipNotifier/settings.ts
 create mode 100644 src/plugins/relationshipNotifier/types.ts
 create mode 100644 src/plugins/relationshipNotifier/utils.ts

diff --git a/src/plugins/relationshipNotifier/events.ts b/src/plugins/relationshipNotifier/events.ts
new file mode 100644
index 000000000..1600484f4
--- /dev/null
+++ b/src/plugins/relationshipNotifier/events.ts
@@ -0,0 +1,40 @@
+/*
+ * 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 { FluxEvents } from "@webpack/types";
+
+import { onChannelDelete, onGuildDelete, onRelationshipRemove } from "./functions";
+import { syncFriends, syncGroups, syncGuilds } from "./utils";
+
+export const FluxHandlers: Partial<Record<FluxEvents, Array<(data: any) => void>>> = {
+    GUILD_CREATE: [syncGuilds],
+    GUILD_DELETE: [onGuildDelete],
+    CHANNEL_CREATE: [syncGroups],
+    CHANNEL_DELETE: [onChannelDelete],
+    RELATIONSHIP_ADD: [syncFriends],
+    RELATIONSHIP_UPDATE: [syncFriends],
+    RELATIONSHIP_REMOVE: [syncFriends, onRelationshipRemove]
+};
+
+export function forEachEvent(fn: (event: FluxEvents, handler: (data: any) => void) => void) {
+    for (const event in FluxHandlers) {
+        for (const cb of FluxHandlers[event]) {
+            fn(event as FluxEvents, cb);
+        }
+    }
+}
diff --git a/src/plugins/relationshipNotifier/functions.ts b/src/plugins/relationshipNotifier/functions.ts
new file mode 100644
index 000000000..c9ec6e3ac
--- /dev/null
+++ b/src/plugins/relationshipNotifier/functions.ts
@@ -0,0 +1,87 @@
+/*
+ * 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 { UserUtils } from "@webpack/common";
+
+import settings from "./settings";
+import { ChannelDelete, ChannelType, GuildDelete, RelationshipRemove, RelationshipType } from "./types";
+import { deleteGroup, deleteGuild, getGroup, getGuild, notify } from "./utils";
+
+let manuallyRemovedFriend: string | undefined;
+let manuallyRemovedGuild: string | undefined;
+let manuallyRemovedGroup: string | undefined;
+
+export const removeFriend = (id: string) => manuallyRemovedFriend = id;
+export const removeGuild = (id: string) => manuallyRemovedGuild = id;
+export const removeGroup = (id: string) => manuallyRemovedGroup = id;
+
+export async function onRelationshipRemove({ relationship: { type, id } }: RelationshipRemove) {
+    if (manuallyRemovedFriend === id) {
+        manuallyRemovedFriend = undefined;
+        return;
+    }
+
+    const user = await UserUtils.fetchUser(id)
+        .catch(() => null);
+    if (!user) return;
+
+    switch (type) {
+        case RelationshipType.FRIEND:
+            if (settings.store.friends)
+                notify(`${user.tag} removed you as a friend.`, user.getAvatarURL(undefined, undefined, false));
+            break;
+        case RelationshipType.FRIEND_REQUEST:
+            if (settings.store.friendRequestCancels)
+                notify(`A friend request from ${user.tag} has been removed.`, user.getAvatarURL(undefined, undefined, false));
+            break;
+    }
+}
+
+export function onGuildDelete({ guild: { id, unavailable } }: GuildDelete) {
+    if (!settings.store.servers) return;
+    if (unavailable) return;
+
+    if (manuallyRemovedGuild === id) {
+        deleteGuild(id);
+        manuallyRemovedGuild = undefined;
+        return;
+    }
+
+    const guild = getGuild(id);
+    if (guild) {
+        deleteGuild(id);
+        notify(`You were removed from the server ${guild.name}.`, guild.iconURL);
+    }
+}
+
+export function onChannelDelete({ channel: { id, type } }: ChannelDelete) {
+    if (!settings.store.groups) return;
+    if (type !== ChannelType.GROUP_DM) return;
+
+    if (manuallyRemovedGroup === id) {
+        deleteGroup(id);
+        manuallyRemovedGroup = undefined;
+        return;
+    }
+
+    const group = getGroup(id);
+    if (group) {
+        deleteGroup(id);
+        notify(`You were removed from the group ${group.name}.`, group.iconURL);
+    }
+}
diff --git a/src/plugins/relationshipNotifier/index.ts b/src/plugins/relationshipNotifier/index.ts
new file mode 100644
index 000000000..fb91ca37b
--- /dev/null
+++ b/src/plugins/relationshipNotifier/index.ts
@@ -0,0 +1,70 @@
+/*
+ * 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 { FluxDispatcher } from "@webpack/common";
+
+import { forEachEvent } from "./events";
+import { removeFriend, removeGroup, removeGuild } from "./functions";
+import settings from "./settings";
+import { syncAndRunChecks } from "./utils";
+
+export default definePlugin({
+    name: "RelationshipNotifier",
+    description: "Notifies you when a friend, group chat, or server removes you.",
+    authors: [Devs.nick],
+    settings,
+
+    patches: [
+        {
+            find: "removeRelationship:function(",
+            replacement: {
+                match: /(removeRelationship:function\((\i),\i,\i\){)/,
+                replace: "$1$self.removeFriend($2);"
+            }
+        },
+        {
+            find: "leaveGuild:function(",
+            replacement: {
+                match: /(leaveGuild:function\((\i)\){)/,
+                replace: "$1$self.removeGuild($2);"
+            }
+        },
+        {
+            find: "closePrivateChannel:function(",
+            replacement: {
+                match: /(closePrivateChannel:function\((\i)\){)/,
+                replace: "$1$self.removeGroup($2);"
+            }
+        }
+    ],
+
+    async start() {
+        await syncAndRunChecks();
+        forEachEvent((ev, cb) => FluxDispatcher.subscribe(ev, cb));
+    },
+
+    stop() {
+        forEachEvent((ev, cb) => FluxDispatcher.unsubscribe(ev, cb));
+    },
+
+    removeFriend,
+    removeGroup,
+    removeGuild
+});
diff --git a/src/plugins/relationshipNotifier/settings.ts b/src/plugins/relationshipNotifier/settings.ts
new file mode 100644
index 000000000..1ed36ea77
--- /dev/null
+++ b/src/plugins/relationshipNotifier/settings.ts
@@ -0,0 +1,53 @@
+/*
+ * 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";
+
+export default definePluginSettings({
+    notices: {
+        type: OptionType.BOOLEAN,
+        description: "Also show a notice at the top of your screen when removed (use this if you don't want to miss any notifications).",
+        default: false
+    },
+    offlineRemovals: {
+        type: OptionType.BOOLEAN,
+        description: "Notify you when starting discord if you were removed while offline.",
+        default: true
+    },
+    friends: {
+        type: OptionType.BOOLEAN,
+        description: "Notify when a friend removes you",
+        default: true
+    },
+    friendRequestCancels: {
+        type: OptionType.BOOLEAN,
+        description: "Notify when a friend request is cancelled",
+        default: true
+    },
+    servers: {
+        type: OptionType.BOOLEAN,
+        description: "Notify when removed from a server",
+        default: true
+    },
+    groups: {
+        type: OptionType.BOOLEAN,
+        description: "Notify when removed from a group chat",
+        default: true
+    }
+});
diff --git a/src/plugins/relationshipNotifier/types.ts b/src/plugins/relationshipNotifier/types.ts
new file mode 100644
index 000000000..d49413ab9
--- /dev/null
+++ b/src/plugins/relationshipNotifier/types.ts
@@ -0,0 +1,62 @@
+/*
+ * 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 { Channel } from "discord-types/general";
+
+export interface ChannelDelete {
+    type: "CHANNEL_DELETE";
+    channel: Channel;
+}
+
+export interface GuildDelete {
+    type: "GUILD_DELETE";
+    guild: {
+        id: string;
+        unavailable?: boolean;
+    };
+}
+
+export interface RelationshipRemove {
+    type: "RELATIONSHIP_REMOVE";
+    relationship: {
+        id: string;
+        nickname: string;
+        type: number;
+    };
+}
+
+export interface SimpleGroupChannel {
+    id: string;
+    name: string;
+    iconURL?: string;
+}
+
+export interface SimpleGuild {
+    id: string;
+    name: string;
+    iconURL?: string;
+}
+
+export const enum ChannelType {
+    GROUP_DM = 3,
+}
+
+export const enum RelationshipType {
+    FRIEND = 1,
+    FRIEND_REQUEST = 3,
+}
diff --git a/src/plugins/relationshipNotifier/utils.ts b/src/plugins/relationshipNotifier/utils.ts
new file mode 100644
index 000000000..09a329a3e
--- /dev/null
+++ b/src/plugins/relationshipNotifier/utils.ts
@@ -0,0 +1,149 @@
+/*
+ * 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, Notices } from "@api/index";
+import { showNotification } from "@api/Notifications";
+import { ChannelStore, GuildStore, RelationshipStore, UserUtils } from "@webpack/common";
+
+import settings from "./settings";
+import { ChannelType, RelationshipType, SimpleGroupChannel, SimpleGuild } from "./types";
+
+const guilds = new Map<string, SimpleGuild>();
+const groups = new Map<string, SimpleGroupChannel>();
+const friends = {
+    friends: [] as string[],
+    requests: [] as string[]
+};
+
+export async function syncAndRunChecks() {
+    const [oldGuilds, oldGroups, oldFriends] = await DataStore.getMany([
+        "relationship-notifier-guilds",
+        "relationship-notifier-groups",
+        "relationship-notifier-friends"
+    ]) as [Map<string, SimpleGuild> | undefined, Map<string, SimpleGroupChannel> | undefined, Record<"friends" | "requests", string[]> | undefined];
+
+    await Promise.all([syncGuilds(), syncGroups(), syncFriends()]);
+
+    if (settings.store.offlineRemovals) {
+        if (settings.store.groups && oldGroups?.size) {
+            for (const [id, group] of oldGroups) {
+                if (!groups.has(id))
+                    notify(`You are no longer in the group ${group.name}.`, group.iconURL);
+            }
+        }
+
+        if (settings.store.servers && oldGuilds?.size) {
+            for (const [id, guild] of oldGuilds) {
+                if (!guilds.has(id))
+                    notify(`You are no longer in the server ${guild.name}.`, guild.iconURL);
+            }
+        }
+
+        if (settings.store.friends && oldFriends?.friends.length) {
+            for (const id of oldFriends.friends) {
+                if (friends.friends.includes(id)) continue;
+
+                const user = await UserUtils.fetchUser(id).catch(() => void 0);
+                if (user)
+                    notify(`You are no longer friends with ${user.tag}.`, user.getAvatarURL(undefined, undefined, false));
+            }
+        }
+
+        if (settings.store.friendRequestCancels && oldFriends?.requests?.length) {
+            for (const id of oldFriends.requests) {
+                if (friends.requests.includes(id)) continue;
+
+                const user = await UserUtils.fetchUser(id).catch(() => void 0);
+                if (user)
+                    notify(`Friend request from ${user.tag} has been revoked.`, user.getAvatarURL(undefined, undefined, false));
+            }
+        }
+    }
+}
+
+export function notify(text: string, icon?: string) {
+    if (settings.store.notices)
+        Notices.showNotice(text, "OK", () => Notices.popNotice());
+
+    showNotification({
+        title: "Relationship Notifier",
+        body: text,
+        icon
+    });
+}
+
+export function getGuild(id: string) {
+    return guilds.get(id);
+}
+
+export function deleteGuild(id: string) {
+    guilds.delete(id);
+    syncGuilds();
+}
+
+export async function syncGuilds() {
+    for (const [id, { name, icon }] of Object.entries(GuildStore.getGuilds())) {
+        guilds.set(id, {
+            id,
+            name,
+            iconURL: icon && `https://cdn.discordapp.com/icons/${id}/${icon}.png`
+        });
+    }
+    await DataStore.set("relationship-notifier-guilds", guilds);
+}
+
+export function getGroup(id: string) {
+    return groups.get(id);
+}
+
+export function deleteGroup(id: string) {
+    groups.delete(id);
+    syncGroups();
+}
+
+export async function syncGroups() {
+    for (const { type, id, name, rawRecipients, icon } of ChannelStore.getSortedPrivateChannels()) {
+        if (type === ChannelType.GROUP_DM)
+            groups.set(id, {
+                id,
+                name: name || rawRecipients.map(r => r.username).join(", "),
+                iconURL: icon && `https://cdn.discordapp.com/channel-icons/${id}/${icon}.png`
+            });
+    }
+
+    await DataStore.set("relationship-notifier-groups", groups);
+}
+
+export async function syncFriends() {
+    friends.friends = [];
+    friends.requests = [];
+
+    const relationShips = RelationshipStore.getRelationships();
+    for (const id in relationShips) {
+        switch (relationShips[id]) {
+            case RelationshipType.FRIEND:
+                friends.friends.push(id);
+                break;
+            case RelationshipType.FRIEND_REQUEST:
+                friends.requests.push(id);
+                break;
+        }
+    }
+
+    await DataStore.set("relationship-notifier-friends", friends);
+}
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index c6277f557..473674af3 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -194,6 +194,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Captain",
         id: 347366054806159360n
     },
+    nick: {
+        name: "nick",
+        id: 347884694408265729n
+    },
     whqwert: {
         name: "whqwert",
         id: 586239091520176128n

From 4dff1c5bd5b16e926bc628acf11118344832a374 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 31 Mar 2023 17:17:50 +0200
Subject: [PATCH 091/147] RelationShipNotifier: Delay by 5s to fix false
 positives

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

diff --git a/src/plugins/relationshipNotifier/index.ts b/src/plugins/relationshipNotifier/index.ts
index fb91ca37b..6319142c0 100644
--- a/src/plugins/relationshipNotifier/index.ts
+++ b/src/plugins/relationshipNotifier/index.ts
@@ -56,7 +56,9 @@ export default definePlugin({
     ],
 
     async start() {
-        await syncAndRunChecks();
+        setTimeout(() => {
+            syncAndRunChecks();
+        }, 5000);
         forEachEvent((ev, cb) => FluxDispatcher.subscribe(ev, cb));
     },
 

From 6960a439c9c2af261517b00b0b16a7fc5756c48b Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sat, 1 Apr 2023 02:47:49 +0200
Subject: [PATCH 092/147] Add Notification log (#745)

---
 package.json                                  |   6 +-
 pnpm-lock.yaml                                |  16 ++
 scripts/build/buildWeb.mjs                    |   2 +-
 scripts/build/common.mjs                      |   2 +-
 src/Vencord.ts                                |   2 +
 .../Notifications/NotificationComponent.tsx   |  12 +-
 src/api/Notifications/Notifications.tsx       |   7 +
 src/api/Notifications/notificationLog.tsx     | 203 ++++++++++++++++++
 src/api/Notifications/styles.css              |  58 ++++-
 src/api/settings.ts                           |   4 +-
 src/components/VencordSettings/VencordTab.tsx |  28 ++-
 src/plugins/crashHandler.ts                   |   2 +
 src/plugins/devCompanion.dev.tsx              |   6 +-
 src/webpack/common/react.ts                   |   4 +-
 14 files changed, 333 insertions(+), 19 deletions(-)
 create mode 100644 src/api/Notifications/notificationLog.tsx

diff --git a/package.json b/package.json
index 6033de408..9a8548a61 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
     "private": "true",
     "version": "1.1.3",
     "description": "The cutest Discord client mod",
-    "keywords": [ ],
+    "keywords": [],
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {
         "url": "https://github.com/Vendicated/Vencord/issues"
@@ -34,11 +34,13 @@
     "dependencies": {
         "@vap/core": "0.0.12",
         "@vap/shiki": "0.10.3",
-        "fflate": "^0.7.4"
+        "fflate": "^0.7.4",
+        "nanoid": "^4.0.2"
     },
     "devDependencies": {
         "@types/diff": "^5.0.2",
         "@types/lodash": "^4.14.191",
+        "@types/nanoid": "^3.0.0",
         "@types/node": "^18.11.18",
         "@types/react": "^18.0.27",
         "@types/react-dom": "^18.0.10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 30ce7bba0..6ac1fb7ca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,6 +11,7 @@ patchedDependencies:
 specifiers:
   '@types/diff': ^5.0.2
   '@types/lodash': ^4.14.191
+  '@types/nanoid': ^3.0.0
   '@types/node': ^18.11.18
   '@types/react': ^18.0.27
   '@types/react-dom': ^18.0.10
@@ -31,6 +32,7 @@ specifiers:
   fflate: ^0.7.4
   highlight.js: 10.6.0
   moment: ^2.29.4
+  nanoid: ^4.0.2
   puppeteer-core: ^19.6.0
   standalone-electron-types: ^1.0.0
   stylelint: ^14.16.1
@@ -43,10 +45,12 @@ dependencies:
   '@vap/core': 0.0.12
   '@vap/shiki': 0.10.3
   fflate: 0.7.4
+  nanoid: 4.0.2
 
 devDependencies:
   '@types/diff': 5.0.2
   '@types/lodash': 4.14.191
+  '@types/nanoid': 3.0.0
   '@types/node': 18.11.18
   '@types/react': 18.0.27
   '@types/react-dom': 18.0.10
@@ -417,6 +421,13 @@ packages:
     resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
     dev: true
 
+  /@types/nanoid/3.0.0:
+    resolution: {integrity: sha512-UXitWSmXCwhDmAKe7D3hNQtQaHeHt5L8LO1CB8GF8jlYVzOv5cBWDNqiJ+oPEWrWei3i3dkZtHY/bUtd0R/uOQ==}
+    deprecated: This is a stub types definition. nanoid provides its own type definitions, so you do not need this installed.
+    dependencies:
+      nanoid: 4.0.2
+    dev: true
+
   /@types/node/18.11.18:
     resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==}
     dev: true
@@ -2245,6 +2256,11 @@ packages:
     hasBin: true
     dev: 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'}
diff --git a/scripts/build/buildWeb.mjs b/scripts/build/buildWeb.mjs
index dd7d32ebc..b9d361b6d 100644
--- a/scripts/build/buildWeb.mjs
+++ b/scripts/build/buildWeb.mjs
@@ -36,7 +36,7 @@ const commonOptions = {
     entryPoints: ["browser/Vencord.ts"],
     globalName: "Vencord",
     format: "iife",
-    external: ["plugins", "git-hash"],
+    external: ["plugins", "git-hash", "/assets/*"],
     plugins: [
         globPlugins,
         ...commonOpts.plugins,
diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
index 80c9ae1ad..53eb23f71 100644
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@@ -193,7 +193,7 @@ export const commonOpts = {
     legalComments: "linked",
     banner,
     plugins: [fileIncludePlugin, gitHashPlugin, gitRemotePlugin, stylePlugin],
-    external: ["~plugins", "~git-hash", "~git-remote"],
+    external: ["~plugins", "~git-hash", "~git-remote", "/assets/*"],
     inject: ["./scripts/build/inject/react.mjs"],
     jsxFactory: "VencordCreateElement",
     jsxFragment: "VencordFragment",
diff --git a/src/Vencord.ts b/src/Vencord.ts
index af6ca088a..00f8a58c0 100644
--- a/src/Vencord.ts
+++ b/src/Vencord.ts
@@ -54,6 +54,7 @@ async function init() {
                         title: "Vencord has been updated!",
                         body: "Click here to restart",
                         permanent: true,
+                        noPersist: true,
                         onClick() {
                             if (needsFullRestart)
                                 window.DiscordNative.app.relaunch();
@@ -69,6 +70,7 @@ async function init() {
                     title: "A Vencord update is available!",
                     body: "Click here to view the update",
                     permanent: true,
+                    noPersist: true,
                     onClick() {
                         SettingsRouter.open("VencordUpdater");
                     }
diff --git a/src/api/Notifications/NotificationComponent.tsx b/src/api/Notifications/NotificationComponent.tsx
index 53c1b8137..542c29bbf 100644
--- a/src/api/Notifications/NotificationComponent.tsx
+++ b/src/api/Notifications/NotificationComponent.tsx
@@ -20,6 +20,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 { NotificationData } from "./Notifications";
@@ -33,8 +34,10 @@ export default ErrorBoundary.wrap(function NotificationComponent({
     onClick,
     onClose,
     image,
-    permanent
-}: NotificationData) {
+    permanent,
+    className,
+    dismissOnClick
+}: NotificationData & { className?: string; }) {
     const { timeout, position } = useSettings(["notifications.timeout", "notifications.position"]).notifications;
     const hasFocus = useStateFromStores([WindowStore], () => WindowStore.isFocused());
 
@@ -61,11 +64,12 @@ export default ErrorBoundary.wrap(function NotificationComponent({
 
     return (
         <button
-            className="vc-notification-root"
+            className={classes("vc-notification-root", className)}
             style={position === "bottom-right" ? { bottom: "1rem" } : { top: "3rem" }}
             onClick={() => {
-                onClose!();
                 onClick?.();
+                if (dismissOnClick !== false)
+                    onClose!();
             }}
             onContextMenu={e => {
                 e.preventDefault();
diff --git a/src/api/Notifications/Notifications.tsx b/src/api/Notifications/Notifications.tsx
index a6b2ccd97..c842ec887 100644
--- a/src/api/Notifications/Notifications.tsx
+++ b/src/api/Notifications/Notifications.tsx
@@ -23,6 +23,7 @@ import type { ReactNode } from "react";
 import type { Root } from "react-dom/client";
 
 import NotificationComponent from "./NotificationComponent";
+import { persistNotification } from "./notificationLog";
 
 const NotificationQueue = new Queue();
 
@@ -56,6 +57,10 @@ export interface NotificationData {
     color?: string;
     /** Whether this notification should not have a timeout */
     permanent?: boolean;
+    /** Whether this notification should not be persisted in the Notification Log */
+    noPersist?: boolean;
+    /** Whether this notification should be dismissed when clicked (defaults to true) */
+    dismissOnClick?: boolean;
 }
 
 function _showNotification(notification: NotificationData, id: number) {
@@ -86,6 +91,8 @@ export async function requestPermission() {
 }
 
 export async function showNotification(data: NotificationData) {
+    persistNotification(data);
+
     if (shouldBeNative() && await requestPermission()) {
         const { title, body, icon, image, onClick = null, onClose = null } = data;
         const n = new Notification(title, {
diff --git a/src/api/Notifications/notificationLog.tsx b/src/api/Notifications/notificationLog.tsx
new file mode 100644
index 000000000..72f09ac2f
--- /dev/null
+++ b/src/api/Notifications/notificationLog.tsx
@@ -0,0 +1,203 @@
+/*
+ * 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 * as DataStore from "@api/DataStore";
+import { Settings } from "@api/settings";
+import { classNameFactory } from "@api/Styles";
+import { useAwaiter } from "@utils/misc";
+import { closeModal, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { Alerts, Button, Forms, moment, React, Text, Timestamp, useEffect, useReducer, useState } from "@webpack/common";
+import { nanoid } from "nanoid";
+import type { DispatchWithoutAction } from "react";
+
+import NotificationComponent from "./NotificationComponent";
+import type { NotificationData } from "./Notifications";
+
+interface PersistentNotificationData extends Pick<NotificationData, "title" | "body" | "image" | "icon" | "color"> {
+    timestamp: number;
+    id: string;
+}
+
+const KEY = "notification-log";
+
+const getLog = async () => {
+    const log = await DataStore.get(KEY) as PersistentNotificationData[] | undefined;
+    return log ?? [];
+};
+
+const cl = classNameFactory("vc-notification-log-");
+const signals = new Set<DispatchWithoutAction>();
+
+export async function persistNotification(notification: NotificationData) {
+    if (notification.noPersist) return;
+
+    const limit = Settings.notifications.logLimit;
+    if (limit === 0) return;
+
+    await DataStore.update(KEY, (old: PersistentNotificationData[] | undefined) => {
+        const log = old ?? [];
+
+        // Omit stuff we don't need
+        const {
+            onClick, onClose, richBody, permanent, noPersist, dismissOnClick,
+            ...pureNotification
+        } = notification;
+
+        log.unshift({
+            ...pureNotification,
+            timestamp: Date.now(),
+            id: nanoid()
+        });
+
+        if (log.length > limit && limit !== 200)
+            log.length = limit;
+
+        return log;
+    });
+
+    signals.forEach(x => x());
+}
+
+export async function deleteNotification(timestamp: number) {
+    const log = await getLog();
+    const index = log.findIndex(x => x.timestamp === timestamp);
+    if (index === -1) return;
+
+    log.splice(index, 1);
+    await DataStore.set(KEY, log);
+    signals.forEach(x => x());
+}
+
+export function useLogs() {
+    const [signal, setSignal] = useReducer(x => x + 1, 0);
+
+    useEffect(() => {
+        signals.add(setSignal);
+        return () => void signals.delete(setSignal);
+    }, []);
+
+    const [log, _, pending] = useAwaiter(getLog, {
+        fallbackValue: [],
+        deps: [signal]
+    });
+
+    return [log, pending] as const;
+}
+
+function NotificationEntry({ data }: { data: PersistentNotificationData; }) {
+    const [removing, setRemoving] = useState(false);
+    const ref = React.useRef<HTMLDivElement>(null);
+
+    useEffect(() => {
+        const div = ref.current!;
+
+        const setHeight = () => {
+            if (div.clientHeight === 0) return requestAnimationFrame(setHeight);
+            div.style.height = `${div.clientHeight}px`;
+        };
+
+        setHeight();
+    }, []);
+
+    return (
+        <div className={cl("wrapper", { removing })} ref={ref}>
+            <NotificationComponent
+                {...data}
+                permanent={true}
+                dismissOnClick={false}
+                onClose={() => {
+                    if (removing) return;
+                    setRemoving(true);
+
+                    setTimeout(() => deleteNotification(data.timestamp), 200);
+                }}
+                richBody={
+                    <div className={cl("body")}>
+                        {data.body}
+                        <Timestamp timestamp={moment(data.timestamp)} className={cl("timestamp")} />
+                    </div>
+                }
+            />
+        </div>
+    );
+}
+
+export function NotificationLog({ log, pending }: { log: PersistentNotificationData[], pending: boolean; }) {
+    if (!log.length && !pending)
+        return (
+            <div className={cl("container")}>
+                <div className={cl("empty")} />
+                <Forms.FormText style={{ textAlign: "center" }}>
+                    No notifications yet
+                </Forms.FormText>
+            </div>
+        );
+
+    return (
+        <div className={cl("container")}>
+            {log.map(n => <NotificationEntry data={n} key={n.id} />)}
+        </div>
+    );
+}
+
+function LogModal({ modalProps, close }: { modalProps: ModalProps; close(): void; }) {
+    const [log, pending] = useLogs();
+
+    return (
+        <ModalRoot {...modalProps} size={ModalSize.LARGE}>
+            <ModalHeader>
+                <Text variant="heading-lg/semibold" style={{ flexGrow: 1 }}>Notification Log</Text>
+                <ModalCloseButton onClick={close} />
+            </ModalHeader>
+
+            <ModalContent>
+                <NotificationLog log={log} pending={pending} />
+            </ModalContent>
+
+            <ModalFooter>
+                <Button
+                    disabled={log.length === 0}
+                    onClick={() => {
+                        Alerts.show({
+                            title: "Are you sure?",
+                            body: `This will permanently remove ${log.length} notification${log.length === 1 ? "" : "s"}. This action cannot be undone.`,
+                            async onConfirm() {
+                                await DataStore.set(KEY, []);
+                                signals.forEach(x => x());
+                            },
+                            confirmText: "Do it!",
+                            confirmColor: "vc-notification-log-danger-btn",
+                            cancelText: "Nevermind"
+                        });
+                    }}
+                >
+                    Clear Notification Log
+                </Button>
+            </ModalFooter>
+        </ModalRoot>
+    );
+}
+
+export function openNotificationLogModal() {
+    const key = openModal(modalProps => (
+        <LogModal
+            modalProps={modalProps}
+            close={() => closeModal(key)}
+        />
+    ));
+}
diff --git a/src/api/Notifications/styles.css b/src/api/Notifications/styles.css
index cd3714282..98dff6df1 100644
--- a/src/api/Notifications/styles.css
+++ b/src/api/Notifications/styles.css
@@ -3,16 +3,20 @@
     all: unset;
     display: flex;
     flex-direction: column;
-    width: 25vw;
-    min-height: 10vh;
     color: var(--text-normal);
     background-color: var(--background-secondary-alt);
-    position: absolute;
-    z-index: 2147483647;
-    right: 1rem;
     border-radius: 6px;
     overflow: hidden;
     cursor: pointer;
+    width: 100%;
+}
+
+.vc-notification-root:not(.vc-notification-log-wrapper > .vc-notification-root) {
+    position: absolute;
+    z-index: 2147483647;
+    right: 1rem;
+    width: 25vw;
+    min-height: 10vh;
 }
 
 .vc-notification {
@@ -72,3 +76,47 @@
 .vc-notification-img {
     width: 100%;
 }
+
+.vc-notification-log-empty {
+    height: 218px;
+    background: url("/assets/b36de980b174d7b798c89f35c116e5c6.svg") center no-repeat;
+    margin-bottom: 40px;
+}
+
+.vc-notification-log-container {
+    display: flex;
+    flex-direction: column;
+    padding: 1em;
+    overflow: hidden;
+}
+
+.vc-notification-log-wrapper {
+    transition: 200ms ease;
+    transition-property: height, opacity;
+}
+
+.vc-notification-log-wrapper:not(:last-child) {
+    margin-bottom: 1em;
+}
+
+.vc-notification-log-removing {
+    height: 0 !important;
+    opacity: 0;
+    margin-bottom: 1em;
+}
+
+.vc-notification-log-body {
+    display: flex;
+    flex-direction: column;
+}
+
+.vc-notification-log-timestamp {
+    margin-left: auto;
+    font-size: 0.8em;
+    font-weight: lighter;
+}
+
+.vc-notification-log-danger-btn {
+    color: var(--white-500);
+    background-color: var(--button-danger-background);
+}
diff --git a/src/api/settings.ts b/src/api/settings.ts
index 0aaa4907e..321a4c423 100644
--- a/src/api/settings.ts
+++ b/src/api/settings.ts
@@ -47,6 +47,7 @@ export interface Settings {
         timeout: number;
         position: "top-right" | "bottom-right";
         useNative: "always" | "never" | "not-focused";
+        logLimit: number;
     };
 }
 
@@ -66,7 +67,8 @@ const DefaultSettings: Settings = {
     notifications: {
         timeout: 5000,
         position: "bottom-right",
-        useNative: "not-focused"
+        useNative: "not-focused",
+        logLimit: 50
     }
 };
 
diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx
index 120f4c520..7113421a6 100644
--- a/src/components/VencordSettings/VencordTab.tsx
+++ b/src/components/VencordSettings/VencordTab.tsx
@@ -17,6 +17,7 @@
 */
 
 
+import { openNotificationLogModal } from "@api/Notifications/notificationLog";
 import { useSettings } from "@api/settings";
 import { classNameFactory } from "@api/Styles";
 import DonateButton from "@components/DonateButton";
@@ -165,7 +166,7 @@ function VencordSettings() {
                     { label: "Only use Desktop notifications when Discord is not focused", value: "not-focused", default: true },
                     { label: "Always use Desktop notifications", value: "always" },
                     { label: "Always use Vencord notifications", value: "never" },
-                ]satisfies Array<{ value: typeof settings["notifications"]["useNative"]; } & Record<string, any>>}
+                ] satisfies Array<{ value: typeof settings["notifications"]["useNative"]; } & Record<string, any>>}
                 closeOnSelect={true}
                 select={v => notifSettings.useNative = v}
                 isSelected={v => v === notifSettings.useNative}
@@ -179,7 +180,7 @@ function VencordSettings() {
                 options={[
                     { label: "Bottom Right", value: "bottom-right", default: true },
                     { label: "Top Right", value: "top-right" },
-                ]satisfies Array<{ value: typeof settings["notifications"]["position"]; } & Record<string, any>>}
+                ] satisfies Array<{ value: typeof settings["notifications"]["position"]; } & Record<string, any>>}
                 select={v => notifSettings.position = v}
                 isSelected={v => v === notifSettings.position}
                 serialize={identity}
@@ -198,6 +199,29 @@ function VencordSettings() {
                 onMarkerRender={v => (v / 1000) + "s"}
                 stickToMarkers={false}
             />
+
+            <Forms.FormTitle tag="h5" className={Margins.top16 + " " + Margins.bottom8}>Notification Log Limit</Forms.FormTitle>
+            <Forms.FormText className={Margins.bottom16}>
+                The amount of notifications to save in the log until old ones are removed.
+                Set to <code>0</code> to disable Notification log and <code>∞</code> to never automatically remove old Notifications
+            </Forms.FormText>
+            <Slider
+                markers={[0, 25, 50, 75, 100, 200]}
+                minValue={0}
+                maxValue={200}
+                stickToMarkers={true}
+                initialValue={notifSettings.logLimit}
+                onValueChange={v => notifSettings.logLimit = v}
+                onValueRender={v => v === 200 ? "∞" : v}
+                onMarkerRender={v => v === 200 ? "∞" : v}
+            />
+
+            <Button
+                onClick={openNotificationLogModal}
+                disabled={notifSettings.logLimit === 0}
+            >
+                Open Notification Log
+            </Button>
         </React.Fragment>
     );
 }
diff --git a/src/plugins/crashHandler.ts b/src/plugins/crashHandler.ts
index 6457e09d2..61b06b353 100644
--- a/src/plugins/crashHandler.ts
+++ b/src/plugins/crashHandler.ts
@@ -78,6 +78,7 @@ export default definePlugin({
                     color: "#eed202",
                     title: "Discord has crashed!",
                     body: "Awn :( Discord has crashed more than five times, not attempting to recover.",
+                    noPersist: true,
                 });
             } catch { }
 
@@ -111,6 +112,7 @@ export default definePlugin({
                     color: "#eed202",
                     title: "Discord has crashed!",
                     body: "Attempting to recover...",
+                    noPersist: true,
                 });
             } catch { }
         }
diff --git a/src/plugins/devCompanion.dev.tsx b/src/plugins/devCompanion.dev.tsx
index b9a7e4d82..c675fc237 100644
--- a/src/plugins/devCompanion.dev.tsx
+++ b/src/plugins/devCompanion.dev.tsx
@@ -116,7 +116,8 @@ function initWs(isManual = false) {
         showNotification({
             title: "Dev Companion Error",
             body: (e as ErrorEvent).message || "No Error Message",
-            color: "var(--status-danger, red)"
+            color: "var(--status-danger, red)",
+            noPersist: true,
         });
     });
 
@@ -128,7 +129,8 @@ function initWs(isManual = false) {
         showNotification({
             title: "Dev Companion Disconnected",
             body: e.reason || "No Reason provided",
-            color: "var(--status-danger, red)"
+            color: "var(--status-danger, red)",
+            noPersist: true,
         });
     });
 
diff --git a/src/webpack/common/react.ts b/src/webpack/common/react.ts
index d73a3dfea..17196132d 100644
--- a/src/webpack/common/react.ts
+++ b/src/webpack/common/react.ts
@@ -24,10 +24,12 @@ export let useState: typeof React.useState;
 export let useEffect: typeof React.useEffect;
 export let useMemo: typeof React.useMemo;
 export let useRef: typeof React.useRef;
+export let useReducer: typeof React.useReducer;
+export let useCallback: typeof React.useCallback;
 
 export const ReactDOM: typeof import("react-dom") & typeof import("react-dom/client") = findByPropsLazy("createPortal", "render");
 
 waitFor("useState", m => {
     React = m;
-    ({ useEffect, useState, useMemo, useRef } = React);
+    ({ useEffect, useState, useMemo, useRef, useReducer, useCallback } = React);
 });

From 462f1910518937400e5fe79f54e45dcaf7fd1361 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 2 Apr 2023 04:26:05 +0200
Subject: [PATCH 093/147] Bump to v1.1.4

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

diff --git a/package.json b/package.json
index 9a8548a61..3107f4f27 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,8 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "description": "The cutest Discord client mod",
-    "keywords": [],
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {
         "url": "https://github.com/Vendicated/Vencord/issues"

From 265c7a18a7d421d4a566f50649af4006100406fe Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sun, 2 Apr 2023 04:33:17 +0200
Subject: [PATCH 094/147] Delete corruptMp4s.ts

Discord/Electron fixed this bug, so mp4s created by this plugin just look normal on Electron 22, not fixable
---
 src/plugins/corruptMp4s.ts | 105 -------------------------------------
 1 file changed, 105 deletions(-)
 delete mode 100644 src/plugins/corruptMp4s.ts

diff --git a/src/plugins/corruptMp4s.ts b/src/plugins/corruptMp4s.ts
deleted file mode 100644
index b9c3a1197..000000000
--- a/src/plugins/corruptMp4s.ts
+++ /dev/null
@@ -1,105 +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 { ApplicationCommandOptionType, sendBotMessage } from "@api/Commands";
-import { findOption } from "@api/Commands/commandHelpers";
-import { ApplicationCommandInputType } from "@api/Commands/types";
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-import { findByCode, findByProps } from "@webpack";
-
-const DRAFT_TYPE = 0;
-
-export default definePlugin({
-    name: "CorruptMp4s",
-    description: "Create corrupt mp4s with extremely high or negative duration",
-    authors: [Devs.Ven],
-    dependencies: ["CommandsAPI"],
-    commands: [{
-        name: "corrupt",
-        description: "Create a corrupt mp4 with extremely high or negative duration",
-        inputType: ApplicationCommandInputType.BUILT_IN,
-        options: [
-            {
-                name: "mp4",
-                description: "the video to corrupt",
-                type: ApplicationCommandOptionType.ATTACHMENT,
-                required: true
-            },
-            {
-                name: "kind",
-                description: "the kind of corruption",
-                type: ApplicationCommandOptionType.STRING,
-                choices: [
-                    {
-                        name: "infinite",
-                        value: "infinite",
-                        label: "Very high duration"
-                    },
-                    {
-                        name: "negative",
-                        value: "negative",
-                        label: "Negative duration"
-                    }
-                ]
-            }
-        ],
-        execute: async (args, ctx) => {
-            const UploadStore = findByProps("getUploads");
-            const upload = UploadStore.getUploads(ctx.channel.id, DRAFT_TYPE)[0];
-
-            const video = upload?.item?.file as File | undefined;
-
-            if (video?.type !== "video/mp4")
-                return void sendBotMessage(ctx.channel.id, {
-                    content: "Please upload a mp4 file"
-                });
-
-            const corruption = findOption<string>(args, "kind", "infinite");
-
-            const buf = new Uint8Array(await video.arrayBuffer());
-            let found = false;
-
-            // adapted from https://github.com/GeopJr/exorcism/blob/c9a12d77ccbcb49c987b385eafae250906efc297/src/App.svelte#L41-L48
-            for (let i = 0; i < buf.length; i++) {
-                if (buf[i] === 0x6d && buf[i + 1] === 0x76 && buf[i + 2] === 0x68 && buf[i + 3] === 0x64) {
-                    let start = i + 18;
-                    buf[start++] = 0x00;
-                    buf[start++] = 0x01;
-                    buf[start++] = corruption === "negative" ? 0xff : 0x7f;
-                    buf[start++] = 0xff;
-                    buf[start++] = 0xff;
-                    buf[start++] = corruption === "negative" ? 0xf0 : 0xff;
-                    found = true;
-                    break;
-                }
-            }
-
-            if (!found) {
-                return void sendBotMessage(ctx.channel.id, {
-                    content: "Could not find signature. Is this even a mp4?"
-                });
-            }
-
-            const newName = video.name.replace(/\.mp4$/i, ".corrupt.mp4");
-            const promptToUpload = findByCode("UPLOAD_FILE_LIMIT_ERROR");
-            const file = new File([buf], newName, { type: "video/mp4" });
-            setTimeout(() => promptToUpload([file], ctx.channel, DRAFT_TYPE), 10);
-        }
-    }]
-});

From 62f74f59179c875cb6f867a7e3da2012e2aa3507 Mon Sep 17 00:00:00 2001
From: Remty <remty516@gmail.com>
Date: Sun, 2 Apr 2023 16:12:19 +0200
Subject: [PATCH 095/147] feat(plugin): FakeProfileThemes (#710)

---
 package.json                      |   4 +-
 pnpm-lock.yaml                    |  16 ++--
 src/plugins/fakeProfileThemes.tsx | 130 ++++++++++++++++++++++++++++++
 src/utils/constants.ts            |   8 ++
 4 files changed, 147 insertions(+), 11 deletions(-)
 create mode 100644 src/plugins/fakeProfileThemes.tsx

diff --git a/package.json b/package.json
index 3107f4f27..a8ba62c84 100644
--- a/package.json
+++ b/package.json
@@ -34,12 +34,12 @@
         "@vap/core": "0.0.12",
         "@vap/shiki": "0.10.3",
         "fflate": "^0.7.4",
-        "nanoid": "^4.0.2"
+        "nanoid": "^4.0.2",
+        "virtual-merge": "^1.0.1"
     },
     "devDependencies": {
         "@types/diff": "^5.0.2",
         "@types/lodash": "^4.14.191",
-        "@types/nanoid": "^3.0.0",
         "@types/node": "^18.11.18",
         "@types/react": "^18.0.27",
         "@types/react-dom": "^18.0.10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6ac1fb7ca..aa891a21c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,7 +11,6 @@ patchedDependencies:
 specifiers:
   '@types/diff': ^5.0.2
   '@types/lodash': ^4.14.191
-  '@types/nanoid': ^3.0.0
   '@types/node': ^18.11.18
   '@types/react': ^18.0.27
   '@types/react-dom': ^18.0.10
@@ -40,17 +39,18 @@ specifiers:
   tsx: ^3.12.6
   type-fest: ^3.5.3
   typescript: ^4.9.4
+  virtual-merge: ^1.0.1
 
 dependencies:
   '@vap/core': 0.0.12
   '@vap/shiki': 0.10.3
   fflate: 0.7.4
   nanoid: 4.0.2
+  virtual-merge: 1.0.1
 
 devDependencies:
   '@types/diff': 5.0.2
   '@types/lodash': 4.14.191
-  '@types/nanoid': 3.0.0
   '@types/node': 18.11.18
   '@types/react': 18.0.27
   '@types/react-dom': 18.0.10
@@ -421,13 +421,6 @@ packages:
     resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
     dev: true
 
-  /@types/nanoid/3.0.0:
-    resolution: {integrity: sha512-UXitWSmXCwhDmAKe7D3hNQtQaHeHt5L8LO1CB8GF8jlYVzOv5cBWDNqiJ+oPEWrWei3i3dkZtHY/bUtd0R/uOQ==}
-    deprecated: This is a stub types definition. nanoid provides its own type definitions, so you do not need this installed.
-    dependencies:
-      nanoid: 4.0.2
-    dev: true
-
   /@types/node/18.11.18:
     resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==}
     dev: true
@@ -2260,6 +2253,7 @@ packages:
     resolution: {integrity: sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==}
     engines: {node: ^14 || ^16 || >=18}
     hasBin: true
+    dev: false
 
   /nanomatch/1.2.13:
     resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
@@ -3139,6 +3133,10 @@ packages:
       spdx-expression-parse: 3.0.1
     dev: true
 
+  /virtual-merge/1.0.1:
+    resolution: {integrity: sha512-h7rzV6n5fZJbDu2lP4iu+IOtsZ00uqECFUxFePK1uY0pz/S5B7FNDJpmdDVfyGL7poyJECEHfTaIpJaknNkU0Q==}
+    dev: false
+
   /vscode-oniguruma/1.7.0:
     resolution: {integrity: sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==}
     dev: false
diff --git a/src/plugins/fakeProfileThemes.tsx b/src/plugins/fakeProfileThemes.tsx
new file mode 100644
index 000000000..de42dd916
--- /dev/null
+++ b/src/plugins/fakeProfileThemes.tsx
@@ -0,0 +1,130 @@
+/*
+ * 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/>.
+*/
+
+// This plugin is a port from Alyxia's Vendetta plugin
+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 definePlugin, { OptionType } from "@utils/types";
+import { Button } from "@webpack/common";
+import { User } from "discord-types/general";
+import virtualMerge from "virtual-merge";
+
+interface UserProfile extends User {
+    themeColors?: Array<number>;
+}
+
+interface Colors {
+    primary: number;
+    accent: number;
+}
+
+function encode(primary: number, accent: number): string {
+    const message = `[#${primary.toString(16).padStart(6, "0")},#${accent.toString(16).padStart(6, "0")}]`;
+    const padding = "";
+    const encoded = Array.from(message)
+        .map(x => x.codePointAt(0))
+        .filter(x => x! >= 0x20 && x! <= 0x7f)
+        .map(x => String.fromCodePoint(x! + 0xe0000))
+        .join("");
+
+    return (padding || "") + " " + encoded;
+}
+
+// Courtesy of Cynthia.
+function decode(bio: string): Array<number> | null {
+    if (bio == null) return null;
+
+    const colorString = bio.match(
+        /\u{e005b}\u{e0023}([\u{e0061}-\u{e0066}\u{e0041}-\u{e0046}\u{e0030}-\u{e0039}]+?)\u{e002c}\u{e0023}([\u{e0061}-\u{e0066}\u{e0041}-\u{e0046}\u{e0030}-\u{e0039}]+?)\u{e005d}/u,
+    );
+    if (colorString != null) {
+        const parsed = [...colorString[0]]
+            .map(x => String.fromCodePoint(x.codePointAt(0)! - 0xe0000))
+            .join("");
+        const colors = parsed
+            .substring(1, parsed.length - 1)
+            .split(",")
+            .map(x => parseInt(x.replace("#", "0x"), 16));
+
+        return colors;
+    } else {
+        return null;
+    }
+}
+
+const settings = definePluginSettings({
+    nitroFirst: {
+        description: "Default color source if both are present",
+        type: OptionType.SELECT,
+        options: [
+            { label: "Nitro colors", value: true, default: true },
+            { label: "Fake colors", value: false },
+        ]
+    }
+});
+
+export default definePlugin({
+    name: "FakeProfileThemes",
+    description: "Allows profile theming by hiding the colors in your bio thanks to invisible 3y3 encoding.",
+    authors: [Devs.Alyxia, Devs.Remty],
+    patches: [
+        {
+            find: "getUserProfile=",
+            replacement: {
+                match: /(?<=getUserProfile=function\(\i\){return )(\i\[\i\])/,
+                replace: "$self.colorDecodeHook($1)"
+            }
+        }, {
+            find: ".USER_SETTINGS_PROFILE_THEME_ACCENT",
+            replacement: {
+                match: /RESET_PROFILE_THEME}\)(?<=},color:(\i).+?},color:(\i).+?)/,
+                replace: "$&,$self.addCopy3y3Button({primary:$1,accent:$2})"
+            }
+        }
+    ],
+    settings,
+    colorDecodeHook(user: UserProfile) {
+        if (user) {
+            // don't replace colors if already set with nitro
+            if (settings.store.nitroFirst && user.themeColors) return user;
+            const colors = decode(user.bio);
+            if (colors) {
+                return virtualMerge(user, {
+                    premiumType: 2,
+                    themeColors: colors
+                });
+            }
+        }
+        return user;
+    },
+    addCopy3y3Button: ErrorBoundary.wrap(function ({ primary, accent }: Colors) {
+        return <Button
+            onClick={() => {
+                const colorString = encode(primary, accent);
+                copyWithToast(colorString);
+            }}
+            color={Button.Colors.PRIMARY}
+            size={Button.Sizes.XLARGE}
+            className={Margins.left16}
+        >Copy 3y3
+        </Button >;
+    }, { noop: true }),
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 473674af3..c54676f4b 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -226,6 +226,14 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "TheKodeToad",
         id: 706152404072267788n
     },
+    Alyxia: {
+        name: "Alyxia Sother",
+        id: 952185386350829688n
+    },
+    Remty: {
+        name: "Remty",
+        id: 335055032204656642n
+    },
     skyevg: {
         name: "skyevg",
         id: 1090310844283363348n

From 5b5ee82f27749e989d727534ad89577f60b0c14e Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sun, 2 Apr 2023 16:16:15 +0200
Subject: [PATCH 096/147] Update Contributor Badge to new logo

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

diff --git a/src/plugins/apiBadges.tsx b/src/plugins/apiBadges.tsx
index 14b548c96..4e1ea2b23 100644
--- a/src/plugins/apiBadges.tsx
+++ b/src/plugins/apiBadges.tsx
@@ -29,7 +29,7 @@ import { closeModal, Modals, openModal } from "@utils/modal";
 import definePlugin from "@utils/types";
 import { Forms } from "@webpack/common";
 
-const CONTRIBUTOR_BADGE = "https://media.discordapp.net/stickers/1026517526106087454.webp";
+const CONTRIBUTOR_BADGE = "https://cdn.discordapp.com/attachments/1033680203433660458/1092089947126780035/favicon.png";
 
 /** List of vencord contributor IDs */
 const contributorIds: string[] = Object.values(Devs).map(d => d.id.toString());

From 6226672ee8d1af917065d29817338b62a5d9fd17 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 2 Apr 2023 16:55:36 +0200
Subject: [PATCH 097/147] Web: Update extension icon from trolley to Vencord
 logo

---
 browser/icon.png | Bin 21831 -> 1091 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/browser/icon.png b/browser/icon.png
index 57349fad211308d620bc7fab2cacfc56c0a091e4..dae93c6194119ffd532ba990e73d2be4c64cdce2 100644
GIT binary patch
literal 1091
zcmV-J1ibr+P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1K3GKK~#7F?VP)g
z)G!o=9Yg_Q1y6xQ2NDeh^UOQ~#cV?j1&BwWKnTH7;oX_o8QT-bcc0k)KWUX6k8?Zr
zf6lSv3}XNQ00000006*9OaXOy#$&}0a(?bvkDSM>LpZ;-|1?eK^3!%t_*~8TZq{x}
zJJ99Ea^GRf`MLPah4J@g{RbYgjuDNvTjQVT(gjI8+|HV;sy0;53Rrr+&3&E9<)8dq
zn_d-gwxsC!TyDj8mtb*`2AP{0CJT}nHs(gT4BFM`vH^U1vMpV$N!LNxg-1gbS47uo
zXd+yuv8*7YH-OE!yjDguas$|UIIo$Gjv50@BfBhKEEbHU051Pj<C}x9wccMc7L3pU
zi_y16#I}S;epjjydUruuZ&wVtR&nbf#l{CnLy75rGOomNSw?zofUL%s?x#e94&{PW
zUw+!U{JN}Da$GR%T#z)X+6cY@n`Imq3>SpWj7EJZ<7$i&Y8WyLvZa-#DpVI#Dh+Mc
z1-YK{x_Yb2sOtVDgK+l`<=3!HJ8U(`TFl5na}6L3@cYwoE|5-ilHaq<@@KCPn?}6*
zIv@AxE4`lj|G)1?_T=T^>KStk!(~B#KF<bT>}fWb;O?8KS2#*G+W^vgO#elJFx1j5
z9pzk<FWuKt&P92thQM49G1(NL1gR{(k-64{a&6PB5}*KLvd4f7O3=EzHI+1aWNjtb
zu2;Qu<^dEyOz;~rp`*co_Xe~B|NM9>_Sg4be6SSQRr$Pm{_en1`1|Fk9Zz;u>-88s
zj1!n%a~&vvn2;E7Zb|9eeU;!56Sz@tE_G%jle+s>mJ$_%xGu0_*%1^#OiUJ(O9^aq
ze_0%<gk&m>6QBTMQpN#EN^sXxPI4kp38|QKO$p<KO`rf`a*Twdl;9-V2PZ!;IUnHW
z%^~$hFcNNooO3~WmEg#Na{1s5lBMJW6hKUgCt_KY;F|?m%Nqd-Ag1Iq;UFbk&HIP;
zc%!@(pa5cOtcuW-;Ht;W*~myGv;q`BOwDycVF`+5)dR91kd^(ej7wa_&<aohF}qcO
z@7m9TSrBGJM_|7(AaLzx#w_T3=wG+`x}YiWJ%pRLe(w)J0mSTB0mf<v@yS;S+0P%i
z7S$IhfSCQiArq;D<kNbtz_VSCFHit6?Ytuvs04LS7Ii+ciB*CpPyjJ|o;=*_xj#P4
z?+^Iq<+k<xq2;p2zc{>S4lojKfj!3nTMrUWIBlE|yV_!9-BFSkfdYtW|ECIwl#mN3
zfS7)MtfR6LasdSp)7l~emDDFzsbsMo6aWAK00000004lB+yiyg8!#VHJx>4t002ov
JPDHLkV1fj&>l*+7

literal 21831
zcmX6^1yogS)1@2fZUni6bazX4r!+`+hm>@ubazNdcejARi*%Q?NW=g5{jQ~WFL%K?
zb7uD5vuB=26{Qd8D8wjGP*CWyGLmZGYtX;HNC@EH0b!E~C@9T0vXWvNUfHM5%gGjF
z&ilwOlhZytJ>8C5-#$<h&~O(bHAK-)9p%!~XF43=+bjxD=<nx!9SO)d@}|%H!kma8
z^>vO$hAHel$LCdQLHv!S4i+o66GVYex2;xCa1jbAO{^G$iCE-Ib$Pa>r4L7CdB>`Y
zdK219J^#tSrgwj?t9@-)(nh#od3qR!dI>W&ChG0EV0>y=zvD5HFZoIFl-sf~p!bN_
zb>6cpzcvjMFi#zrxpa#Dbl_n9e9+AvwQ>58jabgIN#XKbI>a;VcjmtMYv#FoC5yi9
znHp`c%GTL`8g}$%Bp)$gWq*O^`EQpW9!z)Zgm2JF*+t$-@M}e$wwy`KWsfp<-Am)5
z-gpB|6!oi5O><z*;={1*-bVA{tCaYEuc>wQ5R}*SjeVC?HJwVu_B~Pul6bp0$17?_
z6xfEghOH}NGqme_(h|JSZ=UuihL-|+{1#&O7$xpbwRLdAj9F{Ah~ZJ93ZdZf<uT!O
zqF3%dsitbBloV74ki+ZQsGJ>q!?$I!aOa1up^p`V{yg_$6;;@aOAF<FW3)&JQ=^I>
zOxX)Z)wql%E<g9l^m7B#*fnVlmosTmN+Huko#^JdH@#U**A{myJnFEP!_sqz{vZAI
zexmRir6MU?D@pu%7ydpXiM_==w{(j!bM~!=hp$^sqfWf$g5)@Gp99akx`fWwyX0}D
ztZO0*k%H!kUxlw6hY1}AZ+xGQA5PQ1&KzhNRLl|Eixof=kI+RK!`_e?+^vo!;W#ou
zq;zp7tvIB2*q#IOW}Reg&>D|Ywwz=FS@So}ISA1*6yC*rcniLLeV={rH|@n)$QfQz
zLi@d?#inIN(Elp*btUlGxUub<SlU6Tb0}LlD_Ue>gy77#MITt_mYaqBSLXDud#)6}
zB*>sJtvwqokQG($aI&WkCL3dzCJ5t4Vx-?%HWD>1$Bdcxo3op660;GaJq03$Ko4vs
z2+m|GmBoyh4ezjd=LSxv&RB8CnaRwj@Wvqr2i4TP?|wdYysmq_>Dgb|cxJXeu{GC~
z)=lFiMo&@0l@h~*dkI+(>eF6w>`tkH5jEPy)m2i(HNT$BSrw$4U=JUlx;}~-vm1Bf
zEZjJmJ-<D=@rh0rB<CP~ld14-(vl-;+&Zf8BYWn@N=3!_6dKuxoebVM8%|=*EJeK<
z{56MkPDSX}*4EACMk_P~*!^q1MZNBqb>FAk*MZkw<ENFLkG@u4mhHmTqBs@VhE;IG
zW=J;~-`*M4UhMu!ne~!<Z66sLf)CkB5UZQHUnVNrN{Gz98cWgTzNPcy&SJ}(@&BDF
zMbMI6O0Q>|L}OxO6Y0<*-?3IYe^lSpBnkera@x?{J?#SCd<ghjnj+PAIfg9qw1sis
z(eo(q_x2V9&+p>p5e+=QWVXN??Leurc@zGeBnzTVC=1dN>l*rrtDfEV7vp`D*QM7#
zJuXg8y~{^L=>!DRsqrI|R;~@pXl7{MxsR)4r0h$2^Pid>vOg~WOx?54T3XaGG;|L%
z)-`c=U+@j$l|>r(@wtoDt+x(^&4e&`vAVkEYO@b^J>b#)Whd|{{^@Q+#8Qyl)y-}2
zw&&G9SJ1mZ?|C_|t)49pN9+7;X0LYHt7k`l&;84WlZ&51-A37{tAeiDE;Ctle*&+p
zb@K}6SH-VW@2aY*>>TaCHMEca`bEsh$T;oK;(p||dXn@hWQX@J2~Ic_O4yrV5-u5i
zExy212DQEOVezEWr!mi-Xz1`FERmNnWx_wcg1&!aUjO91;0Oo^2>L(Z_LhBaT%P=r
zQCA!IfU@yA#6mv-qvF;f4}Mi6i17G0$^_#C6H8tF_wVE2#i_>^%PQHjH4ipHS?gl-
zLWoOS>x-bWV-5TXJDe?37`=+LH#2nDtD0uJO^uX|qS0=s^Q7;_9m4C>>(1+RRmc*W
zFd29XA`i3ick8#^BRK+|*4$a-Dp7s@?#~X|cV`0UPUq`F9^YGZ_4UonT$7udx%5u)
zYm~lt?EOlnxsP=;t#L0_%|Rc$M80WKg^x=3@tUQEl0sdsBcZ<YrXM0{BV~l!Bw+ut
z+p)1%Ch|x$LPrM$3Q72W7w3OP1D;I-QxOD3uO<xx-k7Lg#6Rq{?)4~edv@T1ot;Ah
z4Sg7WSC$sj;m_3+2r6OpT=Y4r_Q%tyReep_;>rxEHvFSK#Y(Lgrdq)n*Z9Nc#owo=
zm(6wlv4Kw`fdH3^Qnv4}4-AZq{$)WS<cbE{ZwU6OR{O5*^|Z&?TsdF$Gj#(rLPdWY
zfv&CU0<xxD0VBgwhgV5&cjoQEqHyP!%<khh{2)$>g{&%WsEJI`?B>~82NMg6D@fA0
zIqW?DzeHtaWjZH^$GmaRGxG1Z|KW8ycWE&Mb-baN$u)*6Xy_MwGsA0a;b_61UpG=Y
zyvEVx{(V#R|B7aPJs0D{{87sMygD-rOQt5#MAq49)d`O=)uv$?TN<kdBv1VL@6<E9
zl8z9rjxF-QkAs_zj*h2}z}s^jW8*R=GR>}U0P`%0Z61`hsCwFk11qTW^z*NvN|cwG
zYJX`PE7Uaeq>*f%p|Zo!V=tg8HWY~SPaU}Wbmd|Y#7c*NQZAZp{dRAB3DvWL*B!~t
zwHP$V1NF7WEQrOcV1wqha_Kg@@WR=UTR)=s;bgp_^YYr*0{Zojy9CCjYE$;%N31U=
z<;LB&%7#6*5#=NWDIONEVRNyCNVe~F)7Wy9gqCUQ2+nV$ki=eSE26|JDrPJ>Kw#F6
zpb`%FHcg%UowxRf$H!962eLjFK;n<<DqaoNCS<5&l>*6PU^ug;NP3LXdiCU!XpA&9
zv<1dAXSkad$$yTYSNo<txa${rJ@&Z&zA9~QeHM09Gkh++ePnOURKZtK!eOG(Z%`4#
z^tv_HUW-s275`##xYJzhw0SY)#&02<_c-T>E7cufj0+DyUvNgG>><^+E$4thYKy0)
z7CFVYH3w^Tkul9e_G_tIharGfZEfvA=gH$^h8(4l4gIwXb99G^>A^di-O<})TMc8n
znq~}JYU_%foClwP<@E7=brNYTEi|gAUVi!|x8w18o39TTl*81hOxeC#HgHPH%6$C%
z+u)CM4n?+hBF=jRN;-G$EbrJ}`x}*KIFM_E;pV#g(Hhv@$62()s<-5(Dc-rhW~c)R
zv(|$*H-NYsySk><Iy{%x)-24-LKYS@3nA^$NjtpnWU=*X7Go7FeF>ITmhHy$9DLO_
zhfm<2#vlEcO&~FqQx$mxRrvi%ZDO0l)QDo6j(_j&GM=CP<Kp57-+VEe&7wiJ`8wy&
z(lz^2xs*vuH?2G9tsaan)V)wctIN3gTMLstnza{CK2>UI`iZ1_KczGaKvdF2Sjl69
zJu}vv+ZPuJ9vzAuYk!x+yt)Bfac6;&X>4yF2jQEtoL`av7z)C8LVTP>fBP;R7p^bX
ziO%+U1g@@<iQRW#VVJFyY3wSP)opObFW02zk_Y{4FfTj1zNcqqYz&!zfB^7n%Zi1g
zWBl5hVOm<6Owz7vl0DyL!?NifNV~k5=WuwjO>_zIltIr+%tgIz-oI4hog;SKX8bwq
zSySL90pC-En{(_1NDfenFb-4KrC-n(eUO9{I$CSt{h*Nr)n(=BnXXkOMLN>7V!yb!
z*h!E*bC8!@w<M&o#`{88VRuN7ltrJjf}?LQNZ9yaao@+@iFB6xG39{%Xabf)H~!Tw
z-*iL_^7@vR5pdhGNq6e>-;D7;0!}S&`dql3=tSwz-aV$am#kPzqCut*B^Cj_K>KOu
z@;~3NoQfc1;McM!RiMi53hiHqL6vTt`{Mny=A@orKVP?M%+yvwM}U2UfuSnr%{B>;
z`@hxI;xz}~HMq@KSv2i_lQn(6WgxlA7VTTFm^JXJ&?I^?lzhmXyu3!01Fmq^17H1t
z^vF^A@&$w9>a643<@LqCeeEn31BNwI;mK0DO#R_mcxh?Lz|b)9pv|~kx@gNiNNo{4
zxVJ<5^4&H&JnSlh>Xqa6{t(pOF7x~Mvv%Ci=gIRdge3vgw5O!8(g7h>jmzlG>QxKW
zve@U|gVxN<%&qP1rtF#Zot=}<kGI}`4zX^}){0h6*LnAD6v~yt0++RQ4mS6s@uPik
z6wtp&1YAZNUw8)IdMcEuuX`Vmt^3~^E-o!~1-AqcTi{5NG6eqs8nI`?ikI|3opD_p
zMFb?38KQGt(zYxDWv{wiUqikrr#lZzUcs5z?jy*IOa;I4gc+vg=uk9dXfezmcHCXX
zif9aRW-Mu`tn9?Gyh1{IySt$WGkLClev`AaShwdJR#sMDZf<T!jvUr-Uf75Y`d7-E
zx_KLye;zD$8O7gjye1gGT&0JajCP!NPwb4ucX7#+89`~~9;~lLm#eQEE5)@MI*(vq
z!v{6%y$^giArytOD4M;XQ{q<aEh~1u@nRqs$Jg2RUqgap{E5|NPF^qbK?<d;`R~@d
z3HCyWsfEQ**|df3KMDgR!N<$Hd3YGHRA)SYa+5K0AWS;ewWvNSf`U;0*K(bB1Ulbu
zGHxfdfwMEfzZa3hPc-*H(C1GC5a--HJi5BNm(|%!I%KC4;Zmx*JhJ5mx+>6WH~c}x
z`lk88=z|f(?DX67M{dVmL4z|qiHbKd()|WWG;aK4!Ib$6pYB;H$z?|iR*t^<84IrY
z3EvvY#dOSC|FGuloD@=22kA)k<_jq)X?=4u5P6s9Z_n>L42<E-h~)Y{pi!c||E}gd
z^iAHvsN1iPCGZ{^gbzpxK&T^@C8VFYvjX~P=?IQmE}#k*?YXmfg0gVEs+)y5k+y4>
z$Y?0idM134=kPs^H>&x+x%+-Qj@t6E)di8<=!qS4{DNJOKQupPg-1!B*LK#u!)xj9
zzXm%3m^D|(SGr@(5`?iXbu}<Y_1XUCBLy~fKhNIXcIiaJE_mJ;!goPMMG|wI7Ot+z
zr>FLyuXqk#;PY!czWhFYvFAPAdQ9Bj-VV?@cw$1nwyq9{^llqTmw++MInI(<>s2JI
zV7#>S^dpZB;ZueAKP?T`?$YXKjm$KO?g{mj84^l9LK@>0_(kdNn6Q;qsmU~#Ce&yW
zN=iz1N6LY6m~c;Hc~8iv9xG-f$U+U>?oq8qEcX%|;h6Zpzvg?Ip@Al(sOYWm^B;Ai
zE*~jyGoGGH2e((B_XZY^lp^nMRt-$udo~V!|Bgvc#-YG4?g^Lz85`U5e#R9@D?0u5
zwc0wkIO(@@oHwYe)|`IleLz0~-D>CH(9qfW`@A6T0$#lrrg}VmHL&jBfo6JoS};$A
zF19zU4m==oVZTvOul^5=;gshrw%`YJIyhTcg!O$Cty|g|zz`YKo6vXc8oIh_NN=~&
z-Is_AeY;%5e+2*f<g^J-C8c_o?B(GxT%}#-b$>-0(ifyvH3aI!pBXg{0|?GMeVJwJ
zZ>G?C;4Z7G7y$|K3JdRFUCsHzi2b@zhuqRos^J?D%fqS5SULv;C}F}ey?_6$p`jn3
zo?p41p&@OY*$nIWJ5(96_>t_K9A{_eEus14<$uBqyu6<(Cx{u8k|%yz)OU0SC`VUb
z^FRwXf;2-JPDT1zZJeW=j*jl>Si5IC$8&v)1PEjx@7LucZ`%}!7b>;`J&;u7*s`X0
z1q93j1M`$co>S6UjM?*My22do?Z36P$r6SGO<Ou&asF)Evci+#F7%4e%{;*l@blo{
zfRvov#o4*foSjM*8?Xp~=|RGsM#Qb@AxgMxc(GnLekt2iRBr5$4@HSA#|8!lcSe$C
zF^*z5Z^_<#5&koJVu4dzTkH3Z(n}I;Men4-XiO)RA&r%)%y3Sx53XNSuAL9y_2ZE9
zZ(9gJsy{wL>%Qkg9v&Wk=S3H|rjl2W4k5!E1Q?-@kB^-J&tE}7fD7BX%<$;=pLhVY
zv2t3NV#=R$b+sp-M>dN7voHPpZ^gDTnPiyBDA2fa^Z;|A5u-pRouA?mFuK)umJO=#
zHE%l~E12XgrdCU?I;L6he1e;=RKEwsq+MrpKShCt@S<`4`}du?UVNh}uD3Z$tskhs
zFZuj*ln9Vk6X85pfB&hyy%NMuz(KrmM{fMtd3hYfv3FY-funtW(C6Kc%*wffCceHa
z1jXjbCZD^Gm(Iyx{_)noIsh%Py?yM5c=B)U?Z>+8W@vz_{)O7x`)CZs2`#VK*!?3l
z$eW7!qaUA|b@cR1?d_)=E17E9hS7sQ7LZ^LJAhKZxpAM7L)qpYX3bH0rpL$a2F$d-
z|4v_Dzq+R88>ozHcjtmNhb5jGBLf33j9F{W|JK*{XNx}k26y&k@M5UO1#MlUH9-)3
zY*RTYm@upb?Jv$G+ovGvhAUNFS2us^L4<}tN=9~hIYQy;?jE-Ib!tj6zU8>~_3!?x
zYs2RY5HH@ie+mw08DMAxQv!Y93?kztXvv-l<u%?of3&LeuPgvow03s`Mxd#di6Pis
z|J3{x9?_D(O69CYzh~U>{rm9Q88c`k*H6b`QY^--Ij_oOqnMJ^kX7(lH1arTdV%{C
zK2Y%5rDqFVnu+-`WuY2FD+2grq~S#OBxW0A&yc>}oycXo{eduZPHb|xU0E^t&JSht
zTL2&tbZHBh3Ly^WBrWp8J)WQ-yyJX8{2Q3s+S{)Tp3T_{mhBq4x=xiFpt6_kh8Gs_
zfR2G}f<!%yVcvfyR3Qw{rN+B88bJp=2N0^~T0@wF|Lrz6<oAz89*i|iehKo?W2D0Y
zaJLx+zCUv=?<dU9FHS!MZpzlyw!4Xugq=LTt+R9Y=_xxp8r2ahNo-+^1=%sFAMn`c
zCbnVUasHe41tzS7P^+!4{J-i*n*GjOF5w+HgMdUN7xd}{Kgop9#ozyQ_7YqkK%s?7
zERDmJBe!uNrbk9bggMc^Nc6LsdwT=JLISWC?l*%QFTD>#!SzyGjNa}!msNou`6AW!
zs-ne@E7FPs8!m5#l45}YVZol6aL|VMv1m2|p!DCre_K7z$w8YIFb~%U)V22uxL^#W
zB8VyQPGV!x+t-+#Nqu9mrLaI|eMxKYm4rB6BE?D%lnq_quLcVDL0{djls(_Rflg{!
z6k7o-i)vf5cYKWEBtf!&-KI=1<c~r`9sN(O2n+wc^a9q$Ey3dZZgLd!%j0U(wH(<=
z{3e!)yz=<!W;;8(`o_kA<Ks$4C%iNjZZW~&&}d*;<;DI3O3=d|9nk}jS|<Ss{qKVS
z!ZF^1EXrLzxqV#c7<-4poN!@TQ?l^Mdmy1Okx*<6b=s2S&6_tsLa+7&Zcr5Z2uVaV
zh&0LI%E{4altT%K?Xq8*ac3o#(t{9RU%MiN{L@(uEwb||si}A@i?~g~c{AS64_qw9
z-G8K$Xpn(})%+<S$Q)XYq8uZ=Jl*D`)}EE{;&_1($O%3Hft{->Y}@yM8-OYy8rpI?
zG^-0m7yC=iiN(_V{rmoBov)?8&(B>00;YlN_WJvq2t*!8?<H4M04)Dx4>xxwV|pvo
z=AVm;i|~MaCVB9VUzZr~8{{&Vxe|uuQ;)9Ci}cpI7|2#Prbf@_J;~6(G4T0bJ8SKg
zvSP;#Bu#hy?2+43DOZ*v=-Y(&sKOFJ8E^E^k<jkO@BSLt!nCcKd6hz>+|$HT0LbAT
zS5TXhXkdh<PA}E6a)U~pE6;5lQwij`hl;gB+wlV;Utf~6+%J09IE0YTB5OdkYI9he
z4oVmr8(%-%*iO&<a~y@q?3(o^EgMPLJ)N)B-nA^c988n_v$BleCir$5Qr9~E6&WE3
zRjcah?EG_9F>C$r0nW`O#h+$nWdUX{OxXr)9e4zB@$o`DPVVk|@0-AffbB3m9A4*3
zK}ve@bngl<VTL(;U<+L=Ec>TN$LZSX={l5?w|^3ioxS}(QIAGVkGT+ugXKtQ=0^xT
z+<*e#uH2b<i^W8hDWHxI`a%#vgA52qM_>OM>OZ{+H~yPkx*69xm-g=N{e>!R@O0+S
zZ=nS#@f}xAJ^Z<8rNPU8rMxxprSthOux}rJrl;-I`(xqtk|5LrVt+jEnYp}V!=Mm0
z_w~&Jum}ifd3pKr%pO$G-kyacT6%hVfb`7PRslhHz@OO<eph33>zd#7-c!hZEI1-)
zVN7CLCR`2*=m{LyTTl+V08bzR#T?YMiIjL05+jg7y((9)09A!w?#zIk>-wT=WCRpq
z*hoBuZ)EG?D{*Xi{E1o<*6|Yn=$#!i@R)8@+?^u<&b)^%#ZC&HMp%M+oN^3Eb_}@A
zBKKM+_f;oIeCb2DNDsVEudc0a=;=AnWSu=4a-JL?k5WE|3k5-fn%OF|IX?OiaB%57
zJz(qZH_T;*ZmvP`MKHZU95^J96*l7hYMahS7KKaK<IYk9S32;H);3X{?lslGaJ%ux
z2Jpw3Cai(!4MhFF<~KcEcK&BsO_vcyNeYDnA9;KiG*TENl`P@(Kb)o7J%Bd@PO<S#
z${!9{?0-@lC@(;^JV8!tP{+SQMF`>6L7xg#UiVFn<K^}cYQRmE@#V|o`8BA(f1gjL
zQ~vP_Jv8a=?Tr_eHI3uO#>OowRk<NlarSSYukK!6hkXk`iM6^Oya7lJ?h=&OlP_o+
z?=zVE+OrEOkpx?rCgvQcXJ->x3P&}y8Ib==ooB+myuatuvjsIS<j*J>t2W+Y1MP@C
z(Xqx1vNs@ha6Wd#3<#fAklVerwLxDM-eu?Js-@BT`ucWWPYYC6S9=K+Ca478o!Gk?
zOA;bAFOow$+S!3tq<+!nSp+zYGswUVyeEWc)G>8CZ39mK2NMAD05$IEMXmuqryCp6
z9t6Z3Pz_@*FE6okj)o4jl<Fvu!l4dDd;oqOkW7W1joYHrP$=v(qaY*0xEBzipc$^9
zQRz`)8HTo|rd?gZ#DeI8sI3W`^aQxo{O>&6+;<O4J<~-W;{D3orv5~p)S;Tce1t8p
z`V3r;jr(cOe;R_I=MH`*Pvqd~iF7j@Z#;OEdK4K~m$3K#zD<NS$tSY!{}qN(NrW;8
zkz<qp`xLo?*L%>L<Tco9H^u_%-$K_%Psj9ZYl{l#*X}1^(1Uvvj!&<rLNbQR-24ov
zM%h?iRUt#7!Z_lyd^u>oug>X4UpyYyK#8u(0&1Vm5fBV``i~>)2FGX#zZ3cSRSbdh
z#?LvmMk^Zl0uLCkRmRWb9d<Tj*iLj=YUh@TYBjB11@g3>=)plCzdSrWb&ZXCsLF&z
zL~e)3GDZ18gKdOSD?>wTfUK_8maK?1KpH<15FD|)y{#)*@b+hIc}j__mS_bOpL0)A
zZS2SnNsqEoAYkPU`Tj52`#$PZ)|~C1t0eWb&nv2Dgu83LKlG!Cnrayu7B*YDyQj8n
z1d!Bl^}O8F0cyBrmS@t1C`PKA;sPqIGK*mg5G(Ex?cG>h#9vui0lC=E`UiF8<mO4%
z2Qbb|uF%fm;izNWAp!8J5D^iLa2c{_P1VG9`dekcQy!K2jSb74Qe5Q9n+E2@6Bvp2
z7bO@Z5sh}GSRBa@^t*#PqF|<pPPCKK=yy+GtjJ>xa;$`T5kpYfaEoMX&;d*a1gSGf
zCIDc8MZdHupmeoIQCQ`Y24RN;JkKtEFLO}fA8*QRdjfO?%-quQK^6DUqyImEW|=+p
z5K6-T$-?DXVJwsLkw0fWA#Lr9r+R*-Ap<+y{QV%u_}8C!L++o5TB+EomPkU0)7m3a
z%1&CP78{LT?-b!?2;7f1tfA@;n+ZG#M!q4^0ZHt4xAg^#879*`YnnmV<bC@NpMm0?
zqWXqp8?dDS#)2M6crgHcs?+CYeCcTk_+0;Ka7&c$-20s|x?b^{K!F(;&~moFK~MOv
zeFLb)^MHPG^QMnc4Zd3a8}&oEE&j1$i3>7iik%q55;;|lo<((Kb#)iu3c144z|Vht
z@ZpVd*SEci|L#Z-oL2geYnh{{0b|^qdG^RxEnMNWfiV$isqGvceHUxjd#TWAp+GMG
zYxBTW0<{LN5{P@BsWmXE0z!!;#SIy?kRpC0)a0-k8lcWUs|}>1v2Vhg0zi1cUjX$i
z3`AXkYssxKu9B20D^N=yN2$t~!Td<?B_---_0oyAsR9~AQJrF*mXUSXE1ytm)^zaf
z?{^Ge_j-l}6}HL^$(sNh1j;3Qlg|*90oL8IWI6!5qak(iA}<*LHyS|iVb~HOeWK2@
zI~cKo?*|xoN3%uz0!e`GIpk)HX3m|7CcfTBZ2&W#Mj8@DM&%7m81JV$HlR@?RR^7T
z{}4-EDg;jsk;ulJ-S~h;0c6jS{JI(!ydSz~xc*|6{zkE$k+CsdoEfm}3EGjUXmUTy
z4Y7QEc#cI-K_qg44R$JNZi7UTP)7#deF@x5Ru;aDZvFOc>&TET_{hyi;wOFE_t60$
zfI+W*y)Novt@<>oi3<<19|Z66v&I{E17t$n76v@tOKI#cC#O0|Fu*9-=C!o7{RaUJ
z&CNq#)(cpWY2qKjQx(r2-SGzpbx|Tc6*(4@GBq_|egZ_j3!nrvJdXt=E)O#^Gu|&x
zZ6j!bXt#j_P{&~ie9z+Bgl3&2X;OE?Jl%c6!w6t-l1axeX^xDF`~IBjCeUO$be^CZ
zkpFfTBdv0}cr4`~K+g})-H18ja}fcmwx{|tQseJ*qy27tgfPf~1j%!B0<aNl=oEWM
ze5@>_DtAB6d}Pt}DyGzd+Xj-WbNiE()rjw?58|ws;Qr=j(2<*5$J#y+9qXdqzvWXc
zY)(W!xVT3uZbuEGj>e*L36RG>e@S?wBle^Qm84d!(-WZxe<<st{bB!V>*S|B2p=9V
z+s}t$Oz2NAce@)VeaFc6)Wvbd$w^YHxdM<O3L7M>Ajk>qU9}bHA%ILVMoe&``}19c
zL8@IVjTX4p-4WbC`<~Ra{7d{3#=5{JOiFFT9gMqJ{N|{iQ?#_l8tOxXCFf^nSG!|4
z!0H(So(Y)kUJO%l9s$u7?|%c0<vvv1>dx1uc9guxP=O%F%*^G<X4=Q1W`Zj$+T?qK
z>i`<vS39ASnv)l)YI-BZ#nSZxnp6ps4`Ebz@0!-HoqP{9zn12100j?3Vn7ASIeLD;
z@m@MI78L^lUxDMXJkE?sjPJVyT=#!Y0&s0RJLO#5FNxLgs;i>R69+eU0|s{@tP&Ea
z`f*HFLnpDBB|5)cT;9l10Y>sPW?`H-NcvP>?4$M_f2VxpVC74x67|9oDn882nECd+
z)Fo>_Q-E&sD-W?~S38ZU%68xy|H+blgSgXYCWO|fXOKw0&(3`Iq6L|iqQsM+0qy&^
z$I9gI!O0hu$&?TN2NxDCpSo&PZ0^qf$=)7)Gu$(wvJ|)3ykLlT7h8qt?gMkhBC>Si
zkGCe0MsKsDR$X(Zl5g?9tM(^6#XP;RT%&|J)}|Am%oVNh7#U}*EZIM(y)Z?;x7hK$
zJ-hrT=>UQN&v5u;sSY&n0U<Q5n4gPT!)_KGb+Vs)7<Jd&<=-%mXZe&R`F(HyPjbD^
zC=_ctUzh_5zY$|k-iHdFajbnT?*y?%_zUJm5<6RO``z_Kw|Lv^%HGIEdPHm2z5CmQ
zc{Qsos12XLHIDuhMW5)OWIWG6D<;=wiFL$P-V(l~tlYJ&#ZtbiMKV#k#OP~!ck^4^
z{L?nqG0EE#+E%F;QMGj+4>d;wEc>uOe2WKUi~7G_2(vJn@1a_pMW1_m<b{1!1bzle
z3kG4*TnW&|r`v+GK;@J)qYIt`7A7#+z)HnSMPZ>y^~`=Uxu0_x_QXlqw}42*HZpv;
z!3FwdAG#(|Vpa4767l2Y(PPp2TGF)t0s*&upzt4jdFf_BMICw``3SQX^43;7WQ8jK
z<u>q)cG1AmIqkORy>o4cZZB+cV<QLXWuBo*eaaf@17P-#D+)KE?km6GT%rU|pXBfd
z3+?(JZxyXiX`EAsOIg)tKeaoE3;P-_GTYzj*}nWyeoYa1y%xDm)v&?-%)*8awh97A
z{|T#sVkq*q7Zt{8E3~A?#mnK-zm`Y0$sQa9mbC6@0|{Ujb97XpO)Ni5`N@PHcY*5<
z^}CAOqp=FOPG}@ZRmiV)fm&@rDRfOovz{&w_aF2ouop(A-rmbq<vrIq=K#iCi(u|c
ze1m#kPI|rvJ}(7M89xmfLq+3w>AU`YT%WX$r#2S<5y6OS5=MC(&~xs64?InvI)H96
zetlT-`@3xQ(p6Vm%M0B4-QB?sb2Bsya=}fJr!TL)z<Tjtt!Xh_(B;)ZYpqQW-Xq`I
z&sbf_dsQsERy=X@{hLn;Q$eL;+a)$86kXtdw9rfOa`EM<<#pyY&4>G<RQ>gFU6KqA
z#R=O~S}7Rf0eaH5?(Sj29psY7+w;fL2+&^yT!c_uv;;o3tlR2z{CFO5R%o0ph8SKR
z0ah0DyZa&Ev3ae@-Fol!mH)1$$fND`!JQ<3ZQ5(s_vS)1Fm^RLl$y`Yo&7i(*Z=7|
zBhy6EvLDvKG1!i9e|405J>E#~R|AGK@WVl|Y&<ewdjPQ^l*;ga5s+@T=^e1Ud@I^`
z7Ju!WY|{)+I|@6BBIZ%t1PI6{&O_=Ft8yI{=`HTN@_&pA8AxcA=Sl}UoK}h)Q}!;N
zeXGUcTwFc0=p-ZWiD6`t-?_WkiU8z()!$aaiWaf6J52qvE{mBw_+z56K5Ft<L|^X|
z{ITIJp)!8aW-`sz%kv|coaOc7c~37NRj^ExQjj^j`=53MJ$4!0_$VGfBBFVxsqeyD
zY#lCuNh-$63!(y@Iv66>FJgwP+PCXOm&=hg&*|7coe??+`xPohjM0DBB9E}C|0Tqc
zsGpgvPkDQxP_l}n-n>X?+c|4p@@;%-=UQ6*dGb`^&mQ~dFblzK&}}PLEmI<K$&zA+
zQt7cMh2aXrQMQeY%a)-iyi-SbrW)9a2<RE{5-c8dZLm8drX^N%li#3pL+BFz@Zkd(
zp|BF7`T5YSak+?FH4;rpCwrSs+i{QV;;Uq=V!~tTKpK;zS1C29W`w<mTSchtIU!Yg
z5*_oPhfR%*bx%ucr;(NXC1WGgPA~$eDw7Wjqe<dz#gs;jk<aPzZNLF`PoPDxfXm|&
zj@xz?!s;+D0iC(fLyrq*a`Rs|ixGll)d+OJG*lDw53xu#SGnW@J0#+m_q_-~Vpy1P
zRI0_Q4EYebsBv}B=5b^y5xzl)8R4*;C*oHrb`~f6l$Ne7qwZ-M-MI;N#Qr5nxFLa^
z+%K96l1+|erU{w3L3^3z3x+7`MY(ZR+;5#fOA<?Y5Hv{4kec3AsQ6YbQ`^%t{Q^cA
zn5nE4ovt)rdggW_!ziG4ZRAf*3{B>)Y+(q$HYGmz-c9wmcSX8Cv)8e*SQ!}PvQ7-s
zpj&<R-Y0)o<1UK(E}v;J?a!lxWn<e?XI`E_a48dN%G^RPyms*{@bndrZol|l9gUDu
zPzaFzIC<QPmZKNJlWc<O$3r5b`6^^vlch3et%{G@-JN?NKa!+2jw2C_4ChZE)i<;U
zKb)cy<G2IHR-Cqq<TsWWW0ZpVa2ol@8i#pJS6S@A54R4k42yac;xTNHUL>t@qM3B>
zFkRsTk=H+EosT#FI;WlK9K(9%IQ<iuq=56Ji7J50N({Hc!1uhmV!u5*)f|)!ZVuma
z8Z686pS+yKTGG}=3zyh$tadrVEWZd3HK2Dd%4W35VlwE`Njl&gXTXiFH0d&tk{d~r
z+9(_yI-Y@bGAf{9**DL8`x!WKA#!ga2A>JF{C`D4e0Ctz)v0cduD30Z1QzNil;7h1
z`1?%42>2x~Ir{WmOy_*)^zt5jeG++nMH;{di(9X6lgBb9qEVTdS&nYQCoR>Rw17l!
zY;IO8N-Rt%fsp3CJZ$38(T!whlREnwMsmj#Fp*}spc%L(YE?j$aLUQv%$h1hve8<!
z5e6Tkh)1^#%rE2Ww|dcMdt<_diizgK-s1Y~<x1D;uzK9=<Aq5a$bS8Sk`?`PMsL4)
z_L`crtGoMeM7Qv(OasAvk{H1a{hs?R3yCp{z>;zsPmJh>SLqdjHH_bx*tBS?=dFEh
zEr;;SA=k$13z#!4set7<NnGjT3X;_ycAQXUZ33;lA6ZF3sgCUp@eR!O-mbSr>Bx}M
zHtE^-v*t6QOC=ViNZa1tHZcA0DS(M8ymPh7Y|eKV#cUO!`!)oJzyt@DG{SiB+f|A5
zFvBpd-3UL{?^=kdra@{Ll(7mV6m{j%2Uuw;#KR35oM9wOKDzt(95V)jF`qADAI4m_
z5zEIlhqG$4@OG?>hNrI8*DSBtjlcZ11o2@_i`eU3x7>&yfc_HMPd^VFF8Yvn>G--m
zbL93_M_nb2@7ivBb^)wHqyr<@B_LqfjopGfPc?-|6&HI1Ywc5hh|348uwfJA+Y4kf
zCJUqdrU3$Xp2J*y(tIwRDky#X?u$cWTRgtZ85uWBOj_hc!W1nylL!<}>n}g|s#4sP
zY{A>1pY`EOAYsE?2%1@aj31S`i`E<hYY`|FjGpgdup7)v#n<G29?&ch_3-l)+-xsT
zy=w5^y?fjK?Ap>8N%AvPE!6W|c&pK>&g<qlVY&JvYxdkH77n6#&_@yxSkW06WY1DC
z;R->iY6y)<422d<U<Zq8I;;xWj%Hxv(l`feL8oCiRTz;J+?f7u=YS#Ntf*XCC0!zy
z!Y{cHDN6M?N;MLsEuJ2N<rySXgKF?7*iH<qDRNu(x?gh_i<sol)6;8LmBen4>8(;w
zgY~meL6cy}xbmle0^2p&G@+_qJFcq;aV<QrErvZuT&9>?zxLVVd;TVjxyf+nIfG4!
z*W1_Yo`e}XGz6iBdpI+fZ5ryhw}p^lAw?!pZG~)lR0Z7x&9>4-D$1;KHUuVw8i^j=
z7X9*dN&l$Fnlfc^*o}22S&EWiErO<>X7y$pOpBiaU)>W&Pu1yr<QvjfP`x_5;G$FN
zUM35{j6fu+H1`;#6cb&naqWsqk|D_*O|7TyfnQeI<kPE`)mw}A4g}@m!7(`kw%Nwj
z&TdXJj!t6>3-mRdCA!e{qGgh*5h#^9W=y(98u{|wxR`}0`m2;^q-}+;GvC{!u<tXY
zKlDtwIF3xN{Ha;|%8G>CAC{nww)1_wHJ~t-e#|vwu_Z6%yVK5%x8KcBm80-#cBTQ#
zcEqA8f7qaY#FvEO1>nB7#c?XilEkGX{gxVJ0i!S9H<5c{POj#i-~JB!Pe3O&=^dkO
z*EGFB($>bYY$U9)ijgMZoJY_n(Qlf6cf~s<N`F<DpG{!hCDTGGvZ>-v2xooDt&`xv
z#sX=kQZntiN3H4<+WvFh=9be_r~iN+uL{fAU$-RRcJ=E)eC%8+>X*%r)Jx`=16QQ3
zaNSkgRpk2pQre|UiLP4e-K0tOglYOCU(9$DJnNc>ez``%_8Y@vkE162Vw;dwwf9^k
zz)~%kwM(L5lY1}8XzG<@w4`p?r?Zu_hOg(TqmPap!j|lu*GVEiz@Dj~3Yn7*DTMS9
zf0doD@y-mH(@`&ci}XX%#C`6EP7&+)M=nXdA~*Q)CWMn-DsHGER$LuTXbF50SlaRJ
zJJ()@u!TiDv!B~;dhp-JU8);!Et)Ss4}Y9p=wU2*dSvNL;}K(0BfzZ7@8!QZ63c+s
zK&~t&9Mki$z+0@0B7|jn<8>^RsCXft(_+o}b=O-~b$|DMu<XZw!FKz*Zr+Km9zF`#
z6P;Tboc42e-~Cz>+ytWDCUKT5TPM-bt75i4glKiIOc23_irhV(3)oH~HW8=M!;7)f
zMWRbNj9v#9Iz?|p;B3<j>SZV$Sf8Ruf3CfHI1Vg7E|7zE7|7Q%P<fMXRs-uaz3RL!
zNtB|gqkfN7GFzF8$C&axAn@2h8-Ig%FR}Il=4PVuQzK)c{Q8L2ZJ`QY%Q^RA&I`kP
z_x;dP%RwGt{TsgOzOToIF$fN&LGC<VNF>BHX4|5gP(G@~QT<Xq1zfbrmnnsWSckT5
zPB?D|fmB^HwYAM!TN3~#Xi_oT*|G{M1|D48BF5|M>t$fYuW#ty!jg<(?=3@BftP@N
z4Hl}?QmjpD#-ix+k*MVftqW=3is~V9J4kpMviS@xpVp8Uw2D%kqiw|KQO65m@~OiF
z1<nkD9&-%`4a4AQ#};T)tZ}c%c}^bPwcn%)q{nuo>gnR}&Zzm;JaVb!SIj{y`lJ`m
zTOgc^Y31Ydk%*1o-EJ%KnM`tEbu`E?Z^^8G$Q(K?jB^?iCcqZcmNL;Rer_(2ubW8P
zauUt8Dren2KK@!&Web$Lj^6RyCr=$i{kIdAe|(mLNDN7Yy}jbSxvf|U+0dD;{ifZ|
zLn%4!Y8|m9*|hK^O=3#T`Ntv(LoJKMbc5*+cs*7{BV9cidaYpzHFR?(QQSK?%vFEo
zH`mA&Y0&-0jIY`Gsrf1nW)Y&PMts5}8NiL?o~pHYeaqto4bSr*W*|IMW!BZpcXkcU
zXWgfEDaMo21tJZVXW=ll&x|Jw$h5;`aeDjIoib#zwlxKzYA*`juyE>YKBTne{}Gio
z$90I>Tvhw19JuKb_2N<ZZRXas0*?-?KFQ}E{5}s1{}#UIKydT?dirY50=AX-_)LCM
zd}NCm!2vBNQS2AoVfI`w>`z}dSffHy`|`Vs<R?V@wnRMrxB|*n{(vt=+~&i=Lvqbp
zFak6leQ}kJZ*s57r`dYwGjl@Cb~#!#MyCo(Lgrk-V<=-TeHJ7n2V_M<U2Uwx_Afev
zSMa}#3BS&123>DiVZDPx9F;}rVzsvTwyP<n%H7V~T5%)J(DHRyM@1zKesMIU7QSBZ
zRu>lCLfS?yA11>DPEM83uQYMb)iQPN;b@8c`eIgMj)scGKt6}~uSj!<QT$1jyz~xL
z*E-(g;|ydxrq8R_T5$Nkq@6}}AA+}Y#hOF1JZPW1ZEB(ppfNwnsW9~F$g2{|!4}9N
z4U}KOsGWu8%Q2=}s`Av`349s9%zBIJKpUe$LMvL?eIMN^EQ-jbS<Ax|tF_7s^~JDq
z{>(7U?z<CyKUR>Mg?rr<e=OUg8Rf|y9R4WgR?NlQt6aUupb##V4D7PzdP05E*tgT$
zH2uV^B|GXWQPf$<2etJjnumvOHHJRruyXp?AE0$}IWo~Asi)T0guon;-sY=X8sE63
zzrHy~gQ=40r1#(7I4@`Cubv)fcJmZQ>c6rVZZzM#!DtmcowZ?^J-Kb`K4!~R7;Pj~
z=O>_$Lbmx;yzm>77Hpo2RYjOO(7QxyQCX<I&vM~87W6{?ENG>YQTLVS$3kQyo@nyC
zn#CIv!n<T#IA}RWak6~3h&TA?M4JJ_3xwIw{ANEOXm=YG45E+>Y8^ji<YvRudhC8(
zFBtVBNe1Zfn@DF1QPgT`X}e0rmPJ#if_a+{49hx0F2w3d7VsvU3|Ue}*yWfdhRODc
z1c#LQM05~zJ%P7!+Zi5oRB~=yN<9<Sg1dKj5t!J)km5`?QKJ6Ch{6~ox8$wOjMQf4
zjfcga?b)4{<=5Y|Q<l*u>$Fy7Wq%N#KXFExa*}i8?d>jS>|CQZ#mR1SSIJj#&VPSv
z*CbtmsV<&NV6GeYjaH5X!c?+&sDcwptlp0EiQxwXQR)QKZPTo4WFO@RieaL-PDKmL
zC}qXN(RfEIj;_9&S!JwCIF%fQCbUpW<#t#9um4_2D$6@Rgb~?6x0j3NizgP^1r5f-
zQyYIoX*v4NuCg}}$2F}pp(axdQ|+;=jah(P&%3%{_fFDe)Q@{;7v2PJ{wTwy+=kiy
zhoKPy*TDyo7hkX~lb)TMgNZF|KA%nbGnD_MjZJLJ`U8R(l5^)|PFI;=>nn4JNuDXb
zv!9C$F86;OzIiz=({{pU{A6Hx8zMj8#kv3IclL6zIX}6J+p1Yxqe91gA1)>w*5|m$
z?NFLXR_R0%c_ZA6IThTGc40vwy+yu7`JDJ<qUA6#?q@3Wti&*iVX)gMM;#?Bv0|A+
zHu|BkExM?fmQ{)b<l;+Ch1m{N<-cKA)gBT|YM|fGG2W|b>RDIDdK_uzOb|%8p1&7D
zNJUgb_(F!Rhgd9oC~il8>rlzMv-lyE_S#MyQ^yT+PS+(kx2VWJ;MtZ3b!%@TJ=-|j
z`Cyv4k~1?$iB8f)1~)9ld-`U9cBG6hX87&jvomKa$0c<2&hG7n6aVSyIMrVt?S?;4
z1df88L=Ixb+dnZiHHu&yYcotH4a+0@^!qOK(prXl0wO0tO2_oRX702Wla5~Q17S+E
zRY?iNc~cc0?*|$LTE89TBjJ#P7<35%UMp)15{&k9bP+hLqcX0=6%qERrDB10gFB0*
z{&Id?D*oTlF+2oU5GvYl%>pet4+ldOoz)B$1BT!x5<5B+`ZU@aCAt}2PX3I%011MQ
z>m5nYu??w2$|Wsfs<8}V)u53LQiInOE)r?o4#9ZgU@`KO!wmz&yo|c8o0QmCMe!0e
zlVbXDm@NGyUJG}BRI*Y?jSVMBiub6S>3@L%l188#!ihG63F)1}7`>veGwv~EJ#1`m
z82>vg<l%XCbtYiE)8$Dqe`07lku>Wxs9861e~<U&gH;MRM^-YcSJ=@c{`GqVGFyqM
zFym-LaP{anYw^=n2Zsri-lM2A<oaP~70*LX3mbaWolk@+s-05sl?JlBi>R{S1uhG2
z5f)oHC)?b6MuPenV81(UZbTIzyg|#7vV=n^!5iL%STHz#q@M_uS~Oux(NT|0Z5j3^
zJQdHUg{op5hL%rPfFG0<&4(FhFN3(uNsD%@6)xLhhNXpsr29RM)$s}X^_lZq`ue7x
z`=1+M?jETxYH1V2g=dpe;OOD1rhFV5<&e-dhZ7rB^UM*oc{fiK#`dRn_-RMvDI(|8
zU2EwVA(}Va+dL~86OitfT^&RJwpB%*w_NpNama-Q%W}SZ-L8G8uJdHuOZl5*X<sxJ
zf+#S#Pdm^TGi%-N#JRQoM5}B0Lrj6Nm@~_eST@U}<A@h=$G}`GZ8r=y37(h?l#cX>
zT3YyAig_cNg;dgBuNiLXpsFZthejnt4lPXm(dX|}E4sQ=7%PK&Q@{U)UNv*}hcb3t
z@p==yxgq^>l%9z35oC=RdWK?fAV?B%x*R3TELG|#h<yo?gAK3PgrYjEmO<p5rphjM
zl1-`NCh-1i4Q+7mkCUA1<h<vv$vYC^1H#Uv4IM3DvM2ESRA{sBc|_3bBB&5@Hya-?
zxNw6iZifCDC1L>1LO!osXJ?K#reM^y_TLtFC(TcIxw^s-(g{+}-)Jec@wtBJii0=z
z8AgGVeJ5`NUK%mHu6Ci%yKdhUZE?*X4SJJQjdDzQv751zb7aP4#*`^o5zQZEFALJm
zNTZGTkAIFn7}kSXqm0ml6O+U(fiT?r@KI;kRwG9;G-JvEDEa{xn%YiJBfXqpr}c4E
z^|OGzw1qXaasOXrD%y<x;O5V+H`4O_JFC8Um8(C=3IeMpVfWC+Y{{rSuVP)Fv9-i;
znXRqG@d^|U%guKJgyX~`&}82hE~7+>PuX#ULqf)v#|s<?A@V33MIEaqz6azh`YVFo
z4`BDzOZ=;w4Y!sxCo$TCf4h8^ppP|j^c=k#3>kJ<Doqtr#?=0Qg>JtM`K*LbaOl#;
zI!Eq@QXov$p4fV)86J$ozhLZ!Lwq|rZ`aj9T#VIsIUb&&e{mmjp8bg6&eYC#79<zr
zD_WMZ;S$J~n@LuF_jY(*mMhb?*P54d!exIsMwh!+fm##?jxDxHwqwnrqEP|&3nZ9<
z1);nNR_gP62?$=PN=g_NqYE0Jb0sqML1~VP42m9Jrbe5KElpXv-axRTTU&U7aw?mb
z-Y?xam7cgdC+7~xRb{BY2EDAtw^av`dIa05vjdM1k21w1h6caE`yu4?bg)ZH=IZAX
z!$x#+Qe|f+4D!R*@3f{x*HD*EF^kDloAsUhxuXPeEc5NT(EjupthhZ{n9im{>8R_~
zeKu2;x;c@YfP5^D{M#^ZVRL>mRp~T{9FqIA3r`6r6yJ$0<7!9C)J))myh6q30sM0n
z{Sr9p=N-97rP|bgJjWh3ML!<Hl$T_IvwuzhJv;FodLgf+s~H|-ESi2`HesuN<|FG~
zr3g4Q$w96>HW4w$j3u4LG*mSxi=)rrhKU8wCV%=JHd9J8Q6ksEK_52u4Ng6LsZ&{f
z3aovVP<4)}svIig!9*5bfJP~GW|J?SBMk(t6ed)|!q$qggr2SB#Hm3iSX5wqt^JOo
z1S^)aVA*NYBkjif<~U;M3k#p1&y@Rlj27eG^g44#hk$hruYibI;A;?|SA1X3yo4Fl
zt4aP<OPujSO8cheHJfBBK9fWO-0M!Ybx`v}*LLArX@Xg58Khw)iJ!Ezu#LKXBGssz
zaoNb@GpumrIN&)=bdrj{@~Sm`MeaHw3OS)Fn#Hw!s{kGLZPzvA&3pbi9qJTS8r2Za
z?}W+87U~VAa%qa+cH!XMh>=f+8CLXZ+ngJN4P5`7q|_!Q4;Z|Zl_YM_J+7{AZ<ksf
zMpmar|3;goAKd#<P70In7bi;&G=%J<JR(Z0+GeK2hlx*y_N>EuN8KtKVtkq=aOlM9
zsw32&Dq_kiMbj*2eJmO6us+oOr9i-{kru~AEdC~5kv)4DHIplHaDN@o$LkmN2FAmq
z#rxq8IQ!$-$B=t|e*MBCVjlQP8#|2cDD;BAarcm?zWXr>YWu&>n(F*t#fJ#hF_olo
zqE-vc=x(OzuSrP=tLa(qNmHmIx#G#soZbE)Td<XIhA;am6k)kqfrZtNaJXoQOStzj
zmcMrWge@(+!=!(GWG7R{*Hk(|2`^uLU(dEMt_#Z`hLtEy_7xd&ibAdn&H!bxv-sea
ziW2F3dOz#m5b9G|_36LR^_z%*z|rXE_>3u(!g|@FS<|+T$zR9B@@rhgHaI^N4iE(1
ztJ3P=<wua#8E^5JDZ<Y&s8-Tfx~cquo<=1+5iOF3kZRUcU<#lpAh~QS(ndL-i{tWb
zS1#MlS##TPtIdJ4JJQ*tJ=;a`0n>DO0W!IY|NW=8r~LXyC`~(!empoJu$Lv^g`<|)
z$H4HGSCDt>*i@!iep<<Ak}gf!HF?=<*iCKDS~^s9TZ+Zo0r_BFSJRn2gSw1Wv*Oz*
zy`qug{<zFsMwfu6*PjdMnZF_?KhEbreP~*F-%nYb=pnPio$Nfkx4;$h5~0*MAmG?F
zrPea#<#XDX^achrwx3{dr433eop0cD4D!fDNmCAs^Otq{5f~>eao){Sc?%Cg6~rBV
zSLdJ7^k_k!KZ>!-eawXIdXbM)78%x&cx&Idx(3dwWTiHf6_(2;F_|D|DwKA+`wM4*
z?TM%{SM85B-1?FxqN>b?D-BFYcyO^u>ilCw-*yP)Z0jvFN9hUTdy>mi>1=MCYWFOv
z!$Lx|pZ*+BxZEAXFD+ROCho1Tzw`Y2UB~E%Jx7_BfBj(lDY&Qzb$X^&1x`miMGi^h
zSX|);B@3rVc9EudhSt`Y^C_I(yfs~@E_cUP95^^X)`<LrVNgdtSNCf5V)wEGf_L>a
zG=laZVL6Ygm6nbil5%}5TxUdjwOm$5Kao)9e`-iB@<N>Bk+tj>^~PYa7O7X-n#44v
z*5EUvwFYM_qM`25OKmeMjx@bXmCO!)fstvh;@EX2qn))xKAv-NL_dCM4s7_%6kcgE
zm(LQxAH*evG7g_-iH8u>Y38_$gQ&edt~9MQ>taPPF^R-hOe>Kz3E{L+#ZB9Cis=_R
zX`Mvvr*ttkxe1-0gdU(#lIahc+cj^b*CXJ}df%_2{xt^d#(=XbNJT*nOkg{Fvq(8$
z`uh2Rw9}_AKTxr8;p6!ke#c4{Q=Qu(M(zEddF8chV&ykS=m-#!!~<Sz7Kfz4G|04U
z678=k+HHvYP(9_~k(=SLrL*{dyhsGDFgaWu^H$YVENB)ck%jM^fAj9y)!K0Jc-`jE
z)>HNPy;>O<{^b)P3qfw>J$LqTk-~m|ZTvjs+j)EA*x3DT+Ri8+wr?Q~Doo3Qb{?g^
zvij<b^yEMH1G1lmqh{}S_c}jaIdyg}0t6w+N+Yy|Oz4(;%Tn7<n@bsV?p5oU`ZdnK
zlGQQU$To19vE|fnEx1#;WW_zh$0u^&LWn(rteVmAQ}?YRfAJBv{8~!R!uy!z;WV)6
zL-gk%C2W#_Jx-E6)n_zxmuS+Gw&*g&Qoix~_x|C1hMW?78*J4Sj@+KRjDdlr?3~=I
z;~Uf~>arDwt0~8xq2v+e|2i5+tXa1aMecn6jZ#@N(QKO38vLX)_4#vXn>_ln8tM&<
z{?f}0d9M4$BgT^hw?Eg)+7{`@;l~08wei`*Epcwcwu*k!nnDQEeP{15)|6!k4Kf5J
z>^;+0P@|6O_*969b-euig@Hnn%Wphyx!XK%**5$R1nka#&r+a`PGs|X81l4N_C~r$
zpCn1KWY_#Ef@k9s?oYJVB$B3u<98;>)sLzML*29L5CrF+pjh7_HNOoVpEUWhJh?!G
za>%*D<cVieO{nBU=;HHCexRKmGvbfXrLLr8JSUTm<Q5VVV)c8iZRU6!p~{xTO&cs+
z)v)FLUjS1PtnQTzhg0&bB#BZKn)y7d`X@@#q(z#fBuzuB)gX>TvTVZs{!2dj^g~|0
zddBJL5sgN|)3=_w2X}66vbnKI95-piOO*K;^O+)>2TaG6Bu+(`(lDK7pfsTl>Gk>y
zM<X6RdW(Pm@BclIpFU)sjpz?Xbe5J$!^B}N77qkbN})dc<U?zXt<n)onVU*<prJJ6
zS>|R1C`Fc+^!wKght~wU1f4UPj_LOYjuN#Y+02mVhV|7=x=X8ARk7tdaGJlsx<Z9A
zC{^X_l6qmGG@x9C(Bg!s*s|i-E!H%#Wy{shOM@vZkwu`<$`y-(5W*-R(5}9&P{dI}
z5JoP$$tTQ;0i)>!ndx(Oalm9YCXAexPV124qceKFA!T7XJ-y`mYDgHyY^-mvvA)Ij
z#$CGIRho?@+U+i@-F0lK$?}{)M^aOCz}gJCygcRb_$B)<KIQeR=S*e;o;<zJ!$<eH
zb7z}}5AV4(P?|Jp(M*<zbes9a@bbkW-~XGx;m1GvM+T!FX(M1Z8)KElD#c_xCkRvC
ze)~QCyZ`RL=fC>P|AzL`GDYEJ;EgoJ+F(&-tPY#j8g;zCZ$+Y<XSwU+E32uPLBMS0
zo}8t$A`Vg};|Z5nXBd;Y8bXmdrp(}Y`*}`jAPQXrWt_O$v<h&QGG&|`Oc__~PzG(Q
zxbM(X<q^!H;Df0=gQ6^<$g9`8Vs9l!mthtQ`F5ZqR1i6knlvhTx~44WSe22LW5U$(
zzyIz3#>Le+_wL>$2m+2zPFPv)vaz{ASvo)&=z#HfLa%ya*>vLg{3uLWUEN@Pb)AO~
z9<#B&K^Vrg(hl=^$?@?aAN=ZveD>_u%;!^9*Oqzo_yIdRo2;yMSzTSG(`k`5QrfLH
zVVIC-V9JnuW|@vl`qv{4kB<4^!w>n<kN$zPixYxSQ(8mPX!7*wQ@;0Sf6jOR<WG3`
z_zA66huM5a5V>`kOs2G&T|(tLr?u2kv?6RIY1JrE5CodMC<sb7a&0!xDaryvNtu^m
z6k+UU@=a$NV{)u<%^3uiyeM65zN+b4t+0VRl}<)oRHt2P@L)@)1lH7h02F1ZTn!yt
z4b`v}`DO@Wiz%y);?j^8PUsnER|`M{l(r-eQwRd)dCs(&H5|twVWjD-Y!XG9KyMH#
zi?&N#o?kM!F8H&5^&P@6;PvYl1S%nkBI0gLr`2L>Ym+Q@YMeYP84bt$`lFxl*|VP!
zhY@*JVvNgp6dE1PS>J4N|K8hdZEq7r?y>d9$H&BB!ovqo>G%6gCnZr}u{I#j4CBF!
zet*RIS&yr$KDJbR?Q8Gx;Nep@?G#J1)8@VR-s5|J`loE|?tqF>+BLdn@{HoNLEzih
zYYHR_VVp)-8xkfVK@kuZ1*R;C@`&kdMr1V2c0!irOviKA2pK}NlTu`wve1;KdNho-
zG}}%ySQ<lCP6%y^Cd8D5XU0Tc<(RR+t7e=wuqv%uQ;{c?hF9wLs&wD8230A1RaKR9
zFLR(s2O3mKX~!rNVk_NV7=;9(B?#S&fxIw0eE5h~t3{FJG}C47-(9B61Ag)IU!s)d
zYi~WR)I*jm&oCxqIJ#y!o6_z??Cx%|xxGv_pOMdJj0OW{Gbf(i+Sp|K&NiEyn{01w
zF`wuB_{Tq?-y3ptbW9XB34<m@HpZ5Uxy_kpb0(u1{oa5<Z_LGckE`oztg&pYZ%~wl
z^L=TI3PPeVWjLIW_C}<Q6s0tAl7I<`sy>1|%Uv&}uvgVr7$&ZtJye#k2rII}Eq*hb
zlNV0UHp}v=vsRH8LA4M$1R7gtlyNdF5oBVZEDG{`21Hm4fp2&einZE2Q%R;4x(I}2
zUwqRQW{k-x?LuQGa`Hvnm%-W`2tXTbIi)lKahQ_E2~iZFtdm=f$8OsA_SQDdW}CtF
zz$<b7=KFuk(eWYQ``&li*}g}!(;%-hjL~Gs^B1rA@lSrpd^Y8+ClA@)-D0`B#PZTE
zVWf#d7kj(i6&j5;SVfv942NT0zC57S?69%1!}8J=*OybWx$~r!fbnol?`lB5H)K3^
z&p8N`CTg~s=Na?NJsUAn305iky%C28r$lj+twxjSBqIpZDx4G!M^!nP%K#RJ5C&o7
zn<bPET*0zxObBDmJaZ3VjDfK0o`W;b=JfkL7f%a!vfCZ}<ZNq8qBtdvsl*P}yJk1Y
zVKE>Ae|WVUpv1!6%f@>HuvGMF;XjNRg0+ib&QOh|)dn3^I($m9JgWvehZLnDN)v(#
zxyNzLg9i^lSw8sS175t?=bd-oWo2cRqoX6XcD9M)nB~<CcJAEc>Uzxo@qhf7pa1;V
zeDI5pSYB?^?KFA%<PqQf(?4NvcZWQK=_DhLoDw+C4Az9Kt!$xn#NO^hR#&!}jt#a<
zn9mLKVosJB%2HRNTBk`UO~E|R3Briw?kc6V7z1hIbeKgo>}xulk*=*0sF1R-jtz|(
zgn{egk_DG=8(J+x45eX0(zKF5Ynow1Sr)DqUn+{SB+3$+tu}c!V=|di6nQlqDk6#!
z^1P_Vp1XblV@(x<L=x=~vix3Mi7s7j0A~nB1Qd&55vtPBSrb8(|B9~9x&Fl%7OgY}
z*P;~!p_5lx_h+pGk}yI(br^<>CnM(CGMSF~;KQG?wY|pH<_cLp;rx6`v)!cK?J^vW
z$ulU+fUT|jeDfQMi?b8@SC<TX*QC)k-}_fx?%sKqvdk-Bo1(0y-<zOl@MnMamjpT@
z3=*(0lX31gyRb~>bHH_E&E^?dHU|oH08yZ;B2tbHWS~}D(Z?}bLs8^@+<q7>W+oZ0
zcdUf~s|Zn{UqI2U$*ILSw;KilRzs;l2bM61oR>%&G+SNrJaa{)>5S=o%5*X#&r8bE
zV9K1*RPkSlObSq@nk^_Ib0@o!hKY)dcg+)3!NgYmT&}}aJL95sA_{7gyOeVLJ&CI^
zRHDH^2dLU$3WLi^!YBp|I+z0!OfjO<4w%obX*SmgqL^2&_esy2?A+NSj3Um@&&aYV
z4<9~YZKcD1{&62o#AsOZ$w#kw_~7fTudR?38IxSPftp|yN$kqm)<BlK&sgLodEsg@
zd6`j^W!1jr3R+6L{tAn(DylI$jA%3x(ljP*#>7d44!}}UmN{V*IM0e%$nI73f65VV
zA=Y)pRy8eeAsUU+B8RGqA631^YE#usYd!SMf}+T(**dusbQA?eo-xm+WceIh7Fd&4
z)vyKX*CNfX>g&cTY(-5kI*Te<xD7pNrK;vpYc-`UZfNzC3Y>zN039fTD&#n|j;VP%
zMK;fg!+<mmnT$))Sb?$>#gy^rn(pc<3V8kcIqhzfMk`@Dy8=dZmzUUF-{s)tGFRtA
zhW#Ng_76Bay`s@*yM|T=#?jhI)blK-G}blCP+*OvtlGp(Syl$G2t!2_$JM4eZKKou
z$3#&~5Je<ugJv_OnZ_is6N$v3CJ1pXAtlnsC?U7rDHXc!ExrL%ojsMDNz2%H*Y{-&
z73Eob)GU@Ta-&Zg%_gQS$%<-{XFg{(pD>%xDD#Z6%*nI49|Y-p|Ep3dfVNI2qXG@V
zqN&kV%%HSXnLuNV8vqrls8Zd?Vmnoisam#N?n`z0WtM>R7I|J0M=?<l5GvPoJ01^7
z<A~v~$80_(X}3AMIAH0h%`6|1&98`)oL1Aav9`?i_A=KO*Ni6_rLkC}n9U2qC?Hf3
zvsq4A&Ilu?C@Ra6Qp=cHnW$nZj6Ayl0v!>@23-xe5^g34BR9o0j!2S}G<B25<HUsp
zZ|oI7wjKoDyp&Re(ulFp$vcBkMpt!kv6|3HptURAnu@v8R$8td*Bk&Q&;*gCw3f6C
zNgFXmkzq_x<<41U1a8D@X$+<`&iaK2Dyv7;l%`U~ECAwSa!0V}opZDj3rV=-5Y^{k
z(GLKXC$kESA_x+aD5RL>gu2OFkG{@-{^>t3>W^r4QhLKavwT9QoiLsCc=_UzLI0da
z0x%=c8A+l^laTRX#&j}u`u%FIk(7(AEnS<vy92kLN@VEO9%x5yxsf*s7DX5sUlUOQ
zZiGx66UR3nMiECc4P8~ARWB4yUhB5-0B%AERWn0%Q{EQ@U`@?4_*E?{oq9m1l~8=u
z2b6}#s>wmS50nHENfIo?5V@NgmS>KDD$2r7AEk878*bK+p)>|tDMC$YFsek=Bvy5U
z@LGGNoH1dm_VlW;6g+2Osua=~OPr*Xg>^hY)aAk5$Gm#J&)MZ6VHB{kvWyC$v$8~g
zG-5F5(Q2l2+bNL_DDupSN|c+6Q04{*iNl0>F(aG1lOM%SeT}tMO+-=eKLlJylT{Fe
zE;Q<J;Uz2CL=Z&;QAir6B(dwUh~ub|nz?SMK>81<0I;8VaPtb~#MdoDP8v!f0#}Qz
z7EV?9f~jc5s_WN^pd&zAM^h>sXmr2ZZA7dTB(@TrmK3>*ePxl6=MoP~%Df;ia^Ldg
zUQ?i@Jq(L7l|t7n^mg7$Xze}1;<Hr~O|(W?H<ZyhsWEvrC%~Y?gqQ|TpT5mxHsb93
zlFe|H?sA*?bi#OWjVd#?Hdg6&mMF54$uMKspKx)0O`LStyT8lw+L9ZoGp{rQh4Y@;
zNrtKo!Z)4z6_ONKS$B_>8}~hr3Y6AFaZH+46UUOo&2EZZZ$}sgQ1x57;S`mj)i8kU
zb$C1e-?-GR|Dq~<P~EP8whH0nK^DY%5r3rItdtwCAn&J5Kp5jrcM&-dWKA`&qHyg{
z`OPPTmc|)^skjPjTmebOy4>!=_r_c^?6NEg#Pw=TUgRiBqBx)^Gs<GlqlXWfOb7h@
zgP(A9*&_%w%}zqM)yCR_rA~uxyUnmS<Fi+<Ied9enQOlFt#|o1fAMeF+*~J{&s`a|
zdhnF0+^{r+N>ggxaKk|UY^wQ)?%rKvNX6v`A!#)bD~@BLYM4|UMMTx`E?o`RkWAvX
z`}aF)>#I|{ZhyNzsOk1=-t=$PD;9aY@4vhKJ2V=H0A)<O%=?ic&Gm;(xj{?0AFfaq
zCAKn-`lz@1?|9=E#y4fkECG`jm?8(0(`qD)M%TPN+UL_3A9HZ@nkdmMb=z)COQ@NS
zX1soJ%qJi1GabWw-~29r{%`-1x8M2(Q6ptC8Y8t9r5&i2`}=J}Ec}}KmNfh*KBY7|
zj7XB0G)djK+BhbxJqkw$0V<G*@7m7~cvBYeg&2T;v(NoojmlLwIsJue4x9v}%JBun
zNzN}yrTW<VJkP2SQaEo=ECxZ>AN>N0Ol5%=TtUfLheNC_h?AHojF^t5P!`02rpRXK
z(1JERfBlSKfAS$G=SNH?BZ@p@I+>A8bEc!5X58VecfQTHzVkh{cJHDBCpa~QsfJ-J
z?nfRx@!Ji+c_*zFGZ1A&o(@97@YW-6qR4d+R}ZSP06|dAWsunei;m>_Uj0r6P<O3w
zy58h!{WOir0GtP~2;N-0wsKLn3M2K2TaNsfAMmH%)Ks;mEWH89D7HnG;7++Q3&03?
zrL!@)_e@F!XcG_^*W?mtFs7g|86+?-rW_u>;@Pv$xVX5W%q>ZjvbnO&y}d_lZ0(_f
zgi-|#=;;7!Tvp^iG@thXP|vg$#^8{<y)mTH{W&6xYEL8!0#x-HKPXcvH=RV)!b?rY
zeuD@2jk|hlbLG!BPp|sizu&(6M*AwH1DExtOrddov9fv%Z!o$b&_vOqhtHG-Q@GPF
zPbDkM(v3^88K{NYNiMCbQg&r@E~_X|RL=r123tx?7(_ax-CE-Q-a~e`_Xq<wdw@bg
zslY@8VahBoDT=BCNI9cdT6+VmZ?>$Btm&J=K)svUcQtEC?_{vW&2@LGtIt32%(bz9
cJ`?yq0VnD<u`4Z6>i_@%07*qoM6N<$f@pIWNdN!<


From 29382d2781d8e513ef98ca967e4c43fb218a281d Mon Sep 17 00:00:00 2001
From: Juby210 <31005896+Juby210@users.noreply.github.com>
Date: Sun, 2 Apr 2023 17:43:06 +0200
Subject: [PATCH 098/147] Add BetterFolders plugin (#530)

Co-authored-by: Ven <vendicated@riseup.net>
---
 src/plugins/betterFolders/FolderSideBar.tsx |  84 ++++++++++
 src/plugins/betterFolders/betterFolders.css |  16 ++
 src/plugins/betterFolders/index.ts          | 177 ++++++++++++++++++++
 src/utils/constants.ts                      |   4 +
 src/webpack/common/types/utils.d.ts         |   1 +
 5 files changed, 282 insertions(+)
 create mode 100644 src/plugins/betterFolders/FolderSideBar.tsx
 create mode 100644 src/plugins/betterFolders/betterFolders.css
 create mode 100644 src/plugins/betterFolders/index.ts

diff --git a/src/plugins/betterFolders/FolderSideBar.tsx b/src/plugins/betterFolders/FolderSideBar.tsx
new file mode 100644
index 000000000..3e44a5806
--- /dev/null
+++ b/src/plugins/betterFolders/FolderSideBar.tsx
@@ -0,0 +1,84 @@
+/*
+ * 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 { 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";
+
+const cl = classNameFactory("vc-bf-");
+const classes = findByPropsLazy("sidebar", "guilds");
+
+const Animations = findByPropsLazy("a", "animated", "useTransition");
+const ChannelRTCStore = findStoreLazy("ChannelRTCStore");
+const ExpandedGuildFolderStore = findStoreLazy("ExpandedGuildFolderStore");
+
+function Guilds(props: {
+    className: string;
+    bfGuildFolders: any[];
+}) {
+    // @ts-expect-error
+    const res = Vencord.Plugins.plugins.BetterFolders.Guilds(props);
+
+    const scrollerProps = res.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(() => {
+    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)}
+        />
+    );
+
+    if (!guilds || !Settings.plugins.BetterFolders.sidebarAnim)
+        return visible
+            ? <div className={className}>{Sidebar}</div>
+            : null;
+
+    return (
+        <Animations.Transition
+            items={visible}
+            from={{ width: 0 }}
+            enter={{ width: guilds.getBoundingClientRect().width }}
+            leave={{ width: 0 }}
+            config={{ duration: 200 }}
+        >
+            {(style, show) => show && (
+                <Animations.animated.div style={style} className={className}>
+                    {Sidebar}
+                </Animations.animated.div>
+            )}
+        </Animations.Transition>
+    );
+}, { noop: true });
diff --git a/src/plugins/betterFolders/betterFolders.css b/src/plugins/betterFolders/betterFolders.css
new file mode 100644
index 000000000..6efa01d45
--- /dev/null
+++ b/src/plugins/betterFolders/betterFolders.css
@@ -0,0 +1,16 @@
+.vc-bf-folder-sidebar [class*="wrapper-"] > div:first-of-type {
+    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
new file mode 100644
index 000000000..1b6ce4ec0
--- /dev/null
+++ b/src/plugins/betterFolders/index.ts
@@ -0,0 +1,177 @@
+/*
+ * 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],
+    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.guildFolders.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/utils/constants.ts b/src/utils/constants.ts
index c54676f4b..7054db2b2 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -226,6 +226,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "TheKodeToad",
         id: 706152404072267788n
     },
+    juby: {
+        name: "Juby210",
+        id: 324622488644616195n
+    },
     Alyxia: {
         name: "Alyxia Sother",
         id: 952185386350829688n
diff --git a/src/webpack/common/types/utils.d.ts b/src/webpack/common/types/utils.d.ts
index 59233a480..038163d0a 100644
--- a/src/webpack/common/types/utils.d.ts
+++ b/src/webpack/common/types/utils.d.ts
@@ -30,6 +30,7 @@ export interface FluxDispatcher {
     isDispatching(): boolean;
     subscribe(event: FluxEvents, callback: (data: any) => void): void;
     unsubscribe(event: FluxEvents, callback: (data: any) => void): void;
+    wait(callback: () => void): void;
 }
 
 export type Parser = Record<

From 7c563471f686a3b6cffb0fe13d07a5b5eaf0ebe7 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sun, 2 Apr 2023 18:31:23 +0200
Subject: [PATCH 099/147] Fix typo

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

diff --git a/src/plugins/supportHelper.tsx b/src/plugins/supportHelper.tsx
index 9eb21093f..0ba6e36e9 100644
--- a/src/plugins/supportHelper.tsx
+++ b/src/plugins/supportHelper.tsx
@@ -33,7 +33,7 @@ const REMEMBER_DISMISS_KEY = "Vencord-SupportHelper-Dismiss";
 export default definePlugin({
     name: "SupportHelper",
     required: true,
-    description: "Helps me provide support to you",
+    description: "Helps us provide support to you",
     authors: [Devs.Ven],
 
     commands: [{

From 8378638ee4bc1e9159110dacb38e682bc8438f52 Mon Sep 17 00:00:00 2001
From: Juby210 <31005896+Juby210@users.noreply.github.com>
Date: Sun, 2 Apr 2023 20:31:10 +0200
Subject: [PATCH 100/147] BetterFolders: fix mentions display (#761)

closes #759
---
 src/plugins/betterFolders/betterFolders.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/betterFolders/betterFolders.css b/src/plugins/betterFolders/betterFolders.css
index 6efa01d45..115099154 100644
--- a/src/plugins/betterFolders/betterFolders.css
+++ b/src/plugins/betterFolders/betterFolders.css
@@ -1,4 +1,4 @@
-.vc-bf-folder-sidebar [class*="wrapper-"] > div:first-of-type {
+.vc-bf-folder-sidebar [class*="wrapper-"] > [class*="listItem-"]:first-of-type {
     display: none;
 }
 

From 8c47b7080d1b16df319cfadbc442f8a25e5a5a49 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 2 Apr 2023 22:14:58 +0200
Subject: [PATCH 101/147] QuickReply & Up Key: Do not attempt to edit/reply to
 logged deleted message

---
 src/plugins/messageLogger/index.tsx |  5 +++++
 src/plugins/quickReply.ts           | 13 ++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index 4b4e0e911..ef9a0ece6 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -209,6 +209,11 @@ export default definePlugin({
                         "       m" +
                         ")" +
                         ".update($3"
+                },
+                {
+                    // fix up key (edit last message) attempting to edit a deleted message
+                    match: /(?<=getLastEditableMessage=.{0,200}\.find\(\(function\((\i)\)\{)return/,
+                    replace: "return !$1.deleted &&"
                 }
             ]
         },
diff --git a/src/plugins/quickReply.ts b/src/plugins/quickReply.ts
index a499ea412..984db188b 100644
--- a/src/plugins/quickReply.ts
+++ b/src/plugins/quickReply.ts
@@ -111,7 +111,7 @@ function jumpIfOffScreen(channelId: string, messageId: string) {
 }
 
 function getNextMessage(isUp: boolean, isReply: boolean) {
-    let messages: Message[] = MessageStore.getMessages(SelectedChannelStore.getChannelId())._array;
+    let messages: Array<Message & { deleted?: boolean; }> = MessageStore.getMessages(SelectedChannelStore.getChannelId())._array;
     if (!isReply) { // we are editing so only include own
         const meId = UserStore.getCurrentUser().id;
         messages = messages.filter(m => m.author.id === meId);
@@ -121,11 +121,18 @@ function getNextMessage(isUp: boolean, isReply: boolean) {
         ? Math.min(messages.length - 1, i + 1)
         : Math.max(-1, i - 1);
 
+    const findNextNonDeleted = (i: number) => {
+        do {
+            i = mutate(i);
+        } while (i !== -1 && messages[messages.length - i - 1]?.deleted === true);
+        return i;
+    };
+
     let i: number;
     if (isReply)
-        replyIdx = i = mutate(replyIdx);
+        replyIdx = i = findNextNonDeleted(replyIdx);
     else
-        editIdx = i = mutate(editIdx);
+        editIdx = i = findNextNonDeleted(editIdx);
 
     return i === - 1 ? undefined : messages[messages.length - i - 1];
 }

From ae80749dd80b69fd269df23956c66832951ebcd5 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sun, 2 Apr 2023 21:13:44 -0300
Subject: [PATCH 102/147] Game Activity Toggle and SettingsStoreAPI (#587)

---
 README.md                                |  2 +-
 src/api/SettingsStore.ts                 | 71 +++++++++++++++++++++++
 src/api/index.ts                         |  5 ++
 src/plugins/apiSettingsStore.ts          | 38 ++++++++++++
 src/plugins/gameActivityToggle/index.tsx | 73 ++++++++++++++++++++++++
 src/plugins/gameActivityToggle/style.css | 19 ++++++
 6 files changed, 207 insertions(+), 1 deletion(-)
 create mode 100644 src/api/SettingsStore.ts
 create mode 100644 src/plugins/apiSettingsStore.ts
 create mode 100644 src/plugins/gameActivityToggle/index.tsx
 create mode 100644 src/plugins/gameActivityToggle/style.css

diff --git a/README.md b/README.md
index 9b0b757b3..fa754d617 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ The cutest Discord client mod
 
 -   Super easy to install (Download Installer, open, click install button, done)
 -   100+ plugins built in: [See a list](https://gist.github.com/Vendicated/8696cde7b92548064a3ae92ead84d033)
-    -   Some highlights: SpotifyControls, Experiments, NoTrack, MessageLogger, QuickReply, Free Emotes/Stickers, CustomCommands, ShowHiddenChannels, PronounDB
+    -   Some highlights: SpotifyControls, GameActivityToggle, Experiments, NoTrack, MessageLogger, QuickReply, Free Emotes/Stickers, CustomCommands, ShowHiddenChannels, PronounDB
 -   Fairly lightweight despite the many inbuilt plugins
 -   Excellent Browser Support: Run Vencord in your Browser via extension or UserScript
 -   Works on any Discord branch: Stable, Canary or PTB all work (though for the best experience I recommend stable!)
diff --git a/src/api/SettingsStore.ts b/src/api/SettingsStore.ts
new file mode 100644
index 000000000..59c78ed6b
--- /dev/null
+++ b/src/api/SettingsStore.ts
@@ -0,0 +1,71 @@
+/*
+ * 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 Logger from "@utils/Logger";
+import { proxyLazy } from "@utils/proxyLazy";
+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) {
+    if (!Settings.plugins.SettingsStoreAPI.enabled) throw new Error("Cannot use SettingsStoreAPI without setting as dependency.");
+
+    return proxyLazy(() => getSettingStore<T>(group, name));
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index e4b87bfce..ba2978ee6 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -28,6 +28,7 @@ import * as $MessagePopover from "./MessagePopover";
 import * as $Notices from "./Notices";
 import * as $Notifications from "./Notifications";
 import * as $ServerList from "./ServerList";
+import * as $SettingsStore from "./SettingsStore";
 import * as $Styles from "./Styles";
 
 /**
@@ -85,6 +86,10 @@ export const MessageDecorations = $MessageDecorations;
  * An API allowing you to add components to member list users, in both DM's and servers
  */
 export const MemberListDecorators = $MemberListDecorators;
+/**
+ * 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/apiSettingsStore.ts b/src/plugins/apiSettingsStore.ts
new file mode 100644
index 000000000..ca1dc65bf
--- /dev/null
+++ b/src/plugins/apiSettingsStore.ts
@@ -0,0 +1,38 @@
+/*
+ * 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
new file mode 100644
index 000000000..1617e9cf1
--- /dev/null
+++ b/src/plugins/gameActivityToggle/index.tsx
@@ -0,0 +1,73 @@
+/*
+ * 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 "./style.css";
+
+import { getSettingStoreLazy } from "@api/SettingsStore";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { Tooltip } from "@webpack/common";
+
+const ShowCurrentGame = getSettingStoreLazy<boolean>("status", "showCurrentGame");
+
+function GameActivityToggleButton() {
+    const showCurrentGame = ShowCurrentGame?.useSetting();
+
+    return (
+        <Tooltip text="Toggle Game Activity">
+            {tooltipProps => (
+                <button
+                    {...tooltipProps}
+                    className="game-activity-toggle-btn"
+                    onClick={() => ShowCurrentGame?.updateSetting(old => !old)}
+                >
+                    <svg
+                        width="24"
+                        height="24"
+                        viewBox="0 96 960 960"
+                    >
+                        <g fill="currentColor">
+                            <path d="M182 856q-51 0-79-35.5T82 734l42-300q9-60 53.5-99T282 296h396q60 0 104.5 39t53.5 99l42 300q7 51-21 86.5T778 856q-21 0-39-7.5T706 826l-90-90H344l-90 90q-15 15-33 22.5t-39 7.5Zm498-240q17 0 28.5-11.5T720 576q0-17-11.5-28.5T680 536q-17 0-28.5 11.5T640 576q0 17 11.5 28.5T680 616Zm-80-120q17 0 28.5-11.5T640 456q0-17-11.5-28.5T600 416q-17 0-28.5 11.5T560 456q0 17 11.5 28.5T600 496ZM310 616h60v-70h70v-60h-70v-70h-60v70h-70v60h70v70Z" />
+                            {!showCurrentGame && <line x1="920" y1="280" x2="40" y2="880" stroke="var(--status-danger)" stroke-width="80" />}
+                        </g>
+                    </svg>
+                </button>
+            )}
+        </Tooltip>
+    );
+}
+
+export default definePlugin({
+    name: "GameActivityToggle",
+    description: "Adds a button next to the mic and deafen button to toggle game activity.",
+    authors: [Devs.Nuckyz],
+    dependencies: ["SettingsStoreAPI"],
+
+    patches: [
+        {
+            find: ".Messages.ACCOUNT_SPEAKING_WHILE_MUTED",
+            replacement: {
+                match: /this\.renderNameZone\(\).+?children:\[/,
+                replace: "$&$self.GameActivityToggleButton(),"
+            }
+        }
+    ],
+
+    GameActivityToggleButton: ErrorBoundary.wrap(GameActivityToggleButton, { noop: true })
+});
diff --git a/src/plugins/gameActivityToggle/style.css b/src/plugins/gameActivityToggle/style.css
new file mode 100644
index 000000000..b6abf47fe
--- /dev/null
+++ b/src/plugins/gameActivityToggle/style.css
@@ -0,0 +1,19 @@
+[class*="withTagAsButton"] {
+    min-width: 88px;
+}
+
+.game-activity-toggle-btn {
+    all: unset;
+    color: var(--interactive-normal);
+    width: 32px;
+    height: 32px;
+    border-radius: 4px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.game-activity-toggle-btn:hover {
+    color: var(--interactive-hover);
+    background-color: var(--background-modifier-selected);
+}

From a7e2fb48ba26360881143cfc1da3179575ae0dbe Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Mon, 3 Apr 2023 02:36:54 +0200
Subject: [PATCH 103/147] fix oopsie

---
 src/api/SettingsStore.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/api/SettingsStore.ts b/src/api/SettingsStore.ts
index 59c78ed6b..a5a0402cc 100644
--- a/src/api/SettingsStore.ts
+++ b/src/api/SettingsStore.ts
@@ -65,7 +65,5 @@ export function getSettingStore<T = any>(group: string, name: string): Setting<T
  * getSettingStore but lazy
  */
 export function getSettingStoreLazy<T = any>(group: string, name: string) {
-    if (!Settings.plugins.SettingsStoreAPI.enabled) throw new Error("Cannot use SettingsStoreAPI without setting as dependency.");
-
     return proxyLazy(() => getSettingStore<T>(group, name));
 }

From 405be7ef138bc9cbbb9e6d19139ea0c0b9c672f7 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Mon, 3 Apr 2023 03:13:54 +0200
Subject: [PATCH 104/147] Fix weird style on username sheet

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

diff --git a/src/plugins/gameActivityToggle/index.tsx b/src/plugins/gameActivityToggle/index.tsx
index 1617e9cf1..6926505bf 100644
--- a/src/plugins/gameActivityToggle/index.tsx
+++ b/src/plugins/gameActivityToggle/index.tsx
@@ -16,14 +16,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import "./style.css";
-
 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 { Tooltip } from "@webpack/common";
 
+import style from "./style.css?managed";
+
 const ShowCurrentGame = getSettingStoreLazy<boolean>("status", "showCurrentGame");
 
 function GameActivityToggleButton() {
@@ -69,5 +70,13 @@ export default definePlugin({
         }
     ],
 
-    GameActivityToggleButton: ErrorBoundary.wrap(GameActivityToggleButton, { noop: true })
+    GameActivityToggleButton: ErrorBoundary.wrap(GameActivityToggleButton, { noop: true }),
+
+    start() {
+        enableStyle(style);
+    },
+
+    stop() {
+        disableStyle(style);
+    }
 });

From 5bb08bdb6465eebc9dcf80ba2971d894b804abb8 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Mon, 3 Apr 2023 21:25:14 +0200
Subject: [PATCH 105/147] SpotifyControls: Fix crashing on canary

Vencord is still pretty broken on Canary and likely will be for a bit,
but this should at least fix instantly crashing
---
 src/plugins/spotifyControls/PlayerComponent.tsx | 8 ++++----
 src/plugins/spotifyControls/spotifyStyles.css   | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/plugins/spotifyControls/PlayerComponent.tsx b/src/plugins/spotifyControls/PlayerComponent.tsx
index 3276be17b..3de168709 100644
--- a/src/plugins/spotifyControls/PlayerComponent.tsx
+++ b/src/plugins/spotifyControls/PlayerComponent.tsx
@@ -372,10 +372,10 @@ export function Player() {
 
     return (
         <ErrorBoundary fallback={() => (
-            <>
-                <Forms.FormText>Failed to render Spotify Modal :(</Forms.FormText>
-                <Forms.FormText>Check the console for errors</Forms.FormText>
-            </>
+            <div className="vc-spotify-fallback">
+                <p>Failed to render Spotify Modal :(</p>
+                <p >Check the console for errors</p>
+            </div>
         )}>
             <div id={cl("player")}>
                 <Info track={track} />
diff --git a/src/plugins/spotifyControls/spotifyStyles.css b/src/plugins/spotifyControls/spotifyStyles.css
index 18fb1754d..88e1d0aaf 100644
--- a/src/plugins/spotifyControls/spotifyStyles.css
+++ b/src/plugins/spotifyControls/spotifyStyles.css
@@ -191,3 +191,8 @@
 .vc-spotify-time-right {
     right: 0;
 }
+
+.vc-spotify-fallback {
+    padding: 0.5em;
+    color: var(--text-normal);
+}

From 6b26c12bfa1f28d40834478b50d2f7b09c9f54fb Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Tue, 4 Apr 2023 01:16:29 +0200
Subject: [PATCH 106/147] Add additional build flavours for Vencord Desktop
 (#765)

---
 .github/workflows/build.yml                   |   2 +-
 scripts/build/build.mjs                       |  48 +++++++-
 src/Vencord.ts                                |  12 +-
 src/components/VencordSettings/Updater.tsx    |   3 +-
 src/components/VencordSettings/VencordTab.tsx |   4 +-
 src/globals.d.ts                              |   3 +
 src/main/index.ts                             | 108 ++++++++++++++++++
 src/{ipcMain/index.ts => main/ipcMain.ts}     |  10 +-
 src/{ => main}/patchWin32Updater.ts           |   0
 src/{ => main}/patcher.ts                     |  92 +--------------
 src/{ipcMain => main}/updater/common.ts       |   0
 src/{ipcMain => main}/updater/git.ts          |   0
 src/{ipcMain => main}/updater/http.ts         |  24 +++-
 src/{ipcMain => main}/updater/index.ts        |   0
 src/{ipcMain => main/utils}/constants.ts      |   2 +
 src/{ipcMain => main/utils}/crxToZip.ts       |   0
 src/{ipcMain => main/utils}/extensions.ts     |   0
 src/{ipcMain => main/utils}/simpleGet.ts      |   0
 src/plugins/consoleShortcuts.ts               |   3 +-
 src/plugins/settings.tsx                      |   1 +
 src/preload.ts                                |   4 +-
 src/utils/native.ts                           |  24 ++++
 src/utils/settingsSync.ts                     |  42 +++----
 src/utils/updater.ts                          |   7 +-
 src/webpack/webpack.ts                        |   2 +-
 25 files changed, 264 insertions(+), 127 deletions(-)
 create mode 100644 src/main/index.ts
 rename src/{ipcMain/index.ts => main/ipcMain.ts} (93%)
 rename src/{ => main}/patchWin32Updater.ts (100%)
 rename src/{ => main}/patcher.ts (52%)
 rename src/{ipcMain => main}/updater/common.ts (100%)
 rename src/{ipcMain => main}/updater/git.ts (100%)
 rename src/{ipcMain => main}/updater/http.ts (81%)
 rename src/{ipcMain => main}/updater/index.ts (100%)
 rename src/{ipcMain => main/utils}/constants.ts (94%)
 rename src/{ipcMain => main/utils}/crxToZip.ts (100%)
 rename src/{ipcMain => main/utils}/extensions.ts (100%)
 rename src/{ipcMain => main/utils}/simpleGet.ts (100%)
 create mode 100644 src/utils/native.ts

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b7a95cf05..f27870705 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
 
             - name: Clean up obsolete files
               run: |
-                rm -rf dist/extension* Vencord.user.css
+                rm -rf dist/extension* Vencord.user.css vencordDesktopRenderer.css vencordDesktopRenderer.css.map
 
             - name: Get some values needed for the release
               id: release_values
diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs
index 70a05cf9d..a4b06f536 100755
--- a/scripts/build/build.mjs
+++ b/scripts/build/build.mjs
@@ -48,6 +48,7 @@ const sourceMapFooter = s => watch ? "" : `//# sourceMappingURL=vencord://${s}.j
 const sourcemap = watch ? "inline" : "external";
 
 await Promise.all([
+    // common preload
     esbuild.build({
         ...nodeCommonOpts,
         entryPoints: ["src/preload.ts"],
@@ -55,12 +56,19 @@ await Promise.all([
         footer: { js: "//# sourceURL=VencordPreload\n" + sourceMapFooter("preload") },
         sourcemap,
     }),
+
+    // Discord Desktop main & renderer
     esbuild.build({
         ...nodeCommonOpts,
-        entryPoints: ["src/patcher.ts"],
+        entryPoints: ["src/main/index.ts"],
         outfile: "dist/patcher.js",
         footer: { js: "//# sourceURL=VencordPatcher\n" + sourceMapFooter("patcher") },
         sourcemap,
+        define: {
+            ...defines,
+            IS_DISCORD_DESKTOP: true,
+            IS_VENCORD_DESKTOP: false
+        }
     }),
     esbuild.build({
         ...commonOpts,
@@ -77,7 +85,43 @@ await Promise.all([
         ],
         define: {
             ...defines,
-            IS_WEB: false
+            IS_WEB: false,
+            IS_DISCORD_DESKTOP: true,
+            IS_VENCORD_DESKTOP: false
+        }
+    }),
+
+    // Vencord Desktop main & renderer
+    esbuild.build({
+        ...nodeCommonOpts,
+        entryPoints: ["src/main/index.ts"],
+        outfile: "dist/vencordDesktopMain.js",
+        footer: { js: "//# sourceURL=VencordDesktopMain\n" + sourceMapFooter("vencordDesktopMain") },
+        sourcemap,
+        define: {
+            ...defines,
+            IS_DISCORD_DESKTOP: false,
+            IS_VENCORD_DESKTOP: true
+        }
+    }),
+    esbuild.build({
+        ...commonOpts,
+        entryPoints: ["src/Vencord.ts"],
+        outfile: "dist/vencordDesktopRenderer.js",
+        format: "iife",
+        target: ["esnext"],
+        footer: { js: "//# sourceURL=VencordDesktopRenderer\n" + sourceMapFooter("vencordDesktopRenderer") },
+        globalName: "Vencord",
+        sourcemap,
+        plugins: [
+            globPlugins,
+            ...commonOpts.plugins
+        ],
+        define: {
+            ...defines,
+            IS_WEB: false,
+            IS_DISCORD_DESKTOP: false,
+            IS_VENCORD_DESKTOP: true
         }
     }),
 ]).catch(err => {
diff --git a/src/Vencord.ts b/src/Vencord.ts
index 00f8a58c0..73b53e844 100644
--- a/src/Vencord.ts
+++ b/src/Vencord.ts
@@ -30,7 +30,7 @@ import "./webpack/patchWebpack";
 import { showNotification } from "./api/Notifications";
 import { PlainSettings, Settings } from "./api/settings";
 import { patches, PMLogger, startAllPlugins } from "./plugins";
-import { checkForUpdates, rebuild, update, UpdateLogger } from "./utils/updater";
+import { checkForUpdates, rebuild, update,UpdateLogger } from "./utils/updater";
 import { onceReady } from "./webpack";
 import { SettingsRouter } from "./webpack/common";
 
@@ -56,8 +56,12 @@ async function init() {
                         permanent: true,
                         noPersist: true,
                         onClick() {
-                            if (needsFullRestart)
-                                window.DiscordNative.app.relaunch();
+                            if (needsFullRestart) {
+                                if (IS_DISCORD_DESKTOP)
+                                    window.DiscordNative.app.relaunch();
+                                else
+                                    window.VencordDesktop.app.relaunch();
+                            }
                             else
                                 location.reload();
                         }
@@ -96,7 +100,7 @@ async function init() {
 
 init();
 
-if (!IS_WEB && Settings.winNativeTitleBar && navigator.platform.toLowerCase().startsWith("win")) {
+if (IS_DISCORD_DESKTOP && Settings.winNativeTitleBar && navigator.platform.toLowerCase().startsWith("win")) {
     document.addEventListener("DOMContentLoaded", () => {
         document.head.append(Object.assign(document.createElement("style"), {
             id: "vencord-native-titlebar-style",
diff --git a/src/components/VencordSettings/Updater.tsx b/src/components/VencordSettings/Updater.tsx
index 3c3eb91b3..15a8c87a3 100644
--- a/src/components/VencordSettings/Updater.tsx
+++ b/src/components/VencordSettings/Updater.tsx
@@ -24,6 +24,7 @@ import { handleComponentFailed } from "@components/handleComponentFailed";
 import { Link } from "@components/Link";
 import { Margins } from "@utils/margins";
 import { classes, useAwaiter } from "@utils/misc";
+import { relaunch } from "@utils/native";
 import { changes, checkForUpdates, getRepo, isNewer, rebuild, update, updateError, UpdateLogger } from "@utils/updater";
 import { Alerts, Button, Card, Forms, Parser, React, Switch, Toasts } from "@webpack/common";
 
@@ -133,7 +134,7 @@ function Updatable(props: CommonProps) {
                                     cancelText: "Not now!",
                                     onConfirm() {
                                         if (needFullRestart)
-                                            window.DiscordNative.app.relaunch();
+                                            relaunch();
                                         else
                                             location.reload();
                                         r();
diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx
index 7113421a6..8b8696843 100644
--- a/src/components/VencordSettings/VencordTab.tsx
+++ b/src/components/VencordSettings/VencordTab.tsx
@@ -26,6 +26,7 @@ import { ErrorCard } from "@components/ErrorCard";
 import IpcEvents from "@utils/IpcEvents";
 import { Margins } from "@utils/margins";
 import { identity, useAwaiter } from "@utils/misc";
+import { relaunch } from "@utils/native";
 import { Button, Card, Forms, React, Select, Slider, Switch } from "@webpack/common";
 
 const cl = classNameFactory("vc-settings-");
@@ -100,7 +101,7 @@ function VencordSettings() {
                     ) : (
                         <React.Fragment>
                             <Button
-                                onClick={() => window.DiscordNative.app.relaunch()}
+                                onClick={relaunch}
                                 size={Button.Sizes.SMALL}>
                                 Restart Client
                             </Button>
@@ -111,6 +112,7 @@ function VencordSettings() {
                                 Open QuickCSS File
                             </Button>
                             <Button
+                                // FIXME: Vencord Desktop support
                                 onClick={() => window.DiscordNative.fileManager.showItemInFolder(settingsDir)}
                                 size={Button.Sizes.SMALL}
                                 disabled={settingsDirPending}>
diff --git a/src/globals.d.ts b/src/globals.d.ts
index 7c494e282..98eccde30 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -35,6 +35,8 @@ declare global {
     export var IS_WEB: boolean;
     export var IS_DEV: boolean;
     export var IS_STANDALONE: boolean;
+    export var IS_DISCORD_DESKTOP: boolean;
+    export var IS_VENCORD_DESKTOP: boolean;
 
     export var VencordNative: typeof import("./VencordNative").default;
     export var Vencord: typeof import("./Vencord");
@@ -54,6 +56,7 @@ declare global {
      * If you really must use it, mark your plugin as Desktop App only by naming it Foo.desktop.ts(x)
      */
     export var DiscordNative: any;
+    export var VencordDesktop: any;
 
     interface Window {
         webpackChunkdiscord_app: {
diff --git a/src/main/index.ts b/src/main/index.ts
new file mode 100644
index 000000000..c35635ecd
--- /dev/null
+++ b/src/main/index.ts
@@ -0,0 +1,108 @@
+/*
+ * 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 { app, protocol, session } from "electron";
+import { join } from "path";
+
+import { getSettings } from "./ipcMain";
+import { IS_VANILLA } from "./utils/constants";
+import { installExt } from "./utils/extensions";
+
+if (IS_VENCORD_DESKTOP || !IS_VANILLA) {
+    app.whenReady().then(() => {
+        // Source Maps! Maybe there's a better way but since the renderer is executed
+        // from a string I don't think any other form of sourcemaps would work
+        protocol.registerFileProtocol("vencord", ({ url: unsafeUrl }, cb) => {
+            let url = unsafeUrl.slice("vencord://".length);
+            if (url.endsWith("/")) url = url.slice(0, -1);
+            switch (url) {
+                case "renderer.js.map":
+                case "preload.js.map":
+                case "patcher.js.map": // doubt
+                    cb(join(__dirname, url));
+                    break;
+                default:
+                    cb({ statusCode: 403 });
+            }
+        });
+
+        try {
+            if (getSettings().enableReactDevtools)
+                installExt("fmkadmapgofadopljbjfkapdkoienihi")
+                    .then(() => console.info("[Vencord] Installed React Developer Tools"))
+                    .catch(err => console.error("[Vencord] Failed to install React Developer Tools", err));
+        } catch { }
+
+
+        // Remove CSP
+        type PolicyResult = Record<string, string[]>;
+
+        const parsePolicy = (policy: string): PolicyResult => {
+            const result: PolicyResult = {};
+            policy.split(";").forEach(directive => {
+                const [directiveKey, ...directiveValue] = directive.trim().split(/\s+/g);
+                if (directiveKey && !Object.prototype.hasOwnProperty.call(result, directiveKey)) {
+                    result[directiveKey] = directiveValue;
+                }
+            });
+            return result;
+        };
+        const stringifyPolicy = (policy: PolicyResult): string =>
+            Object.entries(policy)
+                .filter(([, values]) => values?.length)
+                .map(directive => directive.flat().join(" "))
+                .join("; ");
+
+        function patchCsp(headers: Record<string, string[]>, header: string) {
+            if (header in headers) {
+                const csp = parsePolicy(headers[header][0]);
+
+                for (const directive of ["style-src", "connect-src", "img-src", "font-src", "media-src", "worker-src"]) {
+                    csp[directive] = ["*", "blob:", "data:", "'unsafe-inline'"];
+                }
+                // TODO: Restrict this to only imported packages with fixed version.
+                // Perhaps auto generate with esbuild
+                csp["script-src"] ??= [];
+                csp["script-src"].push("'unsafe-eval'", "https://unpkg.com", "https://cdnjs.cloudflare.com");
+                headers[header] = [stringifyPolicy(csp)];
+            }
+        }
+
+        session.defaultSession.webRequest.onHeadersReceived(({ responseHeaders, resourceType }, cb) => {
+            if (responseHeaders) {
+                if (resourceType === "mainFrame")
+                    patchCsp(responseHeaders, "content-security-policy");
+
+                // Fix hosts that don't properly set the css content type, such as
+                // raw.githubusercontent.com
+                if (resourceType === "stylesheet")
+                    responseHeaders["content-type"] = ["text/css"];
+            }
+            cb({ cancel: false, responseHeaders });
+        });
+
+        // assign a noop to onHeadersReceived to prevent other mods from adding their own incompatible ones.
+        // For instance, OpenAsar adds their own that doesn't fix content-type for stylesheets which makes it
+        // impossible to load css from github raw despite our fix above
+        session.defaultSession.webRequest.onHeadersReceived = () => { };
+    });
+}
+
+if (IS_DISCORD_DESKTOP) {
+    require("./patcher");
+}
diff --git a/src/ipcMain/index.ts b/src/main/ipcMain.ts
similarity index 93%
rename from src/ipcMain/index.ts
rename to src/main/ipcMain.ts
index 6fb31d174..b0f8fc37b 100644
--- a/src/ipcMain/index.ts
+++ b/src/main/ipcMain.ts
@@ -28,7 +28,7 @@ import { join } from "path";
 
 import monacoHtml from "~fileContent/../components/monacoWin.html;base64";
 
-import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE } from "./constants";
+import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE } from "./utils/constants";
 
 mkdirSync(SETTINGS_DIR, { recursive: true });
 
@@ -44,6 +44,14 @@ export function readSettings() {
     }
 }
 
+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) => {
diff --git a/src/patchWin32Updater.ts b/src/main/patchWin32Updater.ts
similarity index 100%
rename from src/patchWin32Updater.ts
rename to src/main/patchWin32Updater.ts
diff --git a/src/patcher.ts b/src/main/patcher.ts
similarity index 52%
rename from src/patcher.ts
rename to src/main/patcher.ts
index b1f47b0d1..c45a29976 100644
--- a/src/patcher.ts
+++ b/src/main/patcher.ts
@@ -17,12 +17,11 @@
 */
 
 import { onceDefined } from "@utils/onceDefined";
-import electron, { app, BrowserWindowConstructorOptions, Menu, protocol, session } from "electron";
+import electron, { app, BrowserWindowConstructorOptions, Menu } from "electron";
 import { dirname, join } from "path";
 
-import { initIpc } from "./ipcMain";
-import { installExt } from "./ipcMain/extensions";
-import { readSettings } from "./ipcMain/index";
+import { getSettings, initIpc } from "./ipcMain";
+import { IS_VANILLA } from "./utils/constants";
 
 console.log("[Vencord] Starting up...");
 
@@ -41,11 +40,8 @@ require.main!.filename = join(asarPath, discordPkg.main);
 // @ts-ignore Untyped method? Dies from cringe
 app.setAppPath(asarPath);
 
-if (!process.argv.includes("--vanilla")) {
-    let settings: typeof import("@api/settings").Settings = {} as any;
-    try {
-        settings = JSON.parse(readSettings());
-    } catch { }
+if (!IS_VANILLA) {
+    const settings = getSettings();
 
     // Repatch after host updates on Windows
     if (process.platform === "win32") {
@@ -116,84 +112,6 @@ if (!process.argv.includes("--vanilla")) {
     );
 
     process.env.DATA_DIR = join(app.getPath("userData"), "..", "Vencord");
-
-    app.whenReady().then(() => {
-        // Source Maps! Maybe there's a better way but since the renderer is executed
-        // from a string I don't think any other form of sourcemaps would work
-        protocol.registerFileProtocol("vencord", ({ url: unsafeUrl }, cb) => {
-            let url = unsafeUrl.slice("vencord://".length);
-            if (url.endsWith("/")) url = url.slice(0, -1);
-            switch (url) {
-                case "renderer.js.map":
-                case "preload.js.map":
-                case "patcher.js.map": // doubt
-                    cb(join(__dirname, url));
-                    break;
-                default:
-                    cb({ statusCode: 403 });
-            }
-        });
-
-        try {
-            if (settings?.enableReactDevtools)
-                installExt("fmkadmapgofadopljbjfkapdkoienihi")
-                    .then(() => console.info("[Vencord] Installed React Developer Tools"))
-                    .catch(err => console.error("[Vencord] Failed to install React Developer Tools", err));
-        } catch { }
-
-
-        // Remove CSP
-        type PolicyResult = Record<string, string[]>;
-
-        const parsePolicy = (policy: string): PolicyResult => {
-            const result: PolicyResult = {};
-            policy.split(";").forEach(directive => {
-                const [directiveKey, ...directiveValue] = directive.trim().split(/\s+/g);
-                if (directiveKey && !Object.prototype.hasOwnProperty.call(result, directiveKey)) {
-                    result[directiveKey] = directiveValue;
-                }
-            });
-            return result;
-        };
-        const stringifyPolicy = (policy: PolicyResult): string =>
-            Object.entries(policy)
-                .filter(([, values]) => values?.length)
-                .map(directive => directive.flat().join(" "))
-                .join("; ");
-
-        function patchCsp(headers: Record<string, string[]>, header: string) {
-            if (header in headers) {
-                const csp = parsePolicy(headers[header][0]);
-
-                for (const directive of ["style-src", "connect-src", "img-src", "font-src", "media-src", "worker-src"]) {
-                    csp[directive] = ["*", "blob:", "data:", "'unsafe-inline'"];
-                }
-                // TODO: Restrict this to only imported packages with fixed version.
-                // Perhaps auto generate with esbuild
-                csp["script-src"] ??= [];
-                csp["script-src"].push("'unsafe-eval'", "https://unpkg.com", "https://cdnjs.cloudflare.com");
-                headers[header] = [stringifyPolicy(csp)];
-            }
-        }
-
-        session.defaultSession.webRequest.onHeadersReceived(({ responseHeaders, resourceType }, cb) => {
-            if (responseHeaders) {
-                if (resourceType === "mainFrame")
-                    patchCsp(responseHeaders, "content-security-policy");
-
-                // Fix hosts that don't properly set the css content type, such as
-                // raw.githubusercontent.com
-                if (resourceType === "stylesheet")
-                    responseHeaders["content-type"] = ["text/css"];
-            }
-            cb({ cancel: false, responseHeaders });
-        });
-
-        // assign a noop to onHeadersReceived to prevent other mods from adding their own incompatible ones.
-        // For instance, OpenAsar adds their own that doesn't fix content-type for stylesheets which makes it
-        // impossible to load css from github raw despite our fix above
-        session.defaultSession.webRequest.onHeadersReceived = () => { };
-    });
 } else {
     console.log("[Vencord] Running in vanilla mode. Not loading Vencord");
 }
diff --git a/src/ipcMain/updater/common.ts b/src/main/updater/common.ts
similarity index 100%
rename from src/ipcMain/updater/common.ts
rename to src/main/updater/common.ts
diff --git a/src/ipcMain/updater/git.ts b/src/main/updater/git.ts
similarity index 100%
rename from src/ipcMain/updater/git.ts
rename to src/main/updater/git.ts
diff --git a/src/ipcMain/updater/http.ts b/src/main/updater/http.ts
similarity index 81%
rename from src/ipcMain/updater/http.ts
rename to src/main/updater/http.ts
index cc106316f..a2e2aad39 100644
--- a/src/ipcMain/updater/http.ts
+++ b/src/main/updater/http.ts
@@ -25,7 +25,7 @@ import { join } from "path";
 import gitHash from "~git-hash";
 import gitRemote from "~git-remote";
 
-import { get } from "../simpleGet";
+import { get } from "../utils/simpleGet";
 import { calculateHashes, serializeErrors } from "./common";
 
 const API_BASE = `https://api.github.com/repos/${gitRemote}`;
@@ -57,6 +57,13 @@ async function calculateGitChanges() {
     }));
 }
 
+const FILES_TO_DOWNLOAD = [
+    IS_DISCORD_DESKTOP ? "patcher.js" : "vencordDesktopMain.js",
+    "preload.js",
+    IS_DISCORD_DESKTOP ? "renderer.js" : "vencordDesktopRenderer.js",
+    "renderer.css"
+];
+
 async function fetchUpdates() {
     const release = await githubGet("/releases/latest");
 
@@ -66,7 +73,7 @@ async function fetchUpdates() {
         return false;
 
     data.assets.forEach(({ name, browser_download_url }) => {
-        if (["patcher.js", "preload.js", "renderer.js", "renderer.css"].some(s => name.startsWith(s))) {
+        if (FILES_TO_DOWNLOAD.some(s => name.startsWith(s))) {
             PendingUpdates.push([name, browser_download_url]);
         }
     });
@@ -75,8 +82,17 @@ async function fetchUpdates() {
 
 async function applyUpdates() {
     await Promise.all(PendingUpdates.map(
-        async ([name, data]) => writeFile(join(__dirname, name), await get(data)))
-    );
+        async ([name, data]) => writeFile(
+            join(
+                __dirname,
+                IS_VENCORD_DESKTOP
+                    // vencordDesktopRenderer.js -> renderer.js
+                    ? name.replace(/vencordDesktop(\w)/, (_, c) => c.toLowerCase())
+                    : name
+            ),
+            await get(data)
+        )
+    ));
     PendingUpdates = [];
     return true;
 }
diff --git a/src/ipcMain/updater/index.ts b/src/main/updater/index.ts
similarity index 100%
rename from src/ipcMain/updater/index.ts
rename to src/main/updater/index.ts
diff --git a/src/ipcMain/constants.ts b/src/main/utils/constants.ts
similarity index 94%
rename from src/ipcMain/constants.ts
rename to src/main/utils/constants.ts
index 713375788..cc9f459c6 100644
--- a/src/ipcMain/constants.ts
+++ b/src/main/utils/constants.ts
@@ -33,3 +33,5 @@ export const ALLOWED_PROTOCOLS = [
     "steam:",
     "spotify:"
 ];
+
+export const IS_VANILLA = /* @__PURE__ */ process.argv.includes("--vanilla");
diff --git a/src/ipcMain/crxToZip.ts b/src/main/utils/crxToZip.ts
similarity index 100%
rename from src/ipcMain/crxToZip.ts
rename to src/main/utils/crxToZip.ts
diff --git a/src/ipcMain/extensions.ts b/src/main/utils/extensions.ts
similarity index 100%
rename from src/ipcMain/extensions.ts
rename to src/main/utils/extensions.ts
diff --git a/src/ipcMain/simpleGet.ts b/src/main/utils/simpleGet.ts
similarity index 100%
rename from src/ipcMain/simpleGet.ts
rename to src/main/utils/simpleGet.ts
diff --git a/src/plugins/consoleShortcuts.ts b/src/plugins/consoleShortcuts.ts
index 70a9875d3..056d24622 100644
--- a/src/plugins/consoleShortcuts.ts
+++ b/src/plugins/consoleShortcuts.ts
@@ -17,6 +17,7 @@
 */
 
 import { Devs } from "@utils/constants";
+import { relaunch } from "@utils/native";
 import definePlugin from "@utils/types";
 import * as Webpack from "@webpack";
 import { extract, filters, findAll, search } from "@webpack";
@@ -77,7 +78,7 @@ export default definePlugin({
             Settings: Vencord.Settings,
             Api: Vencord.Api,
             reload: () => location.reload(),
-            restart: IS_WEB ? WEB_ONLY("restart") : window.DiscordNative.app.relaunch
+            restart: IS_WEB ? WEB_ONLY("restart") : relaunch
         };
     },
 
diff --git a/src/plugins/settings.tsx b/src/plugins/settings.tsx
index 67d1f8de2..8db0a4e05 100644
--- a/src/plugins/settings.tsx
+++ b/src/plugins/settings.tsx
@@ -168,6 +168,7 @@ export default definePlugin({
     get additionalInfo() {
         if (IS_DEV) return " (Dev)";
         if (IS_WEB) return " (Web)";
+        if (IS_VENCORD_DESKTOP) return " (Vencord Desktop)";
         if (IS_STANDALONE) return " (Standalone)";
         return "";
     },
diff --git a/src/preload.ts b/src/preload.ts
index 820b65547..b75574aff 100644
--- a/src/preload.ts
+++ b/src/preload.ts
@@ -54,7 +54,9 @@ if (location.protocol !== "data:") {
             document.getElementById("vencord-css-core")!.textContent = readFileSync(rendererCss, "utf-8");
         });
     }
-    require(process.env.DISCORD_PRELOAD!);
+
+    if (process.env.DISCORD_PRELOAD)
+        require(process.env.DISCORD_PRELOAD);
 } else {
     // Monaco Popout
     contextBridge.exposeInMainWorld("setCss", debounce(s => VencordNative.ipc.invoke(IpcEvents.SET_QUICK_CSS, s)));
diff --git a/src/utils/native.ts b/src/utils/native.ts
new file mode 100644
index 000000000..70e4c0eb6
--- /dev/null
+++ b/src/utils/native.ts
@@ -0,0 +1,24 @@
+/*
+ * 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 function relaunch() {
+    if (IS_DISCORD_DESKTOP)
+        window.DiscordNative.app.relaunch();
+    else
+        window.VencordDesktop.app.relaunch();
+}
diff --git a/src/utils/settingsSync.ts b/src/utils/settingsSync.ts
index 18e185478..781899f00 100644
--- a/src/utils/settingsSync.ts
+++ b/src/utils/settingsSync.ts
@@ -47,7 +47,9 @@ export async function downloadSettingsBackup() {
     const backup = await exportSettings();
     const data = new TextEncoder().encode(backup);
 
-    if (IS_WEB) {
+    if (IS_DISCORD_DESKTOP) {
+        DiscordNative.fileManager.saveWithDialog(data, filename);
+    } else {
         const file = new File([data], filename, { type: "application/json" });
         const a = document.createElement("a");
         a.href = URL.createObjectURL(file);
@@ -59,8 +61,6 @@ export async function downloadSettingsBackup() {
             URL.revokeObjectURL(a.href);
             document.body.removeChild(a);
         });
-    } else {
-        DiscordNative.fileManager.saveWithDialog(data, filename);
     }
 }
 
@@ -77,7 +77,24 @@ const toastFailure = (err: any) => Toasts.show({
 });
 
 export async function uploadSettingsBackup(showToast = true): Promise<void> {
-    if (IS_WEB) {
+    if (IS_DISCORD_DESKTOP) {
+        const [file] = await DiscordNative.fileManager.openFiles({
+            filters: [
+                { name: "Vencord Settings Backup", extensions: ["json"] },
+                { name: "all", extensions: ["*"] }
+            ]
+        });
+
+        if (file) {
+            try {
+                await importSettings(new TextDecoder().decode(file.data));
+                if (showToast) toastSuccess();
+            } catch (err) {
+                new Logger("SettingsSync").error(err);
+                if (showToast) toastFailure(err);
+            }
+        }
+    } else {
         const input = document.createElement("input");
         input.type = "file";
         input.style.display = "none";
@@ -102,22 +119,5 @@ export async function uploadSettingsBackup(showToast = true): Promise<void> {
         document.body.appendChild(input);
         input.click();
         setImmediate(() => document.body.removeChild(input));
-    } else {
-        const [file] = await DiscordNative.fileManager.openFiles({
-            filters: [
-                { name: "Vencord Settings Backup", extensions: ["json"] },
-                { name: "all", extensions: ["*"] }
-            ]
-        });
-
-        if (file) {
-            try {
-                await importSettings(new TextDecoder().decode(file.data));
-                if (showToast) toastSuccess();
-            } catch (err) {
-                new Logger("SettingsSync").error(err);
-                if (showToast) toastFailure(err);
-            }
-        }
     }
 }
diff --git a/src/utils/updater.ts b/src/utils/updater.ts
index e13f5cf7e..d0b1fdcb4 100644
--- a/src/utils/updater.ts
+++ b/src/utils/updater.ts
@@ -20,6 +20,7 @@ import gitHash from "~git-hash";
 
 import IpcEvents from "./IpcEvents";
 import Logger from "./Logger";
+import { relaunch } from "./native";
 import { IpcRes } from "./types";
 
 export const UpdateLogger = /* #__PURE__*/ new Logger("Updater", "white");
@@ -90,8 +91,10 @@ export async function maybePromptToUpdate(confirmMessage: string, checkForDev =
             if (wantsUpdate) {
                 await update();
                 const needFullRestart = await rebuild();
-                if (needFullRestart) DiscordNative.app.relaunch();
-                else location.reload();
+                if (needFullRestart)
+                    relaunch();
+                else
+                    location.reload();
             }
         }
     } catch (err) {
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 0d9558790..a37fe6d61 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -67,7 +67,7 @@ export function _initWebpack(instance: typeof window.webpackChunkdiscord_app) {
     instance.pop();
 }
 
-if (IS_DEV && !IS_WEB) {
+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(() => {

From d931790ed0dd41b22df01584dc63d9b2b78ab6a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90=E1=BB=97=20V=C4=83n=20Ho=C3=A0i=20Tu=C3=A2n?=
 <htuan03@gmail.com>
Date: Mon, 3 Apr 2023 20:33:11 -0700
Subject: [PATCH 107/147] BetterFolders: Fix unread indicator & read all
 buttons being duplicated (#776)

---
 src/plugins/betterFolders/betterFolders.css | 3 ++-
 src/plugins/readAllNotificationsButton.tsx  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/betterFolders/betterFolders.css b/src/plugins/betterFolders/betterFolders.css
index 115099154..5d8fc2188 100644
--- a/src/plugins/betterFolders/betterFolders.css
+++ b/src/plugins/betterFolders/betterFolders.css
@@ -1,4 +1,5 @@
-.vc-bf-folder-sidebar [class*="wrapper-"] > [class*="listItem-"]:first-of-type {
+.vc-bf-folder-sidebar [class*="wrapper-"] > [class*="listItem-"]:first-of-type,
+.vc-bf-folder-sidebar [class*="unreadMentionsIndicator"] {
     display: none;
 }
 
diff --git a/src/plugins/readAllNotificationsButton.tsx b/src/plugins/readAllNotificationsButton.tsx
index ee6ecde39..b5b0b5f82 100644
--- a/src/plugins/readAllNotificationsButton.tsx
+++ b/src/plugins/readAllNotificationsButton.tsx
@@ -62,10 +62,10 @@ export default definePlugin({
     renderReadAllButton: () => <ReadAllButton />,
 
     start() {
-        addServerListElement(ServerListRenderPosition.In, this.renderReadAllButton);
+        addServerListElement(ServerListRenderPosition.Above, this.renderReadAllButton);
     },
 
     stop() {
-        removeServerListElement(ServerListRenderPosition.In, this.renderReadAllButton);
+        removeServerListElement(ServerListRenderPosition.Above, this.renderReadAllButton);
     }
 });

From 96dc2e12d030ac6d725bdfc58f1c47d35aae67a8 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 4 Apr 2023 10:26:53 -0300
Subject: [PATCH 108/147] Fix Web & Game Activity Toggle (#777)

---
 .github/workflows/reportBrokenPlugins.yml |  2 +-
 scripts/build/buildWeb.mjs                |  4 +-
 src/components/PluginSettings/index.tsx   |  3 +-
 src/plugins/consoleShortcuts.ts           |  1 +
 src/plugins/devCompanion.dev.tsx          |  6 ++-
 src/plugins/gameActivityToggle/index.tsx  | 45 ++++++++++++-----------
 src/plugins/gameActivityToggle/style.css  | 16 --------
 7 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/reportBrokenPlugins.yml b/.github/workflows/reportBrokenPlugins.yml
index 2e927bb82..6dcc09d38 100644
--- a/.github/workflows/reportBrokenPlugins.yml
+++ b/.github/workflows/reportBrokenPlugins.yml
@@ -50,7 +50,7 @@ jobs:
                 export CHROMIUM_BIN=$(which chromium-browser)
                 export USE_CANARY=true
 
-                esbuild test/generateReport.ts > dist/report.mjs
+                esbuild scripts/generateReport.ts > dist/report.mjs
                 node dist/report.mjs >> $GITHUB_STEP_SUMMARY
               env:
                 DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
diff --git a/scripts/build/buildWeb.mjs b/scripts/build/buildWeb.mjs
index b9d361b6d..df75d35a5 100644
--- a/scripts/build/buildWeb.mjs
+++ b/scripts/build/buildWeb.mjs
@@ -45,7 +45,9 @@ const commonOptions = {
     define: {
         IS_WEB: "true",
         IS_STANDALONE: "true",
-        IS_DEV: JSON.stringify(watch)
+        IS_DEV: JSON.stringify(watch),
+        IS_DISCORD_DESKTOP: "false",
+        IS_VENCORD_DESKTOP: "false"
     }
 };
 
diff --git a/src/components/PluginSettings/index.tsx b/src/components/PluginSettings/index.tsx
index 02d89f81f..f3a5cd386 100644
--- a/src/components/PluginSettings/index.tsx
+++ b/src/components/PluginSettings/index.tsx
@@ -46,6 +46,7 @@ const cl = classNameFactory("vc-plugins-");
 const logger = new Logger("PluginSettings", "#a6d189");
 
 const InputStyles = findByPropsLazy("inputDefault", "inputWrapper");
+const ButtonClasses = findByPropsLazy("button", "disabled", "enabled");
 
 const CogWheel = LazyComponent(() => findByCode("18.564C15.797 19.099 14.932 19.498 14 19.738V22H10V19.738C9.069"));
 const InfoIcon = LazyComponent(() => findByCode("4.4408921e-16 C4.4771525,-1.77635684e-15 4.4408921e-16"));
@@ -154,7 +155,7 @@ function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, onMouseLe
                 <Text variant="text-md/bold" className={cl("name")}>
                     {plugin.name}{isNew && <Badge text="NEW" color="#ED4245" />}
                 </Text>
-                <button role="switch" onClick={() => openModal()} className={classes("button-12Fmur", cl("info-button"))}>
+                <button role="switch" onClick={() => openModal()} className={classes(ButtonClasses.button, cl("info-button"))}>
                     {plugin.options
                         ? <CogWheel />
                         : <InfoIcon width="24" height="24" />}
diff --git a/src/plugins/consoleShortcuts.ts b/src/plugins/consoleShortcuts.ts
index 056d24622..0489c2c24 100644
--- a/src/plugins/consoleShortcuts.ts
+++ b/src/plugins/consoleShortcuts.ts
@@ -72,6 +72,7 @@ export default definePlugin({
             findAllByProps: (...props: string[]) => findAll(filters.byProps(...props)),
             findByCode: newFindWrapper(filters.byCode),
             findAllByCode: (code: string) => findAll(filters.byCode(code)),
+            findStore: newFindWrapper(filters.byStoreName),
             PluginsApi: Vencord.Plugins,
             plugins: Vencord.Plugins.plugins,
             React,
diff --git a/src/plugins/devCompanion.dev.tsx b/src/plugins/devCompanion.dev.tsx
index c675fc237..b84dd75dc 100644
--- a/src/plugins/devCompanion.dev.tsx
+++ b/src/plugins/devCompanion.dev.tsx
@@ -161,7 +161,11 @@ function initWs(isManual = false) {
                     return reply("Expected exactly one 'find' matches, found " + keys.length);
 
                 const mod = candidates[keys[0]];
-                let src = String(mod.original ?? mod);
+                let src = String(mod.original ?? mod).replaceAll("\n", "");
+
+                if (src.startsWith("function(")) {
+                    src = "0," + src;
+                }
 
                 let i = 0;
 
diff --git a/src/plugins/gameActivityToggle/index.tsx b/src/plugins/gameActivityToggle/index.tsx
index 6926505bf..c656f3c8d 100644
--- a/src/plugins/gameActivityToggle/index.tsx
+++ b/src/plugins/gameActivityToggle/index.tsx
@@ -21,36 +21,39 @@ import { disableStyle, enableStyle } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { Tooltip } from "@webpack/common";
+import { findByCodeLazy } from "@webpack";
 
 import style from "./style.css?managed";
 
 const ShowCurrentGame = getSettingStoreLazy<boolean>("status", "showCurrentGame");
+const Button = findByCodeLazy("Button.Sizes.NONE,disabled:");
+
+function makeIcon(showCurrentGame?: boolean) {
+    return function () {
+        return (
+            <svg
+                width="24"
+                height="24"
+                viewBox="0 96 960 960"
+            >
+                <path fill="currentColor" d="M182 856q-51 0-79-35.5T82 734l42-300q9-60 53.5-99T282 296h396q60 0 104.5 39t53.5 99l42 300q7 51-21 86.5T778 856q-21 0-39-7.5T706 826l-90-90H344l-90 90q-15 15-33 22.5t-39 7.5Zm498-240q17 0 28.5-11.5T720 576q0-17-11.5-28.5T680 536q-17 0-28.5 11.5T640 576q0 17 11.5 28.5T680 616Zm-80-120q17 0 28.5-11.5T640 456q0-17-11.5-28.5T600 416q-17 0-28.5 11.5T560 456q0 17 11.5 28.5T600 496ZM310 616h60v-70h70v-60h-70v-70h-60v70h-70v60h70v70Z" />
+                {!showCurrentGame && <line x1="920" y1="280" x2="40" y2="880" stroke="var(--status-danger)" stroke-width="80" />}
+            </svg>
+        );
+    };
+}
 
 function GameActivityToggleButton() {
     const showCurrentGame = ShowCurrentGame?.useSetting();
 
     return (
-        <Tooltip text="Toggle Game Activity">
-            {tooltipProps => (
-                <button
-                    {...tooltipProps}
-                    className="game-activity-toggle-btn"
-                    onClick={() => ShowCurrentGame?.updateSetting(old => !old)}
-                >
-                    <svg
-                        width="24"
-                        height="24"
-                        viewBox="0 96 960 960"
-                    >
-                        <g fill="currentColor">
-                            <path d="M182 856q-51 0-79-35.5T82 734l42-300q9-60 53.5-99T282 296h396q60 0 104.5 39t53.5 99l42 300q7 51-21 86.5T778 856q-21 0-39-7.5T706 826l-90-90H344l-90 90q-15 15-33 22.5t-39 7.5Zm498-240q17 0 28.5-11.5T720 576q0-17-11.5-28.5T680 536q-17 0-28.5 11.5T640 576q0 17 11.5 28.5T680 616Zm-80-120q17 0 28.5-11.5T640 456q0-17-11.5-28.5T600 416q-17 0-28.5 11.5T560 456q0 17 11.5 28.5T600 496ZM310 616h60v-70h70v-60h-70v-70h-60v70h-70v60h70v70Z" />
-                            {!showCurrentGame && <line x1="920" y1="280" x2="40" y2="880" stroke="var(--status-danger)" stroke-width="80" />}
-                        </g>
-                    </svg>
-                </button>
-            )}
-        </Tooltip>
+        <Button
+            tooltipText="Toggle Game Activity"
+            icon={makeIcon(showCurrentGame)}
+            role="switch"
+            aria-checked={!showCurrentGame}
+            onClick={() => ShowCurrentGame?.updateSetting(old => !old)}
+        />
     );
 }
 
diff --git a/src/plugins/gameActivityToggle/style.css b/src/plugins/gameActivityToggle/style.css
index b6abf47fe..c25b366c9 100644
--- a/src/plugins/gameActivityToggle/style.css
+++ b/src/plugins/gameActivityToggle/style.css
@@ -1,19 +1,3 @@
 [class*="withTagAsButton"] {
     min-width: 88px;
 }
-
-.game-activity-toggle-btn {
-    all: unset;
-    color: var(--interactive-normal);
-    width: 32px;
-    height: 32px;
-    border-radius: 4px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-.game-activity-toggle-btn:hover {
-    color: var(--interactive-hover);
-    background-color: var(--background-modifier-selected);
-}

From 2e6dfaa8795d093e50d87ebb5e7805cddb29a52c Mon Sep 17 00:00:00 2001
From: Remty <remty516@gmail.com>
Date: Tue, 4 Apr 2023 15:28:41 +0200
Subject: [PATCH 109/147] FakeProfileThemes: add usage guide (#778)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/fakeProfileThemes.tsx | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/plugins/fakeProfileThemes.tsx b/src/plugins/fakeProfileThemes.tsx
index de42dd916..ede0e7298 100644
--- a/src/plugins/fakeProfileThemes.tsx
+++ b/src/plugins/fakeProfileThemes.tsx
@@ -23,7 +23,7 @@ import { Devs } from "@utils/constants";
 import { Margins } from "@utils/margins";
 import { copyWithToast } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
-import { Button } from "@webpack/common";
+import { Button, Forms } from "@webpack/common";
 import { User } from "discord-types/general";
 import virtualMerge from "virtual-merge";
 
@@ -100,6 +100,21 @@ 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 upsells, you should disable it temporarily to set colors.
+            </Forms.FormText>
+        </Forms.FormSection>),
     settings,
     colorDecodeHook(user: UserProfile) {
         if (user) {

From f092f434fe48ba0db8b3c0c66524899b5a21c4f1 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 4 Apr 2023 21:09:47 +0200
Subject: [PATCH 110/147] Fix Vencord

---
 src/components/VencordSettings/index.tsx |  5 +-
 src/main/index.ts                        |  1 +
 src/plugins/apiMenuItemDeobfuscator.ts   | 82 ------------------------
 src/plugins/betterRoleDot.ts             |  7 ++
 src/plugins/emoteCloner.tsx              |  2 +-
 src/plugins/messageLogger/index.tsx      |  2 +-
 src/plugins/reverseImageSearch.tsx       |  2 +-
 src/plugins/spotifyControls/index.tsx    |  1 -
 src/plugins/viewIcons.tsx                |  2 -
 src/webpack/common/components.ts         | 53 ++++++++-------
 src/webpack/common/menu.ts               | 24 +------
 src/webpack/webpack.ts                   |  2 +
 12 files changed, 42 insertions(+), 141 deletions(-)
 delete mode 100644 src/plugins/apiMenuItemDeobfuscator.ts

diff --git a/src/components/VencordSettings/index.tsx b/src/components/VencordSettings/index.tsx
index 0171979fe..cd6ce604a 100644
--- a/src/components/VencordSettings/index.tsx
+++ b/src/components/VencordSettings/index.tsx
@@ -21,8 +21,7 @@ import "./settingsStyles.css";
 import { classNameFactory } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { handleComponentFailed } from "@components/handleComponentFailed";
-import { findByCodeLazy } from "@webpack";
-import { Forms, SettingsRouter, Text } from "@webpack/common";
+import { Forms, SettingsRouter, TabBar, Text } from "@webpack/common";
 
 import BackupRestoreTab from "./BackupRestoreTab";
 import PluginsTab from "./PluginsTab";
@@ -32,8 +31,6 @@ import VencordSettings from "./VencordTab";
 
 const cl = classNameFactory("vc-settings-");
 
-const TabBar = findByCodeLazy('[role="tab"][aria-disabled="false"]');
-
 interface SettingsProps {
     tab: string;
 }
diff --git a/src/main/index.ts b/src/main/index.ts
index c35635ecd..b04ef6c40 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -34,6 +34,7 @@ if (IS_VENCORD_DESKTOP || !IS_VANILLA) {
                 case "renderer.js.map":
                 case "preload.js.map":
                 case "patcher.js.map": // doubt
+                case "main.js.map":
                     cb(join(__dirname, url));
                     break;
                 default:
diff --git a/src/plugins/apiMenuItemDeobfuscator.ts b/src/plugins/apiMenuItemDeobfuscator.ts
deleted file mode 100644
index 4b8554fae..000000000
--- a/src/plugins/apiMenuItemDeobfuscator.ts
+++ /dev/null
@@ -1,82 +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 { migratePluginSettings } from "@api/settings";
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-
-// duplicate values have multiple branches with different types. Just include all to be safe
-const nameMap = {
-    radio: "MenuRadioItem",
-    separator: "MenuSeparator",
-    checkbox: "MenuCheckboxItem",
-    groupstart: "MenuGroup",
-
-    control: "MenuControlItem",
-    compositecontrol: "MenuControlItem",
-
-    item: "MenuItem",
-    customitem: "MenuItem",
-};
-
-migratePluginSettings("MenuItemDeobfuscatorAPI", "MenuItemDeobfuscatorApi");
-export default definePlugin({
-    name: "MenuItemDeobfuscatorAPI",
-    description: "Deobfuscates Discord's Menu Item module",
-    authors: [Devs.Ven],
-    patches: [
-        {
-            find: '"Menu API',
-            replacement: {
-                match: /function.{0,80}type===(\i)\).{0,50}navigable:.+?Menu API/s,
-                replace: (m, mod) => {
-                    let nicenNames = "";
-                    const redefines = [] as string[];
-                    // if (t.type === m.MenuItem)
-                    const typeCheckRe = /\(.{1,3}\.type===(.{1,5})\)/g;
-                    // push({type:"item"})
-                    const pushTypeRe = /type:"(\w+)"/g;
-
-                    let typeMatch: RegExpExecArray | null;
-                    // for each if (t.type === ...)
-                    while ((typeMatch = typeCheckRe.exec(m)) !== null) {
-                        // extract the current menu item
-                        const item = typeMatch[1];
-                        // Set the starting index of the second regex to that of the first to start
-                        // matching from after the if
-                        pushTypeRe.lastIndex = typeCheckRe.lastIndex;
-                        // extract the first type: "..."
-                        const type = pushTypeRe.exec(m)?.[1];
-                        if (type && type in nameMap) {
-                            const name = nameMap[type];
-                            nicenNames += `Object.defineProperty(${item},"name",{value:"${name}"});`;
-                            redefines.push(`${name}:${item}`);
-                        }
-                    }
-                    if (redefines.length < 6) {
-                        console.warn("[ApiMenuItemDeobfuscator] Expected to at least remap 6 items, only remapped", redefines.length);
-                    }
-
-                    // Merge all our redefines with the actual module
-                    return `${nicenNames}Object.assign(${mod},{${redefines.join(",")}});${m}`;
-                },
-            },
-        },
-    ],
-});
-
diff --git a/src/plugins/betterRoleDot.ts b/src/plugins/betterRoleDot.ts
index 62068c782..481077b5c 100644
--- a/src/plugins/betterRoleDot.ts
+++ b/src/plugins/betterRoleDot.ts
@@ -45,6 +45,13 @@ export default definePlugin({
                 replace: "true",
             },
         },
+        {
+            find: ".colorPickerFooter",
+            replacement: {
+                match: /function (\i).{0,200}\.colorPickerFooter/,
+                replace: "$self.ColorPicker=$1;$&"
+            }
+        }
     ],
 
     options: {
diff --git a/src/plugins/emoteCloner.tsx b/src/plugins/emoteCloner.tsx
index 3bcc69446..4a018ec51 100644
--- a/src/plugins/emoteCloner.tsx
+++ b/src/plugins/emoteCloner.tsx
@@ -238,7 +238,7 @@ export default definePlugin({
     name: "EmoteCloner",
     description: "Adds a Clone context menu item to emotes to clone them your own server",
     authors: [Devs.Ven, Devs.Nuckyz],
-    dependencies: ["MenuItemDeobfuscatorAPI", "ContextMenuAPI"],
+    dependencies: ["ContextMenuAPI"],
 
     start() {
         addContextMenuPatch("message", messageContextMenuPatch);
diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index ef9a0ece6..8199271a3 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -76,7 +76,7 @@ export default definePlugin({
     name: "MessageLogger",
     description: "Temporarily logs deleted and edited messages.",
     authors: [Devs.rushii, Devs.Ven],
-    dependencies: ["ContextMenuAPI", "MenuItemDeobfuscatorAPI"],
+    dependencies: ["ContextMenuAPI"],
 
     start() {
         addDeleteStyle();
diff --git a/src/plugins/reverseImageSearch.tsx b/src/plugins/reverseImageSearch.tsx
index 7a3d6d986..4e0a3614d 100644
--- a/src/plugins/reverseImageSearch.tsx
+++ b/src/plugins/reverseImageSearch.tsx
@@ -76,7 +76,7 @@ export default definePlugin({
     name: "ReverseImageSearch",
     description: "Adds ImageSearch to image context menus",
     authors: [Devs.Ven, Devs.Nuckyz],
-    dependencies: ["MenuItemDeobfuscatorAPI", "ContextMenuAPI"],
+    dependencies: ["ContextMenuAPI"],
     patches: [
         {
             find: ".Messages.MESSAGE_ACTIONS_MENU_LABEL",
diff --git a/src/plugins/spotifyControls/index.tsx b/src/plugins/spotifyControls/index.tsx
index ce1bf6759..3a5802a1d 100644
--- a/src/plugins/spotifyControls/index.tsx
+++ b/src/plugins/spotifyControls/index.tsx
@@ -39,7 +39,6 @@ export default definePlugin({
     name: "SpotifyControls",
     description: "Spotify Controls",
     authors: [Devs.Ven, Devs.afn, Devs.KraXen72],
-    dependencies: ["MenuItemDeobfuscatorAPI"],
     options: {
         hoverControls: {
             description: "Show controls on hover",
diff --git a/src/plugins/viewIcons.tsx b/src/plugins/viewIcons.tsx
index 7d56538ce..b60fb759f 100644
--- a/src/plugins/viewIcons.tsx
+++ b/src/plugins/viewIcons.tsx
@@ -35,8 +35,6 @@ export default definePlugin({
     authors: [Devs.Ven],
     description: "Makes Avatars/Banners in user profiles clickable, and adds Guild Context Menu Entries to View Banner/Icon.",
 
-    dependencies: ["MenuItemDeobfuscatorAPI"],
-
     openImage(url: string) {
         const u = new URL(url);
         u.searchParams.set("size", "512");
diff --git a/src/webpack/common/components.ts b/src/webpack/common/components.ts
index 4993b2255..9554f9527 100644
--- a/src/webpack/common/components.ts
+++ b/src/webpack/common/components.ts
@@ -17,40 +17,37 @@
 */
 
 // eslint-disable-next-line path-alias/no-relative
-import { filters, findByPropsLazy } from "../webpack";
+import { filters, findByPropsLazy, waitFor } from "@webpack";
+
 import { waitForComponent } from "./internal";
 import * as t from "./types/components";
 
-export const Forms = {
-    FormTitle: waitForComponent<t.FormTitle>("FormTitle", filters.byCode("errorSeparator")),
-    FormSection: waitForComponent<t.FormSection>("FormSection", filters.byCode("titleClassName", "sectionTitle")),
-    FormDivider: waitForComponent<t.FormDivider>("FormDivider", m => {
-        if (typeof m !== "function") return false;
-        const s = m.toString();
-        return s.length < 200 && s.includes(".divider");
-    }),
-    FormText: waitForComponent<t.FormText>("FormText", m => m.Types?.INPUT_PLACEHOLDER),
+export let Forms = {} as {
+    FormTitle: t.FormTitle,
+    FormSection: t.FormSection,
+    FormDivider: t.FormDivider,
+    FormText: t.FormText,
 };
 
-export const Card = waitForComponent<t.Card>("Card", m => m.Types?.PRIMARY && m.defaultProps);
-export const Button = waitForComponent<t.Button>("Button", ["Hovers", "Looks", "Sizes"]);
-export const Switch = waitForComponent<t.Switch>("Switch", filters.byCode("tooltipNote", "ringTarget"));
-export const Tooltip = waitForComponent<t.Tooltip>("Tooltip", filters.byCode("shouldShowTooltip:!1", "clickableOnMobile||"));
+export let Card: t.Card;
+export let Button: t.Button;
+export let Switch: t.Switch;
+export let Tooltip: t.Tooltip;
+export let TextInput: t.TextInput;
+export let TextArea: t.TextArea;
+export let Text: t.Text;
+export let Select: t.Select;
+export let SearchableSelect: t.SearchableSelect;
+export let Slider: t.Slider;
+export let ButtonLooks: t.ButtonLooks;
+export let TabBar: any;
+
 export const Timestamp = waitForComponent<t.Timestamp>("Timestamp", filters.byCode(".Messages.MESSAGE_EDITED_TIMESTAMP_A11Y_LABEL.format"));
-export const TextInput = waitForComponent<t.TextInput>("TextInput", ["defaultProps", "Sizes", "contextType"]);
-export const TextArea = waitForComponent<t.TextArea>("TextArea", filters.byCode("handleSetRef", "textArea"));
-export const Text = waitForComponent<t.Text>("Text", m => {
-    if (typeof m !== "function") return false;
-    const s = m.toString();
-    return (s.length < 1500 && s.includes("data-text-variant") && s.includes("always-white"));
-});
-export const Select = waitForComponent<t.Select>("Select", filters.byCode("optionClassName", "popoutPosition", "autoFocus", "maxVisibleItems"));
-const searchableSelectFilter = filters.byCode("autoFocus", ".Messages.SELECT");
-export const SearchableSelect = waitForComponent<t.SearchableSelect>("SearchableSelect", m =>
-    m.render && searchableSelectFilter(m.render)
-);
-export const Slider = waitForComponent<t.Slider>("Slider", filters.byCode("closestMarkerIndex", "stickToMarkers"));
 export const Flex = waitForComponent<t.Flex>("Flex", ["Justify", "Align", "Wrap"]);
 
 export const ButtonWrapperClasses = findByPropsLazy("buttonWrapper", "buttonContent") as Record<string, string>;
-export const ButtonLooks: t.ButtonLooks = findByPropsLazy("BLANK", "FILLED", "INVERTED");
+
+waitFor("FormItem", m => {
+    ({ Card, Button, FormSwitch: Switch, Tooltip, TextInput, TextArea, Text, Select, SearchableSelect, Slider, ButtonLooks, TabBar } = m);
+    Forms = m;
+});
diff --git a/src/webpack/common/menu.ts b/src/webpack/common/menu.ts
index 6ecd754ef..97d1d2f58 100644
--- a/src/webpack/common/menu.ts
+++ b/src/webpack/common/menu.ts
@@ -16,32 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { proxyLazy } from "@utils/proxyLazy";
 
 // eslint-disable-next-line path-alias/no-relative
-import { filters, mapMangledModule, mapMangledModuleLazy } from "../webpack";
+import { filters, mapMangledModuleLazy, waitFor } from "../webpack";
 import type * as t from "./types/menu";
 
-export const Menu: t.Menu = proxyLazy(() => {
-    const hasDeobfuscator = Vencord.Settings.plugins.MenuItemDeobfuscatorAPI.enabled;
-    const menuItems = ["MenuSeparator", "MenuGroup", "MenuItem", "MenuCheckboxItem", "MenuRadioItem", "MenuControlItem"];
+export let Menu = {} as t.Menu;
 
-    const map = mapMangledModule("♫ ⊂(｡◕‿‿◕｡⊂) ♪", {
-        ContextMenu: filters.byCode("getContainerProps"),
-        ...Object.fromEntries((hasDeobfuscator ? menuItems : []).map(s => [s, (m: any) => m.name === s]))
-    }) as t.Menu;
-
-    if (!hasDeobfuscator) {
-        for (const m of menuItems)
-            Object.defineProperty(map, m, {
-                get() {
-                    throw new Error("MenuItemDeobfuscator must be enabled to use this.");
-                }
-            });
-    }
-
-    return map;
-});
+waitFor("MenuItem", m => Menu = m);
 
 export const ContextMenu: t.ContextMenuApi = mapMangledModuleLazy('type:"CONTEXT_MENU_OPEN"', {
     open: filters.byCode("stopPropagation"),
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index a37fe6d61..ffa2daadd 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -109,6 +109,8 @@ export const find = traceFunction("find", function find(filter: FilterFn, getDef
     if (!isWaitFor) {
         const err = new Error("Didn't find module matching this filter");
         if (IS_DEV) {
+            logger.error(err);
+            logger.error(filter);
             if (!devToolsOpen)
                 // Strict behaviour in DevBuilds to fail early and make sure the issue is found
                 throw err;

From a55c758b0ea7fd4ea804d3174f033b1bc5780aac Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 4 Apr 2023 21:27:44 +0200
Subject: [PATCH 111/147] Fix SpotifyControls

---
 .../spotifyControls/PlayerComponent.tsx       | 20 +++++++------------
 src/webpack/common/types/menu.d.ts            | 10 ++++++----
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/plugins/spotifyControls/PlayerComponent.tsx b/src/plugins/spotifyControls/PlayerComponent.tsx
index 3de168709..7076085a8 100644
--- a/src/plugins/spotifyControls/PlayerComponent.tsx
+++ b/src/plugins/spotifyControls/PlayerComponent.tsx
@@ -22,8 +22,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { Link } from "@components/Link";
 import { debounce } from "@utils/debounce";
-import { classes, copyWithToast, LazyComponent } from "@utils/misc";
-import { filters, find } from "@webpack";
+import { classes, copyWithToast } from "@utils/misc";
 import { ContextMenu, FluxDispatcher, Forms, Menu, React, useEffect, useState, useStateFromStores } from "@webpack/common";
 
 import { SpotifyStore, Track } from "./SpotifyStore";
@@ -79,7 +78,7 @@ function CopyContextMenu({ name, path }: { name: string; path: string; }) {
     const openId = `spotify-open-${name}`;
 
     return (
-        <Menu.ContextMenu
+        <Menu.Menu
             navId={`spotify-${name}-menu`}
             onClose={() => FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" })}
             aria-label={`Spotify ${name} Menu`}
@@ -96,7 +95,7 @@ function CopyContextMenu({ name, path }: { name: string; path: string; }) {
                 label={`Open ${name} in Spotify`}
                 action={() => SpotifyStore.openExternal(path)}
             />
-        </Menu.ContextMenu>
+        </Menu.Menu>
     );
 }
 
@@ -154,11 +153,6 @@ const seek = debounce((v: number) => {
     SpotifyStore.seek(v);
 });
 
-const Slider = LazyComponent(() => {
-    const filter = filters.byCode("sliderContainer");
-    return find(m => m.render && filter(m.render));
-});
-
 function SeekBar() {
     const { duration } = SpotifyStore.track!;
 
@@ -190,7 +184,7 @@ function SeekBar() {
             >
                 {msToHuman(position)}
             </Forms.FormText>
-            <Slider
+            <Menu.MenuSliderControl
                 minValue={0}
                 maxValue={duration}
                 value={position}
@@ -217,7 +211,7 @@ function AlbumContextMenu({ track }: { track: Track; }) {
     const volume = useStateFromStores([SpotifyStore], () => SpotifyStore.volume);
 
     return (
-        <Menu.ContextMenu
+        <Menu.Menu
             navId="spotify-album-menu"
             onClose={() => FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" })}
             aria-label="Spotify Album Menu"
@@ -240,7 +234,7 @@ function AlbumContextMenu({ track }: { track: Track; }) {
                 key="spotify-volume"
                 label="Volume"
                 control={(props, ref) => (
-                    <Slider
+                    <Menu.MenuSliderControl
                         {...props}
                         ref={ref}
                         value={volume}
@@ -250,7 +244,7 @@ function AlbumContextMenu({ track }: { track: Track; }) {
                     />
                 )}
             />
-        </Menu.ContextMenu>
+        </Menu.Menu>
     );
 }
 
diff --git a/src/webpack/common/types/menu.d.ts b/src/webpack/common/types/menu.d.ts
index e48d59458..bf5508ae8 100644
--- a/src/webpack/common/types/menu.d.ts
+++ b/src/webpack/common/types/menu.d.ts
@@ -21,7 +21,7 @@ import type { ComponentType, CSSProperties, PropsWithChildren, UIEvent } from "r
 type RC<C> = ComponentType<PropsWithChildren<C & Record<string, any>>>;
 
 export interface Menu {
-    ContextMenu: RC<{
+    Menu: RC<{
         navId: string;
         onClose(): void;
         className?: string;
@@ -49,19 +49,21 @@ export interface Menu {
         id: string;
         interactive?: boolean;
     }>;
+    // TODO: Type me
+    MenuSliderControl: RC<any>;
 }
 
 export interface ContextMenuApi {
     close(): void;
     open(
         event: UIEvent,
-        render?: Menu["ContextMenu"],
+        render?: Menu["Menu"],
         options?: { enableSpellCheck?: boolean; },
-        renderLazy?: () => Promise<Menu["ContextMenu"]>
+        renderLazy?: () => Promise<Menu["Menu"]>
     ): void;
     openLazy(
         event: UIEvent,
-        renderLazy?: () => Promise<Menu["ContextMenu"]>,
+        renderLazy?: () => Promise<Menu["Menu"]>,
         options?: { enableSpellCheck?: boolean; }
     ): void;
 }

From f088f17a0a9811fc9495bb87c821c71844e9b47a Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 4 Apr 2023 21:28:38 +0200
Subject: [PATCH 112/147] Remove accidently introduced patch

---
 src/plugins/betterRoleDot.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/plugins/betterRoleDot.ts b/src/plugins/betterRoleDot.ts
index 481077b5c..1fc18c370 100644
--- a/src/plugins/betterRoleDot.ts
+++ b/src/plugins/betterRoleDot.ts
@@ -44,13 +44,6 @@ export default definePlugin({
                 match: /"(?:username|dot)"===\i(?!\.\i)/g,
                 replace: "true",
             },
-        },
-        {
-            find: ".colorPickerFooter",
-            replacement: {
-                match: /function (\i).{0,200}\.colorPickerFooter/,
-                replace: "$self.ColorPicker=$1;$&"
-            }
         }
     ],
 

From 4aa7a052d0da6f76d69758821cccacdbd173a428 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 4 Apr 2023 21:29:39 +0200
Subject: [PATCH 113/147] Bump to v1.1.5

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

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

From 368cb7bc6bc2d066b3ebb180d854d44697e8fa2d Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 4 Apr 2023 21:51:03 +0200
Subject: [PATCH 114/147] Fix Toasts

---
 src/webpack/common/utils.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 083e8d739..2c2af54c9 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -103,8 +103,10 @@ waitFor(["dispatch", "subscribe"], m => {
 
 
 // This is the same module but this is easier
-waitFor(filters.byCode("currentToast?"), m => Toasts.show = m);
-waitFor(filters.byCode("currentToast:null"), m => Toasts.pop = m);
+waitFor("showToast", m => {
+    Toasts.show = m.showToast;
+    Toasts.pop = m.popToast;
+});
 
 waitFor(["show", "close"], m => Alerts = m);
 waitFor("parseTopic", m => Parser = m);

From 8ad710abca9effc4b27c63ae2ab6ad3bc362ee4a Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 4 Apr 2023 22:19:52 +0200
Subject: [PATCH 115/147] Fix ContextMenuAPI

---
 src/plugins/apiContextMenu.ts | 76 +++++------------------------------
 1 file changed, 10 insertions(+), 66 deletions(-)

diff --git a/src/plugins/apiContextMenu.ts b/src/plugins/apiContextMenu.ts
index 88a1eb9cc..aeaa0c4d2 100644
--- a/src/plugins/apiContextMenu.ts
+++ b/src/plugins/apiContextMenu.ts
@@ -16,77 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Settings } from "@api/settings";
 import { Devs } from "@utils/constants";
-import definePlugin, { type PatchReplacement } from "@utils/types";
-import { addListener, removeListener } from "@webpack";
-
-/**
- * The last var name corresponding to the Context Menu API (Discord, not ours) module
- */
-let lastVarName = "";
-
-/**
- * @param target The patch replacement object
- * @param exportKey The key exporting the build Context Menu component function
- */
-function makeReplacementProxy(target: PatchReplacement, exportKey: string) {
-    return new Proxy(target, {
-        get(_, p) {
-            if (p === "match") return RegExp(`${exportKey},{(?<=${lastVarName}\\.${exportKey},{)`, "g");
-            // @ts-expect-error
-            return Reflect.get(...arguments);
-        }
-    });
-}
-
-function listener(exports: any, id: number) {
-    if (!Settings.plugins.ContextMenuAPI.enabled) return removeListener(listener);
-
-    if (typeof exports !== "object" || exports === null) return;
-
-    for (const key in exports) if (key.length <= 3) {
-        const prop = exports[key];
-        if (typeof prop !== "function") continue;
-
-        const str = Function.prototype.toString.call(prop);
-        if (str.includes('path:["empty"]')) {
-            Vencord.Plugins.patches.push({
-                plugin: "ContextMenuAPI",
-                all: true,
-                noWarn: true,
-                find: "navId:",
-                replacement: [
-                    {
-                        // Set the lastVarName for our proxy to use
-                        match: RegExp(`${id}(?<=(\\i)=.+?)`),
-                        replace: (id, varName) => {
-                            lastVarName = varName;
-                            return id;
-                        }
-                    },
-                    /**
-                     * We are using a proxy here to utilize the whole code the patcher gives us, instead of matching the entire module (which is super slow)
-                     * Our proxy returns the corresponding match for that module utilizing lastVarName, which is set by the patch before
-                     */
-                    makeReplacementProxy({
-                        match: "", // Needed to canonicalizeDescriptor
-                        replace: "$&contextMenuApiArguments:arguments,",
-                    }, key)
-                ]
-            });
-
-            removeListener(listener);
-        }
-    }
-}
-
-addListener(listener);
+import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "ContextMenuAPI",
     description: "API for adding/removing items to/from context menus.",
-    authors: [Devs.Nuckyz],
+    authors: [Devs.Nuckyz, Devs.Ven],
     patches: [
         {
             find: "♫ (つ｡◕‿‿◕｡)つ ♪",
@@ -94,6 +30,14 @@ export default definePlugin({
                 match: /(?<=function \i\((\i)\){)(?=var \i,\i=\i\.navId)/,
                 replace: (_, props) => `Vencord.Api.ContextMenu._patchContextMenu(${props});`
             }
+        },
+        {
+            find: ".Menu,{",
+            all: true,
+            replacement: {
+                match: /(?<=\.jsxs?\)\(\i\.Menu,)\{/,
+                replace: "{contextMenuApiArguments:typeof arguments!=='undefined'?arguments:[],"
+            }
         }
     ]
 });

From d8a5e430340c22ba348c0ec62f4cf788a59f049d Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 4 Apr 2023 22:24:16 +0200
Subject: [PATCH 116/147] Fix Themes Tab

---
 src/components/VencordSettings/ThemesTab.tsx | 2 +-
 src/webpack/common/types/components.d.ts     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/VencordSettings/ThemesTab.tsx b/src/components/VencordSettings/ThemesTab.tsx
index f254afffb..4bd0eb8ed 100644
--- a/src/components/VencordSettings/ThemesTab.tsx
+++ b/src/components/VencordSettings/ThemesTab.tsx
@@ -117,7 +117,7 @@ export default ErrorBoundary.wrap(function () {
             <Forms.FormTitle tag="h5">Themes</Forms.FormTitle>
             <TextArea
                 value={themeText}
-                onChange={e => setThemeText(e.currentTarget.value)}
+                onChange={setThemeText}
                 className={`${TextAreaProps.textarea} vc-settings-theme-links`}
                 placeholder="Theme Links"
                 spellCheck={false}
diff --git a/src/webpack/common/types/components.d.ts b/src/webpack/common/types/components.d.ts
index a2e66bd86..7b02ed343 100644
--- a/src/webpack/common/types/components.d.ts
+++ b/src/webpack/common/types/components.d.ts
@@ -186,7 +186,9 @@ export type TextInput = ComponentType<PropsWithChildren<{
     Sizes: Record<"DEFAULT" | "MINI", string>;
 };
 
-export type TextArea = ComponentType<PropsWithRef<HTMLProps<HTMLTextAreaElement>>>;
+export type TextArea = ComponentType<PropsWithRef<Omit<HTMLProps<HTMLTextAreaElement>, "onChange"> & {
+    onChange(v: string): void;
+}>>;
 
 interface SelectOption {
     disabled?: boolean;

From 676bc612d96c3d1d7c7a80e62bf8e50a2a6fb74b Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 5 Apr 2023 04:09:42 +0200
Subject: [PATCH 117/147] VencordDesktop: Include web plugins & use proper
 showItemInFolder

---
 scripts/build/build.mjs                              |  4 ++--
 scripts/build/buildWeb.mjs                           |  2 +-
 scripts/build/common.mjs                             | 12 +++++++-----
 src/components/VencordSettings/VencordTab.tsx        |  7 +++----
 src/plugins/apiContextMenu.ts                        |  2 +-
 .../{noRPC.desktop.ts => noRPC.discordDesktop.ts}    |  0
 ...ge.desktop.ts => noSystemBadge.discordDesktop.ts} |  0
 ...er.desktop.ts => volumeBooster.discordDesktop.ts} |  0
 src/utils/native.ts                                  |  7 +++++++
 9 files changed, 21 insertions(+), 13 deletions(-)
 rename src/plugins/{noRPC.desktop.ts => noRPC.discordDesktop.ts} (100%)
 rename src/plugins/{noSystemBadge.desktop.ts => noSystemBadge.discordDesktop.ts} (100%)
 rename src/plugins/{volumeBooster.desktop.ts => volumeBooster.discordDesktop.ts} (100%)

diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs
index a4b06f536..45cda74ad 100755
--- a/scripts/build/build.mjs
+++ b/scripts/build/build.mjs
@@ -80,7 +80,7 @@ await Promise.all([
         globalName: "Vencord",
         sourcemap,
         plugins: [
-            globPlugins,
+            globPlugins("discordDesktop"),
             ...commonOpts.plugins
         ],
         define: {
@@ -114,7 +114,7 @@ await Promise.all([
         globalName: "Vencord",
         sourcemap,
         plugins: [
-            globPlugins,
+            globPlugins("vencordDesktop"),
             ...commonOpts.plugins
         ],
         define: {
diff --git a/scripts/build/buildWeb.mjs b/scripts/build/buildWeb.mjs
index df75d35a5..98d56b0d4 100644
--- a/scripts/build/buildWeb.mjs
+++ b/scripts/build/buildWeb.mjs
@@ -38,7 +38,7 @@ const commonOptions = {
     format: "iife",
     external: ["plugins", "git-hash", "/assets/*"],
     plugins: [
-        globPlugins,
+        globPlugins("web"),
         ...commonOpts.plugins,
     ],
     target: ["esnext"],
diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
index 53eb23f71..7ff599aa5 100644
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@@ -48,9 +48,9 @@ export const makeAllPackagesExternalPlugin = {
 };
 
 /**
- * @type {import("esbuild").Plugin}
+ * @type {(kind: "web" | "discordDesktop" | "vencordDesktop") => import("esbuild").Plugin}
  */
-export const globPlugins = {
+export const globPlugins = kind => ({
     name: "glob-plugins",
     setup: build => {
         const filter = /^~plugins$/;
@@ -76,8 +76,10 @@ export const globPlugins = {
                     if (fileBits.length > 2 && ["ts", "tsx"].includes(fileBits.at(-1))) {
                         const mod = fileBits.at(-2);
                         if (mod === "dev" && !watch) continue;
-                        if (mod === "web" && !isWeb) continue;
-                        if (mod === "desktop" && isWeb) continue;
+                        if (mod === "web" && kind === "discordDesktop") continue;
+                        if (mod === "desktop" && kind === "web") continue;
+                        if (mod === "discordDesktop" && kind !== "discordDesktop") continue;
+                        if (mod === "vencordDesktop" && kind !== "vencordDesktop") continue;
                     }
 
                     const mod = `p${i}`;
@@ -93,7 +95,7 @@ export const globPlugins = {
             };
         });
     }
-};
+});
 
 /**
  * @type {import("esbuild").Plugin}
diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx
index 8b8696843..3bdd9b76f 100644
--- a/src/components/VencordSettings/VencordTab.tsx
+++ b/src/components/VencordSettings/VencordTab.tsx
@@ -26,7 +26,7 @@ import { ErrorCard } from "@components/ErrorCard";
 import IpcEvents from "@utils/IpcEvents";
 import { Margins } from "@utils/margins";
 import { identity, useAwaiter } from "@utils/misc";
-import { relaunch } from "@utils/native";
+import { relaunch, showItemInFolder } from "@utils/native";
 import { Button, Card, Forms, React, Select, Slider, Switch } from "@webpack/common";
 
 const cl = classNameFactory("vc-settings-");
@@ -65,7 +65,7 @@ function VencordSettings() {
                 title: "Enable React Developer Tools",
                 note: "Requires a full restart"
             },
-            !IS_WEB && (!isWindows ? {
+            !IS_WEB && (!IS_DISCORD_DESKTOP || !isWindows ? {
                 key: "frameless",
                 title: "Disable the window frame",
                 note: "Requires a full restart"
@@ -112,8 +112,7 @@ function VencordSettings() {
                                 Open QuickCSS File
                             </Button>
                             <Button
-                                // FIXME: Vencord Desktop support
-                                onClick={() => window.DiscordNative.fileManager.showItemInFolder(settingsDir)}
+                                onClick={() => showItemInFolder(settingsDir)}
                                 size={Button.Sizes.SMALL}
                                 disabled={settingsDirPending}>
                                 Open Settings Folder
diff --git a/src/plugins/apiContextMenu.ts b/src/plugins/apiContextMenu.ts
index aeaa0c4d2..cb85c4ff3 100644
--- a/src/plugins/apiContextMenu.ts
+++ b/src/plugins/apiContextMenu.ts
@@ -35,7 +35,7 @@ export default definePlugin({
             find: ".Menu,{",
             all: true,
             replacement: {
-                match: /(?<=\.jsxs?\)\(\i\.Menu,)\{/,
+                match: /(?<=\.jsxs?\)\(\i\.Menu,)\{/g,
                 replace: "{contextMenuApiArguments:typeof arguments!=='undefined'?arguments:[],"
             }
         }
diff --git a/src/plugins/noRPC.desktop.ts b/src/plugins/noRPC.discordDesktop.ts
similarity index 100%
rename from src/plugins/noRPC.desktop.ts
rename to src/plugins/noRPC.discordDesktop.ts
diff --git a/src/plugins/noSystemBadge.desktop.ts b/src/plugins/noSystemBadge.discordDesktop.ts
similarity index 100%
rename from src/plugins/noSystemBadge.desktop.ts
rename to src/plugins/noSystemBadge.discordDesktop.ts
diff --git a/src/plugins/volumeBooster.desktop.ts b/src/plugins/volumeBooster.discordDesktop.ts
similarity index 100%
rename from src/plugins/volumeBooster.desktop.ts
rename to src/plugins/volumeBooster.discordDesktop.ts
diff --git a/src/utils/native.ts b/src/utils/native.ts
index 70e4c0eb6..05fa0aa50 100644
--- a/src/utils/native.ts
+++ b/src/utils/native.ts
@@ -22,3 +22,10 @@ export function relaunch() {
     else
         window.VencordDesktop.app.relaunch();
 }
+
+export function showItemInFolder(path: string) {
+    if (IS_DISCORD_DESKTOP)
+        window.DiscordNative.fileManager.showItemInFolder(path);
+    else
+        window.VencordDesktop.fileManager.showItemInFolder(path);
+}

From 6492908a62cbb8e56be6b28e574a3e9e33cc5051 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 5 Apr 2023 04:34:39 +0200
Subject: [PATCH 118/147] VencordDesktop: Fix Updater

---
 src/main/updater/common.ts | 2 +-
 src/utils/updater.ts       | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/updater/common.ts b/src/main/updater/common.ts
index 3729c6d59..bc628f068 100644
--- a/src/main/updater/common.ts
+++ b/src/main/updater/common.ts
@@ -24,7 +24,7 @@ export async function calculateHashes() {
     const hashes = {} as Record<string, string>;
 
     await Promise.all(
-        ["patcher.js", "preload.js", "renderer.js", "renderer.css"].map(file => new Promise<void>(r => {
+        [IS_DISCORD_DESKTOP ? "patcher.js" : "main.js", "preload.js", "renderer.js", "renderer.css"].map(file => new Promise<void>(r => {
             const fis = createReadStream(join(__dirname, file));
             const hash = createHash("sha1", { encoding: "hex" });
             fis.once("end", () => {
diff --git a/src/utils/updater.ts b/src/utils/updater.ts
index d0b1fdcb4..3606e5ffc 100644
--- a/src/utils/updater.ts
+++ b/src/utils/updater.ts
@@ -62,7 +62,7 @@ export function getRepo() {
     return Unwrap(VencordNative.ipc.invoke<IpcRes<string>>(IpcEvents.GET_REPO));
 }
 
-type Hashes = Record<"patcher.js" | "preload.js" | "renderer.js" | "renderer.css", string>;
+type Hashes = Record<"patcher.js" | "main.js" | "preload.js" | "renderer.js" | "renderer.css", string>;
 
 /**
  * @returns true if hard restart is required
@@ -75,8 +75,11 @@ export async function rebuild() {
 
     const newHashes = await Unwrap(VencordNative.ipc.invoke<IpcRes<Hashes>>(IpcEvents.GET_HASHES));
 
-    return oldHashes["patcher.js"] !== newHashes["patcher.js"] ||
-        oldHashes["preload.js"] !== newHashes["preload.js"];
+    if (oldHashes["preload.js"] !== newHashes["preload.js"]) return true;
+    if (IS_DISCORD_DESKTOP && oldHashes["patcher.js"] !== newHashes["patcher.js"]) return true;
+    if (IS_VENCORD_DESKTOP && oldHashes["main.js"] !== newHashes["main.js"]) return true;
+
+    return false;
 }
 
 export async function maybePromptToUpdate(confirmMessage: string, checkForDev = false) {

From 99391a4f0eda95f06a5949496747b33a350e41f5 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 5 Apr 2023 04:54:54 +0200
Subject: [PATCH 119/147] fix generatePluginList

---
 scripts/generatePluginList.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/generatePluginList.ts b/scripts/generatePluginList.ts
index 1f66c3dc8..e4ae20ad8 100644
--- a/scripts/generatePluginList.ts
+++ b/scripts/generatePluginList.ts
@@ -35,7 +35,7 @@ interface PluginData {
     hasCommands: boolean;
     required: boolean;
     enabledByDefault: boolean;
-    target: "desktop" | "web" | "dev";
+    target: "discordDesktop" | "vencordDesktop" | "web" | "dev";
 }
 
 const devs = {} as Record<string, Dev>;
@@ -150,7 +150,7 @@ async function parseFile(fileName: string) {
         const fileBits = fileName.split(".");
         if (fileBits.length > 2 && ["ts", "tsx"].includes(fileBits.at(-1)!)) {
             const mod = fileBits.at(-2)!;
-            if (!["web", "desktop", "dev"].includes(mod)) throw fail(`invalid target ${fileBits.at(-2)}`);
+            if (!["web", "discordDesktop", "vencordDesktop", "dev"].includes(mod)) throw fail(`invalid target ${fileBits.at(-2)}`);
             data.target = mod as any;
         }
 

From 12ffb9d64276dd36c7e1fd7c184e60448fbf748f Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 5 Apr 2023 00:06:04 -0300
Subject: [PATCH 120/147] Fake Nitro Transform Stickers option and other stuff
 (#683)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/crashHandler.ts                   |   6 +
 src/plugins/fakeNitro.tsx                     | 318 ++++++++++++++----
 .../components/HiddenChannelLockScreen.tsx    |  10 +-
 src/plugins/showHiddenChannels/index.tsx      |  11 +-
 4 files changed, 269 insertions(+), 76 deletions(-)

diff --git a/src/plugins/crashHandler.ts b/src/plugins/crashHandler.ts
index 61b06b353..c70d467f7 100644
--- a/src/plugins/crashHandler.ts
+++ b/src/plugins/crashHandler.ts
@@ -43,6 +43,7 @@ const settings = definePluginSettings({
 
 let crashCount: number = 0;
 let lastCrashTimestamp: number = 0;
+let shouldAttemptNextHandle = false;
 
 export default definePlugin({
     name: "CrashHandler",
@@ -72,6 +73,10 @@ export default definePlugin({
     ],
 
     handleCrash(_this: ReactElement & { forceUpdate: () => void; }) {
+        if (Date.now() - lastCrashTimestamp <= 1_000 && !shouldAttemptNextHandle) return true;
+
+        shouldAttemptNextHandle = false;
+
         if (++crashCount > 5) {
             try {
                 showNotification({
@@ -151,6 +156,7 @@ export default definePlugin({
         }
 
         try {
+            shouldAttemptNextHandle = true;
             _this.forceUpdate();
         } catch (err) {
             CrashHandlerLogger.debug("Failed to update crash handler component.", err);
diff --git a/src/plugins/fakeNitro.tsx b/src/plugins/fakeNitro.tsx
index e703af563..0a42ab1de 100644
--- a/src/plugins/fakeNitro.tsx
+++ b/src/plugins/fakeNitro.tsx
@@ -17,20 +17,28 @@
 */
 
 import { addPreEditListener, addPreSendListener, removePreEditListener, removePreSendListener } from "@api/MessageEvents";
-import { migratePluginSettings, Settings } from "@api/settings";
+import { definePluginSettings, migratePluginSettings, Settings } from "@api/settings";
 import { Devs } from "@utils/constants";
-import { ApngDisposeOp, getGifEncoder, importApngJs } from "@utils/dependencies";
+import { ApngBlendOp, ApngDisposeOp, getGifEncoder, importApngJs } from "@utils/dependencies";
 import { getCurrentGuild } from "@utils/discord";
 import { proxyLazy } from "@utils/proxyLazy";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, FluxDispatcher, PermissionStore, UserStore } from "@webpack/common";
+import { ChannelStore, FluxDispatcher, Parser, PermissionStore, UserStore } from "@webpack/common";
+import type { Message } from "discord-types/general";
 
 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;
+};
+const EmojiStore = findStoreLazy("EmojiStore");
+
 
 function searchProtoClass(localName: string, parentProtoClass: any) {
     if (!parentProtoClass) return;
@@ -86,6 +94,55 @@ interface StickerPack {
     stickers: Sticker[];
 }
 
+const fakeNitroEmojiRegex = /\/emojis\/(\d+?)\.(png|webp|gif)/;
+const fakeNitroStickerRegex = /\/stickers\/(\d+?)\./;
+const fakeNitroGifStickerRegex = /\/attachments\/\d+?\/\d+?\/(\d+?)\.gif/;
+
+const settings = definePluginSettings({
+    enableEmojiBypass: {
+        description: "Allow sending fake emojis",
+        type: OptionType.BOOLEAN,
+        default: true,
+        restartNeeded: true
+    },
+    emojiSize: {
+        description: "Size of the emojis when sending",
+        type: OptionType.SLIDER,
+        default: 48,
+        markers: [32, 48, 64, 128, 160, 256, 512]
+    },
+    transformEmojis: {
+        description: "Whether to transform fake emojis into real ones",
+        type: OptionType.BOOLEAN,
+        default: true,
+        restartNeeded: true
+    },
+    enableStickerBypass: {
+        description: "Allow sending fake stickers",
+        type: OptionType.BOOLEAN,
+        default: true,
+        restartNeeded: true
+    },
+    stickerSize: {
+        description: "Size of the stickers when sending",
+        type: OptionType.SLIDER,
+        default: 160,
+        markers: [32, 64, 128, 160, 256, 512]
+    },
+    transformStickers: {
+        description: "Whether to transform fake stickers into real ones",
+        type: OptionType.BOOLEAN,
+        default: true,
+        restartNeeded: true
+    },
+    enableStreamQualityBypass: {
+        description: "Allow streaming in nitro quality",
+        type: OptionType.BOOLEAN,
+        default: true,
+        restartNeeded: true
+    }
+});
+
 migratePluginSettings("FakeNitro", "NitroBypass");
 
 export default definePlugin({
@@ -94,10 +151,12 @@ export default definePlugin({
     description: "Allows you to stream in nitro quality, send fake emojis/stickers and use client themes.",
     dependencies: ["MessageEventsAPI"],
 
+    settings,
+
     patches: [
         {
             find: ".PREMIUM_LOCKED;",
-            predicate: () => Settings.plugins.FakeNitro.enableEmojiBypass === true,
+            predicate: () => settings.store.enableEmojiBypass,
             replacement: [
                 {
                     match: /(?<=(\i)=\i\.intention)/,
@@ -115,7 +174,7 @@ export default definePlugin({
         },
         {
             find: "canUseAnimatedEmojis:function",
-            predicate: () => Settings.plugins.FakeNitro.enableEmojiBypass === true,
+            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)`
@@ -123,7 +182,7 @@ export default definePlugin({
         },
         {
             find: "canUseStickersEverywhere:function",
-            predicate: () => Settings.plugins.FakeNitro.enableStickerBypass === true,
+            predicate: () => settings.store.enableStickerBypass,
             replacement: {
                 match: /canUseStickersEverywhere:function\(\i\){/,
                 replace: "$&return true;"
@@ -131,7 +190,7 @@ export default definePlugin({
         },
         {
             find: "\"SENDABLE\"",
-            predicate: () => Settings.plugins.FakeNitro.enableStickerBypass === true,
+            predicate: () => settings.store.enableStickerBypass,
             replacement: {
                 match: /(\w+)\.available\?/,
                 replace: "true?"
@@ -139,7 +198,7 @@ export default definePlugin({
         },
         {
             find: "canStreamHighQuality:function",
-            predicate: () => Settings.plugins.FakeNitro.enableStreamQualityBypass === true,
+            predicate: () => settings.store.enableStreamQualityBypass,
             replacement: [
                 "canUseHighVideoUploadQuality",
                 "canStreamHighQuality",
@@ -153,7 +212,7 @@ export default definePlugin({
         },
         {
             find: "STREAM_FPS_OPTION.format",
-            predicate: () => Settings.plugins.FakeNitro.enableStreamQualityBypass === true,
+            predicate: () => settings.store.enableStreamQualityBypass,
             replacement: {
                 match: /(userPremiumType|guildPremiumTier):.{0,10}TIER_\d,?/g,
                 replace: ""
@@ -186,34 +245,61 @@ export default definePlugin({
                 replace: (_, rest, backgroundGradientPresetId, originalCall, theme) => `${rest}$self.handleGradientThemeSelect(${backgroundGradientPresetId},${theme},()=>${originalCall});`
             }
         },
-        {
-            find: 'jumboable?"jumbo":"default"',
-            predicate: () => Settings.plugins.FakeNitro.transformEmojis === true,
-            replacement: {
-                match: /jumboable\?"jumbo":"default",emojiId.+?}}\)},(?<=(\i)=function\(\i\){var \i=\i\.node.+?)/,
-                replace: (m, component) => `${m}fakeNitroEmojiComponentExport=($self.EmojiComponent=${component},void 0),`
-            }
-        },
         {
             find: '["strong","em","u","text","inlineCode","s","spoiler"]',
-            predicate: () => Settings.plugins.FakeNitro.transformEmojis === true,
             replacement: [
                 {
+                    predicate: () => settings.store.transformEmojis,
                     match: /1!==(\i)\.length\|\|1!==\i\.length/,
-                    replace: (m, content) => `${m}||${content}[0].target?.startsWith("https://cdn.discordapp.com/emojis/")`
+                    replace: (m, content) => `${m}||$self.shouldKeepEmojiLink(${content}[0])`
                 },
                 {
+                    predicate: () => settings.store.transformEmojis || settings.store.transformStickers,
                     match: /(?=return{hasSpoilerEmbeds:\i,content:(\i)})/,
-                    replace: (_, content) => `${content}=$self.patchFakeNitroEmojis(${content},arguments[2]?.formatInline);`
+                    replace: (_, content) => `${content}=$self.patchFakeNitroEmojisOrRemoveStickersLinks(${content},arguments[2]?.formatInline);`
                 }
             ]
         },
         {
             find: "renderEmbeds=function",
-            predicate: () => Settings.plugins.FakeNitro.transformEmojis === true,
+            replacement: [
+                {
+                    predicate: () => settings.store.transformEmojis || settings.store.transformStickers,
+                    match: /(renderEmbeds=function\((\i)\){)(.+?embeds\.map\(\(function\((\i)\){)/,
+                    replace: (_, rest1, message, rest2, embed) => `${rest1}const fakeNitroMessage=${message};${rest2}if($self.shouldIgnoreEmbed(${embed},fakeNitroMessage))return null;`
+                },
+                {
+                    predicate: () => settings.store.transformStickers,
+                    match: /renderStickersAccessories=function\((\i)\){var (\i)=\(0,\i\.\i\)\(\i\),/,
+                    replace: (m, message, stickers) => `${m}${stickers}=$self.patchFakeNitroStickers(${stickers},${message}),`
+                },
+                {
+                    predicate: () => settings.store.transformStickers,
+                    match: /renderAttachments=function\(\i\){var (\i)=\i.attachments.+?;/,
+                    replace: (m, attachments) => `${m}${attachments}=$self.filterAttachments(${attachments});`
+                }
+            ]
+        },
+        {
+            find: ".STICKER_IN_MESSAGE_HOVER,",
+            predicate: () => settings.store.transformStickers,
+            replacement: [
+                {
+                    match: /var (\i)=\i\.renderableSticker,.{0,50}closePopout.+?channel:\i,closePopout:\i,/,
+                    replace: (m, renderableSticker) => `${m}renderableSticker:${renderableSticker},`
+                },
+                {
+                    match: /emojiSection.{0,50}description:\i(?<=(\i)\.sticker,.+?)(?=,)/,
+                    replace: (m, props) => `${m}+(${props}.renderableSticker?.fake?" This is a Fake Nitro sticker. Only you can see it rendered like a real one, for non Vencord users it will show as a link.":"")`
+                }
+            ]
+        },
+        {
+            find: ".Messages.EMOJI_POPOUT_PREMIUM_JOINED_GUILD_DESCRIPTION",
+            predicate: () => settings.store.transformEmojis,
             replacement: {
-                match: /renderEmbeds=function\(\i\){.+?embeds\.map\(\(function\((\i)\){/,
-                replace: (m, embed) => `${m}if(${embed}.url?.startsWith("https://cdn.discordapp.com/emojis/"))return null;`
+                match: /((\i)=\i\.node,\i=\i\.emojiSourceDiscoverableGuild)(.+?return) (.{0,450}Messages\.EMOJI_POPOUT_PREMIUM_JOINED_GUILD_DESCRIPTION.+?}\))/,
+                replace: (_, rest1, node, rest2, messages) => `${rest1},fakeNitroNode=${node}${rest2}(${messages})+(fakeNitroNode.fake?" This is a Fake Nitro emoji. Only you can see it rendered like a real one, for non Vencord users it will show as a link.":"")`
             }
         }
     ],
@@ -331,37 +417,146 @@ export default definePlugin({
         });
     },
 
-    EmojiComponent: null as any,
-
-    patchFakeNitroEmojis(content: Array<any>, inline: boolean) {
-        if (!this.EmojiComponent) return content;
+    patchFakeNitroEmojisOrRemoveStickersLinks(content: Array<any>, inline: boolean) {
+        if (content.length > 1) return content;
 
         const newContent: Array<any> = [];
 
+        let nextIndex = content.length;
+
         for (const element of content) {
             if (element.props?.trusted == null) {
                 newContent.push(element);
                 continue;
             }
 
-            const fakeNitroMatch = element.props.href.match(/https:\/\/cdn\.discordapp\.com\/emojis\/(\d+?)\.(png|webp|gif).+?(?=\s|$)/);
-            if (!fakeNitroMatch) {
-                newContent.push(element);
+            if (settings.store.transformEmojis) {
+                const fakeNitroMatch = element.props.href.match(fakeNitroEmojiRegex);
+                if (fakeNitroMatch) {
+                    let url: URL | null = null;
+                    try {
+                        url = new URL(element.props.href);
+                    } catch { }
+
+                    const emojiName = EmojiStore.getCustomEmojiById(fakeNitroMatch[1])?.name ?? url?.searchParams.get("name") ?? "FakeNitroEmoji";
+
+                    newContent.push(Parser.defaultRules.customEmoji.react({
+                        jumboable: !inline,
+                        animated: fakeNitroMatch[2] === "gif",
+                        emojiId: fakeNitroMatch[1],
+                        name: emojiName,
+                        fake: true
+                    }, void 0, { key: String(nextIndex++) }));
+
+                    continue;
+                }
+            }
+
+            if (settings.store.transformStickers) {
+                if (fakeNitroStickerRegex.test(element.props.href)) continue;
+
+                const gifMatch = element.props.href.match(fakeNitroGifStickerRegex);
+                if (gifMatch) {
+                    // There is no way to differentiate a regular gif attachment from a fake nitro animated sticker, so we check if the StickerStore contains the id of the fake sticker
+                    if (StickerStore.getStickerById(gifMatch[1])) continue;
+                }
+            }
+
+            newContent.push(element);
+        }
+
+        const firstTextElementIdx = newContent.findIndex(element => typeof element === "string");
+        if (firstTextElementIdx !== -1) newContent[firstTextElementIdx] = newContent[firstTextElementIdx].trimStart();
+
+        return newContent;
+    },
+
+    patchFakeNitroStickers(stickers: Array<any>, message: Message) {
+        const itemsToMaybePush: Array<string> = [];
+
+        const contentItems = message.content.split(/\s/);
+        if (contentItems.length === 1) itemsToMaybePush.push(contentItems[0]);
+
+        itemsToMaybePush.push(...message.attachments.filter(attachment => attachment.content_type === "image/gif").map(attachment => attachment.url));
+
+        for (const item of itemsToMaybePush) {
+            const imgMatch = item.match(fakeNitroStickerRegex);
+            if (imgMatch) {
+                let url: URL | null = null;
+                try {
+                    url = new URL(item);
+                } catch { }
+
+                const stickerName = StickerStore.getStickerById(imgMatch[1])?.name ?? url?.searchParams.get("name") ?? "FakeNitroSticker";
+                stickers.push({
+                    format_type: 1,
+                    id: imgMatch[1],
+                    name: stickerName,
+                    fake: true
+                });
+
                 continue;
             }
 
-            newContent.push((
-                <this.EmojiComponent node={{
-                    type: "customEmoji",
-                    jumboable: !inline && content.length === 1,
-                    animated: fakeNitroMatch[2] === "gif",
-                    name: ":FakeNitroEmoji:",
-                    emojiId: fakeNitroMatch[1]
-                }} />
-            ));
+            const gifMatch = item.match(fakeNitroGifStickerRegex);
+            if (gifMatch) {
+                if (!StickerStore.getStickerById(gifMatch[1])) continue;
+
+                const stickerName = StickerStore.getStickerById(gifMatch[1])?.name ?? "FakeNitroSticker";
+                stickers.push({
+                    format_type: 2,
+                    id: gifMatch[1],
+                    name: stickerName,
+                    fake: true
+                });
+            }
         }
 
-        return newContent;
+        return stickers;
+    },
+
+    shouldIgnoreEmbed(embed: Message["embeds"][number], message: Message) {
+        if (message.content.split(/\s/).length > 1) return false;
+
+        switch (embed.type) {
+            case "image": {
+                if (settings.store.transformEmojis) {
+                    if (fakeNitroEmojiRegex.test(embed.url!)) return true;
+                }
+
+                if (settings.store.transformStickers) {
+                    if (fakeNitroStickerRegex.test(embed.url!)) return true;
+
+                    const gifMatch = embed.url!.match(fakeNitroGifStickerRegex);
+                    if (gifMatch) {
+                        // There is no way to differentiate a regular gif attachment from a fake nitro animated sticker, so we check if the StickerStore contains the id of the fake sticker
+                        if (StickerStore.getStickerById(gifMatch[1])) return true;
+                    }
+                }
+
+                break;
+            }
+        }
+
+        return false;
+    },
+
+    filterAttachments(attachments: Message["attachments"]) {
+        return attachments.filter(attachment => {
+            if (attachment.content_type !== "image/gif") return true;
+
+            const match = attachment.url.match(fakeNitroGifStickerRegex);
+            if (match) {
+                // There is no way to differentiate a regular gif attachment from a fake nitro animated sticker, so we check if the StickerStore contains the id of the fake sticker
+                if (StickerStore.getStickerById(match[1])) return false;
+            }
+
+            return true;
+        });
+    },
+
+    shouldKeepEmojiLink(link: any) {
+        return link.target && fakeNitroEmojiRegex.test(link.target);
     },
 
     hasPermissionToUseExternalEmojis(channelId: string) {
@@ -407,8 +602,17 @@ export default definePlugin({
         const scale = resolution / Math.max(width, height);
         ctx.scale(scale, scale);
 
-        let lastImg: HTMLImageElement | null = null;
-        for (const { left, top, width, height, disposeOp, img, delay } of frames) {
+        let previousFrameData: ImageData;
+
+        for (const frame of frames) {
+            const { left, top, width, height, img, delay, blendOp, disposeOp } = frame;
+
+            previousFrameData = ctx.getImageData(left, top, width, height);
+
+            if (blendOp === ApngBlendOp.SOURCE) {
+                ctx.clearRect(left, top, width, height);
+            }
+
             ctx.drawImage(img, left, top, width, height);
 
             const { data } = ctx.getImageData(0, 0, resolution, resolution);
@@ -419,19 +623,18 @@ export default definePlugin({
             gif.writeFrame(index, resolution, resolution, {
                 transparent: true,
                 palette,
-                delay,
+                delay
             });
 
             if (disposeOp === ApngDisposeOp.BACKGROUND) {
                 ctx.clearRect(left, top, width, height);
-            } else if (disposeOp === ApngDisposeOp.PREVIOUS && lastImg) {
-                ctx.drawImage(lastImg, left, top, width, height);
+            } else if (disposeOp === ApngDisposeOp.PREVIOUS) {
+                ctx.putImageData(previousFrameData, left, top);
             }
-
-            lastImg = img;
         }
 
         gif.finish();
+
         const file = new File([gif.bytesView()], `${stickerId}.gif`, { type: "image/gif" });
         promptToUpload([file], ChannelStore.getChannel(channelId), DRAFT_TYPE);
     },
@@ -442,13 +645,6 @@ export default definePlugin({
             return;
         }
 
-        const EmojiStore = findByPropsLazy("getCustomEmojiById");
-        const StickerStore = findByPropsLazy("getAllGuildStickers") as {
-            getPremiumPacks(): StickerPack[];
-            getAllGuildStickers(): Map<string, Sticker[]>;
-            getStickerById(id: string): Sticker | undefined;
-        };
-
         function getWordBoundary(origStr: string, offset: number) {
             return (!origStr[offset] || /\s/.test(origStr[offset])) ? "" : " ";
         }
@@ -469,7 +665,7 @@ export default definePlugin({
 
                 let link = this.getStickerLink(sticker.id);
                 if (sticker.format_type === 2) {
-                    this.sendAnimatedSticker(this.getStickerLink(sticker.id), sticker.id, channelId);
+                    this.sendAnimatedSticker(link, sticker.id, channelId);
                     return { cancel: true };
                 } else {
                     if ("pack_id" in sticker) {
@@ -483,7 +679,7 @@ export default definePlugin({
                     }
 
                     delete extra.stickerIds;
-                    messageObj.content += " " + link;
+                    messageObj.content += " " + link + `&name=${sticker.name}`;
                 }
             }
 
@@ -493,7 +689,10 @@ 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+/, `?size=${Settings.plugins.FakeNitro.emojiSize}`);
+                    const url = emoji.url.replace(/\?size=\d+/, "?" + new URLSearchParams({
+                        size: Settings.plugins.FakeNitro.emojiSize,
+                        name: encodeURIComponent(emoji.name)
+                    }));
                     messageObj.content = messageObj.content.replace(emojiString, (match, offset, origStr) => {
                         return `${getWordBoundary(origStr, offset - 1)}${url}${getWordBoundary(origStr, offset + match.length)}`;
                     });
@@ -513,7 +712,10 @@ export default definePlugin({
                 if (emoji == null || (emoji.guildId === guildId && !emoji.animated)) continue;
                 if (!emoji.require_colons) continue;
 
-                const url = emoji.url.replace(/\?size=\d+/, `?size=${Settings.plugins.FakeNitro.emojiSize}`);
+                const url = emoji.url.replace(/\?size=\d+/, "?" + new URLSearchParams({
+                    size: Settings.plugins.FakeNitro.emojiSize,
+                    name: encodeURIComponent(emoji.name)
+                }));
                 messageObj.content = messageObj.content.replace(emojiStr, (match, offset, origStr) => {
                     return `${getWordBoundary(origStr, offset - 1)}${url}${getWordBoundary(origStr, offset + match.length)}`;
                 });
diff --git a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
index d2adbb00b..905003717 100644
--- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
+++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
@@ -77,13 +77,8 @@ enum ChannelFlags {
     REQUIRE_TAG = 1 << 4
 }
 
-let EmojiComponent: ComponentType<any>;
 let ChannelBeginHeader: ComponentType<any>;
 
-export function setEmojiComponent(component: ComponentType<any>) {
-    EmojiComponent = component;
-}
-
 export function setChannelBeginHeaderComponent(component: ComponentType<any>) {
     ChannelBeginHeader = component;
 }
@@ -245,11 +240,10 @@ function HiddenChannelLockScreen({ channel }: { channel: ExtendedChannel; }) {
                 {defaultReactionEmoji != null &&
                     <div className="shc-lock-screen-default-emoji-container">
                         <Text variant="text-md/normal">Default reaction emoji:</Text>
-                        <EmojiComponent node={{
-                            type: defaultReactionEmoji.emojiName ? "emoji" : "customEmoji",
+                        {Parser.defaultRules[defaultReactionEmoji.emojiName ? "emoji" : "customEmoji"].react({
                             name: defaultReactionEmoji.emojiName ?? "",
                             emojiId: defaultReactionEmoji.emojiId
-                        }} />
+                        })}
                     </div>
                 }
                 {channel.hasFlag(ChannelFlags.REQUIRE_TAG) &&
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index e0c12455f..d69085daf 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -27,7 +27,7 @@ import { findByPropsLazy } from "@webpack";
 import { ChannelStore, PermissionStore, Tooltip } from "@webpack/common";
 import { Channel } from "discord-types/general";
 
-import HiddenChannelLockScreen, { setChannelBeginHeaderComponent, setEmojiComponent } from "./components/HiddenChannelLockScreen";
+import HiddenChannelLockScreen, { setChannelBeginHeaderComponent } from "./components/HiddenChannelLockScreen";
 
 const ChannelListClasses = findByPropsLazy("channelName", "subtitle", "modeMuted", "iconContainer");
 
@@ -234,14 +234,6 @@ export default definePlugin({
                 replace: ".filter(ch=>!$self.isHiddenChannel(ch))"
             }
         },
-        // Export the emoji component used on the lock screen
-        {
-            find: 'jumboable?"jumbo":"default"',
-            replacement: {
-                match: /jumboable\?"jumbo":"default",emojiId.+?}}\)},(?<=(\i)=function\(\i\){var \i=\i\.node.+?)/,
-                replace: (m, component) => `${m}shcEmojiComponentExport=($self.setEmojiComponent(${component}),void 0),`
-            }
-        },
         {
             find: ".Messages.ROLE_REQUIRED_SINGLE_USER_MESSAGE",
             replacement: [
@@ -403,7 +395,6 @@ export default definePlugin({
         }
     ],
 
-    setEmojiComponent,
     setChannelBeginHeaderComponent,
 
     isHiddenChannel(channel: Channel & { channelId?: string; }, checkConnect = false) {

From 38f3aac98d1098a70364366c056e0007f041d1cf Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 5 Apr 2023 00:07:17 -0300
Subject: [PATCH 121/147] Fix VolumeBooster and improve ContextMenuAPI patch
 (#793)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/apiContextMenu.ts               | 4 ++--
 src/plugins/volumeBooster.discordDesktop.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/apiContextMenu.ts b/src/plugins/apiContextMenu.ts
index cb85c4ff3..0eaca78bd 100644
--- a/src/plugins/apiContextMenu.ts
+++ b/src/plugins/apiContextMenu.ts
@@ -35,8 +35,8 @@ export default definePlugin({
             find: ".Menu,{",
             all: true,
             replacement: {
-                match: /(?<=\.jsxs?\)\(\i\.Menu,)\{/g,
-                replace: "{contextMenuApiArguments:typeof arguments!=='undefined'?arguments:[],"
+                match: /Menu,{(?<=\.jsxs?\)\(\i\.Menu,{)/g,
+                replace: "$&contextMenuApiArguments:typeof arguments!=='undefined'?arguments:[],"
             }
         }
     ]
diff --git a/src/plugins/volumeBooster.discordDesktop.ts b/src/plugins/volumeBooster.discordDesktop.ts
index b77af570a..ac112155d 100644
--- a/src/plugins/volumeBooster.discordDesktop.ts
+++ b/src/plugins/volumeBooster.discordDesktop.ts
@@ -56,7 +56,7 @@ export default definePlugin({
             find: "AudioContextSettingsMigrated",
             replacement: [
                 {
-                    match: /(?<=updateAsync\("audioContextSettings".{0,350}return \i\.volume=)\i(?=})/,
+                    match: /(?<=isLocalMute\(\i,\i\),volume:.+?volume:)\i(?=})/,
                     replace: "$&>200?200:$&"
                 },
                 {

From 9d742094cbb41dd42ce5cddbaf89e4fc2836f3a9 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 5 Apr 2023 17:44:03 -0300
Subject: [PATCH 122/147] ShowHiddenChannels: Use Discord's new overlay vars
 (#795)

* Fix SHC css for new Discord vars

* I'm dumb

* improvements to work with themes

---------

Co-authored-by: V <vendicated@riseup.net>
---
 .../components/HiddenChannelLockScreen.tsx               | 3 ++-
 src/plugins/showHiddenChannels/style.css                 | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
index 905003717..291a767d6 100644
--- a/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
+++ b/src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx
@@ -84,6 +84,7 @@ export function setChannelBeginHeaderComponent(component: ComponentType<any>) {
 }
 
 const ChatScrollClasses = findByPropsLazy("auto", "content", "scrollerBase");
+const ChatClasses = findByPropsLazy("chat", "content", "noChat", "chatContent");
 const TagComponent = LazyComponent(() => find(m => {
     if (typeof m !== "function") return false;
 
@@ -159,7 +160,7 @@ function HiddenChannelLockScreen({ channel }: { channel: ExtendedChannel; }) {
     }
 
     return (
-        <div className={ChatScrollClasses.auto + " " + "shc-lock-screen-outer-container"}>
+        <div className={ChatScrollClasses.auto + " " + ChatScrollClasses.customTheme + " " + ChatClasses.chatContent + " " + "shc-lock-screen-outer-container"}>
             <div className="shc-lock-screen-container">
                 <img className="shc-lock-screen-logo" src={HiddenChannelLogo} />
 
diff --git a/src/plugins/showHiddenChannels/style.css b/src/plugins/showHiddenChannels/style.css
index 01903ce9e..c90e8b73b 100644
--- a/src/plugins/showHiddenChannels/style.css
+++ b/src/plugins/showHiddenChannels/style.css
@@ -1,5 +1,4 @@
 .shc-lock-screen-outer-container {
-    background-color: var(--background-primary);
     overflow: hidden scroll;
     flex: 1 1 auto;
     height: 100%;
@@ -41,14 +40,14 @@
 
 .shc-lock-screen-topic-container {
     color: var(--text-normal);
-    background-color: var(--background-secondary);
+    background: var(--bg-overlay-3, var(--background-secondary));
     border-radius: 5px;
     padding: 10px;
     max-width: 70vw;
 }
 
 .shc-lock-screen-tags-container {
-    background-color: var(--background-secondary);
+    background: var(--bg-overlay-3, var(--background-secondary));
     border-radius: 5px;
     padding: 10px;
     max-width: 70vw;
@@ -84,7 +83,7 @@
 }
 
 .shc-lock-screen-default-emoji-container > [class^="emojiContainer"] {
-    background-color: var(--background-secondary);
+    background: var(--bg-overlay-3, var(--background-secondary));
     border-radius: 8px;
     padding: 3px 4px;
     margin-left: 5px;
@@ -94,7 +93,7 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-    background-color: var(--background-secondary);
+    background: var(--bg-overlay-3, var(--background-secondary));
     border-radius: 5px;
     padding: 10px;
     max-width: 70vw;

From 72ba83924cbf0b74df035f559e4144c6b82a5b1d Mon Sep 17 00:00:00 2001
From: Anubis <102488279+AnubisNekhet@users.noreply.github.com>
Date: Thu, 6 Apr 2023 02:15:03 +0530
Subject: [PATCH 123/147] SpotifyControls: add album art hover transition
 (#797)

---
 src/plugins/spotifyControls/spotifyStyles.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/spotifyControls/spotifyStyles.css b/src/plugins/spotifyControls/spotifyStyles.css
index 88e1d0aaf..008f34e26 100644
--- a/src/plugins/spotifyControls/spotifyStyles.css
+++ b/src/plugins/spotifyControls/spotifyStyles.css
@@ -140,6 +140,7 @@
 
 #vc-spotify-album-image {
     border-radius: 3px;
+    transition: filter 0.2s;
 }
 
 #vc-spotify-album-image:hover {

From 814302e2727e1925c8c5253e5efc4de2f4de0c2b Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Wed, 5 Apr 2023 22:45:14 +0200
Subject: [PATCH 124/147] Fix Badges (#801)

---
 src/plugins/apiBadges.tsx | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/plugins/apiBadges.tsx b/src/plugins/apiBadges.tsx
index 4e1ea2b23..975a7d662 100644
--- a/src/plugins/apiBadges.tsx
+++ b/src/plugins/apiBadges.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { BadgePosition, ProfileBadge } from "@api/Badges";
+import { BadgePosition, BadgeUserArgs, ProfileBadge } from "@api/Badges";
 import DonateButton from "@components/DonateButton";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
@@ -53,14 +53,14 @@ const DonorBadges = {} as Record<string, Pick<ProfileBadge, "image" | "tooltip">
 export default definePlugin({
     name: "BadgeAPI",
     description: "API to add badges to users.",
-    authors: [Devs.Megu],
+    authors: [Devs.Megu, Devs.Ven, Devs.TheSun],
     required: true,
     patches: [
         /* Patch the badges array */
         {
-            find: "PREMIUM_GUILD_SUBSCRIPTION_TOOLTIP.format({date:",
+            find: "Messages.PROFILE_USER_BADGES,",
             replacement: {
-                match: /&&((\w{1,3})\.push\({tooltip:\w{1,3}\.\w{1,3}\.Messages\.PREMIUM_GUILD_SUBSCRIPTION_TOOLTIP\.format.+?;)(?:return\s\w{1,3};?})/,
+                match: /&&((\i)\.push\({tooltip:\i\.\i\.Messages\.PREMIUM_GUILD_SUBSCRIPTION_TOOLTIP\.format.+?;)(?:return\s\i;?})/,
                 replace: (_, m, badgeArray) => `&&${m} return Vencord.Api.Badges.inject(${badgeArray}, arguments[0]);}`,
             }
         },
@@ -69,21 +69,23 @@ export default definePlugin({
             find: "Messages.PROFILE_USER_BADGES,role:",
             replacement: [
                 {
-                    match: /src:(\w{1,3})\[(\w{1,3})\.key\],/,
+                    match: /src:(\i)\[(\i)\.key\],/g,
                     // <img src={badge.image ?? imageMap[badge.key]} {...badge.props} />
                     replace: (_, imageMap, badge) => `src: ${badge}.image ?? ${imageMap}[${badge}.key], ...${badge}.props,`
                 },
                 {
-                    match: /spacing:(\d{1,2}),children:(.{1,40}(\i)\.jsx.+?(\i)\.onClick.+?\)})},/,
-                    // if the badge provides it's own component, render that instead of an image
-                    // the badge also includes info about the user that has it (type BadgeUserArgs), which is why it's passed as props
-                    replace: (_, s, origBadgeComponent, React, badge) =>
-                        `spacing:${s},children:${badge}.component ? () => (0,${React}.jsx)(${badge}.component, { ...${badge} }) : ${origBadgeComponent}},`
+                    match: /children:function(?<=(\i)\.(?:tooltip|description),spacing:\d.+?)/g,
+                    replace: "children:$1.component ? () => $self.renderBadgeComponent($1) : function"
                 }
             ]
         }
     ],
 
+    renderBadgeComponent: ErrorBoundary.wrap((badge: ProfileBadge & BadgeUserArgs) => {
+        const Component = badge.component!;
+        return <Component {...badge} />;
+    }, { noop: true }),
+
     async start() {
         Vencord.Api.Badges.addBadge(ContributorBadge);
         const badges = await fetch("https://gist.githubusercontent.com/Vendicated/51a3dd775f6920429ec6e9b735ca7f01/raw/badges.csv").then(r => r.text());

From c9fd4040127970901aa73535217cf1df0be5bf50 Mon Sep 17 00:00:00 2001
From: Dziurwa <54191536+Dziurwa14@users.noreply.github.com>
Date: Wed, 5 Apr 2023 23:01:11 +0200
Subject: [PATCH 125/147] Fix FriendInvites (#802)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/friendInvites.ts | 50 ++++++++++++++++++++++++++----------
 src/utils/constants.ts       |  4 +++
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/src/plugins/friendInvites.ts b/src/plugins/friendInvites.ts
index 2ad47d939..970994a7a 100644
--- a/src/plugins/friendInvites.ts
+++ b/src/plugins/friendInvites.ts
@@ -19,12 +19,16 @@
 import { ApplicationCommandInputType, sendBotMessage } from "@api/Commands";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { findByProps } from "@webpack";
+import { findByPropsLazy } from "@webpack";
+import { RestAPI, UserStore } from "@webpack/common";
+
+const FriendInvites = findByPropsLazy("createFriendInvite");
+const uuid = findByPropsLazy("v4", "v1");
 
 export default definePlugin({
     name: "FriendInvites",
     description: "Create and manage friend invite links via slash commands (/create friend invite, /view friend invites, /revoke friend invites).",
-    authors: [Devs.afn],
+    authors: [Devs.afn, Devs.Dziurwa],
     dependencies: ["CommandsAPI"],
     commands: [
         {
@@ -32,14 +36,31 @@ export default definePlugin({
             description: "Generates a friend invite link.",
             inputType: ApplicationCommandInputType.BOT,
             execute: async (_, ctx) => {
-                const friendInvites = findByProps("createFriendInvite");
-                const createInvite = await friendInvites.createFriendInvite();
+                if (!UserStore.getCurrentUser().phone)
+                    return sendBotMessage(ctx.channel.id, {
+                        content: "You need to have a phone number connected to your account to create a friend invite!"
+                    });
 
-                return void sendBotMessage(ctx.channel.id, {
+                const random = uuid.v4();
+                const invite = await RestAPI.post({
+                    url: "/friend-finder/find-friends",
+                    body: {
+                        modified_contacts: {
+                            [random]: [1, "", ""]
+                        }
+                    }
+                }).then(res =>
+                    FriendInvites.createFriendInvite({
+                        code: res.body.invite_suggestions[0][3],
+                        recipient_phone_number_or_email: random
+                    })
+                );
+
+                sendBotMessage(ctx.channel.id, {
                     content: `
-                        discord.gg/${createInvite.code} ·
-                        Expires: <t:${new Date(createInvite.expires_at).getTime() / 1000}:R> ·
-                        Max uses: \`${createInvite.max_uses}\`
+                        discord.gg/${invite.code} ·
+                        Expires: <t:${new Date(invite.expires_at).getTime() / 1000}:R> ·
+                        Max uses: \`${invite.max_uses}\`
                     `.trim().replace(/\s+/g, " ")
                 });
             },
@@ -49,15 +70,16 @@ export default definePlugin({
             description: "View a list of all generated friend invites.",
             inputType: ApplicationCommandInputType.BOT,
             execute: async (_, ctx) => {
-                const friendInvites = findByProps("createFriendInvite");
-                const invites = await friendInvites.getAllFriendInvites();
+                const invites = await FriendInvites.getAllFriendInvites();
                 const friendInviteList = invites.map(i =>
-                    `_discord.gg/${i.code}_ ·
+                    `
+                    _discord.gg/${i.code}_ ·
                     Expires: <t:${new Date(i.expires_at).getTime() / 1000}:R> ·
-                    Times used: \`${i.uses}/${i.max_uses}\``.trim().replace(/\s+/g, " ")
+                    Times used: \`${i.uses}/${i.max_uses}\`
+                    `.trim().replace(/\s+/g, " ")
                 );
 
-                return void sendBotMessage(ctx.channel.id, {
+                sendBotMessage(ctx.channel.id, {
                     content: friendInviteList.join("\n") || "You have no active friend invites!"
                 });
             },
@@ -67,7 +89,7 @@ export default definePlugin({
             description: "Revokes all generated friend invites.",
             inputType: ApplicationCommandInputType.BOT,
             execute: async (_, ctx) => {
-                await findByProps("createFriendInvite").revokeFriendInvites();
+                await FriendInvites.revokeFriendInvites();
 
                 return void sendBotMessage(ctx.channel.id, {
                     content: "All friend invites have been revoked."
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 7054db2b2..6814fc73c 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -241,5 +241,9 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     skyevg: {
         name: "skyevg",
         id: 1090310844283363348n
+    },
+    Dziurwa: {
+        name: "Dziurwa",
+        id: 787017887877169173n
     }
 });

From 2e6c5eacf7d6f3ec92da14fb91302f490962cad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90=E1=BB=97=20V=C4=83n=20Ho=C3=A0i=20Tu=C3=A2n?=
 <htuan03@gmail.com>
Date: Wed, 5 Apr 2023 18:02:53 -0700
Subject: [PATCH 126/147] BetterFolders: Fix Close all not working (#808)

---
 src/plugins/betterFolders/index.ts | 4 ++--
 src/utils/constants.ts             | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/plugins/betterFolders/index.ts b/src/plugins/betterFolders/index.ts
index 1b6ce4ec0..d0e61c0d2 100644
--- a/src/plugins/betterFolders/index.ts
+++ b/src/plugins/betterFolders/index.ts
@@ -67,7 +67,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "BetterFolders",
     description: "Shows server folders on dedicated sidebar and adds folder related improvements",
-    authors: [Devs.juby],
+    authors: [Devs.juby, Devs.AutumnVN],
     patches: [
         {
             find: '("guildsnav")',
@@ -122,7 +122,7 @@ export default definePlugin({
     settings,
 
     start() {
-        const getGuildFolder = (id: string) => GuildFolderStore.guildFolders.find(f => f.guildIds.includes(id));
+        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)
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 6814fc73c..365fd0fd2 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -245,5 +245,9 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     Dziurwa: {
         name: "Dziurwa",
         id: 787017887877169173n
+    },
+    AutumnVN: {
+        name: "AutumnVN",
+        id: 393694671383166998n
     }
 });

From df7357b3574bf87eba5caa41e637c73ba2158ee3 Mon Sep 17 00:00:00 2001
From: Syncx <47534062+Syncxv@users.noreply.github.com>
Date: Thu, 6 Apr 2023 11:06:11 +1000
Subject: [PATCH 127/147] feat(plugin): Image Zoom (#510)

Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Co-authored-by: Ven <vendicated@riseup.net>
---
 .../imageZoom/components/Magnifier.tsx        | 198 +++++++++++++++
 src/plugins/imageZoom/constants.ts            |  19 ++
 src/plugins/imageZoom/index.tsx               | 234 ++++++++++++++++++
 src/plugins/imageZoom/styles.css              |  31 +++
 src/plugins/imageZoom/utils/waitFor.ts        |  22 ++
 5 files changed, 504 insertions(+)
 create mode 100644 src/plugins/imageZoom/components/Magnifier.tsx
 create mode 100644 src/plugins/imageZoom/constants.ts
 create mode 100644 src/plugins/imageZoom/index.tsx
 create mode 100644 src/plugins/imageZoom/styles.css
 create mode 100644 src/plugins/imageZoom/utils/waitFor.ts

diff --git a/src/plugins/imageZoom/components/Magnifier.tsx b/src/plugins/imageZoom/components/Magnifier.tsx
new file mode 100644
index 000000000..e61c5602a
--- /dev/null
+++ b/src/plugins/imageZoom/components/Magnifier.tsx
@@ -0,0 +1,198 @@
+/*
+ * 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 { FluxDispatcher, React, useRef, useState } from "@webpack/common";
+
+import { ELEMENT_ID } from "../constants";
+import { settings } from "../index";
+import { waitFor } from "../utils/waitFor";
+
+interface Vec2 {
+    x: number,
+    y: number;
+}
+
+export interface MagnifierProps {
+    zoom: number;
+    size: number,
+    instance: any;
+}
+
+export const Magnifier: React.FC<MagnifierProps> = ({ instance, size: initialSize, zoom: initalZoom }) => {
+    const [ready, setReady] = useState(false);
+
+
+    const [lensPosition, setLensPosition] = useState<Vec2>({ x: 0, y: 0 });
+    const [imagePosition, setImagePosition] = useState<Vec2>({ x: 0, y: 0 });
+    const [opacity, setOpacity] = useState(0);
+
+    const isShiftDown = useRef(false);
+
+    const zoom = useRef(initalZoom);
+    const size = useRef(initialSize);
+
+    const element = useRef<HTMLDivElement | null>(null);
+    const currentVideoElementRef = useRef<HTMLVideoElement | null>(null);
+    const originalVideoElementRef = useRef<HTMLVideoElement | null>(null);
+    const imageRef = useRef<HTMLImageElement | null>(null);
+
+    // since we accessing document im gonna use useLayoutEffect
+    React.useLayoutEffect(() => {
+        const onKeyDown = (e: KeyboardEvent) => {
+            if (e.key === "Shift") {
+                isShiftDown.current = true;
+            }
+        };
+        const onKeyUp = (e: KeyboardEvent) => {
+            if (e.key === "Shift") {
+                isShiftDown.current = false;
+            }
+        };
+        const syncVideos = () => {
+            currentVideoElementRef.current!.currentTime = originalVideoElementRef.current!.currentTime;
+        };
+
+        const updateMousePosition = (e: MouseEvent) => {
+            if (instance.state.mouseOver && instance.state.mouseDown) {
+                const offset = size.current / 2;
+                const pos = { x: e.pageX, y: e.pageY };
+                const x = -((pos.x - element.current!.getBoundingClientRect().left) * zoom.current - offset);
+                const y = -((pos.y - element.current!.getBoundingClientRect().top) * zoom.current - offset);
+                setLensPosition({ x: e.x - offset, y: e.y - offset });
+                setImagePosition({ x, y });
+                setOpacity(1);
+            } else {
+                setOpacity(0);
+            }
+
+        };
+
+        const onMouseDown = (e: MouseEvent) => {
+            if (instance.state.mouseOver && e.button === 0 /* left click */) {
+                zoom.current = settings.store.zoom;
+                size.current = settings.store.size;
+
+                // close context menu if open
+                if (document.getElementById("image-context")) {
+                    FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" });
+                }
+
+                updateMousePosition(e);
+                setOpacity(1);
+            }
+        };
+
+        const onMouseUp = () => {
+            setOpacity(0);
+            if (settings.store.saveZoomValues) {
+                settings.store.zoom = zoom.current;
+                settings.store.size = size.current;
+            }
+        };
+
+        const onWheel = async (e: WheelEvent) => {
+            if (instance.state.mouseOver && instance.state.mouseDown && !isShiftDown.current) {
+                const val = zoom.current + ((e.deltaY / 100) * (settings.store.invertScroll ? -1 : 1)) * settings.store.zoomSpeed;
+                zoom.current = val <= 1 ? 1 : val;
+                updateMousePosition(e);
+            }
+            if (instance.state.mouseOver && instance.state.mouseDown && isShiftDown.current) {
+                const val = size.current + (e.deltaY * (settings.store.invertScroll ? -1 : 1)) * settings.store.zoomSpeed;
+                size.current = val <= 50 ? 50 : val;
+                updateMousePosition(e);
+            }
+        };
+
+        waitFor(() => instance.state.readyState === "READY", () => {
+            const elem = document.getElementById(ELEMENT_ID) as HTMLDivElement;
+            element.current = elem;
+            elem.firstElementChild!.setAttribute("draggable", "false");
+            if (instance.props.animated) {
+                originalVideoElementRef.current = elem!.querySelector("video")!;
+                originalVideoElementRef.current.addEventListener("timeupdate", syncVideos);
+                setReady(true);
+            } else {
+                setReady(true);
+            }
+        });
+        document.addEventListener("keydown", onKeyDown);
+        document.addEventListener("keyup", onKeyUp);
+        document.addEventListener("mousemove", updateMousePosition);
+        document.addEventListener("mousedown", onMouseDown);
+        document.addEventListener("mouseup", onMouseUp);
+        document.addEventListener("wheel", onWheel);
+        return () => {
+            document.removeEventListener("keydown", onKeyDown);
+            document.removeEventListener("keyup", onKeyUp);
+            document.removeEventListener("mousemove", updateMousePosition);
+            document.removeEventListener("mousedown", onMouseDown);
+            document.removeEventListener("mouseup", onMouseUp);
+            document.removeEventListener("wheel", onWheel);
+
+            if (settings.store.saveZoomValues) {
+                settings.store.zoom = zoom.current;
+                settings.store.size = size.current;
+            }
+        };
+    }, []);
+
+    if (!ready) return null;
+
+    const box = element.current!.getBoundingClientRect();
+
+    return (
+        <div
+            className="lens"
+            style={{
+                opacity,
+                width: size.current + "px",
+                height: size.current + "px",
+                transform: `translate(${lensPosition.x}px, ${lensPosition.y}px)`,
+            }}
+        >
+            {instance.props.animated ?
+                (
+                    <video
+                        ref={currentVideoElementRef}
+                        style={{
+                            position: "absolute",
+                            left: `${imagePosition.x}px`,
+                            top: `${imagePosition.y}px`
+                        }}
+                        width={`${box.width * zoom.current}px`}
+                        height={`${box.height * zoom.current}px`}
+                        poster={instance.props.src}
+                        src={originalVideoElementRef.current?.src ?? instance.props.src}
+                        autoPlay
+                        loop
+                    />
+                ) : (
+                    <img
+                        ref={imageRef}
+                        style={{
+                            position: "absolute",
+                            transform: `translate(${imagePosition.x}px, ${imagePosition.y}px)`
+                        }}
+                        width={`${box.width * zoom.current}px`}
+                        height={`${box.height * zoom.current}px`}
+                        src={instance.props.src} alt=""
+                    />
+                )}
+        </div>
+    );
+};
diff --git a/src/plugins/imageZoom/constants.ts b/src/plugins/imageZoom/constants.ts
new file mode 100644
index 000000000..cfde60cf5
--- /dev/null
+++ b/src/plugins/imageZoom/constants.ts
@@ -0,0 +1,19 @@
+/*
+ * 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 ELEMENT_ID = "magnify-modal";
diff --git a/src/plugins/imageZoom/index.tsx b/src/plugins/imageZoom/index.tsx
new file mode 100644
index 000000000..7a1887b91
--- /dev/null
+++ b/src/plugins/imageZoom/index.tsx
@@ -0,0 +1,234 @@
+/*
+ * 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 { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
+import { definePluginSettings } from "@api/settings";
+import { makeRange } from "@components/PluginSettings/components";
+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";
+
+import { Magnifier, MagnifierProps } from "./components/Magnifier";
+import { ELEMENT_ID } from "./constants";
+
+export const settings = definePluginSettings({
+    saveZoomValues: {
+        type: OptionType.BOOLEAN,
+        description: "Whether to save zoom and lens size values",
+        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",
+        default: true,
+    },
+
+    zoom: {
+        description: "Zoom of the lens",
+        type: OptionType.SLIDER,
+        markers: makeRange(1, 50, 4),
+        default: 2,
+        stickToMarkers: false,
+    },
+    size: {
+        description: "Radius / Size of the lens",
+        type: OptionType.SLIDER,
+        markers: makeRange(50, 1000, 50),
+        default: 100,
+        stickToMarkers: false,
+    },
+
+    zoomSpeed: {
+        description: "How fast the zoom / lens size changes",
+        type: OptionType.SLIDER,
+        markers: makeRange(0.1, 5, 0.2),
+        default: 0.5,
+        stickToMarkers: false,
+    },
+});
+
+
+const imageContextMenuPatch: NavContextMenuPatchCallback = (children, _) => {
+    if (!children.some(child => child?.props?.id === "image-zoom")) {
+        children.push(
+            <Menu.MenuGroup id="image-zoom">
+                {/* thanks SpotifyControls */}
+                <Menu.MenuControlItem
+                    id="zoom"
+                    label="Zoom"
+                    control={(props, ref) => (
+                        <Menu.MenuSliderControl
+                            ref={ref}
+                            {...props}
+                            minValue={1}
+                            maxValue={50}
+                            value={settings.store.zoom}
+                            onChange={debounce((value: number) => settings.store.zoom = value, 100)}
+                        />
+                    )}
+                />
+                <Menu.MenuControlItem
+                    id="size"
+                    label="Lens Size"
+                    control={(props, ref) => (
+                        <Menu.MenuSliderControl
+                            ref={ref}
+                            {...props}
+                            minValue={50}
+                            maxValue={1000}
+                            value={settings.store.size}
+                            onChange={debounce((value: number) => settings.store.size = value, 100)}
+                        />
+                    )}
+                />
+                <Menu.MenuControlItem
+                    id="zoom-speed"
+                    label="Zoom Speed"
+                    control={(props, ref) => (
+                        <Menu.MenuSliderControl
+                            ref={ref}
+                            {...props}
+                            minValue={0.1}
+                            maxValue={5}
+                            value={settings.store.zoomSpeed}
+                            onChange={debounce((value: number) => settings.store.zoomSpeed = value, 100)}
+                            renderValue={(value: number) => `${value.toFixed(3)}x`}
+                        />
+                    )}
+                />
+            </Menu.MenuGroup>
+        );
+    }
+};
+
+export default definePlugin({
+    name: "ImageZoom",
+    description: "Lets you zoom in to images and gifs. Use scroll wheel to zoom in and shift + scroll wheel to increase lens radius / size",
+    authors: [Devs.Aria],
+    patches: [
+        {
+            find: '"renderLinkComponent","maxWidth"',
+            replacement: {
+                match: /(return\(.{1,100}\(\)\.wrapper.{1,100})(src)/,
+                replace: `$1id: '${ELEMENT_ID}',$2`
+            }
+        },
+
+        {
+            find: "handleImageLoad=",
+            replacement: [
+                {
+                    match: /(render=function\(\){.{1,500}limitResponsiveWidth.{1,600})onMouseEnter:/,
+                    replace: "$1...$self.makeProps(this),onMouseEnter:"
+                },
+
+                {
+                    match: /componentDidMount=function\(\){/,
+                    replace: "$&$self.renderMagnifier(this);",
+                },
+
+                {
+                    match: /componentWillUnmount=function\(\){/,
+                    replace: "$&$self.unMountMagnifier();"
+                }
+            ]
+        },
+
+        {
+            find: ".carouselModal,",
+            replacement: {
+                match: /onClick:(\i),/,
+                replace: "onClick:$self.settings.store.preventCarouselFromClosingOnClick ? () => {} : $1,"
+            }
+        }
+    ],
+
+    settings,
+
+    // to stop from rendering twice /shrug
+    currentMagnifierElement: null as React.FunctionComponentElement<MagnifierProps & JSX.IntrinsicAttributes> | null,
+    element: null as HTMLDivElement | null,
+
+    Magnifier,
+    root: null as Root | null,
+    makeProps(instance) {
+        return {
+            onMouseOver: () => this.onMouseOver(instance),
+            onMouseOut: () => this.onMouseOut(instance),
+            onMouseDown: (e: React.MouseEvent) => this.onMouseDown(e, instance),
+            onMouseUp: () => this.onMouseUp(instance),
+            id: instance.props.id,
+        };
+    },
+
+    renderMagnifier(instance) {
+        if (instance.props.id === ELEMENT_ID) {
+            if (!this.currentMagnifierElement) {
+                this.currentMagnifierElement = <Magnifier size={settings.store.size} zoom={settings.store.zoom} instance={instance} />;
+                this.root = ReactDOM.createRoot(this.element!);
+                this.root.render(this.currentMagnifierElement);
+            }
+        }
+    },
+
+    unMountMagnifier() {
+        this.root?.unmount();
+        this.currentMagnifierElement = null;
+        this.root = null;
+    },
+
+    onMouseOver(instance) {
+        instance.setState((state: any) => ({ ...state, mouseOver: true }));
+    },
+    onMouseOut(instance) {
+        instance.setState((state: any) => ({ ...state, mouseOver: false }));
+    },
+    onMouseDown(e: React.MouseEvent, instance) {
+        if (e.button === 0 /* left */)
+            instance.setState((state: any) => ({ ...state, mouseDown: true }));
+    },
+    onMouseUp(instance) {
+        instance.setState((state: any) => ({ ...state, mouseDown: false }));
+    },
+
+    start() {
+        addContextMenuPatch("image-context", imageContextMenuPatch);
+        this.element = document.createElement("div");
+        this.element.classList.add("MagnifierContainer");
+        document.body.appendChild(this.element);
+    },
+
+    stop() {
+        // 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/imageZoom/styles.css b/src/plugins/imageZoom/styles.css
new file mode 100644
index 000000000..103ac548b
--- /dev/null
+++ b/src/plugins/imageZoom/styles.css
@@ -0,0 +1,31 @@
+.lens {
+    position: absolute;
+    inset: 0;
+    z-index: 9999;
+    border: 2px solid grey;
+    border-radius: 50%;
+    overflow: hidden;
+    cursor: none;
+    box-shadow: inset 0 0 10px 2px grey;
+    filter: drop-shadow(0 0 2px grey);
+    pointer-events: none;
+}
+
+.zoom img {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+}
+
+/* make the carousel take up less space so we can click the backdrop and exit out of it */
+[class^="focusLock"] > [class^="carouselModal"] {
+    height: fit-content;
+    box-shadow: none;
+}
+
+[class^="focusLock"] > [class^="carouselModal"] > div {
+    height: fit-content;
+    top: 50%;
+    transform: translateY(-50%);
+}
diff --git a/src/plugins/imageZoom/utils/waitFor.ts b/src/plugins/imageZoom/utils/waitFor.ts
new file mode 100644
index 000000000..120aec052
--- /dev/null
+++ b/src/plugins/imageZoom/utils/waitFor.ts
@@ -0,0 +1,22 @@
+/*
+ * 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 function waitFor(condition: () => boolean, cb: () => void) {
+    if (condition()) cb();
+    else requestAnimationFrame(() => waitFor(condition, cb));
+}

From e261c935639896ad8655f99f835f376cc5028dcc Mon Sep 17 00:00:00 2001
From: LordElias <55048695+LordEliasTM@users.noreply.github.com>
Date: Thu, 6 Apr 2023 03:22:54 +0200
Subject: [PATCH 128/147] feat(plugin): User Voice Show (#694)

Co-authored-by: V <vendicated@riseup.net>
Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
---
 .../components/VoiceChannelSection.css        |  18 +++
 .../components/VoiceChannelSection.tsx        |  61 ++++++++++
 src/plugins/userVoiceShow/index.tsx           | 105 ++++++++++++++++++
 src/utils/constants.ts                        |   4 +
 4 files changed, 188 insertions(+)
 create mode 100644 src/plugins/userVoiceShow/components/VoiceChannelSection.css
 create mode 100644 src/plugins/userVoiceShow/components/VoiceChannelSection.tsx
 create mode 100644 src/plugins/userVoiceShow/index.tsx

diff --git a/src/plugins/userVoiceShow/components/VoiceChannelSection.css b/src/plugins/userVoiceShow/components/VoiceChannelSection.css
new file mode 100644
index 000000000..c0bc49d06
--- /dev/null
+++ b/src/plugins/userVoiceShow/components/VoiceChannelSection.css
@@ -0,0 +1,18 @@
+.vc-uvs-button > div {
+    white-space: normal !important;
+}
+
+.vc-uvs-button {
+    width: 100%;
+    margin: auto;
+    height: unset;
+}
+
+.vc-uvs-header {
+    color: var(--header-primary);
+    margin-bottom: 6px;
+}
+
+.vc-uvs-modal-margin > [class^="section"] {
+    margin: 0 12px;
+}
diff --git a/src/plugins/userVoiceShow/components/VoiceChannelSection.tsx b/src/plugins/userVoiceShow/components/VoiceChannelSection.tsx
new file mode 100644
index 000000000..b429f0571
--- /dev/null
+++ b/src/plugins/userVoiceShow/components/VoiceChannelSection.tsx
@@ -0,0 +1,61 @@
+/*
+ * 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 "./VoiceChannelSection.css";
+
+import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { Button, Forms, PermissionStore, Toasts } from "@webpack/common";
+import { Channel } from "discord-types/general";
+
+const ChannelActions = findByPropsLazy("selectChannel", "selectVoiceChannel");
+const UserPopoutSection = findByCodeLazy(".lastSection", ".children");
+
+const CONNECT = 1n << 20n;
+
+interface VoiceChannelFieldProps {
+    channel: Channel;
+    label: string;
+    showHeader: boolean;
+}
+
+export const VoiceChannelSection = ({ channel, label, showHeader }: VoiceChannelFieldProps) => (
+    <UserPopoutSection>
+        {showHeader && <Forms.FormTitle className="vc-uvs-header">In a voice channel</Forms.FormTitle>}
+        <Button
+            className="vc-uvs-button"
+            color={Button.Colors.TRANSPARENT}
+            size={Button.Sizes.SMALL}
+
+            onClick={() => {
+                if (PermissionStore.can(CONNECT, channel))
+                    ChannelActions.selectVoiceChannel(channel.id);
+                else
+                    Toasts.show({
+                        message: "Insufficient permissions to enter the channel.",
+                        id: "user-voice-show-insufficient-permissions",
+                        type: Toasts.Type.FAILURE,
+                        options: {
+                            position: Toasts.Position.BOTTOM,
+                        }
+                    });
+            }}
+        >
+            {label}
+        </Button>
+    </UserPopoutSection>
+);
diff --git a/src/plugins/userVoiceShow/index.tsx b/src/plugins/userVoiceShow/index.tsx
new file mode 100644
index 000000000..d0252c1fd
--- /dev/null
+++ b/src/plugins/userVoiceShow/index.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 { definePluginSettings } from "@api/settings";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { findStoreLazy } from "@webpack";
+import { ChannelStore, GuildStore } from "@webpack/common";
+import { User } from "discord-types/general";
+
+import { VoiceChannelSection } from "./components/VoiceChannelSection";
+
+const VoiceStateStore = findStoreLazy("VoiceStateStore");
+
+const settings = definePluginSettings({
+    showInUserProfileModal: {
+        type: OptionType.BOOLEAN,
+        description: "Show a user's voice channel in their profile modal",
+        default: true,
+    },
+    showVoiceChannelSectionHeader: {
+        type: OptionType.BOOLEAN,
+        description: 'Whether to show "IN A VOICE CHANNEL" above the join button',
+        default: true,
+    }
+});
+
+interface UserProps {
+    user: User;
+}
+
+const VoiceChannelField = ErrorBoundary.wrap(({ user }: UserProps) => {
+    const { channelId } = VoiceStateStore.getVoiceStateForUser(user.id) ?? {};
+    if (!channelId) return null;
+
+    const channel = ChannelStore.getChannel(channelId);
+    const guild = GuildStore.getGuild(channel.guild_id);
+
+    if (!guild) return null; // When in DM call
+
+    const result = `${guild.name} | ${channel.name}`;
+
+    return (
+        <VoiceChannelSection
+            channel={channel}
+            label={result}
+            showHeader={settings.store.showVoiceChannelSectionHeader}
+        />
+    );
+});
+
+export default definePlugin({
+    name: "UserVoiceShow",
+    description: "Shows whether a User is currently in a voice channel somewhere in their profile",
+    authors: [Devs.LordElias],
+    settings,
+
+    patchModal({ user }: UserProps) {
+        if (!settings.store.showInUserProfileModal)
+            return null;
+
+        return (
+            <div className="vc-uvs-modal-margin">
+                <VoiceChannelField user={user} />
+            </div>
+        );
+    },
+
+    patchPopout: ({ user }: UserProps) => <VoiceChannelField user={user} />,
+
+    patches: [
+        {
+            find: ".showCopiableUsername",
+            replacement: {
+                match: /\(0,\w\.jsx\)\(\w{2},{user:\w,setNote/,
+                // paste my fancy custom button above the message field
+                replace: "$self.patchPopout(arguments[0]),$&",
+            }
+        },
+        {
+            find: ".USER_PROFILE_MODAL",
+            replacement: {
+                match: /,{user:\w{1,2}}\)(?!;case)/,
+                // paste my fancy custom button below the username
+                replace: "$&,$self.patchModal(arguments[0])",
+            }
+        }
+    ],
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 365fd0fd2..edbd76d3d 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -226,6 +226,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "TheKodeToad",
         id: 706152404072267788n
     },
+    LordElias: {
+        name: "LordElias",
+        id: 319460781567639554n
+    },
     juby: {
         name: "Juby210",
         id: 324622488644616195n

From e40ebacc5bfd4b6a57dc75b0605e7aac3c653165 Mon Sep 17 00:00:00 2001
From: ActuallyTheSun <78964224+ActuallyTheSun@users.noreply.github.com>
Date: Thu, 6 Apr 2023 04:28:38 +0300
Subject: [PATCH 129/147] feat(plugin): WebhookTags -> MoreUserTags (#378)

Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/moreUserTags.ts | 275 ++++++++++++++++++++++++++++++++++++
 src/plugins/webhookTags.ts  |  51 -------
 2 files changed, 275 insertions(+), 51 deletions(-)
 create mode 100644 src/plugins/moreUserTags.ts
 delete mode 100644 src/plugins/webhookTags.ts

diff --git a/src/plugins/moreUserTags.ts b/src/plugins/moreUserTags.ts
new file mode 100644
index 000000000..ba2a9b762
--- /dev/null
+++ b/src/plugins/moreUserTags.ts
@@ -0,0 +1,275 @@
+/*
+ * 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 { definePluginSettings, migratePluginSettings } from "@api/settings";
+import { Devs } from "@utils/constants";
+import { proxyLazy } from "@utils/proxyLazy.js";
+import definePlugin, { OptionType } from "@utils/types";
+import { find, findByPropsLazy } from "@webpack";
+import { ChannelStore, GuildStore } from "@webpack/common";
+import { Channel, Message, User } from "discord-types/general";
+
+type PermissionName = "CREATE_INSTANT_INVITE" | "KICK_MEMBERS" | "BAN_MEMBERS" | "ADMINISTRATOR" | "MANAGE_CHANNELS" | "MANAGE_GUILD" | "CHANGE_NICKNAME" | "MANAGE_NICKNAMES" | "MANAGE_ROLES" | "MANAGE_WEBHOOKS" | "MANAGE_GUILD_EXPRESSIONS" | "CREATE_GUILD_EXPRESSIONS" | "VIEW_AUDIT_LOG" | "VIEW_CHANNEL" | "VIEW_GUILD_ANALYTICS" | "VIEW_CREATOR_MONETIZATION_ANALYTICS" | "MODERATE_MEMBERS" | "SEND_MESSAGES" | "SEND_TTS_MESSAGES" | "MANAGE_MESSAGES" | "EMBED_LINKS" | "ATTACH_FILES" | "READ_MESSAGE_HISTORY" | "MENTION_EVERYONE" | "USE_EXTERNAL_EMOJIS" | "ADD_REACTIONS" | "USE_APPLICATION_COMMANDS" | "MANAGE_THREADS" | "CREATE_PUBLIC_THREADS" | "CREATE_PRIVATE_THREADS" | "USE_EXTERNAL_STICKERS" | "SEND_MESSAGES_IN_THREADS" | "CONNECT" | "SPEAK" | "MUTE_MEMBERS" | "DEAFEN_MEMBERS" | "MOVE_MEMBERS" | "USE_VAD" | "PRIORITY_SPEAKER" | "STREAM" | "USE_EMBEDDED_ACTIVITIES" | "USE_SOUNDBOARD" | "USE_EXTERNAL_SOUNDS" | "REQUEST_TO_SPEAK" | "MANAGE_EVENTS" | "CREATE_EVENTS";
+
+interface Tag {
+    // name used for identifying, must be alphanumeric + underscores
+    name: string;
+    // name shown on the tag itself, can be anything probably; automatically uppercase'd
+    displayName: string;
+    description: string;
+    permissions?: PermissionName[];
+    condition?(message: Message | null, user: User, channel: Channel): boolean;
+}
+
+const CLYDE_ID = "1081004946872352958";
+
+// PermissionStore.computePermissions is not the same function and doesn't work here
+const PermissionUtil = findByPropsLazy("computePermissions", "canEveryoneRole") as {
+    computePermissions({ ...args }): bigint;
+};
+
+const Permissions = findByPropsLazy("SEND_MESSAGES", "VIEW_CREATOR_MONETIZATION_ANALYTICS") as Record<PermissionName, bigint>;
+const Tags = proxyLazy(() => find(m => m.Types?.[0] === "BOT").Types) as Record<string, number>;
+
+const isWebhook = (message: Message, user: User) => !!message?.webhookId && user.isNonUserBot();
+
+const tags: Tag[] = [
+    {
+        name: "WEBHOOK",
+        displayName: "Webhook",
+        description: "Messages sent by webhooks",
+        condition: isWebhook
+    }, {
+        name: "OWNER",
+        displayName: "Owner",
+        description: "Owns the server",
+        condition: (_, user, channel) => GuildStore.getGuild(channel?.guild_id)?.ownerId === user.id
+    }, {
+        name: "ADMINISTRATOR",
+        displayName: "Admin",
+        description: "Has the administrator permission",
+        permissions: ["ADMINISTRATOR"]
+    }, {
+        name: "MODERATOR_STAFF",
+        displayName: "Staff",
+        description: "Can manage the server, channels or roles",
+        permissions: ["MANAGE_GUILD", "MANAGE_CHANNELS", "MANAGE_ROLES"]
+    }, {
+        name: "MODERATOR",
+        displayName: "Mod",
+        description: "Can manage messages or kick/ban people",
+        permissions: ["MANAGE_MESSAGES", "KICK_MEMBERS", "BAN_MEMBERS"]
+    }, {
+        name: "VOICE_MODERATOR",
+        displayName: "VC Mod",
+        description: "Can manage voice chats",
+        permissions: ["MOVE_MEMBERS", "MUTE_MEMBERS", "DEAFEN_MEMBERS"]
+    }
+];
+
+const settings = definePluginSettings({
+    dontShowBotTag: {
+        description: "Don't show [BOT] text for bots with other tags (verified bots will still have checkmark)",
+        type: OptionType.BOOLEAN
+    },
+    ...Object.fromEntries(tags.map(({ name, displayName, description }) => [
+        `visibility_${name}`, {
+            description: `Show ${displayName} tags (${description})`,
+            type: OptionType.SELECT,
+            options: [
+                {
+                    label: "Always",
+                    value: "always",
+                    default: true
+                }, {
+                    label: "Only in chat",
+                    value: "chat"
+                }, {
+                    label: "Only in member list and profiles",
+                    value: "not-chat"
+                }, {
+                    label: "Never",
+                    value: "never"
+                }
+            ]
+        }
+    ]))
+});
+
+migratePluginSettings("MoreUserTags", "Webhook Tags");
+export default definePlugin({
+    name: "MoreUserTags",
+    description: "Adds tags for webhooks and moderative roles (owner, admin, etc.)",
+    authors: [Devs.Cyn, Devs.TheSun],
+    settings,
+    patches: [
+        // add tags to the tag list
+        {
+            find: '.BOT=0]="BOT"',
+            replacement: [
+                // add tags to the exported tags list (the Tags variable here)
+                {
+                    match: /(\i)\[.\.BOT=0\]="BOT";/,
+                    replace: "$&$1=$self.addTagVariants($1);"
+                },
+                // make the tag show the right text
+                {
+                    match: /(switch\((\i)\){.+?)case (\i)\.BOT:default:(\i)=(\i\.\i\.Messages)\.BOT_TAG_BOT/,
+                    replace: (_, origSwitch, variant, tags, displayedText, strings) =>
+                        `${origSwitch}default:{${displayedText} = $self.getTagText(${tags}[${variant}], ${strings})}`
+                },
+                // show OP tags correctly
+                {
+                    match: /(\i)=(\i)===\i\.ORIGINAL_POSTER/,
+                    replace: "$1=$self.isOPTag($2)"
+                }
+            ],
+        },
+        // in messages
+        {
+            find: ".Types.ORIGINAL_POSTER",
+            replacement: {
+                match: /return null==(\i)\?null:\(0,/,
+                replace: "$1=$self.getTag({...arguments[0],origType:$1,location:'chat'});$&"
+            }
+        },
+        // in the member list
+        {
+            find: ".renderBot=function(){",
+            replacement: {
+                match: /this.props.user;return null!=(\i)&&.{0,10}\?(.{0,50})\.botTag/,
+                replace: "this.props.user;var type=$self.getTag({...this.props,origType:$1.bot?0:null,location:'not-chat'});\
+return type!==null?$2.botTag,type"
+            }
+        },
+        // pass channel id down props to be used in profiles
+        {
+            find: ".hasAvatarForGuild(null==",
+            replacement: {
+                match: /\.usernameSection,user/,
+                replace: ".usernameSection,moreTags_channelId:arguments[0].channelId,user"
+            }
+        },
+        {
+            find: 'copyMetaData:"User Tag"',
+            replacement: {
+                match: /discriminatorClass:(.{1,100}),botClass:/,
+                replace: "discriminatorClass:$1,moreTags_channelId:arguments[0].moreTags_channelId,botClass:"
+            }
+        },
+        // in profiles
+        {
+            find: ",botType:",
+            replacement: {
+                match: /,botType:(\i\((\i)\)),/g,
+                replace: ",botType:$self.getTag({user:$2,channelId:arguments[0].moreTags_channelId,origType:$1,location:'not-chat'}),"
+            }
+        },
+    ],
+
+    getPermissions(user: User, channel: Channel): string[] {
+        const guild = GuildStore.getGuild(channel?.guild_id);
+        if (!guild) return [];
+
+        const permissions = PermissionUtil.computePermissions({ user, context: guild, overwrites: channel.permissionOverwrites });
+        return Object.entries(Permissions)
+            .map(([perm, permInt]) =>
+                permissions & permInt ? perm : ""
+            )
+            .filter(Boolean);
+    },
+
+    addTagVariants(val: any /* i cant think of a good name */) {
+        let i = 100;
+        tags.forEach(({ name }) => {
+            val[name] = ++i;
+            val[i] = name;
+            val[`${name}-BOT`] = ++i;
+            val[i] = `${name}-BOT`;
+            val[`${name}-OP`] = ++i;
+            val[i] = `${name}-OP`;
+        });
+        return val;
+    },
+
+    isOPTag: (tag: number) => tag === Tags.ORIGINAL_POSTER || tags.some(t => tag === Tags[`${t.name}-OP`]),
+
+    getTagText(passedTagName: string, strings: Record<string, string>) {
+        if (!passedTagName) return "BOT";
+        const [tagName, variant] = passedTagName.split("-");
+        const tag = tags.find(({ name }) => tagName === name);
+        if (!tag) return "BOT";
+        switch (variant) {
+            case "OP":
+                return `${strings.BOT_TAG_FORUM_ORIGINAL_POSTER} • ${tag.displayName}`;
+            case "BOT":
+                return `${strings.BOT_TAG_BOT} • ${tag.displayName}`;
+            default:
+                return tag.displayName;
+        }
+    },
+
+    getTag({
+        message, user, channelId, origType, location, channel
+    }: {
+        message?: Message,
+        user: User,
+        channel?: Channel & { isForumPost(): boolean; },
+        channelId?: string;
+        origType?: number;
+        location: string;
+    }): number | null {
+        if (location === "chat" && user.id === "1")
+            return Tags.OFFICIAL;
+        if (user.id === CLYDE_ID)
+            return Tags.AI;
+
+        let type = typeof origType === "number" ? origType : null;
+
+        channel ??= ChannelStore.getChannel(channelId!) as any;
+        if (!channel) return type;
+
+        const settings = this.settings.store;
+        const perms = this.getPermissions(user, channel);
+
+        for (const tag of tags) {
+            switch (settings[`visibility_${tag.name}`]) {
+                case "always":
+                case location:
+                    break;
+                default:
+                    continue;
+            }
+
+            if (
+                tag.permissions?.some(perm => perms.includes(perm)) ||
+                (tag.condition?.(message!, user, channel))
+            ) {
+                if (channel.isForumPost() && channel.ownerId === user.id)
+                    type = Tags[`${tag.name}-OP`];
+                else if (user.bot && !isWebhook(message!, user) && !settings.dontShowBotTag)
+                    type = Tags[`${tag.name}-BOT`];
+                else
+                    type = Tags[tag.name];
+                break;
+            }
+        }
+
+        return type;
+    }
+});
diff --git a/src/plugins/webhookTags.ts b/src/plugins/webhookTags.ts
deleted file mode 100644
index 96cbf3854..000000000
--- a/src/plugins/webhookTags.ts
+++ /dev/null
@@ -1,51 +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: "Webhook Tags",
-    description: "Changes the bot tag to say webhook for webhooks",
-    authors: [Devs.Cyn],
-    patches: [
-        {
-            find: '.BOT=0]="BOT"',
-            replacement: [
-                {
-                    match: /(.)\[.\.BOT=0\]="BOT";/,
-                    replace: (orig, types) =>
-                        `${types}[${types}.WEBHOOK=99]="WEBHOOK";${orig}`,
-                },
-                {
-                    match: /case (.)\.BOT:default:(.)=/,
-                    replace: (orig, types, text) =>
-                        `case ${types}.WEBHOOK:${text}="WEBHOOK";break;${orig}`,
-                },
-            ],
-        },
-        {
-            find: ".Types.ORIGINAL_POSTER",
-            replacement: {
-                match: /return null==(.)\?null:\(0,.{1,3}\.jsxs?\)\((.{1,3}\.\i)/,
-                replace: (orig, type, BotTag) =>
-                    `if(arguments[0].message.webhookId&&arguments[0].user.isNonUserBot()){${type}=${BotTag}.Types.WEBHOOK}${orig}`,
-            },
-        },
-    ],
-});

From 63f5b0a6639bc0bbedd4420193a3772269db25aa Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 6 Apr 2023 03:32:18 +0200
Subject: [PATCH 130/147] bump pnpm to v8

---
 package.json   |    5 +-
 pnpm-lock.yaml | 1153 +++++++++++++++++++++++++-----------------------
 2 files changed, 594 insertions(+), 564 deletions(-)

diff --git a/package.json b/package.json
index 1c18e0349..e6403c6e3 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
         "type-fest": "^3.5.3",
         "typescript": "^4.9.4"
     },
-    "packageManager": "pnpm@7.13.4",
+    "packageManager": "pnpm@8.1.1",
     "pnpm": {
         "patchedDependencies": {
             "eslint-plugin-path-alias@1.0.0": "patches/eslint-plugin-path-alias@1.0.0.patch",
@@ -92,6 +92,7 @@
         "sourceDir": "./dist/extension-v2-unpacked"
     },
     "engines": {
-        "node": ">=18"
+        "node": ">=18",
+        "pnpm": ">=8"
     }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index aa891a21c..73d29a53b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,4 @@
-lockfileVersion: 5.4
+lockfileVersion: '6.0'
 
 patchedDependencies:
   eslint-plugin-path-alias@1.0.0:
@@ -8,89 +8,118 @@ patchedDependencies:
     hash: 7wc6icvgtg3uswirb5tpsbjnbe
     path: patches/eslint@8.28.0.patch
 
-specifiers:
-  '@types/diff': ^5.0.2
-  '@types/lodash': ^4.14.191
-  '@types/node': ^18.11.18
-  '@types/react': ^18.0.27
-  '@types/react-dom': ^18.0.10
-  '@types/yazl': ^2.4.2
-  '@typescript-eslint/eslint-plugin': ^5.49.0
-  '@typescript-eslint/parser': ^5.49.0
-  '@vap/core': 0.0.12
-  '@vap/shiki': 0.10.3
-  diff: ^5.1.0
-  discord-types: ^1.3.26
-  esbuild: ^0.15.18
-  eslint: ^8.28.0
-  eslint-import-resolver-alias: ^1.1.2
-  eslint-plugin-header: ^3.1.1
-  eslint-plugin-path-alias: ^1.0.0
-  eslint-plugin-simple-import-sort: ^8.0.0
-  eslint-plugin-unused-imports: ^2.0.0
-  fflate: ^0.7.4
-  highlight.js: 10.6.0
-  moment: ^2.29.4
-  nanoid: ^4.0.2
-  puppeteer-core: ^19.6.0
-  standalone-electron-types: ^1.0.0
-  stylelint: ^14.16.1
-  stylelint-config-standard: ^29.0.0
-  tsx: ^3.12.6
-  type-fest: ^3.5.3
-  typescript: ^4.9.4
-  virtual-merge: ^1.0.1
-
 dependencies:
-  '@vap/core': 0.0.12
-  '@vap/shiki': 0.10.3
-  fflate: 0.7.4
-  nanoid: 4.0.2
-  virtual-merge: 1.0.1
+  '@vap/core':
+    specifier: 0.0.12
+    version: 0.0.12
+  '@vap/shiki':
+    specifier: 0.10.3
+    version: 0.10.3
+  fflate:
+    specifier: ^0.7.4
+    version: 0.7.4
+  nanoid:
+    specifier: ^4.0.2
+    version: 4.0.2
+  virtual-merge:
+    specifier: ^1.0.1
+    version: 1.0.1
 
 devDependencies:
-  '@types/diff': 5.0.2
-  '@types/lodash': 4.14.191
-  '@types/node': 18.11.18
-  '@types/react': 18.0.27
-  '@types/react-dom': 18.0.10
-  '@types/yazl': 2.4.2
-  '@typescript-eslint/eslint-plugin': 5.49.0_ffoscbl6fkz64kp3vlggrfqozm
-  '@typescript-eslint/parser': 5.49.0_wy4udjehnvkneqnogzx5kughki
-  diff: 5.1.0
-  discord-types: 1.3.26
-  esbuild: 0.15.18
-  eslint: 8.28.0_7wc6icvgtg3uswirb5tpsbjnbe
-  eslint-import-resolver-alias: 1.1.2
-  eslint-plugin-header: 3.1.1_eslint@8.28.0
-  eslint-plugin-path-alias: 1.0.0_m6sma4g6bh67km3q6igf6uxaja_eslint@8.28.0
-  eslint-plugin-simple-import-sort: 8.0.0_eslint@8.28.0
-  eslint-plugin-unused-imports: 2.0.0_nzrwdcb3mq4ezaurfymehngbla
-  highlight.js: 10.6.0
-  moment: 2.29.4
-  puppeteer-core: 19.6.0
-  standalone-electron-types: 1.0.0
-  stylelint: 14.16.1
-  stylelint-config-standard: 29.0.0_stylelint@14.16.1
-  tsx: 3.12.6
-  type-fest: 3.5.3
-  typescript: 4.9.4
+  '@types/diff':
+    specifier: ^5.0.2
+    version: 5.0.2
+  '@types/lodash':
+    specifier: ^4.14.191
+    version: 4.14.191
+  '@types/node':
+    specifier: ^18.11.18
+    version: 18.11.18
+  '@types/react':
+    specifier: ^18.0.27
+    version: 18.0.27
+  '@types/react-dom':
+    specifier: ^18.0.10
+    version: 18.0.10
+  '@types/yazl':
+    specifier: ^2.4.2
+    version: 2.4.2
+  '@typescript-eslint/eslint-plugin':
+    specifier: ^5.49.0
+    version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.28.0)(typescript@4.9.4)
+  '@typescript-eslint/parser':
+    specifier: ^5.49.0
+    version: 5.49.0(eslint@8.28.0)(typescript@4.9.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.28.0
+    version: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
+  eslint-import-resolver-alias:
+    specifier: ^1.1.2
+    version: 1.1.2
+  eslint-plugin-header:
+    specifier: ^3.1.1
+    version: 3.1.1(eslint@8.28.0)
+  eslint-plugin-path-alias:
+    specifier: ^1.0.0
+    version: 1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.28.0)
+  eslint-plugin-simple-import-sort:
+    specifier: ^8.0.0
+    version: 8.0.0(eslint@8.28.0)
+  eslint-plugin-unused-imports:
+    specifier: ^2.0.0
+    version: 2.0.0(@typescript-eslint/eslint-plugin@5.49.0)(eslint@8.28.0)
+  highlight.js:
+    specifier: 10.6.0
+    version: 10.6.0
+  moment:
+    specifier: ^2.29.4
+    version: 2.29.4
+  puppeteer-core:
+    specifier: ^19.6.0
+    version: 19.6.0
+  standalone-electron-types:
+    specifier: ^1.0.0
+    version: 1.0.0
+  stylelint:
+    specifier: ^14.16.1
+    version: 14.16.1
+  stylelint-config-standard:
+    specifier: ^29.0.0
+    version: 29.0.0(stylelint@14.16.1)
+  tsx:
+    specifier: ^3.12.6
+    version: 3.12.6
+  type-fest:
+    specifier: ^3.5.3
+    version: 3.5.3
+  typescript:
+    specifier: ^4.9.4
+    version: 4.9.4
 
 packages:
 
-  /@babel/code-frame/7.18.6:
+  /@babel/code-frame@7.18.6:
     resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
     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:
@@ -99,7 +128,7 @@ packages:
       js-tokens: 4.0.0
     dev: true
 
-  /@csstools/selector-specificity/2.1.1_wajs5nedgkikc5pcuwett7legi:
+  /@csstools/selector-specificity@2.1.1(postcss-selector-parser@6.0.11)(postcss@8.4.21):
     resolution: {integrity: sha512-jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw==}
     engines: {node: ^14 || ^16 || >=18}
     peerDependencies:
@@ -110,46 +139,28 @@ packages:
       postcss-selector-parser: 6.0.11
     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.4.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.12
       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.4.0
     dev: true
 
-  /@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.12:
-    resolution: {integrity: sha512-E/sgkvwoIfj4aMAPL2e35VnUJspzVYl7+M1B2cqeubdBhADV4uPon0KCc8p2G+LqSJ6i8ocYPCqY3A4GGq0zkQ==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/android-arm64/0.17.12:
+  /@esbuild/android-arm64@0.17.12:
     resolution: {integrity: sha512-WQ9p5oiXXYJ33F2EkE3r0FRDFVpEdcDiwNX3u7Xaibxfx6vQE0Sb8ytrfQsA5WO6kDn6mDfKLh6KrPBjvkk7xA==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -158,7 +169,25 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-x64/0.17.12:
+  /@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.12:
+    resolution: {integrity: sha512-E/sgkvwoIfj4aMAPL2e35VnUJspzVYl7+M1B2cqeubdBhADV4uPon0KCc8p2G+LqSJ6i8ocYPCqY3A4GGq0zkQ==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/android-x64@0.17.12:
     resolution: {integrity: sha512-m4OsaCr5gT+se25rFPHKQXARMyAehHTQAz4XX1Vk3d27VtqiX0ALMBPoXZsGaB6JYryCLfgGwUslMqTfqeLU0w==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -167,7 +196,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-arm64/0.17.12:
+  /@esbuild/darwin-arm64@0.17.12:
     resolution: {integrity: sha512-O3GCZghRIx+RAN0NDPhyyhRgwa19MoKlzGonIb5hgTj78krqp9XZbYCvFr9N1eUxg0ZQEpiiZ4QvsOQwBpP+lg==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -176,7 +205,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-x64/0.17.12:
+  /@esbuild/darwin-x64@0.17.12:
     resolution: {integrity: sha512-5D48jM3tW27h1qjaD9UNRuN+4v0zvksqZSPZqeSWggfMlsVdAhH3pwSfQIFJwcs9QJ9BRibPS4ViZgs3d2wsCA==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -185,7 +214,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-arm64/0.17.12:
+  /@esbuild/freebsd-arm64@0.17.12:
     resolution: {integrity: sha512-OWvHzmLNTdF1erSvrfoEBGlN94IE6vCEaGEkEH29uo/VoONqPnoDFfShi41Ew+yKimx4vrmmAJEGNoyyP+OgOQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -194,7 +223,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-x64/0.17.12:
+  /@esbuild/freebsd-x64@0.17.12:
     resolution: {integrity: sha512-A0Xg5CZv8MU9xh4a+7NUpi5VHBKh1RaGJKqjxe4KG87X+mTjDE6ZvlJqpWoeJxgfXHT7IMP9tDFu7IZ03OtJAw==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -203,16 +232,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm/0.17.12:
-    resolution: {integrity: sha512-WsHyJ7b7vzHdJ1fv67Yf++2dz3D726oO3QCu8iNYik4fb5YuuReOI9OtA+n7Mk0xyQivNTPbl181s+5oZ38gyA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-arm64/0.17.12:
+  /@esbuild/linux-arm64@0.17.12:
     resolution: {integrity: sha512-cK3AjkEc+8v8YG02hYLQIQlOznW+v9N+OI9BAFuyqkfQFR+DnDLhEM5N8QRxAUz99cJTo1rLNXqRrvY15gbQUg==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -221,7 +241,16 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ia32/0.17.12:
+  /@esbuild/linux-arm@0.17.12:
+    resolution: {integrity: sha512-WsHyJ7b7vzHdJ1fv67Yf++2dz3D726oO3QCu8iNYik4fb5YuuReOI9OtA+n7Mk0xyQivNTPbl181s+5oZ38gyA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@esbuild/linux-ia32@0.17.12:
     resolution: {integrity: sha512-jdOBXJqcgHlah/nYHnj3Hrnl9l63RjtQ4vn9+bohjQPI2QafASB5MtHAoEv0JQHVb/xYQTFOeuHnNYE1zF7tYw==}
     engines: {node: '>=12'}
     cpu: [ia32]
@@ -230,7 +259,7 @@ packages:
     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]
@@ -239,7 +268,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-loong64/0.17.12:
+  /@esbuild/linux-loong64@0.17.12:
     resolution: {integrity: sha512-GTOEtj8h9qPKXCyiBBnHconSCV9LwFyx/gv3Phw0pa25qPYjVuuGZ4Dk14bGCfGX3qKF0+ceeQvwmtI+aYBbVA==}
     engines: {node: '>=12'}
     cpu: [loong64]
@@ -248,7 +277,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-mips64el/0.17.12:
+  /@esbuild/linux-mips64el@0.17.12:
     resolution: {integrity: sha512-o8CIhfBwKcxmEENOH9RwmUejs5jFiNoDw7YgS0EJTF6kgPgcqLFjgoc5kDey5cMHRVCIWc6kK2ShUePOcc7RbA==}
     engines: {node: '>=12'}
     cpu: [mips64el]
@@ -257,7 +286,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ppc64/0.17.12:
+  /@esbuild/linux-ppc64@0.17.12:
     resolution: {integrity: sha512-biMLH6NR/GR4z+ap0oJYb877LdBpGac8KfZoEnDiBKd7MD/xt8eaw1SFfYRUeMVx519kVkAOL2GExdFmYnZx3A==}
     engines: {node: '>=12'}
     cpu: [ppc64]
@@ -266,7 +295,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-riscv64/0.17.12:
+  /@esbuild/linux-riscv64@0.17.12:
     resolution: {integrity: sha512-jkphYUiO38wZGeWlfIBMB72auOllNA2sLfiZPGDtOBb1ELN8lmqBrlMiucgL8awBw1zBXN69PmZM6g4yTX84TA==}
     engines: {node: '>=12'}
     cpu: [riscv64]
@@ -275,7 +304,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-s390x/0.17.12:
+  /@esbuild/linux-s390x@0.17.12:
     resolution: {integrity: sha512-j3ucLdeY9HBcvODhCY4b+Ds3hWGO8t+SAidtmWu/ukfLLG/oYDMaA+dnugTVAg5fnUOGNbIYL9TOjhWgQB8W5g==}
     engines: {node: '>=12'}
     cpu: [s390x]
@@ -284,7 +313,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-x64/0.17.12:
+  /@esbuild/linux-x64@0.17.12:
     resolution: {integrity: sha512-uo5JL3cgaEGotaqSaJdRfFNSCUJOIliKLnDGWaVCgIKkHxwhYMm95pfMbWZ9l7GeW9kDg0tSxcy9NYdEtjwwmA==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -293,7 +322,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/netbsd-x64/0.17.12:
+  /@esbuild/netbsd-x64@0.17.12:
     resolution: {integrity: sha512-DNdoRg8JX+gGsbqt2gPgkgb00mqOgOO27KnrWZtdABl6yWTST30aibGJ6geBq3WM2TIeW6COs5AScnC7GwtGPg==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -302,7 +331,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/openbsd-x64/0.17.12:
+  /@esbuild/openbsd-x64@0.17.12:
     resolution: {integrity: sha512-aVsENlr7B64w8I1lhHShND5o8cW6sB9n9MUtLumFlPhG3elhNWtE7M1TFpj3m7lT3sKQUMkGFjTQBrvDDO1YWA==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -311,7 +340,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/sunos-x64/0.17.12:
+  /@esbuild/sunos-x64@0.17.12:
     resolution: {integrity: sha512-qbHGVQdKSwi0JQJuZznS4SyY27tYXYF0mrgthbxXrZI3AHKuRvU+Eqbg/F0rmLDpW/jkIZBlCO1XfHUBMNJ1pg==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -320,7 +349,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-arm64/0.17.12:
+  /@esbuild/win32-arm64@0.17.12:
     resolution: {integrity: sha512-zsCp8Ql+96xXTVTmm6ffvoTSZSV2B/LzzkUXAY33F/76EajNw1m+jZ9zPfNJlJ3Rh4EzOszNDHsmG/fZOhtqDg==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -329,7 +358,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-ia32/0.17.12:
+  /@esbuild/win32-ia32@0.17.12:
     resolution: {integrity: sha512-FfrFjR4id7wcFYOdqbDfDET3tjxCozUgbqdkOABsSFzoZGFC92UK7mg4JKRc/B3NNEf1s2WHxJ7VfTdVDPN3ng==}
     engines: {node: '>=12'}
     cpu: [ia32]
@@ -338,7 +367,7 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-x64/0.17.12:
+  /@esbuild/win32-x64@0.17.12:
     resolution: {integrity: sha512-JOOxw49BVZx2/5tW3FqkdjSD/5gXYeVGPDcB0lvap0gLQshkh1Nyel1QazC+wNxus3xPlsYAgqU1BUmrmCvWtw==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -347,7 +376,7 @@ packages:
     dev: true
     optional: true
 
-  /@eslint/eslintrc/1.3.3:
+  /@eslint/eslintrc@1.3.3:
     resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
@@ -364,7 +393,7 @@ packages:
       - supports-color
     dev: true
 
-  /@humanwhocodes/config-array/0.11.7:
+  /@humanwhocodes/config-array@0.11.7:
     resolution: {integrity: sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==}
     engines: {node: '>=10.10.0'}
     dependencies:
@@ -375,16 +404,16 @@ packages:
       - supports-color
     dev: true
 
-  /@humanwhocodes/module-importer/1.0.1:
+  /@humanwhocodes/module-importer@1.0.1:
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
     engines: {node: '>=12.22'}
     dev: true
 
-  /@humanwhocodes/object-schema/1.2.1:
+  /@humanwhocodes/object-schema@1.2.1:
     resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
     dev: true
 
-  /@nodelib/fs.scandir/2.1.5:
+  /@nodelib/fs.scandir@2.1.5:
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
     dependencies:
@@ -392,12 +421,12 @@ packages:
       run-parallel: 1.2.0
     dev: true
 
-  /@nodelib/fs.stat/2.0.5:
+  /@nodelib/fs.stat@2.0.5:
     resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
     engines: {node: '>= 8'}
     dev: true
 
-  /@nodelib/fs.walk/1.2.8:
+  /@nodelib/fs.walk@1.2.8:
     resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
     engines: {node: '>= 8'}
     dependencies:
@@ -405,52 +434,52 @@ packages:
       fastq: 1.13.0
     dev: true
 
-  /@types/diff/5.0.2:
+  /@types/diff@5.0.2:
     resolution: {integrity: sha512-uw8eYMIReOwstQ0QKF0sICefSy8cNO/v7gOTiIy9SbwuHyEecJUm7qlgueOO5S1udZ5I/irVydHVwMchgzbKTg==}
     dev: true
 
-  /@types/json-schema/7.0.11:
+  /@types/json-schema@7.0.11:
     resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
     dev: true
 
-  /@types/lodash/4.14.191:
+  /@types/lodash@4.14.191:
     resolution: {integrity: sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==}
     dev: true
 
-  /@types/minimist/1.2.2:
+  /@types/minimist@1.2.2:
     resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
     dev: true
 
-  /@types/node/18.11.18:
+  /@types/node@18.11.18:
     resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==}
     dev: true
 
-  /@types/normalize-package-data/2.4.1:
+  /@types/normalize-package-data@2.4.1:
     resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
     dev: true
 
-  /@types/parse-json/4.0.0:
+  /@types/parse-json@4.0.0:
     resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
     dev: true
 
-  /@types/prop-types/15.7.5:
+  /@types/prop-types@15.7.5:
     resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
     dev: true
 
-  /@types/react-dom/18.0.10:
+  /@types/react-dom@18.0.10:
     resolution: {integrity: sha512-E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg==}
     dependencies:
       '@types/react': 18.0.27
     dev: true
 
-  /@types/react/17.0.2:
+  /@types/react@17.0.2:
     resolution: {integrity: sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==}
     dependencies:
       '@types/prop-types': 15.7.5
       csstype: 3.1.0
     dev: true
 
-  /@types/react/18.0.27:
+  /@types/react@18.0.27:
     resolution: {integrity: sha512-3vtRKHgVxu3Jp9t718R9BuzoD4NcQ8YJ5XRzsSKxNDiDonD2MXIT1TmSkenxuCycZJoQT5d2vE8LwWJxBC1gmA==}
     dependencies:
       '@types/prop-types': 15.7.5
@@ -458,15 +487,15 @@ packages:
       csstype: 3.1.0
     dev: true
 
-  /@types/scheduler/0.16.2:
+  /@types/scheduler@0.16.2:
     resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
     dev: true
 
-  /@types/semver/7.3.13:
+  /@types/semver@7.3.13:
     resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==}
     dev: true
 
-  /@types/yauzl/2.10.0:
+  /@types/yauzl@2.10.0:
     resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
     requiresBuild: true
     dependencies:
@@ -474,13 +503,13 @@ packages:
     dev: true
     optional: true
 
-  /@types/yazl/2.4.2:
+  /@types/yazl@2.4.2:
     resolution: {integrity: sha512-T+9JH8O2guEjXNxqmybzQ92mJUh2oCwDDMSSimZSe1P+pceZiFROZLYmcbqkzV5EUwz6VwcKXCO2S2yUpra6XQ==}
     dependencies:
       '@types/node': 18.11.18
     dev: true
 
-  /@typescript-eslint/eslint-plugin/5.49.0_ffoscbl6fkz64kp3vlggrfqozm:
+  /@typescript-eslint/eslint-plugin@5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.28.0)(typescript@4.9.4):
     resolution: {integrity: sha512-IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -493,23 +522,23 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.49.0_wy4udjehnvkneqnogzx5kughki
+      '@typescript-eslint/parser': 5.49.0(eslint@8.28.0)(typescript@4.9.4)
       '@typescript-eslint/scope-manager': 5.49.0
-      '@typescript-eslint/type-utils': 5.49.0_wy4udjehnvkneqnogzx5kughki
-      '@typescript-eslint/utils': 5.49.0_wy4udjehnvkneqnogzx5kughki
+      '@typescript-eslint/type-utils': 5.49.0(eslint@8.28.0)(typescript@4.9.4)
+      '@typescript-eslint/utils': 5.49.0(eslint@8.28.0)(typescript@4.9.4)
       debug: 4.3.4
-      eslint: 8.28.0_7wc6icvgtg3uswirb5tpsbjnbe
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
       ignore: 5.2.0
       natural-compare-lite: 1.4.0
       regexpp: 3.2.0
       semver: 7.3.7
-      tsutils: 3.21.0_typescript@4.9.4
+      tsutils: 3.21.0(typescript@4.9.4)
       typescript: 4.9.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/5.49.0_wy4udjehnvkneqnogzx5kughki:
+  /@typescript-eslint/parser@5.49.0(eslint@8.28.0)(typescript@4.9.4):
     resolution: {integrity: sha512-veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -523,15 +552,15 @@ packages:
     dependencies:
       '@typescript-eslint/scope-manager': 5.49.0
       '@typescript-eslint/types': 5.49.0
-      '@typescript-eslint/typescript-estree': 5.49.0_typescript@4.9.4
+      '@typescript-eslint/typescript-estree': 5.49.0(typescript@4.9.4)
       debug: 4.3.4
-      eslint: 8.28.0_7wc6icvgtg3uswirb5tpsbjnbe
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
       typescript: 4.9.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager/5.49.0:
+  /@typescript-eslint/scope-manager@5.49.0:
     resolution: {integrity: sha512-clpROBOiMIzpbWNxCe1xDK14uPZh35u4QaZO1GddilEzoCLAEz4szb51rBpdgurs5k2YzPtJeTEN3qVbG+LRUQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
@@ -539,7 +568,7 @@ packages:
       '@typescript-eslint/visitor-keys': 5.49.0
     dev: true
 
-  /@typescript-eslint/type-utils/5.49.0_wy4udjehnvkneqnogzx5kughki:
+  /@typescript-eslint/type-utils@5.49.0(eslint@8.28.0)(typescript@4.9.4):
     resolution: {integrity: sha512-eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -551,22 +580,22 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.49.0_typescript@4.9.4
-      '@typescript-eslint/utils': 5.49.0_wy4udjehnvkneqnogzx5kughki
+      '@typescript-eslint/typescript-estree': 5.49.0(typescript@4.9.4)
+      '@typescript-eslint/utils': 5.49.0(eslint@8.28.0)(typescript@4.9.4)
       debug: 4.3.4
-      eslint: 8.28.0_7wc6icvgtg3uswirb5tpsbjnbe
-      tsutils: 3.21.0_typescript@4.9.4
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
+      tsutils: 3.21.0(typescript@4.9.4)
       typescript: 4.9.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/types/5.49.0:
+  /@typescript-eslint/types@5.49.0:
     resolution: {integrity: sha512-7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree/5.49.0_typescript@4.9.4:
+  /@typescript-eslint/typescript-estree@5.49.0(typescript@4.9.4):
     resolution: {integrity: sha512-PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -581,13 +610,13 @@ packages:
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.3.8
-      tsutils: 3.21.0_typescript@4.9.4
+      tsutils: 3.21.0(typescript@4.9.4)
       typescript: 4.9.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.49.0_wy4udjehnvkneqnogzx5kughki:
+  /@typescript-eslint/utils@5.49.0(eslint@8.28.0)(typescript@4.9.4):
     resolution: {integrity: sha512-cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -600,17 +629,17 @@ packages:
       '@types/semver': 7.3.13
       '@typescript-eslint/scope-manager': 5.49.0
       '@typescript-eslint/types': 5.49.0
-      '@typescript-eslint/typescript-estree': 5.49.0_typescript@4.9.4
-      eslint: 8.28.0_7wc6icvgtg3uswirb5tpsbjnbe
+      '@typescript-eslint/typescript-estree': 5.49.0(typescript@4.9.4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@8.28.0
+      eslint-utils: 3.0.0(eslint@8.28.0)
       semver: 7.3.8
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/visitor-keys/5.49.0:
+  /@typescript-eslint/visitor-keys@5.49.0:
     resolution: {integrity: sha512-v9jBMjpNWyn8B6k/Mjt6VbUS4J1GvUlR4x3Y+ibnP1z7y7V4n0WRz+50DY6+Myj0UaXVSuUlHohO+eZ8IJEnkg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
@@ -618,13 +647,13 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@vap/core/0.0.12:
+  /@vap/core@0.0.12:
     resolution: {integrity: sha512-3csHpkE1zUSRTZwl7xIf2uXg1cD4IhhtUm0F6K/dWydc95R5Nj+krB4OTNATuqkewIv/ViCbwjPfkafAgvZQSg==}
     dependencies:
       eventemitter3: 4.0.7
     dev: false
 
-  /@vap/shiki/0.10.3:
+  /@vap/shiki@0.10.3:
     resolution: {integrity: sha512-tZPHZxDKEBlorQ2BaprytGfkbo5yKBvdxdAF144p94HCTpjO3ScJk/f319wi7GtV1NE4DV8HBQo/0XpldixWQA==}
     dependencies:
       jsonc-parser: 3.2.0
@@ -632,7 +661,7 @@ packages:
       vscode-textmate: 5.2.0
     dev: false
 
-  /acorn-jsx/5.3.2_acorn@8.8.0:
+  /acorn-jsx@5.3.2(acorn@8.8.0):
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -640,13 +669,13 @@ packages:
       acorn: 8.8.0
     dev: true
 
-  /acorn/8.8.0:
+  /acorn@8.8.0:
     resolution: {integrity: sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==}
     engines: {node: '>=0.4.0'}
     hasBin: true
     dev: true
 
-  /agent-base/6.0.2:
+  /agent-base@6.0.2:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
     dependencies:
@@ -655,7 +684,7 @@ packages:
       - supports-color
     dev: true
 
-  /ajv/6.12.6:
+  /ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
     dependencies:
       fast-deep-equal: 3.1.3
@@ -664,7 +693,7 @@ packages:
       uri-js: 4.4.1
     dev: true
 
-  /ajv/8.12.0:
+  /ajv@8.12.0:
     resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}
     dependencies:
       fast-deep-equal: 3.1.3
@@ -673,79 +702,83 @@ packages:
       uri-js: 4.4.1
     dev: true
 
-  /ansi-regex/5.0.1:
+  /ansi-regex@5.0.1:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
     dev: true
 
-  /ansi-styles/3.2.1:
+  /ansi-styles@3.2.1:
     resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
     engines: {node: '>=4'}
     dependencies:
       color-convert: 1.9.3
     dev: true
 
-  /ansi-styles/4.3.0:
+  /ansi-styles@4.3.0:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
     dependencies:
       color-convert: 2.0.1
     dev: true
 
-  /argparse/2.0.1:
+  /argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
     dev: true
 
-  /arr-diff/4.0.0:
+  /arr-diff@4.0.0:
     resolution: {integrity: sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /arr-union/3.1.0:
+  /arr-union@3.1.0:
     resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /array-union/2.1.0:
+  /array-union@2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
     dev: true
 
-  /array-unique/0.3.2:
+  /array-unique@0.3.2:
     resolution: {integrity: sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /arrify/1.0.1:
+  /arrify@1.0.1:
     resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /assign-symbols/1.0.0:
+  /assign-symbols@1.0.0:
     resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /astral-regex/2.0.0:
+  /astral-regex@2.0.0:
     resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
     engines: {node: '>=8'}
     dev: true
 
-  /atob/2.1.2:
+  /atob@2.1.2:
     resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
     engines: {node: '>= 4.5.0'}
     hasBin: true
     dev: true
 
-  /balanced-match/1.0.2:
+  /balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
     dev: true
 
-  /balanced-match/2.0.0:
+  /balanced-match@2.0.0:
     resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==}
     dev: true
 
-  /base/0.11.2:
+  /base64-js@1.5.1:
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+    dev: true
+
+  /base@0.11.2:
     resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -758,11 +791,7 @@ packages:
       pascalcase: 0.1.1
     dev: true
 
-  /base64-js/1.5.1:
-    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
-    dev: true
-
-  /bl/4.1.0:
+  /bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
     dependencies:
       buffer: 5.7.1
@@ -770,36 +799,36 @@ packages:
       readable-stream: 3.6.0
     dev: true
 
-  /brace-expansion/1.1.11:
+  /brace-expansion@1.1.11:
     resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
     dev: true
 
-  /braces/3.0.2:
+  /braces@3.0.2:
     resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
     engines: {node: '>=8'}
     dependencies:
       fill-range: 7.0.1
     dev: true
 
-  /buffer-crc32/0.2.13:
+  /buffer-crc32@0.2.13:
     resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
     dev: true
 
-  /buffer-from/1.1.2:
+  /buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
     dev: true
 
-  /buffer/5.7.1:
+  /buffer@5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
     dependencies:
       base64-js: 1.5.1
       ieee754: 1.2.1
     dev: true
 
-  /cache-base/1.0.1:
+  /cache-base@1.0.1:
     resolution: {integrity: sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -814,12 +843,12 @@ packages:
       unset-value: 1.0.0
     dev: true
 
-  /callsites/3.1.0:
+  /callsites@3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
     dev: true
 
-  /camelcase-keys/6.2.2:
+  /camelcase-keys@6.2.2:
     resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
     engines: {node: '>=8'}
     dependencies:
@@ -828,12 +857,12 @@ packages:
       quick-lru: 4.0.1
     dev: true
 
-  /camelcase/5.3.1:
+  /camelcase@5.3.1:
     resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
     engines: {node: '>=6'}
     dev: true
 
-  /chalk/2.4.2:
+  /chalk@2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
     engines: {node: '>=4'}
     dependencies:
@@ -842,7 +871,7 @@ packages:
       supports-color: 5.5.0
     dev: true
 
-  /chalk/4.1.2:
+  /chalk@4.1.2:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
     engines: {node: '>=10'}
     dependencies:
@@ -850,11 +879,11 @@ packages:
       supports-color: 7.2.0
     dev: true
 
-  /chownr/1.1.4:
+  /chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
     dev: true
 
-  /class-utils/0.3.6:
+  /class-utils@0.3.6:
     resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -864,7 +893,7 @@ packages:
       static-extend: 0.1.2
     dev: true
 
-  /collection-visit/1.0.0:
+  /collection-visit@1.0.0:
     resolution: {integrity: sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -872,45 +901,45 @@ packages:
       object-visit: 1.0.1
     dev: true
 
-  /color-convert/1.9.3:
+  /color-convert@1.9.3:
     resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
     dependencies:
       color-name: 1.1.3
     dev: true
 
-  /color-convert/2.0.1:
+  /color-convert@2.0.1:
     resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
     engines: {node: '>=7.0.0'}
     dependencies:
       color-name: 1.1.4
     dev: true
 
-  /color-name/1.1.3:
+  /color-name@1.1.3:
     resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
     dev: true
 
-  /color-name/1.1.4:
+  /color-name@1.1.4:
     resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
     dev: true
 
-  /colord/2.9.3:
+  /colord@2.9.3:
     resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}
     dev: true
 
-  /component-emitter/1.3.0:
+  /component-emitter@1.3.0:
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
     dev: true
 
-  /concat-map/0.0.1:
+  /concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
     dev: true
 
-  /copy-descriptor/0.1.1:
+  /copy-descriptor@0.1.1:
     resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /cosmiconfig/7.1.0:
+  /cosmiconfig@7.1.0:
     resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==}
     engines: {node: '>=10'}
     dependencies:
@@ -921,7 +950,7 @@ packages:
       yaml: 1.10.2
     dev: true
 
-  /cross-fetch/3.1.5:
+  /cross-fetch@3.1.5:
     resolution: {integrity: sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==}
     dependencies:
       node-fetch: 2.6.7
@@ -929,7 +958,7 @@ packages:
       - encoding
     dev: true
 
-  /cross-spawn/7.0.3:
+  /cross-spawn@7.0.3:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}
     dependencies:
@@ -938,22 +967,22 @@ packages:
       which: 2.0.2
     dev: true
 
-  /css-functions-list/3.1.0:
+  /css-functions-list@3.1.0:
     resolution: {integrity: sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==}
     engines: {node: '>=12.22'}
     dev: true
 
-  /cssesc/3.0.0:
+  /cssesc@3.0.0:
     resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
     engines: {node: '>=4'}
     hasBin: true
     dev: true
 
-  /csstype/3.1.0:
+  /csstype@3.1.0:
     resolution: {integrity: sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==}
     dev: true
 
-  /debug/2.6.9:
+  /debug@2.6.9:
     resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
     peerDependencies:
       supports-color: '*'
@@ -964,7 +993,7 @@ packages:
       ms: 2.0.0
     dev: true
 
-  /debug/4.3.4:
+  /debug@4.3.4:
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
     peerDependencies:
@@ -976,7 +1005,7 @@ packages:
       ms: 2.1.2
     dev: true
 
-  /decamelize-keys/1.1.1:
+  /decamelize-keys@1.1.1:
     resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -984,35 +1013,35 @@ packages:
       map-obj: 1.0.1
     dev: true
 
-  /decamelize/1.2.0:
+  /decamelize@1.2.0:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /decode-uri-component/0.2.0:
+  /decode-uri-component@0.2.0:
     resolution: {integrity: sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==}
     engines: {node: '>=0.10'}
     dev: true
 
-  /deep-is/0.1.4:
+  /deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
     dev: true
 
-  /define-property/0.2.5:
+  /define-property@0.2.5:
     resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-descriptor: 0.1.6
     dev: true
 
-  /define-property/1.0.0:
+  /define-property@1.0.0:
     resolution: {integrity: sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-descriptor: 1.0.2
     dev: true
 
-  /define-property/2.0.2:
+  /define-property@2.0.2:
     resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -1020,53 +1049,53 @@ packages:
       isobject: 3.0.1
     dev: true
 
-  /devtools-protocol/0.0.1082910:
+  /devtools-protocol@0.0.1082910:
     resolution: {integrity: sha512-RqoZ2GmqaNxyx+99L/RemY5CkwG9D0WEfOKxekwCRXOGrDCep62ngezEJUVMq6rISYQ+085fJnWDQqGHlxVNww==}
     dev: true
 
-  /diff/5.1.0:
+  /diff@5.1.0:
     resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==}
     engines: {node: '>=0.3.1'}
     dev: true
 
-  /dir-glob/3.0.1:
+  /dir-glob@3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}
     dependencies:
       path-type: 4.0.0
     dev: true
 
-  /discord-types/1.3.26:
+  /discord-types@1.3.26:
     resolution: {integrity: sha512-ToG51AOCH+JTQf7b+8vuYQe5Iqwz7nZ7StpECAZ/VZcI1ZhQk13pvt9KkRTfRv1xNvwJ2qib4e3+RifQlo8VPQ==}
     dependencies:
       '@types/react': 17.0.2
       moment: 2.29.4
     dev: true
 
-  /doctrine/3.0.0:
+  /doctrine@3.0.0:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
     engines: {node: '>=6.0.0'}
     dependencies:
       esutils: 2.0.3
     dev: true
 
-  /emoji-regex/8.0.0:
+  /emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
     dev: true
 
-  /end-of-stream/1.4.4:
+  /end-of-stream@1.4.4:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
     dependencies:
       once: 1.4.0
     dev: true
 
-  /error-ex/1.3.2:
+  /error-ex@1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
     dependencies:
       is-arrayish: 0.2.1
     dev: true
 
-  /esbuild-android-64/0.15.18:
+  /esbuild-android-64@0.15.18:
     resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1075,7 +1104,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-android-arm64/0.15.18:
+  /esbuild-android-arm64@0.15.18:
     resolution: {integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -1084,7 +1113,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-darwin-64/0.15.18:
+  /esbuild-darwin-64@0.15.18:
     resolution: {integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1093,7 +1122,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-darwin-arm64/0.15.18:
+  /esbuild-darwin-arm64@0.15.18:
     resolution: {integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -1102,7 +1131,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-freebsd-64/0.15.18:
+  /esbuild-freebsd-64@0.15.18:
     resolution: {integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1111,7 +1140,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-freebsd-arm64/0.15.18:
+  /esbuild-freebsd-arm64@0.15.18:
     resolution: {integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -1120,7 +1149,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-32/0.15.18:
+  /esbuild-linux-32@0.15.18:
     resolution: {integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==}
     engines: {node: '>=12'}
     cpu: [ia32]
@@ -1129,7 +1158,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-64/0.15.18:
+  /esbuild-linux-64@0.15.18:
     resolution: {integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1138,16 +1167,7 @@ packages:
     dev: true
     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
-    optional: true
-
-  /esbuild-linux-arm64/0.15.18:
+  /esbuild-linux-arm64@0.15.18:
     resolution: {integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -1156,7 +1176,16 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-mips64le/0.15.18:
+  /esbuild-linux-arm@0.15.18:
+    resolution: {integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-linux-mips64le@0.15.18:
     resolution: {integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==}
     engines: {node: '>=12'}
     cpu: [mips64el]
@@ -1165,7 +1194,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-ppc64le/0.15.18:
+  /esbuild-linux-ppc64le@0.15.18:
     resolution: {integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==}
     engines: {node: '>=12'}
     cpu: [ppc64]
@@ -1174,7 +1203,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-riscv64/0.15.18:
+  /esbuild-linux-riscv64@0.15.18:
     resolution: {integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==}
     engines: {node: '>=12'}
     cpu: [riscv64]
@@ -1183,7 +1212,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-s390x/0.15.18:
+  /esbuild-linux-s390x@0.15.18:
     resolution: {integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==}
     engines: {node: '>=12'}
     cpu: [s390x]
@@ -1192,7 +1221,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-netbsd-64/0.15.18:
+  /esbuild-netbsd-64@0.15.18:
     resolution: {integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1201,7 +1230,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-openbsd-64/0.15.18:
+  /esbuild-openbsd-64@0.15.18:
     resolution: {integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1210,7 +1239,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-sunos-64/0.15.18:
+  /esbuild-sunos-64@0.15.18:
     resolution: {integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1219,7 +1248,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-windows-32/0.15.18:
+  /esbuild-windows-32@0.15.18:
     resolution: {integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==}
     engines: {node: '>=12'}
     cpu: [ia32]
@@ -1228,7 +1257,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-windows-64/0.15.18:
+  /esbuild-windows-64@0.15.18:
     resolution: {integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -1237,7 +1266,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-windows-arm64/0.15.18:
+  /esbuild-windows-arm64@0.15.18:
     resolution: {integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -1246,7 +1275,7 @@ packages:
     dev: true
     optional: true
 
-  /esbuild/0.15.18:
+  /esbuild@0.15.18:
     resolution: {integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==}
     engines: {node: '>=12'}
     hasBin: true
@@ -1276,7 +1305,7 @@ packages:
       esbuild-windows-arm64: 0.15.18
     dev: true
 
-  /esbuild/0.17.12:
+  /esbuild@0.17.12:
     resolution: {integrity: sha512-bX/zHl7Gn2CpQwcMtRogTTBf9l1nl+H6R8nUbjk+RuKqAE3+8FDulLA+pHvX7aA7Xe07Iwa+CWvy9I8Y2qqPKQ==}
     engines: {node: '>=12'}
     hasBin: true
@@ -1306,17 +1335,17 @@ packages:
       '@esbuild/win32-x64': 0.17.12
     dev: true
 
-  /escape-string-regexp/1.0.5:
+  /escape-string-regexp@1.0.5:
     resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
     engines: {node: '>=0.8.0'}
     dev: true
 
-  /escape-string-regexp/4.0.0:
+  /escape-string-regexp@4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
     dev: true
 
-  /eslint-import-resolver-alias/1.1.2:
+  /eslint-import-resolver-alias@1.1.2:
     resolution: {integrity: sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w==}
     engines: {node: '>= 4'}
     peerDependencies:
@@ -1326,7 +1355,7 @@ packages:
         optional: true
     dev: true
 
-  /eslint-plugin-header/3.1.1_eslint@8.28.0:
+  /eslint-plugin-header@3.1.1(eslint@8.28.0):
     resolution: {integrity: sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==}
     peerDependencies:
       eslint: '>=7.7.0'
@@ -1334,10 +1363,10 @@ packages:
       eslint:
         optional: true
     dependencies:
-      eslint: 8.28.0_7wc6icvgtg3uswirb5tpsbjnbe
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
     dev: true
 
-  /eslint-plugin-path-alias/1.0.0_m6sma4g6bh67km3q6igf6uxaja_eslint@8.28.0:
+  /eslint-plugin-path-alias@1.0.0(patch_hash=m6sma4g6bh67km3q6igf6uxaja)(eslint@8.28.0):
     resolution: {integrity: sha512-FXus57yC+Zd3sMv46pbloXYwFeNVNHJqlACr9V68FG/IzGFBBokGJpmjDbEjpt8ZCeVSndUubeDWWl2A8sCNVQ==}
     peerDependencies:
       eslint: ^7
@@ -1345,14 +1374,14 @@ packages:
       eslint:
         optional: true
     dependencies:
-      eslint: 8.28.0_7wc6icvgtg3uswirb5tpsbjnbe
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
       nanomatch: 1.2.13
     transitivePeerDependencies:
       - supports-color
     dev: true
     patched: true
 
-  /eslint-plugin-simple-import-sort/8.0.0_eslint@8.28.0:
+  /eslint-plugin-simple-import-sort@8.0.0(eslint@8.28.0):
     resolution: {integrity: sha512-bXgJQ+lqhtQBCuWY/FUWdB27j4+lqcvXv5rUARkzbeWLwea+S5eBZEQrhnO+WgX3ZoJHVj0cn943iyXwByHHQw==}
     peerDependencies:
       eslint: '>=5.0.0'
@@ -1360,10 +1389,10 @@ packages:
       eslint:
         optional: true
     dependencies:
-      eslint: 8.28.0_7wc6icvgtg3uswirb5tpsbjnbe
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
     dev: true
 
-  /eslint-plugin-unused-imports/2.0.0_nzrwdcb3mq4ezaurfymehngbla:
+  /eslint-plugin-unused-imports@2.0.0(@typescript-eslint/eslint-plugin@5.49.0)(eslint@8.28.0):
     resolution: {integrity: sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1375,17 +1404,17 @@ packages:
       eslint:
         optional: true
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.49.0_ffoscbl6fkz64kp3vlggrfqozm
-      eslint: 8.28.0_7wc6icvgtg3uswirb5tpsbjnbe
+      '@typescript-eslint/eslint-plugin': 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.28.0)(typescript@4.9.4)
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
       eslint-rule-composer: 0.3.0
     dev: true
 
-  /eslint-rule-composer/0.3.0:
+  /eslint-rule-composer@0.3.0:
     resolution: {integrity: sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==}
     engines: {node: '>=4.0.0'}
     dev: true
 
-  /eslint-scope/5.1.1:
+  /eslint-scope@5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
     engines: {node: '>=8.0.0'}
     dependencies:
@@ -1393,7 +1422,7 @@ packages:
       estraverse: 4.3.0
     dev: true
 
-  /eslint-scope/7.1.1:
+  /eslint-scope@7.1.1:
     resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
@@ -1401,7 +1430,7 @@ packages:
       estraverse: 5.3.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@8.28.0:
+  /eslint-utils@3.0.0(eslint@8.28.0):
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
@@ -1410,21 +1439,21 @@ packages:
       eslint:
         optional: true
     dependencies:
-      eslint: 8.28.0_7wc6icvgtg3uswirb5tpsbjnbe
+      eslint: 8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe)
       eslint-visitor-keys: 2.1.0
     dev: true
 
-  /eslint-visitor-keys/2.1.0:
+  /eslint-visitor-keys@2.1.0:
     resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
     engines: {node: '>=10'}
     dev: true
 
-  /eslint-visitor-keys/3.3.0:
+  /eslint-visitor-keys@3.3.0:
     resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint/8.28.0_7wc6icvgtg3uswirb5tpsbjnbe:
+  /eslint@8.28.0(patch_hash=7wc6icvgtg3uswirb5tpsbjnbe):
     resolution: {integrity: sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
@@ -1440,7 +1469,7 @@ packages:
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.1.1
-      eslint-utils: 3.0.0_eslint@8.28.0
+      eslint-utils: 3.0.0(eslint@8.28.0)
       eslint-visitor-keys: 3.3.0
       espree: 9.4.0
       esquery: 1.4.0
@@ -1473,65 +1502,65 @@ packages:
     dev: true
     patched: true
 
-  /espree/9.4.0:
+  /espree@9.4.0:
     resolution: {integrity: sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       acorn: 8.8.0
-      acorn-jsx: 5.3.2_acorn@8.8.0
+      acorn-jsx: 5.3.2(acorn@8.8.0)
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /espree/9.4.1:
+  /espree@9.4.1:
     resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       acorn: 8.8.0
-      acorn-jsx: 5.3.2_acorn@8.8.0
+      acorn-jsx: 5.3.2(acorn@8.8.0)
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /esquery/1.4.0:
+  /esquery@1.4.0:
     resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
     engines: {node: '>=0.10'}
     dependencies:
       estraverse: 5.3.0
     dev: true
 
-  /esrecurse/4.3.0:
+  /esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
     engines: {node: '>=4.0'}
     dependencies:
       estraverse: 5.3.0
     dev: true
 
-  /estraverse/4.3.0:
+  /estraverse@4.3.0:
     resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
     engines: {node: '>=4.0'}
     dev: true
 
-  /estraverse/5.3.0:
+  /estraverse@5.3.0:
     resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
     engines: {node: '>=4.0'}
     dev: true
 
-  /esutils/2.0.3:
+  /esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /eventemitter3/4.0.7:
+  /eventemitter3@4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: false
 
-  /extend-shallow/2.0.1:
+  /extend-shallow@2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-extendable: 0.1.1
     dev: true
 
-  /extend-shallow/3.0.2:
+  /extend-shallow@3.0.2:
     resolution: {integrity: sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -1539,7 +1568,7 @@ packages:
       is-extendable: 1.0.1
     dev: true
 
-  /extract-zip/2.0.1:
+  /extract-zip@2.0.1:
     resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
     engines: {node: '>= 10.17.0'}
     hasBin: true
@@ -1553,11 +1582,11 @@ packages:
       - supports-color
     dev: true
 
-  /fast-deep-equal/3.1.3:
+  /fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
     dev: true
 
-  /fast-glob/3.2.12:
+  /fast-glob@3.2.12:
     resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==}
     engines: {node: '>=8.6.0'}
     dependencies:
@@ -1568,50 +1597,50 @@ packages:
       micromatch: 4.0.5
     dev: true
 
-  /fast-json-stable-stringify/2.1.0:
+  /fast-json-stable-stringify@2.1.0:
     resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
     dev: true
 
-  /fast-levenshtein/2.0.6:
+  /fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
     dev: true
 
-  /fastest-levenshtein/1.0.16:
+  /fastest-levenshtein@1.0.16:
     resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
     engines: {node: '>= 4.9.1'}
     dev: true
 
-  /fastq/1.13.0:
+  /fastq@1.13.0:
     resolution: {integrity: sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==}
     dependencies:
       reusify: 1.0.4
     dev: true
 
-  /fd-slicer/1.1.0:
+  /fd-slicer@1.1.0:
     resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
     dependencies:
       pend: 1.2.0
     dev: true
 
-  /fflate/0.7.4:
+  /fflate@0.7.4:
     resolution: {integrity: sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==}
     dev: false
 
-  /file-entry-cache/6.0.1:
+  /file-entry-cache@6.0.1:
     resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
     engines: {node: ^10.12.0 || >=12.0.0}
     dependencies:
       flat-cache: 3.0.4
     dev: true
 
-  /fill-range/7.0.1:
+  /fill-range@7.0.1:
     resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
     engines: {node: '>=8'}
     dependencies:
       to-regex-range: 5.0.1
     dev: true
 
-  /find-up/4.1.0:
+  /find-up@4.1.0:
     resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
     engines: {node: '>=8'}
     dependencies:
@@ -1619,7 +1648,7 @@ packages:
       path-exists: 4.0.0
     dev: true
 
-  /find-up/5.0.0:
+  /find-up@5.0.0:
     resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
     engines: {node: '>=10'}
     dependencies:
@@ -1627,7 +1656,7 @@ packages:
       path-exists: 4.0.0
     dev: true
 
-  /flat-cache/3.0.4:
+  /flat-cache@3.0.4:
     resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
     engines: {node: ^10.12.0 || >=12.0.0}
     dependencies:
@@ -1635,31 +1664,31 @@ packages:
       rimraf: 3.0.2
     dev: true
 
-  /flatted/3.2.7:
+  /flatted@3.2.7:
     resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
     dev: true
 
-  /for-in/1.0.2:
+  /for-in@1.0.2:
     resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /fragment-cache/0.2.1:
+  /fragment-cache@0.2.1:
     resolution: {integrity: sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       map-cache: 0.2.2
     dev: true
 
-  /fs-constants/1.0.0:
+  /fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
     dev: true
 
-  /fs.realpath/1.0.0:
+  /fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
     dev: true
 
-  /fsevents/2.3.2:
+  /fsevents@2.3.2:
     resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
@@ -1667,41 +1696,41 @@ packages:
     dev: true
     optional: true
 
-  /function-bind/1.1.1:
+  /function-bind@1.1.1:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
     dev: true
 
-  /get-stream/5.2.0:
+  /get-stream@5.2.0:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
     engines: {node: '>=8'}
     dependencies:
       pump: 3.0.0
     dev: true
 
-  /get-tsconfig/4.4.0:
+  /get-tsconfig@4.4.0:
     resolution: {integrity: sha512-0Gdjo/9+FzsYhXCEFueo2aY1z1tpXrxWZzP7k8ul9qt1U5o8rYJwTJYmaeHdrVosYIVYkOy2iwCJ9FdpocJhPQ==}
     dev: true
 
-  /get-value/2.0.6:
+  /get-value@2.0.6:
     resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /glob-parent/5.1.2:
+  /glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
     dependencies:
       is-glob: 4.0.3
     dev: true
 
-  /glob-parent/6.0.2:
+  /glob-parent@6.0.2:
     resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
     engines: {node: '>=10.13.0'}
     dependencies:
       is-glob: 4.0.3
     dev: true
 
-  /glob/7.2.3:
+  /glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
     dependencies:
       fs.realpath: 1.0.0
@@ -1712,14 +1741,14 @@ packages:
       path-is-absolute: 1.0.1
     dev: true
 
-  /global-modules/2.0.0:
+  /global-modules@2.0.0:
     resolution: {integrity: sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==}
     engines: {node: '>=6'}
     dependencies:
       global-prefix: 3.0.0
     dev: true
 
-  /global-prefix/3.0.0:
+  /global-prefix@3.0.0:
     resolution: {integrity: sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==}
     engines: {node: '>=6'}
     dependencies:
@@ -1728,14 +1757,14 @@ packages:
       which: 1.3.1
     dev: true
 
-  /globals/13.17.0:
+  /globals@13.17.0:
     resolution: {integrity: sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==}
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.20.2
     dev: true
 
-  /globby/11.1.0:
+  /globby@11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
     engines: {node: '>=10'}
     dependencies:
@@ -1747,30 +1776,30 @@ packages:
       slash: 3.0.0
     dev: true
 
-  /globjoin/0.1.4:
+  /globjoin@0.1.4:
     resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
     dev: true
 
-  /grapheme-splitter/1.0.4:
+  /grapheme-splitter@1.0.4:
     resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
     dev: true
 
-  /hard-rejection/2.1.0:
+  /hard-rejection@2.1.0:
     resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
     engines: {node: '>=6'}
     dev: true
 
-  /has-flag/3.0.0:
+  /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
     dev: true
 
-  /has-flag/4.0.0:
+  /has-flag@4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
     dev: true
 
-  /has-value/0.3.1:
+  /has-value@0.3.1:
     resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -1779,7 +1808,7 @@ packages:
       isobject: 2.1.0
     dev: true
 
-  /has-value/1.0.0:
+  /has-value@1.0.0:
     resolution: {integrity: sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -1788,12 +1817,12 @@ packages:
       isobject: 3.0.1
     dev: true
 
-  /has-values/0.1.4:
+  /has-values@0.1.4:
     resolution: {integrity: sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /has-values/1.0.0:
+  /has-values@1.0.0:
     resolution: {integrity: sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -1801,34 +1830,34 @@ packages:
       kind-of: 4.0.0
     dev: true
 
-  /has/1.0.3:
+  /has@1.0.3:
     resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
     engines: {node: '>= 0.4.0'}
     dependencies:
       function-bind: 1.1.1
     dev: true
 
-  /highlight.js/10.6.0:
+  /highlight.js@10.6.0:
     resolution: {integrity: sha512-8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ==}
     dev: true
 
-  /hosted-git-info/2.8.9:
+  /hosted-git-info@2.8.9:
     resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
     dev: true
 
-  /hosted-git-info/4.1.0:
+  /hosted-git-info@4.1.0:
     resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
     engines: {node: '>=10'}
     dependencies:
       lru-cache: 6.0.0
     dev: true
 
-  /html-tags/3.2.0:
+  /html-tags@3.2.0:
     resolution: {integrity: sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==}
     engines: {node: '>=8'}
     dev: true
 
-  /https-proxy-agent/5.0.1:
+  /https-proxy-agent@5.0.1:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
     dependencies:
@@ -1838,21 +1867,21 @@ packages:
       - supports-color
     dev: true
 
-  /ieee754/1.2.1:
+  /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
     dev: true
 
-  /ignore/5.2.0:
+  /ignore@5.2.0:
     resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}
     engines: {node: '>= 4'}
     dev: true
 
-  /ignore/5.2.4:
+  /ignore@5.2.4:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
     engines: {node: '>= 4'}
     dev: true
 
-  /import-fresh/3.3.0:
+  /import-fresh@3.3.0:
     resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
     engines: {node: '>=6'}
     dependencies:
@@ -1860,79 +1889,79 @@ packages:
       resolve-from: 4.0.0
     dev: true
 
-  /import-lazy/4.0.0:
+  /import-lazy@4.0.0:
     resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
     engines: {node: '>=8'}
     dev: true
 
-  /imurmurhash/0.1.4:
+  /imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
     engines: {node: '>=0.8.19'}
     dev: true
 
-  /indent-string/4.0.0:
+  /indent-string@4.0.0:
     resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
     engines: {node: '>=8'}
     dev: true
 
-  /inflight/1.0.6:
+  /inflight@1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
     dependencies:
       once: 1.4.0
       wrappy: 1.0.2
     dev: true
 
-  /inherits/2.0.4:
+  /inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
     dev: true
 
-  /ini/1.3.8:
+  /ini@1.3.8:
     resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
     dev: true
 
-  /is-accessor-descriptor/0.1.6:
+  /is-accessor-descriptor@0.1.6:
     resolution: {integrity: sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 3.2.2
     dev: true
 
-  /is-accessor-descriptor/1.0.0:
+  /is-accessor-descriptor@1.0.0:
     resolution: {integrity: sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 6.0.3
     dev: true
 
-  /is-arrayish/0.2.1:
+  /is-arrayish@0.2.1:
     resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
     dev: true
 
-  /is-buffer/1.1.6:
+  /is-buffer@1.1.6:
     resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
     dev: true
 
-  /is-core-module/2.11.0:
+  /is-core-module@2.11.0:
     resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==}
     dependencies:
       has: 1.0.3
     dev: true
 
-  /is-data-descriptor/0.1.4:
+  /is-data-descriptor@0.1.4:
     resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 3.2.2
     dev: true
 
-  /is-data-descriptor/1.0.0:
+  /is-data-descriptor@1.0.0:
     resolution: {integrity: sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 6.0.3
     dev: true
 
-  /is-descriptor/0.1.6:
+  /is-descriptor@0.1.6:
     resolution: {integrity: sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -1941,7 +1970,7 @@ packages:
       kind-of: 5.1.0
     dev: true
 
-  /is-descriptor/1.0.2:
+  /is-descriptor@1.0.2:
     resolution: {integrity: sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -1950,158 +1979,158 @@ packages:
       kind-of: 6.0.3
     dev: true
 
-  /is-extendable/0.1.1:
+  /is-extendable@0.1.1:
     resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-extendable/1.0.1:
+  /is-extendable@1.0.1:
     resolution: {integrity: sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-plain-object: 2.0.4
     dev: true
 
-  /is-extglob/2.1.1:
+  /is-extglob@2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-fullwidth-code-point/3.0.0:
+  /is-fullwidth-code-point@3.0.0:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
     dev: true
 
-  /is-glob/4.0.3:
+  /is-glob@4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-extglob: 2.1.1
     dev: true
 
-  /is-number/3.0.0:
+  /is-number@3.0.0:
     resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 3.2.2
     dev: true
 
-  /is-number/7.0.0:
+  /is-number@7.0.0:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
     dev: true
 
-  /is-path-inside/3.0.3:
+  /is-path-inside@3.0.3:
     resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
     engines: {node: '>=8'}
     dev: true
 
-  /is-plain-obj/1.1.0:
+  /is-plain-obj@1.1.0:
     resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-plain-object/2.0.4:
+  /is-plain-object@2.0.4:
     resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
     engines: {node: '>=0.10.0'}
     dependencies:
       isobject: 3.0.1
     dev: true
 
-  /is-plain-object/5.0.0:
+  /is-plain-object@5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-windows/1.0.2:
+  /is-windows@1.0.2:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /isarray/1.0.0:
+  /isarray@1.0.0:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
     dev: true
 
-  /isexe/2.0.0:
+  /isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
     dev: true
 
-  /isobject/2.1.0:
+  /isobject@2.1.0:
     resolution: {integrity: sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       isarray: 1.0.0
     dev: true
 
-  /isobject/3.0.1:
+  /isobject@3.0.1:
     resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /js-sdsl/4.1.5:
+  /js-sdsl@4.1.5:
     resolution: {integrity: sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==}
     dev: true
 
-  /js-tokens/4.0.0:
+  /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
     dev: true
 
-  /js-yaml/4.1.0:
+  /js-yaml@4.1.0:
     resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
     hasBin: true
     dependencies:
       argparse: 2.0.1
     dev: true
 
-  /json-parse-even-better-errors/2.3.1:
+  /json-parse-even-better-errors@2.3.1:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
     dev: true
 
-  /json-schema-traverse/0.4.1:
+  /json-schema-traverse@0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
     dev: true
 
-  /json-schema-traverse/1.0.0:
+  /json-schema-traverse@1.0.0:
     resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
     dev: true
 
-  /json-stable-stringify-without-jsonify/1.0.1:
+  /json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
     dev: true
 
-  /jsonc-parser/3.2.0:
+  /jsonc-parser@3.2.0:
     resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
     dev: false
 
-  /kind-of/3.2.2:
+  /kind-of@3.2.2:
     resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-buffer: 1.1.6
     dev: true
 
-  /kind-of/4.0.0:
+  /kind-of@4.0.0:
     resolution: {integrity: sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-buffer: 1.1.6
     dev: true
 
-  /kind-of/5.1.0:
+  /kind-of@5.1.0:
     resolution: {integrity: sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /kind-of/6.0.3:
+  /kind-of@6.0.3:
     resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /known-css-properties/0.26.0:
+  /known-css-properties@0.26.0:
     resolution: {integrity: sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==}
     dev: true
 
-  /levn/0.4.1:
+  /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
     dependencies:
@@ -2109,66 +2138,66 @@ packages:
       type-check: 0.4.0
     dev: true
 
-  /lines-and-columns/1.2.4:
+  /lines-and-columns@1.2.4:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
     dev: true
 
-  /locate-path/5.0.0:
+  /locate-path@5.0.0:
     resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
     engines: {node: '>=8'}
     dependencies:
       p-locate: 4.1.0
     dev: true
 
-  /locate-path/6.0.0:
+  /locate-path@6.0.0:
     resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
     engines: {node: '>=10'}
     dependencies:
       p-locate: 5.0.0
     dev: true
 
-  /lodash.merge/4.6.2:
+  /lodash.merge@4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
-  /lodash.truncate/4.4.2:
+  /lodash.truncate@4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
     dev: true
 
-  /lru-cache/6.0.0:
+  /lru-cache@6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
     dependencies:
       yallist: 4.0.0
     dev: true
 
-  /map-cache/0.2.2:
+  /map-cache@0.2.2:
     resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /map-obj/1.0.1:
+  /map-obj@1.0.1:
     resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /map-obj/4.3.0:
+  /map-obj@4.3.0:
     resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
     engines: {node: '>=8'}
     dev: true
 
-  /map-visit/1.0.0:
+  /map-visit@1.0.0:
     resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==}
     engines: {node: '>=0.10.0'}
     dependencies:
       object-visit: 1.0.1
     dev: true
 
-  /mathml-tag-names/2.1.3:
+  /mathml-tag-names@2.1.3:
     resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}
     dev: true
 
-  /meow/9.0.0:
+  /meow@9.0.0:
     resolution: {integrity: sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==}
     engines: {node: '>=10'}
     dependencies:
@@ -2186,12 +2215,12 @@ packages:
       yargs-parser: 20.2.9
     dev: true
 
-  /merge2/1.4.1:
+  /merge2@1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
     dev: true
 
-  /micromatch/4.0.5:
+  /micromatch@4.0.5:
     resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
     engines: {node: '>=8.6'}
     dependencies:
@@ -2199,18 +2228,18 @@ packages:
       picomatch: 2.3.1
     dev: true
 
-  /min-indent/1.0.1:
+  /min-indent@1.0.1:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
     dev: true
 
-  /minimatch/3.1.2:
+  /minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
     dependencies:
       brace-expansion: 1.1.11
     dev: true
 
-  /minimist-options/4.1.0:
+  /minimist-options@4.1.0:
     resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
     engines: {node: '>= 6'}
     dependencies:
@@ -2219,7 +2248,7 @@ packages:
       kind-of: 6.0.3
     dev: true
 
-  /mixin-deep/1.3.2:
+  /mixin-deep@1.3.2:
     resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -2227,35 +2256,35 @@ packages:
       is-extendable: 1.0.1
     dev: true
 
-  /mkdirp-classic/0.5.3:
+  /mkdirp-classic@0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
     dev: true
 
-  /moment/2.29.4:
+  /moment@2.29.4:
     resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==}
     dev: true
 
-  /ms/2.0.0:
+  /ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
     dev: true
 
-  /ms/2.1.2:
+  /ms@2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
     dev: true
 
-  /nanoid/3.3.4:
+  /nanoid@3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
     dev: true
 
-  /nanoid/4.0.2:
+  /nanoid@4.0.2:
     resolution: {integrity: sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==}
     engines: {node: ^14 || ^16 || >=18}
     hasBin: true
     dev: false
 
-  /nanomatch/1.2.13:
+  /nanomatch@1.2.13:
     resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -2274,15 +2303,15 @@ packages:
       - supports-color
     dev: true
 
-  /natural-compare-lite/1.4.0:
+  /natural-compare-lite@1.4.0:
     resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
     dev: true
 
-  /natural-compare/1.4.0:
+  /natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
     dev: true
 
-  /node-fetch/2.6.7:
+  /node-fetch@2.6.7:
     resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
     engines: {node: 4.x || >=6.0.0}
     peerDependencies:
@@ -2294,7 +2323,7 @@ packages:
       whatwg-url: 5.0.0
     dev: true
 
-  /normalize-package-data/2.5.0:
+  /normalize-package-data@2.5.0:
     resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
     dependencies:
       hosted-git-info: 2.8.9
@@ -2303,7 +2332,7 @@ packages:
       validate-npm-package-license: 3.0.4
     dev: true
 
-  /normalize-package-data/3.0.3:
+  /normalize-package-data@3.0.3:
     resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==}
     engines: {node: '>=10'}
     dependencies:
@@ -2313,12 +2342,12 @@ packages:
       validate-npm-package-license: 3.0.4
     dev: true
 
-  /normalize-path/3.0.0:
+  /normalize-path@3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /object-copy/0.1.0:
+  /object-copy@0.1.0:
     resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -2327,27 +2356,27 @@ packages:
       kind-of: 3.2.2
     dev: true
 
-  /object-visit/1.0.1:
+  /object-visit@1.0.1:
     resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       isobject: 3.0.1
     dev: true
 
-  /object.pick/1.3.0:
+  /object.pick@1.3.0:
     resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       isobject: 3.0.1
     dev: true
 
-  /once/1.4.0:
+  /once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
     dependencies:
       wrappy: 1.0.2
     dev: true
 
-  /optionator/0.9.1:
+  /optionator@0.9.1:
     resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
     engines: {node: '>= 0.8.0'}
     dependencies:
@@ -2359,47 +2388,47 @@ packages:
       word-wrap: 1.2.3
     dev: true
 
-  /p-limit/2.3.0:
+  /p-limit@2.3.0:
     resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
     engines: {node: '>=6'}
     dependencies:
       p-try: 2.2.0
     dev: true
 
-  /p-limit/3.1.0:
+  /p-limit@3.1.0:
     resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
     engines: {node: '>=10'}
     dependencies:
       yocto-queue: 0.1.0
     dev: true
 
-  /p-locate/4.1.0:
+  /p-locate@4.1.0:
     resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
     engines: {node: '>=8'}
     dependencies:
       p-limit: 2.3.0
     dev: true
 
-  /p-locate/5.0.0:
+  /p-locate@5.0.0:
     resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
     engines: {node: '>=10'}
     dependencies:
       p-limit: 3.1.0
     dev: true
 
-  /p-try/2.2.0:
+  /p-try@2.2.0:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
     dev: true
 
-  /parent-module/1.0.1:
+  /parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
     dependencies:
       callsites: 3.1.0
     dev: true
 
-  /parse-json/5.2.0:
+  /parse-json@5.2.0:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
     dependencies:
@@ -2409,57 +2438,57 @@ packages:
       lines-and-columns: 1.2.4
     dev: true
 
-  /pascalcase/0.1.1:
+  /pascalcase@0.1.1:
     resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /path-exists/4.0.0:
+  /path-exists@4.0.0:
     resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
     engines: {node: '>=8'}
     dev: true
 
-  /path-is-absolute/1.0.1:
+  /path-is-absolute@1.0.1:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /path-key/3.1.1:
+  /path-key@3.1.1:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
     dev: true
 
-  /path-parse/1.0.7:
+  /path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
     dev: true
 
-  /path-type/4.0.0:
+  /path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
     dev: true
 
-  /pend/1.2.0:
+  /pend@1.2.0:
     resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
     dev: true
 
-  /picocolors/1.0.0:
+  /picocolors@1.0.0:
     resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
     dev: true
 
-  /picomatch/2.3.1:
+  /picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
     dev: true
 
-  /postcss-media-query-parser/0.2.3:
+  /postcss-media-query-parser@0.2.3:
     resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==}
     dev: true
 
-  /postcss-resolve-nested-selector/0.1.1:
+  /postcss-resolve-nested-selector@0.1.1:
     resolution: {integrity: sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==}
     dev: true
 
-  /postcss-safe-parser/6.0.0_postcss@8.4.21:
+  /postcss-safe-parser@6.0.0(postcss@8.4.21):
     resolution: {integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==}
     engines: {node: '>=12.0'}
     peerDependencies:
@@ -2468,7 +2497,7 @@ packages:
       postcss: 8.4.21
     dev: true
 
-  /postcss-selector-parser/6.0.11:
+  /postcss-selector-parser@6.0.11:
     resolution: {integrity: sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==}
     engines: {node: '>=4'}
     dependencies:
@@ -2476,11 +2505,11 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /postcss-value-parser/4.2.0:
+  /postcss-value-parser@4.2.0:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
     dev: true
 
-  /postcss/8.4.21:
+  /postcss@8.4.21:
     resolution: {integrity: sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
@@ -2489,28 +2518,28 @@ packages:
       source-map-js: 1.0.2
     dev: true
 
-  /prelude-ls/1.2.1:
+  /prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
-  /proxy-from-env/1.1.0:
+  /proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
     dev: true
 
-  /pump/3.0.0:
+  /pump@3.0.0:
     resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
     dev: true
 
-  /punycode/2.1.1:
+  /punycode@2.1.1:
     resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
     engines: {node: '>=6'}
     dev: true
 
-  /puppeteer-core/19.6.0:
+  /puppeteer-core@19.6.0:
     resolution: {integrity: sha512-GvqWdHr9eY/MFR5pXf9o0apnrTmG0hhS7/TtCPfeAvCbaUS1bsLMZWxNGvI/QbviRu4xxi6HrR7VW4x/4esq1Q==}
     engines: {node: '>=14.1.0'}
     dependencies:
@@ -2531,16 +2560,16 @@ packages:
       - utf-8-validate
     dev: true
 
-  /queue-microtask/1.2.3:
+  /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
     dev: true
 
-  /quick-lru/4.0.1:
+  /quick-lru@4.0.1:
     resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==}
     engines: {node: '>=8'}
     dev: true
 
-  /read-pkg-up/7.0.1:
+  /read-pkg-up@7.0.1:
     resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
     engines: {node: '>=8'}
     dependencies:
@@ -2549,7 +2578,7 @@ packages:
       type-fest: 0.8.1
     dev: true
 
-  /read-pkg/5.2.0:
+  /read-pkg@5.2.0:
     resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
     engines: {node: '>=8'}
     dependencies:
@@ -2559,7 +2588,7 @@ packages:
       type-fest: 0.6.0
     dev: true
 
-  /readable-stream/3.6.0:
+  /readable-stream@3.6.0:
     resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==}
     engines: {node: '>= 6'}
     dependencies:
@@ -2568,7 +2597,7 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /redent/3.0.0:
+  /redent@3.0.0:
     resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
     engines: {node: '>=8'}
     dependencies:
@@ -2576,7 +2605,7 @@ packages:
       strip-indent: 3.0.0
     dev: true
 
-  /regex-not/1.0.2:
+  /regex-not@1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -2584,32 +2613,32 @@ packages:
       safe-regex: 1.1.0
     dev: true
 
-  /regexpp/3.2.0:
+  /regexpp@3.2.0:
     resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
     engines: {node: '>=8'}
     dev: true
 
-  /require-from-string/2.0.2:
+  /require-from-string@2.0.2:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /resolve-from/4.0.0:
+  /resolve-from@4.0.0:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
     engines: {node: '>=4'}
     dev: true
 
-  /resolve-from/5.0.0:
+  /resolve-from@5.0.0:
     resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
     engines: {node: '>=8'}
     dev: true
 
-  /resolve-url/0.2.1:
+  /resolve-url@0.2.1:
     resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
     deprecated: https://github.com/lydell/resolve-url#deprecated
     dev: true
 
-  /resolve/1.22.1:
+  /resolve@1.22.1:
     resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
     hasBin: true
     dependencies:
@@ -2618,45 +2647,45 @@ packages:
       supports-preserve-symlinks-flag: 1.0.0
     dev: true
 
-  /ret/0.1.15:
+  /ret@0.1.15:
     resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
     engines: {node: '>=0.12'}
     dev: true
 
-  /reusify/1.0.4:
+  /reusify@1.0.4:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
     dev: true
 
-  /rimraf/3.0.2:
+  /rimraf@3.0.2:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
     hasBin: true
     dependencies:
       glob: 7.2.3
     dev: true
 
-  /run-parallel/1.2.0:
+  /run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
     dependencies:
       queue-microtask: 1.2.3
     dev: true
 
-  /safe-buffer/5.2.1:
+  /safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
     dev: true
 
-  /safe-regex/1.1.0:
+  /safe-regex@1.1.0:
     resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==}
     dependencies:
       ret: 0.1.15
     dev: true
 
-  /semver/5.7.1:
+  /semver@5.7.1:
     resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
     hasBin: true
     dev: true
 
-  /semver/7.3.7:
+  /semver@7.3.7:
     resolution: {integrity: sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==}
     engines: {node: '>=10'}
     hasBin: true
@@ -2664,7 +2693,7 @@ packages:
       lru-cache: 6.0.0
     dev: true
 
-  /semver/7.3.8:
+  /semver@7.3.8:
     resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==}
     engines: {node: '>=10'}
     hasBin: true
@@ -2672,7 +2701,7 @@ packages:
       lru-cache: 6.0.0
     dev: true
 
-  /set-value/2.0.1:
+  /set-value@2.0.1:
     resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -2682,28 +2711,28 @@ packages:
       split-string: 3.1.0
     dev: true
 
-  /shebang-command/2.0.0:
+  /shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
     dependencies:
       shebang-regex: 3.0.0
     dev: true
 
-  /shebang-regex/3.0.0:
+  /shebang-regex@3.0.0:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
     dev: true
 
-  /signal-exit/3.0.7:
+  /signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
     dev: true
 
-  /slash/3.0.0:
+  /slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
     dev: true
 
-  /slice-ansi/4.0.0:
+  /slice-ansi@4.0.0:
     resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
     engines: {node: '>=10'}
     dependencies:
@@ -2712,7 +2741,7 @@ packages:
       is-fullwidth-code-point: 3.0.0
     dev: true
 
-  /snapdragon/0.8.2:
+  /snapdragon@0.8.2:
     resolution: {integrity: sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -2728,12 +2757,12 @@ packages:
       - supports-color
     dev: true
 
-  /source-map-js/1.0.2:
+  /source-map-js@1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /source-map-resolve/0.5.3:
+  /source-map-resolve@0.5.3:
     resolution: {integrity: sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==}
     deprecated: See https://github.com/lydell/source-map-resolve#deprecated
     dependencies:
@@ -2744,64 +2773,64 @@ packages:
       urix: 0.1.0
     dev: true
 
-  /source-map-support/0.5.21:
+  /source-map-support@0.5.21:
     resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
     dependencies:
       buffer-from: 1.1.2
       source-map: 0.6.1
     dev: true
 
-  /source-map-url/0.4.1:
+  /source-map-url@0.4.1:
     resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==}
     deprecated: See https://github.com/lydell/source-map-url#deprecated
     dev: true
 
-  /source-map/0.5.7:
+  /source-map@0.5.7:
     resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /source-map/0.6.1:
+  /source-map@0.6.1:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /spdx-correct/3.1.1:
+  /spdx-correct@3.1.1:
     resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==}
     dependencies:
       spdx-expression-parse: 3.0.1
       spdx-license-ids: 3.0.12
     dev: true
 
-  /spdx-exceptions/2.3.0:
+  /spdx-exceptions@2.3.0:
     resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==}
     dev: true
 
-  /spdx-expression-parse/3.0.1:
+  /spdx-expression-parse@3.0.1:
     resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
     dependencies:
       spdx-exceptions: 2.3.0
       spdx-license-ids: 3.0.12
     dev: true
 
-  /spdx-license-ids/3.0.12:
+  /spdx-license-ids@3.0.12:
     resolution: {integrity: sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==}
     dev: true
 
-  /split-string/3.1.0:
+  /split-string@3.1.0:
     resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       extend-shallow: 3.0.2
     dev: true
 
-  /standalone-electron-types/1.0.0:
+  /standalone-electron-types@1.0.0:
     resolution: {integrity: sha512-0HOi/tlTz3mjWhsAz4uRbpQcHMZ+ifj1JzWW9nugykOHClBBG77ps8QinrzX1eow4Iw2pnC+RFaSYRgufF4BOg==}
     dependencies:
       '@types/node': 18.11.18
     dev: true
 
-  /static-extend/0.1.2:
+  /static-extend@0.1.2:
     resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -2809,7 +2838,7 @@ packages:
       object-copy: 0.1.0
     dev: true
 
-  /string-width/4.2.3:
+  /string-width@4.2.3:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
     dependencies:
@@ -2818,36 +2847,36 @@ packages:
       strip-ansi: 6.0.1
     dev: true
 
-  /string_decoder/1.3.0:
+  /string_decoder@1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
     dependencies:
       safe-buffer: 5.2.1
     dev: true
 
-  /strip-ansi/6.0.1:
+  /strip-ansi@6.0.1:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
     dependencies:
       ansi-regex: 5.0.1
     dev: true
 
-  /strip-indent/3.0.0:
+  /strip-indent@3.0.0:
     resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
     engines: {node: '>=8'}
     dependencies:
       min-indent: 1.0.1
     dev: true
 
-  /strip-json-comments/3.1.1:
+  /strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
     dev: true
 
-  /style-search/0.1.0:
+  /style-search@0.1.0:
     resolution: {integrity: sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==}
     dev: true
 
-  /stylelint-config-recommended/9.0.0_stylelint@14.16.1:
+  /stylelint-config-recommended@9.0.0(stylelint@14.16.1):
     resolution: {integrity: sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ==}
     peerDependencies:
       stylelint: ^14.10.0
@@ -2855,21 +2884,21 @@ packages:
       stylelint: 14.16.1
     dev: true
 
-  /stylelint-config-standard/29.0.0_stylelint@14.16.1:
+  /stylelint-config-standard@29.0.0(stylelint@14.16.1):
     resolution: {integrity: sha512-uy8tZLbfq6ZrXy4JKu3W+7lYLgRQBxYTUUB88vPgQ+ZzAxdrvcaSUW9hOMNLYBnwH+9Kkj19M2DHdZ4gKwI7tg==}
     peerDependencies:
       stylelint: ^14.14.0
     dependencies:
       stylelint: 14.16.1
-      stylelint-config-recommended: 9.0.0_stylelint@14.16.1
+      stylelint-config-recommended: 9.0.0(stylelint@14.16.1)
     dev: true
 
-  /stylelint/14.16.1:
+  /stylelint@14.16.1:
     resolution: {integrity: sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@csstools/selector-specificity': 2.1.1_wajs5nedgkikc5pcuwett7legi
+      '@csstools/selector-specificity': 2.1.1(postcss-selector-parser@6.0.11)(postcss@8.4.21)
       balanced-match: 2.0.0
       colord: 2.9.3
       cosmiconfig: 7.1.0
@@ -2895,7 +2924,7 @@ packages:
       postcss: 8.4.21
       postcss-media-query-parser: 0.2.3
       postcss-resolve-nested-selector: 0.1.1
-      postcss-safe-parser: 6.0.0_postcss@8.4.21
+      postcss-safe-parser: 6.0.0(postcss@8.4.21)
       postcss-selector-parser: 6.0.11
       postcss-value-parser: 4.2.0
       resolve-from: 5.0.0
@@ -2911,21 +2940,21 @@ packages:
       - supports-color
     dev: true
 
-  /supports-color/5.5.0:
+  /supports-color@5.5.0:
     resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
     engines: {node: '>=4'}
     dependencies:
       has-flag: 3.0.0
     dev: true
 
-  /supports-color/7.2.0:
+  /supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
     engines: {node: '>=8'}
     dependencies:
       has-flag: 4.0.0
     dev: true
 
-  /supports-hyperlinks/2.3.0:
+  /supports-hyperlinks@2.3.0:
     resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==}
     engines: {node: '>=8'}
     dependencies:
@@ -2933,16 +2962,16 @@ packages:
       supports-color: 7.2.0
     dev: true
 
-  /supports-preserve-symlinks-flag/1.0.0:
+  /supports-preserve-symlinks-flag@1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
     dev: true
 
-  /svg-tags/1.0.0:
+  /svg-tags@1.0.0:
     resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==}
     dev: true
 
-  /table/6.8.1:
+  /table@6.8.1:
     resolution: {integrity: sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==}
     engines: {node: '>=10.0.0'}
     dependencies:
@@ -2953,7 +2982,7 @@ packages:
       strip-ansi: 6.0.1
     dev: true
 
-  /tar-fs/2.1.1:
+  /tar-fs@2.1.1:
     resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==}
     dependencies:
       chownr: 1.1.4
@@ -2962,7 +2991,7 @@ packages:
       tar-stream: 2.2.0
     dev: true
 
-  /tar-stream/2.2.0:
+  /tar-stream@2.2.0:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
     engines: {node: '>=6'}
     dependencies:
@@ -2973,29 +3002,29 @@ packages:
       readable-stream: 3.6.0
     dev: true
 
-  /text-table/0.2.0:
+  /text-table@0.2.0:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
     dev: true
 
-  /through/2.3.8:
+  /through@2.3.8:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
     dev: true
 
-  /to-object-path/0.3.0:
+  /to-object-path@0.3.0:
     resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       kind-of: 3.2.2
     dev: true
 
-  /to-regex-range/5.0.1:
+  /to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
     dependencies:
       is-number: 7.0.0
     dev: true
 
-  /to-regex/3.0.2:
+  /to-regex@3.0.2:
     resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -3005,20 +3034,20 @@ packages:
       safe-regex: 1.1.0
     dev: true
 
-  /tr46/0.0.3:
+  /tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
     dev: true
 
-  /trim-newlines/3.0.1:
+  /trim-newlines@3.0.1:
     resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
     engines: {node: '>=8'}
     dev: true
 
-  /tslib/1.14.1:
+  /tslib@1.14.1:
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tsutils/3.21.0_typescript@4.9.4:
+  /tsutils@3.21.0(typescript@4.9.4):
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
     peerDependencies:
@@ -3028,7 +3057,7 @@ packages:
       typescript: 4.9.4
     dev: true
 
-  /tsx/3.12.6:
+  /tsx@3.12.6:
     resolution: {integrity: sha512-q93WgS3lBdHlPgS0h1i+87Pt6n9K/qULIMNYZo07nSeu2z5QE2CellcAZfofVXBo2tQg9av2ZcRMQ2S2i5oadQ==}
     hasBin: true
     dependencies:
@@ -3039,52 +3068,52 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-  /type-check/0.4.0:
+  /type-check@0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.2.1
     dev: true
 
-  /type-fest/0.18.1:
+  /type-fest@0.18.1:
     resolution: {integrity: sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==}
     engines: {node: '>=10'}
     dev: true
 
-  /type-fest/0.20.2:
+  /type-fest@0.20.2:
     resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
     engines: {node: '>=10'}
     dev: true
 
-  /type-fest/0.6.0:
+  /type-fest@0.6.0:
     resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
     engines: {node: '>=8'}
     dev: true
 
-  /type-fest/0.8.1:
+  /type-fest@0.8.1:
     resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
     engines: {node: '>=8'}
     dev: true
 
-  /type-fest/3.5.3:
+  /type-fest@3.5.3:
     resolution: {integrity: sha512-V2+og4j/rWReWvaFrse3s9g2xvUv/K9Azm/xo6CjIuq7oeGqsoimC7+9/A3tfvNcbQf8RPSVj/HV81fB4DJrjA==}
     engines: {node: '>=14.16'}
     dev: true
 
-  /typescript/4.9.4:
+  /typescript@4.9.4:
     resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==}
     engines: {node: '>=4.2.0'}
     hasBin: true
     dev: true
 
-  /unbzip2-stream/1.4.3:
+  /unbzip2-stream@1.4.3:
     resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
     dependencies:
       buffer: 5.7.1
       through: 2.3.8
     dev: true
 
-  /union-value/1.0.1:
+  /union-value@1.0.1:
     resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -3094,7 +3123,7 @@ packages:
       set-value: 2.0.1
     dev: true
 
-  /unset-value/1.0.0:
+  /unset-value@1.0.0:
     resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
@@ -3102,68 +3131,68 @@ packages:
       isobject: 3.0.1
     dev: true
 
-  /uri-js/4.4.1:
+  /uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
       punycode: 2.1.1
     dev: true
 
-  /urix/0.1.0:
+  /urix@0.1.0:
     resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==}
     deprecated: Please see https://github.com/lydell/urix#deprecated
     dev: true
 
-  /use/3.1.1:
+  /use@3.1.1:
     resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /util-deprecate/1.0.2:
+  /util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
     dev: true
 
-  /v8-compile-cache/2.3.0:
+  /v8-compile-cache@2.3.0:
     resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==}
     dev: true
 
-  /validate-npm-package-license/3.0.4:
+  /validate-npm-package-license@3.0.4:
     resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
     dependencies:
       spdx-correct: 3.1.1
       spdx-expression-parse: 3.0.1
     dev: true
 
-  /virtual-merge/1.0.1:
+  /virtual-merge@1.0.1:
     resolution: {integrity: sha512-h7rzV6n5fZJbDu2lP4iu+IOtsZ00uqECFUxFePK1uY0pz/S5B7FNDJpmdDVfyGL7poyJECEHfTaIpJaknNkU0Q==}
     dev: false
 
-  /vscode-oniguruma/1.7.0:
+  /vscode-oniguruma@1.7.0:
     resolution: {integrity: sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==}
     dev: false
 
-  /vscode-textmate/5.2.0:
+  /vscode-textmate@5.2.0:
     resolution: {integrity: sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==}
     dev: false
 
-  /webidl-conversions/3.0.1:
+  /webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
     dev: true
 
-  /whatwg-url/5.0.0:
+  /whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
     dependencies:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
     dev: true
 
-  /which/1.3.1:
+  /which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
     hasBin: true
     dependencies:
       isexe: 2.0.0
     dev: true
 
-  /which/2.0.2:
+  /which@2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
     engines: {node: '>= 8'}
     hasBin: true
@@ -3171,16 +3200,16 @@ packages:
       isexe: 2.0.0
     dev: true
 
-  /word-wrap/1.2.3:
+  /word-wrap@1.2.3:
     resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /wrappy/1.0.2:
+  /wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
     dev: true
 
-  /write-file-atomic/4.0.2:
+  /write-file-atomic@4.0.2:
     resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
@@ -3188,7 +3217,7 @@ packages:
       signal-exit: 3.0.7
     dev: true
 
-  /ws/8.11.0:
+  /ws@8.11.0:
     resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
@@ -3201,28 +3230,28 @@ packages:
         optional: true
     dev: true
 
-  /yallist/4.0.0:
+  /yallist@4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
     dev: true
 
-  /yaml/1.10.2:
+  /yaml@1.10.2:
     resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
     engines: {node: '>= 6'}
     dev: true
 
-  /yargs-parser/20.2.9:
+  /yargs-parser@20.2.9:
     resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
     engines: {node: '>=10'}
     dev: true
 
-  /yauzl/2.10.0:
+  /yauzl@2.10.0:
     resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
     dependencies:
       buffer-crc32: 0.2.13
       fd-slicer: 1.1.0
     dev: true
 
-  /yocto-queue/0.1.0:
+  /yocto-queue@0.1.0:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
     dev: true

From 2672dea8e361e8216b9459ac5dac97d36a47e412 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 6 Apr 2023 03:33:16 +0200
Subject: [PATCH 131/147] ci: bump action

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 14f30840d..83fc57c55 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
             - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
 
             - name: Use Node.js 18
-              uses: actions/setup-node@v2
+              uses: actions/setup-node@v3
               with:
                   node-version: 18
                   cache: "pnpm"

From 97f8d4d5154d566568fc475d6aaba5db07399b2b Mon Sep 17 00:00:00 2001
From: Lewis Crichton <lewi@lewisakura.moe>
Date: Fri, 7 Apr 2023 01:27:18 +0100
Subject: [PATCH 132/147] feat: Cloud settings sync (#505)

Co-authored-by: Ven <vendicated@riseup.net>
---
 src/Vencord.ts                                |  29 ++-
 src/api/settings.ts                           |  27 +++
 src/components/VencordSettings/CloudTab.tsx   | 164 +++++++++++++++
 src/components/VencordSettings/index.tsx      |   4 +-
 .../VencordSettings/settingsStyles.css        |  11 +
 src/plugins/settings.tsx                      |   7 +
 src/utils/cloud.tsx                           | 124 ++++++++++++
 src/utils/localStorage.ts                     |  19 ++
 src/utils/settingsSync.ts                     | 191 +++++++++++++++++-
 9 files changed, 564 insertions(+), 12 deletions(-)
 create mode 100644 src/components/VencordSettings/CloudTab.tsx
 create mode 100644 src/utils/cloud.tsx
 create mode 100644 src/utils/localStorage.ts

diff --git a/src/Vencord.ts b/src/Vencord.ts
index 73b53e844..a23b1a8bf 100644
--- a/src/Vencord.ts
+++ b/src/Vencord.ts
@@ -30,17 +30,44 @@ import "./webpack/patchWebpack";
 import { showNotification } from "./api/Notifications";
 import { PlainSettings, Settings } from "./api/settings";
 import { patches, PMLogger, startAllPlugins } from "./plugins";
-import { checkForUpdates, rebuild, update,UpdateLogger } from "./utils/updater";
+import { localStorage } from "./utils/localStorage";
+import { getCloudSettings, putCloudSettings } from "./utils/settingsSync";
+import { checkForUpdates, rebuild, update, UpdateLogger } from "./utils/updater";
 import { onceReady } from "./webpack";
 import { SettingsRouter } from "./webpack/common";
 
 export let Components: any;
 
+async function syncSettings() {
+    if (
+        Settings.cloud.settingsSync && // if it's enabled
+        Settings.cloud.authenticated // if cloud integrations are enabled
+    ) {
+        if (localStorage.Vencord_settingsDirty) {
+            await putCloudSettings();
+            delete localStorage.Vencord_settingsDirty;
+        } else if (await getCloudSettings(false)) { // if we synchronized something (false means no sync)
+            // we show a notification here instead of allowing getCloudSettings() to show one to declutter the amount of
+            // potential notifications that might occur. getCloudSettings() will always send a notification regardless if
+            // there was an error to notify the user, but besides that we only want to show one notification instead of all
+            // of the possible ones it has (such as when your settings are newer).
+            showNotification({
+                title: "Cloud Settings",
+                body: "Your settings have been updated! Click here to restart to fully apply changes!",
+                color: "var(--green-360)",
+                onClick: () => window.DiscordNative.app.relaunch()
+            });
+        }
+    }
+}
+
 async function init() {
     await onceReady;
     startAllPlugins();
     Components = await import("./components");
 
+    syncSettings();
+
     if (!IS_WEB) {
         try {
             const isOutdated = await checkForUpdates();
diff --git a/src/api/settings.ts b/src/api/settings.ts
index 321a4c423..8a7d9ffd4 100644
--- a/src/api/settings.ts
+++ b/src/api/settings.ts
@@ -16,9 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { debounce } from "@utils/debounce";
 import IpcEvents from "@utils/IpcEvents";
+import { localStorage } from "@utils/localStorage";
 import Logger from "@utils/Logger";
 import { mergeDefaults } from "@utils/misc";
+import { putCloudSettings } from "@utils/settingsSync";
 import { DefinedSettings, OptionType, SettingsChecks, SettingsDefinition } from "@utils/types";
 import { React } from "@webpack/common";
 
@@ -49,6 +52,13 @@ export interface Settings {
         useNative: "always" | "never" | "not-focused";
         logLimit: number;
     };
+
+    cloud: {
+        authenticated: boolean;
+        url: string;
+        settingsSync: boolean;
+        settingsSyncVersion: number;
+    };
 }
 
 const DefaultSettings: Settings = {
@@ -69,6 +79,13 @@ const DefaultSettings: Settings = {
         position: "bottom-right",
         useNative: "not-focused",
         logLimit: 50
+    },
+
+    cloud: {
+        authenticated: false,
+        url: "https://api.vencord.dev/",
+        settingsSync: false,
+        settingsSyncVersion: 0
     }
 };
 
@@ -80,6 +97,13 @@ try {
     logger.error("An error occurred while loading the settings. Corrupt settings file?\n", err);
 }
 
+const saveSettingsOnFrequentAction = debounce(async () => {
+    if (Settings.cloud.settingsSync && Settings.cloud.authenticated) {
+        await putCloudSettings();
+        delete localStorage.Vencord_settingsDirty;
+    }
+}, 60_000);
+
 type SubscriptionCallback = ((newValue: any, path: string) => void) & { _path?: string; };
 const subscriptions = new Set<SubscriptionCallback>();
 
@@ -142,6 +166,9 @@ function makeProxy(settings: any, root = settings, path = ""): Settings {
                 }
             }
             // And don't forget to persist the settings!
+            PlainSettings.cloud.settingsSyncVersion = Date.now();
+            localStorage.Vencord_settingsDirty = true;
+            saveSettingsOnFrequentAction();
             VencordNative.ipc.invoke(IpcEvents.SET_SETTINGS, JSON.stringify(root, null, 4));
             return true;
         }
diff --git a/src/components/VencordSettings/CloudTab.tsx b/src/components/VencordSettings/CloudTab.tsx
new file mode 100644
index 000000000..3452cef5a
--- /dev/null
+++ b/src/components/VencordSettings/CloudTab.tsx
@@ -0,0 +1,164 @@
+/*
+ * 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 { Settings, useSettings } from "@api/settings";
+import { CheckedTextInput } from "@components/CheckedTextInput";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Link } from "@components/Link";
+import { authorizeCloud, cloudLogger, deauthorizeCloud, getCloudAuth, getCloudUrl } from "@utils/cloud";
+import { Margins } from "@utils/margins";
+import { deleteCloudSettings, getCloudSettings, putCloudSettings } from "@utils/settingsSync";
+import { Alerts, Button, Forms, Switch, Tooltip } from "@webpack/common";
+
+function validateUrl(url: string) {
+    try {
+        new URL(url);
+        return true;
+    } catch {
+        return "Invalid URL";
+    }
+}
+
+async function eraseAllData() {
+    const res = await fetch(new URL("/v1/", getCloudUrl()), {
+        method: "DELETE",
+        headers: new Headers({
+            Authorization: await getCloudAuth()
+        })
+    });
+
+    if (!res.ok) {
+        cloudLogger.error(`Failed to erase data, API returned ${res.status}`);
+        showNotification({
+            title: "Cloud Integrations",
+            body: `Could not erase all data (API returned ${res.status}), please contact support.`,
+            color: "var(--red-360)"
+        });
+        return;
+    }
+
+    Settings.cloud.authenticated = false;
+    await deauthorizeCloud();
+
+    showNotification({
+        title: "Cloud Integrations",
+        body: "Successfully erased all data.",
+        color: "var(--green-360)"
+    });
+}
+
+function SettingsSyncSection() {
+    const { cloud } = useSettings(["cloud.authenticated", "cloud.settingsSync"]);
+    const sectionEnabled = cloud.authenticated && cloud.settingsSync;
+
+    return (
+        <Forms.FormSection title="Settings Sync" className={Margins.top16}>
+            <Forms.FormText variant="text-md/normal" className={Margins.bottom20}>
+                Synchronize your settings to the cloud. This allows easy synchronization across multiple devices with
+                minimal effort.
+            </Forms.FormText>
+            <Switch
+                key="cloud-sync"
+                disabled={!cloud.authenticated}
+                value={cloud.settingsSync}
+                onChange={v => { cloud.settingsSync = v; }}
+            >
+                Settings Sync
+            </Switch>
+            <div className="vc-cloud-settings-sync-grid">
+                <Button
+                    size={Button.Sizes.SMALL}
+                    disabled={!sectionEnabled}
+                    onClick={() => putCloudSettings()}
+                >Sync to Cloud</Button>
+                <Tooltip text="This will overwrite your local settings with the ones on the cloud. Use wisely!">
+                    {({ onMouseLeave, onMouseEnter }) => (
+                        <Button
+                            onMouseLeave={onMouseLeave}
+                            onMouseEnter={onMouseEnter}
+                            size={Button.Sizes.SMALL}
+                            color={Button.Colors.RED}
+                            disabled={!sectionEnabled}
+                            onClick={() => getCloudSettings(true, true)}
+                        >Sync from Cloud</Button>
+                    )}
+                </Tooltip>
+                <Button
+                    size={Button.Sizes.SMALL}
+                    color={Button.Colors.RED}
+                    disabled={!sectionEnabled}
+                    onClick={() => deleteCloudSettings()}
+                >Delete Cloud Settings</Button>
+            </div>
+        </Forms.FormSection>
+    );
+}
+
+function CloudTab() {
+    const settings = useSettings(["cloud.authenticated", "cloud.url"]);
+
+    return (
+        <>
+            <Forms.FormSection title="Cloud Settings" className={Margins.top16}>
+                <Forms.FormText variant="text-md/normal" className={Margins.bottom20}>
+                    Vencord comes with a cloud integration that adds goodies like settings sync across devices.
+                    It <Link href="https://vencord.dev/cloud/privacy">respects your privacy</Link>, and
+                    the <Link href="https://github.com/Vencord/Backend">source code</Link> is AGPL 3.0 licensed so you
+                    can host it yourself.
+                </Forms.FormText>
+                <Switch
+                    key="backend"
+                    value={settings.cloud.authenticated}
+                    onChange={v => { v && authorizeCloud(); if (!v) settings.cloud.authenticated = v; }}
+                    note="This will request authorization if you have not yet set up cloud integrations."
+                >
+                    Enable Cloud Integrations
+                </Switch>
+                <Forms.FormTitle tag="h5">Backend URL</Forms.FormTitle>
+                <Forms.FormText className={Margins.bottom8}>
+                    Which backend to use when using cloud integrations.
+                </Forms.FormText>
+                <CheckedTextInput
+                    key="backendUrl"
+                    value={settings.cloud.url}
+                    onChange={v => { settings.cloud.url = v; settings.cloud.authenticated = false; deauthorizeCloud(); }}
+                    validate={validateUrl}
+                />
+                <Button
+                    className={Margins.top8}
+                    size={Button.Sizes.MEDIUM}
+                    color={Button.Colors.RED}
+                    disabled={!settings.cloud.authenticated}
+                    onClick={() => Alerts.show({
+                        title: "Are you sure?",
+                        body: "Once your data is erased, we cannot recover it. There's no going back!",
+                        onConfirm: eraseAllData,
+                        confirmText: "Erase it!",
+                        confirmColor: "vc-cloud-erase-data-danger-btn",
+                        cancelText: "Nevermind"
+                    })}
+                >Erase All Data</Button>
+                <Forms.FormDivider className={Margins.top16} />
+            </Forms.FormSection >
+            <SettingsSyncSection />
+        </>
+    );
+}
+
+export default ErrorBoundary.wrap(CloudTab);
diff --git a/src/components/VencordSettings/index.tsx b/src/components/VencordSettings/index.tsx
index cd6ce604a..c15944c76 100644
--- a/src/components/VencordSettings/index.tsx
+++ b/src/components/VencordSettings/index.tsx
@@ -24,6 +24,7 @@ import { handleComponentFailed } from "@components/handleComponentFailed";
 import { Forms, SettingsRouter, TabBar, Text } from "@webpack/common";
 
 import BackupRestoreTab from "./BackupRestoreTab";
+import CloudTab from "./CloudTab";
 import PluginsTab from "./PluginsTab";
 import ThemesTab from "./ThemesTab";
 import Updater from "./Updater";
@@ -45,7 +46,8 @@ const SettingsTabs: Record<string, SettingsTab> = {
     VencordPlugins: { name: "Plugins", component: () => <PluginsTab /> },
     VencordThemes: { name: "Themes", component: () => <ThemesTab /> },
     VencordUpdater: { name: "Updater" }, // Only show updater if IS_WEB is false
-    VencordSettingsSync: { name: "Backup & Restore", component: () => <BackupRestoreTab /> },
+    VencordCloud: { name: "Cloud", component: () => <CloudTab /> },
+    VencordSettingsSync: { name: "Backup & Restore", component: () => <BackupRestoreTab /> }
 };
 
 if (!IS_WEB) SettingsTabs.VencordUpdater.component = () => Updater && <Updater />;
diff --git a/src/components/VencordSettings/settingsStyles.css b/src/components/VencordSettings/settingsStyles.css
index 709c8236f..ebc112c05 100644
--- a/src/components/VencordSettings/settingsStyles.css
+++ b/src/components/VencordSettings/settingsStyles.css
@@ -46,3 +46,14 @@
     padding: 0.5em;
     border: 1px solid var(--background-modifier-accent);
 }
+
+.vc-cloud-settings-sync-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    grid-gap: 1em;
+}
+
+.vc-cloud-erase-data-danger-btn {
+    color: var(--white-500);
+    background-color: var(--button-danger-background);
+}
diff --git a/src/plugins/settings.tsx b/src/plugins/settings.tsx
index 8db0a4e05..c8a6372af 100644
--- a/src/plugins/settings.tsx
+++ b/src/plugins/settings.tsx
@@ -106,6 +106,13 @@ export default definePlugin({
                 onClick: makeOnClick("VencordUpdater")
             });
 
+        cats.push({
+            section: "VencordCloud",
+            label: "Cloud",
+            element: () => <SettingsComponent tab="VencordCloud" />,
+            onClick: makeOnClick("VencordCloud")
+        });
+
         cats.push({
             section: "VencordSettingsSync",
             label: "Backup & Restore",
diff --git a/src/utils/cloud.tsx b/src/utils/cloud.tsx
new file mode 100644
index 000000000..b31091f08
--- /dev/null
+++ b/src/utils/cloud.tsx
@@ -0,0 +1,124 @@
+/*
+ * 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 * 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 Logger from "./Logger";
+import { openModal } from "./modal";
+
+export const cloudLogger = new Logger("Cloud", "#39b7e0");
+export const getCloudUrl = () => new URL(Settings.cloud.url);
+
+export async function getAuthorization() {
+    const secrets = await DataStore.get<Record<string, string>>("Vencord_cloudSecret") ?? {};
+    return secrets[getCloudUrl().origin];
+}
+
+async function setAuthorization(secret: string) {
+    await DataStore.update<Record<string, string>>("Vencord_cloudSecret", secrets => {
+        secrets ??= {};
+        secrets[getCloudUrl().origin] = secret;
+        return secrets;
+    });
+}
+
+export async function deauthorizeCloud() {
+    await DataStore.update<Record<string, string>>("Vencord_cloudSecret", secrets => {
+        secrets ??= {};
+        delete secrets[getCloudUrl().origin];
+        return secrets;
+    });
+}
+
+export async function authorizeCloud() {
+    if (await getAuthorization() !== undefined) {
+        Settings.cloud.authenticated = true;
+        return;
+    }
+
+    try {
+        const oauthConfiguration = await fetch(new URL("/v1/oauth/settings", getCloudUrl()));
+        var { clientId, redirectUri } = await oauthConfiguration.json();
+    } catch {
+        showNotification({
+            title: "Cloud Integration",
+            body: "Setup failed (couldn't retrieve OAuth configuration)."
+        });
+        Settings.cloud.authenticated = false;
+        return;
+    }
+
+    const { OAuth2AuthorizeModal } = findByProps("OAuth2AuthorizeModal");
+
+    openModal((props: any) => <OAuth2AuthorizeModal
+        {...props}
+        scopes={["identify"]}
+        responseType="code"
+        redirectUri={redirectUri}
+        permissions={0n}
+        clientId={clientId}
+        cancelCompletesFlow={false}
+        callback={async (callbackUrl: string) => {
+            if (!callbackUrl) {
+                Settings.cloud.authenticated = false;
+                return;
+            }
+
+            try {
+                const res = await fetch(callbackUrl, {
+                    headers: new Headers({ Accept: "application/json" })
+                });
+                const { secret } = await res.json();
+                if (secret) {
+                    cloudLogger.info("Authorized with secret");
+                    await setAuthorization(secret);
+                    showNotification({
+                        title: "Cloud Integration",
+                        body: "Cloud integrations enabled!"
+                    });
+                    Settings.cloud.authenticated = true;
+                } else {
+                    showNotification({
+                        title: "Cloud Integration",
+                        body: "Setup failed (no secret returned?)."
+                    });
+                    Settings.cloud.authenticated = false;
+                }
+            } catch (e: any) {
+                cloudLogger.error("Failed to authorize", e);
+                showNotification({
+                    title: "Cloud Integration",
+                    body: `Setup failed (${e.toString()}).`
+                });
+                Settings.cloud.authenticated = false;
+            }
+        }
+        }
+    />);
+}
+
+export async function getCloudAuth() {
+    const userId = UserStore.getCurrentUser().id;
+    const secret = await getAuthorization();
+
+    return window.btoa(`${secret}:${userId}`);
+}
diff --git a/src/utils/localStorage.ts b/src/utils/localStorage.ts
new file mode 100644
index 000000000..8730bb2c3
--- /dev/null
+++ b/src/utils/localStorage.ts
@@ -0,0 +1,19 @@
+/*
+ * 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 { localStorage } = window;
diff --git a/src/utils/settingsSync.ts b/src/utils/settingsSync.ts
index 781899f00..d59787d5f 100644
--- a/src/utils/settingsSync.ts
+++ b/src/utils/settingsSync.ts
@@ -16,8 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { showNotification } from "@api/Notifications";
+import { PlainSettings, Settings } from "@api/settings";
 import { Toasts } from "@webpack/common";
+import { deflateSync, inflateSync } from "fflate";
 
+import { getCloudAuth, getCloudUrl } from "./cloud";
 import IpcEvents from "./IpcEvents";
 import Logger from "./Logger";
 
@@ -64,17 +68,18 @@ export async function downloadSettingsBackup() {
     }
 }
 
-const toastSuccess = () => Toasts.show({
-    type: Toasts.Type.SUCCESS,
-    message: "Settings successfully imported. Restart to apply changes!",
-    id: Toasts.genId()
-});
+const toast = (type: number, message: string) =>
+    Toasts.show({
+        type,
+        message,
+        id: Toasts.genId()
+    });
 
-const toastFailure = (err: any) => Toasts.show({
-    type: Toasts.Type.FAILURE,
-    message: `Failed to import settings: ${String(err)}`,
-    id: Toasts.genId()
-});
+const toastSuccess = () =>
+    toast(Toasts.Type.SUCCESS, "Settings successfully imported. Restart to apply changes!");
+
+const toastFailure = (err: any) =>
+    toast(Toasts.Type.FAILURE, `Failed to import settings: ${String(err)}`);
 
 export async function uploadSettingsBackup(showToast = true): Promise<void> {
     if (IS_DISCORD_DESKTOP) {
@@ -121,3 +126,169 @@ export async function uploadSettingsBackup(showToast = true): Promise<void> {
         setImmediate(() => document.body.removeChild(input));
     }
 }
+
+// Cloud settings
+const cloudSettingsLogger = new Logger("Cloud:Settings", "#39b7e0");
+
+export async function putCloudSettings() {
+    const settings = await exportSettings();
+
+    try {
+        const res = await fetch(new URL("/v1/settings", getCloudUrl()), {
+            method: "PUT",
+            headers: new Headers({
+                Authorization: await getCloudAuth(),
+                "Content-Type": "application/octet-stream"
+            }),
+            body: deflateSync(new TextEncoder().encode(settings))
+        });
+
+        if (!res.ok) {
+            cloudSettingsLogger.error(`Failed to sync up, API returned ${res.status}`);
+            showNotification({
+                title: "Cloud Settings",
+                body: `Could not synchronize settings to cloud (API returned ${res.status}).`,
+                color: "var(--red-360)"
+            });
+            return;
+        }
+
+        const { written } = await res.json();
+        PlainSettings.cloud.settingsSyncVersion = written;
+        VencordNative.ipc.invoke(IpcEvents.SET_SETTINGS, JSON.stringify(PlainSettings, null, 4));
+
+        cloudSettingsLogger.info("Settings uploaded to cloud successfully");
+        showNotification({
+            title: "Cloud Settings",
+            body: "Synchronized your settings to the cloud!",
+            color: "var(--green-360)"
+        });
+    } catch (e: any) {
+        cloudSettingsLogger.error("Failed to sync up", e);
+        showNotification({
+            title: "Cloud Settings",
+            body: `Could not synchronize settings to the cloud (${e.toString()}).`,
+            color: "var(--red-360)"
+        });
+    }
+}
+
+export async function getCloudSettings(shouldNotify = true, force = false) {
+    try {
+        const res = await fetch(new URL("/v1/settings", getCloudUrl()), {
+            method: "GET",
+            headers: new Headers({
+                Authorization: await getCloudAuth(),
+                Accept: "application/octet-stream",
+                "If-None-Match": Settings.cloud.settingsSyncVersion.toString()
+            }),
+        });
+
+        if (res.status === 404) {
+            cloudSettingsLogger.info("No settings on the cloud");
+            if (shouldNotify)
+                showNotification({
+                    title: "Cloud Settings",
+                    body: "There are no settings in the cloud."
+                });
+            return false;
+        }
+
+        if (res.status === 304) {
+            cloudSettingsLogger.info("Settings up to date");
+            if (shouldNotify)
+                showNotification({
+                    title: "Cloud Settings",
+                    body: "Your settings are up to date."
+                });
+            return false;
+        }
+
+        if (!res.ok) {
+            cloudSettingsLogger.error(`Failed to sync down, API returned ${res.status}`);
+            showNotification({
+                title: "Cloud Settings",
+                body: `Could not synchronize settings from the cloud (API returned ${res.status}).`,
+                color: "var(--red-360)"
+            });
+            return false;
+        }
+
+        const written = Number(res.headers.get("etag")!);
+        const localWritten = Settings.cloud.settingsSyncVersion;
+
+        // don't need to check for written > localWritten because the server will return 304 due to if-none-match
+        if (!force && written < localWritten) {
+            if (shouldNotify)
+                showNotification({
+                    title: "Cloud Settings",
+                    body: "Your local settings are newer than the cloud ones."
+                });
+            return;
+        }
+
+        const data = await res.arrayBuffer();
+
+        const settings = new TextDecoder().decode(inflateSync(new Uint8Array(data)));
+        await importSettings(settings);
+
+        // sync with server timestamp instead of local one
+        PlainSettings.cloud.settingsSyncVersion = written;
+        VencordNative.ipc.invoke(IpcEvents.SET_SETTINGS, JSON.stringify(PlainSettings, null, 4));
+
+        cloudSettingsLogger.info("Settings loaded from cloud successfully");
+        if (shouldNotify)
+            showNotification({
+                title: "Cloud Settings",
+                body: "Your settings have been updated! Click here to restart to fully apply changes!",
+                color: "var(--green-360)",
+                onClick: () => window.DiscordNative.app.relaunch()
+            });
+
+        return true;
+    } catch (e: any) {
+        cloudSettingsLogger.error("Failed to sync down", e);
+        showNotification({
+            title: "Cloud Settings",
+            body: `Could not synchronize settings from the cloud (${e.toString()}).`,
+            color: "var(--red-360)"
+        });
+
+        return false;
+    }
+}
+
+export async function deleteCloudSettings() {
+    try {
+        const res = await fetch(new URL("/v1/settings", getCloudUrl()), {
+            method: "DELETE",
+            headers: new Headers({
+                Authorization: await getCloudAuth()
+            }),
+        });
+
+        if (!res.ok) {
+            cloudSettingsLogger.error(`Failed to delete, API returned ${res.status}`);
+            showNotification({
+                title: "Cloud Settings",
+                body: `Could not delete settings (API returned ${res.status}).`,
+                color: "var(--red-360)"
+            });
+            return;
+        }
+
+        cloudSettingsLogger.info("Settings deleted from cloud successfully");
+        showNotification({
+            title: "Cloud Settings",
+            body: "Settings deleted from cloud!",
+            color: "var(--green-360)"
+        });
+    } catch (e: any) {
+        cloudSettingsLogger.error("Failed to delete", e);
+        showNotification({
+            title: "Cloud Settings",
+            body: `Could not delete settings (${e.toString()}).`,
+            color: "var(--red-360)"
+        });
+    }
+}

From 2a0c30b66d9c49eca2c6c34f438dbfdfcd338f6e Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Fri, 7 Apr 2023 08:31:21 +0800
Subject: [PATCH 133/147] feat(moreusertags): add option to not show more tags
 for bots (#812)

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

diff --git a/src/plugins/moreUserTags.ts b/src/plugins/moreUserTags.ts
index ba2a9b762..c8420ff30 100644
--- a/src/plugins/moreUserTags.ts
+++ b/src/plugins/moreUserTags.ts
@@ -83,6 +83,10 @@ const tags: Tag[] = [
 ];
 
 const settings = definePluginSettings({
+    dontShowForBots: {
+        description: "Don't show tags (not including the webhook tag) for bots",
+        type: OptionType.BOOLEAN
+    },
     dontShowBotTag: {
         description: "Don't show [BOT] text for bots with other tags (verified bots will still have checkmark)",
         type: OptionType.BOOLEAN
@@ -214,6 +218,8 @@ return type!==null?$2.botTag,type"
         const [tagName, variant] = passedTagName.split("-");
         const tag = tags.find(({ name }) => tagName === name);
         if (!tag) return "BOT";
+        if (variant === "BOT" && tagName !== "WEBHOOK" && this.settings.store.dontShowForBots) return strings.BOT_TAG_BOT;
+
         switch (variant) {
             case "OP":
                 return `${strings.BOT_TAG_FORUM_ORIGINAL_POSTER} • ${tag.displayName}`;

From 8fefa2b7163943fee3269ca4fcebabde7a253ac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90=E1=BB=97=20V=C4=83n=20Ho=C3=A0i=20Tu=C3=A2n?=
 <htuan03@gmail.com>
Date: Fri, 7 Apr 2023 12:15:11 -0700
Subject: [PATCH 134/147] FakeNitro: Fix stickers with space in name #819
 (#820)

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

diff --git a/src/plugins/fakeNitro.tsx b/src/plugins/fakeNitro.tsx
index 0a42ab1de..d8805f4f8 100644
--- a/src/plugins/fakeNitro.tsx
+++ b/src/plugins/fakeNitro.tsx
@@ -147,7 +147,7 @@ migratePluginSettings("FakeNitro", "NitroBypass");
 
 export default definePlugin({
     name: "FakeNitro",
-    authors: [Devs.Arjix, Devs.D3SOX, Devs.Ven, Devs.obscurity, Devs.captain, Devs.Nuckyz],
+    authors: [Devs.Arjix, Devs.D3SOX, Devs.Ven, Devs.obscurity, Devs.captain, Devs.Nuckyz, Devs.AutumnVN],
     description: "Allows you to stream in nitro quality, send fake emojis/stickers and use client themes.",
     dependencies: ["MessageEventsAPI"],
 
@@ -679,7 +679,7 @@ export default definePlugin({
                     }
 
                     delete extra.stickerIds;
-                    messageObj.content += " " + link + `&name=${sticker.name}`;
+                    messageObj.content += " " + link + `&name=${encodeURIComponent(sticker.name)}`;
                 }
             }
 

From f1f61195c3fe8f104e40e20ccd01cca17c79d993 Mon Sep 17 00:00:00 2001
From: exit <67079527+exitss@users.noreply.github.com>
Date: Fri, 7 Apr 2023 20:16:18 +0100
Subject: [PATCH 135/147] InvisibleChat: Add missing dependency on
 MessagePopoverAPI (#817)

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

diff --git a/src/plugins/invisibleChat/index.tsx b/src/plugins/invisibleChat/index.tsx
index d30bb7ccb..97542e77b 100644
--- a/src/plugins/invisibleChat/index.tsx
+++ b/src/plugins/invisibleChat/index.tsx
@@ -119,6 +119,7 @@ export default definePlugin({
     name: "InvisibleChat",
     description: "Encrypt your Messages in a non-suspicious way! This plugin makes requests to >>https://embed.sammcheese.net<< to provide embeds to decrypted links!",
     authors: [Devs.SammCheese],
+    dependencies: ["MessagePopoverAPI"],
     patches: [
         {
             // Indicator

From 1432baa28b60bfe995faaa327e6cf5670d11cc36 Mon Sep 17 00:00:00 2001
From: LordElias <55048695+LordEliasTM@users.noreply.github.com>
Date: Fri, 7 Apr 2023 21:17:54 +0200
Subject: [PATCH 136/147] ignore userplugins when linting (#822)

Co-authored-by: V <vendicated@riseup.net>
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e6403c6e3..c0445639f 100644
--- a/package.json
+++ b/package.json
@@ -21,8 +21,8 @@
         "buildWeb": "node --require=./scripts/suppressExperimentalWarnings.js scripts/build/buildWeb.mjs",
         "generatePluginJson": "tsx scripts/generatePluginList.ts",
         "inject": "node scripts/runInstaller.mjs",
-        "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
-        "lint-styles": "stylelint \"src/**/*.css\"",
+        "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",
         "testWeb": "pnpm lint && pnpm buildWeb && pnpm testTsc",

From 7c514e4b1dae25f48b20bc6d5f3025c22e231450 Mon Sep 17 00:00:00 2001
From: exit <67079527+exitss@users.noreply.github.com>
Date: Fri, 7 Apr 2023 20:19:12 +0100
Subject: [PATCH 137/147] SupportHelper: Add missing dependency - CommandsAPI
 (#823)

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

diff --git a/src/plugins/supportHelper.tsx b/src/plugins/supportHelper.tsx
index 0ba6e36e9..92a5f84eb 100644
--- a/src/plugins/supportHelper.tsx
+++ b/src/plugins/supportHelper.tsx
@@ -35,6 +35,7 @@ export default definePlugin({
     required: true,
     description: "Helps us provide support to you",
     authors: [Devs.Ven],
+    dependencies: ["CommandsAPI"],
 
     commands: [{
         name: "vencord-debug",

From eaf1af75bd9df5fa70df2a4011d21c1e609519fb Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sat, 8 Apr 2023 03:51:37 +0200
Subject: [PATCH 138/147] WebContextMenus: Port more menus (#818)

Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
---
 src/plugins/moreUserTags.ts        |   3 +-
 src/plugins/webContextMenus.web.ts | 218 ++++++++++++++++++++++++++---
 src/utils/settingsSync.ts          |  13 +-
 src/utils/web.ts                   |  30 ++++
 4 files changed, 232 insertions(+), 32 deletions(-)
 create mode 100644 src/utils/web.ts

diff --git a/src/plugins/moreUserTags.ts b/src/plugins/moreUserTags.ts
index c8420ff30..e45e30a43 100644
--- a/src/plugins/moreUserTags.ts
+++ b/src/plugins/moreUserTags.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { definePluginSettings, migratePluginSettings } from "@api/settings";
+import { definePluginSettings } from "@api/settings";
 import { Devs } from "@utils/constants";
 import { proxyLazy } from "@utils/proxyLazy.js";
 import definePlugin, { OptionType } from "@utils/types";
@@ -115,7 +115,6 @@ const settings = definePluginSettings({
     ]))
 });
 
-migratePluginSettings("MoreUserTags", "Webhook Tags");
 export default definePlugin({
     name: "MoreUserTags",
     description: "Adds tags for webhooks and moderative roles (owner, admin, etc.)",
diff --git a/src/plugins/webContextMenus.web.ts b/src/plugins/webContextMenus.web.ts
index 56990e1ba..e1c9725dc 100644
--- a/src/plugins/webContextMenus.web.ts
+++ b/src/plugins/webContextMenus.web.ts
@@ -16,31 +16,211 @@
  * 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";
+import { saveFile } from "@utils/web";
+import { findByProps, findLazy } from "@webpack";
+import { Clipboard } from "@webpack/common";
+
+async function fetchImage(url: string) {
+    const res = await fetch(url);
+    if (res.status !== 200) return;
+
+    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
+    // menu handler instead of the web one, which breaks the other menus that aren't enabled
+    addBack: {
+        type: OptionType.BOOLEAN,
+        description: "Add back the Discord context menus for images, links and the chat input bar",
+        // Web slate menu has proper spellcheck suggestions and image context menu is also pretty good,
+        // so disable this by default. Vencord Desktop just doesn't, so enable by default
+        default: IS_VENCORD_DESKTOP,
+        restartNeeded: true
+    }
+});
 
 export default definePlugin({
     name: "WebContextMenus",
-    description: "Re-adds some of context menu items missing on the web version of Discord, namely Copy/Open Link",
+    description: "Re-adds context menus missing in the web version of Discord: Images, ChatInputBar, Links, 'Copy Link', 'Open Link', 'Copy Image', 'Save Image'",
     authors: [Devs.Ven],
     enabledByDefault: true,
 
-    patches: [{
-        // There is literally no reason for Discord to make this Desktop only.
-        // The only thing broken is copy, but they already have a different copy function
-        // with web support????
-        find: "open-native-link",
-        replacement: [
-            {
-                // if (isNative || null ==
-                match: /if\(!\w\..{1,3}\|\|null==/,
-                replace: "if(null=="
-            },
-            // Fix silly Discord calling the non web support copy
-            {
-                match: /\w\.default\.copy/,
-                replace: "Vencord.Webpack.Common.Clipboard.copy"
+    settings,
+
+    start() {
+        if (settings.store.addBack) {
+            const ctxMenuCallbacks = findByProps("contextMenuCallbackNative");
+            window.removeEventListener("contextmenu", ctxMenuCallbacks.contextMenuCallbackWeb);
+            window.addEventListener("contextmenu", ctxMenuCallbacks.contextMenuCallbackNative);
+            this.changedListeners = true;
+        }
+    },
+
+    stop() {
+        if (this.changedListeners) {
+            const ctxMenuCallbacks = findByProps("contextMenuCallbackNative");
+            window.removeEventListener("contextmenu", ctxMenuCallbacks.contextMenuCallbackNative);
+            window.addEventListener("contextmenu", ctxMenuCallbacks.contextMenuCallbackWeb);
+        }
+    },
+
+    patches: [
+        // Add back Copy & Open Link
+        {
+            // There is literally no reason for Discord to make this Desktop only.
+            // The only thing broken is copy, but they already have a different copy function
+            // with web support????
+            find: "open-native-link",
+            replacement: [
+                {
+                    // if (IS_DESKTOP || null == ...)
+                    match: /if\(!\i\.\i\|\|null==/,
+                    replace: "if(null=="
+                },
+                // Fix silly Discord calling the non web support copy
+                {
+                    match: /\w\.default\.copy/,
+                    replace: "Vencord.Webpack.Common.Clipboard.copy"
+                }
+            ]
+        },
+
+        // Add back Copy & Save Image
+        {
+            find: 'id:"copy-image"',
+            replacement: [
+                {
+                    // if (!IS_WEB || null ==
+                    match: /if\(!\i\.\i\|\|null==/,
+                    replace: "if(null=="
+                },
+                {
+                    match: /return\s*?\[\i\.default\.canCopyImage\(\)/,
+                    replace: "return [true"
+                },
+                {
+                    match: /(?<=COPY_IMAGE_MENU_ITEM,)action:/,
+                    replace: "action:()=>$self.copyImage(arguments[0]),oldAction:"
+                },
+                {
+                    match: /(?<=SAVE_IMAGE_MENU_ITEM,)action:/,
+                    replace: "action:()=>$self.saveImage(arguments[0]),oldAction:"
+                },
+            ]
+        },
+
+        // Add back image context menu
+        {
+            find: 'navId:"image-context"',
+            predicate: () => settings.store.addBack,
+            replacement: {
+                // return IS_DESKTOP ? React.createElement(Menu, ...)
+                match: /return \i\.\i\?(?=\(0,\i\.jsxs?\)\(\i\.Menu)/,
+                replace: "return true?"
             }
-        ]
-    }]
+        },
+
+        // Add back link context menu
+        {
+            find: '"interactionUsernameProfile"',
+            predicate: () => settings.store.addBack,
+            replacement: {
+                match: /if\("A"===\i\.tagName&&""!==\i\.textContent\)/,
+                replace: "if(false)"
+            }
+        },
+
+        // Add back slate / text input context menu
+        {
+            find: '"slate-toolbar"',
+            predicate: () => settings.store.addBack,
+            replacement: {
+                match: /(?<=\.handleContextMenu=.+?"bottom";)\i\.\i\?/,
+                replace: "true?"
+            }
+        },
+        {
+            find: 'navId:"textarea-context"',
+            predicate: () => settings.store.addBack,
+            replacement: [
+                {
+                    // desktopOnlyEntries = makeEntries(), spellcheckChildren = desktopOnlyEntries[0], languageChildren = desktopOnlyEntries[1]
+                    match: /\i=.{0,30}text:\i,target:\i,onHeightUpdate:\i\}\),2\),(\i)=\i\[0\],(\i)=\i\[1\]/,
+                    // set spellcheckChildren & languageChildren to empty arrays, so just in case patch 3 fails, we don't
+                    // reference undefined variables
+                    replace: "$1=[],$2=[]",
+                },
+                {
+                    // if (!IS_DESKTOP) return
+                    match: /(?<=showApplicationCommandSuggestions;)if\(!\i\.\i\)/,
+                    replace: "if(false)"
+                },
+                {
+                    // do not add menu items for entries removed in patch 1. Using a lookbehind for group 1 is slow,
+                    // so just capture and add back
+                    match: /("submit-button".+?)(\(0,\i\.jsx\)\(\i\.MenuGroup,\{children:\i\}\),){2}/,
+                    replace: "$1"
+                },
+                {
+                    // Change calls to DiscordNative.clipboard to us instead
+                    match: /\b\i\.default\.(copy|cut|paste)/g,
+                    replace: "$self.$1"
+                }
+            ]
+        }
+
+        // TODO: Maybe add spellcheck for VencordDesktop
+    ],
+
+    async copyImage(url: string) {
+        const data = await fetchImage(url);
+        if (!data) return;
+
+        await navigator.clipboard.write([
+            new ClipboardItem({
+                [data.type]: data
+            })
+        ]);
+    },
+
+    async saveImage(url: string) {
+        const data = await fetchImage(url);
+        if (!data) return;
+
+        const name = url.split("/").pop()!;
+        const file = new File([data], name, { type: data.type });
+
+        saveFile(file);
+    },
+
+    copy() {
+        const selection = document.getSelection();
+        if (!selection) return;
+
+        Clipboard.copy(selection.toString());
+    },
+
+    cut() {
+        this.copy();
+        MiniDispatcher.dispatch("INSERT_TEXT", { rawText: "" });
+    },
+
+    async paste() {
+        const text = await navigator.clipboard.readText();
+
+        const data = new DataTransfer();
+        data.setData("text/plain", text);
+
+        document.dispatchEvent(
+            new ClipboardEvent("paste", {
+                clipboardData: data
+            })
+        );
+    }
 });
diff --git a/src/utils/settingsSync.ts b/src/utils/settingsSync.ts
index d59787d5f..61fd37ea7 100644
--- a/src/utils/settingsSync.ts
+++ b/src/utils/settingsSync.ts
@@ -24,6 +24,7 @@ import { deflateSync, inflateSync } from "fflate";
 import { getCloudAuth, getCloudUrl } from "./cloud";
 import IpcEvents from "./IpcEvents";
 import Logger from "./Logger";
+import { saveFile } from "./web";
 
 export async function importSettings(data: string) {
     try {
@@ -54,17 +55,7 @@ export async function downloadSettingsBackup() {
     if (IS_DISCORD_DESKTOP) {
         DiscordNative.fileManager.saveWithDialog(data, filename);
     } else {
-        const file = new File([data], filename, { type: "application/json" });
-        const a = document.createElement("a");
-        a.href = URL.createObjectURL(file);
-        a.download = filename;
-
-        document.body.appendChild(a);
-        a.click();
-        setImmediate(() => {
-            URL.revokeObjectURL(a.href);
-            document.body.removeChild(a);
-        });
+        saveFile(new File([data], filename, { type: "application/json" }));
     }
 }
 
diff --git a/src/utils/web.ts b/src/utils/web.ts
new file mode 100644
index 000000000..9cfe71847
--- /dev/null
+++ b/src/utils/web.ts
@@ -0,0 +1,30 @@
+/*
+ * 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 function saveFile(file: File) {
+    const a = document.createElement("a");
+    a.href = URL.createObjectURL(file);
+    a.download = file.name;
+
+    document.body.appendChild(a);
+    a.click();
+    setImmediate(() => {
+        URL.revokeObjectURL(a.href);
+        document.body.removeChild(a);
+    });
+}

From 09e919f0c65329be99bc2f824a0819d58020fef5 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 8 Apr 2023 03:53:32 +0200
Subject: [PATCH 139/147] bump to 1.1.6

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

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

From 0dee968e980f2626715df5db7a9269c3c5098f72 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 8 Apr 2023 22:57:34 +0200
Subject: [PATCH 140/147] WebContextMenus: Don't include queryparams in
 filename on save

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

diff --git a/src/plugins/webContextMenus.web.ts b/src/plugins/webContextMenus.web.ts
index e1c9725dc..6b193e599 100644
--- a/src/plugins/webContextMenus.web.ts
+++ b/src/plugins/webContextMenus.web.ts
@@ -193,7 +193,7 @@ export default definePlugin({
         const data = await fetchImage(url);
         if (!data) return;
 
-        const name = url.split("/").pop()!;
+        const name = new URL(url).pathname.split("/").pop()!;
         const file = new File([data], name, { type: data.type });
 
         saveFile(file);

From acc874c34fac42422fcaedb2345f56d1e2d5bd74 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 8 Apr 2023 23:05:38 +0200
Subject: [PATCH 141/147] WebContextMenus: Fix jpegs being uncopyable

---
 src/plugins/webContextMenus.web.ts | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/plugins/webContextMenus.web.ts b/src/plugins/webContextMenus.web.ts
index 6b193e599..2e9d58147 100644
--- a/src/plugins/webContextMenus.web.ts
+++ b/src/plugins/webContextMenus.web.ts
@@ -179,14 +179,25 @@ export default definePlugin({
     ],
 
     async copyImage(url: string) {
-        const data = await fetchImage(url);
-        if (!data) 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();
+        img.onload = () => {
+            const canvas = document.createElement("canvas");
+            canvas.width = img.naturalWidth;
+            canvas.height = img.naturalHeight;
+            canvas.getContext("2d")!.drawImage(img, 0, 0);
 
-        await navigator.clipboard.write([
-            new ClipboardItem({
-                [data.type]: data
-            })
-        ]);
+            canvas.toBlob(data => {
+                navigator.clipboard.write([
+                    new ClipboardItem({
+                        "image/png": data!
+                    })
+                ]);
+            }, "image/png");
+        };
+        img.crossOrigin = "anonymous";
+        img.src = url;
     },
 
     async saveImage(url: string) {

From 840da146b968b4db7616f5528f1a2b0d24e9517a Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 8 Apr 2023 23:28:12 +0200
Subject: [PATCH 142/147] UX: Make possibly copy-relevant text in settings
 copyable

---
 src/components/PatchHelper.tsx                 |  5 +++--
 src/components/PluginSettings/PluginModal.tsx  |  7 ++++---
 .../VencordSettings/BackupRestoreTab.tsx       |  1 +
 src/components/VencordSettings/ThemesTab.tsx   |  2 +-
 src/components/VencordSettings/Updater.tsx     | 18 +++++++++++++-----
 .../VencordSettings/settingsStyles.css         |  9 +++++++++
 6 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/components/PatchHelper.tsx b/src/components/PatchHelper.tsx
index f1fe22c0c..37782ef3f 100644
--- a/src/components/PatchHelper.tsx
+++ b/src/components/PatchHelper.tsx
@@ -186,9 +186,10 @@ function ReplacementInput({ replacement, setReplacement, replacementError }) {
                 error={error ?? replacementError}
             />
             {!isFunc && (
-                <>
+                <div className="vc-text-selectable">
                     <Forms.FormTitle>Cheat Sheet</Forms.FormTitle>
                     {Object.entries({
+                        "\\i": "Special regex escape sequence that matches identifiers (varnames, classnames, etc.)",
                         "$$": "Insert a $",
                         "$&": "Insert the entire match",
                         "$`\u200b": "Insert the substring before the match",
@@ -200,7 +201,7 @@ function ReplacementInput({ replacement, setReplacement, replacementError }) {
                             {Parser.parse("`" + placeholder + "`")}: {desc}
                         </Forms.FormText>
                     ))}
-                </>
+                </div>
             )}
 
             <Switch
diff --git a/src/components/PluginSettings/PluginModal.tsx b/src/components/PluginSettings/PluginModal.tsx
index 43e1d31ab..6240c17ff 100644
--- a/src/components/PluginSettings/PluginModal.tsx
+++ b/src/components/PluginSettings/PluginModal.tsx
@@ -20,7 +20,8 @@ import { generateId } from "@api/Commands";
 import { useSettings } from "@api/settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
-import { LazyComponent } from "@utils/misc";
+import { Margins } from "@utils/margins";
+import { classes, LazyComponent } from "@utils/misc";
 import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize } from "@utils/modal";
 import { proxyLazy } from "@utils/proxyLazy";
 import { OptionType, Plugin } from "@utils/types";
@@ -174,7 +175,7 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
     }
 
     return (
-        <ModalRoot transitionState={transitionState} size={ModalSize.MEDIUM}>
+        <ModalRoot transitionState={transitionState} size={ModalSize.MEDIUM} className="vc-text-selectable">
             <ModalHeader separator={false}>
                 <Text variant="heading-lg/semibold" style={{ flexGrow: 1 }}>{plugin.name}</Text>
                 <ModalCloseButton onClick={onClose} />
@@ -198,7 +199,7 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
                     </div>
                 </Forms.FormSection>
                 {!!plugin.settingsAboutComponent && (
-                    <div style={{ marginBottom: 8 }}>
+                    <div className={classes(Margins.bottom8, "vc-text-selectable")}>
                         <Forms.FormSection>
                             <ErrorBoundary message="An error occurred while rendering this plugin's custom InfoComponent">
                                 <plugin.settingsAboutComponent tempSettings={tempSettings} />
diff --git a/src/components/VencordSettings/BackupRestoreTab.tsx b/src/components/VencordSettings/BackupRestoreTab.tsx
index 7a3729daf..173747026 100644
--- a/src/components/VencordSettings/BackupRestoreTab.tsx
+++ b/src/components/VencordSettings/BackupRestoreTab.tsx
@@ -41,6 +41,7 @@ function BackupRestoreTab() {
                 Settings Export contains:
                 <ul>
                     <li>&mdash; Custom QuickCSS</li>
+                    <li>&mdash; Theme Links</li>
                     <li>&mdash; Plugin Settings</li>
                 </ul>
             </Text>
diff --git a/src/components/VencordSettings/ThemesTab.tsx b/src/components/VencordSettings/ThemesTab.tsx
index 4bd0eb8ed..83a087004 100644
--- a/src/components/VencordSettings/ThemesTab.tsx
+++ b/src/components/VencordSettings/ThemesTab.tsx
@@ -90,7 +90,7 @@ export default ErrorBoundary.wrap(function () {
 
     return (
         <>
-            <Card className="vc-settings-card">
+            <Card className="vc-settings-card vc-text-selectable">
                 <Forms.FormTitle tag="h5">Paste links to .css / .theme.css files here</Forms.FormTitle>
                 <Forms.FormText>One link per line</Forms.FormText>
                 <Forms.FormText>Make sure to use the raw links or github.io links!</Forms.FormText>
diff --git a/src/components/VencordSettings/Updater.tsx b/src/components/VencordSettings/Updater.tsx
index 15a8c87a3..809a3e70c 100644
--- a/src/components/VencordSettings/Updater.tsx
+++ b/src/components/VencordSettings/Updater.tsx
@@ -229,11 +229,19 @@ function Updater() {
 
             <Forms.FormTitle tag="h5">Repo</Forms.FormTitle>
 
-            <Forms.FormText>{repoPending ? repo : err ? "Failed to retrieve - check console" : (
-                <Link href={repo}>
-                    {repo.split("/").slice(-2).join("/")}
-                </Link>
-            )} (<HashLink hash={gitHash} repo={repo} disabled={repoPending} />)</Forms.FormText>
+            <Forms.FormText className="vc-text-selectable">
+                {repoPending
+                    ? repo
+                    : err
+                        ? "Failed to retrieve - check console"
+                        : (
+                            <Link href={repo}>
+                                {repo.split("/").slice(-2).join("/")}
+                            </Link>
+                        )
+                }
+                {" "}(<HashLink hash={gitHash} repo={repo} disabled={repoPending} />)
+            </Forms.FormText>
 
             <Forms.FormDivider className={Margins.top8 + " " + Margins.bottom8} />
 
diff --git a/src/components/VencordSettings/settingsStyles.css b/src/components/VencordSettings/settingsStyles.css
index ebc112c05..971e9a877 100644
--- a/src/components/VencordSettings/settingsStyles.css
+++ b/src/components/VencordSettings/settingsStyles.css
@@ -57,3 +57,12 @@
     color: var(--white-500);
     background-color: var(--button-danger-background);
 }
+
+.vc-text-selectable,
+.vc-text-selectable :not(a, button) {
+    /* make text selectable, silly discord makes the entirety of settings not selectable */
+    user-select: text;
+
+    /* discord also sets cursor: default which prevents the cursor from showing as text */
+    cursor: initial;
+}

From bfa20f2634a0f3f73a03135f9ddb9d0dfe566e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90=E1=BB=97=20V=C4=83n=20Ho=C3=A0i=20Tu=C3=A2n?=
 <htuan03@gmail.com>
Date: Sat, 8 Apr 2023 18:41:55 -0700
Subject: [PATCH 143/147] feat(setting): Disable minimum window size #834
 (#848)

---
 src/api/settings.ts                           |  2 ++
 src/components/VencordSettings/VencordTab.tsx |  5 +++++
 src/main/patcher.ts                           | 15 +++++++++++----
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/api/settings.ts b/src/api/settings.ts
index 8a7d9ffd4..b88b9f019 100644
--- a/src/api/settings.ts
+++ b/src/api/settings.ts
@@ -38,6 +38,7 @@ export interface Settings {
     frameless: boolean;
     transparent: boolean;
     winCtrlQ: boolean;
+    disableMinSize: boolean;
     winNativeTitleBar: boolean;
     plugins: {
         [plugin: string]: {
@@ -71,6 +72,7 @@ const DefaultSettings: Settings = {
     frameless: false,
     transparent: false,
     winCtrlQ: false,
+    disableMinSize: false,
     winNativeTitleBar: false,
     plugins: {},
 
diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx
index 3bdd9b76f..d5ffa91d6 100644
--- a/src/components/VencordSettings/VencordTab.tsx
+++ b/src/components/VencordSettings/VencordTab.tsx
@@ -83,6 +83,11 @@ function VencordSettings() {
                 key: "winCtrlQ",
                 title: "Register Ctrl+Q as shortcut to close Discord (Alternative to Alt+F4)",
                 note: "Requires a full restart"
+            },
+            IS_DISCORD_DESKTOP && {
+                key: "disableMinSize",
+                title: "Disable minimum window size",
+                note: "Requires a full restart"
             }
         ];
 
diff --git a/src/main/patcher.ts b/src/main/patcher.ts
index c45a29976..f92a64d7d 100644
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@@ -106,10 +106,17 @@ if (!IS_VANILLA) {
         BrowserWindow
     };
 
-    // Patch appSettings to force enable devtools
-    onceDefined(global, "appSettings", s =>
-        s.set("DANGEROUS_ENABLE_DEVTOOLS_ONLY_ENABLE_IF_YOU_KNOW_WHAT_YOURE_DOING", true)
-    );
+    // Patch appSettings to force enable devtools and optionally disable min size
+    onceDefined(global, "appSettings", s => {
+        s.set("DANGEROUS_ENABLE_DEVTOOLS_ONLY_ENABLE_IF_YOU_KNOW_WHAT_YOURE_DOING", true);
+        if (settings.disableMinSize) {
+            s.set("MIN_WIDTH", 0);
+            s.set("MIN_HEIGHT", 0);
+        } else {
+            s.set("MIN_WIDTH", 940);
+            s.set("MIN_HEIGHT", 500);
+        }
+    });
 
     process.env.DATA_DIR = join(app.getPath("userData"), "..", "Vencord");
 } else {

From 08822dd19064ea5b707117c5ed51f62dd0a8e316 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sun, 9 Apr 2023 04:04:02 +0200
Subject: [PATCH 144/147] Improvements for VencordDesktop (#847)

---
 src/Vencord.ts                             | 17 ++---
 src/components/VencordSettings/Updater.tsx |  7 +-
 src/globals.d.ts                           |  1 +
 src/main/index.ts                          |  5 +-
 src/main/updater/common.ts                 | 27 ++------
 src/main/updater/git.ts                    |  3 +-
 src/main/updater/http.ts                   | 20 +-----
 src/plugins/settings.tsx                   | 81 ++++++++++------------
 src/plugins/supportHelper.tsx              |  9 ++-
 src/preload.ts                             | 35 +++++-----
 src/utils/IpcEvents.ts                     |  1 -
 src/utils/native.ts                        |  4 +-
 src/utils/updater.ts                       | 22 +-----
 13 files changed, 85 insertions(+), 147 deletions(-)

diff --git a/src/Vencord.ts b/src/Vencord.ts
index a23b1a8bf..f11ca167c 100644
--- a/src/Vencord.ts
+++ b/src/Vencord.ts
@@ -27,12 +27,14 @@ export { PlainSettings, Settings };
 import "./utils/quickCss";
 import "./webpack/patchWebpack";
 
+import { relaunch } from "@utils/native";
+
 import { showNotification } from "./api/Notifications";
 import { PlainSettings, Settings } from "./api/settings";
 import { patches, PMLogger, startAllPlugins } from "./plugins";
 import { localStorage } from "./utils/localStorage";
 import { getCloudSettings, putCloudSettings } from "./utils/settingsSync";
-import { checkForUpdates, rebuild, update, UpdateLogger } from "./utils/updater";
+import { checkForUpdates, rebuild, update,UpdateLogger } from "./utils/updater";
 import { onceReady } from "./webpack";
 import { SettingsRouter } from "./webpack/common";
 
@@ -75,23 +77,14 @@ async function init() {
 
             if (Settings.autoUpdate) {
                 await update();
-                const needsFullRestart = await rebuild();
+                await rebuild();
                 if (Settings.autoUpdateNotification)
                     setTimeout(() => showNotification({
                         title: "Vencord has been updated!",
                         body: "Click here to restart",
                         permanent: true,
                         noPersist: true,
-                        onClick() {
-                            if (needsFullRestart) {
-                                if (IS_DISCORD_DESKTOP)
-                                    window.DiscordNative.app.relaunch();
-                                else
-                                    window.VencordDesktop.app.relaunch();
-                            }
-                            else
-                                location.reload();
-                        }
+                        onClick: relaunch
                     }), 10_000);
                 return;
             }
diff --git a/src/components/VencordSettings/Updater.tsx b/src/components/VencordSettings/Updater.tsx
index 809a3e70c..6dffbc87c 100644
--- a/src/components/VencordSettings/Updater.tsx
+++ b/src/components/VencordSettings/Updater.tsx
@@ -125,7 +125,7 @@ function Updatable(props: CommonProps) {
                     onClick={withDispatcher(setIsUpdating, async () => {
                         if (await update()) {
                             setUpdates([]);
-                            const needFullRestart = await rebuild();
+                            await rebuild();
                             await new Promise<void>(r => {
                                 Alerts.show({
                                     title: "Update Success!",
@@ -133,10 +133,7 @@ function Updatable(props: CommonProps) {
                                     confirmText: "Restart",
                                     cancelText: "Not now!",
                                     onConfirm() {
-                                        if (needFullRestart)
-                                            relaunch();
-                                        else
-                                            location.reload();
+                                        relaunch();
                                         r();
                                     },
                                     onCancel: r
diff --git a/src/globals.d.ts b/src/globals.d.ts
index 98eccde30..3d9e176d0 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -57,6 +57,7 @@ declare global {
      */
     export var DiscordNative: any;
     export var VencordDesktop: any;
+    export var VencordDesktopNative: any;
 
     interface Window {
         webpackChunkdiscord_app: {
diff --git a/src/main/index.ts b/src/main/index.ts
index b04ef6c40..cb723bb4b 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -32,9 +32,10 @@ if (IS_VENCORD_DESKTOP || !IS_VANILLA) {
             if (url.endsWith("/")) url = url.slice(0, -1);
             switch (url) {
                 case "renderer.js.map":
+                case "vencordDesktopRenderer.js.map":
                 case "preload.js.map":
-                case "patcher.js.map": // doubt
-                case "main.js.map":
+                case "patcher.js.map":
+                case "vencordDesktopMain.js.map":
                     cb(join(__dirname, url));
                     break;
                 default:
diff --git a/src/main/updater/common.ts b/src/main/updater/common.ts
index bc628f068..7cea82d47 100644
--- a/src/main/updater/common.ts
+++ b/src/main/updater/common.ts
@@ -16,28 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { createHash } from "crypto";
-import { createReadStream } from "fs";
-import { join } from "path";
 
-export async function calculateHashes() {
-    const hashes = {} as Record<string, string>;
-
-    await Promise.all(
-        [IS_DISCORD_DESKTOP ? "patcher.js" : "main.js", "preload.js", "renderer.js", "renderer.css"].map(file => new Promise<void>(r => {
-            const fis = createReadStream(join(__dirname, file));
-            const hash = createHash("sha1", { encoding: "hex" });
-            fis.once("end", () => {
-                hash.end();
-                hashes[file] = hash.read();
-                r();
-            });
-            fis.pipe(hash);
-        }))
-    );
-
-    return hashes;
-}
+export const VENCORD_FILES = [
+    IS_DISCORD_DESKTOP ? "patcher.js" : "vencordDesktopMain.js",
+    "preload.js",
+    IS_DISCORD_DESKTOP ? "renderer.js" : "vencordDesktopRenderer.js",
+    "renderer.css"
+];
 
 export function serializeErrors(func: (...args: any[]) => any) {
     return async function () {
diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts
index 89c2d3ccf..d6a29a852 100644
--- a/src/main/updater/git.ts
+++ b/src/main/updater/git.ts
@@ -22,7 +22,7 @@ import { ipcMain } from "electron";
 import { join } from "path";
 import { promisify } from "util";
 
-import { calculateHashes, serializeErrors } from "./common";
+import { serializeErrors } from "./common";
 
 const VENCORD_SRC_DIR = join(__dirname, "..");
 
@@ -76,7 +76,6 @@ async function build() {
     return !res.stderr.includes("Build failed");
 }
 
-ipcMain.handle(IpcEvents.GET_HASHES, serializeErrors(calculateHashes));
 ipcMain.handle(IpcEvents.GET_REPO, serializeErrors(getRepo));
 ipcMain.handle(IpcEvents.GET_UPDATES, serializeErrors(calculateGitChanges));
 ipcMain.handle(IpcEvents.UPDATE, serializeErrors(pull));
diff --git a/src/main/updater/http.ts b/src/main/updater/http.ts
index a2e2aad39..e2a3520de 100644
--- a/src/main/updater/http.ts
+++ b/src/main/updater/http.ts
@@ -26,7 +26,7 @@ import gitHash from "~git-hash";
 import gitRemote from "~git-remote";
 
 import { get } from "../utils/simpleGet";
-import { calculateHashes, serializeErrors } from "./common";
+import { serializeErrors, VENCORD_FILES } from "./common";
 
 const API_BASE = `https://api.github.com/repos/${gitRemote}`;
 let PendingUpdates = [] as [string, string][];
@@ -57,13 +57,6 @@ async function calculateGitChanges() {
     }));
 }
 
-const FILES_TO_DOWNLOAD = [
-    IS_DISCORD_DESKTOP ? "patcher.js" : "vencordDesktopMain.js",
-    "preload.js",
-    IS_DISCORD_DESKTOP ? "renderer.js" : "vencordDesktopRenderer.js",
-    "renderer.css"
-];
-
 async function fetchUpdates() {
     const release = await githubGet("/releases/latest");
 
@@ -73,7 +66,7 @@ async function fetchUpdates() {
         return false;
 
     data.assets.forEach(({ name, browser_download_url }) => {
-        if (FILES_TO_DOWNLOAD.some(s => name.startsWith(s))) {
+        if (VENCORD_FILES.some(s => name.startsWith(s))) {
             PendingUpdates.push([name, browser_download_url]);
         }
     });
@@ -83,13 +76,7 @@ async function fetchUpdates() {
 async function applyUpdates() {
     await Promise.all(PendingUpdates.map(
         async ([name, data]) => writeFile(
-            join(
-                __dirname,
-                IS_VENCORD_DESKTOP
-                    // vencordDesktopRenderer.js -> renderer.js
-                    ? name.replace(/vencordDesktop(\w)/, (_, c) => c.toLowerCase())
-                    : name
-            ),
+            join(__dirname, name),
             await get(data)
         )
     ));
@@ -97,7 +84,6 @@ async function applyUpdates() {
     return true;
 }
 
-ipcMain.handle(IpcEvents.GET_HASHES, serializeErrors(calculateHashes));
 ipcMain.handle(IpcEvents.GET_REPO, serializeErrors(() => `https://github.com/${gitRemote}`));
 ipcMain.handle(IpcEvents.GET_UPDATES, serializeErrors(calculateGitChanges));
 ipcMain.handle(IpcEvents.UPDATE, serializeErrors(fetchUpdates));
diff --git a/src/plugins/settings.tsx b/src/plugins/settings.tsx
index c8a6372af..f9a7548e8 100644
--- a/src/plugins/settings.tsx
+++ b/src/plugins/settings.tsx
@@ -71,66 +71,63 @@ export default definePlugin({
     makeSettingsCategories({ ID }: { ID: Record<string, unknown>; }) {
         const makeOnClick = (tab: string) => () => SettingsRouter.open(tab);
 
-        const cats = [
+        return [
             {
                 section: ID.HEADER,
                 label: "Vencord"
-            }, {
+            },
+            {
                 section: "VencordSettings",
                 label: "Vencord",
                 element: () => <SettingsComponent tab="VencordSettings" />,
                 onClick: makeOnClick("VencordSettings")
-            }, {
+            },
+            {
                 section: "VencordPlugins",
                 label: "Plugins",
                 element: () => <SettingsComponent tab="VencordPlugins" />,
                 onClick: makeOnClick("VencordPlugins")
-            }, {
+            },
+            {
                 section: "VencordThemes",
                 label: "Themes",
                 element: () => <SettingsComponent tab="VencordThemes" />,
                 onClick: makeOnClick("VencordThemes")
-            }
-        ] as Array<{
-            section: unknown,
-            label?: string;
-            element?: React.ComponentType;
-            onClick?(): void;
-        }>;
-
-        if (!IS_WEB)
-            cats.push({
+            },
+            !IS_WEB && {
                 section: "VencordUpdater",
                 label: "Updater",
                 element: () => <SettingsComponent tab="VencordUpdater" />,
                 onClick: makeOnClick("VencordUpdater")
-            });
-
-        cats.push({
-            section: "VencordCloud",
-            label: "Cloud",
-            element: () => <SettingsComponent tab="VencordCloud" />,
-            onClick: makeOnClick("VencordCloud")
-        });
-
-        cats.push({
-            section: "VencordSettingsSync",
-            label: "Backup & Restore",
-            element: () => <SettingsComponent tab="VencordSettingsSync" />,
-            onClick: makeOnClick("VencordSettingsSync")
-        });
-
-        if (IS_DEV)
-            cats.push({
+            },
+            {
+                section: "VencordCloud",
+                label: "Cloud",
+                element: () => <SettingsComponent tab="VencordCloud" />,
+                onClick: makeOnClick("VencordCloud")
+            },
+            {
+                section: "VencordSettingsSync",
+                label: "Backup & Restore",
+                element: () => <SettingsComponent tab="VencordSettingsSync" />,
+                onClick: makeOnClick("VencordSettingsSync")
+            },
+            IS_DEV && {
                 section: "VencordPatchHelper",
                 label: "Patch Helper",
                 element: PatchHelper!,
                 onClick: makeOnClick("VencordPatchHelper")
-            });
-
-        cats.push({ section: ID.DIVIDER });
-
-        return cats;
+            },
+            IS_VENCORD_DESKTOP && {
+                section: "VencordDesktop",
+                label: "Desktop Settings",
+                element: VencordDesktop.Components.Settings,
+                onClick: makeOnClick("VencordDesktop")
+            },
+            {
+                section: ID.DIVIDER
+            }
+        ].filter(Boolean);
     },
 
     options: {
@@ -149,14 +146,6 @@ export default definePlugin({
         },
     },
 
-    tabs: {
-        vencord: () => <SettingsComponent tab="VencordSettings" />,
-        plugins: () => <SettingsComponent tab="VencordPlugins" />,
-        themes: () => <SettingsComponent tab="VencordThemes" />,
-        updater: () => <SettingsComponent tab="VencordUpdater" />,
-        sync: () => <SettingsComponent tab="VencordSettingsSync" />
-    },
-
     get electronVersion() {
         return VencordNative.getVersions().electron || window.armcord?.electron || null;
     },
@@ -175,7 +164,7 @@ export default definePlugin({
     get additionalInfo() {
         if (IS_DEV) return " (Dev)";
         if (IS_WEB) return " (Web)";
-        if (IS_VENCORD_DESKTOP) return " (Vencord Desktop)";
+        if (IS_VENCORD_DESKTOP) return ` (VencordDesktop v${VencordDesktopNative.app.getVersion()})`;
         if (IS_STANDALONE) return " (Standalone)";
         return "";
     },
diff --git a/src/plugins/supportHelper.tsx b/src/plugins/supportHelper.tsx
index 92a5f84eb..21d9059b5 100644
--- a/src/plugins/supportHelper.tsx
+++ b/src/plugins/supportHelper.tsx
@@ -44,11 +44,18 @@ export default definePlugin({
         execute() {
             const { RELEASE_CHANNEL } = window.GLOBAL_ENV;
 
+            const client = (() => {
+                if (IS_DISCORD_DESKTOP) return `Desktop v${DiscordNative.app.getVersion()}`;
+                if (IS_VENCORD_DESKTOP) return `Vencord Desktop v${VencordDesktopNative.app.getVersion()}`;
+                if ("armcord" in window) return `ArmCord v${window.armcord.version}`;
+                return `Web (${navigator.userAgent})`;
+            })();
+
             const debugInfo = `
 **Vencord Debug Info**
 
 > Discord Branch: ${RELEASE_CHANNEL}
-> Client: ${typeof DiscordNative === "undefined" ? window.armcord ? "Armcord" : `Web (${navigator.userAgent})` : `Desktop (Electron v${settings.electronVersion})`}
+> Client: ${client}
 > Platform: ${window.navigator.platform}
 > Vencord Version: ${gitHash}${settings.additionalInfo}
 > Outdated: ${isOutdated}
diff --git a/src/preload.ts b/src/preload.ts
index b75574aff..276cceb19 100644
--- a/src/preload.ts
+++ b/src/preload.ts
@@ -26,27 +26,23 @@ import VencordNative from "./VencordNative";
 
 contextBridge.exposeInMainWorld("VencordNative", VencordNative);
 
+// Discord
 if (location.protocol !== "data:") {
-    // Discord
-    webFrame.executeJavaScript(readFileSync(join(__dirname, "renderer.js"), "utf-8"));
+    // #region cssInsert
     const rendererCss = join(__dirname, "renderer.css");
 
-    function insertCss(css: string) {
-        const style = document.createElement("style");
-        style.id = "vencord-css-core";
-        style.textContent = css;
+    const style = document.createElement("style");
+    style.id = "vencord-css-core";
+    style.textContent = readFileSync(rendererCss, "utf-8");
 
-        if (document.readyState === "complete") {
-            document.documentElement.appendChild(style);
-        } else {
-            document.addEventListener("DOMContentLoaded", () => document.documentElement.appendChild(style), {
-                once: true
-            });
-        }
+    if (document.readyState === "complete") {
+        document.documentElement.appendChild(style);
+    } else {
+        document.addEventListener("DOMContentLoaded", () => document.documentElement.appendChild(style), {
+            once: true
+        });
     }
 
-    const css = readFileSync(rendererCss, "utf-8");
-    insertCss(css);
     if (IS_DEV) {
         // persistent means keep process running if watcher is the only thing still running
         // which we obviously don't want
@@ -54,11 +50,14 @@ if (location.protocol !== "data:") {
             document.getElementById("vencord-css-core")!.textContent = readFileSync(rendererCss, "utf-8");
         });
     }
+    // #endregion
 
-    if (process.env.DISCORD_PRELOAD)
+    if (process.env.DISCORD_PRELOAD) {
+        webFrame.executeJavaScript(readFileSync(join(__dirname, "renderer.js"), "utf-8"));
         require(process.env.DISCORD_PRELOAD);
-} else {
-    // Monaco Popout
+    }
+} // Monaco popout
+else {
     contextBridge.exposeInMainWorld("setCss", debounce(s => VencordNative.ipc.invoke(IpcEvents.SET_QUICK_CSS, s)));
     contextBridge.exposeInMainWorld("getCurrentCss", () => VencordNative.ipc.invoke(IpcEvents.GET_QUICK_CSS));
     // shrug
diff --git a/src/utils/IpcEvents.ts b/src/utils/IpcEvents.ts
index dbf3540c3..57e4bb206 100644
--- a/src/utils/IpcEvents.ts
+++ b/src/utils/IpcEvents.ts
@@ -40,7 +40,6 @@ export default strEnum({
     OPEN_QUICKCSS: "VencordOpenQuickCss",
     GET_UPDATES: "VencordGetUpdates",
     GET_REPO: "VencordGetRepo",
-    GET_HASHES: "VencordGetHashes",
     UPDATE: "VencordUpdate",
     BUILD: "VencordBuild",
     OPEN_MONACO_EDITOR: "VencordOpenMonacoEditor",
diff --git a/src/utils/native.ts b/src/utils/native.ts
index 05fa0aa50..1d29d409b 100644
--- a/src/utils/native.ts
+++ b/src/utils/native.ts
@@ -20,12 +20,12 @@ export function relaunch() {
     if (IS_DISCORD_DESKTOP)
         window.DiscordNative.app.relaunch();
     else
-        window.VencordDesktop.app.relaunch();
+        window.VencordDesktopNative.app.relaunch();
 }
 
 export function showItemInFolder(path: string) {
     if (IS_DISCORD_DESKTOP)
         window.DiscordNative.fileManager.showItemInFolder(path);
     else
-        window.VencordDesktop.fileManager.showItemInFolder(path);
+        window.VencordDesktopNative.fileManager.showItemInFolder(path);
 }
diff --git a/src/utils/updater.ts b/src/utils/updater.ts
index 3606e5ffc..2fd15614d 100644
--- a/src/utils/updater.ts
+++ b/src/utils/updater.ts
@@ -62,24 +62,9 @@ export function getRepo() {
     return Unwrap(VencordNative.ipc.invoke<IpcRes<string>>(IpcEvents.GET_REPO));
 }
 
-type Hashes = Record<"patcher.js" | "main.js" | "preload.js" | "renderer.js" | "renderer.css", string>;
-
-/**
- * @returns true if hard restart is required
- */
 export async function rebuild() {
-    const oldHashes = await Unwrap(VencordNative.ipc.invoke<IpcRes<Hashes>>(IpcEvents.GET_HASHES));
-
     if (!await Unwrap(VencordNative.ipc.invoke<IpcRes<boolean>>(IpcEvents.BUILD)))
         throw new Error("The Build failed. Please try manually building the new update");
-
-    const newHashes = await Unwrap(VencordNative.ipc.invoke<IpcRes<Hashes>>(IpcEvents.GET_HASHES));
-
-    if (oldHashes["preload.js"] !== newHashes["preload.js"]) return true;
-    if (IS_DISCORD_DESKTOP && oldHashes["patcher.js"] !== newHashes["patcher.js"]) return true;
-    if (IS_VENCORD_DESKTOP && oldHashes["main.js"] !== newHashes["main.js"]) return true;
-
-    return false;
 }
 
 export async function maybePromptToUpdate(confirmMessage: string, checkForDev = false) {
@@ -93,11 +78,8 @@ export async function maybePromptToUpdate(confirmMessage: string, checkForDev =
             if (wantsUpdate && isNewer) return alert("Your local copy has more recent commits. Please stash or reset them.");
             if (wantsUpdate) {
                 await update();
-                const needFullRestart = await rebuild();
-                if (needFullRestart)
-                    relaunch();
-                else
-                    location.reload();
+                await rebuild();
+                relaunch();
             }
         }
     } catch (err) {

From 613fa9a57b1fe7985e526a9c7281b9188f535463 Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Sun, 9 Apr 2023 10:06:09 +0800
Subject: [PATCH 145/147] feat: add translucency option for macOS (#849)

Co-authored-by: V <vendicated@riseup.net>
---
 src/api/settings.ts                           | 2 ++
 src/components/VencordSettings/VencordTab.tsx | 6 ++++++
 src/main/patcher.ts                           | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/src/api/settings.ts b/src/api/settings.ts
index b88b9f019..35381d88a 100644
--- a/src/api/settings.ts
+++ b/src/api/settings.ts
@@ -38,6 +38,7 @@ export interface Settings {
     frameless: boolean;
     transparent: boolean;
     winCtrlQ: boolean;
+    macosTranslucency: boolean;
     disableMinSize: boolean;
     winNativeTitleBar: boolean;
     plugins: {
@@ -72,6 +73,7 @@ const DefaultSettings: Settings = {
     frameless: false,
     transparent: false,
     winCtrlQ: false,
+    macosTranslucency: false,
     disableMinSize: false,
     winNativeTitleBar: false,
     plugins: {},
diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx
index d5ffa91d6..7bb5353b1 100644
--- a/src/components/VencordSettings/VencordTab.tsx
+++ b/src/components/VencordSettings/VencordTab.tsx
@@ -48,6 +48,7 @@ function VencordSettings() {
     const donateImage = React.useMemo(() => Math.random() > 0.5 ? DEFAULT_DONATE_IMAGE : SHIGGY_DONATE_IMAGE, []);
 
     const isWindows = navigator.platform.toLowerCase().startsWith("win");
+    const isMac = navigator.platform.toLowerCase().startsWith("mac");
 
     const Switches: Array<false | {
         key: KeysOfType<typeof settings, boolean>;
@@ -88,6 +89,11 @@ function VencordSettings() {
                 key: "disableMinSize",
                 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"
             }
         ];
 
diff --git a/src/main/patcher.ts b/src/main/patcher.ts
index f92a64d7d..066cb3df1 100644
--- a/src/main/patcher.ts
+++ b/src/main/patcher.ts
@@ -85,6 +85,11 @@ if (!IS_VANILLA) {
                     options.backgroundColor = "#00000000";
                 }
 
+                if (settings.macosTranslucency && process.platform === "darwin") {
+                    options.backgroundColor = "#00000000";
+                    options.vibrancy = "sidebar";
+                }
+
                 process.env.DISCORD_PRELOAD = original;
 
                 super(options);

From c4a3d25d37697282dce756d9addc36c23ba1f2ce Mon Sep 17 00:00:00 2001
From: Amsyar Rasyiq <82711525+amsyarasyiq@users.noreply.github.com>
Date: Sun, 9 Apr 2023 12:55:04 +0800
Subject: [PATCH 146/147] feat(NoAutoReplyMention): Inverse shift reply
 behaviour (#839)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/noReplyMention.tsx | 54 +++++++++++++++++-----------------
 src/plugins/quickReply.ts      | 40 ++++++++++++++++++++++---
 src/utils/constants.ts         |  4 +++
 3 files changed, 67 insertions(+), 31 deletions(-)

diff --git a/src/plugins/noReplyMention.tsx b/src/plugins/noReplyMention.tsx
index 2e9758893..1351ec467 100644
--- a/src/plugins/noReplyMention.tsx
+++ b/src/plugins/noReplyMention.tsx
@@ -16,43 +16,43 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Settings } from "@api/settings";
+import { definePluginSettings } from "@api/settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
+import type { Message } from "discord-types/general";
 
-interface Reply {
-    message: {
-        author: {
-            id: string;
-        };
-    };
-}
+const settings = definePluginSettings({
+    exemptList: {
+        description:
+            "List of users to exempt from this plugin (separated by commas or spaces)",
+        type: OptionType.STRING,
+        default: "1234567890123445,1234567890123445",
+    },
+    inverseShiftReply: {
+        description: "Invert Discord's shift replying behaviour (enable to make shift reply mention user)",
+        type: OptionType.BOOLEAN,
+        default: false,
+    }
+});
 
 export default definePlugin({
     name: "NoReplyMention",
     description: "Disables reply pings by default",
-    authors: [Devs.DustyAngel47, Devs.axyie],
-    options: {
-        exemptList: {
-            description:
-                "List of users to exempt from this plugin (separated by commas)",
-            type: OptionType.STRING,
-            default: "1234567890123445,1234567890123445",
-        },
-    },
-    shouldMention(reply: Reply) {
-        return Settings.plugins.NoReplyMention.exemptList.includes(
-            reply.message.author.id
-        );
+    authors: [Devs.DustyAngel47, Devs.axyie, Devs.pylix],
+    settings,
+
+    shouldMention(message: Message, isHoldingShift: boolean) {
+        const isExempt = settings.store.exemptList.includes(message.author.id);
+        return settings.store.inverseShiftReply ? isHoldingShift !== isExempt : !isHoldingShift && isExempt;
     },
+
     patches: [
         {
-            find: "CREATE_PENDING_REPLY:function",
+            find: ",\"Message\")}function",
             replacement: {
-                match: /CREATE_PENDING_REPLY:function\((.{1,2})\){/,
-                replace:
-                    "CREATE_PENDING_REPLY:function($1){$1.shouldMention=$self.shouldMention($1);",
-            },
-        },
+                match: /:(\i),shouldMention:!(\i)\.shiftKey/,
+                replace: ":$1,shouldMention:$self.shouldMention($1,$2.shiftKey)"
+            }
+        }
     ],
 });
diff --git a/src/plugins/quickReply.ts b/src/plugins/quickReply.ts
index 984db188b..d059b3327 100644
--- a/src/plugins/quickReply.ts
+++ b/src/plugins/quickReply.ts
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { migratePluginSettings } from "@api/settings";
+import { definePluginSettings, migratePluginSettings, Settings } from "@api/settings";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { ChannelStore, FluxDispatcher as Dispatcher, MessageStore, SelectedChannelStore, UserStore } from "@webpack/common";
 import { Message } from "discord-types/general";
@@ -31,10 +31,33 @@ let editIdx = -1;
 
 migratePluginSettings("QuickReply", "InteractionKeybinds");
 
+const enum MentionOptions {
+    DISABLED,
+    ENABLED,
+    NO_REPLY_MENTION_PLUGIN
+}
+
+const settings = definePluginSettings({
+    shouldMention: {
+        type: OptionType.SELECT,
+        description: "Ping reply by default",
+        options: [
+            {
+                label: "Follow NoReplyMention",
+                value: MentionOptions.NO_REPLY_MENTION_PLUGIN,
+                default: true
+            },
+            { label: "Enabled", value: MentionOptions.ENABLED },
+            { label: "Disabled", value: MentionOptions.DISABLED },
+        ]
+    }
+});
+
 export default definePlugin({
     name: "QuickReply",
-    authors: [Devs.obscurity, Devs.Ven],
+    authors: [Devs.obscurity, Devs.Ven, Devs.pylix],
     description: "Reply to (ctrl + up/down) and edit (ctrl + shift + up/down) messages via keybinds",
+    settings,
 
     start() {
         Dispatcher.subscribe("DELETE_PENDING_REPLY", onDeletePendingReply);
@@ -137,6 +160,14 @@ function getNextMessage(isUp: boolean, isReply: boolean) {
     return i === - 1 ? undefined : messages[messages.length - i - 1];
 }
 
+function shouldMention() {
+    switch (settings.store.shouldMention) {
+        case MentionOptions.NO_REPLY_MENTION_PLUGIN: return !Settings.plugins.NoReplyMention.enabled;
+        case MentionOptions.DISABLED: return false;
+        default: return true;
+    }
+}
+
 // handle next/prev reply
 function nextReply(isUp: boolean) {
     const message = getNextMessage(isUp, true);
@@ -149,11 +180,12 @@ function nextReply(isUp: boolean) {
 
     const channel = ChannelStore.getChannel(message.channel_id);
     const meId = UserStore.getCurrentUser().id;
+
     Dispatcher.dispatch({
         type: "CREATE_PENDING_REPLY",
         channel,
         message,
-        shouldMention: true,
+        shouldMention: shouldMention(),
         showMentionToggle: channel.guild_id !== null && message.author.id !== meId,
         _isQuickReply: true
     });
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index edbd76d3d..a59499324 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -253,5 +253,9 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     AutumnVN: {
         name: "AutumnVN",
         id: 393694671383166998n
+    },
+    pylix: {
+        name: "pylix",
+        id: 492949202121261067n
     }
 });

From 40a7aa5079ec6df5a9f965c7a1a28821cce14973 Mon Sep 17 00:00:00 2001
From: V <vendicated@riseup.net>
Date: Sun, 9 Apr 2023 06:58:29 +0200
Subject: [PATCH 147/147] UserScript: Fix cors check

---
 browser/GMPolyfill.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/GMPolyfill.js b/browser/GMPolyfill.js
index 6f05ca0bf..beee9156a 100644
--- a/browser/GMPolyfill.js
+++ b/browser/GMPolyfill.js
@@ -59,8 +59,8 @@ async function checkCors(url, method) {
     const origin = headers["access-control-allow-origin"];
     if (origin !== "*" && origin !== window.location.origin) return false;
 
-    const methods = headers["access-control-allow-methods"]?.split(/,\s/g);
-    if (methods && !methods.includes(method)) return false;
+    const methods = headers["access-control-allow-methods"]?.toLowerCase().split(/,\s/g);
+    if (methods && !methods.includes(method.toLowerCase())) return false;
 
     return true;
 }