From 36131de800a43d729bc8d04e9bd8a2e5ee5f28ee Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Mon, 5 Aug 2024 22:01:37 -0400
Subject: [PATCH 01/43] Womp Womp

---
 src/plugins/_core/supportHelper.tsx | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/plugins/_core/supportHelper.tsx b/src/plugins/_core/supportHelper.tsx
index cba19f1e..08b30eac 100644
--- a/src/plugins/_core/supportHelper.tsx
+++ b/src/plugins/_core/supportHelper.tsx
@@ -17,6 +17,7 @@
 */
 
 import { addAccessory } from "@api/MessageAccessories";
+import { MessageObject } from "@api/MessageEvents";
 import { definePluginSettings } from "@api/Settings";
 import { getUserSettingLazy } from "@api/UserSettings";
 import ErrorBoundary from "@components/ErrorBoundary";
@@ -24,10 +25,10 @@ import { Flex } from "@components/Flex";
 import { Link } from "@components/Link";
 import { openUpdaterModal } from "@components/VencordSettings/UpdaterTab";
 import { Devs, EquicordDevs, SUPPORT_CHANNEL_ID, SUPPORT_CHANNEL_IDS, VC_SUPPORT_CHANNEL_ID } from "@utils/constants";
-import { sendMessage } from "@utils/discord";
+import { getCurrentChannel, sendMessage } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
-import { isEquicordPluginDev, isPluginDev, tryOrElse } from "@utils/misc";
+import { isEquicordPluginDev, isPluginDev, sleep, tryOrElse } from "@utils/misc";
 import { relaunch } from "@utils/native";
 import { onlyOnce } from "@utils/onlyOnce";
 import { makeCodeblock } from "@utils/text";
@@ -135,6 +136,26 @@ function generatePluginList() {
     return content;
 }
 
