From 6140b9581496a1102839cbefbd2fa1b41a6f4c12 Mon Sep 17 00:00:00 2001
From: Kyuuhachi <1547062+Kyuuhachi@users.noreply.github.com>
Date: Sat, 16 Mar 2024 02:19:26 +0100
Subject: [PATCH 01/42] new plugin: BetterSettings ~ improves Discord's
 settings (#2222)

- makes opening settings much faster
- removes the scuffed transition animation
- organises the settings cog context menu into categories

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/_core/settings.tsx           |  26 +---
 src/plugins/betterSettings/README.md     |   9 ++
 src/plugins/betterSettings/index.tsx     | 177 +++++++++++++++++++++++
 src/webpack/common/components.ts         |   3 +-
 src/webpack/common/types/components.d.ts |   4 +
 5 files changed, 199 insertions(+), 20 deletions(-)
 create mode 100644 src/plugins/betterSettings/README.md
 create mode 100644 src/plugins/betterSettings/index.tsx

diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index 01220eb4e..569c3f0ac 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { findGroupChildrenByChildId } from "@api/ContextMenu";
 import { Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { React, SettingsRouter } from "@webpack/common";
+import { React } from "@webpack/common";
 
 import gitHash from "~git-hash";
 
@@ -30,23 +29,6 @@ export default definePlugin({
     authors: [Devs.Ven, Devs.Megu],
     required: true,
 
-    contextMenus: {
-        // The settings shortcuts in the user settings cog context menu
-        // read the elements from a hardcoded map which for obvious reason
-        // doesn't contain our sections. This patches the actions of our
-        // sections to manually use SettingsRouter (which only works on desktop
-        // but the context menu is usually not available on mobile anyway)
-        "user-settings-cog"(children) {
-            const section = findGroupChildrenByChildId("VencordSettings", children);
-            section?.forEach(c => {
-                const id = c?.props?.id;
-                if (id?.startsWith("Vencord") || id?.startsWith("Vesktop")) {
-                    c!.props.action = () => SettingsRouter.open(id);
-                }
-            });
-        }
-    },
-
     patches: [{
         find: ".versionHash",
         replacement: [
@@ -75,6 +57,12 @@ export default definePlugin({
             },
             replace: "...$self.makeSettingsCategories($1),$&"
         }
+    }, {
+        find: "Messages.USER_SETTINGS_ACTIONS_MENU_LABEL",
+        replacement: {
+            match: /(?<=function\((\i),\i\)\{)(?=let \i=Object.values\(\i.UserSettingsSections\).*?(\i)\.default\.open\()/,
+            replace: "$2.default.open($1);return;"
+        }
     }],
 
     customSections: [] as ((SectionTypes: Record<string, unknown>) => any)[],
diff --git a/src/plugins/betterSettings/README.md b/src/plugins/betterSettings/README.md
new file mode 100644
index 000000000..127c6ce76
--- /dev/null
+++ b/src/plugins/betterSettings/README.md
@@ -0,0 +1,9 @@
+# BetterSettings
+
+Improves Discord's Settings via multiple (toggleable) changes:
+- makes opening settings much faster
+- removes the scuffed transition animation
+- organises the settings cog context menu into categories
+
+![](https://github.com/Vendicated/Vencord/assets/45497981/e8d67a95-3909-4be5-8281-8cf9d2f1c30e)
+
diff --git a/src/plugins/betterSettings/index.tsx b/src/plugins/betterSettings/index.tsx
new file mode 100644
index 000000000..6d3c8798e
--- /dev/null
+++ b/src/plugins/betterSettings/index.tsx
@@ -0,0 +1,177 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { classNameFactory } from "@api/Styles";
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByPropsLazy } from "@webpack";
+import { ComponentDispatch, FocusLock, i18n, Menu, useEffect, useRef } from "@webpack/common";
+import type { HTMLAttributes, ReactElement } from "react";
+
+type SettingsEntry = { section: string, label: string; };
+
+const cl = classNameFactory("");
+const Classes = findByPropsLazy("animating", "baseLayer", "bg", "layer", "layers");
+
+const settings = definePluginSettings({
+    disableFade: {
+        description: "Disable the crossfade animation",
+        type: OptionType.BOOLEAN,
+        default: true,
+        restartNeeded: true
+    },
+    organizeMenu: {
+        description: "Organizes the settings cog context menu into categories",
+        type: OptionType.BOOLEAN,
+        default: true
+    },
+    eagerLoad: {
+        description: "Removes the loading delay when opening the menu for the first time",
+        type: OptionType.BOOLEAN,
+        default: true,
+        restartNeeded: true
+    }
+});
+
+interface LayerProps extends HTMLAttributes<HTMLDivElement> {
+    mode: "SHOWN" | "HIDDEN";
+    baseLayer?: boolean;
+}
+
+function Layer({ mode, baseLayer = false, ...props }: LayerProps) {
+    const hidden = mode === "HIDDEN";
+    const containerRef = useRef<HTMLDivElement>(null);
+
+    useEffect(() => () => {
+        ComponentDispatch.dispatch("LAYER_POP_START");
+        ComponentDispatch.dispatch("LAYER_POP_COMPLETE");
+    }, []);
+
+    const node = (
+        <div
+            ref={containerRef}
+            aria-hidden={hidden}
+            className={cl({
+                [Classes.layer]: true,
+                [Classes.baseLayer]: baseLayer,
+                "stop-animations": hidden
+            })}
+            style={{ opacity: hidden ? 0 : undefined }}
+            {...props}
+        />
+    );
+
+    return baseLayer
+        ? node
+        : <FocusLock containerRef={containerRef}>{node}</FocusLock>;
+}
+
+export default definePlugin({
+    name: "BetterSettings",
+    description: "Enhances your settings-menu-opening experience",
+    authors: [Devs.Kyuuhachi],
+    settings,
+
+    patches: [
+        {
+            find: "this.renderArtisanalHack()",
+            replacement: [
+                { // Fade in on layer
+                    match: /(?<=(\i)\.contextType=\i\.AccessibilityPreferencesContext;)/,
+                    replace: "$1=$self.Layer;",
+                    predicate: () => settings.store.disableFade
+                },
+                { // Lazy-load contents
+                    match: /createPromise:\(\)=>([^:}]*?),webpackId:"\d+",name:(?!="CollectiblesShop")"[^"]+"/g,
+                    replace: "$&,_:$1",
+                    predicate: () => settings.store.eagerLoad
+                }
+            ]
+        },
+        { // For some reason standardSidebarView also has a small fade-in
+            find: "DefaultCustomContentScroller:function()",
+            replacement: [
+                {
+                    match: /\(0,\i\.useTransition\)\((\i)/,
+                    replace: "(_cb=>_cb(void 0,$1))||$&"
+                },
+                {
+                    match: /\i\.animated\.div/,
+                    replace: '"div"'
+                }
+            ],
+            predicate: () => settings.store.disableFade
+        },
+        { // Load menu stuff on hover, not on click
+            find: "Messages.USER_SETTINGS_WITH_BUILD_OVERRIDE.format",
+            replacement: {
+                match: /(?<=handleOpenSettingsContextMenu.{0,250}?\i\.el\(("[^"]+")\)\.then\([^;]*?("\d+").*?Messages\.USER_SETTINGS,)(?=onClick:)/,
+                replace: "onMouseEnter(){Vencord.Webpack.wreq.el($1).then(()=>Vencord.Webpack.wreq($2));},"
+            },
+            predicate: () => settings.store.eagerLoad
+        },
+        { // Settings cog context menu
+            find: "Messages.USER_SETTINGS_ACTIONS_MENU_LABEL",
+            replacement: {
+                match: /\(0,\i.default\)\(\)(?=\.filter\(\i=>\{let\{section:\i\}=)/,
+                replace: "$self.wrapMenu($&)"
+            }
+        }
+    ],
+
+    Layer(props: LayerProps) {
+        return (
+            <ErrorBoundary fallback={() => props.children as any}>
+                <Layer {...props} />
+            </ErrorBoundary>
+        );
+    },
+
+    wrapMenu(list: SettingsEntry[]) {
+        if (!settings.store.organizeMenu) return list;
+
+        const items = [{ label: null as string | null, items: [] as SettingsEntry[] }];
+
+        for (const item of list) {
+            if (item.section === "HEADER") {
+                items.push({ label: item.label, items: [] });
+            } else if (item.section === "DIVIDER") {
+                items.push({ label: i18n.Messages.OTHER_OPTIONS, items: [] });
+            } else {
+                items.at(-1)!.items.push(item);
+            }
+        }
+
+        return {
+            filter(predicate: (item: SettingsEntry) => boolean) {
+                for (const category of items) {
+                    category.items = category.items.filter(predicate);
+                }
+                return this;
+            },
+            map(render: (item: SettingsEntry) => ReactElement) {
+                return items
+                    .filter(a => a.items.length > 0)
+                    .map(({ label, items }) => {
+                        const children = items.map(render);
+                        if (label) {
+                            return (
+                                <Menu.MenuItem
+                                    id={label.replace(/\W/, "_")}
+                                    label={label}
+                                    children={children}
+                                    action={children[0].props.action}
+                                />);
+                        } else {
+                            return children;
+                        }
+                    });
+            }
+        };
+    }
+});
diff --git a/src/webpack/common/components.ts b/src/webpack/common/components.ts
index 048e65d68..24477c725 100644
--- a/src/webpack/common/components.ts
+++ b/src/webpack/common/components.ts
@@ -47,6 +47,7 @@ export let Paginator: t.Paginator;
 export let ScrollerThin: t.ScrollerThin;
 export let Clickable: t.Clickable;
 export let Avatar: t.Avatar;
+export let FocusLock: t.FocusLock;
 // token lagger real
 /** css colour resolver stuff, no clue what exactly this does, just copied usage from Discord */
 export let useToken: t.useToken;
@@ -58,6 +59,6 @@ export const Flex = waitForComponent<t.Flex>("Flex", ["Justify", "Align", "Wrap"
 export const { OAuth2AuthorizeModal } = findByPropsLazy("OAuth2AuthorizeModal");
 
 waitFor(["FormItem", "Button"], m => {
-    ({ useToken, Card, Button, FormSwitch: Switch, Tooltip, TextInput, TextArea, Text, Select, SearchableSelect, Slider, ButtonLooks, TabBar, Popout, Dialog, Paginator, ScrollerThin, Clickable, Avatar } = m);
+    ({ useToken, Card, Button, FormSwitch: Switch, Tooltip, TextInput, TextArea, Text, Select, SearchableSelect, Slider, ButtonLooks, TabBar, Popout, Dialog, Paginator, ScrollerThin, Clickable, Avatar, FocusLock } = m);
     Forms = m;
 });
diff --git a/src/webpack/common/types/components.d.ts b/src/webpack/common/types/components.d.ts
index 72a8a69b4..3e3ffa4bd 100644
--- a/src/webpack/common/types/components.d.ts
+++ b/src/webpack/common/types/components.d.ts
@@ -453,3 +453,7 @@ export type Avatar = ComponentType<PropsWithChildren<{
     "aria-hidden"?: boolean;
     "aria-label"?: string;
 }>>;
+
+type FocusLock = ComponentType<PropsWithChildren<{
+    containerRef: RefObject<HTMLElement>
+}>>;

From 23aeb212726e5e8e8bbf7de126d1b81b90aa99e4 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 16 Mar 2024 02:30:36 +0100
Subject: [PATCH 02/42] fix ViewIcons & Decor patches

---
 src/plugins/decor/index.tsx     | 2 +-
 src/plugins/viewIcons/index.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx
index 713b17d76..7b9b4e3bf 100644
--- a/src/plugins/decor/index.tsx
+++ b/src/plugins/decor/index.tsx
@@ -43,7 +43,7 @@ export default definePlugin({
         {
             find: "DefaultCustomizationSections",
             replacement: {
-                match: /(?<={user:\i},"decoration"\),)/,
+                match: /(?<=USER_SETTINGS_AVATAR_DECORATION},"decoration"\),)/,
                 replace: "$self.DecorSection(),"
             }
         },
diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
index d9dfc2ad0..6eb773c28 100644
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@@ -174,7 +174,7 @@ export default definePlugin({
             find: ".NITRO_BANNER,",
             replacement: {
                 // style: { backgroundImage: shouldShowBanner ? "url(".concat(bannerUrl,
-                match: /style:\{(?=backgroundImage:(\i&&\i)\?"url\("\.concat\((\i),)/,
+                match: /style:\{(?=backgroundImage:(\i)\?"url\("\.concat\((\i),)/,
                 replace:
                     // onClick: () => shouldShowBanner && ev.target.style.backgroundImage && openImage(bannerUrl), style: { cursor: shouldShowBanner ? "pointer" : void 0,
                     'onClick:ev=>$1&&ev.target.style.backgroundImage&&$self.openImage($2),style:{cursor:$1?"pointer":void 0,'

From 356d8d8e5eb6ea030b756556428df4a5e64cae6e Mon Sep 17 00:00:00 2001
From: Hyper <git@hypergonial.com>
Date: Sat, 16 Mar 2024 03:27:59 +0100
Subject: [PATCH 03/42] feat(MessageLogger): Add delete & edit toggle (#2032)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/messageLogger/index.tsx | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index 8bc563b19..26409b89d 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -137,6 +137,16 @@ export default definePlugin({
             ],
             onChange: () => addDeleteStyle()
         },
+        logDeletes: {
+            type: OptionType.BOOLEAN,
+            description: "Whether to log deleted messages",
+            default: true,
+        },
+        logEdits: {
+            type: OptionType.BOOLEAN,
+            description: "Whether to log edited messages",
+            default: true,
+        },
         ignoreBots: {
             type: OptionType.BOOLEAN,
             description: "Whether to ignore messages by bots",
@@ -197,8 +207,8 @@ export default definePlugin({
         return cache;
     },
 
-    shouldIgnore(message: any) {
-        const { ignoreBots, ignoreSelf, ignoreUsers, ignoreChannels, ignoreGuilds } = Settings.plugins.MessageLogger;
+    shouldIgnore(message: any, isEdit = false) {
+        const { ignoreBots, ignoreSelf, ignoreUsers, ignoreChannels, ignoreGuilds, logEdits, logDeletes } = Settings.plugins.MessageLogger;
         const myId = UserStore.getCurrentUser().id;
 
         return ignoreBots && message.author?.bot ||
@@ -206,6 +216,7 @@ export default definePlugin({
             ignoreUsers.includes(message.author?.id) ||
             ignoreChannels.includes(message.channel_id) ||
             ignoreChannels.includes(ChannelStore.getChannel(message.channel_id)?.parent_id) ||
+            (isEdit ? !logEdits : !logDeletes) ||
             ignoreGuilds.includes(ChannelStore.getChannel(message.channel_id)?.guild_id);
     },
 
@@ -241,7 +252,7 @@ export default definePlugin({
                     match: /(MESSAGE_UPDATE:function\((\i)\).+?)\.update\((\i)/,
                     replace: "$1" +
                         ".update($3,m =>" +
-                        "   (($2.message.flags & 64) === 64 || $self.shouldIgnore($2.message)) ? m :" +
+                        "   (($2.message.flags & 64) === 64 || $self.shouldIgnore($2.message, true)) ? m :" +
                         "   $2.message.content !== m.editHistory?.[0]?.content && $2.message.content !== m.content ?" +
                         "       m.set('editHistory',[...(m.editHistory || []), $self.makeEdit($2.message, m)]) :" +
                         "       m" +

From 90ee07fd981ab0814abded622a711fbd1e95f70c Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Sat, 16 Mar 2024 22:43:04 +0700
Subject: [PATCH 04/42] emoteCloner: fix cloning gif stickers (#2268)

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

diff --git a/src/plugins/emoteCloner/index.tsx b/src/plugins/emoteCloner/index.tsx
index b25e1be27..4c0fe94ad 100644
--- a/src/plugins/emoteCloner/index.tsx
+++ b/src/plugins/emoteCloner/index.tsx
@@ -56,7 +56,7 @@ function getUrl(data: Data) {
     if (data.t === "Emoji")
         return `${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/emojis/${data.id}.${data.isAnimated ? "gif" : "png"}`;
 
-    return `${location.origin}/stickers/${data.id}.${StickerExt[data.format_type]}`;
+    return `${window.GLOBAL_ENV.MEDIA_PROXY_ENDPOINT}/stickers/${data.id}.${StickerExt[data.format_type]}`;
 }
 
 async function fetchSticker(id: string) {

From ae9435ac55dd7a420b59a6a9ab826e106fa2ef81 Mon Sep 17 00:00:00 2001
From: thororen <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 19 Mar 2024 07:06:09 -0400
Subject: [PATCH 05/42] MemberCount: Fix error when not in a channel (#2277)

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

diff --git a/src/plugins/memberCount/MemberCount.tsx b/src/plugins/memberCount/MemberCount.tsx
index 50665353e..3231d01ce 100644
--- a/src/plugins/memberCount/MemberCount.tsx
+++ b/src/plugins/memberCount/MemberCount.tsx
@@ -27,7 +27,7 @@ export function MemberCount({ isTooltip, tooltipGuildId }: { isTooltip?: true; t
 
     const { groups } = useStateFromStores(
         [ChannelMemberStore],
-        () => ChannelMemberStore.getProps(guildId, currentChannel.id)
+        () => ChannelMemberStore.getProps(guildId, currentChannel?.id)
     );
 
     if (!isTooltip && (groups.length >= 1 || groups[0].id !== "unknown")) {

From 0d5f492891b45c847c94b8bd9b4b5dd62bcbf976 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 21 Mar 2024 21:17:47 +0100
Subject: [PATCH 06/42] fix ReviewDB

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

diff --git a/src/plugins/reviewDB/components/ReviewsView.tsx b/src/plugins/reviewDB/components/ReviewsView.tsx
index 46bd7fb84..a705bc80a 100644
--- a/src/plugins/reviewDB/components/ReviewsView.tsx
+++ b/src/plugins/reviewDB/components/ReviewsView.tsx
@@ -31,7 +31,7 @@ import ReviewComponent from "./ReviewComponent";
 const { Editor, Transforms } = findByPropsLazy("Editor", "Transforms");
 const { ChatInputTypes } = findByPropsLazy("ChatInputTypes");
 
-const InputComponent = findComponentByCodeLazy("default.CHANNEL_TEXT_AREA");
+const InputComponent = findComponentByCodeLazy("default.CHANNEL_TEXT_AREA", "input");
 const { createChannelRecordFromServer } = findByPropsLazy("createChannelRecordFromServer");
 
 interface UserProps {

From 3e332a60622ef1ca525404374588e4041551aa5e Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 21 Mar 2024 23:27:08 +0100
Subject: [PATCH 07/42] fix RestAPI find

---
 src/webpack/common/types/utils.d.ts | 6 +-----
 src/webpack/common/utils.ts         | 7 +++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/webpack/common/types/utils.d.ts b/src/webpack/common/types/utils.d.ts
index 3d1c0eea6..39af843c5 100644
--- a/src/webpack/common/types/utils.d.ts
+++ b/src/webpack/common/types/utils.d.ts
@@ -81,11 +81,7 @@ interface RestRequestData {
     retries?: number;
 }
 
-export type RestAPI = Record<"delete" | "get" | "patch" | "post" | "put", (data: RestRequestData) => Promise<any>> & {
-    V6OrEarlierAPIError: Error;
-    V8APIError: Error;
-    getAPIBaseURL(withVersion?: boolean): string;
-};
+export type RestAPI = Record<"delete" | "get" | "patch" | "post" | "put", (data: RestRequestData) => Promise<any>>;
 
 export type Permissions = "CREATE_INSTANT_INVITE"
     | "KICK_MEMBERS"
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 7060573d5..ec6c0e1ed 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -19,7 +19,7 @@
 import type { Channel, User } from "discord-types/general";
 
 // eslint-disable-next-line path-alias/no-relative
-import { _resolveReady, filters, findByCodeLazy, findByPropsLazy, findLazy, waitFor } from "../webpack";
+import { _resolveReady, filters, findByCodeLazy, findByProps, findByPropsLazy, findLazy, proxyLazyWebpack, waitFor } from "../webpack";
 import type * as t from "./types/utils";
 
 export let FluxDispatcher: t.FluxDispatcher;
@@ -37,7 +37,10 @@ export let ComponentDispatch;
 waitFor(["ComponentDispatch", "ComponentDispatcher"], m => ComponentDispatch = m.ComponentDispatch);
 
 
-export const RestAPI: t.RestAPI = findByPropsLazy("getAPIBaseURL", "get");
+export const RestAPI: t.RestAPI = proxyLazyWebpack(() => {
+    const mod = findByProps("getAPIBaseURL");
+    return mod.HTTP ?? mod;
+});
 export const moment: typeof import("moment") = findByPropsLazy("parseTwoDigitYear");
 
 export const hljs: typeof import("highlight.js") = findByPropsLazy("highlight", "registerLanguage");

From 021948c919ffeec364681c91ff1bc70ea7784d76 Mon Sep 17 00:00:00 2001
From: Eric Liu <45801973+waresnew@users.noreply.github.com>
Date: Thu, 21 Mar 2024 19:39:26 -0400
Subject: [PATCH 08/42] WhoReacted: fix scroll jumping when rendering users
 (#2271)

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

diff --git a/src/plugins/whoReacted/index.tsx b/src/plugins/whoReacted/index.tsx
index 6d994be16..b60366900 100644
--- a/src/plugins/whoReacted/index.tsx
+++ b/src/plugins/whoReacted/index.tsx
@@ -29,7 +29,7 @@ import { Message, ReactionEmoji, User } from "discord-types/general";
 
 const UserSummaryItem = findComponentByCodeLazy("defaultRenderUser", "showDefaultAvatarsForNullUsers");
 const AvatarStyles = findByPropsLazy("moreUsers", "emptyUser", "avatarContainer", "clickableAvatar");
-
+let Scroll: any = null;
 const queue = new Queue();
 let reactions: Record<string, ReactionCacheEntry>;
 
@@ -91,7 +91,7 @@ function handleClickAvatar(event: React.MouseEvent<HTMLElement, MouseEvent>) {
 export default definePlugin({
     name: "WhoReacted",
     description: "Renders the avatars of users who reacted to a message",
-    authors: [Devs.Ven, Devs.KannaDev],
+    authors: [Devs.Ven, Devs.KannaDev, Devs.newwares],
 
     patches: [{
         find: ",reactionRef:",
@@ -105,7 +105,19 @@ export default definePlugin({
             match: /(?<=CONNECTION_OPEN:function\(\){)(\i)={}/,
             replace: "$&;$self.reactions=$1"
         }
-    }],
+    },
+    {
+
+        find: "cleanAutomaticAnchor(){",
+        replacement: {
+            match: /this\.automaticAnchor=null,this\.messageFetchAnchor=null,/,
+            replace: "$&$self.setScrollObj(this),"
+        }
+    }
+    ],
+    setScrollObj(scroll: any) {
+        Scroll = scroll;
+    },
 
     renderUsers(props: RootObject) {
         return props.message.reactions.length > 10 ? null : (
@@ -114,9 +126,13 @@ export default definePlugin({
             </ErrorBoundary>
         );
     },
-
     _renderUsers({ message, emoji, type }: RootObject) {
         const forceUpdate = useForceUpdater();
+        React.useLayoutEffect(() => { // bc need to prevent autoscrolling
+            if (Scroll?.scrollCounter > 0) {
+                Scroll.setAutomaticAnchor(null);
+            }
+        });
         React.useEffect(() => {
             const cb = (e: any) => {
                 if (e.messageId === message.id)
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index f609fa644..335ed5cc1 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -413,6 +413,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     Elvyra: {
         name: "Elvyra",
         id: 708275751816003615n,
+    },
+    newwares: {
+        name: "newwares",
+        id: 421405303951851520n
     }
 } satisfies Record<string, Dev>);
 

From 04d5423b08ced44a5e09a77921b5b315771c76d5 Mon Sep 17 00:00:00 2001
From: Masterjoona <69722179+Masterjoona@users.noreply.github.com>
Date: Fri, 22 Mar 2024 01:42:41 +0200
Subject: [PATCH 09/42] fix(AnonymiseFileNames): anonymise files in forum posts
 (#2270)

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

diff --git a/src/plugins/anonymiseFileNames/index.tsx b/src/plugins/anonymiseFileNames/index.tsx
index 911440230..b424b7a59 100644
--- a/src/plugins/anonymiseFileNames/index.tsx
+++ b/src/plugins/anonymiseFileNames/index.tsx
@@ -78,6 +78,13 @@ export default definePlugin({
                     "uploadFiles:(...args)=>(args[0].uploads.forEach(f=>f.filename=$self.anonymise(f)),$1(...args)),",
             },
         },
+        {
+            find: "message.attachments",
+            replacement: {
+                match: /(\i.uploadFiles\((\i),)/,
+                replace: "$2.forEach(f=>f.filename=$self.anonymise(f)),$1"
+            }
+        },
         {
             find: ".Messages.ATTACHMENT_UTILITIES_SPOILER",
             replacement: {

From 55901ba35ecbdb6198227fbe4df1a2f14200b643 Mon Sep 17 00:00:00 2001
From: Trey <47907719+trwy7@users.noreply.github.com>
Date: Thu, 21 Mar 2024 17:44:37 -0600
Subject: [PATCH 10/42] AlwaysTrust: Add options for each popup (#2234)

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

diff --git a/src/plugins/alwaysTrust/index.ts b/src/plugins/alwaysTrust/index.ts
index 07e92afce..5113935f4 100644
--- a/src/plugins/alwaysTrust/index.ts
+++ b/src/plugins/alwaysTrust/index.ts
@@ -16,27 +16,46 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
+
+const settings = definePluginSettings({
+    domain: {
+        type: OptionType.BOOLEAN,
+        default: true,
+        description: "Remove the untrusted domain popup when opening links",
+        restartNeeded: true
+    },
+    file: {
+        type: OptionType.BOOLEAN,
+        default: true,
+        description: "Remove the 'Potentially Dangerous Download' popup when opening links",
+        restartNeeded: true
+    }
+});
 
 export default definePlugin({
     name: "AlwaysTrust",
     description: "Removes the annoying untrusted domain and suspicious file popup",
-    authors: [Devs.zt],
+    authors: [Devs.zt, Devs.Trwy],
     patches: [
         {
             find: ".displayName=\"MaskedLinkStore\"",
             replacement: {
                 match: /(?<=isTrustedDomain\(\i\){)return \i\(\i\)/,
                 replace: "return true"
-            }
+            },
+            predicate: () => settings.store.domain
         },
         {
             find: "isSuspiciousDownload:",
             replacement: {
                 match: /function \i\(\i\){(?=.{0,60}\.parse\(\i\))/,
                 replace: "$&return null;"
-            }
+            },
+            predicate: () => settings.store.file
         }
-    ]
+    ],
+    settings
 });
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 335ed5cc1..5b540895a 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -49,6 +49,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Cynosphere",
         id: 150745989836308480n
     },
+    Trwy: {
+        name: "trey",
+        id: 354427199023218689n
+    },
     Megu: {
         name: "Megumin",
         id: 545581357812678656n

From 2ce348747778b064b2bbd5ea9f3fd9fdd337c7fd Mon Sep 17 00:00:00 2001
From: Syncx <47534062+Syncxv@users.noreply.github.com>
Date: Fri, 22 Mar 2024 10:55:37 +1100
Subject: [PATCH 11/42] PinDMs: add category support & fix bugs (#2203)

Co-authored-by: V <vendicated@riseup.net>
---
 .../pinDms/components/CreateCategoryModal.tsx | 134 ++++++
 src/plugins/pinDms/components/contextMenu.tsx |  96 +++++
 src/plugins/pinDms/constants.ts               |  32 ++
 src/plugins/pinDms/contextMenus.tsx           |  70 ----
 src/plugins/pinDms/data.ts                    | 214 ++++++++++
 src/plugins/pinDms/index.tsx                  | 392 ++++++++++++++----
 src/plugins/pinDms/settings.ts                |  94 -----
 src/plugins/pinDms/styles.css                 |  37 ++
 8 files changed, 822 insertions(+), 247 deletions(-)
 create mode 100644 src/plugins/pinDms/components/CreateCategoryModal.tsx
 create mode 100644 src/plugins/pinDms/components/contextMenu.tsx
 create mode 100644 src/plugins/pinDms/constants.ts
 delete mode 100644 src/plugins/pinDms/contextMenus.tsx
 create mode 100644 src/plugins/pinDms/data.ts
 delete mode 100644 src/plugins/pinDms/settings.ts
 create mode 100644 src/plugins/pinDms/styles.css

diff --git a/src/plugins/pinDms/components/CreateCategoryModal.tsx b/src/plugins/pinDms/components/CreateCategoryModal.tsx
new file mode 100644
index 000000000..f38cc88c0
--- /dev/null
+++ b/src/plugins/pinDms/components/CreateCategoryModal.tsx
@@ -0,0 +1,134 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { classNameFactory } from "@api/Styles";
+import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModalLazy } from "@utils/modal";
+import { extractAndLoadChunksLazy, findComponentByCodeLazy } from "@webpack";
+import { Button, Forms, Text, TextInput, Toasts, useEffect, useState } from "@webpack/common";
+
+import { DEFAULT_COLOR, SWATCHES } from "../constants";
+import { categories, Category, createCategory, getCategory, updateCategory } from "../data";
+import { forceUpdate } from "../index";
+
+interface ColorPickerProps {
+    color: number | null;
+    showEyeDropper?: boolean;
+    suggestedColors?: string[];
+    onChange(value: number | null): void;
+}
+
+interface ColorPickerWithSwatchesProps {
+    defaultColor: number;
+    colors: number[];
+    value: number;
+    disabled?: boolean;
+    onChange(value: number | null): void;
+    renderDefaultButton?: () => React.ReactNode;
+    renderCustomButton?: () => React.ReactNode;
+}
+
+const ColorPicker = findComponentByCodeLazy<ColorPickerProps>(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)");
+const ColorPickerWithSwatches = findComponentByCodeLazy<ColorPickerWithSwatchesProps>(".presets,", "customColor:");
+
+export const requireSettingsMenu = extractAndLoadChunksLazy(['name:"UserSettings"'], /createPromise:.{0,20}el\("(.+?)"\).{0,50}"UserSettings"/);
+
+const cl = classNameFactory("vc-pindms-modal-");
+
+interface Props {
+    categoryId: string | null;
+    initalChannelId: string | null;
+    modalProps: ModalProps;
+}
+
+function useCategory(categoryId: string | null, initalChannelId: string | null) {
+    const [category, setCategory] = useState<Category | null>(null);
+
+    useEffect(() => {
+        if (categoryId)
+            setCategory(getCategory(categoryId)!);
+        else if (initalChannelId)
+            setCategory({
+                id: Toasts.genId(),
+                name: `Pin Category ${categories.length + 1}`,
+                color: 10070709,
+                collapsed: false,
+                channels: [initalChannelId]
+            });
+    }, [categoryId, initalChannelId]);
+
+    return {
+        category,
+        setCategory
+    };
+}
+
+export function NewCategoryModal({ categoryId, modalProps, initalChannelId }: Props) {
+    const { category, setCategory } = useCategory(categoryId, initalChannelId);
+
+    if (!category) return null;
+
+    const onSave = async (e: React.FormEvent<HTMLFormElement> | React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
+        e.preventDefault();
+        if (!categoryId)
+            await createCategory(category);
+        else
+            await updateCategory(category);
+
+        forceUpdate();
+        modalProps.onClose();
+    };
+
+    return (
+        <ModalRoot {...modalProps}>
+            <ModalHeader>
+                <Text variant="heading-lg/semibold" style={{ flexGrow: 1 }}>{categoryId ? "Edit" : "New"} Category</Text>
+            </ModalHeader>
+
+            {/* form is here so when you press enter while in the text input it submits */}
+            <form onSubmit={onSave}>
+                <ModalContent className={cl("content")}>
+                    <Forms.FormSection>
+                        <Forms.FormTitle>Name</Forms.FormTitle>
+                        <TextInput
+                            value={category.name}
+                            onChange={e => setCategory({ ...category, name: e })}
+                        />
+                    </Forms.FormSection>
+                    <Forms.FormDivider />
+                    <Forms.FormSection>
+                        <Forms.FormTitle>Color</Forms.FormTitle>
+                        <ColorPickerWithSwatches
+                            key={category.name}
+                            defaultColor={DEFAULT_COLOR}
+                            colors={SWATCHES}
+                            onChange={c => setCategory({ ...category, color: c! })}
+                            value={category.color}
+                            renderDefaultButton={() => null}
+                            renderCustomButton={() => (
+                                <ColorPicker
+                                    color={category.color}
+                                    onChange={c => setCategory({ ...category, color: c! })}
+                                    key={category.name}
+                                    showEyeDropper={false}
+                                />
+                            )}
+                        />
+                    </Forms.FormSection>
+                </ModalContent>
+                <ModalFooter>
+                    <Button type="submit" onClick={onSave} disabled={!category.name}>{categoryId ? "Save" : "Create"}</Button>
+                </ModalFooter>
+            </form>
+        </ModalRoot>
+    );
+}
+
+export const openCategoryModal = (categoryId: string | null, channelId: string | null) =>
+    openModalLazy(async () => {
+        await requireSettingsMenu();
+        return modalProps => <NewCategoryModal categoryId={categoryId} modalProps={modalProps} initalChannelId={channelId} />;
+    });
+
diff --git a/src/plugins/pinDms/components/contextMenu.tsx b/src/plugins/pinDms/components/contextMenu.tsx
new file mode 100644
index 000000000..0f5a198ba
--- /dev/null
+++ b/src/plugins/pinDms/components/contextMenu.tsx
@@ -0,0 +1,96 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
+import { Menu } from "@webpack/common";
+
+import { addChannelToCategory, canMoveChannelInDirection, categories, isPinned, moveChannel, removeChannelFromCategory } from "../data";
+import { forceUpdate, settings } from "../index";
+import { openCategoryModal } from "./CreateCategoryModal";
+
+function createPinMenuItem(channelId: string) {
+    const pinned = isPinned(channelId);
+
+    return (
+        <Menu.MenuItem
+            id="pin-dm"
+            label="Pin DMs"
+        >
+
+            {!pinned && (
+                <>
+                    <Menu.MenuItem
+                        id="vc-add-category"
+                        label="Add Category"
+                        color="brand"
+                        action={() => openCategoryModal(null, channelId)}
+                    />
+                    <Menu.MenuSeparator />
+
+                    {
+                        categories.map(category => (
+                            <Menu.MenuItem
+                                id={`pin-category-${category.name}`}
+                                label={category.name}
+                                action={() => addChannelToCategory(channelId, category.id).then(forceUpdate)}
+                            />
+                        ))
+                    }
+                </>
+            )}
+
+            {pinned && (
+                <>
+                    <Menu.MenuItem
+                        id="unpin-dm"
+                        label="Unpin DM"
+                        color="danger"
+                        action={() => removeChannelFromCategory(channelId).then(forceUpdate)}
+                    />
+
+                    {
+                        !settings.store.sortDmsByNewestMessage && canMoveChannelInDirection(channelId, -1) && (
+                            <Menu.MenuItem
+                                id="move-up"
+                                label="Move Up"
+                                action={() => moveChannel(channelId, -1).then(forceUpdate)}
+                            />
+                        )
+                    }
+
+                    {
+                        !settings.store.sortDmsByNewestMessage && canMoveChannelInDirection(channelId, 1) && (
+                            <Menu.MenuItem
+                                id="move-down"
+                                label="Move Down"
+                                action={() => moveChannel(channelId, 1).then(forceUpdate)}
+                            />
+                        )
+                    }
+                </>
+            )}
+
+        </Menu.MenuItem>
+    );
+}
+
+const GroupDMContext: NavContextMenuPatchCallback = (children, props) => {
+    const container = findGroupChildrenByChildId("leave-channel", children);
+    container?.unshift(createPinMenuItem(props.channel.id));
+};
+
+const UserContext: NavContextMenuPatchCallback = (children, props) => {
+    const container = findGroupChildrenByChildId("close-dm", children);
+    if (container) {
+        const idx = container.findIndex(c => c?.props?.id === "close-dm");
+        container.splice(idx, 0, createPinMenuItem(props.channel.id));
+    }
+};
+
+export const contextMenus = {
+    "gdm-context": GroupDMContext,
+    "user-context": UserContext
+};
diff --git a/src/plugins/pinDms/constants.ts b/src/plugins/pinDms/constants.ts
new file mode 100644
index 000000000..fbd995e14
--- /dev/null
+++ b/src/plugins/pinDms/constants.ts
@@ -0,0 +1,32 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+export const DEFAULT_CHUNK_SIZE = 256;
+export const DEFAULT_COLOR = 10070709;
+
+export const SWATCHES = [
+    1752220,
+    3066993,
+    3447003,
+    10181046,
+    15277667,
+    15844367,
+    15105570,
+    15158332,
+    9807270,
+    6323595,
+
+    1146986,
+    2067276,
+    2123412,
+    7419530,
+    11342935,
+    12745742,
+    11027200,
+    10038562,
+    9936031,
+    5533306
+];
diff --git a/src/plugins/pinDms/contextMenus.tsx b/src/plugins/pinDms/contextMenus.tsx
deleted file mode 100644
index 1db8b25a9..000000000
--- a/src/plugins/pinDms/contextMenus.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
-import { Menu } from "@webpack/common";
-
-import { isPinned, movePin, PinOrder, settings, snapshotArray, togglePin } from "./settings";
-
-function PinMenuItem(channelId: string) {
-    const pinned = isPinned(channelId);
-    const canMove = pinned && settings.store.pinOrder === PinOrder.Custom;
-
-    return (
-        <>
-            <Menu.MenuItem
-                id="pin-dm"
-                label={pinned ? "Unpin DM" : "Pin DM"}
-                action={() => togglePin(channelId)}
-            />
-            {canMove && snapshotArray[0] !== channelId && (
-                <Menu.MenuItem
-                    id="move-pin-up"
-                    label="Move Pin Up"
-                    action={() => movePin(channelId, -1)}
-                />
-            )}
-            {canMove && snapshotArray[snapshotArray.length - 1] !== channelId && (
-                <Menu.MenuItem
-                    id="move-pin-down"
-                    label="Move Pin Down"
-                    action={() => movePin(channelId, +1)}
-                />
-            )}
-        </>
-    );
-}
-
-const GroupDMContext: NavContextMenuPatchCallback = (children, props) => {
-    const container = findGroupChildrenByChildId("leave-channel", children);
-    if (container)
-        container.unshift(PinMenuItem(props.channel.id));
-};
-
-const UserContext: NavContextMenuPatchCallback = (children, props) => {
-    const container = findGroupChildrenByChildId("close-dm", children);
-    if (container) {
-        const idx = container.findIndex(c => c?.props?.id === "close-dm");
-        container.splice(idx, 0, PinMenuItem(props.channel.id));
-    }
-};
-
-export const contextMenus = {
-    "gdm-context": GroupDMContext,
-    "user-context": UserContext
-};
diff --git a/src/plugins/pinDms/data.ts b/src/plugins/pinDms/data.ts
new file mode 100644
index 000000000..afb6f9795
--- /dev/null
+++ b/src/plugins/pinDms/data.ts
@@ -0,0 +1,214 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import * as DataStore from "@api/DataStore";
+import { Settings } from "@api/Settings";
+import { UserStore } from "@webpack/common";
+
+import { DEFAULT_COLOR } from "./constants";
+import { forceUpdate } from "./index";
+
+export interface Category {
+    id: string;
+    name: string;
+    color: number;
+    channels: string[];
+    collapsed?: boolean;
+}
+
+const CATEGORY_BASE_KEY = "PinDMsCategories-";
+const CATEGORY_MIGRATED_PINDMS_KEY = "PinDMsMigratedPinDMs";
+const CATEGORY_MIGRATED_KEY = "PinDMsMigratedOldCategories";
+const OLD_CATEGORY_KEY = "BetterPinDMsCategories-";
+
+
+export let categories: Category[] = [];
+
+export async function saveCats(cats: Category[]) {
+    const { id } = UserStore.getCurrentUser();
+    await DataStore.set(CATEGORY_BASE_KEY + id, cats);
+}
+
+export async function init() {
+    const id = UserStore.getCurrentUser()?.id;
+    await initCategories(id);
+    await migrateData(id);
+    forceUpdate();
+}
+
+export async function initCategories(userId: string) {
+    categories = await DataStore.get<Category[]>(CATEGORY_BASE_KEY + userId) ?? [];
+}
+
+export function getCategory(id: string) {
+    return categories.find(c => c.id === id);
+}
+
+export async function createCategory(category: Category) {
+    categories.push(category);
+    await saveCats(categories);
+}
+
+export async function updateCategory(category: Category) {
+    const index = categories.findIndex(c => c.id === category.id);
+    if (index === -1) return;
+
+    categories[index] = category;
+    await saveCats(categories);
+}
+
+export async function addChannelToCategory(channelId: string, categoryId: string) {
+    const category = categories.find(c => c.id === categoryId);
+    if (!category) return;
+
+    if (category.channels.includes(channelId)) return;
+
+    category.channels.push(channelId);
+    await saveCats(categories);
+
+}
+
+export async function removeChannelFromCategory(channelId: string) {
+    const category = categories.find(c => c.channels.includes(channelId));
+    if (!category) return;
+
+    category.channels = category.channels.filter(c => c !== channelId);
+    await saveCats(categories);
+}
+
+export async function removeCategory(categoryId: string) {
+    const catagory = categories.find(c => c.id === categoryId);
+    if (!catagory) return;
+
+    // catagory?.channels.forEach(c => removeChannelFromCategory(c));
+    categories = categories.filter(c => c.id !== categoryId);
+    await saveCats(categories);
+}
+
+export async function collapseCategory(id: string, value = true) {
+    const category = categories.find(c => c.id === id);
+    if (!category) return;
+
+    category.collapsed = value;
+    await saveCats(categories);
+}
+
+// utils
+export function isPinned(id: string) {
+    return categories.some(c => c.channels.includes(id));
+}
+
+export function categoryLen() {
+    return categories.length;
+}
+
+export function getAllUncollapsedChannels() {
+    return categories.filter(c => !c.collapsed).map(c => c.channels).flat();
+}
+
+export function getSections() {
+    return categories.reduce((acc, category) => {
+        acc.push(category.channels.length === 0 ? 1 : category.channels.length);
+        return acc;
+    }, [] as number[]);
+}
+
+// move categories
+export const canMoveArrayInDirection = (array: any[], index: number, direction: -1 | 1) => {
+    const a = array[index];
+    const b = array[index + direction];
+
+    return a && b;
+};
+
+export const canMoveCategoryInDirection = (id: string, direction: -1 | 1) => {
+    const index = categories.findIndex(m => m.id === id);
+    return canMoveArrayInDirection(categories, index, direction);
+};
+
+export const canMoveCategory = (id: string) => canMoveCategoryInDirection(id, -1) || canMoveCategoryInDirection(id, 1);
+
+export const canMoveChannelInDirection = (channelId: string, direction: -1 | 1) => {
+    const category = categories.find(c => c.channels.includes(channelId));
+    if (!category) return false;
+
+    const index = category.channels.indexOf(channelId);
+    return canMoveArrayInDirection(category.channels, index, direction);
+};
+
+
+function swapElementsInArray(array: any[], index1: number, index2: number) {
+    if (!array[index1] || !array[index2]) return;
+    [array[index1], array[index2]] = [array[index2], array[index1]];
+}
+
+// stolen from PinDMs
+export async function moveCategory(id: string, direction: -1 | 1) {
+    const a = categories.findIndex(m => m.id === id);
+    const b = a + direction;
+
+    swapElementsInArray(categories, a, b);
+
+    await saveCats(categories);
+}
+
+export async function moveChannel(channelId: string, direction: -1 | 1) {
+    const category = categories.find(c => c.channels.includes(channelId));
+    if (!category) return;
+
+    const a = category.channels.indexOf(channelId);
+    const b = a + direction;
+
+    swapElementsInArray(category.channels, a, b);
+
+    await saveCats(categories);
+}
+
+
+
+// migrate data
+const getPinDMsPins = () => (Settings.plugins.PinDMs.pinnedDMs || void 0)?.split(",") as string[] | undefined;
+
+async function migratePinDMs() {
+    if (categories.some(m => m.id === "oldPins")) {
+        return await DataStore.set(CATEGORY_MIGRATED_PINDMS_KEY, true);
+    }
+
+    const pindmspins = getPinDMsPins();
+
+    // we dont want duplicate pins
+    const difference = [...new Set(pindmspins)]?.filter(m => !categories.some(c => c.channels.includes(m)));
+    if (difference?.length) {
+        categories.push({
+            id: "oldPins",
+            name: "Pins",
+            color: DEFAULT_COLOR,
+            channels: difference
+        });
+    }
+
+    await DataStore.set(CATEGORY_MIGRATED_PINDMS_KEY, true);
+}
+
+async function migrateOldCategories(userId: string) {
+    const oldCats = await DataStore.get<Category[]>(OLD_CATEGORY_KEY + userId);
+    // dont want to migrate if the user has already has categories.
+    if (categories.length === 0 && oldCats?.length) {
+        categories.push(...(oldCats.filter(m => m.id !== "oldPins")));
+    }
+    await DataStore.set(CATEGORY_MIGRATED_KEY, true);
+}
+
+export async function migrateData(userId: string) {
+    const m1 = await DataStore.get(CATEGORY_MIGRATED_KEY), m2 = await DataStore.get(CATEGORY_MIGRATED_PINDMS_KEY);
+    if (m1 && m2) return;
+
+    // want to migrate the old categories first and then slove any conflicts with the PinDMs pins
+    if (!m1) await migrateOldCategories(userId);
+    if (!m2) await migratePinDMs();
+
+    await saveCats(categories);
+}
diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index 45172328e..ee726bfab 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -1,116 +1,131 @@
 /*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
+import "./styles.css";
+
+import { definePluginSettings } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import { classes } from "@utils/misc";
+import definePlugin, { OptionType, StartAt } from "@utils/types";
+import { findByPropsLazy, findStoreLazy } from "@webpack";
+import { ContextMenuApi, FluxDispatcher, Menu, React } from "@webpack/common";
 import { Channel } from "discord-types/general";
 
-import { contextMenus } from "./contextMenus";
-import { getPinAt, isPinned, settings, snapshotArray, sortedSnapshot, usePinnedDms } from "./settings";
+import { contextMenus } from "./components/contextMenu";
+import { openCategoryModal, requireSettingsMenu } from "./components/CreateCategoryModal";
+import { DEFAULT_CHUNK_SIZE } from "./constants";
+import { canMoveCategory, canMoveCategoryInDirection, categories, Category, categoryLen, collapseCategory, getAllUncollapsedChannels, getSections, init, isPinned, moveCategory, removeCategory } from "./data";
+
+interface ChannelComponentProps {
+    children: React.ReactNode,
+    channel: Channel,
+    selected: boolean;
+}
+
+
+const headerClasses = findByPropsLazy("privateChannelsHeaderContainer");
+
+const PrivateChannelSortStore = findStoreLazy("PrivateChannelSortStore") as { getPrivateChannelIds: () => string[]; };
+
+export let instance: any;
+export const forceUpdate = () => instance?.props?._forceUpdate?.();
+
+export const settings = definePluginSettings({
+    sortDmsByNewestMessage: {
+        type: OptionType.BOOLEAN,
+        description: "Sort DMs by newest message",
+        default: false,
+        onChange: () => forceUpdate()
+    },
+
+    dmSectioncollapsed: {
+        type: OptionType.BOOLEAN,
+        description: "Collapse DM sections",
+        default: false,
+        onChange: () => forceUpdate()
+    }
+});
 
 export default definePlugin({
     name: "PinDMs",
     description: "Allows you to pin private channels to the top of your DM list. To pin/unpin or reorder pins, right click DMs",
-    authors: [Devs.Ven],
-
+    authors: [Devs.Ven, Devs.Aria],
     settings,
     contextMenus,
 
-    usePinCount(channelIds: string[]) {
-        const pinnedDms = usePinnedDms();
-        // See comment on 2nd patch for reasoning
-        return channelIds.length ? [pinnedDms.size] : [];
-    },
-
-    getChannel(channels: Record<string, Channel>, idx: number) {
-        return channels[getPinAt(idx)];
-    },
-
-    isPinned,
-    getSnapshot: sortedSnapshot,
-
-    getScrollOffset(channelId: string, rowHeight: number, padding: number, preRenderedChildren: number, originalOffset: number) {
-        if (!isPinned(channelId))
-            return (
-                (rowHeight + padding) * 2 // header
-                + rowHeight * snapshotArray.length // pins
-                + originalOffset // original pin offset minus pins
-            );
-
-        return rowHeight * (snapshotArray.indexOf(channelId) + preRenderedChildren) + padding;
-    },
-
     patches: [
-        // Patch DM list
         {
             find: ".privateChannelsHeaderContainer,",
             replacement: [
+                // Init
                 {
-                    // filter Discord's privateChannelIds list to remove pins, and pass
-                    // pinCount as prop. This needs to be here so that the entire DM list receives
-                    // updates on pin/unpin
-                    match: /(?<=\i,{channels:\i,)privateChannelIds:(\i),/,
-                    replace: "privateChannelIds:$1.filter(c=>!$self.isPinned(c)),pinCount:$self.usePinCount($1),"
+                    match: /(?<=componentDidMount\(\){).{1,100}scrollToChannel/,
+                    replace: "$self._instance = this;$&"
                 },
                 {
-                    // sections is an array of numbers, where each element is a section and
-                    // the number is the amount of rows. Add our pinCount in second place
-                    // - Section 1: buttons for pages like Friends & Library
-                    // - Section 2: our pinned dms
-                    // - Section 3: the normal dm list
-                    match: /(?<=renderRow:this\.renderRow,)sections:\[\i,/,
-                    // For some reason, adding our sections when no private channels are ready yet
-                    // makes DMs infinitely load. Thus usePinCount returns either a single element
-                    // array with the count, or an empty array. Due to spreading, only in the former
-                    // case will an element be added to the outer array
-                    // Thanks for the fix, Strencher!
-                    replace: "$&...this.props.pinCount??[],"
+                    // Filter out pinned channels from the private channel list
+                    match: /(?<=\i,{channels:\i,)privateChannelIds:(\i)/,
+                    replace: "privateChannelIds:$1.filter(c=>!$self.isPinned(c))"
                 },
                 {
-                    // Patch renderSection (renders the header) to set the text to "Pinned DMs" instead of "Direct Messages"
-                    // lookbehind is used to lookup parameter name. We could use arguments[0], but
-                    // if children ever is wrapped in an iife, it will break
-                    match: /children:(\i\.\i\.Messages.DIRECT_MESSAGES)(?<=renderSection=(\i)=>{.+?)/,
-                    replace: "children:$2.section===1?'Pinned DMs':$1"
+                    // Insert the pinned channels to sections
+                    match: /(?<=renderRow:this\.renderRow,)sections:\[.+?1\)]/,
+                    replace: "...$self.makeProps(this,{$&})"
+                },
+
+                // Rendering
+                {
+                    match: /this\.renderDM=\(.+?(\i\.default),{channel.+?this.renderRow=(\i)=>{/,
+                    replace: "$&if($self.isChannelIndex($2.section, $2.row))return $self.renderChannel($2.section,$2.row,$1);"
                 },
                 {
-                    // Patch channel lookup inside renderDM
-                    // channel=channels[channelIds[row]];
-                    match: /(?<=renderDM=\((\i),(\i)\)=>{.*?this.state,\i=\i\[\i\],\i=)((\i)\[\i\]);/,
-                    // section 1 is us, manually get our own channel
-                    // section === 1 ? getChannel(channels, row) : channels[channelIds[row]];
-                    replace: "$1===1?$self.getChannel($4,$2):$3;"
+                    match: /this\.renderSection=(\i)=>{/,
+                    replace: "$&if($self.isCategoryIndex($1.section))return $self.renderCategory($1);"
                 },
                 {
-                    // Fix getRowHeight's check for whether this is the DMs section
-                    // DMS (inlined) === section
-                    match: /(?<=getRowHeight=\(.{2,50}?)1===\i/,
-                    // DMS (inlined) === section - 1
-                    replace: "$&-1"
+                    match: /(?<=span",{)className:\i\.headerText,/,
+                    replace: "...$self.makeSpanProps(),$&"
                 },
+
+                // Fix Row Height
+                {
+                    match: /(?<=this\.getRowHeight=.{1,100}return 1===)\i/,
+                    replace: "($&-$self.categoryLen())"
+                },
+                {
+                    match: /this.getRowHeight=\((\i),(\i)\)=>{/,
+                    replace: "$&if($self.isChannelHidden($1,$2))return 0;"
+                },
+
+                // Fix ScrollTo
                 {
                     // Override scrollToChannel to properly account for pinned channels
                     match: /(?<=scrollTo\(\{to:\i\}\):\(\i\+=)(\d+)\*\(.+?(?=,)/,
                     replace: "$self.getScrollOffset(arguments[0],$1,this.props.padding,this.state.preRenderedChildren,$&)"
-                }
+                },
+                {
+                    match: /(?<=scrollToChannel\(\i\){.{1,300})this\.props\.privateChannelIds/,
+                    replace: "[...$&,...$self.getAllUncollapsedChannels()]"
+                },
+
             ]
         },
 
+
+        // forceUpdate moment
+        // https://regex101.com/r/kDN9fO/1
+        {
+            find: ".FRIENDS},\"friends\"",
+            replacement: {
+                match: /(?<=\i=\i=>{).{1,100}premiumTabSelected.{1,800}showDMHeader:.+?,/,
+                replace: "let forceUpdate = Vencord.Util.useForceUpdater();$&_forceUpdate:forceUpdate,"
+            }
+        },
+
         // Fix Alt Up/Down navigation
         {
             find: ".Routes.APPLICATION_STORE&&",
@@ -118,16 +133,227 @@ export default definePlugin({
                 // channelIds = __OVERLAY__ ? stuff : [...getStaticPaths(),...channelIds)]
                 match: /(?<=\i=__OVERLAY__\?\i:\[\.\.\.\i\(\),\.\.\.)\i/,
                 // ....concat(pins).concat(toArray(channelIds).filter(c => !isPinned(c)))
-                replace: "$self.getSnapshot().concat($&.filter(c=>!$self.isPinned(c)))"
+                replace: "$self.getAllUncollapsedChannels().concat($&.filter(c=>!$self.isPinned(c)))"
             }
         },
+
         // fix alt+shift+up/down
         {
             find: ".getFlattenedGuildIds()],",
             replacement: {
                 match: /(?<=\i===\i\.ME\?)\i\.\i\.getPrivateChannelIds\(\)/,
-                replace: "$self.getSnapshot().concat($&.filter(c=>!$self.isPinned(c)))"
+                replace: "$self.getAllUncollapsedChannels().concat($&.filter(c=>!$self.isPinned(c)))"
             }
         },
-    ]
+    ],
+    sections: null as number[] | null,
+
+    set _instance(i: any) {
+        this.instance = i;
+        instance = i;
+    },
+
+    startAt: StartAt.WebpackReady,
+    start: init,
+    flux: {
+        CONNECTION_OPEN: init,
+    },
+
+    isPinned,
+    categoryLen,
+    getSections,
+    getAllUncollapsedChannels,
+    requireSettingsMenu,
+    makeProps(instance, { sections }: { sections: number[]; }) {
+        this.sections = sections;
+
+        this.sections.splice(1, 0, ...this.getPinCount(instance.props.privateChannelIds || []));
+
+        if (this.instance?.props?.privateChannelIds?.length === 0) {
+            this.sections[this.sections.length - 1] = 0;
+        }
+
+        return {
+            sections: this.sections,
+            chunkSize: this.getChunkSize(),
+        };
+    },
+
+    makeSpanProps() {
+        return {
+            onClick: () => this.collapseDMList(),
+            role: "button",
+            style: { cursor: "pointer" }
+        };
+    },
+
+    getChunkSize() {
+        // the chunk size is the amount of rows (measured in pixels) that are rendered at once (probably)
+        // the higher the chunk size, the more rows are rendered at once
+        // also if the chunk size is 0 it will render everything at once
+
+        const sections = this.getSections();
+        const sectionHeaderSizePx = sections.length * 40;
+        // (header heights + DM heights + DEFAULT_CHUNK_SIZE) * 1.5
+        // we multiply everything by 1.5 so it only gets unmounted after the entire list is off screen
+        return (sectionHeaderSizePx + sections.reduce((acc, v) => acc += v + 44, 0) + DEFAULT_CHUNK_SIZE) * 1.5;
+    },
+
+    getPinCount(channelIds: string[]) {
+        return channelIds.length ? this.getSections() : [];
+    },
+
+    isCategoryIndex(sectionIndex: number) {
+        return this.sections && sectionIndex > 0 && sectionIndex < this.sections.length - 1;
+    },
+
+    isChannelIndex(sectionIndex: number, channelIndex: number) {
+        if (settings.store.dmSectioncollapsed && sectionIndex !== 0)
+            return true;
+        const cat = categories[sectionIndex - 1];
+        return this.isCategoryIndex(sectionIndex) && (cat.channels.length === 0 || cat?.channels[channelIndex]);
+    },
+
+    isDMSectioncollapsed() {
+        return settings.store.dmSectioncollapsed;
+    },
+
+    collapseDMList() {
+        // console.log("HI");
+        settings.store.dmSectioncollapsed = !settings.store.dmSectioncollapsed;
+        forceUpdate();
+    },
+
+    isChannelHidden(categoryIndex: number, channelIndex: number) {
+        if (categoryIndex === 0) return false;
+
+        if (settings.store.dmSectioncollapsed && this.getSections().length + 1 === categoryIndex)
+            return true;
+
+        if (!this.instance || !this.isChannelIndex(categoryIndex, channelIndex)) return false;
+
+        const category = categories[categoryIndex - 1];
+        if (!category) return false;
+
+        return category.collapsed && this.instance.props.selectedChannelId !== category.channels[channelIndex];
+    },
+
+    getScrollOffset(channelId: string, rowHeight: number, padding: number, preRenderedChildren: number, originalOffset: number) {
+        if (!isPinned(channelId))
+            return (
+                (rowHeight + padding) * 2 // header
+                + rowHeight * this.getAllUncollapsedChannels().length // pins
+                + originalOffset // original pin offset minus pins
+            );
+
+        return rowHeight * (this.getAllUncollapsedChannels().indexOf(channelId) + preRenderedChildren) + padding;
+    },
+
+    renderCategory: ErrorBoundary.wrap(({ section }: { section: number; }) => {
+        const category = categories[section - 1];
+
+        if (!category) return null;
+
+        return (
+            <h2
+                className={classes(headerClasses.privateChannelsHeaderContainer, "vc-pindms-section-container", category.collapsed ? "vc-pindms-collapsed" : "")}
+                style={{ color: `#${category.color.toString(16).padStart(6, "0")}` }}
+                onClick={async () => {
+                    await collapseCategory(category.id, !category.collapsed);
+                    forceUpdate();
+                }}
+                onContextMenu={e => {
+                    ContextMenuApi.openContextMenu(e, () => (
+                        <Menu.Menu
+                            navId="vc-pindms-header-menu"
+                            onClose={() => FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" })}
+                            color="danger"
+                            aria-label="Pin DMs Category Menu"
+                        >
+                            <Menu.MenuItem
+                                id="vc-pindms-edit-category"
+                                label="Edit Category"
+                                action={() => openCategoryModal(category.id, null)}
+                            />
+
+                            {
+                                canMoveCategory(category.id) && (
+                                    <>
+                                        {
+                                            canMoveCategoryInDirection(category.id, -1) && <Menu.MenuItem
+                                                id="vc-pindms-move-category-up"
+                                                label="Move Up"
+                                                action={() => moveCategory(category.id, -1).then(() => forceUpdate())}
+                                            />
+                                        }
+                                        {
+                                            canMoveCategoryInDirection(category.id, 1) && <Menu.MenuItem
+                                                id="vc-pindms-move-category-down"
+                                                label="Move Down"
+                                                action={() => moveCategory(category.id, 1).then(() => forceUpdate())}
+                                            />
+                                        }
+                                    </>
+
+                                )
+                            }
+
+                            <Menu.MenuSeparator />
+                            <Menu.MenuItem
+                                id="vc-pindms-delete-category"
+                                color="danger"
+                                label="Delete Category"
+                                action={() => removeCategory(category.id).then(() => forceUpdate())}
+                            />
+
+
+                        </Menu.Menu>
+                    ));
+                }}
+            >
+                <span className={headerClasses.headerText}>
+                    {category?.name ?? "uh oh"}
+                </span>
+                <svg className="vc-pindms-collapse-icon" aria-hidden="true" role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+                    <path fill="currentColor" d="M9.3 5.3a1 1 0 0 0 0 1.4l5.29 5.3-5.3 5.3a1 1 0 1 0 1.42 1.4l6-6a1 1 0 0 0 0-1.4l-6-6a1 1 0 0 0-1.42 0Z"></path>
+                </svg>
+            </h2>
+        );
+    }),
+
+    renderChannel(sectionIndex: number, index: number, ChannelComponent: React.ComponentType<ChannelComponentProps>) {
+        const { channel, category } = this.getChannel(sectionIndex, index, this.instance.props.channels);
+
+        if (!channel || !category) return null;
+        if (this.isChannelHidden(sectionIndex, index)) return null;
+
+        return (
+            <ChannelComponent
+                channel={channel}
+                selected={this.instance.props.selectedChannelId === channel.id}
+            >
+                {channel.id}
+            </ChannelComponent>
+        );
+    },
+
+
+    getChannel(sectionIndex: number, index: number, channels: Record<string, Channel>) {
+        const category = categories[sectionIndex - 1];
+        if (!category) return { channel: null, category: null };
+
+        const channelId = this.getCategoryChannels(category)[index];
+
+        return { channel: channels[channelId], category };
+    },
+
+    getCategoryChannels(category: Category) {
+        if (category.channels.length === 0) return [];
+
+        if (settings.store.sortDmsByNewestMessage) {
+            return PrivateChannelSortStore.getPrivateChannelIds().filter(c => category.channels.includes(c));
+        }
+
+        return category?.channels ?? [];
+    }
 });
diff --git a/src/plugins/pinDms/settings.ts b/src/plugins/pinDms/settings.ts
deleted file mode 100644
index 1e0244ed7..000000000
--- a/src/plugins/pinDms/settings.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { definePluginSettings, Settings, useSettings } from "@api/Settings";
-import { OptionType } from "@utils/types";
-import { findStoreLazy } from "@webpack";
-
-export const enum PinOrder {
-    LastMessage,
-    Custom
-}
-
-export const settings = definePluginSettings({
-    pinOrder: {
-        type: OptionType.SELECT,
-        description: "Which order should pinned DMs be displayed in?",
-        options: [
-            { label: "Most recent message", value: PinOrder.LastMessage, default: true },
-            { label: "Custom (right click channels to reorder)", value: PinOrder.Custom }
-        ]
-    }
-});
-
-const PrivateChannelSortStore = findStoreLazy("PrivateChannelSortStore");
-
-export let snapshotArray: string[];
-let snapshot: Set<string> | undefined;
-
-const getArray = () => (Settings.plugins.PinDMs.pinnedDMs || void 0)?.split(",") as string[] | undefined;
-const save = (pins: string[]) => {
-    snapshot = void 0;
-    Settings.plugins.PinDMs.pinnedDMs = pins.join(",");
-};
-const takeSnapshot = () => {
-    snapshotArray = getArray() ?? [];
-    return snapshot = new Set<string>(snapshotArray);
-};
-const requireSnapshot = () => snapshot ?? takeSnapshot();
-
-export function usePinnedDms() {
-    useSettings(["plugins.PinDMs.pinnedDMs"]);
-
-    return requireSnapshot();
-}
-
-export function isPinned(id: string) {
-    return requireSnapshot().has(id);
-}
-
-export function togglePin(id: string) {
-    const snapshot = requireSnapshot();
-    if (!snapshot.delete(id)) {
-        snapshot.add(id);
-    }
-
-    save([...snapshot]);
-}
-
-export function sortedSnapshot() {
-    requireSnapshot();
-    if (settings.store.pinOrder === PinOrder.LastMessage)
-        return PrivateChannelSortStore.getPrivateChannelIds().filter(isPinned);
-
-    return snapshotArray;
-}
-
-export function getPinAt(idx: number) {
-    return sortedSnapshot()[idx];
-}
-
-export function movePin(id: string, direction: -1 | 1) {
-    const pins = getArray()!;
-    const a = pins.indexOf(id);
-    const b = a + direction;
-
-    [pins[a], pins[b]] = [pins[b], pins[a]];
-
-    save(pins);
-}
diff --git a/src/plugins/pinDms/styles.css b/src/plugins/pinDms/styles.css
new file mode 100644
index 000000000..173f0f76b
--- /dev/null
+++ b/src/plugins/pinDms/styles.css
@@ -0,0 +1,37 @@
+.vc-pindms-section-container {
+    box-sizing: border-box;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    text-transform: uppercase;
+    font-size: 12px;
+    line-height: 16px;
+    letter-spacing: .02em;
+    font-family: var(--font-display);
+    font-weight: 600;
+    flex: 1 1 auto;
+    color: var(--channels-default);
+    cursor: pointer;
+}
+
+.vc-pindms-modal-content {
+    display: grid;
+    justify-content: center;
+    padding: 1rem;
+    gap: 1.5rem;
+}
+
+.vc-pindms-modal-content [class^="defaultContainer"] {
+    display: none;
+}
+
+.vc-pindms-collapse-icon {
+    width: 16px;
+    height: 16px;
+    color: var(--interactive-normal);
+    transform: rotate(90deg)
+}
+
+.vc-pindms-collapsed .vc-pindms-collapse-icon {
+    transform: rotate(0deg);
+}

From 5646fe402ac0da45e9a6a9f25d2594cb721527cf Mon Sep 17 00:00:00 2001
From: MrDiamondDog <84212701+MrDiamondDog@users.noreply.github.com>
Date: Thu, 21 Mar 2024 17:59:25 -0600
Subject: [PATCH 12/42] feat(PatchHelper): Paste Full Patch (#1982)

---
 src/components/CheckedTextInput.tsx           |  6 +-
 .../VencordSettings/PatchHelperTab.tsx        | 65 ++++++++++++++++++-
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/src/components/CheckedTextInput.tsx b/src/components/CheckedTextInput.tsx
index cf4aa119b..de2d7ae04 100644
--- a/src/components/CheckedTextInput.tsx
+++ b/src/components/CheckedTextInput.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { React, TextInput } from "@webpack/common";
+import { React, TextInput, useEffect } from "@webpack/common";
 
 // TODO: Refactor settings to use this as well
 interface TextInputProps {
@@ -55,6 +55,10 @@ export function CheckedTextInput({ value: initialValue, onChange, validate }: Te
         }
     }
 
+    useEffect(() => {
+        handleChange(initialValue);
+    }, [initialValue]);
+
     return (
         <>
             <TextInput
diff --git a/src/components/VencordSettings/PatchHelperTab.tsx b/src/components/VencordSettings/PatchHelperTab.tsx
index 7e68ec1e7..064c872ab 100644
--- a/src/components/VencordSettings/PatchHelperTab.tsx
+++ b/src/components/VencordSettings/PatchHelperTab.tsx
@@ -22,9 +22,9 @@ import { debounce } from "@shared/debounce";
 import { Margins } from "@utils/margins";
 import { canonicalizeMatch, canonicalizeReplace } from "@utils/patches";
 import { makeCodeblock } from "@utils/text";
-import { ReplaceFn } from "@utils/types";
+import { Patch, ReplaceFn } from "@utils/types";
 import { search } from "@webpack";
-import { Button, Clipboard, Forms, Parser, React, Switch, TextInput } from "@webpack/common";
+import { Button, Clipboard, Forms, Parser, React, Switch, TextArea, TextInput } from "@webpack/common";
 
 import { SettingsTab, wrapTab } from "./shared";
 
@@ -218,6 +218,60 @@ function ReplacementInput({ replacement, setReplacement, replacementError }) {
     );
 }
 
+interface FullPatchInputProps {
+    setFind(v: string): void;
+    setMatch(v: string): void;
+    setReplacement(v: string | ReplaceFn): void;
+}
+
+function FullPatchInput({ setFind, setMatch, setReplacement }: FullPatchInputProps) {
+    const [fullPatch, setFullPatch] = React.useState<string>("");
+    const [fullPatchError, setFullPatchError] = React.useState<string>("");
+
+    function update() {
+        if (fullPatch === "") {
+            setFullPatchError("");
+
+            setFind("");
+            setMatch("");
+            setReplacement("");
+            return;
+        }
+
+        try {
+            const parsed = (0, eval)(`(${fullPatch})`) as Patch;
+
+            if (!parsed.find) throw new Error("No 'find' field");
+            if (!parsed.replacement) throw new Error("No 'replacement' field");
+
+            if (parsed.replacement instanceof Array) {
+                if (parsed.replacement.length === 0) throw new Error("Invalid replacement");
+
+                parsed.replacement = {
+                    match: parsed.replacement[0].match,
+                    replace: parsed.replacement[0].replace
+                };
+            }
+
+            if (!parsed.replacement.match) throw new Error("No 'replacement.match' field");
+            if (!parsed.replacement.replace) throw new Error("No 'replacement.replace' field");
+
+            setFind(parsed.find);
+            setMatch(parsed.replacement.match instanceof RegExp ? parsed.replacement.match.source : parsed.replacement.match);
+            setReplacement(parsed.replacement.replace);
+            setFullPatchError("");
+        } catch (e) {
+            setFullPatchError((e as Error).message);
+        }
+    }
+
+    return <>
+        <Forms.FormText>Paste your full JSON patch here to fill out the fields</Forms.FormText>
+        <TextArea value={fullPatch} onChange={setFullPatch} onBlur={update} />
+        {fullPatchError !== "" && <Forms.FormText style={{ color: "var(--text-danger)" }}>{fullPatchError}</Forms.FormText>}
+    </>;
+}
+
 function PatchHelper() {
     const [find, setFind] = React.useState<string>("");
     const [match, setMatch] = React.useState<string>("");
@@ -260,6 +314,13 @@ function PatchHelper() {
 
     return (
         <SettingsTab title="Patch Helper">
+            <Forms.FormTitle>full patch</Forms.FormTitle>
+            <FullPatchInput
+                setFind={onFindChange}
+                setMatch={onMatchChange}
+                setReplacement={setReplacement}
+            />
+
             <Forms.FormTitle>find</Forms.FormTitle>
             <TextInput
                 type="text"

From 1cb295b1b97b4e19d49a709541905bdf8949c4a0 Mon Sep 17 00:00:00 2001
From: Inbestigator <119569726+Inbestigator@users.noreply.github.com>
Date: Thu, 21 Mar 2024 18:16:24 -0700
Subject: [PATCH 13/42] new plugin: OverrideForumDefaults (#2272)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/overrideForumDefaults/index.tsx | 54 +++++++++++++++++++++
 src/utils/constants.ts                      |  4 ++
 2 files changed, 58 insertions(+)
 create mode 100644 src/plugins/overrideForumDefaults/index.tsx

diff --git a/src/plugins/overrideForumDefaults/index.tsx b/src/plugins/overrideForumDefaults/index.tsx
new file mode 100644
index 000000000..be106ac8a
--- /dev/null
+++ b/src/plugins/overrideForumDefaults/index.tsx
@@ -0,0 +1,54 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+
+const settings = definePluginSettings({
+    defaultLayout: {
+        type: OptionType.SELECT,
+        options: [
+            { label: "List", value: 1, default: true },
+            { label: "Gallery", value: 2 }
+        ],
+        description: "Which layout to use as default"
+    },
+    defaultSortOrder: {
+        type: OptionType.SELECT,
+        options: [
+            { label: "Recently Active", value: 0, default: true },
+            { label: "Date Posted", value: 1 }
+        ],
+        description: "Which sort order to use as default"
+    }
+});
+
+export default definePlugin({
+    name: "OverrideForumDefaults",
+    description: "Allows you to override default forum layout/sort order. you can still change it on a per-channel basis",
+    authors: [Devs.Inbestigator],
+    patches: [
+        {
+            find: "getDefaultLayout(){",
+            replacement: [
+                {
+                    match: /getDefaultLayout\(\){/,
+                    replace: "$&return $self.getLayout();"
+                },
+                {
+                    match: /getDefaultSortOrder\(\){/,
+                    replace: "$&return $self.getSortOrder();"
+                }
+            ]
+        }
+    ],
+
+    getLayout: () => settings.store.defaultLayout,
+    getSortOrder: () => settings.store.defaultSortOrder,
+
+    settings
+});
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 5b540895a..f3626aaa0 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -418,6 +418,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Elvyra",
         id: 708275751816003615n,
     },
+    Inbestigator: {
+        name: "Inbestigator",
+        id: 761777382041714690n
+    },
     newwares: {
         name: "newwares",
         id: 421405303951851520n

From ec66c35d4101bbd9acb1981f80f99e6418bac6d6 Mon Sep 17 00:00:00 2001
From: mcpower <mcpower@users.noreply.github.com>
Date: Fri, 22 Mar 2024 12:27:09 +1100
Subject: [PATCH 14/42] MessageLinkEmbeds: Load embeds from newest to oldest
 (#2230)

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

diff --git a/src/plugins/messageLinkEmbeds/index.tsx b/src/plugins/messageLinkEmbeds/index.tsx
index 50c09ec9f..6ee60be71 100644
--- a/src/plugins/messageLinkEmbeds/index.tsx
+++ b/src/plugins/messageLinkEmbeds/index.tsx
@@ -255,7 +255,7 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
                 delete msg.embeds;
                 delete msg.interaction;
 
-                messageFetchQueue.push(() => fetchMessage(channelID, messageID)
+                messageFetchQueue.unshift(() => fetchMessage(channelID, messageID)
                     .then(m => m && FluxDispatcher.dispatch({
                         type: "MESSAGE_UPDATE",
                         message: msg

From caa14ece0d238ad8ec2455510a7cd719428f674a Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 22 Mar 2024 03:14:57 +0100
Subject: [PATCH 15/42] bump to v1.7.3

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

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

From ca18b6e0446b6f1858a82de47489bb01f925ce25 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Fri, 22 Mar 2024 04:08:08 +0100
Subject: [PATCH 16/42] Fix CloudSync

---
 src/components/CheckedTextInput.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/CheckedTextInput.tsx b/src/components/CheckedTextInput.tsx
index de2d7ae04..cf4aa119b 100644
--- a/src/components/CheckedTextInput.tsx
+++ b/src/components/CheckedTextInput.tsx
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { React, TextInput, useEffect } from "@webpack/common";
+import { React, TextInput } from "@webpack/common";
 
 // TODO: Refactor settings to use this as well
 interface TextInputProps {
@@ -55,10 +55,6 @@ export function CheckedTextInput({ value: initialValue, onChange, validate }: Te
         }
     }
 
-    useEffect(() => {
-        handleChange(initialValue);
-    }, [initialValue]);
-
     return (
         <>
             <TextInput

From 8d35cc6112a4e50250e397d40c315c9d841e8666 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 22 Mar 2024 09:42:19 -0300
Subject: [PATCH 17/42] BetterNotes: Fix patches

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

diff --git a/src/plugins/betterNotes/index.tsx b/src/plugins/betterNotes/index.tsx
index da41b9732..2183d98e2 100644
--- a/src/plugins/betterNotes/index.tsx
+++ b/src/plugins/betterNotes/index.tsx
@@ -18,6 +18,7 @@
 
 import { Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
+import { canonicalizeMatch } from "@utils/patches";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 
@@ -39,8 +40,12 @@ export default definePlugin({
                 match: /hideNote:.+?(?=([,}].*?\)))/g,
                 replace: (m, rest) => {
                     const destructuringMatch = rest.match(/}=.+/);
-                    if (destructuringMatch == null) return "hideNote:!0";
-                    return m;
+                    if (destructuringMatch) {
+                        const defaultValueMatch = m.match(canonicalizeMatch(/hideNote:(\i)=!?\d/));
+                        return defaultValueMatch ? `hideNote:${defaultValueMatch[1]}=!0` : m;
+                    }
+
+                    return "hideNote:!0";
                 }
             }
         },
@@ -52,10 +57,10 @@ export default definePlugin({
             }
         },
         {
-            find: ".Messages.NOTE}",
+            find: ".popularApplicationCommandIds,",
             replacement: {
-                match: /(?<=return \i\?)null(?=:\(0,\i\.jsxs)/,
-                replace: "$self.patchPadding(arguments[0])"
+                match: /lastSection:(!?\i)}\),/,
+                replace: "$&$self.patchPadding($1),"
             }
         }
     ],
@@ -75,8 +80,8 @@ export default definePlugin({
         }
     },
 
-    patchPadding(e: any) {
-        if (!e.lastSection) return;
+    patchPadding(lastSection: any) {
+        if (!lastSection) return;
         return (
             <div className={UserPopoutSectionCssClasses.lastSection}></div>
         );

From e1f8b3cb307371471978973e3c8d4501efc8a6e6 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 22 Mar 2024 09:43:17 -0300
Subject: [PATCH 18/42] UserVoiceShow: Fix UserPopout patch stealing predicates
 from another component

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

diff --git a/src/plugins/userVoiceShow/index.tsx b/src/plugins/userVoiceShow/index.tsx
index 935ff1c5d..200cfe895 100644
--- a/src/plugins/userVoiceShow/index.tsx
+++ b/src/plugins/userVoiceShow/index.tsx
@@ -98,8 +98,8 @@ export default definePlugin({
         {
             find: ".popularApplicationCommandIds,",
             replacement: {
-                match: /\(0,\i\.jsx\)\(\i\.\i,{user:\i,setNote/,
-                replace: "$self.patchPopout(arguments[0]),$&",
+                match: /applicationId:\i\.id}\),(?=.{0,50}setNote:\i)/,
+                replace: "$&$self.patchPopout(arguments[0]),",
             }
         },
         // below username

From 0983a038f1aa81232f61c5034201dcba51e57724 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 27 Mar 2024 10:29:58 -0300
Subject: [PATCH 19/42] Fix broken patches

---
 src/plugins/_api/chatButtons.ts          | 6 +++---
 src/plugins/_api/memberListDecorators.ts | 2 +-
 src/plugins/webContextMenus.web/index.ts | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/_api/chatButtons.ts b/src/plugins/_api/chatButtons.ts
index ca85964c0..9e2c6bf06 100644
--- a/src/plugins/_api/chatButtons.ts
+++ b/src/plugins/_api/chatButtons.ts
@@ -13,10 +13,10 @@ export default definePlugin({
     authors: [Devs.Ven],
 
     patches: [{
-        find: 'location:"ChannelTextAreaButtons"',
+        find: '"gift")),(null',
         replacement: {
-            match: /if\(!\i\.isMobile\)\{(?=.+?&&(\i)\.push\(.{0,50}"gift")/,
-            replace: "$&Vencord.Api.ChatButtons._injectButtons($1,arguments[0]);"
+            match: /!\i\.isMobile&&(?=\(\i\.isDM.+?&&(\i)\.push\(.{0,50}"gift")/,
+            replace: "$&(Vencord.Api.ChatButtons._injectButtons($1,arguments[0]),!0)&&"
         }
     }]
 });
diff --git a/src/plugins/_api/memberListDecorators.ts b/src/plugins/_api/memberListDecorators.ts
index 1251c3578..5e3e5ed18 100644
--- a/src/plugins/_api/memberListDecorators.ts
+++ b/src/plugins/_api/memberListDecorators.ts
@@ -31,7 +31,7 @@ export default definePlugin({
                     match: /let\{[^}]*lostPermissionTooltipText:\i[^}]*\}=(\i),/,
                     replace: "$&vencordProps=$1,"
                 }, {
-                    match: /decorators:.{0,100}?children:\[/,
+                    match: /\.Messages\.GUILD_OWNER(?=.+?decorators:(\i)\(\)).+?\1=?\(\)=>.+?children:\[/,
                     replace: "$&...(typeof vencordProps=='undefined'?[]:Vencord.Api.MemberListDecorators.__getDecorators(vencordProps)),"
                 }
             ]
diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts
index faa240783..ac4689036 100644
--- a/src/plugins/webContextMenus.web/index.ts
+++ b/src/plugins/webContextMenus.web/index.ts
@@ -195,7 +195,7 @@ export default definePlugin({
 
         // Add back "Show My Camera" context menu
         {
-            find: '.default("MediaEngineWebRTC");',
+            find: '"MediaEngineWebRTC");',
             replacement: {
                 match: /supports\(\i\)\{switch\(\i\)\{case (\i).Features/,
                 replace: "$&.DISABLE_VIDEO:return true;case $1.Features"

From 31c21594e64d70cfa712e3301b58dbe361cc1ca7 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 27 Mar 2024 10:39:58 -0300
Subject: [PATCH 20/42] Reporter: Ignore another useless error

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

diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts
index 33b099ef8..41e384295 100644
--- a/scripts/generateReport.ts
+++ b/scripts/generateReport.ts
@@ -67,7 +67,8 @@ const IGNORED_DISCORD_ERRORS = [
     "Unable to process domain list delta: Client revision number is null",
     "Downloading the full bad domains file",
     /\[GatewaySocket\].{0,110}Cannot access '/,
-    "search for 'name' in undefined"
+    "search for 'name' in undefined",
+    "Attempting to set fast connect zstd when unsupported"
 ] as Array<string | RegExp>;
 
 function toCodeBlock(s: string) {

From 0d22ff0091601dc297fe919e63acc5f69baa964a Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 27 Mar 2024 21:27:56 +0100
Subject: [PATCH 21/42] webpack: fix infinite recursion when using
 ConsoleShortcuts plugin

---
 docs/1_INSTALLING.md            | 8 +++-----
 src/plugins/_api/chatButtons.ts | 6 +++---
 src/webpack/common/stores.ts    | 1 -
 src/webpack/webpack.ts          | 4 ++--
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/docs/1_INSTALLING.md b/docs/1_INSTALLING.md
index d57e64e58..edeed4eb5 100644
--- a/docs/1_INSTALLING.md
+++ b/docs/1_INSTALLING.md
@@ -1,6 +1,6 @@
-> [!WARNING]  
-> These instructions are only for advanced users. If you're not a Developer, you should use our [graphical installer](https://github.com/Vendicated/VencordInstaller#usage) instead.  
-> No support will be provided for installing in this fashion. If you cannot figure it out, you should just stick to a regular install.  
+> [!WARNING]
+> These instructions are only for advanced users. If you're not a Developer, you should use our [graphical installer](https://github.com/Vendicated/VencordInstaller#usage) instead.
+> No support will be provided for installing in this fashion. If you cannot figure it out, you should just stick to a regular install.
 
 # Installation Guide
 
@@ -95,5 +95,3 @@ Simply run:
 ```shell
 pnpm uninject
 ```
-
-If you need more help, ask in the support channel in our [Discord Server](https://discord.gg/D9uwnFnqmd).
diff --git a/src/plugins/_api/chatButtons.ts b/src/plugins/_api/chatButtons.ts
index 9e2c6bf06..1ec2fa25e 100644
--- a/src/plugins/_api/chatButtons.ts
+++ b/src/plugins/_api/chatButtons.ts
@@ -13,10 +13,10 @@ export default definePlugin({
     authors: [Devs.Ven],
 
     patches: [{
-        find: '"gift")),(null',
+        find: '"sticker")',
         replacement: {
-            match: /!\i\.isMobile&&(?=\(\i\.isDM.+?&&(\i)\.push\(.{0,50}"gift")/,
-            replace: "$&(Vencord.Api.ChatButtons._injectButtons($1,arguments[0]),!0)&&"
+            match: /!\i\.isMobile(?=.+?(\i)\.push\(.{0,50}"gift")/,
+            replace: "$& &&(Vencord.Api.ChatButtons._injectButtons($1,arguments[0]),true)"
         }
     }]
 });
diff --git a/src/webpack/common/stores.ts b/src/webpack/common/stores.ts
index f3a18d7bc..2f9786bc5 100644
--- a/src/webpack/common/stores.ts
+++ b/src/webpack/common/stores.ts
@@ -44,7 +44,6 @@ export let PermissionStore: GenericStore;
 export let GuildChannelStore: GenericStore;
 export let ReadStateStore: GenericStore;
 export let PresenceStore: GenericStore;
-export let PoggerModeSettingsStore: GenericStore;
 
 export let GuildStore: t.GuildStore;
 export let UserStore: Stores.UserStore & t.FluxStore;
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 992bf38f3..a543a2dcd 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -110,13 +110,13 @@ export const find = traceFunction("find", function find(filter: FilterFn, { isIn
 
     for (const key in cache) {
         const mod = cache[key];
-        if (!mod?.exports) continue;
+        if (!mod?.exports || mod.exports === window) continue;
 
         if (filter(mod.exports)) {
             return isWaitFor ? [mod.exports, key] : mod.exports;
         }
 
-        if (mod.exports.default && filter(mod.exports.default)) {
+        if (mod.exports.default && mod.exports.default !== window && filter(mod.exports.default)) {
             const found = mod.exports.default;
             return isWaitFor ? [found, key] : found;
         }

From 8ab56f5bcfe720b8e6d03f85b5f4ada1a18bfc37 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 27 Mar 2024 21:44:54 +0100
Subject: [PATCH 22/42] ReadAllNotificationButton: make button less ugly

---
 src/plugins/readAllNotificationsButton/index.tsx | 10 +++++++---
 src/plugins/readAllNotificationsButton/style.css | 11 +++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 src/plugins/readAllNotificationsButton/style.css

diff --git a/src/plugins/readAllNotificationsButton/index.tsx b/src/plugins/readAllNotificationsButton/index.tsx
index 0e08edb6d..ae66e11a4 100644
--- a/src/plugins/readAllNotificationsButton/index.tsx
+++ b/src/plugins/readAllNotificationsButton/index.tsx
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import "./style.css";
+
 import { addServerListElement, removeServerListElement, ServerListRenderPosition } from "@api/ServerList";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
@@ -49,9 +51,11 @@ const ReadAllButton = () => (
     <Button
         onClick={onClick}
         size={Button.Sizes.MIN}
-        color={Button.Colors.BRAND}
-        style={{ marginTop: "2px", marginBottom: "8px", marginLeft: "9px" }}
-    >Read all</Button>
+        color={Button.Colors.CUSTOM}
+        className="vc-ranb-button"
+    >
+        Read All
+    </Button>
 );
 
 export default definePlugin({
diff --git a/src/plugins/readAllNotificationsButton/style.css b/src/plugins/readAllNotificationsButton/style.css
new file mode 100644
index 000000000..3d10b2bd5
--- /dev/null
+++ b/src/plugins/readAllNotificationsButton/style.css
@@ -0,0 +1,11 @@
+.vc-ranb-button {
+    color: var(--interactive-normal);
+    padding: 0 0.5em;
+    margin-bottom: 0.5em;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.vc-ranb-button:hover {
+    color: var(--interactive-active);
+}

From 74b6ceee7838d7190f43336c9c29acd392f1870f Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 28 Mar 2024 03:43:37 +0100
Subject: [PATCH 23/42] Fix WhoReacted

---
 src/plugins/whoReacted/index.tsx | 40 +++++++++++++++++---------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/plugins/whoReacted/index.tsx b/src/plugins/whoReacted/index.tsx
index b60366900..b3728c215 100644
--- a/src/plugins/whoReacted/index.tsx
+++ b/src/plugins/whoReacted/index.tsx
@@ -93,28 +93,30 @@ export default definePlugin({
     description: "Renders the avatars of users who reacted to a message",
     authors: [Devs.Ven, Devs.KannaDev, Devs.newwares],
 
-    patches: [{
-        find: ",reactionRef:",
-        replacement: {
-            match: /(\i)\?null:\(0,\i\.jsx\)\(\i\.\i,{className:\i\.reactionCount,.*?}\),/,
-            replace: "$&$1?null:$self.renderUsers(this.props),"
-        }
-    }, {
-        find: '.displayName="MessageReactionsStore";',
-        replacement: {
-            match: /(?<=CONNECTION_OPEN:function\(\){)(\i)={}/,
-            replace: "$&;$self.reactions=$1"
-        }
-    },
-    {
+    patches: [
+        {
+            find: ",reactionRef:",
+            replacement: {
+                match: /(\i)\?null:\(0,\i\.jsx\)\(\i\.\i,{className:\i\.reactionCount,.*?}\),/,
+                replace: "$&$1?null:$self.renderUsers(this.props),"
+            }
+        }, {
+            find: '"MessageReactionsStore"',
+            replacement: {
+                match: /(?<=CONNECTION_OPEN:function\(\){)(\i)={}/,
+                replace: "$&;$self.reactions=$1"
+            }
+        },
+        {
 
-        find: "cleanAutomaticAnchor(){",
-        replacement: {
-            match: /this\.automaticAnchor=null,this\.messageFetchAnchor=null,/,
-            replace: "$&$self.setScrollObj(this),"
+            find: "cleanAutomaticAnchor(){",
+            replacement: {
+                match: /constructor\(\i\)\{(?=.{0,100}automaticAnchor)/,
+                replace: "$&$self.setScrollObj(this);"
+            }
         }
-    }
     ],
+
     setScrollObj(scroll: any) {
         Scroll = scroll;
     },

From b1009baf7af4f4279f73273482d5bed6487f9d64 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 28 Mar 2024 03:47:00 +0100
Subject: [PATCH 24/42] Fix MessageLogger

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

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index 26409b89d..8a1e23912 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -225,7 +225,7 @@ export default definePlugin({
         {
             // MessageStore
             // Module 171447
-            find: "displayName=\"MessageStore\"",
+            find: '"MessageStore"',
             replacement: [
                 {
                     // Add deleted=true to all target messages in the MESSAGE_DELETE event
@@ -380,7 +380,7 @@ export default definePlugin({
         {
             // ReferencedMessageStore
             // Module 778667
-            find: "displayName=\"ReferencedMessageStore\"",
+            find: '"ReferencedMessageStore"',
             replacement: [
                 {
                     match: /MESSAGE_DELETE:function\((\i)\).+?},/,

From 6c711e2781c01f225e3c36c4b7457b6f27ade2ed Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 28 Mar 2024 03:58:11 +0100
Subject: [PATCH 25/42] Fix PinDMs

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

diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index ee726bfab..8951f0949 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -79,11 +79,11 @@ export default definePlugin({
 
                 // Rendering
                 {
-                    match: /this\.renderDM=\(.+?(\i\.default),{channel.+?this.renderRow=(\i)=>{/,
-                    replace: "$&if($self.isChannelIndex($2.section, $2.row))return $self.renderChannel($2.section,$2.row,$1);"
+                    match: /"renderRow",(\i)=>{(?<="renderDM",.+?(\i\.default),\{channel:.+?)/,
+                    replace: "$&if($self.isChannelIndex($1.section, $1.row))return $self.renderChannel($1.section,$1.row,$2);"
                 },
                 {
-                    match: /this\.renderSection=(\i)=>{/,
+                    match: /"renderSection",(\i)=>{/,
                     replace: "$&if($self.isCategoryIndex($1.section))return $self.renderCategory($1);"
                 },
                 {
@@ -93,11 +93,11 @@ export default definePlugin({
 
                 // Fix Row Height
                 {
-                    match: /(?<=this\.getRowHeight=.{1,100}return 1===)\i/,
+                    match: /(?<="getRowHeight",.{1,100}return 1===)\i/,
                     replace: "($&-$self.categoryLen())"
                 },
                 {
-                    match: /this.getRowHeight=\((\i),(\i)\)=>{/,
+                    match: /"getRowHeight",\((\i),(\i)\)=>{/,
                     replace: "$&if($self.isChannelHidden($1,$2))return 0;"
                 },
 

From c997ff7ada7e063f4483c3754a07fae3df7df5f4 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Wed, 27 Mar 2024 17:44:41 -0300
Subject: [PATCH 26/42] Fix lazy chunk force loading

---
 .../pinDms/components/CreateCategoryModal.tsx |  4 +--
 src/webpack/webpack.ts                        | 27 ++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/plugins/pinDms/components/CreateCategoryModal.tsx b/src/plugins/pinDms/components/CreateCategoryModal.tsx
index f38cc88c0..309ca69ff 100644
--- a/src/plugins/pinDms/components/CreateCategoryModal.tsx
+++ b/src/plugins/pinDms/components/CreateCategoryModal.tsx
@@ -31,9 +31,9 @@ interface ColorPickerWithSwatchesProps {
 }
 
 const ColorPicker = findComponentByCodeLazy<ColorPickerProps>(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)");
-const ColorPickerWithSwatches = findComponentByCodeLazy<ColorPickerWithSwatchesProps>(".presets,", "customColor:");
+const ColorPickerWithSwatches = findComponentByCodeLazy<ColorPickerWithSwatchesProps>("presets,", "customColor:");
 
-export const requireSettingsMenu = extractAndLoadChunksLazy(['name:"UserSettings"'], /createPromise:.{0,20}el\("(.+?)"\).{0,50}"UserSettings"/);
+export const requireSettingsMenu = extractAndLoadChunksLazy(['name:"UserSettings"'], /createPromise:.{0,20}Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\).{0,50}"UserSettings"/);
 
 const cl = classNameFactory("vc-pindms-modal-");
 
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index a543a2dcd..0790e8bf1 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -408,10 +408,11 @@ export function findExportedComponentLazy<T extends object = any>(...props: stri
 
 /**
  * Extract and load chunks using their entry point
- * @param code An array of all the code the module factory containing the entry point (as of using it to load chunks) must include
- * @param matcher A RegExp that returns the entry point id as the first capture group. Defaults to a matcher that captures the first entry point found in the module factory
+ * @param code An array of all the code the module factory containing the lazy chunk loading must include
+ * @param matcher A RegExp that returns the chunk ids array as the first capture group and the entry point id as the second. Defaults to a matcher that captures the lazy chunk loading found in the module factory
+ * @returns A promise that resolves when the chunks were loaded
  */
-export async function extractAndLoadChunks(code: string[], matcher: RegExp = /\.el\("(.+?)"\)(?<=(\i)\.el.+?)\.then\(\2\.bind\(\2,"\1"\)\)/) {
+export async function extractAndLoadChunks(code: string[], matcher: RegExp = /Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\)/) {
     const module = findModuleFactory(...code);
     if (!module) {
         const err = new Error("extractAndLoadChunks: Couldn't find module factory");
@@ -432,9 +433,9 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = /\.
         return;
     }
 
-    const [, id] = match;
-    if (!id || !Number(id)) {
-        const err = new Error("extractAndLoadChunks: Matcher didn't return a capturing group with the entry point, or the entry point returned wasn't a number");
+    const [, rawChunkIds, entryPointId] = match;
+    if (!rawChunkIds || Number.isNaN(entryPointId)) {
+        const err = new Error("extractAndLoadChunks: Matcher didn't return a capturing group with the chunk ids array, or the entry point id returned as the second group wasn't a number");
         logger.warn(err, "Code:", code, "Matcher:", matcher);
 
         // Strict behaviour in DevBuilds to fail early and make sure the issue is found
@@ -444,19 +445,21 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = /\.
         return;
     }
 
-    await (wreq as any).el(id);
-    return wreq(id as any);
+    const chunkIds = Array.from(rawChunkIds.matchAll(/\("(.+?)"\)/g)).map((m: any) => m[1]);
+
+    await Promise.all(chunkIds.map(id => wreq.e(id)));
+    wreq(entryPointId);
 }
 
 /**
  * This is just a wrapper around {@link extractAndLoadChunks} to make our reporter test for your webpack finds.
  *
  * Extract and load chunks using their entry point
- * @param code An array of all the code the module factory containing the entry point (as of using it to load chunks) must include
- * @param matcher A RegExp that returns the entry point id as the first capture group. Defaults to a matcher that captures the first entry point found in the module factory
- * @returns A function that loads the chunks on first call
+ * @param code An array of all the code the module factory containing the lazy chunk loading must include
+ * @param matcher A RegExp that returns the chunk ids array as the first capture group and the entry point id as the second. Defaults to a matcher that captures the lazy chunk loading found in the module factory
+ * @returns A function that returns a promise that resolves when the chunks were loaded, on first call
  */
-export function extractAndLoadChunksLazy(code: string[], matcher: RegExp = /\.el\("(.+?)"\)(?<=(\i)\.el.+?)\.then\(\2\.bind\(\2,"\1"\)\)/) {
+export function extractAndLoadChunksLazy(code: string[], matcher: RegExp = /Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\)/) {
     if (IS_DEV) lazyWebpackSearchHistory.push(["extractAndLoadChunks", [code, matcher]]);
 
     return () => extractAndLoadChunks(code, matcher);

From e71fcc301067a0f9fb54aa25dbd8b7430237a86b Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 28 Mar 2024 04:21:52 +0100
Subject: [PATCH 27/42] Fix FakeNitro

---
 src/plugins/_api/messageEvents.ts | 2 +-
 src/plugins/_api/notices.ts       | 2 +-
 src/plugins/fakeNitro/index.tsx   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/_api/messageEvents.ts b/src/plugins/_api/messageEvents.ts
index 1b4a2d15a..48ae062c7 100644
--- a/src/plugins/_api/messageEvents.ts
+++ b/src/plugins/_api/messageEvents.ts
@@ -35,7 +35,7 @@ export default definePlugin({
             }
         },
         {
-            find: ".handleSendMessage=",
+            find: ".handleSendMessage",
             replacement: {
                 // props.chatInputType...then((function(isMessageValid)... var parsedMessage = b.c.parse(channel,... var replyOptions = f.g.getSendMessageOptionsForReply(pendingReply);
                 // Lookbehind: validateMessage)({openWarningPopout:..., type: i.props.chatInputType, content: t, stickers: r, ...}).then((function(isMessageValid)
diff --git a/src/plugins/_api/notices.ts b/src/plugins/_api/notices.ts
index 0648afa04..90ae6ded9 100644
--- a/src/plugins/_api/notices.ts
+++ b/src/plugins/_api/notices.ts
@@ -26,7 +26,7 @@ export default definePlugin({
     required: true,
     patches: [
         {
-            find: 'displayName="NoticeStore"',
+            find: '"NoticeStore"',
             replacement: [
                 {
                     match: /\i=null;(?=.{0,80}getPremiumSubscription\(\))/g,
diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 30744276e..8db449cdd 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -214,7 +214,7 @@ export default definePlugin({
                 {
                     // Make the emoji always available if the intention allows it
                     match: /if\(!\i\.available/,
-                    replace: m => `${m}&&(typeof fakeNitroIntention==="undefined"||![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention))`
+                    replace: m => `${m}&&(typeof fakeNitroIntention==="undefined"||![${1},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention))`
                 }
             ]
         },
@@ -277,7 +277,7 @@ export default definePlugin({
             }
         },
         {
-            find: '.displayName="UserSettingsProtoStore"',
+            find: '"UserSettingsProtoStore"',
             replacement: [
                 {
                     // Overwrite incoming connection settings proto with our local settings

From 82ab3ad1b9bdf531215221408e13444024b62a19 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 28 Mar 2024 05:18:00 +0100
Subject: [PATCH 28/42] i may be stupid :3

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

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index 8db449cdd..d6028aa76 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -214,7 +214,7 @@ export default definePlugin({
                 {
                     // Make the emoji always available if the intention allows it
                     match: /if\(!\i\.available/,
-                    replace: m => `${m}&&(typeof fakeNitroIntention==="undefined"||![${1},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention))`
+                    replace: m => `${m}&&(typeof fakeNitroIntention==="undefined"||![${EmojiIntentions.CHAT},${EmojiIntentions.GUILD_STICKER_RELATED_EMOJI}].includes(fakeNitroIntention))`
                 }
             ]
         },

From de9122b05b20c22d9d59bad08e6eb2e2e2ca017e Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Thu, 28 Mar 2024 12:43:05 +0700
Subject: [PATCH 29/42] fix ImageZoom, LoadingQuote, NoRPC, RevealAllSpoilers,
 SecretRingTone (#2306)

---
 src/plugins/imageZoom/index.tsx           | 4 ++--
 src/plugins/loadingQuotes/index.ts        | 4 ++--
 src/plugins/noRPC.discordDesktop/index.ts | 2 +-
 src/plugins/revealAllSpoilers/index.ts    | 4 ++--
 src/plugins/secretRingTone/index.ts       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/imageZoom/index.tsx b/src/plugins/imageZoom/index.tsx
index cbaa07d2a..3f0e3294a 100644
--- a/src/plugins/imageZoom/index.tsx
+++ b/src/plugins/imageZoom/index.tsx
@@ -23,7 +23,7 @@ import { makeRange } from "@components/PluginSettings/components";
 import { debounce } from "@shared/debounce";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { Menu, React, ReactDOM } from "@webpack/common";
+import { Menu, ReactDOM } from "@webpack/common";
 import type { Root } from "react-dom/client";
 
 import { Magnifier, MagnifierProps } from "./components/Magnifier";
@@ -168,7 +168,7 @@ export default definePlugin({
         },
 
         {
-            find: "handleImageLoad=",
+            find: ".handleImageLoad)",
             replacement: [
                 {
                     match: /placeholderVersion:\i,/,
diff --git a/src/plugins/loadingQuotes/index.ts b/src/plugins/loadingQuotes/index.ts
index eed5b3ec5..97178979c 100644
--- a/src/plugins/loadingQuotes/index.ts
+++ b/src/plugins/loadingQuotes/index.ts
@@ -81,11 +81,11 @@ export default definePlugin({
             find: ".LOADING_DID_YOU_KNOW}",
             replacement: [
                 {
-                    match: /\._loadingText=function\(\)\{/,
+                    match: /"_loadingText",function\(\)\{/,
                     replace: "$&return $self.quote;",
                 },
                 {
-                    match: /\._eventLoadingText=function\(\)\{/,
+                    match: /"_eventLoadingText",function\(\)\{/,
                     replace: "$&return $self.quote;",
                     predicate: () => settings.store.replaceEvents
                 }
diff --git a/src/plugins/noRPC.discordDesktop/index.ts b/src/plugins/noRPC.discordDesktop/index.ts
index ebbbd5e8f..4c6319e5e 100644
--- a/src/plugins/noRPC.discordDesktop/index.ts
+++ b/src/plugins/noRPC.discordDesktop/index.ts
@@ -27,7 +27,7 @@ export default definePlugin({
         {
             find: '.ensureModule("discord_rpc")',
             replacement: {
-                match: /\.ensureModule\("discord_rpc"\)\.then\(\(.+?\)\)}/,
+                match: /\.ensureModule\("discord_rpc"\)\.then\(\(.+?\)}\)}/,
                 replace: '.ensureModule("discord_rpc")}',
             },
         },
diff --git a/src/plugins/revealAllSpoilers/index.ts b/src/plugins/revealAllSpoilers/index.ts
index 746973b42..e728181aa 100644
--- a/src/plugins/revealAllSpoilers/index.ts
+++ b/src/plugins/revealAllSpoilers/index.ts
@@ -30,9 +30,9 @@ export default definePlugin({
 
     patches: [
         {
-            find: ".removeObscurity=",
+            find: ".removeObscurity,",
             replacement: {
-                match: /(?<=\.removeObscurity=(\i)=>{)/,
+                match: /(?<="removeObscurity",(\i)=>{)/,
                 replace: (_, event) => `$self.reveal(${event});`
             }
         }
diff --git a/src/plugins/secretRingTone/index.ts b/src/plugins/secretRingTone/index.ts
index 9d6d6a155..8f0176f88 100644
--- a/src/plugins/secretRingTone/index.ts
+++ b/src/plugins/secretRingTone/index.ts
@@ -16,7 +16,7 @@ export default definePlugin({
         {
             find: "call_ringing_beat\"",
             replacement: {
-                match: /500===\i\.random\(1,1e3\)/,
+                match: /500===\i\(\)\.random\(1,1e3\)/,
                 replace: "true"
             }
         },

From ec34412100e226f85d7414651bf99b0fffdba972 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 28 Mar 2024 09:48:47 -0300
Subject: [PATCH 30/42] Fix store finds

---
 src/plugins/alwaysTrust/index.ts                  | 2 +-
 src/plugins/ignoreActivities/index.tsx            | 2 +-
 src/plugins/noBlockedMessages/index.ts            | 4 ++--
 src/plugins/showHiddenChannels/index.tsx          | 6 +++---
 src/plugins/spotifyCrack/index.ts                 | 2 +-
 src/plugins/volumeBooster.discordDesktop/index.ts | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/plugins/alwaysTrust/index.ts b/src/plugins/alwaysTrust/index.ts
index 5113935f4..b195e8ebf 100644
--- a/src/plugins/alwaysTrust/index.ts
+++ b/src/plugins/alwaysTrust/index.ts
@@ -41,7 +41,7 @@ export default definePlugin({
     authors: [Devs.zt, Devs.Trwy],
     patches: [
         {
-            find: ".displayName=\"MaskedLinkStore\"",
+            find: '="MaskedLinkStore",',
             replacement: {
                 match: /(?<=isTrustedDomain\(\i\){)return \i\(\i\)/,
                 replace: "return true"
diff --git a/src/plugins/ignoreActivities/index.tsx b/src/plugins/ignoreActivities/index.tsx
index c04ce1c56..5c349a4e7 100644
--- a/src/plugins/ignoreActivities/index.tsx
+++ b/src/plugins/ignoreActivities/index.tsx
@@ -210,7 +210,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: '.displayName="LocalActivityStore"',
+            find: '="LocalActivityStore",',
             replacement: [
                 {
                     match: /HANG_STATUS.+?(?=!\i\(\i,\i\)&&)(?<=(\i)\.push.+?)/,
diff --git a/src/plugins/noBlockedMessages/index.ts b/src/plugins/noBlockedMessages/index.ts
index f9de3e13c..8435f1351 100644
--- a/src/plugins/noBlockedMessages/index.ts
+++ b/src/plugins/noBlockedMessages/index.ts
@@ -38,8 +38,8 @@ export default definePlugin({
             ]
         },
         ...[
-            'displayName="MessageStore"',
-            'displayName="ReadStateStore"'
+            '="MessageStore",',
+            '="ReadStateStore",'
         ].map(find => ({
             find,
             predicate: () => Settings.plugins.NoBlockedMessages.ignoreBlockedMessages === true,
diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 2d091c24a..9968ef16b 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -191,7 +191,7 @@ export default definePlugin({
         },
         {
             // Hide the new version of unreads box for hidden channels
-            find: '.displayName="ChannelListUnreadsStore"',
+            find: '="ChannelListUnreadsStore",',
             replacement: {
                 match: /(?<=if\(null==(\i))(?=.{0,160}?getHasImportantUnread\)\(\i\))/g, // Global because Discord has multiple methods like that in the same module
                 replace: (_, channel) => `||$self.isHiddenChannel(${channel})`
@@ -442,7 +442,7 @@ export default definePlugin({
             }
         },
         {
-            find: '.displayName="GuildChannelStore"',
+            find: '="GuildChannelStore",',
             replacement: [
                 {
                     // Make GuildChannelStore contain hidden channels
@@ -465,7 +465,7 @@ export default definePlugin({
             }
         },
         {
-            find: '.displayName="NowPlayingViewStore"',
+            find: '="NowPlayingViewStore",',
             replacement: {
                 // Make active now voice states on hidden channels
                 match: /(getVoiceStateForUser.{0,150}?)&&\i\.\i\.canWithPartialContext.{0,20}VIEW_CHANNEL.+?}\)(?=\?)/,
diff --git a/src/plugins/spotifyCrack/index.ts b/src/plugins/spotifyCrack/index.ts
index 5d890349c..1beccad60 100644
--- a/src/plugins/spotifyCrack/index.ts
+++ b/src/plugins/spotifyCrack/index.ts
@@ -51,7 +51,7 @@ export default definePlugin({
             },
         },
         {
-            find: '.displayName="SpotifyStore"',
+            find: '"displayName","SpotifyStore")',
             replacement: [
                 {
                     predicate: () => settings.store.noSpotifyAutoPause,
diff --git a/src/plugins/volumeBooster.discordDesktop/index.ts b/src/plugins/volumeBooster.discordDesktop/index.ts
index 4aca79fc7..b455c97ec 100644
--- a/src/plugins/volumeBooster.discordDesktop/index.ts
+++ b/src/plugins/volumeBooster.discordDesktop/index.ts
@@ -71,7 +71,7 @@ export default definePlugin({
         },
         // Prevent the MediaEngineStore from overwriting our LocalVolumes above 200 with the ones the Discord Audio Context Settings sync sends
         {
-            find: '.displayName="MediaEngineStore"',
+            find: '="MediaEngineStore",',
             replacement: [
                 {
                     match: /(\.settings\.audioContextSettings.+?)(\i\[\i\])=(\i\.volume)(.+?setLocalVolume\(\i,).+?\)/,

From 344f8c9f0384a60061d62843c9a144e9e00633eb Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Thu, 28 Mar 2024 11:31:08 +0000
Subject: [PATCH 31/42] Fix DisableCallIdle

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

diff --git a/src/plugins/disableCallIdle/index.ts b/src/plugins/disableCallIdle/index.ts
index 904d53b03..d26f72813 100644
--- a/src/plugins/disableCallIdle/index.ts
+++ b/src/plugins/disableCallIdle/index.ts
@@ -29,7 +29,7 @@ export default definePlugin({
         {
             find: ".Messages.BOT_CALL_IDLE_DISCONNECT",
             replacement: {
-                match: /,?(?=this\.idleTimeout=new \i\.Timeout)/,
+                match: /,?(?=\i\(this,"idleTimeout",new \i\.Timeout\))/,
                 replace: ";return;"
             }
         },

From 2f07dc230a8ae5d52e72d66aa7cd68e6e4f4157e Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Thu, 28 Mar 2024 19:40:48 +0700
Subject: [PATCH 32/42] fix BetterGifPicker, Experiments

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

diff --git a/src/plugins/betterGifPicker/index.ts b/src/plugins/betterGifPicker/index.ts
index 09bb570d7..f1608f28c 100644
--- a/src/plugins/betterGifPicker/index.ts
+++ b/src/plugins/betterGifPicker/index.ts
@@ -15,8 +15,8 @@ export default definePlugin({
         {
             find: ".GIFPickerResultTypes.SEARCH",
             replacement: [{
-                match: "this.state={resultType:null}",
-                replace: 'this.state={resultType:"Favorites"}'
+                match: /(?<="state",{resultType:)null/,
+                replace: '"Favorites"'
             }]
         }
     ]
diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx
index f8ea4b04a..344638828 100644
--- a/src/plugins/experiments/index.tsx
+++ b/src/plugins/experiments/index.tsx
@@ -64,7 +64,7 @@ export default definePlugin({
             }
         },
         {
-            find: ".isStaff=()",
+            find: '"isStaff",',
             predicate: () => settings.store.enableIsStaff,
             replacement: [
                 {

From 74c38146d5f186b242d6fc51c6287a472ba5576b Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 28 Mar 2024 10:17:05 -0300
Subject: [PATCH 33/42] Fix BetterSettings patches (#2307)

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

diff --git a/src/plugins/betterSettings/index.tsx b/src/plugins/betterSettings/index.tsx
index 6d3c8798e..7d81c6f5c 100644
--- a/src/plugins/betterSettings/index.tsx
+++ b/src/plugins/betterSettings/index.tsx
@@ -82,7 +82,7 @@ export default definePlugin({
             find: "this.renderArtisanalHack()",
             replacement: [
                 { // Fade in on layer
-                    match: /(?<=(\i)\.contextType=\i\.AccessibilityPreferencesContext;)/,
+                    match: /(?<=\((\i),"contextType",\i\.AccessibilityPreferencesContext\);)/,
                     replace: "$1=$self.Layer;",
                     predicate: () => settings.store.disableFade
                 },
@@ -107,11 +107,11 @@ export default definePlugin({
             ],
             predicate: () => settings.store.disableFade
         },
-        { // Load menu stuff on hover, not on click
+        { // Load menu TOC eagerly
             find: "Messages.USER_SETTINGS_WITH_BUILD_OVERRIDE.format",
             replacement: {
-                match: /(?<=handleOpenSettingsContextMenu.{0,250}?\i\.el\(("[^"]+")\)\.then\([^;]*?("\d+").*?Messages\.USER_SETTINGS,)(?=onClick:)/,
-                replace: "onMouseEnter(){Vencord.Webpack.wreq.el($1).then(()=>Vencord.Webpack.wreq($2));},"
+                match: /(?<=(\i)\(this,"handleOpenSettingsContextMenu",.{0,100}?openContextMenuLazy.{0,100}?(await Promise\.all[^};]*?\)\)).*?,)(?=\1\(this)/,
+                replace: "(async ()=>$2)(),"
             },
             predicate: () => settings.store.eagerLoad
         },

From 762684a138f19308a3e64d6578aae57f453cae5f Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 28 Mar 2024 10:30:29 -0300
Subject: [PATCH 34/42] Fix more patches

---
 src/plugins/betterGifAltText/index.ts  | 2 +-
 src/plugins/decor/index.tsx            | 4 ++--
 src/plugins/gifPaste/index.ts          | 6 +++---
 src/plugins/ignoreActivities/index.tsx | 2 +-
 src/plugins/noBlockedMessages/index.ts | 2 +-
 src/plugins/resurrectHome/index.tsx    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/plugins/betterGifAltText/index.ts b/src/plugins/betterGifAltText/index.ts
index 8b4116318..f0090343e 100644
--- a/src/plugins/betterGifAltText/index.ts
+++ b/src/plugins/betterGifAltText/index.ts
@@ -26,7 +26,7 @@ export default definePlugin({
         "Change GIF alt text from simply being 'GIF' to containing the gif tags / filename",
     patches: [
         {
-            find: "onCloseImage=",
+            find: '"onCloseImage",',
             replacement: {
                 match: /(return.{0,10}\.jsx.{0,50}isWindowFocused)/,
                 replace:
diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx
index 7b9b4e3bf..d4f420c7d 100644
--- a/src/plugins/decor/index.tsx
+++ b/src/plugins/decor/index.tsx
@@ -61,8 +61,8 @@ export default definePlugin({
                 },
                 // Remove NEW label from decor avatar decorations
                 {
-                    match: /(?<=\.Section\.PREMIUM_PURCHASE&&\i;if\()(?<=avatarDecoration:(\i).+?)/,
-                    replace: "$1.skuId===$self.SKU_ID||"
+                    match: /(?<=\.Section\.PREMIUM_PURCHASE&&\i)(?<=avatarDecoration:(\i).+?)/,
+                    replace: "||$1.skuId===$self.SKU_ID"
                 }
             ]
         },
diff --git a/src/plugins/gifPaste/index.ts b/src/plugins/gifPaste/index.ts
index 3e864b31a..5553bf847 100644
--- a/src/plugins/gifPaste/index.ts
+++ b/src/plugins/gifPaste/index.ts
@@ -29,10 +29,10 @@ export default definePlugin({
     authors: [Devs.Ven],
 
     patches: [{
-        find: ".handleSelectGIF=",
+        find: '"handleSelectGIF",',
         replacement: {
-            match: /\.handleSelectGIF=(\i)=>\{/,
-            replace: ".handleSelectGIF=$1=>{if (!this.props.className) return $self.handleSelect($1);"
+            match: /"handleSelectGIF",(\i)=>\{/,
+            replace: '"handleSelectGIF",$1=>{if (!this.props.className) return $self.handleSelect($1);'
         }
     }],
 
diff --git a/src/plugins/ignoreActivities/index.tsx b/src/plugins/ignoreActivities/index.tsx
index 5c349a4e7..e2262129d 100644
--- a/src/plugins/ignoreActivities/index.tsx
+++ b/src/plugins/ignoreActivities/index.tsx
@@ -213,7 +213,7 @@ export default definePlugin({
             find: '="LocalActivityStore",',
             replacement: [
                 {
-                    match: /HANG_STATUS.+?(?=!\i\(\i,\i\)&&)(?<=(\i)\.push.+?)/,
+                    match: /HANG_STATUS.+?(?=!\i\(\)\(\i,\i\)&&)(?<=(\i)\.push.+?)/,
                     replace: (m, activities) => `${m}${activities}=${activities}.filter($self.isActivityNotIgnored);`
                 }
             ]
diff --git a/src/plugins/noBlockedMessages/index.ts b/src/plugins/noBlockedMessages/index.ts
index 8435f1351..427f725ca 100644
--- a/src/plugins/noBlockedMessages/index.ts
+++ b/src/plugins/noBlockedMessages/index.ts
@@ -39,7 +39,7 @@ export default definePlugin({
         },
         ...[
             '="MessageStore",',
-            '="ReadStateStore",'
+            '"displayName","ReadStateStore")'
         ].map(find => ({
             find,
             predicate: () => Settings.plugins.NoBlockedMessages.ignoreBlockedMessages === true,
diff --git a/src/plugins/resurrectHome/index.tsx b/src/plugins/resurrectHome/index.tsx
index 6b0069a7f..f48debc76 100644
--- a/src/plugins/resurrectHome/index.tsx
+++ b/src/plugins/resurrectHome/index.tsx
@@ -59,7 +59,7 @@ export default definePlugin({
             find: "GuildHomeFeedbackExperiment.definition.id",
             replacement: [
                 {
-                    match: /return{showFeedback:\i,setOnDismissedFeedback:(\i)}/,
+                    match: /return{showFeedback:.+?,setOnDismissedFeedback:(\i)}/,
                     replace: "return{showFeedback:false,setOnDismissedFeedback:$1}"
                 }
             ]

From 126023f8f2dca014117d954642e2cd1408cabd6a Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 28 Mar 2024 10:44:37 -0300
Subject: [PATCH 35/42] ShowHiddenChannels: Fix patches

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

diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
index 9968ef16b..31dc93ad2 100644
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@@ -138,7 +138,7 @@ export default definePlugin({
             all: true,
             // Render null instead of the buttons if the channel is hidden
             replacement: {
-                match: /(?<=renderOpenChatButton=\(\)=>{)/,
+                match: /(?<="renderOpenChatButton",\(\)=>{)/,
                 replace: "if($self.isHiddenChannel(this.props.channel))return null;"
             }
         },
@@ -193,8 +193,8 @@ export default definePlugin({
             // Hide the new version of unreads box for hidden channels
             find: '="ChannelListUnreadsStore",',
             replacement: {
-                match: /(?<=if\(null==(\i))(?=.{0,160}?getHasImportantUnread\)\(\i\))/g, // Global because Discord has multiple methods like that in the same module
-                replace: (_, channel) => `||$self.isHiddenChannel(${channel})`
+                match: /(?=&&\(0,\i\.getHasImportantUnread\)\((\i)\))/g, // Global because Discord has multiple methods like that in the same module
+                replace: (_, channel) => `&&!$self.isHiddenChannel(${channel})`
             }
         },
         {
@@ -218,19 +218,19 @@ export default definePlugin({
             find: "Missing channel in Channel.renderHeaderToolbar",
             replacement: [
                 {
-                    match: /(?<=renderHeaderToolbar=\(\)=>{.+?case \i\.\i\.GUILD_TEXT:)(?=.+?(\i\.push.{0,50}channel:(\i)},"notifications"\)\)))(?<=isLurking:(\i).+?)/,
+                    match: /(?<="renderHeaderToolbar",\(\)=>{.+?case \i\.\i\.GUILD_TEXT:)(?=.+?(\i\.push.{0,50}channel:(\i)},"notifications"\)\)))(?<=isLurking:(\i).+?)/,
                     replace: (_, pushNotificationButtonExpression, channel, isLurking) => `if(!${isLurking}&&$self.isHiddenChannel(${channel})){${pushNotificationButtonExpression};break;}`
                 },
                 {
-                    match: /(?<=renderHeaderToolbar=\(\)=>{.+?case \i\.\i\.GUILD_MEDIA:)(?=.+?(\i\.push.{0,40}channel:(\i)},"notifications"\)\)))(?<=isLurking:(\i).+?)/,
+                    match: /(?<="renderHeaderToolbar",\(\)=>{.+?case \i\.\i\.GUILD_MEDIA:)(?=.+?(\i\.push.{0,40}channel:(\i)},"notifications"\)\)))(?<=isLurking:(\i).+?)/,
                     replace: (_, pushNotificationButtonExpression, channel, isLurking) => `if(!${isLurking}&&$self.isHiddenChannel(${channel})){${pushNotificationButtonExpression};break;}`
                 },
                 {
-                    match: /renderMobileToolbar=\(\)=>{.+?case \i\.\i\.GUILD_DIRECTORY:(?<=let{channel:(\i).+?)/,
+                    match: /"renderMobileToolbar",\(\)=>{.+?case \i\.\i\.GUILD_DIRECTORY:(?<=let{channel:(\i).+?)/,
                     replace: (m, channel) => `${m}if($self.isHiddenChannel(${channel}))break;`
                 },
                 {
-                    match: /(?<=renderHeaderBar=\(\)=>{.+?hideSearch:(\i)\.isDirectory\(\))/,
+                    match: /(?<="renderHeaderBar",\(\)=>{.+?hideSearch:(\i)\.isDirectory\(\))/,
                     replace: (_, channel) => `||$self.isHiddenChannel(${channel})`
                 },
                 {

From 7fe718a018fa7ec1ddb16b002ab3495ea6ba0c29 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 28 Mar 2024 11:30:04 -0300
Subject: [PATCH 36/42] FakeNitro: Make Soundboard sounds not require boost
 level

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

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index d6028aa76..eb9931956 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -388,6 +388,14 @@ export default definePlugin({
                 match: /\i\.\i\.isPremium\(\i\.\i\.getCurrentUser\(\)\)/,
                 replace: "true"
             }
+        },
+        // Make all Soundboard sounds available
+        {
+            find: 'type:"GUILD_SOUNDBOARD_SOUND_CREATE"',
+            replacement: {
+                match: /(?<=type:"(?:SOUNDBOARD_SOUNDS_RECEIVED|GUILD_SOUNDBOARD_SOUND_CREATE|GUILD_SOUNDBOARD_SOUND_UPDATE|GUILD_SOUNDBOARD_SOUNDS_UPDATE)".+?available:)\i\.available/g,
+                replace: "true"
+            }
         }
     ],
 

From bdef47eb8aee5cc53f09683e7847eca8bc1b722b Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 28 Mar 2024 11:44:38 -0300
Subject: [PATCH 37/42] Bump to 1.7.4

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

diff --git a/package.json b/package.json
index 025fa13d4..78370f097 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.7.3",
+    "version": "1.7.4",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

From 60f66781078d7a5c51265d841c5aa043dd2cb305 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 28 Mar 2024 12:57:28 -0300
Subject: [PATCH 38/42] Decor: Fix find targetting wrong module in some cases

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

diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx
index d4f420c7d..5b2b6d0f0 100644
--- a/src/plugins/decor/index.tsx
+++ b/src/plugins/decor/index.tsx
@@ -49,7 +49,7 @@ export default definePlugin({
         },
         // Decoration modal module
         {
-            find: ".decorationGridItem",
+            find: ".decorationGridItem,",
             replacement: [
                 {
                     match: /(?<==)\i=>{let{children.{20,100}decorationGridItem/,

From 650f4050e10b90dc92c5921f8c6e2550e78079e1 Mon Sep 17 00:00:00 2001
From: Syncx <47534062+Syncxv@users.noreply.github.com>
Date: Fri, 29 Mar 2024 07:40:47 +1100
Subject: [PATCH 39/42] fix(PinDMs): display properly when there are 0 unpinned
 dms (#2281)

Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Co-authored-by: V <vendicated@riseup.net>
---
 .../pinDms/components/CreateCategoryModal.tsx |  2 +-
 src/plugins/pinDms/components/contextMenu.tsx |  6 ++--
 src/plugins/pinDms/index.tsx                  | 35 ++++++++++---------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/plugins/pinDms/components/CreateCategoryModal.tsx b/src/plugins/pinDms/components/CreateCategoryModal.tsx
index 309ca69ff..06e1c3568 100644
--- a/src/plugins/pinDms/components/CreateCategoryModal.tsx
+++ b/src/plugins/pinDms/components/CreateCategoryModal.tsx
@@ -53,7 +53,7 @@ function useCategory(categoryId: string | null, initalChannelId: string | null)
             setCategory({
                 id: Toasts.genId(),
                 name: `Pin Category ${categories.length + 1}`,
-                color: 10070709,
+                color: DEFAULT_COLOR,
                 collapsed: false,
                 channels: [initalChannelId]
             });
diff --git a/src/plugins/pinDms/components/contextMenu.tsx b/src/plugins/pinDms/components/contextMenu.tsx
index 0f5a198ba..f2bf9fae6 100644
--- a/src/plugins/pinDms/components/contextMenu.tsx
+++ b/src/plugins/pinDms/components/contextMenu.tsx
@@ -8,7 +8,7 @@ import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/Co
 import { Menu } from "@webpack/common";
 
 import { addChannelToCategory, canMoveChannelInDirection, categories, isPinned, moveChannel, removeChannelFromCategory } from "../data";
-import { forceUpdate, settings } from "../index";
+import { forceUpdate, PinOrder, settings } from "../index";
 import { openCategoryModal } from "./CreateCategoryModal";
 
 function createPinMenuItem(channelId: string) {
@@ -52,7 +52,7 @@ function createPinMenuItem(channelId: string) {
                     />
 
                     {
-                        !settings.store.sortDmsByNewestMessage && canMoveChannelInDirection(channelId, -1) && (
+                        settings.store.pinOrder === PinOrder.Custom && canMoveChannelInDirection(channelId, -1) && (
                             <Menu.MenuItem
                                 id="move-up"
                                 label="Move Up"
@@ -62,7 +62,7 @@ function createPinMenuItem(channelId: string) {
                     }
 
                     {
-                        !settings.store.sortDmsByNewestMessage && canMoveChannelInDirection(channelId, 1) && (
+                        settings.store.pinOrder === PinOrder.Custom && canMoveChannelInDirection(channelId, 1) && (
                             <Menu.MenuItem
                                 id="move-down"
                                 label="Move Down"
diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index 8951f0949..353fc482a 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/src/plugins/pinDms/index.tsx
@@ -34,11 +34,19 @@ const PrivateChannelSortStore = findStoreLazy("PrivateChannelSortStore") as { ge
 export let instance: any;
 export const forceUpdate = () => instance?.props?._forceUpdate?.();
 
+export const enum PinOrder {
+    LastMessage,
+    Custom
+}
+
 export const settings = definePluginSettings({
-    sortDmsByNewestMessage: {
-        type: OptionType.BOOLEAN,
-        description: "Sort DMs by newest message",
-        default: false,
+    pinOrder: {
+        type: OptionType.SELECT,
+        description: "Which order should pinned DMs be displayed in?",
+        options: [
+            { label: "Most recent message", value: PinOrder.LastMessage, default: true },
+            { label: "Custom (right click channels to reorder)", value: PinOrder.Custom }
+        ],
         onChange: () => forceUpdate()
     },
 
@@ -61,11 +69,6 @@ export default definePlugin({
         {
             find: ".privateChannelsHeaderContainer,",
             replacement: [
-                // Init
-                {
-                    match: /(?<=componentDidMount\(\){).{1,100}scrollToChannel/,
-                    replace: "$self._instance = this;$&"
-                },
                 {
                     // Filter out pinned channels from the private channel list
                     match: /(?<=\i,{channels:\i,)privateChannelIds:(\i)/,
@@ -164,12 +167,15 @@ export default definePlugin({
     getSections,
     getAllUncollapsedChannels,
     requireSettingsMenu,
+
     makeProps(instance, { sections }: { sections: number[]; }) {
+        this._instance = instance;
         this.sections = sections;
 
-        this.sections.splice(1, 0, ...this.getPinCount(instance.props.privateChannelIds || []));
+        this.sections.splice(1, 0, ...this.getSections());
 
         if (this.instance?.props?.privateChannelIds?.length === 0) {
+            // dont render direct messages header
             this.sections[this.sections.length - 1] = 0;
         }
 
@@ -199,10 +205,6 @@ export default definePlugin({
         return (sectionHeaderSizePx + sections.reduce((acc, v) => acc += v + 44, 0) + DEFAULT_CHUNK_SIZE) * 1.5;
     },
 
-    getPinCount(channelIds: string[]) {
-        return channelIds.length ? this.getSections() : [];
-    },
-
     isCategoryIndex(sectionIndex: number) {
         return this.sections && sectionIndex > 0 && sectionIndex < this.sections.length - 1;
     },
@@ -211,7 +213,7 @@ export default definePlugin({
         if (settings.store.dmSectioncollapsed && sectionIndex !== 0)
             return true;
         const cat = categories[sectionIndex - 1];
-        return this.isCategoryIndex(sectionIndex) && (cat.channels.length === 0 || cat?.channels[channelIndex]);
+        return this.isCategoryIndex(sectionIndex) && (cat?.channels?.length === 0 || cat?.channels[channelIndex]);
     },
 
     isDMSectioncollapsed() {
@@ -219,7 +221,6 @@ export default definePlugin({
     },
 
     collapseDMList() {
-        // console.log("HI");
         settings.store.dmSectioncollapsed = !settings.store.dmSectioncollapsed;
         forceUpdate();
     },
@@ -350,7 +351,7 @@ export default definePlugin({
     getCategoryChannels(category: Category) {
         if (category.channels.length === 0) return [];
 
-        if (settings.store.sortDmsByNewestMessage) {
+        if (settings.store.pinOrder === PinOrder.LastMessage) {
             return PrivateChannelSortStore.getPrivateChannelIds().filter(c => category.channels.includes(c));
         }
 

From 69b349da77a069dd5c780fc555fc40125079c7ae Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 30 Mar 2024 00:28:15 +0100
Subject: [PATCH 40/42] fix minor updater bugs

---
 src/main/updater/git.ts  | 5 +++--
 src/main/updater/http.ts | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts
index 82c38b6bc..1955f7dce 100644
--- a/src/main/updater/git.ts
+++ b/src/main/updater/git.ts
@@ -28,7 +28,7 @@ const VENCORD_SRC_DIR = join(__dirname, "..");
 
 const execFile = promisify(cpExecFile);
 
-const isFlatpak = process.platform === "linux" && Boolean(process.env.FLATPAK_ID?.includes("discordapp") || process.env.FLATPAK_ID?.includes("Discord"));
+const isFlatpak = process.platform === "linux" && !!process.env.FLATPAK_ID;
 
 if (process.platform === "darwin") process.env.PATH = `/usr/local/bin:${process.env.PATH}`;
 
@@ -60,7 +60,8 @@ async function calculateGitChanges() {
     return commits ? commits.split("\n").map(line => {
         const [author, hash, ...rest] = line.split("/");
         return {
-            hash, author, message: rest.join("/")
+            hash, author,
+            message: rest.join("/").split("\n")[0]
         };
     }) : [];
 }
diff --git a/src/main/updater/http.ts b/src/main/updater/http.ts
index 9e5a1cef4..0738a8c24 100644
--- a/src/main/updater/http.ts
+++ b/src/main/updater/http.ts
@@ -53,7 +53,7 @@ async function calculateGitChanges() {
         // github api only sends the long sha
         hash: c.sha.slice(0, 7),
         author: c.author.login,
-        message: c.commit.message.substring(c.commit.message.indexOf("\n") + 1)
+        message: c.commit.message.split("\n")[0]
     }));
 }
 

From b158cecd4b4b3e4486fc2092daa9b753b1c136fa Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sun, 31 Mar 2024 01:00:09 +0100
Subject: [PATCH 41/42] FakeNitro: Fix sending unavailable emotes of the
 current server

---
 src/plugins/fakeNitro/index.tsx | 25 +++++++++++++------------
 src/utils/constants.ts          |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/plugins/fakeNitro/index.tsx b/src/plugins/fakeNitro/index.tsx
index eb9931956..d6822d97d 100644
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@@ -25,6 +25,7 @@ import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy, findStoreLazy, proxyLazyWebpack } from "@webpack";
 import { Alerts, ChannelStore, EmojiStore, FluxDispatcher, Forms, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
+import type { CustomEmoji } from "@webpack/types";
 import type { Message } from "discord-types/general";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
 import type { ReactElement, ReactNode } from "react";
@@ -784,6 +785,16 @@ export default definePlugin({
         UploadHandler.promptToUpload([file], ChannelStore.getChannel(channelId), DRAFT_TYPE);
     },
 
+    canUseEmote(e: CustomEmoji, channelId: string) {
+        if (e.require_colons === false) return true;
+        if (e.available === false) return false;
+
+        if (this.canUseEmotes)
+            return e.guildId === this.guildId || hasExternalEmojiPerms(channelId);
+        else
+            return !e.animated && e.guildId === this.guildId;
+    },
+
     start() {
         const s = settings.store;
 
@@ -882,12 +893,8 @@ export default definePlugin({
             }
 
             if (s.enableEmojiBypass) {
-                const canUseEmotes = this.canUseEmotes && hasExternalEmojiPerms(channelId);
-
                 for (const emoji of messageObj.validNonShortcutEmojis) {
-                    if (!emoji.require_colons) continue;
-                    if (emoji.available !== false && canUseEmotes) continue;
-                    if (emoji.guildId === guildId && !emoji.animated) continue;
+                    if (this.canUseEmote(emoji, channelId)) continue;
 
                     hasBypass = true;
 
@@ -917,18 +924,12 @@ export default definePlugin({
         this.preEdit = addPreEditListener(async (channelId, __, messageObj) => {
             if (!s.enableEmojiBypass) return;
 
-            const { guildId } = this;
-
             let hasBypass = false;
 
-            const canUseEmotes = this.canUseEmotes && hasExternalEmojiPerms(channelId);
-
             messageObj.content = messageObj.content.replace(/(?<!\\)<a?:(?:\w+):(\d+)>/ig, (emojiStr, emojiId, offset, origStr) => {
                 const emoji = EmojiStore.getCustomEmojiById(emojiId);
                 if (emoji == null) return emojiStr;
-                if (!emoji.require_colons) return emojiStr;
-                if (emoji.available !== false && canUseEmotes) return emojiStr;
-                if (emoji.guildId === guildId && !emoji.animated) return emojiStr;
+                if (this.canUseEmote(emoji, channelId)) return emojiStr;
 
                 hasBypass = true;
 
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index f3626aaa0..53f9934b1 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -155,7 +155,7 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     },
     kemo: {
         name: "kemo",
-        id: 299693897859465228n
+        id: 715746190813298788n
     },
     dzshn: {
         name: "dzshn",

From c623e447865b2798c99082ebe36039127c332b67 Mon Sep 17 00:00:00 2001
From: Koda!! <162957404+Kodarru@users.noreply.github.com>
Date: Sat, 30 Mar 2024 19:33:03 -0700
Subject: [PATCH 42/42] ReviewDB: Fix website url (#2318)

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

diff --git a/src/plugins/reviewDB/settings.tsx b/src/plugins/reviewDB/settings.tsx
index 79cf4174e..eeebd0aa1 100644
--- a/src/plugins/reviewDB/settings.tsx
+++ b/src/plugins/reviewDB/settings.tsx
@@ -71,7 +71,7 @@ export const settings = definePluginSettings({
                 </Button>
 
                 <Button onClick={async () => {
-                    let url = "https://reviewdb.mantikafasi.dev/";
+                    let url = "https://reviewdb.mantikafasi.dev";
                     const token = await getToken();
                     if (token)
                         url += "/api/redirect?token=" + encodeURIComponent(token);