offline edition

CONTRIBUTING.md

@@ -31,7 +31,6 @@ Before starting your plugin:
 - No FakeDeafen or FakeMute
 - No StereoMic
 - No plugins that simply hide or redesign ui elements. This can be done with CSS
-- No plugins that interact with specific Discord bots (official Discord apps like Youtube WatchTogether are okay)
 - No selfbots or API spam (animated status, message pruner, auto reply, nitro snipers, etc)
 - No untrusted third party APIs. Popular services like Google or GitHub are fine, but absolutely no self hosted ones
 - No plugins that require the user to enter their own API key

package.json

@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.10.8",
+    "version": "1.10.7",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

src/api/ChatButtons.tsx

@@ -99,8 +99,7 @@ export interface ChatBarButtonProps {
     tooltip: string;
     onClick: MouseEventHandler<HTMLButtonElement>;
     onContextMenu?: MouseEventHandler<HTMLButtonElement>;
-    onAuxClick?: MouseEventHandler<HTMLButtonElement>;
-    buttonProps?: Omit<HTMLProps<HTMLButtonElement>, "size" | "onClick" | "onContextMenu" | "onAuxClick">;
+    buttonProps?: Omit<HTMLProps<HTMLButtonElement>, "size" | "onClick" | "onContextMenu">;
 }
 export const ChatBarButton = ErrorBoundary.wrap((props: ChatBarButtonProps) => {
     return (
@@ -116,7 +115,6 @@ export const ChatBarButton = ErrorBoundary.wrap((props: ChatBarButtonProps) => {
                         innerClassName={`${ButtonWrapperClasses.button} ${ChannelTextAreaClasses?.button}`}
                         onClick={props.onClick}
                         onContextMenu={props.onContextMenu}
-                        onAuxClick={props.onAuxClick}
                         {...props.buttonProps}
                     >
                         <div className={ButtonWrapperClasses.buttonWrapper}>

src/api/Commands/commandHelpers.ts

@@ -54,5 +54,5 @@ export function sendBotMessage(channelId: string, message: PartialDeep<Message>)
 export function findOption<T>(args: Argument[], name: string): T & {} | undefined;
 export function findOption<T>(args: Argument[], name: string, fallbackValue: T): T & {};
 export function findOption(args: Argument[], name: string, fallbackValue?: any) {
-    return (args.find(a => a.name === name)?.value ?? fallbackValue) as any;
+    return (args.find(a => a.name === name)?.value || fallbackValue) as any;
 }

src/api/Commands/index.ts

@@ -110,7 +110,6 @@ function registerSubCommands(cmd: Command, plugin: string) {
         const subCmd = {
             ...cmd,
             ...o,
-            options: o.options !== undefined ? o.options : undefined,
             type: ApplicationCommandType.CHAT_INPUT,
             name: `${cmd.name} ${o.name}`,
             id: `${o.name}-${cmd.id}`,

src/components/ExpandableHeader.css

@@ -0,0 +1,11 @@
+.vc-expandableheader-center-flex {
+    display: flex;
+    place-items: center;
+}
+
+.vc-expandableheader-btn {
+    all: unset;
+    cursor: pointer;
+    width: 24px;
+    height: 24px;
+}

src/components/ExpandableHeader.tsx

@@ -0,0 +1,121 @@
+/*
+ * 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 "./ExpandableHeader.css";
+
+import { classNameFactory } from "@api/Styles";
+import { Text, Tooltip, useState } from "@webpack/common";
+
+const cl = classNameFactory("vc-expandableheader-");
+
+export interface ExpandableHeaderProps {
+    onMoreClick?: () => void;
+    moreTooltipText?: string;
+    onDropDownClick?: (state: boolean) => void;
+    defaultState?: boolean;
+    headerText: string;
+    children: React.ReactNode;
+    buttons?: React.ReactNode[];
+    forceOpen?: boolean;
+}
+
+export function ExpandableHeader({
+    children,
+    onMoreClick,
+    buttons,
+    moreTooltipText,
+    onDropDownClick,
+    headerText,
+    defaultState = false,
+    forceOpen = false,
+}: ExpandableHeaderProps) {
+    const [showContent, setShowContent] = useState(defaultState || forceOpen);
+
+    return (
+        <>
+            <div style={{
+                display: "flex",
+                justifyContent: "space-between",
+                alignItems: "center",
+                marginBottom: "8px"
+            }}>
+                <Text
+                    tag="h2"
+                    variant="eyebrow"
+                    style={{
+                        color: "var(--header-primary)",
+                        display: "inline"
+                    }}
+                >
+                    {headerText}
+                </Text>
+
+                <div className={cl("center-flex")}>
+                    {
+                        buttons ?? null
+                    }
+
+                    {
+                        onMoreClick && // only show more button if callback is provided
+                        <Tooltip text={moreTooltipText}>
+                            {tooltipProps => (
+                                <button
+                                    {...tooltipProps}
+                                    className={cl("btn")}
+                                    onClick={onMoreClick}>
+                                    <svg
+                                        width="24"
+                                        height="24"
+                                        viewBox="0 0 24 24"
+                                    >
+                                        <path fill="var(--text-normal)" d="M7 12.001C7 10.8964 6.10457 10.001 5 10.001C3.89543 10.001 3 10.8964 3 12.001C3 13.1055 3.89543 14.001 5 14.001C6.10457 14.001 7 13.1055 7 12.001ZM14 12.001C14 10.8964 13.1046 10.001 12 10.001C10.8954 10.001 10 10.8964 10 12.001C10 13.1055 10.8954 14.001 12 14.001C13.1046 14.001 14 13.1055 14 12.001ZM19 10.001C20.1046 10.001 21 10.8964 21 12.001C21 13.1055 20.1046 14.001 19 14.001C17.8954 14.001 17 13.1055 17 12.001C17 10.8964 17.8954 10.001 19 10.001Z" />
+                                    </svg>
+                                </button>
+                            )}
+                        </Tooltip>
+                    }
+
+
+                    <Tooltip text={showContent ? "Hide " + headerText : "Show " + headerText}>
+                        {tooltipProps => (
+                            <button
+                                {...tooltipProps}
+                                className={cl("btn")}
+                                onClick={() => {
+                                    setShowContent(v => !v);
+                                    onDropDownClick?.(showContent);
+                                }}
+                                disabled={forceOpen}
+                            >
+                                <svg
+                                    width="24"
+                                    height="24"
+                                    viewBox="0 0 24 24"
+                                    transform={showContent ? "scale(1 -1)" : "scale(1 1)"}
+                                >
+                                    <path fill="var(--text-normal)" d="M16.59 8.59003L12 13.17L7.41 8.59003L6 10L12 16L18 10L16.59 8.59003Z" />
+                                </svg>
+                            </button>
+                        )}
+                    </Tooltip>
+                </div>
+            </div>
+            {showContent && children}
+        </>
+    );
+}

src/components/index.ts

@@ -10,6 +10,7 @@ export * from "./CodeBlock";
 export * from "./DonateButton";
 export { default as ErrorBoundary } from "./ErrorBoundary";
 export * from "./ErrorCard";
+export * from "./ExpandableHeader";
 export * from "./Flex";
 export * from "./Heart";
 export * from "./Icons";

src/main/patcher.ts

@@ -17,7 +17,7 @@
 */
 
 import { onceDefined } from "@shared/onceDefined";
-import electron, { app, BrowserWindowConstructorOptions, Menu } from "electron";
+import electron, { app, BrowserWindowConstructorOptions, Menu, nativeTheme } from "electron";
 import { dirname, join } from "path";
 
 import { initIpc } from "./ipcMain";
@@ -100,6 +100,19 @@ if (!IS_VANILLA) {
 
                 super(options);
                 initIpc(this);
+
+                // Workaround for https://github.com/electron/electron/issues/43367. Vesktop also has its own workaround
+                // @TODO: Remove this when the issue is fixed
+                if (IS_DISCORD_DESKTOP) {
+                    this.webContents.on("devtools-opened", () => {
+                        if (!nativeTheme.shouldUseDarkColors) return;
+
+                        nativeTheme.themeSource = "light";
+                        setTimeout(() => {
+                            nativeTheme.themeSource = "dark";
+                        }, 100);
+                    });
+                }
             } else super(options);
         }
     }

src/plugins/_api/badges/fixDiscordBadgePadding.css

@@ -1,5 +0,0 @@
-/* the profile popout badge container(s) */
-[class*="biteSize_"] [class*="tags_"] [class*="container_"] {
-    /* Discord has padding set to 2px instead of 1px, which causes the 12th badge to wrap to a new line. */
-    padding: 0 1px;
-}

src/plugins/_api/badges/index.tsx

@@ -16,8 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import "./fixDiscordBadgePadding.css";
-
 import { _getBadges, BadgePosition, BadgeUserArgs, ProfileBadge } from "@api/Badges";
 import DonateButton from "@components/DonateButton";
 import ErrorBoundary from "@components/ErrorBoundary";

src/plugins/_api/messagePopover.ts

@@ -23,14 +23,11 @@ export default definePlugin({
     name: "MessagePopoverAPI",
     description: "API to add buttons to message popovers.",
     authors: [Devs.KingFish, Devs.Ven, Devs.Nuckyz],
-    patches: [
-        {
+    patches: [{
         find: "#{intl::MESSAGE_UTILITIES_A11Y_LABEL}",
         replacement: {
-                match: /(?<=:null),(.{0,40}togglePopout:.+?}\))\]}\):null,(?<=\((\i\.\i),{label:.+?:null,(\i&&!\i)\?\(0,\i\.jsxs?\)\(\i\.Fragment.+?message:(\i).+?)/,
-                replace: (_, ReactButton, ButtonComponent, showReactButton, message) => "" +
-                    `]}):null,Vencord.Api.MessagePopover._buildPopoverElements(${ButtonComponent},${message}),${showReactButton}?${ReactButton}:null,`
+            match: /\.jsx\)\((\i\.\i),\{label:\i\.\i\.string\(\i\.\i#{intl::MESSAGE_ACTION_REPLY}.{0,200}?"reply-self".{0,50}?\}\):null(?=,.+?message:(\i))/,
+            replace: "$&,Vencord.Api.MessagePopover._buildPopoverElements($1,$2)"
         }
-        }
-    ]
+    }],
 });

src/plugins/alwaysTrust/index.ts

@@ -51,7 +51,7 @@ export default definePlugin({
         {
             find: "bitbucket.org",
             replacement: {
-                match: /function \i\(\i\){(?=.{0,30}pathname:\i)/,
+                match: /function \i\(\i\){(?=.{0,60}\.parse\(\i\))/,
                 replace: "$&return null;"
             },
             predicate: () => settings.store.file

src/plugins/betterFolders/index.tsx

@@ -123,7 +123,7 @@ export default definePlugin({
                 },
                 // If we are rendering the Better Folders sidebar, we filter out everything but the servers and folders from the GuildsBar Guild List children
                 {
-                    match: /lastTargetNode:\i\[\i\.length-1\].+?}\)\](?=}\))/,
+                    match: /lastTargetNode:\i\[\i\.length-1\].+?Fragment.+?\]}\)\]/,
                     replace: "$&.filter($self.makeGuildsBarGuildListFilter(!!arguments[0]?.isBetterFolders))"
                 },
                 // If we are rendering the Better Folders sidebar, we filter out everything but the scroller for the guild list from the GuildsBar Tree children
@@ -159,7 +159,7 @@ export default definePlugin({
             ]
         },
         {
-            find: ".expandedFolderBackground,",
+            find: ".FOLDER_ITEM_GUILD_ICON_MARGIN);",
             predicate: () => settings.store.sidebar,
             replacement: [
                 // We use arguments[0] to access the isBetterFolders variable in this nested folder component (the parent exports all the props so we don't have to patch it)
@@ -185,7 +185,7 @@ export default definePlugin({
                 {
                     // Decide if we should render the expanded folder background if we are rendering the Better Folders sidebar
                     predicate: () => settings.store.showFolderIcon !== FolderIconDisplay.Always,
-                    match: /(?<=\.isExpanded\),children:\[)/,
+                    match: /(?<=\.wrapper,children:\[)/,
                     replace: "$self.shouldShowFolderIconAndBackground(!!arguments[0]?.isBetterFolders,arguments[0]?.betterFoldersExpandedIds)&&"
                 },
                 {
@@ -276,29 +276,23 @@ export default definePlugin({
 
     makeGuildsBarGuildListFilter(isBetterFolders: boolean) {
             return child => {
-            if (!isBetterFolders) return true;
-
+                if (isBetterFolders) {
                     try {
                         return child?.props?.["aria-label"] === getIntlMessage("SERVERS");
                     } catch (e) {
                         console.error(e);
                     }
-
+                }
                 return true;
             };
     },
 
     makeGuildsBarTreeFilter(isBetterFolders: boolean) {
         return child => {
-            if (!isBetterFolders) return true;
-
-            if (child?.props?.className?.includes("itemsContainer") && child.props.children != null) {
-                // Filter out everything but the scroller for the guild list
-                child.props.children = child.props.children.filter(child => child?.props?.onScroll != null);
-                return true;
+            if (isBetterFolders) {
+                return child?.props?.onScroll != null;
             }
-
-            return false;
+            return true;
         };
     },
 

src/plugins/callTimer/index.tsx

@@ -75,11 +75,10 @@ export default definePlugin({
     patches: [{
         find: "renderConnectionStatus(){",
         replacement: {
-            match: /(?<=renderConnectionStatus\(\){.+\.channel,children:).+?}\):\i(?=}\))/,
+            match: /(?<=renderConnectionStatus\(\)\{.+\.channel,children:)\i/,
             replace: "[$&, $self.renderTimer(this.props.channel.id)]"
         }
     }],
-
     renderTimer(channelId: string) {
         return <ErrorBoundary noop>
             <this.Timer channelId={channelId} />

src/plugins/consoleJanitor/index.ts

@@ -66,13 +66,6 @@ export default definePlugin({
     },
 
     patches: [
-        {
-            find: "https://github.com/highlightjs/highlight.js/issues/2277",
-            replacement: {
-                match: /(?<=&&\()console.log\(`Deprecated.+?`\),/,
-                replace: ""
-            }
-        },
         {
             find: 'react-spring: The "interpolate" function',
             replacement: {

src/plugins/disableCallIdle/index.ts

@@ -16,9 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { migratePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 
+migratePluginSettings("DisableCallIdle", "DisableDMCallIdle");
 export default definePlugin({
     name: "DisableCallIdle",
     description: "Disables automatically getting kicked from a DM voice call after 3 minutes and being moved to an AFK voice channel.",

src/plugins/imageZoom/components/Magnifier.tsx

@@ -18,7 +18,7 @@
 
 import { classNameFactory } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { FluxDispatcher, useLayoutEffect, useRef, useState } from "@webpack/common";
+import { FluxDispatcher, React, useRef, useState } from "@webpack/common";
 
 import { ELEMENT_ID } from "../constants";
 import { settings } from "../index";
@@ -55,7 +55,7 @@ export const Magnifier = ErrorBoundary.wrap<MagnifierProps>(({ instance, size: i
     const imageRef = useRef<HTMLImageElement | null>(null);
 
     // since we accessing document im gonna use useLayoutEffect
-    useLayoutEffect(() => {
+    React.useLayoutEffect(() => {
         const onKeyDown = (e: KeyboardEvent) => {
             if (e.key === "Shift") {
                 isShiftDown.current = true;
@@ -135,14 +135,12 @@ export const Magnifier = ErrorBoundary.wrap<MagnifierProps>(({ instance, size: i
 
             setReady(true);
         });
-
         document.addEventListener("keydown", onKeyDown);
         document.addEventListener("keyup", onKeyUp);
         document.addEventListener("mousemove", updateMousePosition);
         document.addEventListener("mousedown", onMouseDown);
         document.addEventListener("mouseup", onMouseUp);
         document.addEventListener("wheel", onWheel);
-
         return () => {
             document.removeEventListener("keydown", onKeyDown);
             document.removeEventListener("keyup", onKeyUp);
@@ -150,15 +148,13 @@ export const Magnifier = ErrorBoundary.wrap<MagnifierProps>(({ instance, size: i
             document.removeEventListener("mousedown", onMouseDown);
             document.removeEventListener("mouseup", onMouseUp);
             document.removeEventListener("wheel", onWheel);
-        };
-    }, []);
 
-    useLayoutEffect(() => () => {
             if (settings.store.saveZoomValues) {
                 settings.store.zoom = zoom.current;
                 settings.store.size = size.current;
             }
-    });
+        };
+    }, []);
 
     if (!ready) return null;
 

src/plugins/mutualGroupDMs/index.tsx

@@ -19,7 +19,6 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { isNonNullish } from "@utils/guards";
-import { Logger } from "@utils/Logger";
 import definePlugin from "@utils/types";
 import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import { Avatar, ChannelStore, Clickable, IconUtils, RelationshipStore, ScrollerThin, useMemo, UserStore } from "@webpack/common";
@@ -98,32 +97,14 @@ export default definePlugin({
         },
         {
             find: 'section:"MUTUAL_FRIENDS"',
-            replacement: [
-                {
-                    match: /\i\|\|\i(?=\?\(0,\i\.jsxs?\)\(\i\.\i\.Overlay,)/,
-                    replace: "$&||$self.getMutualGroupDms(arguments[0].user.id).length>0"
-                },
-                {
-                    match: /\.openUserProfileModal.+?\)}\)}\)(?<=,(\i)&&(\i)&&(\(0,\i\.jsxs?\)\(\i\.\i,{className:(\i)\.divider}\)).+?)/,
-                    replace: (m, hasMutualGuilds, hasMutualFriends, Divider, classes) => "" +
-                        `${m},$self.renderDMPageList({user:arguments[0].user,hasDivider:${hasMutualGuilds}||${hasMutualFriends},Divider:${Divider},listStyle:${classes}.list})`
+            replacement: {
+                match: /\.openUserProfileModal.+?\)}\)}\)(?<=(\(0,\i\.jsxs?\)\(\i\.\i,{className:(\i)\.divider}\)).+?)/,
+                replace: "$&,$self.renderDMPageList({user: arguments[0].user, Divider: $1, listStyle: $2.list})"
             }
-            ]
         }
     ],
 
-    getMutualGroupDms(userId: string) {
-        try {
-            return getMutualGroupDms(userId);
-        } catch (e) {
-            new Logger("MutualGroupDMs").error("Failed to get mutual group dms:", e);
-        }
-
-        return [];
-    },
-
     pushSection(sections: any[], user: User) {
-        try {
         if (isBotOrSelf(user) || sections[IS_PATCHED]) return;
 
         sections[IS_PATCHED] = true;
@@ -131,13 +112,11 @@ export default definePlugin({
             section: "MUTUAL_GDMS",
             text: getMutualGDMCountText(user)
         });
-        } catch (e) {
-            new Logger("MutualGroupDMs").error("Failed to push mutual group dms section:", e);
-        }
     },
 
     renderMutualGDMs: ErrorBoundary.wrap(({ user, onClose }: { user: User, onClose: () => void; }) => {
         const mutualGDms = useMemo(() => getMutualGroupDms(user.id), [user.id]);
+
         const entries = renderClickableGDMs(mutualGDms, onClose);
 
         return (
@@ -159,13 +138,14 @@ export default definePlugin({
         );
     }),
 
-    renderDMPageList: ErrorBoundary.wrap(({ user, hasDivider, Divider, listStyle }: { user: User, hasDivider: boolean, Divider: JSX.Element, listStyle: string; }) => {
+    renderDMPageList: ErrorBoundary.wrap(({ user, Divider, listStyle }: { user: User, Divider: JSX.Element, listStyle: string; }) => {
         const mutualGDms = getMutualGroupDms(user.id);
         if (mutualGDms.length === 0) return null;
 
+
         return (
             <>
-                {hasDivider && Divider}
+                {Divider}
                 <ExpandableList
                     listClassName={listStyle}
                     header={"Mutual Groups"}

src/plugins/newGuildSettings/index.tsx

@@ -20,7 +20,7 @@ import {
     findGroupChildrenByChildId,
     NavContextMenuPatchCallback
 } from "@api/ContextMenu";
-import { definePluginSettings } from "@api/Settings";
+import { definePluginSettings, migratePluginSettings } from "@api/Settings";
 import { CogWheel } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
@@ -115,6 +115,8 @@ function applyDefaultSettings(guildId: string | null) {
     }
 }
 
+
+migratePluginSettings("NewGuildSettings", "MuteNewGuild");
 export default definePlugin({
     name: "NewGuildSettings",
     description: "Automatically mute new servers and change various other settings upon joining",

src/plugins/noScreensharePreview/index.ts

@@ -16,27 +16,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { getUserSettingLazy } from "@api/UserSettings";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 
-const DisableStreamPreviews = getUserSettingLazy<boolean>("voiceAndVideo", "disableStreamPreviews")!;
-
-// @TODO: Delete this plugin in the future
 export default definePlugin({
     name: "NoScreensharePreview",
     description: "Disables screenshare previews from being sent.",
     authors: [Devs.Nuckyz],
-
-    start() {
-        if (!DisableStreamPreviews.getSetting()) {
-            DisableStreamPreviews.updateSetting(true);
-        }
-    },
-
-    stop() {
-        if (DisableStreamPreviews.getSetting()) {
-            DisableStreamPreviews.updateSetting(false);
+    patches: [
+        {
+            find: '"ApplicationStreamPreviewUploadManager"',
+            replacement: {
+                match: /await \i\.\i\.(makeChunkedRequest\(|post\(\{url:)\i\.\i\.STREAM_PREVIEW.+?\}\)/g,
+                replace: "0"
             }
         }
+    ]
 });

src/plugins/partyMode/index.ts

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { definePluginSettings } from "@api/Settings";
+import { definePluginSettings, migratePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType, ReporterTestable } from "@utils/types";
 import { FluxDispatcher } from "@webpack/common";
@@ -41,6 +41,7 @@ const settings = definePluginSettings({
     },
 });
 
+migratePluginSettings("PartyMode", "Party mode 🎉");
 export default definePlugin({
     name: "PartyMode",
     description: "Allows you to use party mode cause the party never ends ✨",

src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx

@@ -22,12 +22,12 @@ import { InfoIcon, OwnerCrownIcon } from "@components/Icons";
 import { getIntlMessage, getUniqueUsername } from "@utils/discord";
 import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { findByCodeLazy } from "@webpack";
-import { Clipboard, ContextMenuApi, FluxDispatcher, GuildMemberStore, GuildStore, i18n, Menu, PermissionsBits, ScrollerThin, Text, Tooltip, useEffect, useMemo, UserStore, useState, useStateFromStores } from "@webpack/common";
+import { Clipboard, ContextMenuApi, FluxDispatcher, GuildMemberStore, GuildStore, Menu, PermissionsBits, ScrollerThin, Text, Tooltip, useEffect, UserStore, useState, useStateFromStores } from "@webpack/common";
 import { UnicodeEmoji } from "@webpack/types";
 import type { Guild, Role, User } from "discord-types/general";
 
 import { settings } from "..";
-import { cl, getGuildPermissionSpecMap } from "../utils";
+import { cl, getPermissionDescription, getPermissionString } from "../utils";
 import { PermissionAllowedIcon, PermissionDefaultIcon, PermissionDeniedIcon } from "./icons";
 
 export const enum PermissionType {
@@ -56,7 +56,7 @@ function getRoleIconSrc(role: Role) {
 }
 
 function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, header }: { permissions: Array<RoleOrUserPermission>; guild: Guild; modalProps: ModalProps; header: string; }) {
-    const guildPermissionSpecMap = useMemo(() => getGuildPermissionSpecMap(guild), [guild.id]);
+    permissions.sort((a, b) => a.type - b.type);
 
     useStateFromStores(
         [GuildMemberStore],
@@ -65,10 +65,6 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
         (old, current) => old.length === current.length
     );
 
-    useEffect(() => {
-        permissions.sort((a, b) => a.type - b.type);
-    }, [permissions]);
-
     useEffect(() => {
         const usersToRequest = permissions
             .filter(p => p.type === PermissionType.User && !GuildMemberStore.isMember(guild.id, p.id!))
@@ -177,7 +173,7 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
                         </ScrollerThin>
                         <div className={cl("modal-divider")} />
                         <ScrollerThin className={cl("modal-perms")} orientation="auto">
-                            {Object.values(PermissionsBits).map(bit => (
+                            {Object.entries(PermissionsBits).map(([permissionName, bit]) => (
                                 <div className={cl("modal-perms-item")}>
                                     <div className={cl("modal-perms-item-icon")}>
                                         {(() => {
@@ -196,14 +192,9 @@ function RolesAndUsersPermissionsComponent({ permissions, guild, modalProps, hea
                                             return PermissionDefaultIcon();
                                         })()}
                                     </div>
-                                    <Text variant="text-md/normal">{guildPermissionSpecMap[String(bit)].title}</Text>
+                                    <Text variant="text-md/normal">{getPermissionString(permissionName)}</Text>
 
-                                    <Tooltip text={
-                                        (() => {
-                                            const { description } = guildPermissionSpecMap[String(bit)];
-                                            return typeof description === "function" ? i18n.intl.format(description, {}) : description;
-                                        })()
-                                    }>
+                                    <Tooltip text={getPermissionDescription(permissionName) || "No Description"}>
                                         {props => <InfoIcon {...props} />}
                                     </Tooltip>
                                 </div>

src/plugins/permissionsViewer/components/UserPermissions.tsx

@@ -17,6 +17,7 @@
 */
 
 import ErrorBoundary from "@components/ErrorBoundary";
+import { ExpandableHeader } from "@components/ExpandableHeader";
 import { getIntlMessage } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { filters, findBulk, proxyLazyWebpack } from "@webpack";
@@ -24,7 +25,7 @@ import { PermissionsBits, Text, Tooltip, useMemo, UserStore } from "@webpack/com
 import type { Guild, GuildMember } from "discord-types/general";
 
 import { PermissionsSortOrder, settings } from "..";
-import { cl, getGuildPermissionSpecMap, getSortedRoles, sortUserRoles } from "../utils";
+import { cl, getPermissionString, getSortedRoles, sortUserRoles } from "../utils";
 import openRolesAndUsersPermissionsModal, { PermissionType, type RoleOrUserPermission } from "./RolesAndUsersPermissions";
 
 interface UserPermission {
@@ -86,11 +87,9 @@ function GrantedByTooltip({ roleName, roleColor }: GrantedByTooltipProps) {
     );
 }
 
-function UserPermissionsComponent({ guild, guildMember, closePopout }: { guild: Guild; guildMember: GuildMember; closePopout: () => void; }) {
+function UserPermissionsComponent({ guild, guildMember, forceOpen = false }: { guild: Guild; guildMember: GuildMember; forceOpen?: boolean; }) {
     const { permissionsSortOrder } = settings.use(["permissionsSortOrder"]);
 
-    const guildPermissionSpecMap = useMemo(() => getGuildPermissionSpecMap(guild), [guild.id]);
-
     const [rolePermissions, userPermissions] = useMemo(() => {
         const userPermissions: UserPermissions = [];
 
@@ -107,7 +106,7 @@ function UserPermissionsComponent({ guild, guildMember, closePopout }: { guild:
                 permissions: Object.values(PermissionsBits).reduce((prev, curr) => prev | curr, 0n)
             });
 
-            const OWNER = getIntlMessage("GUILD_OWNER") ?? "Server Owner";
+            const OWNER = getIntlMessage("GUILD_OWNER") || "Server Owner";
             userPermissions.push({
                 permission: OWNER,
                 roleName: "Owner",
@@ -118,11 +117,11 @@ function UserPermissionsComponent({ guild, guildMember, closePopout }: { guild:
 
         sortUserRoles(userRoles);
 
-        for (const bit of Object.values(PermissionsBits)) {
+        for (const [permission, bit] of Object.entries(PermissionsBits)) {
             for (const { permissions, colorString, position, name } of userRoles) {
                 if ((permissions & bit) === bit) {
                     userPermissions.push({
-                        permission: guildPermissionSpecMap[String(bit)].title,
+                        permission: getPermissionString(permission),
                         roleName: name,
                         roleColor: colorString || "var(--primary-300)",
                         rolePosition: position
@@ -138,15 +137,26 @@ function UserPermissionsComponent({ guild, guildMember, closePopout }: { guild:
         return [rolePermissions, userPermissions];
     }, [permissionsSortOrder]);
 
-    return <div>
-        <div className={cl("user-header-container")}>
-            <Text variant="eyebrow">Permissions</Text>
-            <div className={cl("user-header-btns")}>
+    return (
+        <ExpandableHeader
+            forceOpen={forceOpen}
+            headerText="Permissions"
+            moreTooltipText="Role Details"
+            onMoreClick={() =>
+                openRolesAndUsersPermissionsModal(
+                    rolePermissions,
+                    guild,
+                    guildMember.nick || UserStore.getUser(guildMember.userId).username
+                )
+            }
+            onDropDownClick={state => settings.store.defaultPermissionsDropdownState = !state}
+            defaultState={settings.store.defaultPermissionsDropdownState}
+            buttons={[
                 <Tooltip text={`Sorting by ${permissionsSortOrder === PermissionsSortOrder.HighestRole ? "Highest Role" : "Lowest Role"}`}>
                     {tooltipProps => (
                         <div
                             {...tooltipProps}
-                            className={cl("user-header-btn")}
+                            className={cl("user-sortorder-btn")}
                             role="button"
                             tabIndex={0}
                             onClick={() => {
@@ -154,8 +164,8 @@ function UserPermissionsComponent({ guild, guildMember, closePopout }: { guild:
                             }}
                         >
                             <svg
-                                width="24"
-                                height="24"
+                                width="20"
+                                height="20"
                                 viewBox="0 96 960 960"
                                 transform={permissionsSortOrder === PermissionsSortOrder.HighestRole ? "scale(1 1)" : "scale(1 -1)"}
                             >
@@ -164,30 +174,7 @@ function UserPermissionsComponent({ guild, guildMember, closePopout }: { guild:
                         </div>
                     )}
                 </Tooltip>
-                <Tooltip text="Role Details">
-                    {tooltipProps => (
-                        <div
-                            {...tooltipProps}
-                            className={cl("user-header-btn")}
-                            role="button"
-                            tabIndex={0}
-                            onClick={() => {
-                                closePopout();
-                                openRolesAndUsersPermissionsModal(rolePermissions, guild, guildMember.nick || UserStore.getUser(guildMember.userId).username);
-                            }}
-                        >
-                            <svg
-                                width="24"
-                                height="24"
-                                viewBox="0 0 24 24"
-                            >
-                                <path fill="var(--text-normal)" d="M7 12.001C7 10.8964 6.10457 10.001 5 10.001C3.89543 10.001 3 10.8964 3 12.001C3 13.1055 3.89543 14.001 5 14.001C6.10457 14.001 7 13.1055 7 12.001ZM14 12.001C14 10.8964 13.1046 10.001 12 10.001C10.8954 10.001 10 10.8964 10 12.001C10 13.1055 10.8954 14.001 12 14.001C13.1046 14.001 14 13.1055 14 12.001ZM19 10.001C20.1046 10.001 21 10.8964 21 12.001C21 13.1055 20.1046 14.001 19 14.001C17.8954 14.001 17 13.1055 17 12.001C17 10.8964 17.8954 10.001 19 10.001Z" />
-                            </svg>
-                        </div>
-                    )}
-                </Tooltip>
-            </div>
-        </div>
+            ]}>
             {userPermissions.length > 0 && (
                 <div className={classes(RoleRootClasses.root)}>
                     {userPermissions.map(({ permission, roleColor, roleName }) => (
@@ -203,7 +190,8 @@ function UserPermissionsComponent({ guild, guildMember, closePopout }: { guild:
                     ))}
                 </div>
             )}
-    </div>;
+        </ExpandableHeader>
+    );
 }
 
 export default ErrorBoundary.wrap(UserPermissionsComponent, { noop: true });

src/plugins/permissionsViewer/index.tsx

@@ -56,6 +56,11 @@ export const settings = definePluginSettings({
             { label: "Lowest Role", value: PermissionsSortOrder.LowestRole }
         ]
     },
+    defaultPermissionsDropdownState: {
+        description: "Whether the permissions dropdown on user popouts should be open by default",
+        type: OptionType.BOOLEAN,
+        default: false
+    }
 });
 
 function MenuItem(guildId: string, id?: string, type?: MenuItemParentType) {
@@ -177,9 +182,9 @@ export default definePlugin({
         <Popout
             position="bottom"
             align="center"
-            renderPopout={({ closePopout }) => (
+            renderPopout={() => (
                 <Dialog className={PopoutClasses.container} style={{ width: "500px" }}>
-                    <UserPermissions guild={guild} guildMember={guildMember} closePopout={closePopout} />
+                    <UserPermissions guild={guild} guildMember={guildMember} forceOpen />
                 </Dialog>
             )}
         >

src/plugins/permissionsViewer/styles.css

@@ -1,22 +1,12 @@
 /* User Permissions Component */
 
-.vc-permviewer-user-header-container {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 8px;
-}
-
-.vc-permviewer-user-header-btns {
-    display: flex;
-    gap: 8px;
-}
-
-.vc-permviewer-user-header-btn {
+.vc-permviewer-user-sortorder-btn {
     cursor: pointer;
     display: flex;
     align-items: center;
     justify-content: center;
+    width: 24px;
+    height: 24px;
 }
 
 /*  RolesAndUsersPermissions Component */

src/plugins/permissionsViewer/utils.ts

@@ -17,17 +17,57 @@
 */
 
 import { classNameFactory } from "@api/Styles";
-import { findByPropsLazy } from "@webpack";
-import { GuildStore } from "@webpack/common";
+import { getIntlMessage } from "@utils/discord";
+import { wordsToTitle } from "@utils/text";
+import { GuildStore, Parser } from "@webpack/common";
 import { Guild, GuildMember, Role } from "discord-types/general";
+import type { ReactNode } from "react";
 
 import { PermissionsSortOrder, settings } from ".";
 import { PermissionType } from "./components/RolesAndUsersPermissions";
 
-export const { getGuildPermissionSpecMap } = findByPropsLazy("getGuildPermissionSpecMap");
-
 export const cl = classNameFactory("vc-permviewer-");
 
+function formatPermissionWithoutMatchingString(permission: string) {
+    return wordsToTitle(permission.toLowerCase().split("_"));
+}
+
+// because discord is unable to be consistent with their names
+const PermissionKeyMap = {
+    MANAGE_GUILD: "MANAGE_SERVER",
+    MANAGE_GUILD_EXPRESSIONS: "MANAGE_EXPRESSIONS",
+    CREATE_GUILD_EXPRESSIONS: "CREATE_EXPRESSIONS",
+    MODERATE_MEMBERS: "MODERATE_MEMBER", // HELLOOOO ??????
+    STREAM: "VIDEO",
+    SEND_VOICE_MESSAGES: "ROLE_PERMISSIONS_SEND_VOICE_MESSAGE",
+} as const;
+
+export function getPermissionString(permission: string) {
+    permission = PermissionKeyMap[permission] || permission;
+
+    return getIntlMessage(permission) ||
+        // shouldn't get here but just in case
+        formatPermissionWithoutMatchingString(permission);
+}
+
+export function getPermissionDescription(permission: string): ReactNode {
+    // DISCORD PLEEEEEEEEAAAAASE IM BEGGING YOU :(
+    if (permission === "USE_APPLICATION_COMMANDS")
+        permission = "USE_APPLICATION_COMMANDS_GUILD";
+    else if (permission === "SEND_VOICE_MESSAGES")
+        permission = "SEND_VOICE_MESSAGE_GUILD";
+    else if (permission !== "STREAM")
+        permission = PermissionKeyMap[permission] || permission;
+
+    const msg = getIntlMessage(`ROLE_PERMISSIONS_${permission}_DESCRIPTION`) as any;
+    if (msg?.hasMarkdown)
+        return Parser.parse(msg.message);
+
+    if (typeof msg === "string") return msg;
+
+    return "";
+}
+
 export function getSortedRoles({ id }: Guild, member: GuildMember) {
     const roles = GuildStore.getRoles(id);
 

src/plugins/serverInfo/index.tsx

@@ -5,6 +5,7 @@
  */
 
 import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
+import { migratePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { Menu } from "@webpack/common";
@@ -24,6 +25,7 @@ const Patch: NavContextMenuPatchCallback = (children, { guild }: { guild: Guild;
     );
 };
 
+migratePluginSettings("ServerInfo", "ServerProfile"); // what was I thinking with this name lmao
 export default definePlugin({
     name: "ServerInfo",
     description: "Allows you to view info about a server",

src/plugins/serverListIndicators/index.tsx

@@ -20,9 +20,9 @@ import { addServerListElement, removeServerListElement, ServerListRenderPosition
 import { Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
+import { useForceUpdater } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
-import { findStoreLazy } from "@webpack";
-import { GuildStore, PresenceStore, RelationshipStore, useStateFromStores } from "@webpack/common";
+import { GuildStore, PresenceStore, RelationshipStore } from "@webpack/common";
 
 const enum IndicatorType {
     SERVER = 1 << 0,
@@ -30,24 +30,13 @@ const enum IndicatorType {
     BOTH = SERVER | FRIEND,
 }
 
-const UserGuildJoinRequestStore = findStoreLazy("UserGuildJoinRequestStore");
+let onlineFriends = 0;
+let guildCount = 0;
+let forceUpdateFriendCount: () => void;
+let forceUpdateGuildCount: () => void;
 
 function FriendsIndicator() {
-    const onlineFriendsCount = useStateFromStores([RelationshipStore, PresenceStore], () => {
-        let count = 0;
-
-        const friendIds = RelationshipStore.getFriendIDs();
-        for (const id of friendIds) {
-            const status = PresenceStore.getStatus(id) ?? "offline";
-            if (status === "offline") {
-                continue;
-            }
-
-            count++;
-        }
-
-        return count;
-    });
+    forceUpdateFriendCount = useForceUpdater();
 
     return (
         <span id="vc-friendcount" style={{
@@ -59,19 +48,13 @@ function FriendsIndicator() {
             textTransform: "uppercase",
             textAlign: "center",
         }}>
-            {onlineFriendsCount} online
+            {onlineFriends} online
         </span>
     );
 }
 
 function ServersIndicator() {
-    const guildCount = useStateFromStores([GuildStore, UserGuildJoinRequestStore], () => {
-        const guildJoinRequests: string[] = UserGuildJoinRequestStore.computeGuildIds();
-        const guilds = GuildStore.getGuilds();
-
-        // Filter only pending guild join requests
-        return GuildStore.getGuildCount() + guildJoinRequests.filter(id => guilds[id] == null).length;
-    });
+    forceUpdateGuildCount = useForceUpdater();
 
     return (
         <span id="vc-guildcount" style={{
@@ -88,6 +71,24 @@ function ServersIndicator() {
     );
 }
 
+function handlePresenceUpdate() {
+    onlineFriends = 0;
+    const relations = RelationshipStore.getRelationships();
+    for (const id of Object.keys(relations)) {
+        const type = relations[id];
+        // FRIEND relationship type
+        if (type === 1 && PresenceStore.getStatus(id) !== "offline") {
+            onlineFriends += 1;
+        }
+    }
+    forceUpdateFriendCount?.();
+}
+
+function handleGuildUpdate() {
+    guildCount = GuildStore.getGuildCount();
+    forceUpdateGuildCount?.();
+}
+
 export default definePlugin({
     name: "ServerListIndicators",
     description: "Add online friend count or server count in the server list",
@@ -116,8 +117,18 @@ export default definePlugin({
         </ErrorBoundary>;
     },
 
+    flux: {
+        PRESENCE_UPDATES: handlePresenceUpdate,
+        GUILD_CREATE: handleGuildUpdate,
+        GUILD_DELETE: handleGuildUpdate,
+    },
+
+
     start() {
         addServerListElement(ServerListRenderPosition.Above, this.renderIndicator);
+
+        handlePresenceUpdate();
+        handleGuildUpdate();
     },
 
     stop() {

src/plugins/showHiddenChannels/index.tsx

@@ -168,7 +168,7 @@ export default definePlugin({
                 },
                 // Add the hidden eye icon if the channel is hidden
                 {
-                    match: /\.name,{.{0,140}\.children.+?:null(?<=,channel:(\i).+?)/,
+                    match: /\.name\),.{0,120}\.children.+?:null(?<=,channel:(\i).+?)/,
                     replace: (m, channel) => `${m},$self.isHiddenChannel(${channel})?$self.HiddenChannelIcon():null`
                 },
                 // Make voice channels also appear as muted if they are muted

src/plugins/showHiddenThings/index.ts

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { definePluginSettings } from "@api/Settings";
+import { definePluginSettings, migratePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType, PluginSettingDef } from "@utils/types";
 
@@ -35,6 +35,7 @@ const settings = definePluginSettings({
     disableDisallowedDiscoveryFilters: opt("Disable filters in Server Discovery search that hide NSFW & disallowed servers."),
 });
 
+migratePluginSettings("ShowHiddenThings", "ShowTimeouts");
 export default definePlugin({
     name: "ShowHiddenThings",
     tags: ["ShowTimeouts", "ShowInvitesPaused", "ShowModView", "DisableDiscoveryFilters"],
@@ -74,15 +75,6 @@ export default definePlugin({
                 replace: "$1$2arguments[0].member.highestRoleId]",
             }
         },
-        // allows you to open mod view on yourself
-        {
-            find: ".MEMBER_SAFETY,{modViewPanel:",
-            predicate: () => settings.store.showModView,
-            replacement: {
-                match: /\i(?=\?null)/,
-                replace: "false"
-            }
-        },
         {
             find: "prod_discoverable_guilds",
             predicate: () => settings.store.disableDiscoveryFilters,

src/plugins/silentTyping/index.tsx

@@ -54,17 +54,9 @@ const SilentTypingToggle: ChatBarButton = ({ isMainChat }) => {
             tooltip={isEnabled ? "Disable Silent Typing" : "Enable Silent Typing"}
             onClick={toggle}
         >
-            <svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" style={{ scale: "1.2" }}>
-                <path fill="currentColor" mask="url(#silent-typing-msg-mask)" d="M18.333 15.556H1.667a1.667 1.667 0 0 1 -1.667 -1.667v-10a1.667 1.667 0 0 1 1.667 -1.667h16.667a1.667 1.667 0 0 1 1.667 1.667v10a1.667 1.667 0 0 1 -1.667 1.667M4.444 6.25V4.861a0.417 0.417 0 0 0 -0.417 -0.417H2.639a0.417 0.417 0 0 0 -0.417 0.417V6.25a0.417 0.417 0 0 0 0.417 0.417h1.389a0.417 0.417 0 0 0 0.417 -0.417m3.333 0V4.861a0.417 0.417 0 0 0 -0.417 -0.417H5.973a0.417 0.417 0 0 0 -0.417 0.417V6.25a0.417 0.417 0 0 0 0.417 0.417h1.389a0.417 0.417 0 0 0 0.417 -0.417m3.333 0V4.861a0.417 0.417 0 0 0 -0.417 -0.417h-1.389a0.417 0.417 0 0 0 -0.417 0.417V6.25a0.417 0.417 0 0 0 0.417 0.417h1.389a0.417 0.417 0 0 0 0.417 -0.417m3.333 0V4.861a0.417 0.417 0 0 0 -0.417 -0.417h-1.389a0.417 0.417 0 0 0 -0.417 0.417V6.25a0.417 0.417 0 0 0 0.417 0.417h1.389a0.417 0.417 0 0 0 0.417 -0.417m3.333 0V4.861a0.417 0.417 0 0 0 -0.417 -0.417h-1.389a0.417 0.417 0 0 0 -0.417 0.417V6.25a0.417 0.417 0 0 0 0.417 0.417h1.389a0.417 0.417 0 0 0 0.417 -0.417m-11.667 3.333V8.194a0.417 0.417 0 0 0 -0.417 -0.417H4.306a0.417 0.417 0 0 0 -0.417 0.417V9.583a0.417 0.417 0 0 0 0.417 0.417h1.389a0.417 0.417 0 0 0 0.417 -0.417m3.333 0V8.194a0.417 0.417 0 0 0 -0.417 -0.417H7.639a0.417 0.417 0 0 0 -0.417 0.417V9.583a0.417 0.417 0 0 0 0.417 0.417h1.389a0.417 0.417 0 0 0 0.417 -0.417m3.333 0V8.194a0.417 0.417 0 0 0 -0.417 -0.417h-1.389a0.417 0.417 0 0 0 -0.417 0.417V9.583a0.417 0.417 0 0 0 0.417 0.417h1.389a0.417 0.417 0 0 0 0.417 -0.417m3.333 0V8.194a0.417 0.417 0 0 0 -0.417 -0.417h-1.389a0.417 0.417 0 0 0 -0.417 0.417V9.583a0.417 0.417 0 0 0 0.417 0.417h1.389a0.417 0.417 0 0 0 0.417 -0.417m-11.667 3.333v-1.389a0.417 0.417 0 0 0 -0.417 -0.417H2.639a0.417 0.417 0 0 0 -0.417 0.417V12.917a0.417 0.417 0 0 0 0.417 0.417h1.389a0.417 0.417 0 0 0 0.417 -0.417m10 0v-1.389a0.417 0.417 0 0 0 -0.417 -0.417H5.973a0.417 0.417 0 0 0 -0.417 0.417V12.917a0.417 0.417 0 0 0 0.417 0.417h8.056a0.417 0.417 0 0 0 0.417 -0.417m3.333 0v-1.389a0.417 0.417 0 0 0 -0.417 -0.417h-1.389a0.417 0.417 0 0 0 -0.417 0.417V12.917a0.417 0.417 0 0 0 0.417 0.417h1.389a0.417 0.417 0 0 0 0.417 -0.417" transform="translate(2, 3)" />
-                {isEnabled && (
-                    <>
-                        <mask id="silent-typing-msg-mask">
-                            <path fill="#fff" d="M0 0h24v24H0Z"></path>
-                            <path stroke="#000" strokeWidth="5.99068" d="M0 24 24 0" transform="translate(-2, -3)"></path>
-                        </mask>
-                        <path fill="var(--status-danger)" d="m21.178 1.70703 1.414 1.414L4.12103 21.593l-1.414-1.415L21.178 1.70703Z" />
-                    </>
-                )}
+            <svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
+                <path fill="currentColor" d="M528 448H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h480c26.51 0 48 21.49 48 48v288c0 26.51-21.49 48-48 48zM128 180v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm-336 96v-40c0-6.627-5.373-12-12-12H76c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12zm288 0v-40c0-6.627-5.373-12-12-12H172c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h232c6.627 0 12-5.373 12-12zm96 0v-40c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12z" />
+                {isEnabled && <path d="M13 432L590 48" stroke="var(--red-500)" stroke-width="72" stroke-linecap="round" />}
             </svg>
         </ChatBarButton>
     );

src/plugins/typingIndicator/index.tsx

@@ -163,7 +163,7 @@ export default definePlugin({
         {
             find: "UNREAD_IMPORTANT:",
             replacement: {
-                match: /\.name,{.{0,140}\.children.+?:null(?<=,channel:(\i).+?)/,
+                match: /\.name\),.{0,120}\.children.+?:null(?<=,channel:(\i).+?)/,
                 replace: "$&,$self.TypingIndicator($1.id,$1.getGuildId())"
             }
         },

src/plugins/typingTweaks/index.tsx

@@ -91,31 +91,34 @@ export default definePlugin({
     name: "TypingTweaks",
     description: "Show avatars and role colours in the typing indicator",
     authors: [Devs.zt],
-    settings,
-
     patches: [
-        {
-            find: "#{intl::THREE_USERS_TYPING}",
-            replacement: [
-                {
         // Style the indicator and add function call to modify the children before rendering
-                    match: /(?<=children:\[(\i)\.length>0.{0,200}?"aria-atomic":!0,children:)\i(?<=guildId:(\i).+?)/,
-                    replace: "$self.mutateChildren($2,$1,$&),style:$self.TYPING_TEXT_STYLE"
-                },
         {
+            find: "getCooldownTextStyle",
+            replacement: {
+                match: /(?<=children:\[(\i)\.length>0.{0,200}?"aria-atomic":!0,children:)\i/,
+                replace: "$self.mutateChildren(this.props, $1, $&), style: $self.TYPING_TEXT_STYLE"
+            }
+        },
         // Changes the indicator to keep the user object when creating the list of typing users
-                    match: /\.map\((\i)=>\i\.\i\.getName\(\i,\i\.id,\1\)\)/,
-                    replace: ""
-                },
         {
+            find: "getCooldownTextStyle",
+            replacement: {
+                match: /(?<=map\(\i=>)\i\.\i\.getName\(\i,this\.props\.channel\.id,(\i)\)/,
+                replace: "$1"
+            }
+        },
         // Adds the alternative formatting for several users typing
-                    match: /(,{a:(\i),b:(\i),c:\i}\):\i\.length>3&&\(\i=)\i\.\i\.string\(\i\.\i#{intl::SEVERAL_USERS_TYPING}\)(?<=(\i)\.length.+?)/,
-                    replace: (_, rest, a, b, users) => `${rest}$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2 })`,
+        {
+            find: "getCooldownTextStyle",
+            replacement: {
+                match: /(,{a:(\i),b:(\i),c:\i}\):)\i\.\i\.string\(\i\.\i#{intl::SEVERAL_USERS_TYPING}\)(?<=(\i)\.length.+?)/,
+                replace: (_, rest, a, b, users) => `${rest}$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2 })`
+            },
             predicate: () => settings.store.alternativeFormatting
         }
-            ]
-        }
     ],
+    settings,
 
     TYPING_TEXT_STYLE: {
         display: "grid",
@@ -125,7 +128,7 @@ export default definePlugin({
 
     buildSeveralUsers,
 
-    mutateChildren(guildId: any, users: User[], children: any) {
+    mutateChildren(props: any, users: User[], children: any) {
         try {
             if (!Array.isArray(children)) {
                 return children;
@@ -135,7 +138,7 @@ export default definePlugin({
 
             return children.map(c =>
                 c.type === "strong" || (typeof c !== "string" && !React.isValidElement(c))
-                    ? <TypingUser guildId={guildId} user={users[element++]} />
+                    ? <TypingUser {...props} user={users[element++]} />
                     : c
             );
         } catch (e) {

src/plugins/webContextMenus.web/index.ts

@@ -164,8 +164,8 @@ export default definePlugin({
             find: 'getElementById("slate-toolbar"',
             predicate: () => settings.store.addBack,
             replacement: {
-                match: /(?<=handleContextMenu\(\i\)\{.{0,200}isPlatformEmbedded)\)/,
-                replace: "||true)"
+                match: /(?<=handleContextMenu\(\i\)\{.{0,200}isPlatformEmbedded)\?/,
+                replace: "||true?"
             }
         },
         {
@@ -216,12 +216,9 @@ export default definePlugin({
                     replace: "true"
                 },
                 {
-                    match: /\i\.\i\.copy(?=\(\i)/,
+                    match: /\i\.\i\.copy/,
                     replace: "Vencord.Webpack.Common.Clipboard.copy"
-                }
-            ],
-            all: true,
-            noWarn: true
+                }]
         },
         // Automod add filter words
         {

src/plugins/youtubeAdblock.desktop/index.ts

@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { migratePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
 
 // The entire code of this plugin can be found in native.ts
+migratePluginSettings("YoutubeAdblock", "WatchTogetherAdblock");
 export default definePlugin({
     name: "YoutubeAdblock",
     description: "Block ads in YouTube embeds and the WatchTogether activity via AdGuard",

src/webpack/common/react.ts

@@ -22,7 +22,6 @@ import { findByPropsLazy, waitFor } from "../webpack";
 export let React: typeof import("react");
 export let useState: typeof React.useState;
 export let useEffect: typeof React.useEffect;
-export let useLayoutEffect: typeof React.useLayoutEffect;
 export let useMemo: typeof React.useMemo;
 export let useRef: typeof React.useRef;
 export let useReducer: typeof React.useReducer;
@@ -32,5 +31,5 @@ export const ReactDOM: typeof import("react-dom") & typeof import("react-dom/cli
 
 waitFor("useState", m => {
     React = m;
-    ({ useEffect, useState, useLayoutEffect, useMemo, useRef, useReducer, useCallback } = React);
+    ({ useEffect, useState, useMemo, useRef, useReducer, useCallback } = React);
 });