+function intoChunks(): string[] {
+    const messageContent: string = generatePluginList();
+    if (messageContent.length <= 2000) return [messageContent];
+
+    let chunks: string[] = [];
+    for (let idx = 0; idx < messageContent.length; idx += 2000) {
+        chunks.push(messageContent.slice(idx, idx + 2000));
+    }
+    chunks = chunks.map(e => e.trimStart().trimEnd());
+    return chunks;
+}
+
+async function sendMessages(channelId: string, messageContents: string[], delay: number) {
+    for (const messageContent of messageContents) {
+        const messageObject: Partial<MessageObject> = { content: messageContent };
+        sendMessage(channelId, messageObject);
+        await sleep(delay);
+    }
+}
+
 const checkForUpdatesOnce = onlyOnce(checkForUpdates);
 
 const settings = definePluginSettings({}).withPrivateSettings<{
@@ -171,7 +192,9 @@ export default definePlugin({
             name: "equicord-plugins",
             description: "Send Equicord plugin list",
             predicate: ctx => isPluginDev(UserStore.getCurrentUser()?.id) || isEquicordPluginDev(UserStore.getCurrentUser()?.id) || AllowedChannelIds.includes(ctx.channel.id),
-            execute: () => ({ content: generatePluginList() })
+            execute: (_, ctx) => {
+                sendMessages(ctx.channel.id, intoChunks(), Math.max(2000, getCurrentChannel().rateLimitPerUser ?? 0));
+            }
         }
     ],
 

From 740d6857d20f8aef15eb7dfbc1ea5f994589b747 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Mon, 5 Aug 2024 22:06:11 -0400
Subject: [PATCH 02/43] Revert "Womp Womp"

This reverts commit 36131de800a43d729bc8d04e9bd8a2e5ee5f28ee.
---
 src/plugins/_core/supportHelper.tsx | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/plugins/_core/supportHelper.tsx b/src/plugins/_core/supportHelper.tsx
index 08b30eac..cba19f1e 100644
--- a/src/plugins/_core/supportHelper.tsx
+++ b/src/plugins/_core/supportHelper.tsx
@@ -17,7 +17,6 @@
 */
 
 import { addAccessory } from "@api/MessageAccessories";
-import { MessageObject } from "@api/MessageEvents";
 import { definePluginSettings } from "@api/Settings";
 import { getUserSettingLazy } from "@api/UserSettings";
 import ErrorBoundary from "@components/ErrorBoundary";
@@ -25,10 +24,10 @@ import { Flex } from "@components/Flex";
 import { Link } from "@components/Link";
 import { openUpdaterModal } from "@components/VencordSettings/UpdaterTab";
 import { Devs, EquicordDevs, SUPPORT_CHANNEL_ID, SUPPORT_CHANNEL_IDS, VC_SUPPORT_CHANNEL_ID } from "@utils/constants";
-import { getCurrentChannel, sendMessage } from "@utils/discord";
+import { sendMessage } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
-import { isEquicordPluginDev, isPluginDev, sleep, tryOrElse } from "@utils/misc";
+import { isEquicordPluginDev, isPluginDev, tryOrElse } from "@utils/misc";
 import { relaunch } from "@utils/native";
 import { onlyOnce } from "@utils/onlyOnce";
 import { makeCodeblock } from "@utils/text";
@@ -136,26 +135,6 @@ function generatePluginList() {
     return content;
 }
 
-function intoChunks(): string[] {
-    const messageContent: string = generatePluginList();
-    if (messageContent.length <= 2000) return [messageContent];
-
-    let chunks: string[] = [];
-    for (let idx = 0; idx < messageContent.length; idx += 2000) {
-        chunks.push(messageContent.slice(idx, idx + 2000));
-    }
-    chunks = chunks.map(e => e.trimStart().trimEnd());
-    return chunks;
-}
-
-async function sendMessages(channelId: string, messageContents: string[], delay: number) {
-    for (const messageContent of messageContents) {
-        const messageObject: Partial<MessageObject> = { content: messageContent };
-        sendMessage(channelId, messageObject);
-        await sleep(delay);
-    }
-}
-
 const checkForUpdatesOnce = onlyOnce(checkForUpdates);
 
 const settings = definePluginSettings({}).withPrivateSettings<{
@@ -192,9 +171,7 @@ export default definePlugin({
             name: "equicord-plugins",
             description: "Send Equicord plugin list",
             predicate: ctx => isPluginDev(UserStore.getCurrentUser()?.id) || isEquicordPluginDev(UserStore.getCurrentUser()?.id) || AllowedChannelIds.includes(ctx.channel.id),
-            execute: (_, ctx) => {
-                sendMessages(ctx.channel.id, intoChunks(), Math.max(2000, getCurrentChannel().rateLimitPerUser ?? 0));
-            }
+            execute: () => ({ content: generatePluginList() })
         }
     ],
 

From 6398dbd716838e585de4fee9b3c321e5e26bc3c0 Mon Sep 17 00:00:00 2001
From: pan <93918332+Panniku@users.noreply.github.com>
Date: Tue, 6 Aug 2024 22:01:03 +0530
Subject: [PATCH 03/43] fix: background-primary (#30)

* feat: plugin information in plugins tab

* feat(equicordCSS): remove if hell and simplify

* feat(Demonstration): notif reminder

* fix(Demonstration): improvement

* add devs

* Updates And Fixes

* Revert "Updates And Fixes"

This reverts commit d84b833bc4acb84e332270c9880eedd17c1b09cd.

* feat(ServerListIndicators): toggle compact and optimization

* fix: background-primary

---------

Co-authored-by: thororen1234 <78185467+thororen1234@users.noreply.github.com>
---
 src/equicordplugins/serverSearch/styles.css | 2 +-
 src/plugins/serverListIndicators/styles.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/equicordplugins/serverSearch/styles.css b/src/equicordplugins/serverSearch/styles.css
index 196d9535..db2e745a 100644
--- a/src/equicordplugins/serverSearch/styles.css
+++ b/src/equicordplugins/serverSearch/styles.css
@@ -11,7 +11,7 @@
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    background-color: var(--background-secondary);
+    background-color: var(--background-primary);
     height: 48px;
     width: 48px;
     border-radius: 100%;
diff --git a/src/plugins/serverListIndicators/styles.css b/src/plugins/serverListIndicators/styles.css
index 6fe2ef3b..d6fb68a5 100644
--- a/src/plugins/serverListIndicators/styles.css
+++ b/src/plugins/serverListIndicators/styles.css
@@ -12,7 +12,7 @@
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    background-color: var(--background-secondary);
+    background-color: var(--background-primary);
     height: 48px;
     width: 48px;
     border-radius: 100%;

From 5ac9d0bc4c756e385ec0a3a6e143618641569b3f Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 6 Aug 2024 15:59:03 -0400
Subject: [PATCH 04/43] Womp Womp

---
 src/equicordplugins/keywordNotify/index.tsx | 265 +++++++++++++++++---
 src/utils/constants.ts                      |   4 +
 2 files changed, 240 insertions(+), 29 deletions(-)

diff --git a/src/equicordplugins/keywordNotify/index.tsx b/src/equicordplugins/keywordNotify/index.tsx
index cadce33a..bd535b0f 100644
--- a/src/equicordplugins/keywordNotify/index.tsx
+++ b/src/equicordplugins/keywordNotify/index.tsx
@@ -7,23 +7,37 @@
 import "./style.css";
 
 import { DataStore } from "@api/index";
-import { showNotification } from "@api/Notifications";
 import { definePluginSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import { Flex } from "@components/Flex";
 import { DeleteIcon } from "@components/Icons";
 import { EquicordDevs } from "@utils/constants";
 import { Margins } from "@utils/margins";
+import { classes } from "@utils/misc";
 import { useForceUpdater } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { Button, ChannelStore, Forms, NavigationRouter, Select, Switch, TextInput, useState } from "@webpack/common";
-import { Message } from "discord-types/general/index.js";
+import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { Button, ChannelStore, Forms, Select, SelectedChannelStore, Switch, TabBar, TextInput, Tooltip, UserStore, useState } from "@webpack/common";
+import { Message, User } from "discord-types/general/index.js";
+import type { PropsWithChildren } from "react";
 
+
+type IconProps = JSX.IntrinsicElements["svg"];
 type KeywordEntry = { regex: string, listIds: Array<string>, listType: ListType, ignoreCase: boolean; };
 
 let keywordEntries: Array<KeywordEntry> = [];
+let currentUser: User;
+let keywordLog: Array<any> = [];
 
+const recentMentionsPopoutClass = findByPropsLazy("recentMentionsPopout");
+const tabClass = findByPropsLazy("tab");
+const buttonClass = findByPropsLazy("size36");
+
+const MenuHeader = findByCodeLazy(".getMessageReminders()).length");
+const Popout = findByCodeLazy("e.get(e.jumpTargetId");
+const createMessageRecord = findByCodeLazy(".createFromServer(", ".isBlockedForMessage", "messageReference:");
 const KEYWORD_ENTRIES_KEY = "KeywordNotify_keywordEntries";
+const KEYWORD_LOG_KEY = "KeywordNotify_log";
 
 const cl = classNameFactory("vc-keywordnotify-");
 
@@ -52,6 +66,32 @@ enum ListType {
     Whitelist = "Whitelist"
 }
 
+interface BaseIconProps extends IconProps {
+    viewBox: string;
+}
+
+function highlightKeywords(str: string, entries: Array<KeywordEntry>) {
+    let regexes: Array<RegExp>;
+    try {
+        regexes = entries.map(e => new RegExp(e.regex, "g" + (e.ignoreCase ? "i" : "")));
+    } catch (err) {
+        return [str];
+    }
+
+    const matches = regexes.map(r => str.match(r)).flat().filter(e => e != null) as Array<string>;
+    if (matches.length === 0) {
+        return [str];
+    }
+
+    const idx = str.indexOf(matches[0]);
+
+    return [
+        <span>{str.substring(0, idx)}</span>,
+        <span className="highlight">{matches[0]}</span>,
+        <span>{str.substring(idx + matches[0].length)}</span>
+    ];
+}
+
 function Collapsible({ title, children }) {
     const [isOpen, setIsOpen] = useState(false);
 
@@ -115,7 +155,7 @@ function ListedIds({ listIds, setListIds }) {
     );
 }
 
-function ListTypeSelector({ listType, setListType }) {
+function ListTypeSelector({ listType, setListType }: { listType: ListType, setListType: (v: ListType) => void; }) {
     return (
         <Select
             options={[
@@ -185,7 +225,6 @@ function KeywordEntries() {
                     >
                         Ignore Case
                     </Switch>
-                    <Forms.FormDivider className={[Margins.top8, Margins.bottom8].join(" ")} />
                     <Forms.FormTitle tag="h5">Whitelist/Blacklist</Forms.FormTitle>
                     <Flex flexDirection="row">
                         <div style={{ flexGrow: 1 }}>
@@ -215,22 +254,60 @@ function KeywordEntries() {
     );
 }
 
+function Icon({ height = 24, width = 24, className, children, viewBox, ...svgProps }: PropsWithChildren<BaseIconProps>) {
+    return (
+        <svg
+            className={classes(className, "vc-icon")}
+            role="img"
+            width={width}
+            height={height}
+            viewBox={viewBox}
+            {...svgProps}
+        >
+            {children}
+        </svg>
+    );
+}
+
+// Ideally I would just add this to Icons.tsx, but I cannot as this is a user-plugin :/
+function DoubleCheckmarkIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            className={classes(props.className, "vc-double-checkmark-icon")}
+            viewBox="0 0 24 24"
+        >
+            <path fill="currentColor"
+                d="M16.7 8.7a1 1 0 0 0-1.4-1.4l-3.26 3.24a1 1 0 0 0 1.42 1.42L16.7 8.7ZM3.7 11.3a1 1 0 0 0-1.4 1.4l4.5 4.5a1 1 0 0 0 1.4-1.4l-4.5-4.5Z"
+            />
+            <path fill="currentColor"
+                d="M21.7 9.7a1 1 0 0 0-1.4-1.4L13 15.58l-3.3-3.3a1 1 0 0 0-1.4 1.42l4 4a1 1 0 0 0 1.4 0l8-8Z"
+            />
+        </Icon>
+    );
+}
+
 const settings = definePluginSettings({
     ignoreBots: {
         type: OptionType.BOOLEAN,
         description: "Ignore messages from bots",
         default: true
     },
+    amountToKeep: {
+        type: OptionType.NUMBER,
+        description: "Amount of messages to keep in the log",
+        default: 50
+    },
     keywords: {
         type: OptionType.COMPONENT,
-        description: "Keywords to detect",
+        description: "Manage keywords",
         component: () => <KeywordEntries />
     }
 });
 
 export default definePlugin({
     name: "KeywordNotify",
-    authors: [EquicordDevs.camila314, EquicordDevs.thororen],
+    authors: [EquicordDevs.camila314, EquicordDevs.x3rt, EquicordDevs.thororen],
     description: "Sends a notification if a given message matches certain keywords or regexes",
     settings,
     patches: [
@@ -240,20 +317,53 @@ export default definePlugin({
                 match: /}_dispatch\((\i),\i\){/,
                 replace: "$&$1=$self.modify($1);"
             }
+        },
+        {
+            find: "Messages.UNREADS_TAB_LABEL}",
+            replacement: {
+                match: /\i\?\(0,\i\.jsxs\)\(\i\.TabBar\.Item/,
+                replace: "$self.keywordTabBar(),$&"
+            }
+        },
+        {
+            find: "location:\"RecentsPopout\"})",
+            replacement: {
+                match: /:(\i)===\i\.\i\.MENTIONS\?\(0,.+?setTab:(\i),onJump:(\i),badgeState:\i,closePopout:(\i)/,
+                replace: ": $1 === 8 ? $self.tryKeywordMenu($2, $3, $4) $&"
+            }
+        },
+        {
+            find: ".guildFilter:null",
+            replacement: {
+                match: /function (\i)\(\i\){let{message:\i,gotoMessage/,
+                replace: "$self.renderMsg = $1; $&"
+            }
+        },
+        {
+            find: ".guildFilter:null",
+            replacement: {
+                match: /onClick:\(\)=>(\i\.\i\.deleteRecentMention\((\i)\.id\))/,
+                replace: "onClick: () => $2._keyword ? $self.deleteKeyword($2.id) : $1"
+            }
         }
     ],
 
     async start() {
+        this.onUpdate = () => null;
+        currentUser = UserStore.getCurrentUser();
         keywordEntries = await DataStore.get(KEYWORD_ENTRIES_KEY) ?? [];
+        await DataStore.set(KEYWORD_ENTRIES_KEY, keywordEntries);
+        (await DataStore.get(KEYWORD_LOG_KEY) ?? []).map(e => JSON.parse(e)).forEach(e => {
+            this.addToLog(e);
+        });
     },
 
     applyKeywordEntries(m: Message) {
         let matches = false;
-        let match = "";
 
         for (const entry of keywordEntries) {
             if (entry.regex === "") {
-                return;
+                continue;
             }
 
             let listed = entry.listIds.some(id => id === m.channel_id || id === m.author.id);
@@ -267,31 +377,30 @@ export default definePlugin({
             const whitelistMode = entry.listType === ListType.Whitelist;
 
             if (!whitelistMode && listed) {
-                return;
+                continue;
             }
             if (whitelistMode && !listed) {
-                return;
+                continue;
             }
 
             if (settings.store.ignoreBots && m.author.bot && (!whitelistMode || !entry.listIds.includes(m.author.id))) {
-                return;
+                continue;
             }
 
             const flags = entry.ignoreCase ? "i" : "";
             if (safeMatchesRegex(m.content, entry.regex, flags)) {
                 matches = true;
-                match = m.content;
-            }
-
-            for (const embed of m.embeds as any) {
-                if (safeMatchesRegex(embed.description, entry.regex, flags) || safeMatchesRegex(embed.title, entry.regex, flags)) {
-                    matches = true;
-                    match = m.content;
-                } else if (embed.fields != null) {
-                    for (const field of embed.fields as Array<{ name: string, value: string; }>) {
-                        if (safeMatchesRegex(field.value, entry.regex, flags) || safeMatchesRegex(field.name, entry.regex, flags)) {
-                            matches = true;
-                            match = m.content;
+            } else {
+                for (const embed of m.embeds as any) {
+                    if (safeMatchesRegex(embed.description, entry.regex, flags) || safeMatchesRegex(embed.title, entry.regex, flags)) {
+                        matches = true;
+                        break;
+                    } else if (embed.fields != null) {
+                        for (const field of embed.fields as Array<{ name: string, value: string; }>) {
+                            if (safeMatchesRegex(field.value, entry.regex, flags) || safeMatchesRegex(field.name, entry.regex, flags)) {
+                                matches = true;
+                                break;
+                            }
                         }
                     }
                 }
@@ -299,14 +408,112 @@ export default definePlugin({
         }
 
         if (matches) {
-            showNotification({
-                title: "Keyword Notify",
-                body: `${m.author.username} matched the keyword ${match}`,
-                onClick: () => NavigationRouter.transitionTo(`/channels/${ChannelStore.getChannel(m.channel_id)?.guild_id ?? "@me"}/${m.channel_id}${m.id ? "/" + m.id : ""}`)
-            });
+            // @ts-ignore
+            m.mentions.push({ id: currentUser.id });
+
+            if (m.author.id !== currentUser.id)
+                this.addToLog(m);
         }
     },
 
+    addToLog(m: Message) {
+        if (m == null || keywordLog.some(e => e.id === m.id))
+            return;
+
+        DataStore.get(KEYWORD_LOG_KEY).then(log => {
+            DataStore.set(KEYWORD_LOG_KEY, [...log, JSON.stringify(m)]);
+        });
+
+        const thing = createMessageRecord(m);
+        keywordLog.push(thing);
+        keywordLog.sort((a, b) => b.timestamp - a.timestamp);
+
+        if (keywordLog.length > settings.store.amountToKeep)
+            keywordLog.pop();
+
+        this.onUpdate();
+    },
+
+    deleteKeyword(id) {
+        keywordLog = keywordLog.filter(e => e.id !== id);
+        this.onUpdate();
+    },
+
+    keywordTabBar() {
+        return (
+            <TabBar.Item className={classes(tabClass.tab, tabClass.expanded)} id={8}>
+                Keywords
+            </TabBar.Item>
+        );
+    },
+
+    tryKeywordMenu(setTab, onJump, closePopout) {
+        const header = (
+            <MenuHeader tab={8} setTab={setTab} closePopout={closePopout} badgeState={{ badgeForYou: false }} children={
+                <Tooltip text="Clear All">
+                    {({ onMouseLeave, onMouseEnter }) => (
+                        <Button
+                            onMouseLeave={onMouseLeave}
+                            onMouseEnter={onMouseEnter}
+                            look={Button.Looks.BLANK}
+                            size={Button.Sizes.ICON}
+                            onClick={() => {
+                                keywordLog = [];
+                                DataStore.set(KEYWORD_LOG_KEY, []);
+                                this.onUpdate();
+                            }}>
+                            <div className={classes(buttonClass.button, buttonClass.secondary, buttonClass.size32)}>
+                                <DoubleCheckmarkIcon />
+                            </div>
+                        </Button>
+                    )}
+                </Tooltip>
+            } />
+        );
+
+        const channel = ChannelStore.getChannel(SelectedChannelStore.getChannelId());
+
+        const [tempLogs, setKeywordLog] = useState(keywordLog);
+        this.onUpdate = () => {
+            const newLog = Array.from(keywordLog);
+            setKeywordLog(newLog);
+        };
+
+        const messageRender = (e, t) => {
+            e._keyword = true;
+
+            e.customRenderedContent = {
+                content: highlightKeywords(e.content, keywordEntries)
+            };
+
+            const msg = this.renderMsg({
+                message: e,
+                gotoMessage: t,
+                dismissible: true
+            });
+
+            return [msg];
+        };
+
+        return (
+            <>
+                <Popout
+                    className={classes(recentMentionsPopoutClass.recentMentionsPopout)}
+                    renderHeader={() => header}
+                    renderMessage={messageRender}
+                    channel={channel}
+                    onJump={onJump}
+                    onFetch={() => null}
+                    onCloseMessage={this.deleteKeyword}
+                    loadMore={() => null}
+                    messages={tempLogs}
+                    renderEmptyState={() => null}
+                    canCloseAllMessages={true}
+                />
+            </>
+        );
+    },
+
     modify(e) {
         if (e.type === "MESSAGE_CREATE") {
             this.applyKeywordEntries(e.message);
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index cf765b88..09f47580 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -743,6 +743,10 @@ export const EquicordDevs = Object.freeze({
         name: "sadan",
         id: 521819891141967883n
     },
+    x3rt: {
+        name: "x3rt",
+        id: 131602100332396544n
+    },
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly

From ef0810f5b19ad92b9ae96fa63962d996df4da4f5 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 6 Aug 2024 16:18:23 -0400
Subject: [PATCH 05/43] Womp Womp 2

---
 README.md                                     |  5 +-
 src/equicordplugins/jumpscare/index.tsx       | 95 +++++++++++++++++++
 src/equicordplugins/jumpscare/styles.css      | 33 +++++++
 .../unreadBadgeCount/index.tsx                | 36 +++++++
 .../unreadBadgeCount/styles.css               |  7 ++
 5 files changed, 174 insertions(+), 2 deletions(-)
 create mode 100644 src/equicordplugins/jumpscare/index.tsx
 create mode 100644 src/equicordplugins/jumpscare/styles.css
 create mode 100644 src/equicordplugins/unreadBadgeCount/index.tsx
 create mode 100644 src/equicordplugins/unreadBadgeCount/styles.css

diff --git a/README.md b/README.md
index 5cc3148c..23b87800 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 -   Request for plugins from Discord.
 
 <details>
-<summary>Extra included plugins (119 additional plugins)</summary>
+<summary>Extra included plugins (120 additional plugins)</summary>
 
 - AllCallTimers by MaxHerbold and D3SOX
 - AltKrispSwitch by newwares
@@ -80,6 +80,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 - InRole by nin0dev
 - IrcColors by Grzesiek11
 - IRememberYou by zoodogood
+- Jumpscare by Joona
 - JumpToStart by Samwich
 - KeyboardSounds by HypedDomi
 - KeywordNotify by camila314 (maintained by thororen)
@@ -90,7 +91,6 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 - MessageLoggerEnhanced by Aria
 - MessageTranslate by Samwich
 - ModalFade by Kyuuhachi
-- MusicTitleRPC by Blackilykay
 - NewPluginsManager by Sqaaakoi
 - noAppsAllowed by kvba
 - NoBulletPoints by Samwich
@@ -130,6 +130,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 - Translate+ by Prince527 (Using Translate by Ven)
 - UnitConverter by sadan
 - UnlimitedAccounts by thororen
+- UnreadCountBadge by Joona
 - UserPFP by nexpid (maintained by thororen)
 - UwUifier by echo
 - VCSupport by thororen
diff --git a/src/equicordplugins/jumpscare/index.tsx b/src/equicordplugins/jumpscare/index.tsx
new file mode 100644
index 00000000..bfddd14d
--- /dev/null
+++ b/src/equicordplugins/jumpscare/index.tsx
@@ -0,0 +1,95 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./styles.css";
+
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { FluxDispatcher, ReactDOM, useEffect, useState } from "@webpack/common";
+import { Root } from "react-dom/client";
+
+let jumpscareRoot: Root | undefined;
+
+const settings = definePluginSettings({
+    imageSource: {
+        type: OptionType.STRING,
+        description: "Sets the image url of the jumpscare",
+        default: "https://github.com/Equicord/Equibored/blob/main/misc/troll.gif?raw=true"
+    },
+    audioSource: {
+        type: OptionType.STRING,
+        description: "Sets the audio url of the jumpscare",
+        default: "https://github.com/Equicord/Equibored/raw/main/misc/trollolol.mp3?raw=true"
+    },
+    chance: {
+        type: OptionType.NUMBER,
+        description: "The chance of a jumpscare happening (1 in X so: 100 = 1/100 or 1%, 50 = 1/50 or 2%, etc.)",
+        default: 1000
+    }
+});
+
+function getJumpscareRoot(): Root {
+    if (!jumpscareRoot) {
+        const element = document.createElement("div");
+        element.id = "jumpscare-root";
+        element.classList.add("jumpscare-root");
+        document.body.append(element);
+        jumpscareRoot = ReactDOM.createRoot(element);
+    }
+
+    return jumpscareRoot;
+}
+
+export default definePlugin({
+    name: "Jumpscare",
+    description: "Adds a configurable chance of jumpscaring you whenever you open a channel. Inspired by Geometry Dash Mega Hack",
+    authors: [Devs.surgedevs],
+    settings,
+
+    start() {
+        getJumpscareRoot().render(
+            <this.JumpscareComponent />
+        );
+    },
+
+    stop() {
+        jumpscareRoot?.unmount();
+        jumpscareRoot = undefined;
+    },
+
+    JumpscareComponent() {
+        const [isPlaying, setIsPlaying] = useState(false);
+
+        const audio = new Audio(settings.store.audioSource);
+
+        const jumpscare = event => {
+            if (isPlaying) return;
+
+            const chance = 1 / settings.store.chance;
+            if (Math.random() > chance) return;
+
+            setIsPlaying(true);
+            audio.play();
+
+            console.log(isPlaying);
+
+            setTimeout(() => {
+                setIsPlaying(false);
+            }, 1000);
+        };
+
+        useEffect(() => {
+            FluxDispatcher.subscribe("CHANNEL_SELECT", jumpscare);
+
+            return () => {
+                FluxDispatcher.unsubscribe("CHANNEL_SELECT", jumpscare);
+            };
+        });
+
+        return <img className={`jumpscare-img ${isPlaying ? "jumpscare-animate" : ""}`} src={settings.store.imageSource} />;
+    }
+});
diff --git a/src/equicordplugins/jumpscare/styles.css b/src/equicordplugins/jumpscare/styles.css
new file mode 100644
index 00000000..3bfd50c3
--- /dev/null
+++ b/src/equicordplugins/jumpscare/styles.css
@@ -0,0 +1,33 @@
+.jumpscare-root {
+    pointer-events: none;
+}
+
+.jumpscare-img {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    background-color: #000;
+    z-index: 99999;
+    object-fit: contain;
+    opacity: 0;
+}
+
+.jumpscare-animate {
+    animation: jumpscare-animation 0.7s;
+}
+
+@keyframes jumpscare-animation {
+    0% {
+        transform: scale(0);
+    }
+
+    80% {
+        transform: scale(1);
+        opacity: 1;
+    }
+
+    100% {
+        transform: scale(0);
+        opacity: 0;
+    }
+}
diff --git a/src/equicordplugins/unreadBadgeCount/index.tsx b/src/equicordplugins/unreadBadgeCount/index.tsx
new file mode 100644
index 00000000..20a7736f
--- /dev/null
+++ b/src/equicordplugins/unreadBadgeCount/index.tsx
@@ -0,0 +1,36 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+import { ReadStateStore, useStateFromStores } from "@webpack/common";
+const { NumberBadge } = findByPropsLazy("NumberBadge");
+
+import "./styles.css";
+
+export default definePlugin({
+    name: "UnreadCountBadge",
+    authors: [Devs.Joona],
+    description: "Show unread count in the channel list",
+    patches: [
+        // Kanged from typingindicators
+        {
+            find: "UNREAD_IMPORTANT:",
+            replacement: {
+                match: /\.name\),.{0,120}\.children.+?:null(?<=,channel:(\i).+?)/,
+                replace: "$&,$self.CountBadge({channelId:$1.id})"
+            }
+        },
+    ],
+
+    CountBadge: ErrorBoundary.wrap(({ channelId }: { channelId: string; }) => {
+        const unreadCount = useStateFromStores([ReadStateStore], () => ReadStateStore.getUnreadCount(channelId));
+        if (!unreadCount) return null;
+        return <NumberBadge count={unreadCount} color="var(--brand-500)" className="unreadCountBadge" />;
+    }, { noop: true })
+});
diff --git a/src/equicordplugins/unreadBadgeCount/styles.css b/src/equicordplugins/unreadBadgeCount/styles.css
new file mode 100644
index 00000000..793d089e
--- /dev/null
+++ b/src/equicordplugins/unreadBadgeCount/styles.css
@@ -0,0 +1,7 @@
+.unreadCountBadge {
+    margin-left: 4px;
+}
+
+[class*="modeMuted_"] .unreadCountBadge {
+    display: none;
+}

From 1e5e6d222b66a539e866b9fb615c7cfa64fcdb21 Mon Sep 17 00:00:00 2001
From: thororen <78185467+thororen1234@users.noreply.github.com>
Date: Wed, 7 Aug 2024 02:36:31 -0400
Subject: [PATCH 06/43] Womp Womp 3

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

diff --git a/src/equicordplugins/keywordNotify/index.tsx b/src/equicordplugins/keywordNotify/index.tsx
index bd535b0f..4f2ec84b 100644
--- a/src/equicordplugins/keywordNotify/index.tsx
+++ b/src/equicordplugins/keywordNotify/index.tsx
@@ -34,7 +34,7 @@ const tabClass = findByPropsLazy("tab");
 const buttonClass = findByPropsLazy("size36");
 
 const MenuHeader = findByCodeLazy(".getMessageReminders()).length");
-const Popout = findByCodeLazy("e.get(e.jumpTargetId");
+const Popout = findByCodeLazy(".Messages.UNBLOCK_TO_JUMP_TITLE", "canCloseAllMessages:");
 const createMessageRecord = findByCodeLazy(".createFromServer(", ".isBlockedForMessage", "messageReference:");
 const KEYWORD_ENTRIES_KEY = "KeywordNotify_keywordEntries";
 const KEYWORD_LOG_KEY = "KeywordNotify_log";

From 202de5af0bda02bfb3eaca2d6d488fbb7581a87e Mon Sep 17 00:00:00 2001
From: verticalsync <60797172+verticalsync@users.noreply.github.com>
Date: Thu, 8 Aug 2024 18:17:55 +0300
Subject: [PATCH 07/43] feat(plugin): NoMirroredCamera

---
 .../noMirroredCamera/index.tsx                | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 src/equicordplugins/noMirroredCamera/index.tsx

diff --git a/src/equicordplugins/noMirroredCamera/index.tsx b/src/equicordplugins/noMirroredCamera/index.tsx
new file mode 100644
index 00000000..3d635de2
--- /dev/null
+++ b/src/equicordplugins/noMirroredCamera/index.tsx
@@ -0,0 +1,41 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { EquicordDevs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "NoMirroredCamera",
+    description: "Prevents the camera from being mirrored on your screen",
+    authors: [EquicordDevs.nyx],
+
+    patches: [
+        // When focused on voice channel or group chat voice call
+        {
+            find: /\i\?\i.\i.SELF_VIDEO/,
+            replacement: {
+                match: /mirror:\i/,
+                replace: "mirror:!1"
+            }
+        },
+        // Popout camera when not focused on voice channel
+        {
+            find: ".mirror]:",
+            replacement: {
+                match: /\[(\i).mirror]:\i/,
+                replace: "[$1.mirror]:!1"
+            }
+        },
+        // Overriding css on Preview Camera/Change Video Background popup
+        {
+            find: ".cameraPreview,",
+            replacement: {
+                match: /className:\i.camera,/,
+                replace: "$&style:{transform: \"scalex(1)\"},"
+            }
+        }
+    ]
+});

From 59e32da053bbbe0e62d128d1428ce414601f7c37 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 8 Aug 2024 14:10:46 -0400
Subject: [PATCH 08/43] feat(plugin): MessageColors

---
 README.md                                     |   4 +-
 .../messageColors/constants.ts                |  63 ++++++
 src/equicordplugins/messageColors/index.tsx   | 203 ++++++++++++++++++
 src/equicordplugins/messageColors/styles.css  |  20 ++
 .../noMirroredCamera/index.tsx                |   4 +-
 src/utils/constants.ts                        |   4 +
 6 files changed, 295 insertions(+), 3 deletions(-)
 create mode 100644 src/equicordplugins/messageColors/constants.ts
 create mode 100644 src/equicordplugins/messageColors/index.tsx
 create mode 100644 src/equicordplugins/messageColors/styles.css

diff --git a/README.md b/README.md
index 23b87800..3f542f10 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 -   Request for plugins from Discord.
 
 <details>
-<summary>Extra included plugins (120 additional plugins)</summary>
+<summary>Extra included plugins (122 additional plugins)</summary>
 
 - AllCallTimers by MaxHerbold and D3SOX
 - AltKrispSwitch by newwares
@@ -87,6 +87,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 - LoginWithQR by nexpid
 - MediaDownloader by Colorman
 - Meow by Samwich
+- MessageColors by hen
 - MessageLinkTooltip by Kyuuhachi
 - MessageLoggerEnhanced by Aria
 - MessageTranslate by Samwich
@@ -96,6 +97,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 - NoBulletPoints by Samwich
 - NoDefaultEmojis by Samwich
 - NoDeleteSafety by Samwich
+- NoMirroredCamera by Nyx
 - NoModalAnimation by AutumnVN
 - NoNitroUpsell by thororen
 - NoRoleHeaders by Samwich
diff --git a/src/equicordplugins/messageColors/constants.ts b/src/equicordplugins/messageColors/constants.ts
new file mode 100644
index 00000000..30336512
--- /dev/null
+++ b/src/equicordplugins/messageColors/constants.ts
@@ -0,0 +1,63 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { OptionType } from "@utils/types";
+
+export const enum RenderType {
+    BLOCK,
+    FOREGROUND,
+    BACKGROUND,
+}
+
+export const settings = definePluginSettings({
+    renderType: {
+        type: OptionType.SELECT,
+        description: "How to render colors",
+        options: [
+            {
+                label: "Text color",
+                value: RenderType.FOREGROUND,
+                default: true,
+            },
+            {
+                label: "Block nearby",
+                value: RenderType.BLOCK,
+            },
+            {
+                label: "Background color",
+                value: RenderType.BACKGROUND
+            },
+        ]
+    }
+});
+
+export const enum ColorType {
+    RGB,
+    RGBA,
+    HEX,
+    HSL
+}
+
+// It's sooo hard to read regex without this, it makes it at least somewhat bearable
+export const replaceRegexp = (reg: string) => {
+    const n = new RegExp(reg
+        // \c - 'comma'
+        // \v - 'value'
+        // \f - 'float'
+        .replaceAll("\\f", "[+-]?([0-9]*[.])?[0-9]+")
+        .replaceAll("\\c", "(?:,|\\s)")
+        .replaceAll("\\v", "\\s*?\\d+?\\s*?"), "g");
+
+    return n;
+};
+
+export const regex = [
+    { reg: /rgb\(\v\c\v\c\v\)/g, type: ColorType.RGB },
+    { reg: /rgba\(\v\c\v\c\v(\c|\/?)\s*\f\)/g, type: ColorType.RGBA },
+    { reg: /hsl\(\v°?\c\s*?\d+%?\s*?\c\s*?\d+%?\s*?\)/g, type: ColorType.HSL },
+    { reg: /#(?:[0-9a-fA-F]{3}){1,2}/g, type: ColorType.HEX }
+].map(v => { v.reg = replaceRegexp(v.reg.source); return v; });
diff --git a/src/equicordplugins/messageColors/index.tsx b/src/equicordplugins/messageColors/index.tsx
new file mode 100644
index 00000000..41abc6a3
--- /dev/null
+++ b/src/equicordplugins/messageColors/index.tsx
@@ -0,0 +1,203 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./styles.css";
+
+import { EquicordDevs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { React } from "@webpack/common";
+
+import {
+    ColorType,
+    regex,
+    RenderType,
+    replaceRegexp,
+    settings,
+} from "./constants";
+
+const source = regex.map(r => r.reg.source).join("|");
+const matchAllRegExp = new RegExp(`^(${source})`, "i");
+
+interface ParsedColorInfo {
+    type: "color";
+    color: string;
+    colorType: ColorType;
+    text: string;
+}
+
+const requiredFirstCharacters = ["r", "h", "#"].flatMap(v => [
+    v,
+    v.toUpperCase(),
+]);
+
+export default definePlugin({
+    authors: [EquicordDevs.hen],
+    name: "MessageColors",
+    description: "Displays color codes like #FF0042 inside of messages",
+    settings,
+    patches: [
+        // Create a new markdown rule, so it parses just like any other features
+        // Like bolding, spoilers, mentions, etc
+        {
+            find: "roleMention:{order:",
+            group: true,
+            replacement: {
+                match: /roleMention:\{order:(\i\.\i\.order)/,
+                replace: "color:$self.getColor($1),$&",
+            },
+        },
+        // Changes text md rule regex, so it stops right before hsl( | rgb(
+        // Without it discord will try to pass a string without those to color rule
+        {
+            find: ".defaultRules.text,match:",
+            group: true,
+            replacement: {
+                // $)/)
+                match: /\$\)\/\)}/,
+                // hsl(|rgb(|$&
+                replace: requiredFirstCharacters.join("|") + "|$&",
+            },
+        },
+        // Discord just requires it to be here
+        // Or it explodes (bad)
+        {
+            find: "Unknown markdown rule:",
+            group: true,
+            replacement: {
+                match: /roleMention:{type:/,
+                replace: 'color:{type:"inlineObject"},$&',
+            },
+        },
+    ],
+    getColor(order: number) {
+        return {
+            order,
+            // Don't even try to match if the message chunk doesn't start with...
+            requiredFirstCharacters,
+            // Match -> Parse -> React
+            // Result of previous action is dropped as a first argument of the next one
+            match(content: string) {
+                return matchAllRegExp.exec(content);
+            },
+            parse(
+                matchedContent: RegExpExecArray,
+                _,
+                parseProps: Record<string, any>,
+            ): ParsedColorInfo | { type: "text"; content: string; } {
+                // This check makes sure that it doesn't try to parse color
+                // When typing/editing message
+                //
+                // Discord doesn't know how to deal with color and crashes
+                if (!parseProps.messageId)
+                    return {
+                        type: "text",
+                        content: matchedContent[0],
+                    };
+
+                const content = matchedContent[0];
+                try {
+                    const type = getColorType(content);
+
+                    return {
+                        type: "color",
+                        colorType: type,
+                        color: parseColor(content, type),
+                        text: content,
+                    };
+                } catch (e) {
+                    console.error(e);
+                    return {
+                        type: "text",
+                        content: matchedContent[0],
+                    };
+                }
+            },
+            // react(args: ReturnType<typeof this.parse>)
+            react({ text, colorType, color }: ParsedColorInfo) {
+                if (settings.store.renderType === RenderType.FOREGROUND) {
+                    return <span style={{ color: color }}>{text}</span>;
+                }
+                const styles = {
+                    "--color": color,
+                } as React.CSSProperties;
+
+                if (settings.store.renderType === RenderType.BACKGROUND) {
+                    const isDark = isColorDark(color, colorType);
+                    const className = `vc-color-bg ${!isDark ? "vc-color-bg-invert" : ""}`;
+                    return (
+                        <span className={className} style={styles}>
+                            {text}
+                        </span>
+                    );
+                }
+
+                return (
+                    <>
+                        {text}
+                        <span className="vc-color-block" style={styles}></span>
+                    </>
+                );
+            },
+        };
+    },
+});
+
+// https://en.wikipedia.org/wiki/Relative_luminance
+const calcRGBLightness = (r: number, g: number, b: number) => {
+    return 0.2126 * r + 0.7152 * g + 0.0722 * b;
+};
+const isColorDark = (color: string, type: ColorType): boolean => {
+    switch (type) {
+        case ColorType.RGBA:
+        case ColorType.RGB: {
+            const match = color.match(/\d+/g)!;
+            const lightness = calcRGBLightness(+match[0], +match[1], +match[2]);
+            return lightness < 140;
+        }
+        case ColorType.HEX: {
+            var rgb = parseInt(color.substring(1), 16);
+            const r = (rgb >> 16) & 0xff;
+            const g = (rgb >> 8) & 0xff;
+            const b = (rgb >> 0) & 0xff;
+            const lightness = calcRGBLightness(r, g, b);
+            return lightness < 140;
+        }
+        case ColorType.HSL: {
+            const match = color.match(/\d+/g)!;
+            const lightness = +match[2];
+            return lightness < 50;
+        }
+    }
+};
+
+const getColorType = (color: string): ColorType => {
+    color = color.toLowerCase().trim();
+    if (color.startsWith("#")) return ColorType.HEX;
+    if (color.startsWith("hsl")) return ColorType.HSL;
+    if (color.startsWith("rgba")) return ColorType.RGBA;
+    if (color.startsWith("rgb")) return ColorType.RGB;
+
+    throw new Error(`Can't resolve color type of ${color}`);
+};
+
+function parseColor(str: string, type: ColorType): string {
+    str = str
+        .toLowerCase()
+        .trim()
+        .replaceAll(/(\s|,)+/g, " ");
+    switch (type) {
+        case ColorType.RGB:
+            return str;
+        case ColorType.RGBA:
+            if (!str.includes("/"))
+                return str.replaceAll(replaceRegexp(/\f(?=\s*?\))/.source), "/$&");
+            return str;
+        case ColorType.HEX:
+            return str[0] === "#" ? str : `#${str}`;
+        case ColorType.HSL:
+            return str.replace("°", "");
+    }
+}
diff --git a/src/equicordplugins/messageColors/styles.css b/src/equicordplugins/messageColors/styles.css
new file mode 100644
index 00000000..87d34e84
--- /dev/null
+++ b/src/equicordplugins/messageColors/styles.css
@@ -0,0 +1,20 @@
+.vc-color-block {
+    aspect-ratio: 1/1;
+    background: var(--color);
+    height: 1rem;
+    vertical-align: middle;
+    border-radius: 4px;
+    display: inline-block;
+    user-select: none;
+    margin-left: 2px;
+}
+
+.vc-color-bg {
+    background: var(--color);
+}
+
+/* Light color in dark theme */
+.theme-dark .vc-color-bg.vc-color-bg-invert,
+.theme-light .vc-color-bg:not(.vc-color-bg-invert) {
+    color: var(--background-tertiary);
+}
diff --git a/src/equicordplugins/noMirroredCamera/index.tsx b/src/equicordplugins/noMirroredCamera/index.tsx
index 3d635de2..821c3efe 100644
--- a/src/equicordplugins/noMirroredCamera/index.tsx
+++ b/src/equicordplugins/noMirroredCamera/index.tsx
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { EquicordDevs } from "@utils/constants";
+import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 
 export default definePlugin({
     name: "NoMirroredCamera",
     description: "Prevents the camera from being mirrored on your screen",
-    authors: [EquicordDevs.nyx],
+    authors: [Devs.nyx],
 
     patches: [
         // When focused on voice channel or group chat voice call
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 09f47580..145ad648 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -747,6 +747,10 @@ export const EquicordDevs = Object.freeze({
         name: "x3rt",
         id: 131602100332396544n
     },
+    hen: {
+        id: 279266228151779329n,
+        name: "Hen",
+    },
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly

From 784d06090dd8b35d51b91cf6603761212a881ea0 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 8 Aug 2024 14:17:21 -0400
Subject: [PATCH 09/43] Fix MessageColors Dev Format

---
 README.md                                   | 2 +-
 src/equicordplugins/messageColors/index.tsx | 2 +-
 src/utils/constants.ts                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3f542f10..88d516e4 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 - LoginWithQR by nexpid
 - MediaDownloader by Colorman
 - Meow by Samwich
-- MessageColors by hen
+- MessageColors by Hen
 - MessageLinkTooltip by Kyuuhachi
 - MessageLoggerEnhanced by Aria
 - MessageTranslate by Samwich
diff --git a/src/equicordplugins/messageColors/index.tsx b/src/equicordplugins/messageColors/index.tsx
index 41abc6a3..6dd0ea4f 100644
--- a/src/equicordplugins/messageColors/index.tsx
+++ b/src/equicordplugins/messageColors/index.tsx
@@ -34,7 +34,7 @@ const requiredFirstCharacters = ["r", "h", "#"].flatMap(v => [
 ]);
 
 export default definePlugin({
-    authors: [EquicordDevs.hen],
+    authors: [EquicordDevs.Hen],
     name: "MessageColors",
     description: "Displays color codes like #FF0042 inside of messages",
     settings,
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 145ad648..5a782eb9 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -747,9 +747,9 @@ export const EquicordDevs = Object.freeze({
         name: "x3rt",
         id: 131602100332396544n
     },
-    hen: {
-        id: 279266228151779329n,
+    Hen: {
         name: "Hen",
+        id: 279266228151779329n
     },
 } satisfies Record<string, Dev>);
 

From 56d234216557d206ea84632252f5c3838d323ee8 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 8 Aug 2024 14:19:41 -0400
Subject: [PATCH 10/43] UnreadBadgeCount PR Ver

---
 .../unreadBadgeCount/index.tsx                | 91 ++++++++++++++++---
 .../unreadBadgeCount/styles.css               | 16 ++++
 2 files changed, 94 insertions(+), 13 deletions(-)

diff --git a/src/equicordplugins/unreadBadgeCount/index.tsx b/src/equicordplugins/unreadBadgeCount/index.tsx
index 20a7736f..0b461cdc 100644
--- a/src/equicordplugins/unreadBadgeCount/index.tsx
+++ b/src/equicordplugins/unreadBadgeCount/index.tsx
@@ -4,33 +4,98 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import "./styles.css";
+
+import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
 import { ReadStateStore, useStateFromStores } from "@webpack/common";
+import { Channel } from "discord-types/general";
+
+const UserGuildSettingsStore = findStoreLazy("UserGuildSettingsStore");
+const JoinedThreadsStore = findStoreLazy("JoinedThreadsStore");
 const { NumberBadge } = findByPropsLazy("NumberBadge");
 
-import "./styles.css";
+const settings = definePluginSettings({
+    showOnMutedChannels: {
+        description: "Show unread count on muted channels",
+        type: OptionType.BOOLEAN,
+        default: false,
+    },
+    notificationCountLimit: {
+        description: "Show +99 instead of true amount",
+        type: OptionType.BOOLEAN,
+        default: false,
+    },
+    replaceWhiteDot: {
+        description: "Replace the white dot with the badge",
+        type: OptionType.BOOLEAN,
+        default: false,
+        restartNeeded: true,
+    },
+});
 
 export default definePlugin({
     name: "UnreadCountBadge",
     authors: [Devs.Joona],
-    description: "Show unread count in the channel list",
+    description: "Shows unread message count badges on channels in the channel list",
+    settings,
+
     patches: [
         // Kanged from typingindicators
         {
             find: "UNREAD_IMPORTANT:",
-            replacement: {
-                match: /\.name\),.{0,120}\.children.+?:null(?<=,channel:(\i).+?)/,
-                replace: "$&,$self.CountBadge({channelId:$1.id})"
-            }
+            replacement: [
+                {
+                    match: /\.name\),.{0,120}\.children.+?:null/,
+                    replace: "$&,$self.CountBadge({channel: arguments[0].channel,})",
+                    predicate: () => !settings.store.replaceWhiteDot
+                },
+                {
+                    match: /\(0,\i\.jsx\)\("div",{className:\i\(\)\(\i\.unread,\i\?\i\.unreadImportant:void 0\)}\)/,
+                    replace: "$self.CountBadge({channel: arguments[0].channel, whiteDot:$&})",
+                    predicate: () => settings.store.replaceWhiteDot
+                }
+            ]
+        },
+        // Threads
+        {
+            // This is the thread "spine" that shows in the left
+            find: "M11 9H4C2.89543 9 2 8.10457 2 7V1C2 0.447715 1.55228 0 1 0C0.447715 0 0 0.447715 0 1V7C0 9.20914 1.79086 11 4 11H11C11.5523 11 12 10.5523 12 10C12 9.44771 11.5523 9 11 9Z",
+            replacement: [
+                {
+                    match: /mentionsCount:\i.{0,50}?null/,
+                    replace: "$&,$self.CountBadge({channel: arguments[0].thread})",
+                    predicate: () => !settings.store.replaceWhiteDot
+                },
+                {
+                    match: /\(0,\i\.jsx\)\("div",{className:\i\(\)\(\i\.unread,\i\.unreadImportant\)}\)/,
+                    replace: "$self.CountBadge({channel: arguments[0].thread, whiteDot:$&})",
+                    predicate: () => settings.store.replaceWhiteDot
+                }
+            ]
         },
     ],
 
-    CountBadge: ErrorBoundary.wrap(({ channelId }: { channelId: string; }) => {
-        const unreadCount = useStateFromStores([ReadStateStore], () => ReadStateStore.getUnreadCount(channelId));
-        if (!unreadCount) return null;
-        return <NumberBadge count={unreadCount} color="var(--brand-500)" className="unreadCountBadge" />;
-    }, { noop: true })
+    CountBadge: ErrorBoundary.wrap(({ channel, whiteDot }: { channel: Channel, whiteDot?: JSX.Element; }) => {
+        const unreadCount = useStateFromStores([ReadStateStore], () => ReadStateStore.getUnreadCount(channel.id));
+        if (!unreadCount) return whiteDot || null;
+
+        if (!settings.store.showOnMutedChannels && (UserGuildSettingsStore.isChannelMuted(channel.guild_id, channel.id) || JoinedThreadsStore.isMuted(channel.id)))
+            return null;
+        const className = `vc-unreadCountBadge${whiteDot ? "-dot" : ""}${channel.threadMetadata ? "-thread" : ""}`;
+        return (
+            <NumberBadge
+                color="var(--brand-500)"
+                className={className}
+                count={
+                    unreadCount > 99 && settings.store.notificationCountLimit
+                        ? "+99"
+                        : unreadCount
+                }
+            />
+        );
+    }, { noop: true }),
 });
diff --git a/src/equicordplugins/unreadBadgeCount/styles.css b/src/equicordplugins/unreadBadgeCount/styles.css
index 793d089e..e049e72c 100644
--- a/src/equicordplugins/unreadBadgeCount/styles.css
+++ b/src/equicordplugins/unreadBadgeCount/styles.css
@@ -2,6 +2,22 @@
     margin-left: 4px;
 }
 
+.vc-unreadCountBadge-dot {
+    position: absolute;
+    top: 25%;
+    margin-left: -3%;
+    scale: 0.9;
+    z-index: 1;
+}
+
+.vc-unreadCountBadge-dot-thread {
+    position: absolute;
+    top: 20%;
+    margin-left: -18%;
+    scale: 0.9;
+    z-index: 1;
+}
+
 [class*="modeMuted_"] .unreadCountBadge {
     display: none;
 }

From 6692f069e58ff97ecc88168e773d0c5f57e27cd7 Mon Sep 17 00:00:00 2001
From: nyx <60797172+verticalsync@users.noreply.github.com>
Date: Fri, 9 Aug 2024 01:51:00 +0300
Subject: [PATCH 11/43] Update constants.ts

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

diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 5a782eb9..03081046 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -645,7 +645,7 @@ export const EquicordDevs = Object.freeze({
     },
     Woosh: {
         name: "w00shh.",
-        id: 689165844835860522n,
+        id: 919239894327521361n,
     },
     Hanzy: {
         name: "hanzydev",

From bcdf29c3ad6e3a8e2dd6aebf4b89941cbfa48b23 Mon Sep 17 00:00:00 2001
From: nexpid <60316309+nexpid@users.noreply.github.com>
Date: Fri, 9 Aug 2024 21:54:32 +0200
Subject: [PATCH 12/43] fix(loginwithqr): fix qr code icon

---
 src/equicordplugins/loginWithQR/index.tsx   | 4 ++--
 src/equicordplugins/loginWithQR/ui/index.ts | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/equicordplugins/loginWithQR/index.tsx b/src/equicordplugins/loginWithQR/index.tsx
index 3d9f1b41..1b2b6b65 100644
--- a/src/equicordplugins/loginWithQR/index.tsx
+++ b/src/equicordplugins/loginWithQR/index.tsx
@@ -12,7 +12,7 @@ import { Button, Forms, i18n, Menu, TabBar } from "@webpack/common";
 import { ReactElement } from "react";
 
 import { preload, unload } from "./images";
-import { cl, QrCodeCameraIcon } from "./ui";
+import { cl, QrCodeIcon } from "./ui";
 import openQrModal from "./ui/modals/QrModal";
 
 export default definePlugin({
@@ -106,7 +106,7 @@ export default definePlugin({
                 <Menu.MenuItem
                     id="scan-qr"
                     label={i18n.Messages.USER_SETTINGS_SCAN_QR_CODE}
-                    icon={QrCodeCameraIcon}
+                    icon={QrCodeIcon}
                     action={openQrModal}
                     showIconFirst
                     focusedClassName={menuItemFocused}
diff --git a/src/equicordplugins/loginWithQR/ui/index.ts b/src/equicordplugins/loginWithQR/ui/index.ts
index cb3f0ded..e2bc34cc 100644
--- a/src/equicordplugins/loginWithQR/ui/index.ts
+++ b/src/equicordplugins/loginWithQR/ui/index.ts
@@ -37,11 +37,10 @@ export const { Spinner } = proxyLazy(() => Forms as any as {
     SpinnerTypes: typeof SpinnerTypes;
 });
 
-export const { QrCodeCameraIcon } = findByPropsLazy("QrCodeCameraIcon") as {
-    QrCodeCameraIcon: ComponentType<{
-        size: number;
-    }>;
-};
+const icons = findByPropsLazy("PencilIcon");
+export const QrCodeIcon = proxyLazy(() => icons.QrCodeCameraIcon ?? icons.QrCodeIcon) as ComponentType<{
+    size: number;
+}>;
 
 export const cl = classNameFactory("qrlogin-");
 

From 11a32888f38a4ee3c451a563d9e002414d18522a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KrystalSkull=F0=9F=92=96?= <gamerkub69@gmail.com>
Date: Fri, 9 Aug 2024 17:47:41 -0400
Subject: [PATCH 13/43] Give correct credit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 88d516e4..b0a6c57b 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 - InRole by nin0dev
 - IrcColors by Grzesiek11
 - IRememberYou by zoodogood
-- Jumpscare by Joona
+- Jumpscare by Surgedevs
 - JumpToStart by Samwich
 - KeyboardSounds by HypedDomi
 - KeywordNotify by camila314 (maintained by thororen)

From 2849c36cdf106bb5254df0a83faef7c1f09eb156 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Fri, 9 Aug 2024 23:42:47 -0400
Subject: [PATCH 14/43] Fix PictureInPicture

---
 scripts/generateReport.ts              |  5 ++-
 src/plugins/pictureInPicture/index.tsx |  6 +--
 src/utils/constants.ts                 | 52 ++++++++++++++------------
 3 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 9a0e2c5b..21ab20cc 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -37,7 +37,10 @@ const CANARY = process.env.USE_CANARY === "true";
 
 const browser = await pup.launch({
     headless: true,
-    executablePath: process.env.CHROMIUM_BIN
+    executablePath: process.env.CHROMIUM_BIN,
+    args: [
+        '--shm-size=5gb' // Testing Value
+    ]
 });
 
 const page = await browser.newPage();
diff --git a/src/plugins/pictureInPicture/index.tsx b/src/plugins/pictureInPicture/index.tsx
index 81d75a25..20cedf45 100644
--- a/src/plugins/pictureInPicture/index.tsx
+++ b/src/plugins/pictureInPicture/index.tsx
@@ -24,13 +24,13 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "PictureInPicture",
     description: "Adds picture in picture to videos (next to the Download button)",
-    authors: [Devs.Nobody],
+    authors: [Devs.Lumap],
     settings,
     patches: [
         {
-            find: ".nonMediaMosaicItem]",
+            find: ".removeMosaicItemHoverButton),",
             replacement: {
-                match: /\.nonMediaMosaicItem\]:!(\i).{0,50}?children:\[(\S)/,
+                match: /\.nonMediaMosaicItem\]:!(\i).{0,50}?children:\[\S,(\S)/,
                 replace: "$&,$1&&$2&&$self.renderPiPButton(),"
             },
         },
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 03081046..07a058c0 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -547,13 +547,33 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     surgedevs: {
         name: "Chloe",
         id: 1084592643784331324n
-    }
+    },
+    Lumap: {
+        name: "Lumap",
+        id: 585278686291427338n,
+    },
 } satisfies Record<string, Dev>);
 
 export const EquicordDevs = Object.freeze({
-    vmohammad: {
-        name: "vMohammad",
-        id: 921098159348924457n
+    thororen: {
+        name: "thororen",
+        id: 848339671629299742n
+    },
+    nyx: {
+        name: "verticalsync",
+        id: 328165170536775680n,
+    },
+    Cortex: {
+        name: "Cortex",
+        id: 825069530376044594n,
+    },
+    KrystalSkull: {
+        name: "krystalskullofficial",
+        id: 929208515883569182n
+    },
+    Naibuu: {
+        name: "hs50",
+        id: 1120045713867423835n,
     },
     nexpid: {
         name: "Nexpid",
@@ -575,10 +595,6 @@ export const EquicordDevs = Object.freeze({
         name: "ryan",
         id: 479403382994632704n
     },
-    thororen: {
-        name: "thororen",
-        id: 848339671629299742n
-    },
     MrDiamond: {
         name: "MrDiamond",
         id: 523338295644782592n
@@ -615,18 +631,10 @@ export const EquicordDevs = Object.freeze({
         name: "cooles",
         id: 406084422308331522n,
     },
-    KrystalSkull: {
-        name: "krystalskullofficial",
-        id: 929208515883569182n
-    },
     SerStars: {
         name: "SerStars",
         id: 861631850681729045n
     },
-    nyx: {
-        name: "verticalsync",
-        id: 328165170536775680n,
-    },
     MaxHerbold: {
         name: "MaxHerbold",
         id: 1189527130611138663n,
@@ -639,10 +647,6 @@ export const EquicordDevs = Object.freeze({
         name: "Megal",
         id: 387790666484285441n
     },
-    Cortex: {
-        name: "Cortex",
-        id: 825069530376044594n,
-    },
     Woosh: {
         name: "w00shh.",
         id: 919239894327521361n,
@@ -683,10 +687,6 @@ export const EquicordDevs = Object.freeze({
         name: "Fafa",
         id: 428188716641812481n,
     },
-    Naibuu: {
-        name: "hs50",
-        id: 1120045713867423835n,
-    },
     Colorman: {
         name: "colorman",
         id: 298842558610800650n,
@@ -751,6 +751,10 @@ export const EquicordDevs = Object.freeze({
         name: "Hen",
         id: 279266228151779329n
     },
+    vmohammad: {
+        name: "vMohammad",
+        id: 921098159348924457n
+    },
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly

From a576b736bbad07b588884de9e54fd879b50568ca Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Fri, 9 Aug 2024 23:49:23 -0400
Subject: [PATCH 15/43] Testing for reporter

---
 .github/workflows/reportBrokenPlugins.yml | 2 +-
 scripts/generateReport.ts                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/reportBrokenPlugins.yml b/.github/workflows/reportBrokenPlugins.yml
index e410f5bf..cdd1c0fe 100644
--- a/.github/workflows/reportBrokenPlugins.yml
+++ b/.github/workflows/reportBrokenPlugins.yml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   schedule:
     # Every day at midnight
-    - cron: 0 0 * * *
+    - cron: 0 5 * * *
 
 jobs:
   TestPlugins:
diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 21ab20cc..76016344 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -39,7 +39,7 @@ const browser = await pup.launch({
     headless: true,
     executablePath: process.env.CHROMIUM_BIN,
     args: [
-        '--shm-size=5gb' // Testing Value
+        '--shm-size=4gb'
     ]
 });
 

From a8a01467657ab34598bd4803d87794d0105456a6 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Fri, 9 Aug 2024 23:53:33 -0400
Subject: [PATCH 16/43] Do Promise All For Reporter

---
 scripts/generateReport.ts | 228 +++++++++++++++++++-------------------
 1 file changed, 115 insertions(+), 113 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 76016344..2321a809 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -183,124 +183,126 @@ async function printReport() {
         });
     }
 }
+await Promise.all([
+    page.on("console", async e => {
+        const level = e.type();
+        const rawArgs = e.args();
 
-page.on("console", async e => {
-    const level = e.type();
-    const rawArgs = e.args();
-
-    async function getText() {
-        try {
-            return await Promise.all(
-                e.args().map(async a => {
-                    return await maybeGetError(a) || await a.jsonValue();
-                })
-            ).then(a => a.join(" ").trim());
-        } catch {
-            return e.text();
-        }
-    }
-
-    const firstArg = await rawArgs[0]?.jsonValue();
-
-    const isEquicord = firstArg === "[Equicord]";
-    const isDebug = firstArg === "[PUP_DEBUG]";
-
-    outer:
-    if (isEquicord) {
-        try {
-            var args = await Promise.all(e.args().map(a => a.jsonValue()));
-        } catch {
-            break outer;
-        }
-
-        const [, tag, message, otherMessage] = args as Array<string>;
-
-        switch (tag) {
-            case "WebpackInterceptor:":
-                const patchFailMatch = message.match(/Patch by (.+?) (had no effect|errored|found no module) \(Module id is (.+?)\): (.+)/)!;
-                if (!patchFailMatch) break;
-
-                console.error(await getText());
-                process.exitCode = 1;
-
-                const [, plugin, type, id, regex] = patchFailMatch;
-                report.badPatches.push({
-                    plugin,
-                    type,
-                    id,
-                    match: regex.replace(/\[A-Za-z_\$\]\[\\w\$\]\*/g, "\\i"),
-                    error: await maybeGetError(e.args()[3])
-                });
-
-                break;
-            case "PluginManager:":
-                const failedToStartMatch = message.match(/Failed to start (.+)/);
-                if (!failedToStartMatch) break;
-
-                console.error(await getText());
-                process.exitCode = 1;
-
-                const [, name] = failedToStartMatch;
-                report.badStarts.push({
-                    plugin: name,
-                    error: await maybeGetError(e.args()[3]) ?? "Unknown error"
-                });
-
-                break;
-            case "LazyChunkLoader:":
-                console.error(await getText());
-
-                switch (message) {
-                    case "A fatal error occurred:":
-                        process.exit(1);
-                }
-
-                break;
-            case "Reporter:":
-                console.error(await getText());
-
-                switch (message) {
-                    case "A fatal error occurred:":
-                        process.exit(1);
-                    case "Webpack Find Fail:":
-                        process.exitCode = 1;
-                        report.badWebpackFinds.push(otherMessage);
-                        break;
-                    case "Finished test":
-                        await browser.close();
-                        await printReport();
-                        process.exit();
-                }
-        }
-    }
-
-    if (isDebug) {
-        console.error(await getText());
-    } else if (level === "error") {
-        const text = await getText();
-
-        if (text.length && !text.startsWith("Failed to load resource: the server responded with a status of") && !text.includes("Webpack")) {
-            if (IGNORED_DISCORD_ERRORS.some(regex => text.match(regex))) {
-                report.ignoredErrors.push(text);
-            } else {
-                console.error("[Unexpected Error]", text);
-                report.otherErrors.push(text);
+        async function getText() {
+            try {
+                return await Promise.all(
+                    e.args().map(async a => {
+                        return await maybeGetError(a) || await a.jsonValue();
+                    })
+                ).then(a => a.join(" ").trim());
+            } catch {
+                return e.text();
             }
         }
-    }
-});
 
-page.on("error", e => console.error("[Error]", e.message));
-page.on("pageerror", e => {
-    if (e.message.includes("Sentry successfully disabled")) return;
+        const firstArg = await rawArgs[0]?.jsonValue();
 
-    if (!e.message.startsWith("Object") && !e.message.includes("Cannot find module")) {
-        console.error("[Page Error]", e.message);
-        report.otherErrors.push(e.message);
-    } else {
-        report.ignoredErrors.push(e.message);
-    }
-});
+        const isEquicord = firstArg === "[Equicord]";
+        const isDebug = firstArg === "[PUP_DEBUG]";
+
+        outer:
+        if (isEquicord) {
+            try {
+                var args = await Promise.all(e.args().map(a => a.jsonValue()));
+            } catch {
+                break outer;
+            }
+
+            const [, tag, message, otherMessage] = args as Array<string>;
+
+            switch (tag) {
+                case "WebpackInterceptor:":
+                    const patchFailMatch = message.match(/Patch by (.+?) (had no effect|errored|found no module) \(Module id is (.+?)\): (.+)/)!;
+                    if (!patchFailMatch) break;
+
+                    console.error(await getText());
+                    process.exitCode = 1;
+
+                    const [, plugin, type, id, regex] = patchFailMatch;
+                    report.badPatches.push({
+                        plugin,
+                        type,
+                        id,
+                        match: regex.replace(/\[A-Za-z_\$\]\[\\w\$\]\*/g, "\\i"),
+                        error: await maybeGetError(e.args()[3])
+                    });
+
+                    break;
+                case "PluginManager:":
+                    const failedToStartMatch = message.match(/Failed to start (.+)/);
+                    if (!failedToStartMatch) break;
+
+                    console.error(await getText());
+                    process.exitCode = 1;
+
+                    const [, name] = failedToStartMatch;
+                    report.badStarts.push({
+                        plugin: name,
+                        error: await maybeGetError(e.args()[3]) ?? "Unknown error"
+                    });
+
+                    break;
+                case "LazyChunkLoader:":
+                    console.error(await getText());
+
+                    switch (message) {
+                        case "A fatal error occurred:":
+                            process.exit(1);
+                    }
+
+                    break;
+                case "Reporter:":
+                    console.error(await getText());
+
+                    switch (message) {
+                        case "A fatal error occurred:":
+                            process.exit(1);
+                        case "Webpack Find Fail:":
+                            process.exitCode = 1;
+                            report.badWebpackFinds.push(otherMessage);
+                            break;
+                        case "Finished test":
+                            await browser.close();
+                            await printReport();
+                            process.exit();
+                    }
+            }
+        }
+
+        if (isDebug) {
+            console.error(await getText());
+        } else if (level === "error") {
+            const text = await getText();
+
+            if (text.length && !text.startsWith("Failed to load resource: the server responded with a status of") && !text.includes("Webpack")) {
+                if (IGNORED_DISCORD_ERRORS.some(regex => text.match(regex))) {
+                    report.ignoredErrors.push(text);
+                } else {
+                    console.error("[Unexpected Error]", text);
+                    report.otherErrors.push(text);
+                }
+            }
+        }
+    }),
+
+    page.on("error", e => console.error("[Error]", e.message)),
+
+    page.on("pageerror", e => {
+        if (e.message.includes("Sentry successfully disabled")) return;
+
+        if (!e.message.startsWith("Object") && !e.message.includes("Cannot find module")) {
+            console.error("[Page Error]", e.message);
+            report.otherErrors.push(e.message);
+        } else {
+            report.ignoredErrors.push(e.message);
+        }
+    })
+]);
 
 async function reporterRuntime(token: string) {
     Vencord.Webpack.waitFor(

From 4936e5ec2e41f649eead8962d0e1eac6b6488161 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Fri, 9 Aug 2024 23:58:56 -0400
Subject: [PATCH 17/43] Will Reporter Explode With This?

---
 scripts/generateReport.ts | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 2321a809..93aac2b1 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -44,8 +44,6 @@ const browser = await pup.launch({
 });
 
 const page = await browser.newPage();
-await page.setUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36");
-await page.setBypassCSP(true);
 
 async function maybeGetError(handle: JSHandle): Promise<string | undefined> {
     return await (handle as JSHandle<Error>)?.getProperty("message")
@@ -184,6 +182,10 @@ async function printReport() {
     }
 }
 await Promise.all([
+    page.setUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"),
+
+    page.setBypassCSP(true),
+
     page.on("console", async e => {
         const level = e.type();
         const rawArgs = e.args();
@@ -301,7 +303,16 @@ await Promise.all([
         } else {
             report.ignoredErrors.push(e.message);
         }
-    })
+    }),
+
+    page.evaluateOnNewDocument(`
+        if (location.host.endsWith("discord.com")) {
+            ${readFileSync("./dist/browser/browser.js", "utf-8")};
+            (${reporterRuntime.toString()})(${JSON.stringify(process.env.DISCORD_TOKEN)});
+        }
+    `),
+
+    page.goto(CANARY ? "https://canary.discord.com/login" : "https://discord.com/login")
 ]);
 
 async function reporterRuntime(token: string) {
@@ -313,12 +324,3 @@ async function reporterRuntime(token: string) {
         }
     );
 }
-
-await page.evaluateOnNewDocument(`
-    if (location.host.endsWith("discord.com")) {
-        ${readFileSync("./dist/browser/browser.js", "utf-8")};
-        (${reporterRuntime.toString()})(${JSON.stringify(process.env.DISCORD_TOKEN)});
-    }
-`);
-
-await page.goto(CANARY ? "https://canary.discord.com/login" : "https://discord.com/login");

From e4450497ea0ea4bb2b5e09de8ae69a9266c7f946 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Sat, 10 Aug 2024 00:02:01 -0400
Subject: [PATCH 18/43] Rawr (Fixes for reporter)

---
 .github/workflows/reportBrokenPlugins.yml | 2 +-
 scripts/generateReport.ts                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/reportBrokenPlugins.yml b/.github/workflows/reportBrokenPlugins.yml
index cdd1c0fe..e410f5bf 100644
--- a/.github/workflows/reportBrokenPlugins.yml
+++ b/.github/workflows/reportBrokenPlugins.yml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   schedule:
     # Every day at midnight
-    - cron: 0 5 * * *
+    - cron: 0 0 * * *
 
 jobs:
   TestPlugins:
diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 93aac2b1..342db4b1 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -269,6 +269,7 @@ await Promise.all([
                             report.badWebpackFinds.push(otherMessage);
                             break;
                         case "Finished test":
+                            await page.close();
                             await browser.close();
                             await printReport();
                             process.exit();

From c350aab84b5f006806624d6f9edc49e6c117d694 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Sat, 10 Aug 2024 00:07:04 -0400
Subject: [PATCH 19/43] Stable Reporter Come Back Please

---
 scripts/generateReport.ts | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 342db4b1..e49e0daf 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -39,11 +39,14 @@ const browser = await pup.launch({
     headless: true,
     executablePath: process.env.CHROMIUM_BIN,
     args: [
+        '--disable-dev-shm-usage',
         '--shm-size=4gb'
     ]
 });
 
 const page = await browser.newPage();
+await page.setUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36");
+await page.setBypassCSP(true);
 
 async function maybeGetError(handle: JSHandle): Promise<string | undefined> {
     return await (handle as JSHandle<Error>)?.getProperty("message")
@@ -182,10 +185,6 @@ async function printReport() {
     }
 }
 await Promise.all([
-    page.setUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"),
-
-    page.setBypassCSP(true),
-
     page.on("console", async e => {
         const level = e.type();
         const rawArgs = e.args();
@@ -269,7 +268,6 @@ await Promise.all([
                             report.badWebpackFinds.push(otherMessage);
                             break;
                         case "Finished test":
-                            await page.close();
                             await browser.close();
                             await printReport();
                             process.exit();
@@ -304,16 +302,7 @@ await Promise.all([
         } else {
             report.ignoredErrors.push(e.message);
         }
-    }),
-
-    page.evaluateOnNewDocument(`
-        if (location.host.endsWith("discord.com")) {
-            ${readFileSync("./dist/browser/browser.js", "utf-8")};
-            (${reporterRuntime.toString()})(${JSON.stringify(process.env.DISCORD_TOKEN)});
-        }
-    `),
-
-    page.goto(CANARY ? "https://canary.discord.com/login" : "https://discord.com/login")
+    })
 ]);
 
 async function reporterRuntime(token: string) {
@@ -325,3 +314,12 @@ async function reporterRuntime(token: string) {
         }
     );
 }
+
+await page.evaluateOnNewDocument(`
+    if (location.host.endsWith("discord.com")) {
+        ${readFileSync("./dist/browser/browser.js", "utf-8")};
+        (${reporterRuntime.toString()})(${JSON.stringify(process.env.DISCORD_TOKEN)});
+    }
+`);
+
+await page.goto(CANARY ? "https://canary.discord.com/login" : "https://discord.com/login");

From 2f6700192f82cef388e7cdd21adc90f73b3751fc Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Sat, 10 Aug 2024 00:10:29 -0400
Subject: [PATCH 20/43] Reporter: Revert everything but args

---
 scripts/generateReport.ts | 207 +++++++++++++++++++-------------------
 1 file changed, 102 insertions(+), 105 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index e49e0daf..28dde421 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -43,7 +43,6 @@ const browser = await pup.launch({
         '--shm-size=4gb'
     ]
 });
-
 const page = await browser.newPage();
 await page.setUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36");
 await page.setBypassCSP(true);
@@ -184,126 +183,124 @@ async function printReport() {
         });
     }
 }
-await Promise.all([
-    page.on("console", async e => {
-        const level = e.type();
-        const rawArgs = e.args();
 
-        async function getText() {
-            try {
-                return await Promise.all(
-                    e.args().map(async a => {
-                        return await maybeGetError(a) || await a.jsonValue();
-                    })
-                ).then(a => a.join(" ").trim());
-            } catch {
-                return e.text();
-            }
+page.on("console", async e => {
+    const level = e.type();
+    const rawArgs = e.args();
+
+    async function getText() {
+        try {
+            return await Promise.all(
+                e.args().map(async a => {
+                    return await maybeGetError(a) || await a.jsonValue();
+                })
+            ).then(a => a.join(" ").trim());
+        } catch {
+            return e.text();
+        }
+    }
+
+    const firstArg = await rawArgs[0]?.jsonValue();
+
+    const isEquicord = firstArg === "[Equicord]";
+    const isDebug = firstArg === "[PUP_DEBUG]";
+
+    outer:
+    if (isEquicord) {
+        try {
+            var args = await Promise.all(e.args().map(a => a.jsonValue()));
+        } catch {
+            break outer;
         }
 
-        const firstArg = await rawArgs[0]?.jsonValue();
+        const [, tag, message, otherMessage] = args as Array<string>;
 
-        const isEquicord = firstArg === "[Equicord]";
-        const isDebug = firstArg === "[PUP_DEBUG]";
+        switch (tag) {
+            case "WebpackInterceptor:":
+                const patchFailMatch = message.match(/Patch by (.+?) (had no effect|errored|found no module) \(Module id is (.+?)\): (.+)/)!;
+                if (!patchFailMatch) break;
 
-        outer:
-        if (isEquicord) {
-            try {
-                var args = await Promise.all(e.args().map(a => a.jsonValue()));
-            } catch {
-                break outer;
-            }
+                console.error(await getText());
+                process.exitCode = 1;
 
-            const [, tag, message, otherMessage] = args as Array<string>;
+                const [, plugin, type, id, regex] = patchFailMatch;
+                report.badPatches.push({
+                    plugin,
+                    type,
+                    id,
+                    match: regex.replace(/\[A-Za-z_\$\]\[\\w\$\]\*/g, "\\i"),
+                    error: await maybeGetError(e.args()[3])
+                });
 
-            switch (tag) {
-                case "WebpackInterceptor:":
-                    const patchFailMatch = message.match(/Patch by (.+?) (had no effect|errored|found no module) \(Module id is (.+?)\): (.+)/)!;
-                    if (!patchFailMatch) break;
+                break;
+            case "PluginManager:":
+                const failedToStartMatch = message.match(/Failed to start (.+)/);
+                if (!failedToStartMatch) break;
 
-                    console.error(await getText());
-                    process.exitCode = 1;
+                console.error(await getText());
+                process.exitCode = 1;
 
-                    const [, plugin, type, id, regex] = patchFailMatch;
-                    report.badPatches.push({
-                        plugin,
-                        type,
-                        id,
-                        match: regex.replace(/\[A-Za-z_\$\]\[\\w\$\]\*/g, "\\i"),
-                        error: await maybeGetError(e.args()[3])
-                    });
+                const [, name] = failedToStartMatch;
+                report.badStarts.push({
+                    plugin: name,
+                    error: await maybeGetError(e.args()[3]) ?? "Unknown error"
+                });
 
-                    break;
-                case "PluginManager:":
-                    const failedToStartMatch = message.match(/Failed to start (.+)/);
-                    if (!failedToStartMatch) break;
+                break;
+            case "LazyChunkLoader:":
+                console.error(await getText());
 
-                    console.error(await getText());
-                    process.exitCode = 1;
-
-                    const [, name] = failedToStartMatch;
-                    report.badStarts.push({
-                        plugin: name,
-                        error: await maybeGetError(e.args()[3]) ?? "Unknown error"
-                    });
-
-                    break;
-                case "LazyChunkLoader:":
-                    console.error(await getText());
-
-                    switch (message) {
-                        case "A fatal error occurred:":
-                            process.exit(1);
-                    }
-
-                    break;
-                case "Reporter:":
-                    console.error(await getText());
-
-                    switch (message) {
-                        case "A fatal error occurred:":
-                            process.exit(1);
-                        case "Webpack Find Fail:":
-                            process.exitCode = 1;
-                            report.badWebpackFinds.push(otherMessage);
-                            break;
-                        case "Finished test":
-                            await browser.close();
-                            await printReport();
-                            process.exit();
-                    }
-            }
-        }
-
-        if (isDebug) {
-            console.error(await getText());
-        } else if (level === "error") {
-            const text = await getText();
-
-            if (text.length && !text.startsWith("Failed to load resource: the server responded with a status of") && !text.includes("Webpack")) {
-                if (IGNORED_DISCORD_ERRORS.some(regex => text.match(regex))) {
-                    report.ignoredErrors.push(text);
-                } else {
-                    console.error("[Unexpected Error]", text);
-                    report.otherErrors.push(text);
+                switch (message) {
+                    case "A fatal error occurred:":
+                        process.exit(1);
                 }
+
+                break;
+            case "Reporter:":
+                console.error(await getText());
+
+                switch (message) {
+                    case "A fatal error occurred:":
+                        process.exit(1);
+                    case "Webpack Find Fail:":
+                        process.exitCode = 1;
+                        report.badWebpackFinds.push(otherMessage);
+                        break;
+                    case "Finished test":
+                        await browser.close();
+                        await printReport();
+                        process.exit();
+                }
+        }
+    }
+
+    if (isDebug) {
+        console.error(await getText());
+    } else if (level === "error") {
+        const text = await getText();
+
+        if (text.length && !text.startsWith("Failed to load resource: the server responded with a status of") && !text.includes("Webpack")) {
+            if (IGNORED_DISCORD_ERRORS.some(regex => text.match(regex))) {
+                report.ignoredErrors.push(text);
+            } else {
+                console.error("[Unexpected Error]", text);
+                report.otherErrors.push(text);
             }
         }
-    }),
+    }
+});
 
-    page.on("error", e => console.error("[Error]", e.message)),
+page.on("error", e => console.error("[Error]", e.message));
+page.on("pageerror", e => {
+    if (e.message.includes("Sentry successfully disabled")) return;
 
-    page.on("pageerror", e => {
-        if (e.message.includes("Sentry successfully disabled")) return;
-
-        if (!e.message.startsWith("Object") && !e.message.includes("Cannot find module")) {
-            console.error("[Page Error]", e.message);
-            report.otherErrors.push(e.message);
-        } else {
-            report.ignoredErrors.push(e.message);
-        }
-    })
-]);
+    if (!e.message.startsWith("Object") && !e.message.includes("Cannot find module")) {
+        console.error("[Page Error]", e.message);
+        report.otherErrors.push(e.message);
+    } else {
+        report.ignoredErrors.push(e.message);
+    }
+});
 
 async function reporterRuntime(token: string) {
     Vencord.Webpack.waitFor(

From 4e3c178043a538245db37d109929fe3378d929a7 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 10 Aug 2024 16:30:39 +0200
Subject: [PATCH 21/43] fix MutualGroupDMs

---
 src/plugins/mutualGroupDMs/index.tsx | 37 ++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx
index 27850143..7c71e1ed 100644
--- a/src/plugins/mutualGroupDMs/index.tsx
+++ b/src/plugins/mutualGroupDMs/index.tsx
@@ -21,7 +21,7 @@ import { Devs } from "@utils/constants";
 import { isNonNullish } from "@utils/guards";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { Avatar, ChannelStore, Clickable, IconUtils, RelationshipStore, ScrollerThin, UserStore } from "@webpack/common";
+import { Avatar, ChannelStore, Clickable, IconUtils, RelationshipStore, ScrollerThin, useMemo, UserStore } from "@webpack/common";
 import { Channel, User } from "discord-types/general";
 
 const SelectedChannelActionCreators = findByPropsLazy("selectPrivateChannel");
@@ -39,6 +39,19 @@ function getGroupDMName(channel: Channel) {
             .join(", ");
 }
 
+const getMutualGroupDms = (userId: string) =>
+    ChannelStore.getSortedPrivateChannels()
+        .filter(c => c.isGroupDM() && c.recipients.includes(userId));
+
+const isBotOrSelf = (user: User) => user.bot || user.id === UserStore.getCurrentUser().id;
+
+function getMutualGDMCountText(user: User) {
+    const count = getMutualGroupDms(user.id).length;
+    return `${count === 0 ? "No" : count} Mutual Group${count !== 1 ? "s" : ""}`;
+}
+
+const IS_PATCHED = Symbol("MutualGroupDMs.Patched");
+
 export default definePlugin({
     name: "MutualGroupDMs",
     description: "Shows mutual group dms in profiles",
@@ -63,8 +76,8 @@ export default definePlugin({
             find: ".MUTUAL_FRIENDS?(",
             replacement: [
                 {
-                    match: /(?<=onItemSelect:\i,children:)(\i)\.map/,
-                    replace: "[...$1, ...($self.isBotOrSelf(arguments[0].user) ? [] : [{section:'MUTUAL_GDMS',text:$self.getMutualGDMCountText(arguments[0].user)}])].map"
+                    match: /\i\.useEffect.{0,100}(\i)\[0\]\.section/,
+                    replace: "$self.pushSection($1, arguments[0].user);$&"
                 },
                 {
                     match: /\(0,\i\.jsx\)\(\i,\{items:\i,section:(\i)/,
@@ -74,15 +87,23 @@ export default definePlugin({
         }
     ],
 
-    isBotOrSelf: (user: User) => user.bot || user.id === UserStore.getCurrentUser().id,
+    isBotOrSelf,
+    getMutualGDMCountText,
 
-    getMutualGDMCountText: (user: User) => {
-        const count = ChannelStore.getSortedPrivateChannels().filter(c => c.isGroupDM() && c.recipients.includes(user.id)).length;
-        return `${count === 0 ? "No" : count} Mutual Group${count !== 1 ? "s" : ""}`;
+    pushSection(sections: any[], user: User) {
+        if (isBotOrSelf(user) || sections[IS_PATCHED]) return;
+
+        sections[IS_PATCHED] = true;
+        sections.push({
+            section: "MUTUAL_GDMS",
+            text: getMutualGDMCountText(user)
+        });
     },
 
     renderMutualGDMs: ErrorBoundary.wrap(({ user, onClose }: { user: User, onClose: () => void; }) => {
-        const entries = ChannelStore.getSortedPrivateChannels().filter(c => c.isGroupDM() && c.recipients.includes(user.id)).map(c => (
+        const mutualDms = useMemo(() => getMutualGroupDms(user.id), [user.id]);
+
+        const entries = mutualDms.map(c => (
             <Clickable
                 className={ProfileListClasses.listRow}
                 onClick={() => {

From 003e4a08d5c9af1e387a9d95ac3f79df813e9b45 Mon Sep 17 00:00:00 2001
From: Lumap <lumap@duck.com>
Date: Sat, 10 Aug 2024 16:39:33 +0200
Subject: [PATCH 22/43] fix PictureInPicture (#2773)

Co-authored-by: v <vendicated@riseup.net>
---
 src/plugins/pictureInPicture/index.tsx |  6 +++---
 src/utils/constants.ts                 | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/pictureInPicture/index.tsx b/src/plugins/pictureInPicture/index.tsx
index 81d75a25..20cedf45 100644
--- a/src/plugins/pictureInPicture/index.tsx
+++ b/src/plugins/pictureInPicture/index.tsx
@@ -24,13 +24,13 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "PictureInPicture",
     description: "Adds picture in picture to videos (next to the Download button)",
-    authors: [Devs.Nobody],
+    authors: [Devs.Lumap],
     settings,
     patches: [
         {
-            find: ".nonMediaMosaicItem]",
+            find: ".removeMosaicItemHoverButton),",
             replacement: {
-                match: /\.nonMediaMosaicItem\]:!(\i).{0,50}?children:\[(\S)/,
+                match: /\.nonMediaMosaicItem\]:!(\i).{0,50}?children:\[\S,(\S)/,
                 replace: "$&,$1&&$2&&$self.renderPiPButton(),"
             },
         },
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 35525cd1..febb8f9a 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -33,10 +33,6 @@ export interface Dev {
  * If you are fine with attribution but don't want the badge, add badge: false
  */
 export const Devs = /* #__PURE__*/ Object.freeze({
-    Nobody: {
-        name: "Nobody",
-        id: 0n,
-    },
     Ven: {
         name: "Vee",
         id: 343383572805058560n
@@ -545,7 +541,11 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     surgedevs: {
         name: "Chloe",
         id: 1084592643784331324n
-    }
+    },
+    Lumap: {
+        name: "Lumap",
+        id: 585278686291427338n,
+    },
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly

From 87e6fa8647b6ddfcd73036fd62f2357ed820d510 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 10 Aug 2024 17:25:40 +0200
Subject: [PATCH 23/43] build: improve errors when breaking module boundaries

---
 scripts/build/build.mjs    |  6 +++---
 scripts/build/buildWeb.mjs | 11 ++++++++---
 scripts/build/common.mjs   | 25 +++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs
index 817c2cec..623f9f94 100755
--- a/scripts/build/build.mjs
+++ b/scripts/build/build.mjs
@@ -21,7 +21,7 @@ import esbuild from "esbuild";
 import { readdir } from "fs/promises";
 import { join } from "path";
 
-import { BUILD_TIMESTAMP, commonOpts, exists, globPlugins, IS_DEV, IS_REPORTER, IS_STANDALONE, IS_UPDATER_DISABLED, resolvePluginName, VERSION, watch } from "./common.mjs";
+import { BUILD_TIMESTAMP, commonOpts, exists, globPlugins, IS_DEV, IS_REPORTER, IS_STANDALONE, IS_UPDATER_DISABLED, resolvePluginName, VERSION, commonRendererPlugins, watch } from "./common.mjs";
 
 const defines = {
     IS_STANDALONE,
@@ -131,7 +131,7 @@ await Promise.all([
         sourcemap,
         plugins: [
             globPlugins("discordDesktop"),
-            ...commonOpts.plugins
+            ...commonRendererPlugins
         ],
         define: {
             ...defines,
@@ -180,7 +180,7 @@ await Promise.all([
         sourcemap,
         plugins: [
             globPlugins("vencordDesktop"),
-            ...commonOpts.plugins
+            ...commonRendererPlugins
         ],
         define: {
             ...defines,
diff --git a/scripts/build/buildWeb.mjs b/scripts/build/buildWeb.mjs
index bc15ccce..deab8661 100644
--- a/scripts/build/buildWeb.mjs
+++ b/scripts/build/buildWeb.mjs
@@ -23,7 +23,7 @@ import { appendFile, mkdir, readdir, readFile, rm, writeFile } from "fs/promises
 import { join } from "path";
 import Zip from "zip-local";
 
-import { BUILD_TIMESTAMP, commonOpts, globPlugins, IS_DEV, IS_REPORTER, VERSION } from "./common.mjs";
+import { BUILD_TIMESTAMP, commonOpts, globPlugins, IS_DEV, IS_REPORTER, VERSION, commonRendererPlugins } from "./common.mjs";
 
 /**
  * @type {esbuild.BuildOptions}
@@ -36,7 +36,7 @@ const commonOptions = {
     external: ["~plugins", "~git-hash", "/assets/*"],
     plugins: [
         globPlugins("web"),
-        ...commonOpts.plugins,
+        ...commonRendererPlugins
     ],
     target: ["esnext"],
     define: {
@@ -116,7 +116,12 @@ await Promise.all(
             }
         })
     ]
-);
+).catch(err => {
+    console.error("Build failed");
+    console.error(err.message);
+    if (!commonOpts.watch)
+        process.exit(1);
+});;
 
 /**
  * @type {(dir: string) => Promise<string[]>}
diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
index c46a559a..247557e3 100644
--- a/scripts/build/common.mjs
+++ b/scripts/build/common.mjs
@@ -28,6 +28,7 @@ import { join, relative } from "path";
 import { promisify } from "util";
 
 import { getPluginTarget } from "../utils.mjs";
+import { builtinModules } from "module";
 
 /** @type {import("../../package.json")} */
 const PackageJSON = JSON.parse(readFileSync("package.json"));
@@ -292,6 +293,18 @@ export const stylePlugin = {
     }
 };
 
+/**
+ * @type {(filter: RegExp, message: string) => import("esbuild").Plugin}
+ */
+export const banImportPlugin = (filter, message) => ({
+    name: "ban-imports",
+    setup: build => {
+        build.onResolve({ filter }, () => {
+            return { errors: [{ text: message }] };
+        });
+    }
+});
+
 /**
  * @type {import("esbuild").BuildOptions}
  */
@@ -311,3 +324,15 @@ export const commonOpts = {
     // Work around https://github.com/evanw/esbuild/issues/2460
     tsconfig: "./scripts/build/tsconfig.esbuild.json"
 };
+
+const escapedBuiltinModules = builtinModules
+    .map(m => m.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&"))
+    .join("|");
+const builtinModuleRegex = new RegExp(`^(node:)?(${escapedBuiltinModules})$`);
+
+export const commonRendererPlugins = [
+    banImportPlugin(builtinModuleRegex, "Cannot import node inbuilt modules in browser code. You need to use a native.ts file"),
+    banImportPlugin(/^react$/, "Cannot import from react. React and hooks should be imported from @webpack/common"),
+    banImportPlugin(/^electron(\/.*)?$/, "Cannot import electron in browser code. You need to use a native.ts file"),
+    ...commonOpts.plugins
+];

From 1a712e75a61d6f8462bca5b37dd2dfb169edc5bb Mon Sep 17 00:00:00 2001
From: Joona <69722179+Masterjoona@users.noreply.github.com>
Date: Sat, 10 Aug 2024 19:35:21 +0300
Subject: [PATCH 24/43] fix(SpotifyControls): sync with external shuffle
 toggles  (#2767)

Co-authored-by: v <vendicated@riseup.net>
---
 src/plugins/spotifyControls/SpotifyStore.ts |  2 ++
 src/plugins/spotifyControls/index.tsx       | 23 ++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/plugins/spotifyControls/SpotifyStore.ts b/src/plugins/spotifyControls/SpotifyStore.ts
index 7fdd6bba..5c0c5fe4 100644
--- a/src/plugins/spotifyControls/SpotifyStore.ts
+++ b/src/plugins/spotifyControls/SpotifyStore.ts
@@ -55,6 +55,7 @@ interface PlayerState {
 
     // added by patch
     actual_repeat: Repeat;
+    shuffle: boolean;
 }
 
 interface Device {
@@ -182,6 +183,7 @@ export const SpotifyStore = proxyLazyWebpack(() => {
             store.isPlaying = e.isPlaying ?? false;
             store.volume = e.volumePercent ?? 0;
             store.repeat = e.actual_repeat || "off";
+            store.shuffle = e.shuffle ?? false;
             store.position = e.position ?? 0;
             store.isSettingPosition = false;
             store.emitChange();
diff --git a/src/plugins/spotifyControls/index.tsx b/src/plugins/spotifyControls/index.tsx
index ae5fbcd8..1e15ef56 100644
--- a/src/plugins/spotifyControls/index.tsx
+++ b/src/plugins/spotifyControls/index.tsx
@@ -70,21 +70,20 @@ export default definePlugin({
                 replace: "false",
             }]
         },
-        // Discord doesn't give you the repeat kind, only a boolean
         {
             find: 'repeat:"off"!==',
-            replacement: {
-                match: /repeat:"off"!==(.{1,3}),/,
-                replace: "actual_repeat:$1,$&"
-            }
+            replacement: [
+                {
+                    // Discord doesn't give you shuffle state and the repeat kind, only a boolean
+                    match: /repeat:"off"!==(\i),/,
+                    replace: "shuffle:arguments[2]?.shuffle_state??false,actual_repeat:$1,$&"
+                },
+                {
+                    match: /(?<=artists.filter\(\i=>).{0,10}\i\.id\)&&/,
+                    replace: ""
+                }
+            ]
         },
-        {
-            find: "artists.filter",
-            replacement: {
-                match: /(?<=artists.filter\(\i=>).{0,10}\i\.id\)&&/,
-                replace: ""
-            }
-        }
     ],
 
     start: () => toggleHoverControls(Settings.plugins.SpotifyControls.hoverControls),

From 3035edf256009398a431ccdece4f5806022052fb Mon Sep 17 00:00:00 2001
From: nexpid <60316309+nexpid@users.noreply.github.com>
Date: Sat, 10 Aug 2024 22:25:25 +0200
Subject: [PATCH 25/43] feat(wigglyText): Updates

* feat(wigglyText): upsert

* Fix Import Formatting

---------

Co-authored-by: thororen <78185467+thororen1234@users.noreply.github.com>
---
 src/equicordplugins/wigglyText/index.tsx      | 151 +++++++++++-------
 .../ui/components/ExampleWiggle.tsx           |  20 +++
 2 files changed, 115 insertions(+), 56 deletions(-)
 create mode 100644 src/equicordplugins/wigglyText/ui/components/ExampleWiggle.tsx

diff --git a/src/equicordplugins/wigglyText/index.tsx b/src/equicordplugins/wigglyText/index.tsx
index 7ffd6e0e..df261230 100644
--- a/src/equicordplugins/wigglyText/index.tsx
+++ b/src/equicordplugins/wigglyText/index.tsx
@@ -8,8 +8,11 @@ import { definePluginSettings } from "@api/Settings";
 import { makeRange } from "@components/PluginSettings/components";
 import { EquicordDevs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
+import { Text } from "@webpack/common";
 import { ReactNode } from "react";
 
+import ExampleWiggle from "./ui/components/ExampleWiggle";
+
 const settings = definePluginSettings({
     intensity: {
         type: OptionType.SLIDER,
@@ -18,22 +21,6 @@ const settings = definePluginSettings({
         default: 4,
         stickToMarkers: true,
         onChange: () => updateStyles()
-    },
-    direction: {
-        type: OptionType.SELECT,
-        description: "Swing direction",
-        options: [{
-            label: "Circle",
-            value: "xy",
-            default: true
-        }, {
-            label: "Horizontal",
-            value: "x",
-        }, {
-            label: "Vertical",
-            value: "y"
-        }],
-        onChange: () => updateStyles()
     }
 });
 
@@ -42,56 +29,103 @@ const dirMap = {
     y: "1.2s wiggle-wavy-y linear infinite"
 };
 
+const classMap = [
+    {
+        chars: ["<", ">"],
+        className: "wiggle-inner-x",
+    },
+    {
+        chars: ["^", "^"],
+        className: "wiggle-inner-y",
+    },
+    {
+        chars: [")", "("],
+        className: "wiggle-inner-xy"
+    }
+];
+
 let styles: HTMLStyleElement;
 const updateStyles = () => {
     const inten = Vencord.Settings.plugins.WigglyText.intensity + "px";
-    const dir = Vencord.Settings.plugins.WigglyText.direction as string;
     styles.textContent = `
-        .wiggly-inner {
-            animation: ${dir.split("").map(dir => dirMap[dir]).join(", ")};
-            position: relative;
-            top: 0;
-            left: 0;
-        }
+.wiggle-example {
+    list-style-type: disc;
+    list-style-position: outside;
+    margin: 4px 0 0 16px;
+}
 
-        @keyframes wiggle-wavy-x {
-            from {
-                left: -${inten};
-            }
+.wiggle-example li {
+    white-space: break-spaces;
+    margin-bottom: 4px;
+}
 
-            to {
-                left: ${inten};
-            }
-        }
+.wiggle-inner {
+    position: relative;
+    top: 0;
+    left: 0;
 
-        @keyframes wiggle-wavy-y {
-            0% {
-                top: 0;
-                animation-timing-function: ease-out;
-            }
+    &.wiggle-inner-x {
+        animation: ${dirMap.x};
+    }
 
-            25% {
-                top: -${inten};
-                animation-timing-function: ease-in;
-            }
+    &.wiggle-inner-y {
+        animation: ${dirMap.y};
+    }
 
-            50% {
-                top: 0;
-                animation-timing-function: ease-out;
-            }
+    &.wiggle-inner-xy {
+        animation: ${dirMap.x}, ${dirMap.y};
+    }
+}
 
-            75% {
-                top: ${inten};
-                animation-timing-function: ease-in;
-            }
-        }`;
+@keyframes wiggle-wavy-x {
+    from {
+        left: -${inten};
+    }
+
+    to {
+        left: ${inten};
+    }
+}
+
+@keyframes wiggle-wavy-y {
+    0% {
+        top: 0;
+        animation-timing-function: ease-out;
+    }
+
+    25% {
+        top: -${inten};
+        animation-timing-function: ease-in;
+    }
+
+    50% {
+        top: 0;
+        animation-timing-function: ease-out;
+    }
+
+    75% {
+        top: ${inten};
+        animation-timing-function: ease-in;
+    }
+}`;
 };
 
 export default definePlugin({
     name: "WigglyText",
-    description: "Adds a new markdown formatting that makes text ~wiggly~",
+    description: "Adds a new markdown formatting that makes text wiggly.",
     authors: [EquicordDevs.nexpid],
     settings,
+    settingsAboutComponent: () => (
+        <Text>
+            You can make text wiggle with the following:<br />
+            <ul className="wiggle-example">
+                <li><ExampleWiggle wiggle="x">left and right</ExampleWiggle> by typing <code>&lt;~text~&gt;</code></li>
+                <li><ExampleWiggle wiggle="y">up and down</ExampleWiggle> by typing <code>^~text~^</code></li>
+                <li><ExampleWiggle wiggle="xy">in a circle</ExampleWiggle> by typing <code>)~text~(</code></li>
+            </ul>
+        </Text>
+    ),
+
     patches: [
         {
             find: "parseToAST:",
@@ -104,16 +138,21 @@ export default definePlugin({
 
     wigglyRule: {
         order: 24,
-        match: (source: string) => source.match(/^~([\s\S]+?)~(?!_)/),
+        match: (source: string) => classMap.map(({ chars }) => source.match(new RegExp(`^(\\${chars[0]})~([\\s\\S]+?)~(\\${chars[1]})(?!_)`))).find(x => x !== null),
         parse: (
             capture: RegExpMatchArray,
             transform: (...args: any[]) => any,
             state: any
-        ) => ({
-            content: transform(capture[1], state),
-        }),
+        ) => {
+            const className = classMap.find(({ chars }) => chars[0] === capture[1] && chars[1] === capture[3])?.className ?? "";
+
+            return {
+                content: transform(capture[2], state),
+                className
+            };
+        },
         react: (
-            data: { content: any[]; },
+            data: { content: any[]; className: string; },
             output: (...args: any[]) => ReactNode[]
         ) => {
             let offset = 0;
@@ -129,7 +168,7 @@ export default definePlugin({
                         children[j] = child.split("").map((x, i) => (
                             <span key={i}>
                                 <span
-                                    className="wiggly-inner"
+                                    className={`wiggle-inner ${data.className}`}
                                     style={{
                                         animationDelay: `${((offset++) * 25) % 1200}ms`,
                                     }}
diff --git a/src/equicordplugins/wigglyText/ui/components/ExampleWiggle.tsx b/src/equicordplugins/wigglyText/ui/components/ExampleWiggle.tsx
new file mode 100644
index 00000000..1f6e709a
--- /dev/null
+++ b/src/equicordplugins/wigglyText/ui/components/ExampleWiggle.tsx
@@ -0,0 +1,20 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+export default function ExampleWiggle({ wiggle, children }: { wiggle: "x" | "y" | "xy", children: string; }) {
+    return children.split("").map((x, i) => (
+        <span key={i}>
+            <span
+                className={`wiggle-inner wiggle-inner-${wiggle}`}
+                style={{
+                    animationDelay: `${(i * 25) % 1200}ms`,
+                }}
+            >
+                {x}
+            </span>
+        </span>
+    ));
+}

From b6cb11578cbe17c9eb923b759e68f4ad17b23585 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Sun, 11 Aug 2024 01:12:38 -0400
Subject: [PATCH 26/43] Update D3SOX Plugins

Remove NotifyUserChanges as it enables a stalking like behavior
---
 README.md                                     |  10 +-
 .../components/ActivityTooltip.tsx            |  73 ---
 .../betterActivities/index.tsx                | 434 +++++++++++++-----
 .../betterActivities/settings.tsx             |  77 ----
 .../betterActivities/styles.css               |  48 +-
 src/equicordplugins/betterActivities/types.ts |   9 -
 src/equicordplugins/betterActivities/utils.ts | 158 -------
 .../components/SpeedIcon.tsx                  |  21 +
 .../mediaPlaybackSpeed/index.tsx              | 151 ++++++
 .../components/NotificationsOffIcon.tsx       |  11 -
 .../components/NotificationsOnIcon.tsx        |  11 -
 .../notifyUserChanges/index.tsx               | 344 --------------
 .../serverProfilesToolbox/index.tsx           | 190 ++++++++
 .../silentTypingEnhanced/index.tsx            | 177 +++++++
 src/equicordplugins/voiceChatUtils/index.tsx  |   6 +-
 15 files changed, 868 insertions(+), 852 deletions(-)
 delete mode 100644 src/equicordplugins/betterActivities/components/ActivityTooltip.tsx
 delete mode 100644 src/equicordplugins/betterActivities/settings.tsx
 delete mode 100644 src/equicordplugins/betterActivities/utils.ts
 create mode 100644 src/equicordplugins/mediaPlaybackSpeed/components/SpeedIcon.tsx
 create mode 100644 src/equicordplugins/mediaPlaybackSpeed/index.tsx
 delete mode 100644 src/equicordplugins/notifyUserChanges/components/NotificationsOffIcon.tsx
 delete mode 100644 src/equicordplugins/notifyUserChanges/components/NotificationsOnIcon.tsx
 delete mode 100644 src/equicordplugins/notifyUserChanges/index.tsx
 create mode 100644 src/equicordplugins/serverProfilesToolbox/index.tsx
 create mode 100644 src/equicordplugins/silentTypingEnhanced/index.tsx

diff --git a/README.md b/README.md
index b0a6c57b..d951b030 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 -   Request for plugins from Discord.
 
 <details>
-<summary>Extra included plugins (122 additional plugins)</summary>
+<summary>Extra included plugins (124 additional plugins)</summary>
 
 - AllCallTimers by MaxHerbold and D3SOX
 - AltKrispSwitch by newwares
@@ -86,6 +86,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 - KeywordNotify by camila314 (maintained by thororen)
 - LoginWithQR by nexpid
 - MediaDownloader by Colorman
+- MediaPlaybackSpeed by D3SOX
 - Meow by Samwich
 - MessageColors by Hen
 - MessageLinkTooltip by Kyuuhachi
@@ -102,7 +103,6 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 - NoNitroUpsell by thororen
 - NoRoleHeaders by Samwich
 - NotificationTitle by Kyuuhachi
-- NotifyUserChanges by D3SOX
 - OnePingPerDM by ProffDea
 - PlatformSpoofer by Drag
 - PurgeMessages by bhop and nyx
@@ -116,9 +116,11 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 - ScreenRecorder by AutumnVN
 - SearchFix by Jaxx
 - SekaiStickers by MaiKokain
+- ServerProfilesToolbox by D3SOX
 - ServerSearch by camila314
-- Shakespearean by vmohammad
+- Shakespearean by vmohammad (Dev build only)
 - ShowBadgesInChat by Inbestigator and KrystalSkull
+- SilentTypingEnhanced by Ven, Rini, D3SOX
 - Slap by Korbo
 - SoundBoardLogger by Moxxie, fres, echo (maintained by thororen)
 - SteamStatusSync by niko
@@ -139,7 +141,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 - VencordRPC by AutumnVN
 - VideoSpeed by Samwich
 - ViewRaw2 by Kyuuhachi
-- VoiceChatUtilities by Dams and D3SOX
+- VoiceChatUtilities by D3SOX
 - WebpackTarball by Kyuuhachi
 - WhosWatching by fres
 - WigglyText by nexpid
diff --git a/src/equicordplugins/betterActivities/components/ActivityTooltip.tsx b/src/equicordplugins/betterActivities/components/ActivityTooltip.tsx
deleted file mode 100644
index cc5a03ea..00000000
--- a/src/equicordplugins/betterActivities/components/ActivityTooltip.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import ErrorBoundary from "@components/ErrorBoundary";
-import { findComponentByCodeLazy } from "@webpack";
-import { moment, React, useMemo } from "@webpack/common";
-import { User } from "discord-types/general";
-
-import { Activity, Application } from "../types";
-import {
-    formatElapsedTime,
-    getActivityImage,
-    getApplicationIcons,
-    getValidStartTimeStamp,
-    getValidTimestamps
-} from "../utils";
-
-const TimeBar = findComponentByCodeLazy<{
-    start: number;
-    end: number;
-    themed: boolean;
-    className: string;
-}>("isSingleLine");
-
-interface ActivityTooltipProps {
-    activity: Activity;
-    application?: Application;
-    user: User;
-    cl: ReturnType<typeof import("@api/Styles").classNameFactory>;
-}
-
-export default function ActivityTooltip({ activity, application, user, cl }: Readonly<ActivityTooltipProps>) {
-    const image = useMemo(() => {
-        const activityImage = getActivityImage(activity, application);
-        if (activityImage) {
-            return activityImage;
-        }
-        const icon = getApplicationIcons([activity], true)[0];
-        return icon?.image.src;
-    }, [activity]);
-    const timestamps = useMemo(() => getValidTimestamps(activity), [activity]);
-    const startTime = useMemo(() => getValidStartTimeStamp(activity), [activity]);
-
-    const hasDetails = activity.details ?? activity.state;
-    return (
-        <ErrorBoundary>
-            <div className={cl("activity")}>
-                {image && <img className={cl("activity-image")} src={image} alt="Activity logo" />}
-                <div className={cl("activity-title")}>{activity.name}</div>
-                {hasDetails && <div className={cl("activity-divider")} />}
-                <div className={cl("activity-details")}>
-                    <div>{activity.details}</div>
-                    <div>{activity.state}</div>
-                    {!timestamps && startTime &&
-                        <div className={cl("activity-time-bar")}>
-                            {formatElapsedTime(moment(startTime / 1000), moment())}
-                        </div>
-                    }
-                </div>
-                {timestamps && (
-                    <TimeBar start={timestamps.start}
-                        end={timestamps.end}
-                        themed={false}
-                        className={cl("activity-time-bar")}
-                    />
-                )}
-            </div>
-        </ErrorBoundary>
-    );
-}
diff --git a/src/equicordplugins/betterActivities/index.tsx b/src/equicordplugins/betterActivities/index.tsx
index 4aaa5a65..813e2fa9 100644
--- a/src/equicordplugins/betterActivities/index.tsx
+++ b/src/equicordplugins/betterActivities/index.tsx
@@ -1,51 +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/>.
-*/
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 import "./styles.css";
 
-import { migratePluginSettings } from "@api/Settings";
+import { definePluginSettings, migratePluginSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-import { findComponentByCodeLazy } from "@webpack";
-import { PresenceStore, React, Tooltip, useStateFromStores } from "@webpack/common";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByPropsLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack";
+import { PresenceStore, React, Tooltip, useEffect, useMemo, useState, useStateFromStores } from "@webpack/common";
 import { User } from "discord-types/general";
 
-import ActivityTooltip from "./components/ActivityTooltip";
 import { Caret } from "./components/Caret";
 import { SpotifyIcon } from "./components/SpotifyIcon";
 import { TwitchIcon } from "./components/TwitchIcon";
-import settings from "./settings";
-import { Activity, ActivityListIcon, ActivityViewProps, ApplicationIcon, IconCSSProperties } from "./types";
-import {
-    getApplicationIcons
-} from "./utils";
+import { Activity, ActivityListIcon, Application, ApplicationIcon, IconCSSProperties } from "./types";
+
+const settings = definePluginSettings({
+    memberList: {
+        type: OptionType.BOOLEAN,
+        description: "Show activity icons in the member list",
+        default: true,
+        restartNeeded: true,
+    },
+    iconSize: {
+        type: OptionType.SLIDER,
+        description: "Size of the activity icons",
+        markers: [10, 15, 20],
+        default: 15,
+        stickToMarkers: false,
+    },
+    specialFirst: {
+        type: OptionType.BOOLEAN,
+        description: "Show special activities first (Currently Spotify and Twitch)",
+        default: true,
+        restartNeeded: false,
+    },
+    renderGifs: {
+        type: OptionType.BOOLEAN,
+        description: "Allow rendering GIFs",
+        default: true,
+        restartNeeded: false,
+    },
+    showAppDescriptions: {
+        type: OptionType.BOOLEAN,
+        description: "Show application descriptions in the activity tooltip",
+        default: true,
+        restartNeeded: false,
+    },
+    divider: {
+        type: OptionType.COMPONENT,
+        description: "",
+        component: () => (
+            <div style={{
+                width: "100%",
+                height: 1,
+                borderTop: "thin solid var(--background-modifier-accent)",
+                paddingTop: 5,
+                paddingBottom: 5
+            }} />
+        ),
+    },
+    userPopout: {
+        type: OptionType.BOOLEAN,
+        description: "Show all activities in the profile popout/sidebar",
+        default: true,
+        restartNeeded: true,
+    },
+    allActivitiesStyle: {
+        type: OptionType.SELECT,
+        description: "Style for showing all activities",
+        options: [
+            {
+                default: true,
+                label: "Carousel",
+                value: "carousel",
+            },
+            {
+                label: "List",
+                value: "list",
+            },
+        ]
+    }
+});
 
 const cl = classNameFactory("vc-bactivities-");
 
-const ActivityView = findComponentByCodeLazy<ActivityViewProps>(",onOpenGameProfileModal:");
+const ApplicationStore: {
+    getApplication: (id: string) => Application | null;
+} = findStoreLazy("ApplicationStore");
+
+const { fetchApplication }: {
+    fetchApplication: (id: string) => Promise<Application | null>;
+} = findByPropsLazy("fetchApplication");
+
+const ActivityView = findComponentByCodeLazy<{
+    activity: Activity | null;
+    user: User;
+    application?: Application;
+    type?: string;
+}>(",onOpenGameProfileModal:");
 
 // if discord one day decides to change their icon this needs to be updated
 const DefaultActivityIcon = findComponentByCodeLazy("M6,7 L2,7 L2,6 L6,6 L6,7 Z M8,5 L2,5 L2,4 L8,4 L8,5 Z M8,3 L2,3 L2,2 L8,2 L8,3 Z M8.88888889,0 L1.11111111,0 C0.494444444,0 0,0.494444444 0,1.11111111 L0,8.88888889 C0,9.50253861 0.497461389,10 1.11111111,10 L8.88888889,10 C9.50253861,10 10,9.50253861 10,8.88888889 L10,1.11111111 C10,0.494444444 9.5,0 8.88888889,0 Z");
 
+const fetchedApplications = new Map<string, Application | null>();
+
+const xboxUrl = "https://discord.com/assets/9a15d086141be29d9fcd.png"; // TODO: replace with "renderXboxImage"?
+
+const ActivityTooltip = ({ activity, application, user }: Readonly<{ activity: Activity, application?: Application, user: User; }>) => {
+    return (
+        <ErrorBoundary>
+            <div className={cl("activity-tooltip")}>
+                <ActivityView
+                    activity={activity}
+                    user={user}
+                    application={application}
+                    type="BiteSizePopout"
+                />
+            </div>
+        </ErrorBoundary>
+    );
+};
+
+function getActivityApplication({ application_id }: Activity) {
+    if (!application_id) return undefined;
+    let application = ApplicationStore.getApplication(application_id);
+    if (!application && fetchedApplications.has(application_id)) {
+        application = fetchedApplications.get(application_id) ?? null;
+    }
+    return application ?? undefined;
+}
+
+function getApplicationIcons(activities: Activity[], preferSmall = false) {
+    const applicationIcons: ApplicationIcon[] = [];
+    const applications = activities.filter(activity => activity.application_id || activity.platform);
+
+    for (const activity of applications) {
+        const { assets, application_id, platform } = activity;
+        if (!application_id && !platform) {
+            continue;
+        }
+
+        if (assets) {
+            const addImage = (image: string, alt: string) => {
+                if (image.startsWith("mp:")) {
+                    const discordMediaLink = `https://media.discordapp.net/${image.replace(/mp:/, "")}`;
+                    if (settings.store.renderGifs || !discordMediaLink.endsWith(".gif")) {
+                        applicationIcons.push({
+                            image: { src: discordMediaLink, alt },
+                            activity
+                        });
+                    }
+                } else {
+                    const src = `https://cdn.discordapp.com/app-assets/${application_id}/${image}.png`;
+                    applicationIcons.push({
+                        image: { src, alt },
+                        activity
+                    });
+                }
+            };
+
+            const smallImage = assets.small_image;
+            const smallText = assets.small_text ?? "Small Text";
+            const largeImage = assets.large_image;
+            const largeText = assets.large_text ?? "Large Text";
+            if (preferSmall) {
+                if (smallImage) {
+                    addImage(smallImage, smallText);
+                } else if (largeImage) {
+                    addImage(largeImage, largeText);
+                }
+            } else {
+                if (largeImage) {
+                    addImage(largeImage, largeText);
+                } else if (smallImage) {
+                    addImage(smallImage, smallText);
+                }
+            }
+        } else if (application_id) {
+            let application = ApplicationStore.getApplication(application_id);
+            if (!application) {
+                if (fetchedApplications.has(application_id)) {
+                    application = fetchedApplications.get(application_id) as Application | null;
+                } else {
+                    fetchedApplications.set(application_id, null);
+                    fetchApplication(application_id).then(app => {
+                        fetchedApplications.set(application_id, app);
+                    }).catch(console.error);
+                }
+            }
+
+            if (application) {
+                if (application.icon) {
+                    const src = `https://cdn.discordapp.com/app-icons/${application.id}/${application.icon}.png`;
+                    applicationIcons.push({
+                        image: { src, alt: application.name },
+                        activity,
+                        application
+                    });
+                } else if (platform === "xbox") {
+                    applicationIcons.push({
+                        image: { src: xboxUrl, alt: "Xbox" },
+                        activity,
+                        application
+                    });
+                }
+            } else if (platform === "xbox") {
+                applicationIcons.push({
+                    image: { src: xboxUrl, alt: "Xbox" },
+                    activity
+                });
+            }
+        } else if (platform === "xbox") {
+            applicationIcons.push({
+                image: { src: xboxUrl, alt: "Xbox" },
+                activity
+            });
+        }
+    }
+
+    return applicationIcons;
+}
 
 migratePluginSettings("BetterActivities", "MemberListActivities");
+
 export default definePlugin({
     name: "BetterActivities",
     description: "Shows activity icons in the member list and allows showing all activities",
@@ -68,12 +251,7 @@ export default definePlugin({
             for (const appIcon of uniqueIcons) {
                 icons.push({
                     iconElement: <img {...appIcon.image} />,
-                    tooltip: <ActivityTooltip
-                        activity={appIcon.activity}
-                        application={appIcon.application}
-                        user={user}
-                        cl={cl}
-                    />
+                    tooltip: <ActivityTooltip activity={appIcon.activity} application={appIcon.application} user={user} />
                 });
             }
         }
@@ -84,7 +262,7 @@ export default definePlugin({
                 const activity = activities[activityIndex];
                 const iconObject: ActivityListIcon = {
                     iconElement: <IconComponent />,
-                    tooltip: <ActivityTooltip activity={activity} user={user} cl={cl} />
+                    tooltip: <ActivityTooltip activity={activity} user={user} />
                 };
 
                 if (settings.store.specialFirst) {
@@ -131,8 +309,8 @@ export default definePlugin({
         return null;
     },
 
-    showAllActivitiesComponent({ activity, user, guild, channelId, onClose }: ActivityViewProps) {
-        const [currentActivity, setCurrentActivity] = React.useState<Activity | null>(
+    showAllActivitiesComponent({ activity, user, ...props }: Readonly<{ activity: Activity; user: User; application: Application; type: string; }>) {
+        const [currentActivity, setCurrentActivity] = useState<Activity | null>(
             activity?.type !== 4 ? activity! : null
         );
 
@@ -140,7 +318,7 @@ export default definePlugin({
             [PresenceStore], () => PresenceStore.getActivities(user.id).filter((activity: Activity) => activity.type !== 4)
         ) ?? [];
 
-        React.useEffect(() => {
+        useEffect(() => {
             if (!activities.length) {
                 setCurrentActivity(null);
                 return;
@@ -148,75 +326,92 @@ export default definePlugin({
 
             if (!currentActivity || !activities.includes(currentActivity))
                 setCurrentActivity(activities[0]);
-
         }, [activities]);
 
+        // we use these for other activities, it would be better to somehow get the corresponding activity props
+        const generalProps = useMemo(() => Object.keys(props).reduce((acc, key) => {
+            // exclude activity specific props to prevent copying them to all activities (e.g. buttons)
+            if (key !== "renderActions" && key !== "application") acc[key] = props[key];
+            return acc;
+        }, {}), [props]);
+
         if (!activities.length) return null;
 
         if (settings.store.allActivitiesStyle === "carousel") {
             return (
                 <div style={{ display: "flex", flexDirection: "column" }}>
-                    <ActivityView
-                        activity={currentActivity}
-                        user={user}
-                        guild={guild}
-                        channelId={channelId}
-                        onClose={onClose} />
-                    <div
-                        className={cl("controls")}
-                        style={{
-                            display: "flex",
-                            flexDirection: "row",
-                            justifyContent: "space-between",
-                        }}
-                    >
-                        <Tooltip text="Left" tooltipClassName={cl("controls-tooltip")}>{({
-                            onMouseEnter,
-                            onMouseLeave
-                        }) => {
-                            return <span
-                                onMouseEnter={onMouseEnter}
-                                onMouseLeave={onMouseLeave}
-                                onClick={() => {
-                                    const index = activities.indexOf(currentActivity!);
-                                    if (index - 1 >= 0)
-                                        setCurrentActivity(activities[index - 1]);
-                                }}
-                            >
-                                <Caret
-                                    disabled={activities.indexOf(currentActivity!) < 1}
-                                    direction="left" />
-                            </span>;
-                        }}</Tooltip>
+                    {currentActivity?.id === activity.id ? (
+                        <ActivityView
+                            activity={currentActivity}
+                            user={user}
+                            {...props}
+                        />
+                    ) : (
+                        <ActivityView
+                            activity={currentActivity}
+                            user={user}
+                            // fetch optional application
+                            application={getActivityApplication(currentActivity!)}
+                            {...generalProps}
+                        />
+                    )}
+                    {activities.length > 1 &&
+                        <div
+                            className={cl("controls")}
+                            style={{
+                                display: "flex",
+                                flexDirection: "row",
+                                justifyContent: "space-between",
+                            }}
+                        >
+                            <Tooltip text="Left" tooltipClassName={cl("controls-tooltip")}>{({
+                                onMouseEnter,
+                                onMouseLeave
+                            }) => {
+                                return <span
+                                    onMouseEnter={onMouseEnter}
+                                    onMouseLeave={onMouseLeave}
+                                    onClick={() => {
+                                        const index = activities.indexOf(currentActivity!);
+                                        if (index - 1 >= 0)
+                                            setCurrentActivity(activities[index - 1]);
+                                    }}
+                                >
+                                    <Caret
+                                        disabled={activities.indexOf(currentActivity!) < 1}
+                                        direction="left" />
+                                </span>;
+                            }}</Tooltip>
 
-                        <div className="carousell">
-                            {activities.map((activity, index) => (
-                                <div
-                                    key={"dot--" + index}
-                                    onClick={() => setCurrentActivity(activity)}
-                                    className={`dot ${currentActivity === activity ? "selected" : ""}`} />
-                            ))}
+                            <div className="carousel">
+                                {activities.map((activity, index) => (
+                                    <div
+                                        key={"dot--" + index}
+                                        onClick={() => setCurrentActivity(activity)}
+                                        className={`dot ${currentActivity === activity ? "selected" : ""}`} />
+                                ))}
+                            </div>
+
+                            <Tooltip text="Right" tooltipClassName={cl("controls-tooltip")}>{({
+                                onMouseEnter,
+                                onMouseLeave
+                            }) => {
+                                return <span
+                                    onMouseEnter={onMouseEnter}
+                                    onMouseLeave={onMouseLeave}
+                                    onClick={() => {
+                                        const index = activities.indexOf(currentActivity!);
+                                        if (index + 1 < activities.length)
+                                            setCurrentActivity(activities[index + 1]);
+                                    }}
+                                >
+                                    <Caret
+                                        disabled={activities.indexOf(currentActivity!) >= activities.length - 1}
+                                        direction="right" />
+                                </span>;
+                            }}</Tooltip>
                         </div>
-
-                        <Tooltip text="Right" tooltipClassName={cl("controls-tooltip")}>{({
-                            onMouseEnter,
-                            onMouseLeave
-                        }) => {
-                            return <span
-                                onMouseEnter={onMouseEnter}
-                                onMouseLeave={onMouseLeave}
-                                onClick={() => {
-                                    const index = activities.indexOf(currentActivity!);
-                                    if (index + 1 < activities.length)
-                                        setCurrentActivity(activities[index + 1]);
-                                }}
-                            >
-                                <Caret
-                                    disabled={activities.indexOf(currentActivity!) >= activities.length - 1}
-                                    direction="right" />
-                            </span>;
-                        }}</Tooltip>
-                    </div>
+                    }
                 </div>
             );
         } else {
@@ -228,16 +423,22 @@ export default definePlugin({
                         gap: "5px",
                     }}
                 >
-                    {activities.map((activity, index) => (
-                        <ActivityView
-                            key={index}
-                            activity={activity}
-                            user={user}
-                            guild={guild}
-                            channelId={channelId}
-                            onClose={onClose}
-                        />
-                    ))}
+                    {activities.map((activity, index) =>
+                        index === 0 ? (
+                            <ActivityView
+                                key={index}
+                                activity={activity}
+                                user={user}
+                                {...props}
+                            />) : (
+                            <ActivityView
+                                key={index}
+                                activity={activity}
+                                user={user}
+                                application={getActivityApplication(activity)}
+                                {...generalProps}
+                            />
+                        ))}
                 </div>
             );
         }
@@ -254,22 +455,13 @@ export default definePlugin({
             predicate: () => settings.store.memberList,
         },
         {
-            // Show all activities in the profile panel
-            find: "{layout:\"DM_PANEL\",",
+            // Show all activities in the user popout/sidebar
+            find: '"UserActivityContainer"',
             replacement: {
-                match: /(?<=\(0,\i\.jsx\)\()\i\.\i(?=,{activity:.+?,user:\i,channelId:\i.id,)/,
-                replace: "$self.showAllActivitiesComponent"
-            },
-            predicate: () => settings.store.profileSidebar,
-        },
-        {
-            // Show all activities in the user popout
-            find: "customStatusSection,",
-            replacement: {
-                match: /(?<=\(0,\i\.jsx\)\()\i\.\i(?=,{activity:\i,user:\i,guild:\i,channelId:\i,onClose:\i,)/,
-                replace: "$self.showAllActivitiesComponent"
+                match: /(?<=\(0,\i\.jsx\)\()(\i\.\i)(?=,{...(\i),activity:\i,user:\i,application:\i)/,
+                replace: "$2.type==='BiteSizePopout'?$self.showAllActivitiesComponent:$1"
             },
             predicate: () => settings.store.userPopout
-        }
+        },
     ],
 });
diff --git a/src/equicordplugins/betterActivities/settings.tsx b/src/equicordplugins/betterActivities/settings.tsx
deleted file mode 100644
index 98f1b06e..00000000
--- a/src/equicordplugins/betterActivities/settings.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { definePluginSettings } from "@api/Settings";
-import { OptionType } from "@utils/types";
-import { React } from "@webpack/common";
-
-const settings = definePluginSettings({
-    memberList: {
-        type: OptionType.BOOLEAN,
-        description: "Show activity icons in the member list",
-        default: true,
-        restartNeeded: true,
-    },
-    iconSize: {
-        type: OptionType.SLIDER,
-        description: "Size of the activity icons",
-        markers: [10, 15, 20],
-        default: 15,
-        stickToMarkers: false,
-    },
-    specialFirst: {
-        type: OptionType.BOOLEAN,
-        description: "Show special activities first (Currently Spotify and Twitch)",
-        default: true,
-    },
-    renderGifs: {
-        type: OptionType.BOOLEAN,
-        description: "Allow rendering GIFs",
-        default: true,
-    },
-    divider: {
-        type: OptionType.COMPONENT,
-        description: "",
-        component: () => (
-            <div style={{
-                width: "100%",
-                height: 1,
-                borderTop: "thin solid var(--background-modifier-accent)",
-                paddingTop: 5,
-                paddingBottom: 5
-            }} />
-        ),
-    },
-    profileSidebar: {
-        type: OptionType.BOOLEAN,
-        description: "Show all activities in the profile sidebar",
-        default: true,
-        restartNeeded: true,
-    },
-    userPopout: {
-        type: OptionType.BOOLEAN,
-        description: "Show all activities in the user popout",
-        default: true,
-        restartNeeded: true,
-    },
-    allActivitiesStyle: {
-        type: OptionType.SELECT,
-        description: "Style for showing all activities",
-        options: [
-            {
-                default: true,
-                label: "Carousel",
-                value: "carousel",
-            },
-            {
-                label: "List",
-                value: "list",
-            },
-        ]
-    }
-});
-
-export default settings;
diff --git a/src/equicordplugins/betterActivities/styles.css b/src/equicordplugins/betterActivities/styles.css
index 1990c173..1ab6d3ad 100644
--- a/src/equicordplugins/betterActivities/styles.css
+++ b/src/equicordplugins/betterActivities/styles.css
@@ -19,44 +19,8 @@
     border-radius: 50%;
 }
 
-.vc-bactivities-activity {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-wrap: wrap;
-    gap: 5px;
-}
-
-.vc-bactivities-activity-title {
-    font-weight: bold;
-    text-align: center;
-}
-
-.vc-bactivities-activity-image {
-    height: 20px;
-    width: 20px;
-    border-radius: 50%;
-    object-fit: cover;
-}
-
-.vc-bactivities-activity-divider {
-    width: 100%;
-    border-top: 1px dotted rgb(255 255 255 / 20%);
-    margin-top: 3px;
-    margin-bottom: 3px;
-}
-
-.vc-bactivities-activity-details {
-    display: flex;
-    flex-direction: column;
-    color: var(--text-muted);
-    word-break: break-word;
-}
-
-.vc-bactivities-activity-time-bar {
-    width: 100%;
-    margin-top: 3px;
-    margin-bottom: 3px;
+.vc-bactivities-activity-tooltip {
+    padding: 1px;
 }
 
 .vc-bactivities-caret-left,
@@ -101,12 +65,12 @@
     background: var(--background-modifier-accent);
 }
 
-.vc-bactivities-controls .carousell {
+.vc-bactivities-controls .carousel {
     display: flex;
     align-items: center;
 }
 
-.vc-bactivities-controls .carousell .dot {
+.vc-bactivities-controls .carousel .dot {
     margin: 0 4px;
     width: 10px;
     cursor: pointer;
@@ -117,11 +81,11 @@
     opacity: 0.6;
 }
 
-.vc-bactivities-controls .carousell .dot:hover:not(.selected) {
+.vc-bactivities-controls .carousel .dot:hover:not(.selected) {
     opacity: 1;
 }
 
-.vc-bactivities-controls .carousell .dot.selected {
+.vc-bactivities-controls .carousel .dot.selected {
     opacity: 1;
     background: var(--dot-color, var(--brand-500));
 }
diff --git a/src/equicordplugins/betterActivities/types.ts b/src/equicordplugins/betterActivities/types.ts
index 6ca4b533..e11896c8 100644
--- a/src/equicordplugins/betterActivities/types.ts
+++ b/src/equicordplugins/betterActivities/types.ts
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { Guild, User } from "discord-types/general";
 import { CSSProperties, ImgHTMLAttributes } from "react";
 
 export interface Timestamp {
@@ -81,11 +80,3 @@ export interface ActivityListIcon {
 export interface IconCSSProperties extends CSSProperties {
     "--icon-size": string;
 }
-
-export interface ActivityViewProps {
-    activity: Activity | null;
-    user: User;
-    guild: Guild;
-    channelId: string;
-    onClose: () => void;
-}
diff --git a/src/equicordplugins/betterActivities/utils.ts b/src/equicordplugins/betterActivities/utils.ts
deleted file mode 100644
index d1511acc..00000000
--- a/src/equicordplugins/betterActivities/utils.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { findByPropsLazy, findStoreLazy } from "@webpack";
-import { moment } from "@webpack/common";
-
-import settings from "./settings";
-import { Activity, Application, ApplicationIcon, Timestamp } from "./types";
-
-const ApplicationStore: {
-    getApplication: (id: string) => Application | null;
-} = findStoreLazy("ApplicationStore");
-
-const { fetchApplication }: {
-    fetchApplication: (id: string) => Promise<Application | null>;
-} = findByPropsLazy("fetchApplication");
-
-export function getActivityImage(activity: Activity, application?: Application): string | undefined {
-    if (activity.type === 2 && activity.name === "Spotify") {
-        // get either from large or small image
-        const image = activity.assets?.large_image ?? activity.assets?.small_image;
-        // image needs to replace 'spotify:'
-        if (image?.startsWith("spotify:")) {
-            // spotify cover art is always https://i.scdn.co/image/ID
-            return image.replace("spotify:", "https://i.scdn.co/image/");
-        }
-    }
-    if (activity.type === 1 && activity.name === "Twitch") {
-        const image = activity.assets?.large_image;
-        // image needs to replace 'twitch:'
-        if (image?.startsWith("twitch:")) {
-            // twitch images are always https://static-cdn.jtvnw.net/previews-ttv/live_user_USERNAME-RESOLTUON.jpg
-            return `${image.replace("twitch:", "https://static-cdn.jtvnw.net/previews-ttv/live_user_")}-108x60.jpg`;
-        }
-    }
-    // TODO: we could support other assets here
-}
-
-const fetchedApplications = new Map<string, Application | null>();
-
-// TODO: replace with "renderXboxImage"?
-const xboxUrl = "https://discord.com/assets/9a15d086141be29d9fcd.png";
-
-export function getApplicationIcons(activities: Activity[], preferSmall = false) {
-    const applicationIcons: ApplicationIcon[] = [];
-    const applications = activities.filter(activity => activity.application_id || activity.platform);
-
-    for (const activity of applications) {
-        const { assets, application_id, platform } = activity;
-        if (!application_id && !platform) {
-            continue;
-        }
-        if (assets) {
-
-            const addImage = (image: string, alt: string) => {
-                if (image.startsWith("mp:")) {
-                    const discordMediaLink = `https://media.discordapp.net/${image.replace(/mp:/, "")}`;
-                    if (settings.store.renderGifs || !discordMediaLink.endsWith(".gif")) {
-                        applicationIcons.push({
-                            image: { src: discordMediaLink, alt },
-                            activity
-                        });
-                    }
-                } else {
-                    const src = `https://cdn.discordapp.com/app-assets/${application_id}/${image}.png`;
-                    applicationIcons.push({
-                        image: { src, alt },
-                        activity
-                    });
-                }
-            };
-
-            const smallImage = assets.small_image;
-            const smallText = assets.small_text ?? "Small Text";
-            const largeImage = assets.large_image;
-            const largeText = assets.large_text ?? "Large Text";
-            if (preferSmall) {
-                if (smallImage) {
-                    addImage(smallImage, smallText);
-                } else if (largeImage) {
-                    addImage(largeImage, largeText);
-                }
-            } else {
-                if (largeImage) {
-                    addImage(largeImage, largeText);
-                } else if (smallImage) {
-                    addImage(smallImage, smallText);
-                }
-            }
-        } else if (application_id) {
-            let application = ApplicationStore.getApplication(application_id);
-            if (!application) {
-                if (fetchedApplications.has(application_id)) {
-                    application = fetchedApplications.get(application_id) as Application | null;
-                } else {
-                    fetchedApplications.set(application_id, null);
-                    fetchApplication(application_id).then(app => {
-                        fetchedApplications.set(application_id, app);
-                    });
-                }
-            }
-
-            if (application) {
-                if (application.icon) {
-                    const src = `https://cdn.discordapp.com/app-icons/${application.id}/${application.icon}.png`;
-                    applicationIcons.push({
-                        image: { src, alt: application.name },
-                        activity,
-                        application
-                    });
-                } else if (platform === "xbox") {
-                    applicationIcons.push({
-                        image: { src: xboxUrl, alt: "Xbox" },
-                        activity,
-                        application
-                    });
-                }
-            }
-        } else {
-            if (platform === "xbox") {
-                applicationIcons.push({
-                    image: { src: xboxUrl, alt: "Xbox" },
-                    activity
-                });
-            }
-        }
-    }
-
-    return applicationIcons;
-}
-
-export function getValidTimestamps(activity: Activity): Required<Timestamp> | null {
-    if (activity.timestamps?.start !== undefined && activity.timestamps?.end !== undefined) {
-        return activity.timestamps as Required<Timestamp>;
-    }
-    return null;
-}
-
-export function getValidStartTimeStamp(activity: Activity): number | null {
-    if (activity.timestamps?.start !== undefined) {
-        return activity.timestamps.start;
-    }
-    return null;
-}
-
-const customFormat = (momentObj: moment.Moment): string => {
-    const hours = momentObj.hours();
-    const formattedTime = momentObj.format("mm:ss");
-    return hours > 0 ? `${momentObj.format("HH:")}${formattedTime}` : formattedTime;
-};
-
-export function formatElapsedTime(startTime: moment.Moment, endTime: moment.Moment): string {
-    const duration = moment.duration(endTime.diff(startTime));
-    return `${customFormat(moment.utc(duration.asMilliseconds()))} elapsed`;
-}
diff --git a/src/equicordplugins/mediaPlaybackSpeed/components/SpeedIcon.tsx b/src/equicordplugins/mediaPlaybackSpeed/components/SpeedIcon.tsx
new file mode 100644
index 00000000..c6d4a907
--- /dev/null
+++ b/src/equicordplugins/mediaPlaybackSpeed/components/SpeedIcon.tsx
@@ -0,0 +1,21 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+function SpeedIcon() {
+    return (
+        <svg
+            xmlns="http://www.w3.org/2000/svg"
+            width="24"
+            height="24"
+            fill="currentColor"
+            viewBox="0 -960 960 960"
+        >
+            <path d="M418-340q24 24 62 23.5t56-27.5l224-336-336 224q-27 18-28.5 55t22.5 61zm62-460q59 0 113.5 16.5T696-734l-76 48q-33-17-68.5-25.5T480-720q-133 0-226.5 93.5T160-400q0 42 11.5 83t32.5 77h552q23-38 33.5-79t10.5-85q0-36-8.5-70T766-540l48-76q30 47 47.5 100T880-406q1 57-13 109t-41 99q-11 18-30 28t-40 10H204q-21 0-40-10t-30-28q-26-45-40-95.5T80-400q0-83 31.5-155.5t86-127Q252-737 325-768.5T480-800zm7 313z"></path>
+        </svg>
+    );
+}
+
+export default SpeedIcon;
diff --git a/src/equicordplugins/mediaPlaybackSpeed/index.tsx b/src/equicordplugins/mediaPlaybackSpeed/index.tsx
new file mode 100644
index 00000000..d7001eff
--- /dev/null
+++ b/src/equicordplugins/mediaPlaybackSpeed/index.tsx
@@ -0,0 +1,151 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./styles.css";
+
+import { definePluginSettings } from "@api/Settings";
+import { classNameFactory } from "@api/Styles";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { makeRange } from "@components/PluginSettings/components";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { ContextMenuApi, FluxDispatcher, Heading, Menu, React, Tooltip, useEffect } from "@webpack/common";
+import { RefObject } from "react";
+
+import SpeedIcon from "./components/SpeedIcon";
+
+const cl = classNameFactory("vc-media-playback-speed-");
+
+const min = 0.25;
+const max = 3.5;
+const speeds = makeRange(min, max, 0.25);
+
+const settings = definePluginSettings({
+    test: {
+        type: OptionType.COMPONENT,
+        description: "",
+        component() {
+            return <Heading variant="heading-lg/bold" selectable={false}>
+                Default playback speeds
+            </Heading>;
+        }
+    },
+    defaultVoiceMessageSpeed: {
+        type: OptionType.SLIDER,
+        default: 1,
+        description: "Voice messages",
+        markers: speeds,
+    },
+    defaultVideoSpeed: {
+        type: OptionType.SLIDER,
+        default: 1,
+        description: "Videos",
+        markers: speeds,
+    },
+    defaultAudioSpeed: {
+        type: OptionType.SLIDER,
+        default: 1,
+        description: "Audios",
+        markers: speeds,
+    },
+});
+
+type MediaRef = RefObject<HTMLMediaElement> | undefined;
+
+export default definePlugin({
+    name: "MediaPlaybackSpeed",
+    description: "Allows changing the (default) playback speed of media embeds",
+    authors: [Devs.D3SOX],
+
+    settings,
+
+    PlaybackSpeedComponent({ mediaRef }: { mediaRef: MediaRef; }) {
+        const changeSpeed = (speed: number) => {
+            const media = mediaRef?.current;
+            if (media) {
+                media.playbackRate = speed;
+            }
+        };
+
+        useEffect(() => {
+            if (!mediaRef?.current) return;
+            const media = mediaRef.current;
+            if (media.tagName === "AUDIO") {
+                const isVoiceMessage = media.className.includes("audioElement_");
+                changeSpeed(isVoiceMessage ? settings.store.defaultVoiceMessageSpeed : settings.store.defaultAudioSpeed);
+            } else if (media.tagName === "VIDEO") {
+                changeSpeed(settings.store.defaultVideoSpeed);
+            }
+        }, [mediaRef]);
+
+        return (
+            <Tooltip text="Playback speed">
+                {tooltipProps => (
+                    <button
+                        {...tooltipProps}
+                        className={cl("icon")}
+                        onClick={e => {
+                            ContextMenuApi.openContextMenu(e, () =>
+                                <Menu.Menu
+                                    navId="vc-playback-speed"
+                                    onClose={() => FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" })}
+                                    aria-label="Playback speed control"
+                                >
+                                    <Menu.MenuGroup
+                                        label="Playback speed"
+                                    >
+                                        {speeds.map(speed => (
+                                            <Menu.MenuItem
+                                                key={speed}
+                                                id={"speed-" + speed}
+                                                label={`${speed}x`}
+                                                action={() => changeSpeed(speed)}
+                                            />
+                                        ))}
+                                    </Menu.MenuGroup>
+                                </Menu.Menu>
+                            );
+                        }}>
+                        <SpeedIcon />
+                    </button>
+                )}
+            </Tooltip>
+        );
+    },
+
+    renderComponent(mediaRef: MediaRef) {
+        return <ErrorBoundary noop>
+            <this.PlaybackSpeedComponent mediaRef={mediaRef} />
+        </ErrorBoundary>;
+    },
+
+    patches: [
+        // voice message embeds
+        {
+            find: "\"--:--\"",
+            replacement: {
+                match: /onVolumeShow:\i,onVolumeHide:\i\}\)(?<=useCallback\(\(\)=>\{let \i=(\i).current;.+?)/,
+                replace: "$&,$self.renderComponent($1)"
+            }
+        },
+        // audio & video embeds
+        {
+            // need to pass media ref via props to make it easily accessible from inside controls
+            find: "renderControls(){",
+            replacement: {
+                match: /onToggleMuted:this.toggleMuted,/,
+                replace: "$&mediaRef:this.mediaRef,"
+            }
+        },
+        {
+            find: "AUDIO:\"AUDIO\"",
+            replacement: {
+                match: /onVolumeHide:\i,iconClassName:\i.controlIcon,iconColor:"currentColor",sliderWrapperClassName:\i.volumeSliderWrapper\}\)\}\),/,
+                replace: "$&$self.renderComponent(this.props.mediaRef),"
+            }
+        }
+    ]
+});
diff --git a/src/equicordplugins/notifyUserChanges/components/NotificationsOffIcon.tsx b/src/equicordplugins/notifyUserChanges/components/NotificationsOffIcon.tsx
deleted file mode 100644
index a2261bee..00000000
--- a/src/equicordplugins/notifyUserChanges/components/NotificationsOffIcon.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { SVGProps } from "react";
-
-export function NotificationsOffIcon(props: SVGProps<SVGSVGElement>) {
-    return (<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" {...props}><path fill="currentColor" d="M20 18.69L7.84 6.14L5.27 3.49L4 4.76l2.8 2.8v.01c-.52.99-.8 2.16-.8 3.42v5l-2 2v1h13.73l2 2L21 19.72zM12 22c1.11 0 2-.89 2-2h-4c0 1.11.89 2 2 2m6-7.32V11c0-3.08-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68c-.15.03-.29.08-.42.12c-.1.03-.2.07-.3.11h-.01c-.01 0-.01 0-.02.01c-.23.09-.46.2-.68.31c0 0-.01 0-.01.01z"></path></svg>);
-}
diff --git a/src/equicordplugins/notifyUserChanges/components/NotificationsOnIcon.tsx b/src/equicordplugins/notifyUserChanges/components/NotificationsOnIcon.tsx
deleted file mode 100644
index 8ce2818f..00000000
--- a/src/equicordplugins/notifyUserChanges/components/NotificationsOnIcon.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import type { SVGProps } from "react";
-
-export function NotificationsOnIcon(props: SVGProps<SVGSVGElement>) {
-    return (<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" {...props}><path fill="currentColor" d="M10 20h4c0 1.1-.9 2-2 2s-2-.9-2-2m4-11c0 2.61 1.67 4.83 4 5.66V17h2v2H4v-2h2v-7c0-2.79 1.91-5.14 4.5-5.8v-.7c0-.83.67-1.5 1.5-1.5s1.5.67 1.5 1.5v.7c.71.18 1.36.49 1.95.9A5.902 5.902 0 0 0 14 9m10-1h-3V5h-2v3h-3v2h3v3h2v-3h3z"></path></svg>);
-}
diff --git a/src/equicordplugins/notifyUserChanges/index.tsx b/src/equicordplugins/notifyUserChanges/index.tsx
deleted file mode 100644
index 170e41bf..00000000
--- a/src/equicordplugins/notifyUserChanges/index.tsx
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { NavContextMenuPatchCallback } from "@api/ContextMenu";
-import { showNotification } from "@api/Notifications";
-import { definePluginSettings, Settings } from "@api/Settings";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findStoreLazy } from "@webpack";
-import { Menu, PresenceStore, React, SelectedChannelStore, Tooltip, UserStore } from "@webpack/common";
-import type { Channel, User } from "discord-types/general";
-import { CSSProperties } from "react";
-
-import { NotificationsOffIcon } from "./components/NotificationsOffIcon";
-import { NotificationsOnIcon } from "./components/NotificationsOnIcon";
-
-interface PresenceUpdate {
-    user: {
-        id: string;
-        username?: string;
-        global_name?: string;
-    };
-    clientStatus: {
-        desktop?: string;
-        web?: string;
-        mobile?: string;
-        console?: string;
-    };
-    guildId?: string;
-    status: string;
-    broadcast?: any; // what's this?
-    activities: Array<{
-        session_id: string;
-        created_at: number;
-        id: string;
-        name: string;
-        details?: string;
-        type: number;
-    }>;
-}
-
-interface VoiceState {
-    userId: string;
-    channelId?: string;
-    oldChannelId?: string;
-    deaf: boolean;
-    mute: boolean;
-    selfDeaf: boolean;
-    selfMute: boolean;
-    selfStream: boolean;
-    selfVideo: boolean;
-    sessionId: string;
-    suppress: boolean;
-    requestToSpeakTimestamp: string | null;
-}
-
-function shouldBeNative() {
-    if (typeof Notification === "undefined") return false;
-
-    const { useNative } = Settings.notifications;
-    if (useNative === "always") return true;
-    if (useNative === "not-focused") return !document.hasFocus();
-    return false;
-}
-
-const SessionsStore = findStoreLazy("SessionsStore");
-
-const StatusUtils = findByPropsLazy("useStatusFillColor", "StatusTypes");
-
-function Icon(path: string, opts?: { viewBox?: string; width?: number; height?: number; }) {
-    return ({ color, tooltip, small }: { color: string; tooltip: string; small: boolean; }) => (
-        <Tooltip text={tooltip} >
-            {(tooltipProps: any) => (
-                <svg
-                    {...tooltipProps}
-                    height={(opts?.height ?? 20) - (small ? 3 : 0)}
-                    width={(opts?.width ?? 20) - (small ? 3 : 0)}
-                    viewBox={opts?.viewBox ?? "0 0 24 24"}
-                    fill={color}
-                >
-                    <path d={path} />
-                </svg>
-            )}
-        </Tooltip>
-    );
-}
-
-const Icons = {
-    desktop: Icon("M4 2.5c-1.103 0-2 .897-2 2v11c0 1.104.897 2 2 2h7v2H7v2h10v-2h-4v-2h7c1.103 0 2-.896 2-2v-11c0-1.103-.897-2-2-2H4Zm16 2v9H4v-9h16Z"),
-    web: Icon("M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2Zm-1 17.93c-3.95-.49-7-3.85-7-7.93 0-.62.08-1.21.21-1.79L9 15v1c0 1.1.9 2 2 2v1.93Zm6.9-2.54c-.26-.81-1-1.39-1.9-1.39h-1v-3c0-.55-.45-1-1-1H8v-2h2c.55 0 1-.45 1-1V7h2c1.1 0 2-.9 2-2v-.41c2.93 1.19 5 4.06 5 7.41 0 2.08-.8 3.97-2.1 5.39Z"),
-    mobile: Icon("M 187 0 L 813 0 C 916.277 0 1000 83.723 1000 187 L 1000 1313 C 1000 1416.277 916.277 1500 813 1500 L 187 1500 C 83.723 1500 0 1416.277 0 1313 L 0 187 C 0 83.723 83.723 0 187 0 Z M 125 1000 L 875 1000 L 875 250 L 125 250 Z M 500 1125 C 430.964 1125 375 1180.964 375 1250 C 375 1319.036 430.964 1375 500 1375 C 569.036 1375 625 1319.036 625 1250 C 625 1180.964 569.036 1125 500 1125 Z", { viewBox: "0 0 1000 1500", height: 17, width: 17 }),
-    console: Icon("M14.8 2.7 9 3.1V47h3.3c1.7 0 6.2.3 10 .7l6.7.6V2l-4.2.2c-2.4.1-6.9.3-10 .5zm1.8 6.4c1 1.7-1.3 3.6-2.7 2.2C12.7 10.1 13.5 8 15 8c.5 0 1.2.5 1.6 1.1zM16 33c0 6-.4 10-1 10s-1-4-1-10 .4-10 1-10 1 4 1 10zm15-8v23.3l3.8-.7c2-.3 4.7-.6 6-.6H43V3h-2.2c-1.3 0-4-.3-6-.6L31 1.7V25z", { viewBox: "0 0 50 50" }),
-};
-type Platform = keyof typeof Icons;
-
-const PlatformIcon = ({ platform, status, small }: { platform: Platform, status: string; small: boolean; }) => {
-    const tooltip = platform[0].toUpperCase() + platform.slice(1);
-    const Icon = Icons[platform] ?? Icons.desktop;
-
-    return <Icon color={StatusUtils.useStatusFillColor(status)} tooltip={tooltip} small={small} />;
-};
-
-interface PlatformIndicatorProps {
-    user: User;
-    wantMargin?: boolean;
-    wantTopMargin?: boolean;
-    small?: boolean;
-    style?: CSSProperties;
-}
-
-const PlatformIndicator = ({ user, wantMargin = true, wantTopMargin = false, small = false, style = {} }: PlatformIndicatorProps) => {
-    if (!user || user.bot) return null;
-
-    if (user.id === UserStore.getCurrentUser().id) {
-        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;
-            if (a === "online") return 1;
-            if (b === "online") return -1;
-            if (a === "idle") return 1;
-            if (b === "idle") return -1;
-            return 0;
-        });
-
-        const ownStatus = Object.values(sortedSessions).reduce((acc: any, curr: any) => {
-            if (curr.clientInfo.client !== "unknown")
-                acc[curr.clientInfo.client] = curr.status;
-            return acc;
-        }, {});
-
-        const { clientStatuses } = PresenceStore.getState();
-        clientStatuses[UserStore.getCurrentUser().id] = ownStatus;
-    }
-
-    const status = PresenceStore.getState()?.clientStatuses?.[user.id] as Record<Platform, string>;
-    if (!status) return null;
-
-    const icons = Object.entries(status).map(([platform, status]) => (
-        <PlatformIcon
-            key={platform}
-            platform={platform as Platform}
-            status={status}
-            small={small}
-        />
-    ));
-
-    if (!icons.length) return null;
-
-    return (
-        <span
-            className="vc-platform-indicator"
-            style={{
-                display: "inline-flex",
-                justifyContent: "center",
-                alignItems: "center",
-                marginLeft: wantMargin ? 4 : 0,
-                verticalAlign: "top",
-                position: "relative",
-                top: wantTopMargin ? 2 : 0,
-                padding: !wantMargin ? 1 : 0,
-                gap: 2,
-                ...style
-            }}
-
-        >
-            {icons}
-        </span>
-    );
-};
-
-export const settings = definePluginSettings({
-    notifyStatus: {
-        type: OptionType.BOOLEAN,
-        description: "Notify on status changes",
-        restartNeeded: false,
-        default: true,
-    },
-    notifyVoice: {
-        type: OptionType.BOOLEAN,
-        description: "Notify on voice channel changes",
-        restartNeeded: false,
-        default: false,
-    },
-    persistNotifications: {
-        type: OptionType.BOOLEAN,
-        description: "Persist notifications",
-        restartNeeded: false,
-        default: false,
-    },
-    userIds: {
-        type: OptionType.STRING,
-        description: "User IDs (comma separated)",
-        restartNeeded: false,
-        default: "",
-    }
-});
-
-function getUserIdList() {
-    try {
-        return settings.store.userIds.split(",").filter(Boolean);
-    } catch (e) {
-        settings.store.userIds = "";
-        return [];
-    }
-}
-
-// show rich body with user avatar
-const getRichBody = (user: User, text: string | React.ReactNode) => <div
-    style={{ display: "flex", flexWrap: "wrap", alignItems: "center", gap: "10px" }}>
-    <div style={{ position: "relative" }}>
-        <img src={user.getAvatarURL(void 0, 80, true)}
-            style={{ width: "80px", height: "80px", borderRadius: "15%" }} alt={`${user.username}'s avatar`} />
-        <PlatformIndicator user={user} style={{ position: "absolute", top: "-8px", right: "-10px" }} />
-    </div>
-    <span>{text}</span>
-</div>;
-
-function triggerVoiceNotification(userId: string, userChannelId: string | null) {
-    const user = UserStore.getUser(userId);
-    const myChanId = SelectedChannelStore.getVoiceChannelId();
-
-    const name = user.username;
-
-    const title = shouldBeNative() ? `User ${name} changed voice status` : "User voice status change";
-    if (userChannelId) {
-        if (userChannelId !== myChanId) {
-            showNotification({
-                title,
-                body: "joined a new voice channel",
-                noPersist: !settings.store.persistNotifications,
-                richBody: getRichBody(user, `${name} joined a new voice channel`),
-            });
-        }
-    } else {
-        showNotification({
-            title,
-            body: "left their voice channel",
-            noPersist: !settings.store.persistNotifications,
-            richBody: getRichBody(user, `${name} left their voice channel`),
-        });
-    }
-}
-
-function toggleUserNotify(userId: string) {
-    const userIds = getUserIdList();
-    if (userIds.includes(userId)) {
-        userIds.splice(userIds.indexOf(userId), 1);
-    } else {
-        userIds.push(userId);
-    }
-    settings.store.userIds = userIds.join(",");
-}
-
-interface UserContextProps {
-    channel?: Channel;
-    guildId?: string;
-    user: User;
-}
-
-const UserContext: NavContextMenuPatchCallback = (children, { user }: UserContextProps) => {
-    if (!user || user.id === UserStore.getCurrentUser().id) return;
-    const isNotifyOn = getUserIdList().includes(user.id);
-    const label = isNotifyOn ? "Don't notify on changes" : "Notify on changes";
-    const icon = isNotifyOn ? NotificationsOffIcon : NotificationsOnIcon;
-
-    children.splice(-1, 0, (
-        <Menu.MenuGroup>
-            <Menu.MenuItem
-                id="toggle-notify-user"
-                label={label}
-                action={() => toggleUserNotify(user.id)}
-                icon={icon}
-            />
-        </Menu.MenuGroup>
-    ));
-};
-
-const lastStatuses = new Map<string, string>();
-
-export default definePlugin({
-    name: "NotifyUserChanges",
-    description: "Adds a notify option in the user context menu to get notified when a user changes voice channels or online status",
-    authors: [Devs.D3SOX],
-
-    settings,
-
-    contextMenus: {
-        "user-context": UserContext
-    },
-
-    flux: {
-        VOICE_STATE_UPDATES({ voiceStates }: { voiceStates: VoiceState[]; }) {
-            if (!settings.store.notifyVoice || !settings.store.userIds) {
-                return;
-            }
-            for (const { userId, channelId, oldChannelId } of voiceStates) {
-                if (channelId !== oldChannelId) {
-                    const isFollowed = getUserIdList().includes(userId);
-                    if (!isFollowed) {
-                        continue;
-                    }
-
-                    if (channelId) {
-                        // move or join new channel
-                        triggerVoiceNotification(userId, channelId);
-                    } else if (oldChannelId) {
-                        // leave
-                        triggerVoiceNotification(userId, null);
-                    }
-                }
-            }
-        },
-        PRESENCE_UPDATES({ updates }: { updates: PresenceUpdate[]; }) {
-            if (!settings.store.notifyStatus || !settings.store.userIds) {
-                return;
-            }
-            for (const { user: { id: userId, username }, status } of updates) {
-                const isFollowed = getUserIdList().includes(userId);
-                if (!isFollowed) {
-                    continue;
-                }
-
-                // this is also triggered for multiple guilds and when only the activities change, so we have to check if the status actually changed
-                if (lastStatuses.has(userId) && lastStatuses.get(userId) !== status) {
-                    const user = UserStore.getUser(userId);
-                    const name = username ?? user.username;
-
-                    showNotification({
-                        title: shouldBeNative() ? `User ${name} changed status` : "User status change",
-                        body: `is now ${status}`,
-                        noPersist: !settings.store.persistNotifications,
-                        richBody: getRichBody(user, `${name}'s status is now ${status}`),
-                    });
-                }
-                lastStatuses.set(userId, status);
-            }
-        }
-    },
-
-});
diff --git a/src/equicordplugins/serverProfilesToolbox/index.tsx b/src/equicordplugins/serverProfilesToolbox/index.tsx
new file mode 100644
index 00000000..1c9c87c3
--- /dev/null
+++ b/src/equicordplugins/serverProfilesToolbox/index.tsx
@@ -0,0 +1,190 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
+import {
+    Button,
+    Clipboard,
+    GuildMemberStore,
+    Text,
+    Toasts,
+    UserProfileStore,
+    UserStore
+} from "@webpack/common";
+import { GuildMember } from "discord-types/general";
+
+const SummaryItem = findComponentByCodeLazy("borderType", "showBorder", "hideDivider");
+
+interface SavedProfile {
+    nick: string | null;
+    pronouns: string | null;
+    bio: string | null;
+    themeColors: number[] | undefined;
+    banner: string | undefined;
+    avatar: string | undefined;
+    profileEffectId: string | undefined;
+    avatarDecoration: string | undefined;
+}
+
+const savedProfile: SavedProfile = {
+    nick: null,
+    pronouns: null,
+    bio: null,
+    themeColors: undefined,
+    banner: undefined,
+    avatar: undefined,
+    profileEffectId: undefined,
+    avatarDecoration: undefined,
+};
+
+const {
+    setPendingAvatar,
+    setPendingBanner,
+    setPendingBio,
+    setPendingNickname,
+    setPendingPronouns,
+    setPendingThemeColors,
+    setPendingProfileEffectId,
+    setPendingAvatarDecoration,
+}: {
+    setPendingAvatar: (a: string | undefined) => void;
+    setPendingBanner: (a: string | undefined) => void;
+    setPendingBio: (a: string | null) => void;
+    setPendingNickname: (a: string | null) => void;
+    setPendingPronouns: (a: string | null) => void;
+    setPendingThemeColors: (a: number[] | undefined) => void;
+    setPendingProfileEffectId: (a: string | undefined) => void;
+    setPendingAvatarDecoration: (a: string | undefined) => void;
+} = findByPropsLazy("setPendingNickname", "setPendingPronouns");
+
+export default definePlugin({
+    name: "ServerProfilesToolbox",
+    authors: [Devs.D3SOX],
+    description: "Adds a copy/paste/reset button to the server profiles editor",
+
+    patchServerProfiles({ guildId }: { guildId: string; }) {
+        const currentUser = UserStore.getCurrentUser();
+        const premiumType = currentUser.premiumType ?? 0;
+
+        const copy = () => {
+            const profile = UserProfileStore.getGuildMemberProfile(currentUser.id, guildId);
+            const nick = GuildMemberStore.getNick(guildId, currentUser.id);
+            const selfMember = GuildMemberStore.getMember(guildId, currentUser.id) as GuildMember & { avatarDecoration: string | undefined; };
+            savedProfile.nick = nick ?? "";
+            savedProfile.pronouns = profile.pronouns;
+            savedProfile.bio = profile.bio;
+            savedProfile.themeColors = profile.themeColors;
+            savedProfile.banner = profile.banner;
+            savedProfile.avatar = selfMember.avatar;
+            savedProfile.profileEffectId = profile.profileEffectId;
+            savedProfile.avatarDecoration = selfMember.avatarDecoration;
+        };
+
+        const paste = () => {
+            setPendingNickname(savedProfile.nick);
+            setPendingPronouns(savedProfile.pronouns);
+            if (premiumType === 2) {
+                setPendingBio(savedProfile.bio);
+                setPendingThemeColors(savedProfile.themeColors);
+                setPendingBanner(savedProfile.banner);
+                setPendingAvatar(savedProfile.avatar);
+                setPendingProfileEffectId(savedProfile.profileEffectId);
+                setPendingAvatarDecoration(savedProfile.avatarDecoration);
+            }
+        };
+
+        const reset = () => {
+            setPendingNickname(null);
+            setPendingPronouns("");
+            if (premiumType === 2) {
+                setPendingBio(null);
+                setPendingThemeColors([]);
+                setPendingBanner(undefined);
+                setPendingAvatar(undefined);
+                setPendingProfileEffectId(undefined);
+                setPendingAvatarDecoration(undefined);
+            }
+        };
+
+        const copyToClipboard = () => {
+            copy();
+            Clipboard.copy(JSON.stringify(savedProfile));
+        };
+
+        const pasteFromClipboard = async () => {
+            try {
+                const clip = await navigator.clipboard.readText();
+                if (!clip) {
+                    Toasts.show({
+                        message: "Clipboard is empty",
+                        type: Toasts.Type.FAILURE,
+                        id: Toasts.genId(),
+                    });
+                    return;
+                }
+                const clipboardProfile: SavedProfile = JSON.parse(clip);
+
+                if (!("nick" in clipboardProfile)) {
+                    Toasts.show({
+                        message: "Data is not in correct format",
+                        type: Toasts.Type.FAILURE,
+                        id: Toasts.genId(),
+                    });
+                    return;
+                }
+
+                Object.assign(savedProfile, JSON.parse(clip));
+                paste();
+            } catch (e) {
+                Toasts.show({
+                    message: `Failed to read clipboard data: ${e}`,
+                    type: Toasts.Type.FAILURE,
+                    id: Toasts.genId(),
+                });
+            }
+        };
+
+        return <SummaryItem title="Server Profiles Toolbox" hideDivider={false} forcedDivider>
+            <div style={{ display: "flex", alignItems: "center", flexDirection: "column", gap: "5px" }}>
+                <Text variant="text-md/normal">
+                    Use the following buttons to mange the currently selected server
+                </Text>
+                <div style={{ display: "flex", gap: "5px" }}>
+                    <Button onClick={copy}>
+                        Copy profile
+                    </Button>
+                    <Button onClick={paste}>
+                        Paste profile
+                    </Button>
+                    <Button onClick={reset}>
+                        Reset profile
+                    </Button>
+                </div>
+                <div style={{ display: "flex", gap: "5px" }}>
+                    <Button onClick={copyToClipboard}>
+                        Copy to clipboard
+                    </Button>
+                    <Button onClick={pasteFromClipboard}>
+                        Paste from clipboard
+                    </Button>
+                </div>
+            </div>
+        </SummaryItem>;
+    },
+
+    patches: [
+        {
+            find: ".PROFILE_CUSTOMIZATION_GUILD_SELECT_TITLE",
+            replacement: {
+                match: /return\(0(.{10,350})\}\)\}\)\}/,
+                replace: "return [(0$1})}),$self.patchServerProfiles(e)]}"
+            }
+        }
+    ],
+
+});
diff --git a/src/equicordplugins/silentTypingEnhanced/index.tsx b/src/equicordplugins/silentTypingEnhanced/index.tsx
new file mode 100644
index 00000000..309aa5cf
--- /dev/null
+++ b/src/equicordplugins/silentTypingEnhanced/index.tsx
@@ -0,0 +1,177 @@
+/*
+ * 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 { addChatBarButton, ChatBarButton, removeChatBarButton } from "@api/ChatButtons";
+import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, sendBotMessage } from "@api/Commands";
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { ChannelStore, FluxDispatcher, React } from "@webpack/common";
+
+const settings = definePluginSettings({
+    showIcon: {
+        type: OptionType.BOOLEAN,
+        default: true,
+        description: "Show an icon for toggling the plugin",
+        restartNeeded: true,
+    },
+    isEnabled: {
+        type: OptionType.BOOLEAN,
+        description: "Toggle functionality",
+        default: true,
+    },
+    specificChats: {
+        type: OptionType.BOOLEAN,
+        default: false,
+        description: "Disable silent typing for specific chats instead (use icon to toggle)",
+        restartNeeded: false,
+    },
+    disabledFor: {
+        type: OptionType.STRING,
+        description: "Disable functionality for these chats (comma separated list of guild or user IDs)",
+        default: "",
+    },
+});
+
+const SilentTypingToggle: ChatBarButton = ({ isMainChat, channel }) => {
+    const { isEnabled, showIcon, specificChats, disabledFor } = settings.use(["isEnabled", "showIcon", "specificChats", "disabledFor"]);
+    const id = channel.guild_id ?? channel.id;
+
+    const toggleGlobal = () => {
+        settings.store.isEnabled = !settings.store.isEnabled;
+    };
+    const toggle = () => {
+        if (specificChats) {
+            if (!settings.store.isEnabled) {
+                toggleGlobal();
+            } else {
+                const disabledChannels = getDisabledChannelsList(disabledFor);
+                if (disabledChannels.includes(id)) {
+                    disabledChannels.splice(disabledChannels.indexOf(id), 1);
+                } else {
+                    disabledChannels.push(id);
+                }
+                settings.store.disabledFor = disabledChannels.join(", ");
+            }
+        } else {
+            toggleGlobal();
+        }
+    };
+    const shouldEnable = isEnabled && (!specificChats || !getDisabledChannelsList(disabledFor).includes(id));
+
+    let tooltip = shouldEnable ? "Disable Silent Typing" : "Enable Silent Typing";
+    if (specificChats) {
+        if (!isEnabled) {
+            tooltip = "Re-enable Silent Typing globally";
+        } else {
+            const chatType = channel.guild_id ? "guild" : "user";
+            tooltip = shouldEnable ? `Disable Silent Typing for current ${chatType} (right-click to toggle globally)`
+                : `Enable Silent Typing for current ${chatType} (right-click to toggle globally)`;
+        }
+    }
+
+    if (!isMainChat || !showIcon) return null;
+
+    return (
+        <ChatBarButton
+            tooltip={tooltip}
+            onClick={toggle}
+            onContextMenu={toggleGlobal}
+        >
+            <svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
+                <path fill="currentColor"
+                    d="M528 448H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h480c26.51 0 48 21.49 48 48v288c0 26.51-21.49 48-48 48zM128 180v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm288 0v-40c0-6.627-5.373-12-12-12H172c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h232c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12z" />
+                {shouldEnable &&
+                    <path d="M13 432L590 48" stroke="var(--red-500)" strokeWidth="72" strokeLinecap="round" />}
+                {specificChats && !settings.store.isEnabled &&
+                    <path
+                        transform="matrix(0.27724514,0,0,0.27724514,34.252062,-35.543268)"
+                        d="M 1827.701,303.065 698.835,1431.801 92.299,825.266 0,917.564 698.835,1616.4 1919.869,395.234 Z"
+                        stroke="var(--green-500)"
+                        strokeWidth="150" strokeLinecap="round"
+                        fillRule="evenodd" />
+                }
+            </svg>
+        </ChatBarButton>
+    );
+};
+
+function getDisabledChannelsList(list = settings.store.disabledFor) {
+    try {
+        return list.split(",").map(x => x.trim()).filter(Boolean);
+    } catch (e) {
+        settings.store.disabledFor = "";
+        return [];
+    }
+}
+
+function isEnabled(channelId: string) {
+    if (!settings.store.isEnabled) return false;
+    if (settings.store.specificChats) {
+        // need to resolve guild id for guild channels
+        const guildId = ChannelStore.getChannel(channelId)?.guild_id;
+        return !getDisabledChannelsList().includes(guildId ?? channelId);
+    }
+    return true;
+}
+
+export default definePlugin({
+    name: "SilentTypingEnhanced",
+    authors: [Devs.Ven, Devs.Rini, Devs.D3SOX],
+    description: "Hide that you are typing",
+    dependencies: ["CommandsAPI", "ChatInputButtonAPI"],
+    settings,
+
+    patches: [
+        {
+            find: '.dispatch({type:"TYPING_START_LOCAL"',
+            replacement: {
+                match: /startTyping\(\i\){.+?},stop/,
+                replace: "startTyping:$self.startTyping,stop"
+            }
+        },
+    ],
+
+    commands: [{
+        name: "silenttype",
+        description: "Toggle whether you're hiding that you're typing or not.",
+        inputType: ApplicationCommandInputType.BUILT_IN,
+        options: [
+            {
+                name: "value",
+                description: "whether to hide or not that you're typing (default is toggle)",
+                required: false,
+                type: ApplicationCommandOptionType.BOOLEAN,
+            },
+        ],
+        execute: async (args, ctx) => {
+            settings.store.isEnabled = !!findOption(args, "value", !settings.store.isEnabled);
+            sendBotMessage(ctx.channel.id, {
+                content: settings.store.isEnabled ? "Silent typing enabled!" : "Silent typing disabled!",
+            });
+        },
+    }],
+
+    async startTyping(channelId: string) {
+        if (isEnabled(channelId)) return;
+        FluxDispatcher.dispatch({ type: "TYPING_START_LOCAL", channelId });
+    },
+
+    start: () => addChatBarButton("SilentTyping", SilentTypingToggle),
+    stop: () => removeChatBarButton("SilentTyping"),
+});
diff --git a/src/equicordplugins/voiceChatUtils/index.tsx b/src/equicordplugins/voiceChatUtils/index.tsx
index e40d79c3..ec232cf6 100644
--- a/src/equicordplugins/voiceChatUtils/index.tsx
+++ b/src/equicordplugins/voiceChatUtils/index.tsx
@@ -7,7 +7,7 @@
 import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { definePluginSettings } from "@api/Settings";
 import { makeRange } from "@components/PluginSettings/components";
-import { Devs, EquicordDevs } from "@utils/constants";
+import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findStoreLazy } from "@webpack";
 import { GuildChannelStore, Menu, React, RestAPI, UserStore } from "@webpack/common";
@@ -159,8 +159,10 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "VoiceChatUtilities",
     description: "This plugin allows you to perform multiple actions on an entire channel (move, mute, disconnect, etc.) (originally by dutake)",
-    authors: [EquicordDevs.Dams, Devs.D3SOX],
+    authors: [Devs.D3SOX],
+
     settings,
+
     contextMenus: {
         "channel-context": VoiceChannelContext
     },

From 44d31e69a8479a5ab04f526fd8bcb9880ceea7b0 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Sun, 11 Aug 2024 01:16:52 -0400
Subject: [PATCH 27/43] I might be dumb

---
 src/equicordplugins/mediaPlaybackSpeed/styles.css | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 src/equicordplugins/mediaPlaybackSpeed/styles.css

diff --git a/src/equicordplugins/mediaPlaybackSpeed/styles.css b/src/equicordplugins/mediaPlaybackSpeed/styles.css
new file mode 100644
index 00000000..816190a4
--- /dev/null
+++ b/src/equicordplugins/mediaPlaybackSpeed/styles.css
@@ -0,0 +1,10 @@
+.vc-media-playback-speed-icon {
+    background-color: transparent;
+    height: 100%;
+    z-index: 2;
+    color: var(--interactive-normal);
+}
+
+.vc-media-playback-speed-icon:hover {
+    color: var(--interactive-active);
+}

From fe8c0350f1a6e124c388b54f5315b52d4ef59845 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Sun, 11 Aug 2024 01:35:52 -0400
Subject: [PATCH 28/43] Fix Building

---
 scripts/build/build.mts    |  8 ++++----
 scripts/build/buildWeb.mts |  4 ++--
 scripts/build/common.mts   | 22 ----------------------
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/scripts/build/build.mts b/scripts/build/build.mts
index 6e936257..cc74f0e7 100644
--- a/scripts/build/build.mts
+++ b/scripts/build/build.mts
@@ -23,7 +23,7 @@ import { existsSync, readdirSync } from "fs";
 import { readdir, rm, writeFile } from "fs/promises";
 import { join } from "path";
 
-import { addBuild, BUILD_TIMESTAMP, buildOrWatchAll, commonOpts, commonRendererPlugins, exists, globPlugins, IS_DEV, IS_REPORTER, IS_STANDALONE, IS_UPDATER_DISABLED, resolvePluginName, VERSION, watch } from "./common.mjs";
+import { addBuild, BUILD_TIMESTAMP, buildOrWatchAll, commonOpts, exists, globPlugins, IS_DEV, IS_REPORTER, IS_STANDALONE, IS_UPDATER_DISABLED, resolvePluginName, VERSION, watch } from "./common.mjs";
 
 const defines = {
     IS_STANDALONE: String(IS_STANDALONE),
@@ -128,7 +128,7 @@ await Promise.all([
         sourcemap,
         plugins: [
             globPlugins("discordDesktop"),
-            ...commonRendererPlugins
+            ...commonOpts.plugins
         ],
         define: {
             ...defines,
@@ -180,7 +180,7 @@ await Promise.all([
         sourcemap,
         plugins: [
             globPlugins("vencordDesktop"),
-            ...commonRendererPlugins
+            ...commonOpts.plugins
         ],
         define: {
             ...defines,
@@ -232,7 +232,7 @@ await Promise.all([
         sourcemap,
         plugins: [
             globPlugins("equicordDesktop"),
-            ...commonRendererPlugins
+            ...commonOpts.plugins
         ],
         define: {
             ...defines,
diff --git a/scripts/build/buildWeb.mts b/scripts/build/buildWeb.mts
index fd465868..8f1b33ef 100644
--- a/scripts/build/buildWeb.mts
+++ b/scripts/build/buildWeb.mts
@@ -23,7 +23,7 @@ import { appendFile, mkdir, readdir, readFile, rm, writeFile } from "fs/promises
 import { join } from "path";
 import Zip from "zip-local";
 
-import { addBuild, BUILD_TIMESTAMP, buildOrWatchAll, commonOpts, commonRendererPlugins, globPlugins, IS_DEV, IS_REPORTER, VERSION } from "./common.mjs";
+import { addBuild, BUILD_TIMESTAMP, buildOrWatchAll, commonOpts, globPlugins, IS_DEV, IS_REPORTER, VERSION } from "./common.mjs";
 
 /**
  * @type {esbuild.BuildOptions}
@@ -36,7 +36,7 @@ const commonOptions: esbuild.BuildOptions = {
     external: ["~plugins", "~git-hash", "/assets/*"],
     plugins: [
         globPlugins("web"),
-        ...commonRendererPlugins
+        ...commonOpts.plugins
     ],
     target: ["esnext"],
     define: {
diff --git a/scripts/build/common.mts b/scripts/build/common.mts
index 72d842ca..c2321fcf 100644
--- a/scripts/build/common.mts
+++ b/scripts/build/common.mts
@@ -28,7 +28,6 @@ import { join, relative } from "path";
 import { promisify } from "util";
 
 import { getPluginTarget } from "../utils.mjs";
-import { builtinModules } from "module";
 
 const PackageJSON: typeof import("../../package.json") = JSON.parse(readFileSync("package.json", "utf-8"));
 
@@ -263,15 +262,6 @@ export const stylePlugin: Plugin = {
     }
 };
 
-export const banImportPlugin = (filter: RegExp, message: string) => ({
-    name: "ban-imports",
-    setup: build => {
-        build.onResolve({ filter }, () => {
-            return { errors: [{ text: message }] };
-        });
-    }
-});
-
 export const commonOpts = {
     logLevel: "info",
     bundle: true,
@@ -312,15 +302,3 @@ export async function buildOrWatchAll() {
         }
     }
 }
-
-const escapedBuiltinModules = builtinModules
-    .map(m => m.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&"))
-    .join("|");
-const builtinModuleRegex = new RegExp(`^(node:)?(${escapedBuiltinModules})$`);
-
-export const commonRendererPlugins = [
-    banImportPlugin(builtinModuleRegex, "Cannot import node inbuilt modules in browser code. You need to use a native.ts file"),
-    banImportPlugin(/^react$/, "Cannot import from react. React and hooks should be imported from @webpack/common"),
-    banImportPlugin(/^electron(\/.*)?$/, "Cannot import electron in browser code. You need to use a native.ts file"),
-    ...commonOpts.plugins
-];

From 9e5315cbe4b5f46e74618910c2f9aebadfc1777a Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Sun, 11 Aug 2024 21:21:14 -0400
Subject: [PATCH 29/43] Drop 2 D3SOX Plugins

---
 README.md                                     |   4 +-
 .../serverProfilesToolbox/index.tsx           | 190 ------------------
 .../silentTypingEnhanced/index.tsx            | 177 ----------------
 3 files changed, 1 insertion(+), 370 deletions(-)
 delete mode 100644 src/equicordplugins/serverProfilesToolbox/index.tsx
 delete mode 100644 src/equicordplugins/silentTypingEnhanced/index.tsx

diff --git a/README.md b/README.md
index d951b030..f30bc935 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 -   Request for plugins from Discord.
 
 <details>
-<summary>Extra included plugins (124 additional plugins)</summary>
+<summary>Extra included plugins (122 additional plugins)</summary>
 
 - AllCallTimers by MaxHerbold and D3SOX
 - AltKrispSwitch by newwares
@@ -116,11 +116,9 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 - ScreenRecorder by AutumnVN
 - SearchFix by Jaxx
 - SekaiStickers by MaiKokain
-- ServerProfilesToolbox by D3SOX
 - ServerSearch by camila314
 - Shakespearean by vmohammad (Dev build only)
 - ShowBadgesInChat by Inbestigator and KrystalSkull
-- SilentTypingEnhanced by Ven, Rini, D3SOX
 - Slap by Korbo
 - SoundBoardLogger by Moxxie, fres, echo (maintained by thororen)
 - SteamStatusSync by niko
diff --git a/src/equicordplugins/serverProfilesToolbox/index.tsx b/src/equicordplugins/serverProfilesToolbox/index.tsx
deleted file mode 100644
index 1c9c87c3..00000000
--- a/src/equicordplugins/serverProfilesToolbox/index.tsx
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
-import {
-    Button,
-    Clipboard,
-    GuildMemberStore,
-    Text,
-    Toasts,
-    UserProfileStore,
-    UserStore
-} from "@webpack/common";
-import { GuildMember } from "discord-types/general";
-
-const SummaryItem = findComponentByCodeLazy("borderType", "showBorder", "hideDivider");
-
-interface SavedProfile {
-    nick: string | null;
-    pronouns: string | null;
-    bio: string | null;
-    themeColors: number[] | undefined;
-    banner: string | undefined;
-    avatar: string | undefined;
-    profileEffectId: string | undefined;
-    avatarDecoration: string | undefined;
-}
-
-const savedProfile: SavedProfile = {
-    nick: null,
-    pronouns: null,
-    bio: null,
-    themeColors: undefined,
-    banner: undefined,
-    avatar: undefined,
-    profileEffectId: undefined,
-    avatarDecoration: undefined,
-};
-
-const {
-    setPendingAvatar,
-    setPendingBanner,
-    setPendingBio,
-    setPendingNickname,
-    setPendingPronouns,
-    setPendingThemeColors,
-    setPendingProfileEffectId,
-    setPendingAvatarDecoration,
-}: {
-    setPendingAvatar: (a: string | undefined) => void;
-    setPendingBanner: (a: string | undefined) => void;
-    setPendingBio: (a: string | null) => void;
-    setPendingNickname: (a: string | null) => void;
-    setPendingPronouns: (a: string | null) => void;
-    setPendingThemeColors: (a: number[] | undefined) => void;
-    setPendingProfileEffectId: (a: string | undefined) => void;
-    setPendingAvatarDecoration: (a: string | undefined) => void;
-} = findByPropsLazy("setPendingNickname", "setPendingPronouns");
-
-export default definePlugin({
-    name: "ServerProfilesToolbox",
-    authors: [Devs.D3SOX],
-    description: "Adds a copy/paste/reset button to the server profiles editor",
-
-    patchServerProfiles({ guildId }: { guildId: string; }) {
-        const currentUser = UserStore.getCurrentUser();
-        const premiumType = currentUser.premiumType ?? 0;
-
-        const copy = () => {
-            const profile = UserProfileStore.getGuildMemberProfile(currentUser.id, guildId);
-            const nick = GuildMemberStore.getNick(guildId, currentUser.id);
-            const selfMember = GuildMemberStore.getMember(guildId, currentUser.id) as GuildMember & { avatarDecoration: string | undefined; };
-            savedProfile.nick = nick ?? "";
-            savedProfile.pronouns = profile.pronouns;
-            savedProfile.bio = profile.bio;
-            savedProfile.themeColors = profile.themeColors;
-            savedProfile.banner = profile.banner;
-            savedProfile.avatar = selfMember.avatar;
-            savedProfile.profileEffectId = profile.profileEffectId;
-            savedProfile.avatarDecoration = selfMember.avatarDecoration;
-        };
-
-        const paste = () => {
-            setPendingNickname(savedProfile.nick);
-            setPendingPronouns(savedProfile.pronouns);
-            if (premiumType === 2) {
-                setPendingBio(savedProfile.bio);
-                setPendingThemeColors(savedProfile.themeColors);
-                setPendingBanner(savedProfile.banner);
-                setPendingAvatar(savedProfile.avatar);
-                setPendingProfileEffectId(savedProfile.profileEffectId);
-                setPendingAvatarDecoration(savedProfile.avatarDecoration);
-            }
-        };
-
-        const reset = () => {
-            setPendingNickname(null);
-            setPendingPronouns("");
-            if (premiumType === 2) {
-                setPendingBio(null);
-                setPendingThemeColors([]);
-                setPendingBanner(undefined);
-                setPendingAvatar(undefined);
-                setPendingProfileEffectId(undefined);
-                setPendingAvatarDecoration(undefined);
-            }
-        };
-
-        const copyToClipboard = () => {
-            copy();
-            Clipboard.copy(JSON.stringify(savedProfile));
-        };
-
-        const pasteFromClipboard = async () => {
-            try {
-                const clip = await navigator.clipboard.readText();
-                if (!clip) {
-                    Toasts.show({
-                        message: "Clipboard is empty",
-                        type: Toasts.Type.FAILURE,
-                        id: Toasts.genId(),
-                    });
-                    return;
-                }
-                const clipboardProfile: SavedProfile = JSON.parse(clip);
-
-                if (!("nick" in clipboardProfile)) {
-                    Toasts.show({
-                        message: "Data is not in correct format",
-                        type: Toasts.Type.FAILURE,
-                        id: Toasts.genId(),
-                    });
-                    return;
-                }
-
-                Object.assign(savedProfile, JSON.parse(clip));
-                paste();
-            } catch (e) {
-                Toasts.show({
-                    message: `Failed to read clipboard data: ${e}`,
-                    type: Toasts.Type.FAILURE,
-                    id: Toasts.genId(),
-                });
-            }
-        };
-
-        return <SummaryItem title="Server Profiles Toolbox" hideDivider={false} forcedDivider>
-            <div style={{ display: "flex", alignItems: "center", flexDirection: "column", gap: "5px" }}>
-                <Text variant="text-md/normal">
-                    Use the following buttons to mange the currently selected server
-                </Text>
-                <div style={{ display: "flex", gap: "5px" }}>
-                    <Button onClick={copy}>
-                        Copy profile
-                    </Button>
-                    <Button onClick={paste}>
-                        Paste profile
-                    </Button>
-                    <Button onClick={reset}>
-                        Reset profile
-                    </Button>
-                </div>
-                <div style={{ display: "flex", gap: "5px" }}>
-                    <Button onClick={copyToClipboard}>
-                        Copy to clipboard
-                    </Button>
-                    <Button onClick={pasteFromClipboard}>
-                        Paste from clipboard
-                    </Button>
-                </div>
-            </div>
-        </SummaryItem>;
-    },
-
-    patches: [
-        {
-            find: ".PROFILE_CUSTOMIZATION_GUILD_SELECT_TITLE",
-            replacement: {
-                match: /return\(0(.{10,350})\}\)\}\)\}/,
-                replace: "return [(0$1})}),$self.patchServerProfiles(e)]}"
-            }
-        }
-    ],
-
-});
diff --git a/src/equicordplugins/silentTypingEnhanced/index.tsx b/src/equicordplugins/silentTypingEnhanced/index.tsx
deleted file mode 100644
index 309aa5cf..00000000
--- a/src/equicordplugins/silentTypingEnhanced/index.tsx
+++ /dev/null
@@ -1,177 +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 { addChatBarButton, ChatBarButton, removeChatBarButton } from "@api/ChatButtons";
-import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, sendBotMessage } from "@api/Commands";
-import { definePluginSettings } from "@api/Settings";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-import { ChannelStore, FluxDispatcher, React } from "@webpack/common";
-
-const settings = definePluginSettings({
-    showIcon: {
-        type: OptionType.BOOLEAN,
-        default: true,
-        description: "Show an icon for toggling the plugin",
-        restartNeeded: true,
-    },
-    isEnabled: {
-        type: OptionType.BOOLEAN,
-        description: "Toggle functionality",
-        default: true,
-    },
-    specificChats: {
-        type: OptionType.BOOLEAN,
-        default: false,
-        description: "Disable silent typing for specific chats instead (use icon to toggle)",
-        restartNeeded: false,
-    },
-    disabledFor: {
-        type: OptionType.STRING,
-        description: "Disable functionality for these chats (comma separated list of guild or user IDs)",
-        default: "",
-    },
-});
-
-const SilentTypingToggle: ChatBarButton = ({ isMainChat, channel }) => {
-    const { isEnabled, showIcon, specificChats, disabledFor } = settings.use(["isEnabled", "showIcon", "specificChats", "disabledFor"]);
-    const id = channel.guild_id ?? channel.id;
-
-    const toggleGlobal = () => {
-        settings.store.isEnabled = !settings.store.isEnabled;
-    };
-    const toggle = () => {
-        if (specificChats) {
-            if (!settings.store.isEnabled) {
-                toggleGlobal();
-            } else {
-                const disabledChannels = getDisabledChannelsList(disabledFor);
-                if (disabledChannels.includes(id)) {
-                    disabledChannels.splice(disabledChannels.indexOf(id), 1);
-                } else {
-                    disabledChannels.push(id);
-                }
-                settings.store.disabledFor = disabledChannels.join(", ");
-            }
-        } else {
-            toggleGlobal();
-        }
-    };
-    const shouldEnable = isEnabled && (!specificChats || !getDisabledChannelsList(disabledFor).includes(id));
-
-    let tooltip = shouldEnable ? "Disable Silent Typing" : "Enable Silent Typing";
-    if (specificChats) {
-        if (!isEnabled) {
-            tooltip = "Re-enable Silent Typing globally";
-        } else {
-            const chatType = channel.guild_id ? "guild" : "user";
-            tooltip = shouldEnable ? `Disable Silent Typing for current ${chatType} (right-click to toggle globally)`
-                : `Enable Silent Typing for current ${chatType} (right-click to toggle globally)`;
-        }
-    }
-
-    if (!isMainChat || !showIcon) return null;
-
-    return (
-        <ChatBarButton
-            tooltip={tooltip}
-            onClick={toggle}
-            onContextMenu={toggleGlobal}
-        >
-            <svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
-                <path fill="currentColor"
-                    d="M528 448H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h480c26.51 0 48 21.49 48 48v288c0 26.51-21.49 48-48 48zM128 180v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm288 0v-40c0-6.627-5.373-12-12-12H172c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h232c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12z" />
-                {shouldEnable &&
-                    <path d="M13 432L590 48" stroke="var(--red-500)" strokeWidth="72" strokeLinecap="round" />}
-                {specificChats && !settings.store.isEnabled &&
-                    <path
-                        transform="matrix(0.27724514,0,0,0.27724514,34.252062,-35.543268)"
-                        d="M 1827.701,303.065 698.835,1431.801 92.299,825.266 0,917.564 698.835,1616.4 1919.869,395.234 Z"
-                        stroke="var(--green-500)"
-                        strokeWidth="150" strokeLinecap="round"
-                        fillRule="evenodd" />
-                }
-            </svg>
-        </ChatBarButton>
-    );
-};
-
-function getDisabledChannelsList(list = settings.store.disabledFor) {
-    try {
-        return list.split(",").map(x => x.trim()).filter(Boolean);
-    } catch (e) {
-        settings.store.disabledFor = "";
-        return [];
-    }
-}
-
-function isEnabled(channelId: string) {
-    if (!settings.store.isEnabled) return false;
-    if (settings.store.specificChats) {
-        // need to resolve guild id for guild channels
-        const guildId = ChannelStore.getChannel(channelId)?.guild_id;
-        return !getDisabledChannelsList().includes(guildId ?? channelId);
-    }
-    return true;
-}
-
-export default definePlugin({
-    name: "SilentTypingEnhanced",
-    authors: [Devs.Ven, Devs.Rini, Devs.D3SOX],
-    description: "Hide that you are typing",
-    dependencies: ["CommandsAPI", "ChatInputButtonAPI"],
-    settings,
-
-    patches: [
-        {
-            find: '.dispatch({type:"TYPING_START_LOCAL"',
-            replacement: {
-                match: /startTyping\(\i\){.+?},stop/,
-                replace: "startTyping:$self.startTyping,stop"
-            }
-        },
-    ],
-
-    commands: [{
-        name: "silenttype",
-        description: "Toggle whether you're hiding that you're typing or not.",
-        inputType: ApplicationCommandInputType.BUILT_IN,
-        options: [
-            {
-                name: "value",
-                description: "whether to hide or not that you're typing (default is toggle)",
-                required: false,
-                type: ApplicationCommandOptionType.BOOLEAN,
-            },
-        ],
-        execute: async (args, ctx) => {
-            settings.store.isEnabled = !!findOption(args, "value", !settings.store.isEnabled);
-            sendBotMessage(ctx.channel.id, {
-                content: settings.store.isEnabled ? "Silent typing enabled!" : "Silent typing disabled!",
-            });
-        },
-    }],
-
-    async startTyping(channelId: string) {
-        if (isEnabled(channelId)) return;
-        FluxDispatcher.dispatch({ type: "TYPING_START_LOCAL", channelId });
-    },
-
-    start: () => addChatBarButton("SilentTyping", SilentTypingToggle),
-    stop: () => removeChatBarButton("SilentTyping"),
-});

From 4301ed889d59d34f7b3364dfc9fc401cf412eae7 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 13 Aug 2024 01:50:17 -0300
Subject: [PATCH 30/43] Fix ShowHiddenThings feature & PauseInvitesForever

---
 src/plugins/pauseInvitesForever/index.tsx | 7 +------
 src/plugins/showHiddenThings/index.ts     | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/plugins/pauseInvitesForever/index.tsx b/src/plugins/pauseInvitesForever/index.tsx
index 3f1ce6bf..666f0af8 100644
--- a/src/plugins/pauseInvitesForever/index.tsx
+++ b/src/plugins/pauseInvitesForever/index.tsx
@@ -19,16 +19,11 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { findLazy } from "@webpack";
 import { Constants, GuildStore, i18n, RestAPI } from "@webpack/common";
 
-const InvitesDisabledExperiment = findLazy(m => m.definition?.id === "2022-07_invites_disabled");
-
 function showDisableInvites(guildId: string) {
-    // Once the experiment is removed, this should keep working
-    const { enableInvitesDisabled } = InvitesDisabledExperiment?.getCurrentConfig?.({ guildId }) ?? { enableInvitesDisabled: true };
     // @ts-ignore
-    return enableInvitesDisabled && !GuildStore.getGuild(guildId).hasFeature("INVITES_DISABLED");
+    return !GuildStore.getGuild(guildId).hasFeature("INVITES_DISABLED");
 }
 
 function disableInvites(guildId: string) {
diff --git a/src/plugins/showHiddenThings/index.ts b/src/plugins/showHiddenThings/index.ts
index f01dc210..9ffaa7e1 100644
--- a/src/plugins/showHiddenThings/index.ts
+++ b/src/plugins/showHiddenThings/index.ts
@@ -51,7 +51,7 @@ export default definePlugin({
             },
         },
         {
-            find: "2022-07_invites_disabled",
+            find: "INVITES_DISABLED))||",
             predicate: () => settings.store.showInvitesPaused,
             replacement: {
                 match: /\i\.\i\.can\(\i\.\i.MANAGE_GUILD,\i\)/,

From 3e714e0c7a8aeab524b596451a528ccb55326541 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 13 Aug 2024 15:42:54 -0400
Subject: [PATCH 31/43] ?

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

diff --git a/src/equicordplugins/betterActivities/index.tsx b/src/equicordplugins/betterActivities/index.tsx
index 813e2fa9..429fb356 100644
--- a/src/equicordplugins/betterActivities/index.tsx
+++ b/src/equicordplugins/betterActivities/index.tsx
@@ -340,7 +340,7 @@ export default definePlugin({
         if (settings.store.allActivitiesStyle === "carousel") {
             return (
                 <div style={{ display: "flex", flexDirection: "column" }}>
-                    {currentActivity?.id === activity.id ? (
+                    {currentActivity?.id === activity?.id ? (
                         <ActivityView
                             activity={currentActivity}
                             user={user}

From 62c08441bc59b7714c076942d5fed1849b6a63a5 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:04:46 -0400
Subject: [PATCH 32/43] Update Glide

---
 src/equicordplugins/glide/index.tsx | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/equicordplugins/glide/index.tsx b/src/equicordplugins/glide/index.tsx
index bb4a4fb4..2e0e4e6a 100644
--- a/src/equicordplugins/glide/index.tsx
+++ b/src/equicordplugins/glide/index.tsx
@@ -291,7 +291,7 @@ function getCSS(fontName) {
         ` : ""}
         /*Privacy blur*/
         ${Settings.plugins.Glide.privacyBlur ? `
-                .header_ec86aa,
+                .header_f9f2ca,
                 .container_ee69e0,
                 .title_a7d72e,
                 .layout_f9647d,
@@ -300,7 +300,7 @@ function getCSS(fontName) {
                 transition: filter 0.2s ease-in-out;
                 }
 
-                body:not(:hover) .header_ec86aa,
+                body:not(:hover) .header_f9f2ca,
                 body:not(:hover) .container_ee69e0,
                 body:not(:hover) .title_a7d72e,
                 body:not(:hover) [aria-label="Members"],
@@ -512,8 +512,16 @@ function getCSS(fontName) {
                 {
                     color: var(--mutedtext) !important
                 }
-
-                ${settings.store.pastelStatuses ? `
+                .menu_d90b3d
+                {
+                    background: var(--accent) !important;
+                }
+                .messageGroupWrapper_ac90a2, .header_ac90a2
+                {
+                    background-color: var(--primary);
+                }
+                ${settings.store.pastelStatuses ?
+            `
                     /*Pastel statuses*/
                     rect[fill='#23a55a'], svg[fill='#23a55a'] {
                         fill: #80c968 !important;
@@ -612,7 +620,7 @@ function getCSS(fontName) {
                 }
 
                 /*No more useless spotify activity header*/
-                .headerContainer_d5089b
+                .headerContainer_c1d9fd
                 {
                     display: none;
                 }
@@ -634,7 +642,7 @@ function getCSS(fontName) {
                 }
 
                 /*Hide icon on file uploading status*/
-                .icon_a4623d
+                .icon_b52bef
                 {
                     display: none;
                 }
@@ -655,12 +663,12 @@ function getCSS(fontName) {
                     padding: 6px 8px !important;
                 }
                 /*Hide the icon that displays what platform the user is listening with on spotify status*/
-                .platformIcon_d5089b
+                .platformIcon_c1d9fd
                 {
                     display: none !important;
                 }
                 /*hide the album name on spotify statuses (who cares)*/
-                [class="state_d5089b ellipsis_d5089b textRow_d5089b"]
+                [class="state_c1d9fd ellipsis_c1d9fd textRow_c1d9fd"]
                 {
                     display: none;
                 }
@@ -782,5 +790,3 @@ export default definePlugin({
     // preview thing, kinda low effort but eh
     settingsAboutComponent: () => <img src="https://files.catbox.moe/j8y2gt.webp" width="568px" border-radius="30px" ></img>
 });
-
-

From d388aa4347cc11a7dc81a375d562629417432300 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 14 Aug 2024 19:34:59 -0300
Subject: [PATCH 33/43] Decor: Fix on current user area

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

diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx
index fe1f6dcb..c6cd895f 100644
--- a/src/plugins/decor/index.tsx
+++ b/src/plugins/decor/index.tsx
@@ -91,7 +91,7 @@ export default definePlugin({
             replacement: [
                 // Use Decor avatar decoration hook
                 {
-                    match: /(?<=\i\)\({avatarDecoration:)(\i).avatarDecoration(?=,)/,
+                    match: /(?<=\i\)\({avatarDecoration:)(\i)(?=,)(?<=currentUser:(\i).+?)/,
                     replace: "$self.useUserDecorAvatarDecoration($1)??$&"
                 }
             ]

From 2e92c45447ab661ade420c48a6ee6ea7ad0b0a6e Mon Sep 17 00:00:00 2001
From: verysillycat <cortex@duck.com>
Date: Wed, 14 Aug 2024 21:58:09 -0600
Subject: [PATCH 34/43] scripts(reporter): fix stable

---
 scripts/generateReport.ts | 290 +++++++++++++++++++-------------------
 1 file changed, 148 insertions(+), 142 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 28dde421..b2520af2 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -35,24 +35,6 @@ for (const variable of ["DISCORD_TOKEN", "CHROMIUM_BIN"]) {
 
 const CANARY = process.env.USE_CANARY === "true";
 
-const browser = await pup.launch({
-    headless: true,
-    executablePath: process.env.CHROMIUM_BIN,
-    args: [
-        '--disable-dev-shm-usage',
-        '--shm-size=4gb'
-    ]
-});
-const page = await browser.newPage();
-await page.setUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36");
-await page.setBypassCSP(true);
-
-async function maybeGetError(handle: JSHandle): Promise<string | undefined> {
-    return await (handle as JSHandle<Error>)?.getProperty("message")
-        .then(m => m?.jsonValue())
-        .catch(() => undefined);
-}
-
 const report = {
     badPatches: [] as {
         plugin: string;
@@ -184,123 +166,11 @@ async function printReport() {
     }
 }
 
-page.on("console", async e => {
-    const level = e.type();
-    const rawArgs = e.args();
-
-    async function getText() {
-        try {
-            return await Promise.all(
-                e.args().map(async a => {
-                    return await maybeGetError(a) || await a.jsonValue();
-                })
-            ).then(a => a.join(" ").trim());
-        } catch {
-            return e.text();
-        }
-    }
-
-    const firstArg = await rawArgs[0]?.jsonValue();
-
-    const isEquicord = firstArg === "[Equicord]";
-    const isDebug = firstArg === "[PUP_DEBUG]";
-
-    outer:
-    if (isEquicord) {
-        try {
-            var args = await Promise.all(e.args().map(a => a.jsonValue()));
-        } catch {
-            break outer;
-        }
-
-        const [, tag, message, otherMessage] = args as Array<string>;
-
-        switch (tag) {
-            case "WebpackInterceptor:":
-                const patchFailMatch = message.match(/Patch by (.+?) (had no effect|errored|found no module) \(Module id is (.+?)\): (.+)/)!;
-                if (!patchFailMatch) break;
-
-                console.error(await getText());
-                process.exitCode = 1;
-
-                const [, plugin, type, id, regex] = patchFailMatch;
-                report.badPatches.push({
-                    plugin,
-                    type,
-                    id,
-                    match: regex.replace(/\[A-Za-z_\$\]\[\\w\$\]\*/g, "\\i"),
-                    error: await maybeGetError(e.args()[3])
-                });
-
-                break;
-            case "PluginManager:":
-                const failedToStartMatch = message.match(/Failed to start (.+)/);
-                if (!failedToStartMatch) break;
-
-                console.error(await getText());
-                process.exitCode = 1;
-
-                const [, name] = failedToStartMatch;
-                report.badStarts.push({
-                    plugin: name,
-                    error: await maybeGetError(e.args()[3]) ?? "Unknown error"
-                });
-
-                break;
-            case "LazyChunkLoader:":
-                console.error(await getText());
-
-                switch (message) {
-                    case "A fatal error occurred:":
-                        process.exit(1);
-                }
-
-                break;
-            case "Reporter:":
-                console.error(await getText());
-
-                switch (message) {
-                    case "A fatal error occurred:":
-                        process.exit(1);
-                    case "Webpack Find Fail:":
-                        process.exitCode = 1;
-                        report.badWebpackFinds.push(otherMessage);
-                        break;
-                    case "Finished test":
-                        await browser.close();
-                        await printReport();
-                        process.exit();
-                }
-        }
-    }
-
-    if (isDebug) {
-        console.error(await getText());
-    } else if (level === "error") {
-        const text = await getText();
-
-        if (text.length && !text.startsWith("Failed to load resource: the server responded with a status of") && !text.includes("Webpack")) {
-            if (IGNORED_DISCORD_ERRORS.some(regex => text.match(regex))) {
-                report.ignoredErrors.push(text);
-            } else {
-                console.error("[Unexpected Error]", text);
-                report.otherErrors.push(text);
-            }
-        }
-    }
-});
-
-page.on("error", e => console.error("[Error]", e.message));
-page.on("pageerror", e => {
-    if (e.message.includes("Sentry successfully disabled")) return;
-
-    if (!e.message.startsWith("Object") && !e.message.includes("Cannot find module")) {
-        console.error("[Page Error]", e.message);
-        report.otherErrors.push(e.message);
-    } else {
-        report.ignoredErrors.push(e.message);
-    }
-});
+async function maybeGetError(handle: JSHandle): Promise<string | undefined> {
+    return await (handle as JSHandle<Error>)?.getProperty("message")
+        .then(m => m?.jsonValue())
+        .catch(() => undefined);
+}
 
 async function reporterRuntime(token: string) {
     Vencord.Webpack.waitFor(
@@ -312,11 +182,147 @@ async function reporterRuntime(token: string) {
     );
 }
 
-await page.evaluateOnNewDocument(`
-    if (location.host.endsWith("discord.com")) {
-        ${readFileSync("./dist/browser/browser.js", "utf-8")};
-        (${reporterRuntime.toString()})(${JSON.stringify(process.env.DISCORD_TOKEN)});
-    }
-`);
+try {
+    const browser = await pup.launch({
+        headless: true,
+        executablePath: process.env.CHROMIUM_BIN,
+        args: [
+            '--disable-dev-shm-usage',
+            '--shm-size=4gb'
+        ]
+    });
+    const page = await browser.newPage();
+    await page.setUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36");
+    await page.setBypassCSP(true);
 
-await page.goto(CANARY ? "https://canary.discord.com/login" : "https://discord.com/login");
+    page.on("console", async e => {
+        const level = e.type();
+        const rawArgs = e.args();
+
+        async function getText() {
+            try {
+                return await Promise.all(
+                    e.args().map(async a => {
+                        return await maybeGetError(a) || await a.jsonValue();
+                    })
+                ).then(a => a.join(" ").trim());
+            } catch {
+                return e.text();
+            }
+        }
+
+        const firstArg = await rawArgs[0]?.jsonValue();
+
+        const isEquicord = firstArg === "[Equicord]";
+        const isDebug = firstArg === "[PUP_DEBUG]";
+
+        outer:
+        if (isEquicord) {
+            try {
+                var args = await Promise.all(e.args().map(a => a.jsonValue()));
+            } catch {
+                break outer;
+            }
+
+            const [, tag, message, otherMessage] = args as Array<string>;
+
+            switch (tag) {
+                case "WebpackInterceptor:":
+                    const patchFailMatch = message.match(/Patch by (.+?) (had no effect|errored|found no module) \(Module id is (.+?)\): (.+)/)!;
+                    if (!patchFailMatch) break;
+
+                    console.error(await getText());
+                    process.exitCode = 1;
+
+                    const [, plugin, type, id, regex] = patchFailMatch;
+                    report.badPatches.push({
+                        plugin,
+                        type,
+                        id,
+                        match: regex.replace(/\[A-Za-z_\$\]\[\\w\$\]\*/g, "\\i"),
+                        error: await maybeGetError(e.args()[3])
+                    });
+
+                    break;
+                case "PluginManager:":
+                    const failedToStartMatch = message.match(/Failed to start (.+)/);
+                    if (!failedToStartMatch) break;
+
+                    console.error(await getText());
+                    process.exitCode = 1;
+
+                    const [, name] = failedToStartMatch;
+                    report.badStarts.push({
+                        plugin: name,
+                        error: await maybeGetError(e.args()[3]) ?? "Unknown error"
+                    });
+
+                    break;
+                case "LazyChunkLoader:":
+                    console.error(await getText());
+
+                    switch (message) {
+                        case "A fatal error occurred:":
+                            process.exit(1);
+                    }
+
+                    break;
+                case "Reporter:":
+                    console.error(await getText());
+
+                    switch (message) {
+                        case "A fatal error occurred:":
+                            process.exit(1);
+                        case "Webpack Find Fail:":
+                            process.exitCode = 1;
+                            report.badWebpackFinds.push(otherMessage);
+                            break;
+                        case "Finished test":
+                            await browser.close();
+                            await printReport();
+                            process.exit();
+                    }
+            }
+        }
+
+        if (isDebug) {
+            console.error(await getText());
+        } else if (level === "error") {
+            const text = await getText();
+
+            if (text.length && !text.startsWith("Failed to load resource: the server responded with a status of") && !text.includes("Webpack")) {
+                if (IGNORED_DISCORD_ERRORS.some(regex => text.match(regex))) {
+                    report.ignoredErrors.push(text);
+                } else {
+                    console.error("[Unexpected Error]", text);
+                    report.otherErrors.push(text);
+                }
+            }
+        }
+    });
+
+    page.on("error", e => console.error("[Error]", e.message));
+    page.on("pageerror", e => {
+        if (!e.message.startsWith("Object") && !e.message.includes("Cannot find module")) {
+            console.error("[Page Error]", e.message);
+            report.otherErrors.push(e.message);
+        } else {
+            report.ignoredErrors.push(e.message);
+        }
+    });
+
+    await page.evaluateOnNewDocument(`
+        if (location.host.endsWith("discord.com")) {
+            ${readFileSync("./dist/browser/browser.js", "utf-8")};
+            (${reporterRuntime.toString()})(${JSON.stringify(process.env.DISCORD_TOKEN)});
+        }
+    `);
+
+    await page.goto(CANARY ? "https://canary.discord.com/login" : "https://discord.com/login");
+
+    await printReport();
+    await browser.close();
+} catch (error) {
+    console.error("An error occurred:", error);
+    process.exit(1);
+}

From 88c8ae5f2be80e6c72e18b2761a4930fd00b2b81 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 15 Aug 2024 00:56:59 -0400
Subject: [PATCH 35/43] Fix

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

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index b2520af2..69bb47e7 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -303,6 +303,7 @@ try {
 
     page.on("error", e => console.error("[Error]", e.message));
     page.on("pageerror", e => {
+        if (e.message.includes("Sentry successfully disabled")) return;
         if (!e.message.startsWith("Object") && !e.message.includes("Cannot find module")) {
             console.error("[Page Error]", e.message);
             report.otherErrors.push(e.message);

From 47f7411124735b1c575ab6f8fef19e193f6304ff Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 15 Aug 2024 00:58:55 -0400
Subject: [PATCH 36/43] Update StatusWhilePlaying

---
 .../statusWhilePlaying.desktop/index.ts       | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/equicordplugins/statusWhilePlaying.desktop/index.ts b/src/equicordplugins/statusWhilePlaying.desktop/index.ts
index 1913ef4c..e5af9eef 100644
--- a/src/equicordplugins/statusWhilePlaying.desktop/index.ts
+++ b/src/equicordplugins/statusWhilePlaying.desktop/index.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { definePluginSettings, migratePluginSettings } from "@api/Settings";
+import { definePluginSettings } from "@api/Settings";
 import { EquicordDevs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy } from "@webpack";
-import { FluxDispatcher, PresenceStore, UserStore } from "@webpack/common";
+import { PresenceStore, UserStore } from "@webpack/common";
 
+let savedStatus = "";
 const updateAsync = findByCodeLazy("updateAsync", "status");
-
 const settings = definePluginSettings({
     statusToSet: {
         type: OptionType.SELECT,
@@ -38,26 +38,23 @@ const settings = definePluginSettings({
     }
 });
 
-migratePluginSettings("StatusWhilePlaying", "DNDWhilePlaying");
 export default definePlugin({
     name: "StatusWhilePlaying",
-    description: "Automatically updates your status when playing games",
+    description: "Automatically updates your online status (online, idle, dnd) when launching games",
     authors: [EquicordDevs.thororen],
     settings,
-    runningGamesChange(event) {
-        let savedStatus = "";
-        if (event.games.length > 0) {
+    flux: {
+        RUNNING_GAMES_CHANGE(event) {
             const status = PresenceStore.getStatus(UserStore.getCurrentUser().id);
-            savedStatus = status;
-            updateAsync(settings.store.statusToSet);
-        } else if (event.games.length === 0) {
-            updateAsync(savedStatus);
-        }
-    },
-    start() {
-        FluxDispatcher.subscribe("RUNNING_GAMES_CHANGE", this.runningGamesChange);
-    },
-    stop() {
-        FluxDispatcher.unsubscribe("RUNNING_GAMES_CHANGE", this.runningGamesChange);
+            if (event.games.length > 0) {
+                if (savedStatus !== "" && savedStatus !== settings.store.statusToSet)
+                    updateAsync(savedStatus);
+            } else {
+                if (status !== settings.store.statusToSet) {
+                    savedStatus = status;
+                    updateAsync(settings.store.statusToSet);
+                }
+            }
+        },
     }
 });

From d69a1b3f705813d31ff057fbfd8bdfab0407d04d Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 15 Aug 2024 01:03:20 -0400
Subject: [PATCH 37/43] bleh

---
 scripts/generateReport.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 69bb47e7..1d46d578 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -185,11 +185,7 @@ async function reporterRuntime(token: string) {
 try {
     const browser = await pup.launch({
         headless: true,
-        executablePath: process.env.CHROMIUM_BIN,
-        args: [
-            '--disable-dev-shm-usage',
-            '--shm-size=4gb'
-        ]
+        executablePath: process.env.CHROMIUM_BIN
     });
     const page = await browser.newPage();
     await page.setUserAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36");

From 722de4ebb3ec0f59d99607290382bb2d8dfcdd17 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 15 Aug 2024 01:11:06 -0400
Subject: [PATCH 38/43] :3

---
 src/equicordplugins/cutePats/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/equicordplugins/cutePats/index.ts b/src/equicordplugins/cutePats/index.ts
index bc3b6eee..e974b8d5 100644
--- a/src/equicordplugins/cutePats/index.ts
+++ b/src/equicordplugins/cutePats/index.ts
@@ -8,6 +8,7 @@ import { EquicordDevs } from "@utils/constants";
 import definePlugin from "@utils/types";
 
 async function getcutepats(): Promise<string> {
+    // Empty Without Me
     const res = await fetch("https://api.waifu.pics/sfw/pat");
     const url = (await res.json()).url as string;
     return url;

From 3f27ae590b29459935a9a47bcdb1ee045a1f1424 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 15 Aug 2024 01:12:35 -0400
Subject: [PATCH 39/43] :(

---
 src/equicordplugins/cutePats/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/equicordplugins/cutePats/index.ts b/src/equicordplugins/cutePats/index.ts
index e974b8d5..bc3b6eee 100644
--- a/src/equicordplugins/cutePats/index.ts
+++ b/src/equicordplugins/cutePats/index.ts
@@ -8,7 +8,6 @@ import { EquicordDevs } from "@utils/constants";
 import definePlugin from "@utils/types";
 
 async function getcutepats(): Promise<string> {
-    // Empty Without Me
     const res = await fetch("https://api.waifu.pics/sfw/pat");
     const url = (await res.json()).url as string;
     return url;

From 32d70de0e690284089aee92198f72165c1a3727e Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 15 Aug 2024 01:26:53 -0400
Subject: [PATCH 40/43] Workflow updates

---
 .github/workflows/build.yml               | 20 +------------
 .github/workflows/codeberg-mirror.yml     | 21 +------------
 .github/workflows/reportBrokenPlugins.yml |  1 -
 .github/workflows/syncDev.yml             | 36 +++++++++++------------
 .github/workflows/syncMain.yml            | 36 +++++++++++------------
 .github/workflows/test.yml                | 21 +------------
 6 files changed, 39 insertions(+), 96 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6e71f929..16d083e1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,25 +15,9 @@ env:
     GITHUB_TOKEN: ${{ secrets.ETOKEN }}
 
 jobs:
-    DetermineRunner:
-        name: Determine Runner
-        runs-on: ubuntu-latest
-        outputs:
-            runner: ${{ steps.set-runner.outputs.runner }}
-        steps:
-        - name: Determine which runner to use
-          id: set-runner
-          uses: benjaminmichaelis/get-soonest-available-runner@v1.1.0
-          with:
-            primary-runner: "self-hosted"
-            fallback-runner: "ubuntu-latest"
-            min-available-runners: 1
-            github-token: ${{ env.GITHUB_TOKEN }}
-
     Build:
         name: Build Equicord
-        needs: DetermineRunner
-        runs-on: ${{ needs.DetermineRunner.outputs.runner}}
+        runs-on: ubuntu-latest
 
         steps:
             - uses: actions/checkout@v4
@@ -89,12 +73,10 @@ jobs:
                   rm release/*.map
 
             - name: Upload Equicord
-              if: github.repository == 'Equicord/Equicord'
               run: |
                 gh release upload latest --clobber dist/release/*
 
             - name: Upload Plugins JSON to Ignore repo
-              if: github.repository == 'Equicord/Equicord'
               run: |
                 git config --global user.name "$USERNAME"
                 git config --global user.email "78185467+thororen1234@users.noreply.github.com"
diff --git a/.github/workflows/codeberg-mirror.yml b/.github/workflows/codeberg-mirror.yml
index 0f7ae1d1..9bbb434d 100644
--- a/.github/workflows/codeberg-mirror.yml
+++ b/.github/workflows/codeberg-mirror.yml
@@ -9,28 +9,9 @@ on:
     - cron: "0 */6 * * *"
 
 jobs:
-  DetermineRunner:
-    name: Determine Runner
-    runs-on: ubuntu-latest
-    outputs:
-      runner: ${{ steps.set-runner.outputs.runner }}
-    steps:
-      - name: Determine which runner to use
-        id: set-runner
-        uses: benjaminmichaelis/get-soonest-available-runner@v1.1.0
-        with:
-          primary-runner: "self-hosted"
-          fallback-runner: "ubuntu-latest"
-          min-available-runners: 1
-          github-token: ${{ env.GITHUB_TOKEN }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.ETOKEN }}
-
   codeberg:
     name: Sync Codeberg and Github
-    if: github.repository == 'Equicord/Equicord'
-    needs: DetermineRunner
-    runs-on: ${{ needs.DetermineRunner.outputs.runner }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/reportBrokenPlugins.yml b/.github/workflows/reportBrokenPlugins.yml
index e410f5bf..c396c3e9 100644
--- a/.github/workflows/reportBrokenPlugins.yml
+++ b/.github/workflows/reportBrokenPlugins.yml
@@ -8,7 +8,6 @@ on:
 jobs:
   TestPlugins:
     name: Test Patches
-    if: github.repository == 'Equicord/Equicord'
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/syncDev.yml b/.github/workflows/syncDev.yml
index 9890bbbd..1c106318 100644
--- a/.github/workflows/syncDev.yml
+++ b/.github/workflows/syncDev.yml
@@ -1,25 +1,25 @@
 name: Sync Vencord Dev
 
 env:
-    WORKFLOW_TOKEN: ${{ secrets.ETOKEN }}
-    UPSTREAM_URL: "https://github.com/Vendicated/Vencord.git"
-    UPSTREAM_BRANCH: "dev"
-    DOWNSTREAM_BRANCH: "dev"
+  WORKFLOW_TOKEN: ${{ secrets.ETOKEN }}
+  UPSTREAM_URL: "https://github.com/Vendicated/Vencord.git"
+  UPSTREAM_BRANCH: "dev"
+  DOWNSTREAM_BRANCH: "dev"
 
 on:
-    schedule:
-        - cron: "0 * * * *"
-    workflow_dispatch:
+  schedule:
+    - cron: "0 * * * *"
+  workflow_dispatch:
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Sync Vencord Dev
-              id: sync
-              uses: verticalsync/sync-upstream-repo@master
-              with:
-                  upstream_repo: ${{ env.UPSTREAM_URL }}
-                  upstream_branch: ${{ env.UPSTREAM_BRANCH }}
-                  downstream_branch: ${{ env.DOWNSTREAM_BRANCH }}
-                  token: ${{ env.WORKFLOW_TOKEN }}
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Sync Vencord Dev
+        id: sync
+        uses: verticalsync/sync-upstream-repo@master
+        with:
+          upstream_repo: ${{ env.UPSTREAM_URL }}
+          upstream_branch: ${{ env.UPSTREAM_BRANCH }}
+          downstream_branch: ${{ env.DOWNSTREAM_BRANCH }}
+          token: ${{ env.WORKFLOW_TOKEN }}
diff --git a/.github/workflows/syncMain.yml b/.github/workflows/syncMain.yml
index b549a0d7..147c949f 100644
--- a/.github/workflows/syncMain.yml
+++ b/.github/workflows/syncMain.yml
@@ -1,25 +1,25 @@
 name: Sync Vencord Main
 
 env:
-    WORKFLOW_TOKEN: ${{ secrets.ETOKEN }}
-    UPSTREAM_URL: "https://github.com/Vendicated/Vencord.git"
-    UPSTREAM_BRANCH: "main"
-    DOWNSTREAM_BRANCH: "main"
+  WORKFLOW_TOKEN: ${{ secrets.ETOKEN }}
+  UPSTREAM_URL: "https://github.com/Vendicated/Vencord.git"
+  UPSTREAM_BRANCH: "main"
+  DOWNSTREAM_BRANCH: "main"
 
 on:
-    schedule:
-        - cron: "0 * * * *"
-    workflow_dispatch:
+  schedule:
+    - cron: "0 * * * *"
+  workflow_dispatch:
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Sync Vencord Main
-              id: sync
-              uses: verticalsync/sync-upstream-repo@master
-              with:
-                  upstream_repo: ${{ env.UPSTREAM_URL }}
-                  upstream_branch: ${{ env.UPSTREAM_BRANCH }}
-                  downstream_branch: ${{ env.DOWNSTREAM_BRANCH }}
-                  token: ${{ env.WORKFLOW_TOKEN }}
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Sync Vencord Main
+        id: sync
+        uses: verticalsync/sync-upstream-repo@master
+        with:
+          upstream_repo: ${{ env.UPSTREAM_URL }}
+          upstream_branch: ${{ env.UPSTREAM_BRANCH }}
+          downstream_branch: ${{ env.DOWNSTREAM_BRANCH }}
+          token: ${{ env.WORKFLOW_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d14307aa..f550f151 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,29 +10,10 @@ on:
       - dev
 
 jobs:
-  DetermineRunner:
-    name: Determine Runner
-    if: ${{ github.event_name == 'push' }}
-    runs-on: ubuntu-latest
-    outputs:
-      runner: ${{ steps.set-runner.outputs.runner }}
-    steps:
-      - name: Determine which runner to use
-        id: set-runner
-        uses: benjaminmichaelis/get-soonest-available-runner@v1.1.0
-        with:
-          primary-runner: "self-hosted"
-          fallback-runner: "ubuntu-latest"
-          min-available-runners: 1
-          github-token: ${{ env.GITHUB_TOKEN }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.ETOKEN }}
-
   Test:
     name: Test For Pushes
-    needs: DetermineRunner
     if: ${{ github.event_name == 'push' }}
-    runs-on: ${{ needs.DetermineRunner.outputs.runner}}
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4

From 5545e86665df6560c1f364940233f765bf5f0dbd Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 15 Aug 2024 01:44:08 -0400
Subject: [PATCH 41/43] Indi

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 16d083e1..9cb7407d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -76,7 +76,7 @@ jobs:
               run: |
                 gh release upload latest --clobber dist/release/*
 
-            - name: Upload Plugins JSON to Ignore repo
+            - name: Upload Plugins JSON to Equibored repo
               run: |
                 git config --global user.name "$USERNAME"
                 git config --global user.email "78185467+thororen1234@users.noreply.github.com"

From de498b74c7cd008fc22cddf6e61e06e94d29c240 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 15 Aug 2024 01:51:30 -0400
Subject: [PATCH 42/43] Fix Addback disabled by default

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

diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index 64891e57..d7f190ec 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -22,7 +22,6 @@ import definePlugin, { OptionType } from "@utils/types";
 import { saveFile } from "@utils/web";
 import { findByPropsLazy } from "@webpack";
 import { Clipboard, ComponentDispatch } from "@webpack/common";
-
 const ctxMenuCallbacks = findByPropsLazy("contextMenuCallbackNative");
 
 async function fetchImage(url: string) {
@@ -41,7 +40,7 @@ const settings = definePluginSettings({
         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. Vesktop just doesn't, so enable by default
-        default: IS_VESKTOP || IS_EQUIBOP,
+        default: !IS_DISCORD_DESKTOP && !IS_WEB,
         restartNeeded: true
     }
 });

From 57f531c5e96fdcf14c8bc6c7272d2d88fcda2ead Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 15 Aug 2024 01:58:39 -0400
Subject: [PATCH 43/43] Only check Vesktop and Equibop

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

diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index d7f190ec..7864c94a 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -40,7 +40,7 @@ const settings = definePluginSettings({
         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. Vesktop just doesn't, so enable by default
-        default: !IS_DISCORD_DESKTOP && !IS_WEB,
+        default: IS_VESKTOP && !IS_EQUIBOP || !IS_VESKTOP && IS_EQUIBOP,
         restartNeeded: true
     }
 });