Merge branch 'dev' into main

2025-01-10 09:56:24 +00:00 · 2024-07-15 20:48:54 -04:00 · 2024-07-15 20:48:54 -04:00 · e89e54ffaf
commit e89e54ffaf
parent 50371724ed 5bd10c8608
42 changed files with 833 additions and 522 deletions
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@ -1,6 +1,12 @@
 {
    "extends": "stylelint-config-standard",
    "rules": {
-        "indentation": 4
+        "indentation": 4,
+        "selector-class-pattern": [
+            "^[a-z][a-zA-Z0-9]*(-[a-z0-9][a-zA-Z0-9]*)*$",
+            {
+                "message": "Expected class selector to be kebab-case with camelCase segments"
+            }
+        ]
    }
 }
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
    "name": "vencord",
    "private": "true",
-    "version": "1.9.3",
+    "version": "1.9.5",
    "description": "The cutest Discord client mod",
    "homepage": "https://github.com/Vendicated/Vencord#readme",
    "bugs": {
--- a/src/components/Icons.tsx
+++ b/src/components/Icons.tsx
@ -392,6 +392,21 @@ export function PaintbrushIcon(props: IconProps) {
    );
 }

+export function PencilIcon(props: IconProps) {
+    return (
+        <Icon
+            {...props}
+            className={classes(props.className, "vc-pencil-icon")}
+            viewBox="0 0 24 24"
+        >
+            <path
+                fill="currentColor"
+                d="m13.96 5.46 4.58 4.58a1 1 0 0 0 1.42 0l1.38-1.38a2 2 0 0 0 0-2.82l-3.18-3.18a2 2 0 0 0-2.82 0l-1.38 1.38a1 1 0 0 0 0 1.42ZM2.11 20.16l.73-4.22a3 3 0 0 1 .83-1.61l7.87-7.87a1 1 0 0 1 1.42 0l4.58 4.58a1 1 0 0 1 0 1.42l-7.87 7.87a3 3 0 0 1-1.6.83l-4.23.73a1.5 1.5 0 0 1-1.73-1.73Z"
+            />
+        </Icon>
+    );
+}
+
 const WebsiteIconDark = "/assets/e1e96d89e192de1997f73730db26e94f.svg";
 const WebsiteIconLight = "/assets/730f58bcfd5a57a5e22460c445a0c6cf.svg";
 const GithubIconLight = "/assets/3ff98ad75ac94fa883af5ed62d17c459.svg";
