Merge 0a51a865d3 into 8afd79dd50

src/components/PluginSettings/index.tsx

@@ -292,10 +292,10 @@ export default function PluginSettings() {
 
         if (!pluginFilter(p)) continue;
 
-        const isRequired = p.required || depMap[p.name]?.some(d => settings.plugins[d].enabled);
+        const isRequired = p.required || p.isDependency || depMap[p.name]?.some(d => settings.plugins[d].enabled);
 
         if (isRequired) {
-            const tooltipText = p.required
+            const tooltipText = p.required || !depMap[p.name]
                 ? "This plugin is required for Vencord to function."
                 : makeDependencyList(depMap[p.name]?.filter(d => settings.plugins[d].enabled));
 

src/plugins/_core/supportHelper.tsx

@@ -142,7 +142,7 @@ export default definePlugin({
     required: true,
     description: "Helps us provide support to you",
     authors: [Devs.Ven],
-    dependencies: ["CommandsAPI", "UserSettingsAPI", "MessageAccessoriesAPI"],
+    dependencies: ["UserSettingsAPI", "MessageAccessoriesAPI"],
 
     settings,
 

src/plugins/editUsers/data.ts

@@ -0,0 +1,42 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { definePluginSettings } from "@api/Settings";
+
+export const enum OverrideFlags {
+    None = 0,
+    PreferServerNicks = 1 << 0,
+    DisableNicks = 1 << 1,
+    KeepServerAvatar = 1 << 2,
+    DisableServerAvatars = 1 << 3,
+    KeepServerBanner = 1 << 4,
+    DisableServerBanners = 1 << 5,
+}
+
+export interface UserOverride {
+    username: string;
+    avatarUrl: string;
+    bannerUrl: string;
+    pronouns: string;
+    flags: OverrideFlags;
+}
+
+export const emptyOverride: UserOverride = Object.freeze({
+    username: "",
+    avatarUrl: "",
+    bannerUrl: "",
+    pronouns: "",
+    flags: OverrideFlags.None,
+});
+
+export const settings = definePluginSettings({})
+    .withPrivateSettings<{
+        users?: Record<string, UserOverride>;
+    }>();
+
+export const getUserOverride = (userId: string) => settings.store.users?.[userId] ?? emptyOverride;
+
+export const hasFlag = (field: OverrideFlags, flag: OverrideFlags) => (field & flag) === flag;

src/plugins/editUsers/index.tsx

@@ -0,0 +1,125 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./styles.css";
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+import { Menu } from "@webpack/common";
+import { User } from "discord-types/general";
+
+import { getUserOverride, hasFlag, OverrideFlags, settings } from "./data";
+import { openUserEditModal } from "./modal";
+
+export default definePlugin({
+    name: "EditUsers",
+    description: "Edit users",
+    authors: [Devs.Ven],
+
+    settings,
+
+    contextMenus: {
+        "user-context"(children, { user }: { user?: User; }) {
+            if (!user) return;
+
+            children.push(
+                <Menu.MenuItem
+                    id="vc-edit-user"
+                    label="Edit User"
+                    action={() => openUserEditModal(user)}
+                />
+            );
+        }
+    },
+
+    patches: [
+        {
+            find: ",getUserTag:",
+            replacement: {
+                match: /if\(\i\((\i)\.global_name\)\)return(?=.{0,100}return"\?\?\?")/,
+                replace: "const vcEuName=$self.getUsername($1);if(vcEuName)return vcEuName;$&"
+            }
+        },
+        {
+            find: "=this.guildMemberAvatars[",
+            replacement: [
+                {
+                    match: /&&null!=this\.guildMemberAvatars\[\i\]/,
+                    replace: "$& && !$self.shouldIgnoreGuildAvatar(this)"
+                },
+                {
+                    match: /(?<=null!=(\i))\?(\i\.\i\.getGuildMemberAvatarURLSimple.+?):(?=\i\.\i\.getUserAvatarURL\(this)/,
+                    replace: "&& this.hasAvatarForGuild?.($1) ? $2 : $self.getAvatarUrl(this)||"
+                }
+            ]
+        },
+        {
+            find: "this.isUsingGuildMemberBanner()",
+            replacement: [
+                {
+                    match: /:\i\.banner\)!=null/,
+                    replace: "$& && !$self.shouldIgnoreGuildBanner(this.userId)"
+                },
+                {
+                    match: /(?<=:).{0,10}\(\{id:this\.userId,banner/,
+                    replace: "$self.getBannerUrl(this.userId)||$&"
+                },
+                {
+                    match: /isUsingGuildMemberPronouns\(\)\{/,
+                    replace:
+                        "set pronouns(v){this._vcPronouns=v}" +
+                        "get pronouns(){return $self.getPronouns(this.userId)||this._vcPronouns}" +
+                        "isUsingGuildMemberPronouns(){"
+                },
+                {
+                    match: /\i\(this,"pronouns",void 0\),/,
+                    replace: ""
+                }
+            ]
+        },
+        {
+            find: '"GuildMemberStore"',
+            replacement: {
+                match: /getNick\(\i,(\i)\)\{/,
+                replace: "$& if ($self.shouldIgnoreNick($1)) return null;"
+            }
+        }
+    ],
+
+    getUsername: (user: User) => getUserOverride(user.id).username,
+    getAvatarUrl: (user: User) => getUserOverride(user.id).avatarUrl,
+    getBannerUrl: (userId: string) => getUserOverride(userId).bannerUrl,
+    getPronouns: (userId: string) => getUserOverride(userId).pronouns,
+
+    shouldIgnoreGuildAvatar(user: User) {
+        const { avatarUrl, flags } = getUserOverride(user.id);
+
+        if (avatarUrl && !hasFlag(flags, OverrideFlags.KeepServerAvatar))
+            return true;
+
+        return hasFlag(flags, OverrideFlags.DisableServerAvatars);
+    },
+
+    shouldIgnoreGuildBanner(userId: string) {
+        const { bannerUrl, flags } = getUserOverride(userId);
+
+        if (bannerUrl && !hasFlag(flags, OverrideFlags.KeepServerBanner))
+            return true;
+
+        return hasFlag(flags, OverrideFlags.DisableServerBanners);
+    },
+
+    shouldIgnoreNick(userId?: string) {
+        if (!userId) return false;
+
+        const { username, flags } = getUserOverride(userId);
+
+        if (username && !hasFlag(flags, OverrideFlags.PreferServerNicks))
+            return true;
+
+        return hasFlag(flags, OverrideFlags.DisableNicks);
+    }
+});

src/plugins/editUsers/modal.tsx

@@ -0,0 +1,170 @@
+/*
+ * 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 { Flex } from "@components/Flex";
+import { Margins } from "@utils/margins";
+import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { Button, DisplayProfileUtils, showToast, Switch, TabBar, Text, TextInput, Toasts, UsernameUtils, useState } from "@webpack/common";
+import { User } from "discord-types/general";
+import type { Dispatch, SetStateAction } from "react";
+
+import { emptyOverride, hasFlag, OverrideFlags, settings, UserOverride } from "./data";
+
+const cl = classNameFactory("vc-editUsers-");
+
+interface OverrideProps {
+    override: UserOverride;
+    setOverride: Dispatch<SetStateAction<UserOverride>>;
+}
+
+interface SettingsRowProps extends OverrideProps {
+    overrideKey: keyof Omit<UserOverride, "flags">;
+    name: string;
+    flagDisable: OverrideFlags;
+    flagPrefer: OverrideFlags;
+    placeholder: string;
+}
+
+function SettingsRow(props: SettingsRowProps) {
+    const { name, override, setOverride, overrideKey, placeholder, flagDisable, flagPrefer } = props;
+    const namePlural = name + "s";
+    const { flags } = override;
+
+    const toggleFlag = (on: boolean, flag: OverrideFlags) =>
+        on
+            ? flags | flag
+            : flags & ~flag;
+
+    return (
+        <>
+            <TextInput
+                className={Margins.bottom16}
+                value={override[overrideKey]}
+                onChange={v => setOverride(o => ({ ...o, [overrideKey]: v }))}
+                placeholder={placeholder}
+                autoFocus
+            />
+            <Switch
+                value={hasFlag(flags, flagDisable)}
+                onChange={v => setOverride(o => ({ ...o, flags: toggleFlag(v, flagDisable) }))}
+                note={`Will use the user's global ${name} (or your EditUser configured ${name}) over server specific ${namePlural}`}
+            >
+                Disable server specific {namePlural}
+            </Switch>
+            <Switch
+                value={hasFlag(flags, flagPrefer)}
+                onChange={v => setOverride(o => ({ ...o, flags: toggleFlag(v, flagPrefer) }))}
+                note={`Will use server specific ${namePlural} over the EditUser configured ${name}`}
+                hideBorder
+            >
+                Prefer server specific {namePlural}
+            </Switch>
+        </>
+    );
+}
+
+const Tabs = {
+    username: {
+        name: "Username",
+        flagDisable: OverrideFlags.DisableNicks,
+        flagPrefer: OverrideFlags.PreferServerNicks,
+        placeholder: (user: User) => UsernameUtils.getName(user),
+    },
+    avatarUrl: {
+        name: "Avatar",
+        flagDisable: OverrideFlags.DisableServerAvatars,
+        flagPrefer: OverrideFlags.KeepServerAvatar,
+        placeholder: (user: User) => user.getAvatarURL(),
+    },
+    bannerUrl: {
+        name: "Banner",
+        flagDisable: OverrideFlags.DisableServerBanners,
+        flagPrefer: OverrideFlags.KeepServerBanner,
+        placeholder: (user: User) => DisplayProfileUtils.getDisplayProfile(user.id)?.getBannerURL({ canAnimate: true, size: 64 }) ?? "",
+    },
+} as const;
+const TabKeys = Object.keys(Tabs) as (keyof typeof Tabs)[];
+
+function EditTabs({ user, override, setOverride }: { user: User; } & OverrideProps) {
+    const [currentTabName, setCurrentTabName] = useState(TabKeys[0]);
+
+    const currentTab = Tabs[currentTabName];
+
+    return (
+        <>
+            <TabBar
+                type="top"
+                look="brand"
+                className={cl("tabBar")}
+                selectedItem={currentTabName}
+                onItemSelect={setCurrentTabName}
+            >
+                {TabKeys.map(key => (
+                    <TabBar.Item
+                        id={key}
+                        key={key}
+                        className={cl("tab")}
+                    >
+                        {Tabs[key].name}
+                    </TabBar.Item>
+                ))}
+            </TabBar>
+
+            <SettingsRow
+                {...currentTab}
+                override={override}
+                overrideKey={currentTabName}
+                setOverride={setOverride}
+                placeholder={currentTab.placeholder(user)}
+            />
+        </>
+    );
+}
+
+function EditModal({ user, modalProps }: { user: User; modalProps: ModalProps; }) {
+    const [override, setOverride] = useState(() => ({ ...settings.store.users?.[user.id] ?? emptyOverride }));
+
+    return (
+        <ModalRoot {...modalProps} size={ModalSize.MEDIUM}>
+            <ModalHeader>
+                <Text variant="heading-lg/semibold" style={{ flexGrow: 1 }}>Edit User {user.username}</Text>
+                <ModalCloseButton onClick={modalProps.onClose} />
+            </ModalHeader>
+
+            <ModalContent>
+                <div className={cl("modal")}>
+                    <EditTabs user={user} override={override} setOverride={setOverride} />
+                </div>
+            </ModalContent>
+
+            <ModalFooter>
+                <Flex>
+                    <Button
+                        color={Button.Colors.RED}
+                        onClick={() => setOverride({ ...emptyOverride })}
+                    >
+                        Reset All
+                    </Button>
+                    <Button
+                        onClick={() => {
+                            const s = settings.store.users ??= {};
+                            s[user.id] = override;
+                            modalProps.onClose();
+                            showToast("Saved! Switch chats for changes to apply everywhere", Toasts.Type.SUCCESS, { position: Toasts.Position.BOTTOM });
+                        }}
+                    >
+                        Save
+                    </Button>
+                </Flex>
+            </ModalFooter>
+        </ModalRoot>
+    );
+}
+
+export function openUserEditModal(user: User) {
+    openModal(props => <EditModal user={user} modalProps={props} />);
+}

src/plugins/editUsers/styles.css

@@ -0,0 +1,14 @@
+.vc-editUsers-modal {
+    padding: 1em 0;
+}
+
+.vc-editUsers-tabBar {
+    gap: 1em;
+    margin-bottom: 16px;
+    border-bottom: 2px solid var(--background-modifier-accent);
+}
+
+.vc-editUsers-tab {
+    padding-bottom: 8px;
+}
+

src/plugins/friendInvites/index.ts

@@ -27,7 +27,6 @@ export default definePlugin({
     name: "FriendInvites",
     description: "Create and manage friend invite links via slash commands (/create friend invite, /view friend invites, /revoke friend invites).",
     authors: [Devs.afn, Devs.Dziurwa],
-    dependencies: ["CommandsAPI"],
     commands: [
         {
             name: "create friend invite",

src/plugins/index.ts

@@ -105,6 +105,11 @@ for (const p of pluginsValues) if (isPluginEnabled(p.name)) {
         settings[d].enabled = true;
         dep.isDependency = true;
     });
+
+    if (p.commands?.length) {
+        Plugins.CommandsAPI.isDependency = true;
+        settings.CommandsAPI.enabled = true;
+    }
 }
 
 for (const p of pluginsValues) {

src/plugins/messageTags/index.ts

@@ -82,7 +82,6 @@ export default definePlugin({
             default: true
         }
     },
-    dependencies: ["CommandsAPI"],
 
     async start() {
         for (const tag of await getTags()) createTagCommand(tag);

src/plugins/moreCommands/index.ts

@@ -33,7 +33,6 @@ export default definePlugin({
     name: "MoreCommands",
     description: "echo, lenny, mock",
     authors: [Devs.Arjix, Devs.echo, Devs.Samu],
-    dependencies: ["CommandsAPI"],
     commands: [
         {
             name: "echo",

src/plugins/moreKaomoji/index.ts

@@ -24,7 +24,6 @@ export default definePlugin({
     name: "MoreKaomoji",
     description: "Adds more Kaomoji to discord. ヽ(´▽`)/",
     authors: [Devs.JacobTm],
-    dependencies: ["CommandsAPI"],
     commands: [
         { name: "dissatisfaction", description: " ＞﹏＜" },
         { name: "smug", description: "ಠ_ಠ" },

src/plugins/petpet/index.ts

@@ -88,7 +88,6 @@ export default definePlugin({
     name: "petpet",
     description: "Adds a /petpet slash command to create headpet gifs from any image",
     authors: [Devs.Ven],
-    dependencies: ["CommandsAPI"],
     commands: [
         {
             inputType: ApplicationCommandInputType.BUILT_IN,

src/plugins/silentTyping/index.tsx

@@ -88,7 +88,7 @@ export default definePlugin({
     name: "SilentTyping",
     authors: [Devs.Ven, Devs.Rini, Devs.ImBanana],
     description: "Hide that you are typing",
-    dependencies: ["CommandsAPI", "ChatInputButtonAPI"],
+    dependencies: ["ChatInputButtonAPI"],
     settings,
     contextMenus: {
         "textarea-context": ChatBarContextCheckbox

src/plugins/spotifyShareCommands/index.ts

@@ -76,7 +76,6 @@ export default definePlugin({
     name: "SpotifyShareCommands",
     description: "Share your current Spotify track, album or artist via slash command (/track, /album, /artist)",
     authors: [Devs.katlyn],
-    dependencies: ["CommandsAPI"],
     commands: [
         {
             name: "track",

src/utils/types.ts

@@ -72,13 +72,13 @@ export interface PluginDef {
     stop?(): void;
     patches?: Omit<Patch, "plugin">[];
     /**
-     * List of commands. If you specify these, you must add CommandsAPI to dependencies
+     * List of commands that your plugin wants to register
      */
     commands?: Command[];
     /**
      * A list of other plugins that your plugin depends on.
      * These will automatically be enabled and loaded before your plugin
-     * Common examples are CommandsAPI, MessageEventsAPI...
+     * Generally these will be API plugins
      */
     dependencies?: string[],
     /**

src/webpack/common/components.ts

@@ -28,6 +28,8 @@ export let Forms = {} as {
     FormText: t.FormText,
 };
 
+export let Icons = {} as t.Icons;
+
 export let Card: t.Card;
 export let Button: t.Button;
 export let Switch: t.Switch;
@@ -85,4 +87,5 @@ waitFor(["FormItem", "Button"], m => {
         Heading
     } = m);
     Forms = m;
+    Icons = m;
 });

src/webpack/common/types/components.d.ts

@@ -18,6 +18,8 @@
 
 import type { ComponentType, CSSProperties, FunctionComponent, HtmlHTMLAttributes, HTMLProps, KeyboardEvent, MouseEvent, PropsWithChildren, PropsWithRef, ReactNode, Ref } from "react";
 
+import { IconNames } from "./iconNames";
+
 export type TextVariant = "heading-sm/normal" | "heading-sm/medium" | "heading-sm/semibold" | "heading-sm/bold" | "heading-md/normal" | "heading-md/medium" | "heading-md/semibold" | "heading-md/bold" | "heading-lg/normal" | "heading-lg/medium" | "heading-lg/semibold" | "heading-lg/bold" | "heading-xl/normal" | "heading-xl/medium" | "heading-xl/bold" | "heading-xxl/normal" | "heading-xxl/medium" | "heading-xxl/bold" | "eyebrow" | "heading-deprecated-14/normal" | "heading-deprecated-14/medium" | "heading-deprecated-14/bold" | "text-xxs/normal" | "text-xxs/medium" | "text-xxs/semibold" | "text-xxs/bold" | "text-xs/normal" | "text-xs/medium" | "text-xs/semibold" | "text-xs/bold" | "text-sm/normal" | "text-sm/medium" | "text-sm/semibold" | "text-sm/bold" | "text-md/normal" | "text-md/medium" | "text-md/semibold" | "text-md/bold" | "text-lg/normal" | "text-lg/medium" | "text-lg/semibold" | "text-lg/bold" | "display-sm" | "display-md" | "display-lg" | "code";
 export type FormTextTypes = Record<"DEFAULT" | "INPUT_PLACEHOLDER" | "DESCRIPTION" | "LABEL_BOLD" | "LABEL_SELECTED" | "LABEL_DESCRIPTOR" | "ERROR" | "SUCCESS", string>;
 export type HeadingTag = `h${1 | 2 | 3 | 4 | 5 | 6}`;
@@ -69,7 +71,7 @@ export type FormText = ComponentType<PropsWithChildren<{
 }> & TextProps> & { Types: FormTextTypes; };
 
 export type Tooltip = ComponentType<{
-    text: ReactNode;
+    text: ReactNode | ComponentType;
     children: FunctionComponent<{
         onClick(): void;
         onMouseEnter(): void;
@@ -502,3 +504,10 @@ export type Avatar = ComponentType<PropsWithChildren<{
 type FocusLock = ComponentType<PropsWithChildren<{
     containerRef: RefObject<HTMLElement>;
 }>>;
+
+export type Icon = ComponentType<JSX.IntrinsicElements["svg"] & {
+    size?: string;
+    colorClass?: string;
+} & Record<string, any>>;
+
+export type Icons = Record<IconNames, Icon>;