--- a/src/components/VencordSettings/ThemesTab.tsx
+++ b/src/components/VencordSettings/ThemesTab.tsx
@ -16,24 +16,26 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import { useSettings } from "@api/Settings";
+import { Settings, useSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import { Flex } from "@components/Flex";
-import { DeleteIcon } from "@components/Icons";
+import { DeleteIcon, FolderIcon, PaintbrushIcon, PencilIcon, PlusIcon, RestartIcon } from "@components/Icons";
 import { Link } from "@components/Link";
-import PluginModal from "@components/PluginSettings/PluginModal";
+import { openPluginModal } from "@components/PluginSettings/PluginModal";
 import type { UserThemeHeader } from "@main/themes";
 import { openInviteModal } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import { classes } from "@utils/misc";
-import { openModal } from "@utils/modal";
 import { showItemInFolder } from "@utils/native";
 import { useAwaiter } from "@utils/react";
 import { findByPropsLazy, findLazy } from "@webpack";
-import { Button, Card, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
+import { Card, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
 import type { ComponentType, Ref, SyntheticEvent } from "react";

+import Plugins from "~plugins";
+
 import { AddonCard } from "./AddonCard";
+import { QuickAction, QuickActionCard } from "./quickActions";
 import { SettingsTab, wrapTab } from "./shared";

 type FileInput = ComponentType<{
@ -213,60 +215,52 @@ function ThemesTab() {
                </Card>

                <Forms.FormSection title="Local Themes">
-                    <Card className="vc-settings-quick-actions-card">
+                    <QuickActionCard>
                        <>
                            {IS_WEB ?
                                (
-                                    <Button
-                                        size={Button.Sizes.SMALL}
-                                        disabled={themeDirPending}
-                                    >
-                                        Upload Theme
-                                        <FileInput
-                                            ref={fileInputRef}
-                                            onChange={onFileUpload}
-                                            multiple={true}
-                                            filters={[{ extensions: ["css"] }]}
-                                        />
-                                    </Button>
+                                    <QuickAction
+                                        text={
+                                            <span style={{ position: "relative" }}>
+                                                Upload Theme
+                                                <FileInput
+                                                    ref={fileInputRef}
+                                                    onChange={onFileUpload}
+                                                    multiple={true}
+                                                    filters={[{ extensions: ["css"] }]}
+                                                />
+                                            </span>
+                                        }
+                                        Icon={PlusIcon}
+                                    />
                                ) : (
-                                    <Button
-                                        onClick={() => showItemInFolder(themeDir!)}
-                                        size={Button.Sizes.SMALL}
+                                    <QuickAction
+                                        text="Open Themes Folder"
+                                        action={() => showItemInFolder(themeDir!)}
                                        disabled={themeDirPending}
-                                    >
-                                        Open Themes Folder
-                                    </Button>
+                                        Icon={FolderIcon}
+                                    />
                                )}
-                            <Button
-                                onClick={refreshLocalThemes}
-                                size={Button.Sizes.SMALL}
-                            >
-                                Load missing Themes
-                            </Button>
-                            <Button
-                                onClick={() => VencordNative.quickCss.openEditor()}
-                                size={Button.Sizes.SMALL}
-                            >
-                                Edit QuickCSS
-                            </Button>
+                            <QuickAction
+                                text="Load missing Themes"
+                                action={refreshLocalThemes}
+                                Icon={RestartIcon}
+                            />
+                            <QuickAction
+                                text="Edit QuickCSS"
+                                action={() => VencordNative.quickCss.openEditor()}
+                                Icon={PaintbrushIcon}
+                            />

-                            {Vencord.Settings.plugins.ClientTheme.enabled && (
-                                <Button
-                                    onClick={() => openModal(modalProps => (
-                                        <PluginModal
-                                            {...modalProps}
-                                            plugin={Vencord.Plugins.plugins.ClientTheme}
-                                            onRestartNeeded={() => { }}
-                                        />
-                                    ))}
-                                    size={Button.Sizes.SMALL}
-                                >
-                                    Edit ClientTheme
-                                </Button>
+                            {Settings.plugins.ClientTheme.enabled && (
+                                <QuickAction
+                                    text="Edit ClientTheme"
+                                    action={() => openPluginModal(Plugins.ClientTheme)}
+                                    Icon={PencilIcon}
+                                />
                            )}
                        </>
-                    </Card>
+                    </QuickActionCard>

                    <div className={cl("grid")}>
                        {userThemes?.map(theme => (
--- a/src/components/VencordSettings/VencordTab.tsx
+++ b/src/components/VencordSettings/VencordTab.tsx
@ -21,15 +21,16 @@ import { useSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import DonateButton from "@components/DonateButton";
 import { openPluginModal } from "@components/PluginSettings/PluginModal";
+import { gitRemote } from "@shared/vencordUserAgent";
 import { Margins } from "@utils/margins";
 import { identity } from "@utils/misc";
 import { relaunch, showItemInFolder } from "@utils/native";
 import { useAwaiter } from "@utils/react";
-import { Button, Card, Forms, React, Select, Switch, TooltipContainer } from "@webpack/common";
-import { ComponentType } from "react";
+import { Button, Card, Forms, React, Select, Switch } from "@webpack/common";

 import { Flex, FolderIcon, GithubIcon, LogIcon, PaintbrushIcon, RestartIcon } from "..";
 import { openNotificationSettingsModal } from "./NotificationSettings";
+import { QuickAction, QuickActionCard } from "./quickActions";
 import { SettingsTab, wrapTab } from "./shared";

 const cl = classNameFactory("vc-settings-");
@ -41,17 +42,6 @@ type KeysOfType<Object, Type> = {
    [K in keyof Object]: Object[K] extends Type ? K : never;
 }[keyof Object];

-const iconWithTooltip = (Icon: ComponentType<{ className?: string; }>, tooltip: string) => () => (
-    <TooltipContainer text={tooltip}>
-        <Icon className={cl("quick-actions-img")} />
-    </TooltipContainer>
-);
-
-const NotificationLogIcon = iconWithTooltip(LogIcon, "Open Notification Log");
-const QuickCssIcon = iconWithTooltip(PaintbrushIcon, "Edit QuickCSS");
-const RelaunchIcon = iconWithTooltip(RestartIcon, "Relaunch Discord");
-const OpenSettingsDirIcon = iconWithTooltip(FolderIcon, "Open Settings Directory");
-const OpenGithubIcon = iconWithTooltip(GithubIcon, "View Vencord's GitHub Repository");

 function VencordSettings() {
    const [settingsDir, , settingsDirPending] = useAwaiter(VencordNative.settings.getSettingsDir, {
@ -111,44 +101,37 @@ function VencordSettings() {
        <SettingsTab title="Vencord Settings">
            <DonateCard image={donateImage} />
            <Forms.FormSection title="Quick Actions">
-                <Card className={cl("quick-actions-card")}>
-                    <Button
-                        onClick={openNotificationLogModal}
-                        look={Button.Looks.BLANK}
-                    >
-                        <NotificationLogIcon />
-                    </Button>
-                    <Button
-                        onClick={() => VencordNative.quickCss.openEditor()}
-                        look={Button.Looks.BLANK}
-                    >
-                        <QuickCssIcon />
-                    </Button>
+                <QuickActionCard>
+                    <QuickAction
+                        Icon={LogIcon}
+                        text="Notification Log"
+                        action={openNotificationLogModal}
+                    />
+                    <QuickAction
+                        Icon={PaintbrushIcon}
+                        text="Edit QuickCSS"
+                        action={() => VencordNative.quickCss.openEditor()}
+                    />
                    {!IS_WEB && (
-                        <Button
-                            onClick={relaunch}
-                            look={Button.Looks.BLANK}
-                        >
-                            <RelaunchIcon />
-                        </Button>
+                        <QuickAction
+                            Icon={RestartIcon}
+                            text="Relaunch Discord"
+                            action={relaunch}
+                        />
                    )}
                    {!IS_WEB && (
-                        <Button
-                            onClick={() => showItemInFolder(settingsDir)}
-                            look={Button.Looks.BLANK}
-                            disabled={settingsDirPending}
-                        >
-                            <OpenSettingsDirIcon />
-                        </Button>
+                        <QuickAction
+                            Icon={FolderIcon}
+                            text="Open Settings Folder"
+                            action={() => showItemInFolder(settingsDir)}
+                        />
                    )}
-                    <Button
-                        onClick={() => VencordNative.native.openExternal("https://github.com/Vendicated/Vencord")}
-                        look={Button.Looks.BLANK}
-                        disabled={settingsDirPending}
-                    >
-                        <OpenGithubIcon />
-                    </Button>
-                </Card>
+                    <QuickAction
+                        Icon={GithubIcon}
+                        text="View Source Code"
+                        action={() => VencordNative.native.openExternal("https://github.com/" + gitRemote)}
+                    />
+                </QuickActionCard>
            </Forms.FormSection>

            <Forms.FormDivider />
--- a/src/components/VencordSettings/quickActions.css
+++ b/src/components/VencordSettings/quickActions.css
@ -0,0 +1,33 @@
+.vc-settings-quickActions-card {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(200px, max-content));
+    gap: 0.5em;
+    justify-content: center;
+    padding: 0.5em 0;
+    margin-bottom: 1em;
+}
+
+.vc-settings-quickActions-pill {
+    all: unset;
+    background: var(--background-secondary);
+    color: var(--header-secondary);
+    display: flex;
+    align-items: center;
+    gap: 0.5em;
+    padding: 8px 12px;
+    border-radius: 9999px;
+}
+
+.vc-settings-quickActions-pill:hover {
+    background: var(--background-secondary-alt);
+}
+
+.vc-settings-quickActions-pill:focus-visible {
+    outline: 2px solid var(--focus-primary);
+    outline-offset: 2px;
+}
+
+.vc-settings-quickActions-img {
+    width: 24px;
+    height: 24px;
+}
--- a/src/components/VencordSettings/quickActions.tsx
+++ b/src/components/VencordSettings/quickActions.tsx
@ -0,0 +1,39 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./quickActions.css";
+
+import { classNameFactory } from "@api/Styles";
+import { Card } from "@webpack/common";
+import type { ComponentType, PropsWithChildren, ReactNode } from "react";
+
+const cl = classNameFactory("vc-settings-quickActions-");
+
+export interface QuickActionProps {
+    Icon: ComponentType<{ className?: string; }>;
+    text: ReactNode;
+    action?: () => void;
+    disabled?: boolean;
+}
+
+export function QuickAction(props: QuickActionProps) {
+    const { Icon, action, text, disabled } = props;
+
+    return (
+        <button className={cl("pill")} onClick={action} disabled={disabled}>
+            <Icon className={cl("img")} />
+            {text}
+        </button>
+    );
+}
+
+export function QuickActionCard(props: PropsWithChildren) {
+    return (
+        <Card className={cl("card")}>
+            {props.children}
+        </Card>
+    );
+}
--- a/src/components/VencordSettings/settingsStyles.css
+++ b/src/components/VencordSettings/settingsStyles.css
@ -10,26 +10,6 @@
    margin-bottom: -2px;
 }

-.vc-settings-quick-actions-card {
-    color: var(--text-normal);
-    padding: 1em;
-    display: flex;
-    justify-content: space-evenly;
-    gap: 1em;
-    flex-wrap: wrap;
-    align-items: center;
-    margin-bottom: 1em;
-}
-
-.vc-settings-quick-actions-card button {
-    min-width: unset;
-}
-
-.vc-settings-quick-actions-img {
-    width: 30px;
-    height: 30px;
-}
-
 .vc-settings-donate {
    display: flex;
    flex-direction: row;
--- a/src/plugins/banger/index.ts
+++ b/src/plugins/banger/index.ts
@ -16,28 +16,34 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

+import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";

+const settings = definePluginSettings({
+    source: {
+        description: "Source to replace ban GIF with (Video or Gif)",
+        type: OptionType.STRING,
+        default: "https://i.imgur.com/wp5q52C.mp4",
+        restartNeeded: true,
+    }
+});
+
 export default definePlugin({
    name: "BANger",
    description: "Replaces the GIF in the ban dialogue with a custom one.",
    authors: [Devs.Xinto, Devs.Glitch],
+    settings,
    patches: [
        {
            find: "BAN_CONFIRM_TITLE.",
            replacement: {
                match: /src:\i\("?\d+"?\)/g,
-                replace: "src: Vencord.Settings.plugins.BANger.source"
+                replace: "src:$self.source"
            }
        }
    ],
-    options: {
-        source: {
-            description: "Source to replace ban GIF with (Video or Gif)",
-            type: OptionType.STRING,
-            default: "https://i.imgur.com/wp5q52C.mp4",
-            restartNeeded: true,
-        }
+    get source() {
+        return settings.store.source;
    }
 });
--- a/src/plugins/betterNotes/index.tsx
+++ b/src/plugins/betterNotes/index.tsx
@ -16,7 +16,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import { Settings } from "@api/Settings";
+import { definePluginSettings, Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { canonicalizeMatch } from "@utils/patches";
@ -25,10 +25,26 @@ import { findByPropsLazy } from "@webpack";

 const UserPopoutSectionCssClasses = findByPropsLazy("section", "lastSection");

+const settings = definePluginSettings({
+    hide: {
+        type: OptionType.BOOLEAN,
+        description: "Hide notes",
+        default: false,
+        restartNeeded: true
+    },
+    noSpellCheck: {
+        type: OptionType.BOOLEAN,
+        description: "Disable spellcheck in notes",
+        disabled: () => Settings.plugins.BetterNotesBox.hide,
+        default: false
+    }
+});
+
 export default definePlugin({
    name: "BetterNotesBox",
    description: "Hide notes or disable spellcheck (Configure in settings!!)",
    authors: [Devs.Ven],
+    settings,

    patches: [
        {
@ -36,7 +52,7 @@ export default definePlugin({
            all: true,
            // Some modules match the find but the replacement is returned untouched
            noWarn: true,
-            predicate: () => Vencord.Settings.plugins.BetterNotesBox.hide,
+            predicate: () => settings.store.hide,
            replacement: {
                match: /hideNote:.+?(?=([,}].*?\)))/g,
                replace: (m, rest) => {
@ -54,7 +70,7 @@ export default definePlugin({
            find: "Messages.NOTE_PLACEHOLDER",
            replacement: {
                match: /\.NOTE_PLACEHOLDER,/,
-                replace: "$&spellCheck:!Vencord.Settings.plugins.BetterNotesBox.noSpellCheck,"
+                replace: "$&spellCheck:!$self.noSpellCheck,"
            }
        },
        {
@ -66,25 +82,14 @@ export default definePlugin({
        }
    ],

-    options: {
-        hide: {
-            type: OptionType.BOOLEAN,
-            description: "Hide notes",
-            default: false,
-            restartNeeded: true
-        },
-        noSpellCheck: {
-            type: OptionType.BOOLEAN,
-            description: "Disable spellcheck in notes",
-            disabled: () => Settings.plugins.BetterNotesBox.hide,
-            default: false
-        }
-    },
-
    patchPadding: ErrorBoundary.wrap(({ lastSection }) => {
        if (!lastSection) return null;
        return (
            <div className={UserPopoutSectionCssClasses.lastSection} ></div>
        );
-    })
+    }),
+
+    get noSpellCheck() {
+        return settings.store.noSpellCheck;
+    }
 });
--- a/src/plugins/consoleJanitor/README.md
+++ b/src/plugins/consoleJanitor/README.md
@ -0,0 +1,5 @@
+# ConsoleJanitor
+
+Disables annoying console messages/errors. This plugin mainly removes errors/warnings that happen all the time and noisy/spammy logging messages.
+
+Some of the disabled messages include the "notosans-400-normalitalic" error and MessageActionCreators, Routing/Utils loggers.
--- a/src/plugins/consoleJanitor/index.ts
+++ b/src/plugins/consoleJanitor/index.ts
@ -0,0 +1,152 @@
+/*
+ * 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 Noop = () => { };
+const NoopLogger = {
+    logDangerously: Noop,
+    log: Noop,
+    verboseDangerously: Noop,
+    verbose: Noop,
+    info: Noop,
+    warn: Noop,
+    error: Noop,
+    trace: Noop,
+    time: Noop,
+    fileOnly: Noop
+};
+
+const settings = definePluginSettings({
+    disableNoisyLoggers: {
+        type: OptionType.BOOLEAN,
+        description: "Disable noisy loggers like the MessageActionCreators",
+        default: false,
+        restartNeeded: true
+    },
+    disableSpotifyLogger: {
+        type: OptionType.BOOLEAN,
+        description: "Disable the Spotify logger, which leaks account information and access token",
+        default: true,
+        restartNeeded: true
+    }
+});
+
+export default definePlugin({
+    name: "ConsoleJanitor",
+    description: "Disables annoying console messages/errors",
+    authors: [Devs.Nuckyz],
+    settings,
+
+    NoopLogger: () => NoopLogger,
+
+    patches: [
+        {
+            find: 'console.warn("Window state not initialized"',
+            replacement: {
+                match: /console\.warn\("Window state not initialized",\i\),/,
+                replace: ""
+            }
+        },
+        {
+            find: "is not a valid locale.",
+            replacement: {
+                match: /\i\.error\(""\.concat\(\i," is not a valid locale."\)\);/,
+                replace: ""
+            }
+        },
+        {
+            find: "notosans-400-normalitalic",
+            replacement: {
+                match: /,"notosans-.+?"/g,
+                replace: ""
+            }
+        },
+        {
+            find: 'console.warn("[DEPRECATED] Please use `subscribeWithSelector` middleware");',
+            all: true,
+            replacement: {
+                match: /console\.warn\("\[DEPRECATED\] Please use `subscribeWithSelector` middleware"\);/,
+                replace: ""
+            }
+        },
+        {
+            find: "RPCServer:WSS",
+            replacement: {
+                match: /\i\.error\("Error: "\.concat\((\i)\.message/,
+                replace: '!$1.message.includes("EADDRINUSE")&&$&'
+            }
+        },
+        {
+            find: "Tried getting Dispatch instance before instantiated",
+            replacement: {
+                match: /null==\i&&\i\.warn\("Tried getting Dispatch instance before instantiated"\),/,
+                replace: ""
+            }
+        },
+        {
+            find: "Unable to determine render window for element",
+            replacement: {
+                match: /console\.warn\("Unable to determine render window for element",\i\),/,
+                replace: ""
+            }
+        },
+        {
+            find: "failed to send analytics events",
+            replacement: {
+                match: /console\.error\("\[analytics\] failed to send analytics events query: "\.concat\(\i\)\)/,
+                replace: ""
+            }
+        },
+        {
+            find: "Slow dispatch on",
+            replacement: {
+                match: /\i\.totalTime>100&&\i\.verbose\("Slow dispatch on ".+?\)\);/,
+                replace: ""
+            }
+        },
+        ...[
+            '("MessageActionCreators")', '("ChannelMessages")',
+            '("Routing/Utils")', '("RTCControlSocket")',
+            '("ConnectionEventFramerateReducer")', '("RTCLatencyTestManager")',
+            '("OverlayBridgeStore")', '("RPCServer:WSS")', '("RPCServer:IPC")'
+        ].map(logger => ({
+            find: logger,
+            predicate: () => settings.store.disableNoisyLoggers,
+            all: true,
+            replacement: {
+                match: new RegExp(String.raw`new \i\.\i${logger.replace(/([()])/g, "\\$1")}`),
+                replace: `$self.NoopLogger${logger}`
+            }
+        })),
+        {
+            find: '"Experimental codecs: "',
+            predicate: () => settings.store.disableNoisyLoggers,
+            replacement: {
+                match: /new \i\.\i\("Connection\("\.concat\(\i,"\)"\)\)/,
+                replace: "$self.NoopLogger()"
+            }
+        },
+        {
+            find: '"Handling ping: "',
+            predicate: () => settings.store.disableNoisyLoggers,
+            replacement: {
+                match: /new \i\.\i\("RTCConnection\("\.concat.+?\)\)(?=,)/,
+                replace: "$self.NoopLogger()"
+            }
+        },
+        {
+            find: '("Spotify")',
+            predicate: () => settings.store.disableSpotifyLogger,
+            replacement: {
+                match: /new \i\.\i\("Spotify"\)/,
+                replace: "$self.NoopLogger()"
+            }
+        }
+    ]
+});
--- a/src/plugins/ctrlEnterSend/index.ts
+++ b/src/plugins/ctrlEnterSend/index.ts
@ -39,6 +39,15 @@ export default definePlugin({
        }
    }),
    patches: [
+        // Only one of the two patches will be at effect; Discord often updates to switch between them.
+        // See: https://discord.com/channels/1015060230222131221/1032770730703716362/1261398512017477673
+        {
+            find: ".ENTER&&(!",
+            replacement: {
+                match: /(?<=(\i)\.which===\i\.\i.ENTER&&).{0,100}(\(0,\i\.\i\)\(\i\)).{0,100}(?=&&\(\i\.preventDefault)/,
+                replace: "$self.shouldSubmit($1, $2)"
+            }
+        },
        {
            find: "!this.hasOpenCodeBlock()",
            replacement: {
--- a/src/plugins/experiments/index.tsx
+++ b/src/plugins/experiments/index.tsx
@ -88,8 +88,8 @@ export default definePlugin({
        {
            find: "useCanFavoriteChannel",
            replacement: {
-                match: /!\(\i\.isDM\(\)\|\|\i\.isThread\(\)\)/,
-                replace: "true",
+                match: /\i\.isDM\(\)\|\|\i\.isThread\(\)/,
+                replace: "false",
            }
        }
    ],
--- a/src/plugins/fakeNitro/index.tsx
+++ b/src/plugins/fakeNitro/index.tsx
@ -24,7 +24,7 @@ import { getCurrentGuild } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy, findStoreLazy, proxyLazyWebpack } from "@webpack";
-import { Alerts, ChannelStore, DraftType, EmojiStore, FluxDispatcher, Forms, IconUtils, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
+import { Alerts, ChannelStore, DraftType, EmojiStore, FluxDispatcher, Forms, GuildMemberStore, IconUtils, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
 import type { Emoji } from "@webpack/types";
 import type { Message } from "discord-types/general";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
@ -818,7 +818,14 @@ export default definePlugin({

        if (isUnusableRoleSubscriptionEmoji(e, this.guildId, true)) return false;

-        if (this.canUseEmotes)
+        let isUsableTwitchSubEmote = false;
+        if (e.managed && e.guildId) {
+            // @ts-ignore outdated type
+            const myRoles = GuildMemberStore.getSelfMember(e.guildId)?.roles ?? [];
+            isUsableTwitchSubEmote = e.roles.some(r => myRoles.includes(r));
+        }
+
+        if (this.canUseEmotes || isUsableTwitchSubEmote)
            return e.guildId === this.guildId || hasExternalEmojiPerms(channelId);
        else
            return !e.animated && e.guildId === this.guildId;
--- a/src/plugins/friendsSince/index.tsx
+++ b/src/plugins/friendsSince/index.tsx
@ -17,7 +17,7 @@ const container = findByPropsLazy("memberSince");
 const getCreatedAtDate = findByCodeLazy('month:"short",day:"numeric"');
 const locale = findByPropsLazy("getLocale");
 const lastSection = findByPropsLazy("lastSection");
-const section = findLazy((m: any) => m.section !== void 0 && Object.values(m).length === 1);
+const section = findLazy((m: any) => m.section !== void 0 && m.heading !== void 0 && Object.values(m).length === 2);

 export default definePlugin({
    name: "FriendsSince",
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@ -59,11 +59,15 @@ export function addPatch(newPatch: Omit<Patch, "plugin">, pluginName: string) {
        delete patch.group;
    }

+    if (patch.predicate && !patch.predicate()) return;
+
    canonicalizeFind(patch);
    if (!Array.isArray(patch.replacement)) {
        patch.replacement = [patch.replacement];
    }

+    patch.replacement = patch.replacement.filter(({ predicate }) => !predicate || predicate());
+
    if (IS_REPORTER) {
        patch.replacement.forEach(r => {
            delete r.predicate;
--- a/src/plugins/invisibleChat.desktop/index.tsx
+++ b/src/plugins/invisibleChat.desktop/index.tsx
@ -133,10 +133,12 @@ export default definePlugin({
                    message: message,
                    channel: ChannelStore.getChannel(message.channel_id),
                    onClick: async () => {
-                        await iteratePasswords(message).then((res: string | false) => {
-                            if (res) return void this.buildEmbed(message, res);
-                            return void buildDecModal({ message });
-                        });
+                        const res = await iteratePasswords(message);
+
+                        if (res)
+                            this.buildEmbed(message, res);
+                        else
+                            buildDecModal({ message });
                    }
                }
                : null;
@ -169,9 +171,9 @@ export default definePlugin({

        message.embeds.push({
            type: "rich",
-            title: "Decrypted Message",
+            rawTitle: "Decrypted Message",
            color: "0x45f5f5",
-            description: revealed,
+            rawDescription: revealed,
            footer: {
                text: "Made with ❤️ by c0dine and Sammy!",
            },
--- a/src/plugins/mentionAvatars/README.md
+++ b/src/plugins/mentionAvatars/README.md
@ -0,0 +1,5 @@
+# MentionAvatars
+
+Shows user avatars inside mentions
+
+![](https://github.com/user-attachments/assets/fc76ea47-5e19-4063-a592-c57785a75cc7)
--- a/src/plugins/mentionAvatars/index.tsx
+++ b/src/plugins/mentionAvatars/index.tsx
@ -0,0 +1,44 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./styles.css";
+
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { SelectedGuildStore, useState } from "@webpack/common";
+import { User } from "discord-types/general";
+
+export default definePlugin({
+    name: "MentionAvatars",
+    description: "Shows user avatars inside mentions",
+    authors: [Devs.Ven],
+
+    patches: [{
+        find: ".USER_MENTION)",
+        replacement: {
+            match: /children:"@"\.concat\((null!=\i\?\i:\i)\)(?<=\.useName\((\i)\).+?)/,
+            replace: "children:$self.renderUsername({username:$1,user:$2})"
+        }
+    }],
+
+    renderUsername: ErrorBoundary.wrap((props: { user: User, username: string; }) => {
+        const { user, username } = props;
+        const [isHovering, setIsHovering] = useState(false);
+
+        if (!user) return <>@{username}</>;
+
+        return (
+            <span
+                onMouseEnter={() => setIsHovering(true)}
+                onMouseLeave={() => setIsHovering(false)}
+            >
+                <img src={user.getAvatarURL(SelectedGuildStore.getGuildId(), 16, isHovering)} className="vc-mentionAvatars-avatar" />
+                @{username}
+            </span>
+        );
+    }, { noop: true })
+});
--- a/src/plugins/mentionAvatars/styles.css
+++ b/src/plugins/mentionAvatars/styles.css
@ -0,0 +1,8 @@
+.vc-mentionAvatars-avatar {
+    vertical-align: middle;
+    width: 1em;
+    height: 1em;
+    margin: 0 4px 0.2rem 2px;
+    border-radius: 50%;
+    box-sizing: border-box;
+}
--- a/src/plugins/messageLogger/HistoryModal.tsx
+++ b/src/plugins/messageLogger/HistoryModal.tsx
@ -0,0 +1,91 @@
+/*
+ * 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 ErrorBoundary from "@components/ErrorBoundary";
+import { Margins } from "@utils/margins";
+import { classes } from "@utils/misc";
+import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { findByPropsLazy } from "@webpack";
+import { TabBar, Text, Timestamp, TooltipContainer, useState } from "@webpack/common";
+
+import { parseEditContent } from ".";
+
+const CodeContainerClasses = findByPropsLazy("markup", "codeContainer");
+const MiscClasses = findByPropsLazy("messageContent", "markupRtl");
+
+const cl = classNameFactory("vc-ml-modal-");
+
+export function openHistoryModal(message: any) {
+    openModal(props =>
+        <ErrorBoundary>
+            <HistoryModal
+                modalProps={props}
+                message={message}
+            />
+        </ErrorBoundary>
+    );
+}
+
+export function HistoryModal({ modalProps, message }: { modalProps: ModalProps; message: any; }) {
+    const [currentTab, setCurrentTab] = useState(message.editHistory.length);
+    const timestamps = [message.firstEditTimestamp, ...message.editHistory.map(m => m.timestamp)];
+    const contents = [...message.editHistory.map(m => m.content), message.content];
+
+    return (
+        <ModalRoot {...modalProps} size={ModalSize.LARGE}>
+            <ModalHeader className={cl("head")}>
+                <Text variant="heading-lg/semibold" style={{ flexGrow: 1 }}>Message Edit History</Text>
+                <ModalCloseButton onClick={modalProps.onClose} />
+            </ModalHeader>
+
+            <ModalContent className={cl("contents")}>
+                <TabBar
+                    type="top"
+                    look="brand"
+                    className={classes("vc-settings-tab-bar", cl("tab-bar"))}
+                    selectedItem={currentTab}
+                    onItemSelect={setCurrentTab}
+                >
+                    {message.firstEditTimestamp.getTime() !== message.timestamp.getTime() && (
+                        <TooltipContainer text="This edit state was not logged so it can't be displayed.">
+                            <TabBar.Item
+                                className="vc-settings-tab-bar-item"
+                                id={-1}
+                                disabled
+                            >
+                                <Timestamp
+                                    className={cl("timestamp")}
+                                    timestamp={message.timestamp}
+                                    isEdited={true}
+                                    isInline={false}
+                                />
+                            </TabBar.Item>
+                        </TooltipContainer>
+                    )}
+
+                    {timestamps.map((timestamp, index) => (
+                        <TabBar.Item
+                            className="vc-settings-tab-bar-item"
+                            id={index}
+                        >
+                            <Timestamp
+                                className={cl("timestamp")}
+                                timestamp={timestamp}
+                                isEdited={true}
+                                isInline={false}
+                            />
+                        </TabBar.Item>
+                    ))}
+                </TabBar>
+
+                <div className={classes(CodeContainerClasses.markup, MiscClasses.messageContent, Margins.top20)}>
+                    {parseEditContent(contents[currentTab], message)}
+                </div>
+            </ModalContent>
+        </ModalRoot>
+    );
+}
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@ -24,21 +24,26 @@ import { Settings } from "@api/Settings";
 import { disableStyle, enableStyle } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
+import { proxyLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
+import { classes } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy } from "@webpack";
-import { ChannelStore, FluxDispatcher, i18n, Menu, MessageStore, Parser, Timestamp, UserStore, useStateFromStores } from "@webpack/common";
+import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { ChannelStore, FluxDispatcher, i18n, Menu, MessageStore, Parser, SelectedChannelStore, Timestamp, UserStore, useStateFromStores } from "@webpack/common";
 import { Message } from "discord-types/general";

 import overlayStyle from "./deleteStyleOverlay.css?managed";
 import textStyle from "./deleteStyleText.css?managed";
+import { openHistoryModal } from "./HistoryModal";

 interface MLMessage extends Message {
    deleted?: boolean;
    editHistory?: { timestamp: Date; content: string; }[];
+    firstEditTimestamp?: Date;
 }

 const styles = findByPropsLazy("edited", "communicationDisabled", "isSystemMessage");
+const getMessage = findByCodeLazy('replace(/^\\n+|\\n+$/g,"")');

 function addDeleteStyle() {
    if (Settings.plugins.MessageLogger.deleteStyle === "text") {
@ -125,10 +130,22 @@ const patchChannelContextMenu: NavContextMenuPatchCallback = (children, { channe
    );
 };

+export function parseEditContent(content: string, message: Message) {
+    return Parser.parse(content, true, {
+        channelId: message.channel_id,
+        messageId: message.id,
+        allowLinks: true,
+        allowHeading: true,
+        allowList: true,
+        allowEmojiLinks: true,
+        viewingChannelId: SelectedChannelStore.getChannelId(),
+    });
+}
+
 export default definePlugin({
    name: "MessageLogger",
    description: "Temporarily logs deleted and edited messages.",
-    authors: [Devs.rushii, Devs.Ven, Devs.AutumnVN, Devs.Nickyux],
+    authors: [Devs.rushii, Devs.Ven, Devs.AutumnVN, Devs.Nickyux, Devs.Kyuuhachi],
    dependencies: ["MessageUpdaterAPI"],

    contextMenus: {
@ -150,11 +167,11 @@ export default definePlugin({
            (oldMsg, newMsg) => oldMsg?.editHistory === newMsg?.editHistory
        );

-        return (
+        return Settings.plugins.MessageLogger.inlineEdits && (
            <>
                {message.editHistory?.map(edit => (
                    <div className="messagelogger-edited">
-                        {Parser.parse(edit.content)}
+                        {parseEditContent(edit.content, message)}
                        <Timestamp
                            timestamp={edit.timestamp}
                            isEdited={true}
@ -191,11 +208,21 @@ export default definePlugin({
            description: "Whether to log deleted messages",
            default: true,
        },
+        collapseDeleted: {
+            type: OptionType.BOOLEAN,
+            description: "Whether to collapse deleted messages, similar to blocked messages",
+            default: false
+        },
        logEdits: {
            type: OptionType.BOOLEAN,
            description: "Whether to log edited messages",
            default: true,
        },
+        inlineEdits: {
+            type: OptionType.BOOLEAN,
+            description: "Whether to display edit history as part of message content",
+            default: true
+        },
        ignoreBots: {
            type: OptionType.BOOLEAN,
            description: "Whether to ignore messages by bots",
@ -271,6 +298,23 @@ export default definePlugin({
            (message.channel_id === "1026515880080842772" && message.author?.id === "1017176847865352332");
    },

+    EditMarker({ message, className, children, ...props }: any) {
+        return (
+            <span
+                {...props}
+                className={classes("messagelogger-edit-marker", className)}
+                onClick={() => openHistoryModal(message)}
+                aria-role="button"
+            >
+                {children}
+            </span>
+        );
+    },
+
+    Messages: proxyLazy(() => ({
+        DELETED_MESSAGE_COUNT: getMessage("{count, plural, =0 {No deleted messages} one {{count} deleted message} other {{count} deleted messages}}")
+    })),
+
    patches: [
        {
            // MessageStore
@ -324,7 +368,8 @@ export default definePlugin({
                    match: /this\.customRenderedContent=(\i)\.customRenderedContent,/,
                    replace: "this.customRenderedContent = $1.customRenderedContent," +
                        "this.deleted = $1.deleted || false," +
-                        "this.editHistory = $1.editHistory || [],"
+                        "this.editHistory = $1.editHistory || []," +
+                        "this.firstEditTimestamp = $1.firstEditTimestamp || this.editedTimestamp || this.timestamp,"
                }
            ]
        },
@ -337,7 +382,7 @@ export default definePlugin({
                    // Pass through editHistory & deleted & original attachments to the "edited message" transformer
                    match: /(?<=null!=\i\.edited_timestamp\)return )\i\(\i,\{reactions:(\i)\.reactions.{0,50}\}\)/,
                    replace:
-                        "Object.assign($&,{ deleted:$1.deleted, editHistory:$1.editHistory, attachments:$1.attachments })"
+                        "Object.assign($&,{ deleted:$1.deleted, editHistory:$1.editHistory, firstEditTimestamp:$1.firstEditTimestamp })"
                },

                {
@ -356,7 +401,8 @@ export default definePlugin({
                        "   return $2;" +
                        "})())," +
                        "deleted: arguments[1]?.deleted," +
-                        "editHistory: arguments[1]?.editHistory"
+                        "editHistory: arguments[1]?.editHistory," +
+                        "firstEditTimestamp: new Date(arguments[1]?.firstEditTimestamp ?? $2.editedTimestamp ?? $2.timestamp)"
                },
                {
                    // Preserve deleted attribute on attachments
@ -404,6 +450,11 @@ export default definePlugin({
                    // Render editHistory in the deepest div for message content
                    match: /(\)\("div",\{id:.+?children:\[)/,
                    replace: "$1 (!!arguments[0].message.editHistory?.length && $self.renderEdits(arguments[0])),"
+                },
+                {
+                    // Make edit marker clickable
+                    match: /"span",\{(?=className:\i\.edited,)/,
+                    replace: "$self.EditMarker,{message:arguments[0].message,"
                }
            ]
        },
@ -433,6 +484,30 @@ export default definePlugin({
                    replace: "children:arguments[0].message.deleted?[]:$1"
                }
            ]
+        },
+        {
+            // Message grouping
+            find: "NON_COLLAPSIBLE.has(",
+            replacement: {
+                match: /if\((\i)\.blocked\)return \i\.\i\.MESSAGE_GROUP_BLOCKED;/,
+                replace: '$&else if($1.deleted) return"MESSAGE_GROUP_DELETED";',
+            },
+            predicate: () => Settings.plugins.MessageLogger.collapseDeleted
+        },
+        {
+            // Message group rendering
+            find: "Messages.NEW_MESSAGES_ESTIMATED_WITH_DATE",
+            replacement: [
+                {
+                    match: /(\i).type===\i\.\i\.MESSAGE_GROUP_BLOCKED\|\|/,
+                    replace: '$&$1.type==="MESSAGE_GROUP_DELETED"||',
+                },
+                {
+                    match: /(\i).type===\i\.\i\.MESSAGE_GROUP_BLOCKED\?.*?:/,
+                    replace: '$&$1.type==="MESSAGE_GROUP_DELETED"?$self.Messages.DELETED_MESSAGE_COUNT:',
+                },
+            ],
+            predicate: () => Settings.plugins.MessageLogger.collapseDeleted
        }
    ]
 });
--- a/src/plugins/messageLogger/messageLogger.css
+++ b/src/plugins/messageLogger/messageLogger.css
@ -8,11 +8,15 @@
    .emoji,
    [data-type="sticker"],
    iframe,
-    .messagelogger-deleted-attachment:not([class*="hiddenAttachment_"]),
+    .messagelogger-deleted-attachment,
    [class|="inlineMediaEmbed"]
 ) {
    filter: grayscale(1) !important;
    transition: 150ms filter ease-in-out;
+
+    &[class*="hiddenMosaicItem_"] {
+        filter: grayscale(1) blur(var(--custom-message-attachment-spoiler-blur-radius, 44px)) !important;
+    }
 }

 .messagelogger-deleted
@ -23,8 +27,7 @@
    iframe,
    .messagelogger-deleted-attachment,
    [class|="inlineMediaEmbed"]
-):hover,
-.messagelogger-deleted {
+):hover {
    filter: grayscale(0) !important;
 }

@ -35,3 +38,17 @@
 .theme-light .messagelogger-edited {
    opacity: 0.5;
 }
+
+.messagelogger-edit-marker {
+    cursor: pointer;
+}
+
+.vc-ml-modal-timestamp {
+    cursor: unset;
+    height: unset;
+}
+
+.vc-ml-modal-tab-bar {
+    flex-wrap: wrap;
+    gap: 16px;
+}
--- a/src/plugins/moreUserTags/index.tsx
+++ b/src/plugins/moreUserTags/index.tsx
@ -256,6 +256,7 @@ export default definePlugin({
        // in profiles
        {
            find: ",overrideDiscriminator:",
+            group: true,
            replacement: [
                {
                    // prevent channel id from getting ghosted
@ -263,7 +264,7 @@ export default definePlugin({
                    match: /user:\i,nick:\i,/,
                    replace: "$&moreTags_channelId,"
                }, {
-                    match: /,botType:(\i\((\i)\)),/g,
+                    match: /,botType:(\i),(?<=user:(\i).+?)/g,
                    replace: ",botType:$self.getTag({user:$2,channelId:moreTags_channelId,origType:$1,location:'not-chat'}),"
                }
            ]
--- a/src/plugins/permissionsViewer/index.tsx
+++ b/src/plugins/permissionsViewer/index.tsx
@ -34,7 +34,7 @@ import UserPermissions from "./components/UserPermissions";
 import { getSortedRoles, sortPermissionOverwrites } from "./utils";

 const PopoutClasses = findByPropsLazy("container", "scroller", "list");
-const RoleButtonClasses = findByPropsLazy("button", "buttonInner", "icon", "text");
+const RoleButtonClasses = findByPropsLazy("button", "buttonInner", "icon", "banner");

 export const enum PermissionsSortOrder {
    HighestRole,
--- a/src/plugins/reviewDB/index.tsx
+++ b/src/plugins/reviewDB/index.tsx
@ -37,8 +37,7 @@ import { getCurrentUserInfo, readNotification } from "./reviewDbApi";
 import { settings } from "./settings";
 import { showToast } from "./utils";

-const PopoutClasses = findByPropsLazy("container", "scroller", "list");
-const RoleButtonClasses = findByPropsLazy("button", "buttonInner", "icon", "text");
+const RoleButtonClasses = findByPropsLazy("button", "buttonInner", "icon", "banner");

 const guildPopoutPatch: NavContextMenuPatchCallback = (children, { guild }: { guild: Guild, onClose(): void; }) => {
    if (!guild) return;
@ -181,9 +180,9 @@ export default definePlugin({
                    onClick={() => openReviewsModal(user.id, user.username)}
                    look={Button.Looks.FILLED}
                    size={Button.Sizes.NONE}
-                    color={RoleButtonClasses.color}
-                    className={classes(RoleButtonClasses.button, RoleButtonClasses.banner)}
-                    innerClassName={classes(RoleButtonClasses.buttonInner, RoleButtonClasses.banner)}
+                    color={RoleButtonClasses.bannerColor}
+                    className={classes(RoleButtonClasses.button, RoleButtonClasses.icon, RoleButtonClasses.banner)}
+                    innerClassName={classes(RoleButtonClasses.buttonInner, RoleButtonClasses.icon, RoleButtonClasses.banner)}
                >
                    <NotesIcon height={16} width={16} />
                </Button>
--- a/src/plugins/roleColorEverywhere/index.tsx
+++ b/src/plugins/roleColorEverywhere/index.tsx
@ -60,7 +60,7 @@ export default definePlugin({
            find: 'location:"UserMention',
            replacement: [
                {
-                    match: /user:(\i),channel:(\i).{0,400}?"@"\.concat\(.+?\)/,
+                    match: /onContextMenu:\i,color:\i,\.\.\.\i(?=,children:)(?<=user:(\i),channel:(\i).{0,500}?)/,
                    replace: "$&,color:$self.getUserColor($1?.id,{channelId:$2?.id})"
                }
            ],
--- a/src/plugins/showAllRoles/index.ts
+++ b/src/plugins/showAllRoles/index.ts
@ -15,8 +15,8 @@ export default definePlugin({
        {
            find: ".Messages.VIEW_ALL_ROLES",
            replacement: {
-                match: /return null!=\i(?=\?\i\.slice)/,
-                replace: "return false"
+                match: /(\i)\.slice\(0,\i\)/,
+                replace: "$1"
            }
        }
    ]
--- a/src/plugins/showHiddenChannels/index.tsx
+++ b/src/plugins/showHiddenChannels/index.tsx
@ -257,7 +257,7 @@ export default definePlugin({
        {
            find: '"alt+shift+down"',
            replacement: {
-                match: /(?<=getChannel\(\i\);return null!=(\i))(?=.{0,150}?>0\)&&\(0,\i\.\i\)\(\i\))/,
+                match: /(?<=getChannel\(\i\);return null!=(\i))(?=.{0,200}?>0\)&&\(0,\i\.\i\)\(\i\))/,
                replace: (_, channel) => `&&!$self.isHiddenChannel(${channel})`
            }
        },
@ -265,8 +265,8 @@ export default definePlugin({
        {
            find: ".APPLICATION_STORE&&null!=",
            replacement: {
-                match: /(?<=getState\(\)\.channelId.{0,30}?\(0,\i\.\i\)\(\i\))(?=\.map\()/,
-                replace: ".filter(e=>!$self.isHiddenChannel(e))"
+                match: /getState\(\)\.channelId.+?(?=\.map\(\i=>\i\.id)/,
+                replace: "$&.filter(e=>!$self.isHiddenChannel(e))"
            }
        },
        {
--- a/src/plugins/showHiddenThings/index.ts
+++ b/src/plugins/showHiddenThings/index.ts
@ -18,34 +18,21 @@

 import { definePluginSettings, migratePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
+import definePlugin, { OptionType, PluginSettingDef } from "@utils/types";
+
+const opt = (description: string) => ({
+    type: OptionType.BOOLEAN,
+    description,
+    default: true,
+    restartNeeded: true
+} satisfies PluginSettingDef);

 const settings = definePluginSettings({
-    showTimeouts: {
-        type: OptionType.BOOLEAN,
-        description: "Show member timeout icons in chat.",
-        default: true,
-    },
-    showInvitesPaused: {
-        type: OptionType.BOOLEAN,
-        description: "Show the invites paused tooltip in the server list.",
-        default: true,
-    },
-    showModView: {
-        type: OptionType.BOOLEAN,
-        description: "Show the member mod view context menu item in all servers.",
-        default: true,
-    },
-    disableDiscoveryFilters: {
-        type: OptionType.BOOLEAN,
-        description: "Disable filters in Server Discovery search that hide servers that don't meet discovery criteria.",
-        default: true,
-    },
-    disableDisallowedDiscoveryFilters: {
-        type: OptionType.BOOLEAN,
-        description: "Disable filters in Server Discovery search that hide NSFW & disallowed servers.",
-        default: true,
-    },
+    showTimeouts: opt("Show member timeout icons in chat."),
+    showInvitesPaused: opt("Show the invites paused tooltip in the server list."),
+    showModView: opt("Show the member mod view context menu item in all servers."),
+    disableDiscoveryFilters: opt("Disable filters in Server Discovery search that hide servers that don't meet discovery criteria."),
+    disableDisallowedDiscoveryFilters: opt("Disable filters in Server Discovery search that hide NSFW & disallowed servers."),
 });

 migratePluginSettings("ShowHiddenThings", "ShowTimeouts");
--- a/src/plugins/showMeYourName/index.tsx
+++ b/src/plugins/showMeYourName/index.tsx
@ -67,7 +67,7 @@ export default definePlugin({
            const { nick } = author;
            const prefix = withMentionPrefix ? "@" : "";

-            if (isRepliedMessage && !settings.store.inReplies || username === nick.toLowerCase())
+            if (isRepliedMessage && !settings.store.inReplies || username.toLowerCase() === nick.toLowerCase())
                return <>{prefix}{nick}</>;

            if (settings.store.mode === "user-nick")
--- a/src/plugins/urbanDictionary/README.md
+++ b/src/plugins/urbanDictionary/README.md
@ -1,13 +0,0 @@
-# Urban Dictionary
-
-Use /urban slash command to search for a definition for a word on [Urban Dictionary](https://www.urbandictionary.com/).
-
-## Preview
-
-![preview](https://i.imgur.com/1zwzj38.png)
-
-## Usage
-
- Enable this plugin
- Set plugin settings as desired
- Type /urban and start getting definitions right into your Discord client.
--- a/src/plugins/urbanDictionary/index.ts
+++ b/src/plugins/urbanDictionary/index.ts
@ -1,105 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { ApplicationCommandOptionType, sendBotMessage } from "@api/Commands";
-import { ApplicationCommandInputType } from "@api/Commands/types";
-import { definePluginSettings } from "@api/Settings";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-
-const settings = definePluginSettings({
-    resultsAmount: {
-        type: OptionType.NUMBER,
-        description: "The amount of results you want to get (more gives better results, but is slower)",
-        default: 10
-    }
-});
-
-export default definePlugin({
-    name: "UrbanDictionary",
-    description: "Search for a word on Urban Dictionary via /urban slash command",
-    authors: [Devs.jewdev],
-    dependencies: ["CommandsAPI"],
-    settings,
-    commands: [
-        {
-            name: "urban",
-            description: "Returns the definition of a word from Urban Dictionary",
-            inputType: ApplicationCommandInputType.BUILT_IN,
-            options: [
-                {
-                    type: ApplicationCommandOptionType.STRING,
-                    name: "word",
-                    description: "The word to search for on Urban Dictionary",
-                    required: true
-                }
-            ],
-            execute: async (args, ctx) => {
-                try {
-                    const query: string = encodeURIComponent(args[0].value);
-                    const { list } = await fetch(`https://api.urbandictionary.com/v0/define?term=${query}&per_page=${settings.store.resultsAmount}`).then(response => response.json());
-
-                    if (!list.length)
-                        return void sendBotMessage(ctx.channel.id, { content: "No results found." });
-
-                    const definition = list.reduce((prev, curr) => {
-                        return prev.thumbs_up > curr.thumbs_up ? prev : curr;
-                    });
-
-                    const linkify = (text: string) => text
-                        .replaceAll("\r\n", "\n")
-                        .replace(/([*>_`~\\])/gsi, "\\$1")
-                        .replace(/\[(.+?)\]/g, (_, word) => `[${word}](https://www.urbandictionary.com/define.php?term=${encodeURIComponent(word)} "Define '${word}' on Urban Dictionary")`)
-                        .trim();
-
-                    return void sendBotMessage(ctx.channel.id, {
-                        embeds: [
-                            {
-                                type: "rich",
-                                author: {
-                                    name: `Uploaded by "${definition.author}"`,
-                                    url: `https://www.urbandictionary.com/author.php?author=${encodeURIComponent(definition.author)}`,
-                                },
-                                title: definition.word,
-                                url: `https://www.urbandictionary.com/define.php?term=${encodeURIComponent(definition.word)}`,
-                                description: linkify(definition.definition),
-                                fields: [
-                                    {
-                                        name: "Example",
-                                        value: linkify(definition.example),
-                                    },
-                                    {
-                                        name: "Want more definitions?",
-                                        value: `Check out [more definitions](https://www.urbandictionary.com/define.php?term=${query} "Define "${args[0].value}" on Urban Dictionary") on Urban Dictionary.`,
-                                    },
-                                ],
-                                color: 0xFF9900,
-                                footer: { text: `👍 ${definition.thumbs_up.toString()} | 👎 ${definition.thumbs_down.toString()}`, icon_url: "https://www.urbandictionary.com/favicon.ico" },
-                                timestamp: new Date(definition.written_on).toISOString(),
-                            },
-                        ] as any,
-                    });
-                } catch (error) {
-                    sendBotMessage(ctx.channel.id, {
-                        content: `Something went wrong: \`${error}\``,
-                    });
-                }
-            }
-        }
-    ]
-});
--- a/src/plugins/viewIcons/index.tsx
+++ b/src/plugins/viewIcons/index.tsx
@ -183,14 +183,22 @@ export default definePlugin({
    },

    patches: [
-        // Profiles Modal pfp
-        ...[".MODAL,hasProfileEffect", ".FULL_SIZE,hasProfileEffect:"].map(find => ({
-            find,
+        // Avatar component used in User DMs "User Profile" popup in the right and Profiles Modal pfp
+        {
+            find: ".overlay:void 0,status:",
+            replacement: {
+                match: /avatarSrc:(\i),eventHandlers:(\i).+?"div",{...\2,/,
+                replace: "$&style:{cursor:\"pointer\"},onClick:()=>{$self.openImage($1)},"
+            }
+        },
+        // Old Profiles Modal pfp
+        {
+            find: ".MODAL,hasProfileEffect",
            replacement: {
                match: /\{src:(\i)(?=,avatarDecoration)/,
                replace: "{src:$1,onClick:()=>$self.openImage($1)"
            }
-        })),
+        },
        // Banners
        ...[".NITRO_BANNER,", "=!1,canUsePremiumCustomization:"].map(find => ({
            find,
@ -202,7 +210,7 @@ export default definePlugin({
                    'onClick:ev=>$1&&ev.target.style.backgroundImage&&$self.openImage($2),style:{cursor:$1?"pointer":void 0,'
            }
        })),
-        // User DMs "User Profile" popup in the right
+        // Old User DMs "User Profile" popup in the right
        {
            find: ".avatarPositionPanel",
            replacement: {
@ -210,14 +218,6 @@ export default definePlugin({
                replace: "$1style:($2)?{cursor:\"pointer\"}:{},onClick:$2?()=>{$self.openImage($3)}"
            }
        },
-        {
-            find: ".canUsePremiumProfileCustomization,{avatarSrc:",
-            replacement: {
-                match: /children:\(0,\i\.jsx\)\(\i,{src:(\i)/,
-                replace: "style:{cursor:\"pointer\"},onClick:()=>{$self.openImage($1)},$&"
-
-            }
-        },
        // Group DMs top small & large icon
        {
            find: /\.recipients\.length>=2(?!<isMultiUserDM.{0,50})/,
--- a/src/plugins/viewRaw/index.tsx
+++ b/src/plugins/viewRaw/index.tsx
@ -55,6 +55,7 @@ function cleanMessage(msg: Message) {
    const cloneAny = clone as any;
    delete cloneAny.editHistory;
    delete cloneAny.deleted;
+    delete cloneAny.firstEditTimestamp;
    cloneAny.attachments?.forEach(a => delete a.deleted);

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

--- a/src/webpack/common/types/utils.d.ts
+++ b/src/webpack/common/types/utils.d.ts
@ -16,7 +16,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import { Guild, GuildMember } from "discord-types/general";
+import { Guild, GuildMember, User } from "discord-types/general";
 import type { ReactNode } from "react";
 import { LiteralUnion } from "type-fest";

@ -256,3 +256,63 @@ export interface PopoutActions {
    close(key: string): void;
    setAlwaysOnTop(key: string, alwaysOnTop: boolean): void;
 }
+
+export type UserNameUtilsTagInclude = LiteralUnion<"auto" | "always" | "never", string>;
+export interface UserNameUtilsTagOptions {
+    forcePomelo?: boolean;
+    identifiable?: UserNameUtilsTagInclude;
+    decoration?: UserNameUtilsTagInclude;
+    mode?: "full" | "username";
+}
+
+export interface UsernameUtils {
+    getGlobalName(user: User): string;
+    getFormattedName(user: User, useTagInsteadOfUsername?: boolean): string;
+    getName(user: User): string;
+    useName(user: User): string;
+    getUserTag(user: User, options?: UserNameUtilsTagOptions): string;
+    useUserTag(user: User, options?: UserNameUtilsTagOptions): string;
+
+
+    useDirectMessageRecipient: any;
+    humanizeStatus: any;
+}
+
+export class DisplayProfile {
+    userId: string;
+    banner?: string;
+    bio?: string;
+    pronouns?: string;
+    accentColor?: number;
+    themeColors?: number[];
+    popoutAnimationParticleType?: any;
+    profileEffectId?: string;
+    _userProfile?: any;
+    _guildMemberProfile?: any;
+    canUsePremiumProfileCustomization: boolean;
+    canEditThemes: boolean;
+    premiumGuildSince: Date | null;
+    premiumSince: Date | null;
+    premiumType?: number;
+    primaryColor?: number;
+
+    getBadges(): Array<{
+        id: string;
+        description: string;
+        icon: string;
+        link?: string;
+    }>;
+    getBannerURL(options: { canAnimate: boolean; size: number; }): string;
+    getLegacyUsername(): string | null;
+    hasFullProfile(): boolean;
+    hasPremiumCustomization(): boolean;
+    hasThemeColors(): boolean;
+    isUsingGuildMemberBanner(): boolean;
+    isUsingGuildMemberBio(): boolean;
+    isUsingGuildMemberPronouns(): boolean;
+}
+
+export interface DisplayProfileUtils {
+    getDisplayProfile(userId: string, guildId?: string, customStores?: any): DisplayProfile | null;
+    useDisplayProfile(userId: string, guildId?: string, customStores?: any): DisplayProfile | null;
+}
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@ -73,6 +73,25 @@ const ToastPosition = {
    BOTTOM: 1
 };

+export interface ToastData {
+    message: string,
+    id: string,
+    /**
+     * Toasts.Type
+     */
+    type: number,
+    options?: ToastOptions;
+}
+
+export interface ToastOptions {
+    /**
+     * Toasts.Position
+     */
+    position?: number;
+    component?: React.ReactNode,
+    duration?: number;
+}
+
 export const Toasts = {
    Type: ToastType,
    Position: ToastPosition,
@ -81,23 +100,9 @@ export const Toasts = {

    // hack to merge with the following interface, dunno if there's a better way
    ...{} as {
-        show(data: {
-            message: string,
-            id: string,
-            /**
-             * Toasts.Type
-             */
-            type: number,
-            options?: {
-                /**
-                 * Toasts.Position
-                 */
-                position?: number;
-                component?: React.ReactNode,
-                duration?: number;
-            };
-        }): void;
+        show(data: ToastData): void;
        pop(): void;
+        create(message: string, type: number, options?: ToastOptions): ToastData;
    }
 };

@ -105,18 +110,15 @@ export const Toasts = {
 waitFor("showToast", m => {
    Toasts.show = m.showToast;
    Toasts.pop = m.popToast;
+    Toasts.create = m.createToast;
 });


 /**
 * Show a simple toast. If you need more options, use Toasts.show manually
 */
-export function showToast(message: string, type = ToastType.MESSAGE) {
-    Toasts.show({
-        id: Toasts.genId(),
-        message,
-        type
-    });
+export function showToast(message: string, type = ToastType.MESSAGE, options?: ToastOptions) {
+    Toasts.show(Toasts.create(message, type, options));
 }

 export const UserUtils = {
@ -172,3 +174,9 @@ export const PopoutActions: t.PopoutActions = mapMangledModuleLazy('type:"POPOUT
    close: filters.byCode('type:"POPOUT_WINDOW_CLOSE"'),
    setAlwaysOnTop: filters.byCode('type:"POPOUT_WINDOW_SET_ALWAYS_ON_TOP"'),
 });
+
+export const UsernameUtils: t.UsernameUtils = findByPropsLazy("useName", "getGlobalName");
+export const DisplayProfileUtils: t.DisplayProfileUtils = mapMangledModuleLazy(/=\i\.getUserProfile\(\i\),\i=\i\.getGuildMemberProfile\(/, {
+    getDisplayProfile: filters.byCode(".getGuildMemberProfile("),
+    useDisplayProfile: filters.byCode(/\[\i\.\i,\i\.\i],\(\)=>/)
+});
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@ -259,7 +259,6 @@ function patchFactories(factories: Record<string, (module: any, exports: any, re

        for (let i = 0; i < patches.length; i++) {
            const patch = patches[i];
-            if (patch.predicate && !patch.predicate()) continue;

            const moduleMatches = typeof patch.find === "string"
                ? code.includes(patch.find)
@ -275,8 +274,6 @@ function patchFactories(factories: Record<string, (module: any, exports: any, re

            // We change all patch.replacement to array in plugins/index
            for (const replacement of patch.replacement as PatchReplacement[]) {
-                if (replacement.predicate && !replacement.predicate()) continue;
-
                const lastMod = mod;
                const lastCode = code;

--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@ -38,31 +38,43 @@ export let cache: WebpackInstance["c"];

 export type FilterFn = (mod: any) => boolean;

+type PropsFilter = Array<string>;
+type CodeFilter = Array<string | RegExp>;
+type StoreNameFilter = string;
+
+const stringMatches = (s: string, filter: CodeFilter) =>
+    filter.every(f =>
+        typeof f === "string"
+            ? s.includes(f)
+            : f.test(s)
+    );
+
 export const filters = {
-    byProps: (...props: string[]): FilterFn =>
+    byProps: (...props: PropsFilter): FilterFn =>
        props.length === 1
            ? m => m[props[0]] !== void 0
            : m => props.every(p => m[p] !== void 0),

-    byCode: (...code: string[]): FilterFn => m => {
-        if (typeof m !== "function") return false;
-        const s = Function.prototype.toString.call(m);
-        for (const c of code) {
-            if (!s.includes(c)) return false;
-        }
-        return true;
+    byCode: (...code: CodeFilter): FilterFn => {
+        code = code.map(canonicalizeMatch);
+        return m => {
+            if (typeof m !== "function") return false;
+            return stringMatches(Function.prototype.toString.call(m), code);
+        };
    },
-    byStoreName: (name: string): FilterFn => m =>
+    byStoreName: (name: StoreNameFilter): FilterFn => m =>
        m.constructor?.displayName === name,

-    componentByCode: (...code: string[]): FilterFn => {
+    componentByCode: (...code: CodeFilter): FilterFn => {
        const filter = filters.byCode(...code);
        return m => {
            if (filter(m)) return true;
            if (!m.$$typeof) return false;
-            if (m.type && m.type.render) return filter(m.type.render); // memo + forwardRef
-            if (m.type) return filter(m.type); // memos
-            if (m.render) return filter(m.render); // forwardRefs
+            if (m.type)
+                return m.type.render
+                    ? filter(m.type.render) // memo + forwardRef
+                    : filter(m.type); // memo
+            if (m.render) return filter(m.render); // forwardRef
            return false;
        };
    }
@ -245,15 +257,9 @@ export const findBulk = traceFunction("findBulk", function findBulk(...filterFns
 * Find the id of the first module factory that includes all the given code
 * @returns string or null
 */
-export const findModuleId = traceFunction("findModuleId", function findModuleId(...code: string[]) {
-    outer:
+export const findModuleId = traceFunction("findModuleId", function findModuleId(...code: CodeFilter) {
    for (const id in wreq.m) {
-        const str = wreq.m[id].toString();
-
-        for (const c of code) {
-            if (!str.includes(c)) continue outer;
-        }
-        return id;
+        if (stringMatches(wreq.m[id].toString(), code)) return id;
    }

    const err = new Error("Didn't find module with code(s):\n" + code.join("\n"));
@ -272,7 +278,7 @@ export const findModuleId = traceFunction("findModuleId", function findModuleId(
 * Find the first module factory that includes all the given code
 * @returns The module factory or null
 */
-export function findModuleFactory(...code: string[]) {
+export function findModuleFactory(...code: CodeFilter) {
    const id = findModuleId(...code);
    if (!id) return null;

@ -325,7 +331,7 @@ export function findLazy(filter: FilterFn) {
 /**
 * Find the first module that has the specified properties
 */
-export function findByProps(...props: string[]) {
+export function findByProps(...props: PropsFilter) {
    const res = find(filters.byProps(...props), { isIndirect: true });
    if (!res)
        handleModuleNotFound("findByProps", ...props);
@ -335,7 +341,7 @@ export function findByProps(...props: string[]) {
 /**
 * Find the first module that has the specified properties, lazily
 */
-export function findByPropsLazy(...props: string[]) {
+export function findByPropsLazy(...props: PropsFilter) {
    if (IS_REPORTER) lazyWebpackSearchHistory.push(["findByProps", props]);

    return proxyLazy(() => findByProps(...props));
@ -344,7 +350,7 @@ export function findByPropsLazy(...props: string[]) {
 /**
 * Find the first function that includes all the given code
 */
-export function findByCode(...code: string[]) {
+export function findByCode(...code: CodeFilter) {
    const res = find(filters.byCode(...code), { isIndirect: true });
    if (!res)
        handleModuleNotFound("findByCode", ...code);
@ -354,7 +360,7 @@ export function findByCode(...code: string[]) {
 /**
 * Find the first function that includes all the given code, lazily
 */
-export function findByCodeLazy(...code: string[]) {
+export function findByCodeLazy(...code: CodeFilter) {
    if (IS_REPORTER) lazyWebpackSearchHistory.push(["findByCode", code]);

    return proxyLazy(() => findByCode(...code));
@ -363,7 +369,7 @@ export function findByCodeLazy(...code: string[]) {
 /**
 * Find a store by its displayName
 */
-export function findStore(name: string) {
+export function findStore(name: StoreNameFilter) {
    const res = find(filters.byStoreName(name), { isIndirect: true });
    if (!res)
        handleModuleNotFound("findStore", name);
@ -373,7 +379,7 @@ export function findStore(name: string) {
 /**
 * Find a store by its displayName, lazily
 */
-export function findStoreLazy(name: string) {
+export function findStoreLazy(name: StoreNameFilter) {
    if (IS_REPORTER) lazyWebpackSearchHistory.push(["findStore", [name]]);

    return proxyLazy(() => findStore(name));
@ -382,7 +388,7 @@ export function findStoreLazy(name: string) {
 /**
 * Finds the component which includes all the given code. Checks for plain components, memos and forwardRefs
 */
-export function findComponentByCode(...code: string[]) {
+export function findComponentByCode(...code: CodeFilter) {
    const res = find(filters.componentByCode(...code), { isIndirect: true });
    if (!res)
        handleModuleNotFound("findComponentByCode", ...code);
@ -407,7 +413,7 @@ export function findComponentLazy<T extends object = any>(filter: FilterFn) {
 /**
 * Finds the first component that includes all the given code, lazily
 */
-export function findComponentByCodeLazy<T extends object = any>(...code: string[]) {
+export function findComponentByCodeLazy<T extends object = any>(...code: CodeFilter) {
    if (IS_REPORTER) lazyWebpackSearchHistory.push(["findComponentByCode", code]);

    return LazyComponent<T>(() => {
@ -421,7 +427,7 @@ export function findComponentByCodeLazy<T extends object = any>(...code: string[
 /**
 * Finds the first component that is exported by the first prop name, lazily
 */
-export function findExportedComponentLazy<T extends object = any>(...props: string[]) {
+export function findExportedComponentLazy<T extends object = any>(...props: PropsFilter) {
    if (IS_REPORTER) lazyWebpackSearchHistory.push(["findExportedComponent", props]);

    return LazyComponent<T>(() => {
@ -445,10 +451,13 @@ export function findExportedComponentLazy<T extends object = any>(...props: stri
 *             closeModal: filters.byCode("key==")
 *          })
 */
-export const mapMangledModule = traceFunction("mapMangledModule", function mapMangledModule<S extends string>(code: string, mappers: Record<S, FilterFn>): Record<S, any> {
+export const mapMangledModule = traceFunction("mapMangledModule", function mapMangledModule<S extends string>(code: string | RegExp | CodeFilter, mappers: Record<S, FilterFn>): Record<S, any> {
+    if (!Array.isArray(code)) code = [code];
+    code = code.map(canonicalizeMatch);
+
    const exports = {} as Record<S, any>;

-    const id = findModuleId(code);
+    const id = findModuleId(...code);
    if (id === null)
        return exports;

@ -482,7 +491,7 @@ export const mapMangledModule = traceFunction("mapMangledModule", function mapMa
 *             closeModal: filters.byCode("key==")
 *          })
 */
-export function mapMangledModuleLazy<S extends string>(code: string, mappers: Record<S, FilterFn>): Record<S, any> {
+export function mapMangledModuleLazy<S extends string>(code: string | RegExp | CodeFilter, mappers: Record<S, FilterFn>): Record<S, any> {
    if (IS_REPORTER) lazyWebpackSearchHistory.push(["mapMangledModule", [code, mappers]]);

    return proxyLazy(() => mapMangledModule(code, mappers));
@ -497,7 +506,7 @@ export const ChunkIdsRegex = /\("([^"]+?)"\)/g;
 * @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 first lazy chunk loading found in the module factory
 * @returns A promise that resolves with a boolean whether the chunks were loaded
 */
-export async function extractAndLoadChunks(code: string[], matcher: RegExp = DefaultExtractAndLoadChunksRegex) {
+export async function extractAndLoadChunks(code: CodeFilter, matcher: RegExp = DefaultExtractAndLoadChunksRegex) {
    const module = findModuleFactory(...code);
    if (!module) {
        const err = new Error("extractAndLoadChunks: Couldn't find module factory");
@ -562,7 +571,7 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp = Def
 * @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 first lazy chunk loading found in the module factory
 * @returns A function that returns a promise that resolves with a boolean whether the chunks were loaded, on first call
 */
-export function extractAndLoadChunksLazy(code: string[], matcher = DefaultExtractAndLoadChunksRegex) {
+export function extractAndLoadChunksLazy(code: CodeFilter, matcher = DefaultExtractAndLoadChunksRegex) {
    if (IS_REPORTER) lazyWebpackSearchHistory.push(["extractAndLoadChunks", [code, matcher]]);

    return makeLazy(() => extractAndLoadChunks(code, matcher));
@ -572,7 +581,7 @@ export function extractAndLoadChunksLazy(code: string[], matcher = DefaultExtrac
 * Wait for a module that matches the provided filter to be registered,
 * then call the callback with the module as the first argument
 */
-export function waitFor(filter: string | string[] | FilterFn, callback: CallbackFn, { isIndirect = false }: { isIndirect?: boolean; } = {}) {
+export function waitFor(filter: string | PropsFilter | FilterFn, callback: CallbackFn, { isIndirect = false }: { isIndirect?: boolean; } = {}) {
    if (IS_REPORTER && !isIndirect) lazyWebpackSearchHistory.push(["waitFor", Array.isArray(filter) ? filter : [filter]]);

    if (typeof filter === "string")
@ -593,21 +602,18 @@ export function waitFor(filter: string | string[] | FilterFn, callback: Callback
 /**
 * Search modules by keyword. This searches the factory methods,
 * meaning you can search all sorts of things, displayName, methodName, strings somewhere in the code, etc
- * @param filters One or more strings or regexes
+ * @param code One or more strings or regexes
 * @returns Mapping of found modules
 */
-export function search(...filters: Array<string | RegExp>) {
+export function search(...code: CodeFilter) {
    const results = {} as Record<number, Function>;
    const factories = wreq.m;
-    outer:
+
    for (const id in factories) {
        const factory = factories[id].original ?? factories[id];
-        const str: string = factory.toString();
-        for (const filter of filters) {
-            if (typeof filter === "string" && !str.includes(filter)) continue outer;
-            if (filter instanceof RegExp && !filter.test(str)) continue outer;
-        }
-        results[id] = factory;
+
+        if (stringMatches(factory.toString(), code))
+            results[id] = factory;
    }

    return results;