Merge branch 'dev' into immediate-finds-modules-proxy

src/plugins/_api/badges/index.tsx

@@ -62,34 +62,6 @@ export default definePlugin({
     authors: [Devs.Megu, Devs.Ven, Devs.TheSun],
     required: true,
     patches: [
-        /* Patch the badge list component on user profiles */
-        {
-            find: 'id:"premium",',
-            replacement: [
-                {
-                    match: /&&(\i)\.push\(\{id:"premium".+?\}\);/,
-                    replace: "$&$1.unshift(...$self.getBadges(arguments[0]));",
-                },
-                {
-                    // alt: "", aria-hidden: false, src: originalSrc
-                    match: /alt:" ","aria-hidden":!0,src:(?=(\i)\.src)/,
-                    // ...badge.props, ..., src: badge.image ?? ...
-                    replace: "...$1.props,$& $1.image??"
-                },
-                // replace their component with ours if applicable
-                {
-                    match: /(?<=text:(\i)\.description,spacing:12,.{0,50})children:/,
-                    replace: "children:$1.component ? () => $self.renderBadgeComponent($1) :"
-                },
-                // conditionally override their onClick with badge.onClick if it exists
-                {
-                    match: /href:(\i)\.link/,
-                    replace: "...($1.onClick && { onClick: vcE => $1.onClick(vcE, $1) }),$&"
-                }
-            ]
-        },
-
-        /* new profiles */
         {
             find: ".FULL_SIZE]:26",
             replacement: {

src/plugins/betterNotes/index.tsx

@@ -17,13 +17,9 @@
 */
 
 import { definePluginSettings } from "@api/Settings";
-import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { canonicalizeMatch } from "@utils/patches";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByProps } from "@webpack";
-
-const UserPopoutSectionCssClasses = findByProps("section", "lastSection");
 
 const settings = definePluginSettings({
     hide: {
@@ -72,23 +68,9 @@ export default definePlugin({
                 match: /\.NOTE_PLACEHOLDER,/,
                 replace: "$&spellCheck:!$self.noSpellCheck,"
             }
-        },
-        {
-            find: ".popularApplicationCommandIds,",
-            replacement: {
-                match: /lastSection:(!?\i)}\),/,
-                replace: "$&$self.patchPadding({lastSection:$1}),"
-            }
         }
     ],
 
-    patchPadding: ErrorBoundary.wrap(({ lastSection }) => {
-        if (!lastSection) return null;
-        return (
-            <div className={UserPopoutSectionCssClasses.lastSection} ></div>
-        );
-    }),
-
     get noSpellCheck() {
         return settings.store.noSpellCheck;
     }

src/plugins/friendsSince/index.tsx

@@ -16,7 +16,6 @@ const containerWrapper = findByProps("memberSinceWrapper");
 const container = findByProps("memberSince");
 const getCreatedAtDate = findByCode('month:"short",day:"numeric"');
 const locale = findByProps("getLocale");
-const lastSection = findByProps("lastSection");
 const section = find((m: any) => m.section !== void 0 && m.heading !== void 0 && Object.values(m).length === 2);
 
 export default definePlugin({
@@ -24,31 +23,7 @@ export default definePlugin({
     description: "Shows when you became friends with someone in the user popout",
     authors: [Devs.Elvyra, Devs.Antti],
     patches: [
-        // User popup - old layout
+        // DM User Sidebar
-        {
-            find: ".USER_PROFILE}};return",
-            replacement: {
-                match: /,{userId:(\i.id).{0,30}}\)/,
-                replace: "$&,$self.friendsSinceOld({ userId: $1 })"
-            }
-        },
-        // DM User Sidebar - old layout
-        {
-            find: ".PROFILE_PANEL,",
-            replacement: {
-                match: /,{userId:([^,]+?)}\)/,
-                replace: "$&,$self.friendsSinceOld({ userId: $1 })"
-            }
-        },
-        // User Profile Modal - old layout
-        {
-            find: ".userInfoSectionHeader,",
-            replacement: {
-                match: /(\.Messages\.USER_PROFILE_MEMBER_SINCE.+?userId:(.+?),textClassName:)(\i\.userInfoText)}\)/,
-                replace: (_, rest, userId, textClassName) => `${rest}!$self.getFriendSince(${userId}) ? ${textClassName} : void 0 }), $self.friendsSinceOld({ userId: ${userId}, textClassName: ${textClassName} })`
-            }
-        },
-        // DM User Sidebar - new layout
         {
             find: ".PANEL}),nicknameIcons",
             replacement: {
@@ -56,7 +31,7 @@ export default definePlugin({
                 replace: "$&,$self.friendsSinceNew({userId:$1,isSidebar:true})"
             }
         },
-        // User Profile Modal - new layout
+        // User Profile Modal
         {
             find: "action:\"PRESS_APP_CONNECTION\"",
             replacement: {
@@ -77,39 +52,6 @@ export default definePlugin({
         }
     },
 
-    friendsSinceOld: ErrorBoundary.wrap(({ userId, textClassName }: { userId: string; textClassName?: string; }) => {
-        if (!RelationshipStore.isFriend(userId)) return null;
-
-        const friendsSince = RelationshipStore.getSince(userId);
-        if (!friendsSince) return null;
-
-        return (
-            <div className={lastSection.section}>
-                <Heading variant="eyebrow">
-                    Friends Since
-                </Heading>
-
-                <div className={containerWrapper.memberSinceWrapper}>
-                    {!!getCurrentChannel()?.guild_id && (
-                        <svg
-                            aria-hidden="true"
-                            width="16"
-                            height="16"
-                            viewBox="0 0 24 24"
-                            fill="var(--interactive-normal)"
-                        >
-                            <path d="M13 10a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z" />
-                            <path d="M3 5v-.75C3 3.56 3.56 3 4.25 3s1.24.56 1.33 1.25C6.12 8.65 9.46 12 13 12h1a8 8 0 0 1 8 8 2 2 0 0 1-2 2 .21.21 0 0 1-.2-.15 7.65 7.65 0 0 0-1.32-2.3c-.15-.2-.42-.06-.39.17l.25 2c.02.15-.1.28-.25.28H9a2 2 0 0 1-2-2v-2.22c0-1.57-.67-3.05-1.53-4.37A15.85 15.85 0 0 1 3 5Z" />
-                        </svg>
-                    )}
-                    <Text variant="text-sm/normal" className={textClassName}>
-                        {getCreatedAtDate(friendsSince, locale.getLocale())}
-                    </Text>
-                </div>
-            </div>
-        );
-    }, { noop: true }),
-
     friendsSinceNew: ErrorBoundary.wrap(({ userId, isSidebar }: { userId: string; isSidebar: boolean; }) => {
         if (!RelationshipStore.isFriend(userId)) return null;
 

src/plugins/moreUserTags/index.tsx

@@ -248,9 +248,9 @@ export default definePlugin({
             }
         },
         {
-            find: 'copyMetaData:"User Tag"',
+            find: ".Messages.USER_PROFILE_PRONOUNS",
             replacement: {
-                match: /(?=,botClass:)/,
+                match: /(?=,hideBotTag:!0)/,
                 replace: ",moreTags_channelId:arguments[0].moreTags_channelId"
             }
         },

src/plugins/mutualGroupDMs/index.tsx

@@ -58,20 +58,6 @@ export default definePlugin({
     authors: [Devs.amia],
 
     patches: [
-        {
-            find: ".Messages.MUTUAL_GUILDS_WITH_END_COUNT", // Note: the module is lazy-loaded
-            replacement: {
-                match: /(?<=\.tabBarItem.{0,50}MUTUAL_GUILDS.+?}\),)(?=.+?(\(0,\i\.jsxs?\)\(.{0,100}id:))/,
-                replace: '$self.isBotOrSelf(arguments[0].user)?null:$1"MUTUAL_GDMS",children:$self.getMutualGDMCountText(arguments[0].user)}),'
-            }
-        },
-        {
-            find: ".USER_INFO_CONNECTIONS:case",
-            replacement: {
-                match: /(?<={user:(\i),onClose:(\i)}\);)(?=case \i\.\i\.MUTUAL_FRIENDS)/,
-                replace: "case \"MUTUAL_GDMS\":return $self.renderMutualGDMs({user: $1, onClose: $2});"
-            }
-        },
         {
             find: ".MUTUAL_FRIENDS?(",
             replacement: [
@@ -87,9 +73,6 @@ export default definePlugin({
         }
     ],
 
-    isBotOrSelf,
-    getMutualGDMCountText,
-
     pushSection(sections: any[], user: User) {
         if (isBotOrSelf(user) || sections[IS_PATCHED]) return;
 

src/plugins/noProfileThemes/index.ts

@@ -33,15 +33,6 @@ export default definePlugin({
                 replace: "=(arguments[0]?.bannerSrc||$1?.banner)&&"
             }
         },
-        {
-            find: ".avatarPositionPremiumNoBanner,default:",
-            replacement: {
-                // premiumUserWithoutBanner: foo().avatarPositionPremiumNoBanner, default: foo().avatarPositionNormal
-                match: /\.avatarPositionPremiumNoBanner(?=,default:\i\.(\i))/,
-                // premiumUserWithoutBanner: foo().avatarPositionNormal...
-                replace: ".$1"
-            }
-        },
         {
             find: "hasThemeColors(){",
             replacement: {

src/plugins/permissionsViewer/index.tsx

@@ -169,13 +169,6 @@ export default definePlugin({
     settings,
 
     patches: [
-        {
-            find: ".popularApplicationCommandIds,",
-            replacement: {
-                match: /showBorder:(.{0,60})}\),(?<=guild:(\i),guildMember:(\i),.+?)/,
-                replace: (m, showBoder, guild, guildMember) => `${m}$self.UserPermissions(${guild},${guildMember},${showBoder}),`
-            }
-        },
         {
             find: ".VIEW_ALL_ROLES,",
             replacement: {
@@ -185,9 +178,6 @@ export default definePlugin({
         }
     ],
 
-    UserPermissions: (guild: Guild, guildMember: GuildMember | undefined, showBorder: boolean) =>
-        !!guildMember && <UserPermissions guild={guild} guildMember={guildMember} showBorder={showBorder} />,
-
     ViewPermissionsButton: ErrorBoundary.wrap(({ guild, guildMember }: { guild: Guild; guildMember: GuildMember; }) => (
         <Popout
             position="bottom"

src/plugins/pronoundb/index.ts

@@ -51,28 +51,8 @@ export default definePlugin({
                 }
             ]
         },
-        // Patch the profile popout username header to use our pronoun hook instead of Discord's pronouns
+
-        {
+        // @TODO Patch discord pronoun hook in user profiles (useProfilePronouns)
-            find: ".pronouns,children",
-            replacement: [
-                {
-                    match: /{user:(\i),[^}]*,pronouns:(\i),[^}]*}=\i.*?;(?=return)/,
-                    replace: "$&let vcPronounSource;[$2,vcPronounSource]=$self.useProfilePronouns($1.id);"
-                },
-                PRONOUN_TOOLTIP_PATCH
-            ]
-        },
-        // Patch the profile modal username header to use our pronoun hook instead of Discord's pronouns
-        {
-            find: ".nameTagSmall)",
-            replacement: [
-                {
-                    match: /\.getName\(\i\);(?<=displayProfile.{0,200})/,
-                    replace: "$&const [vcPronounce,vcPronounSource]=$self.useProfilePronouns(arguments[0].user.id,true);if(arguments[0].displayProfile&&vcPronounce)arguments[0].displayProfile.pronouns=vcPronounce;"
-                },
-                PRONOUN_TOOLTIP_PATCH
-            ]
-        }
     ],
 
     settings,

src/plugins/reviewDB/index.tsx

@@ -20,18 +20,16 @@ import "./style.css";
 
 import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { ExpandableHeader } from "@components/ExpandableHeader";
 import { NotesIcon, OpenExternalIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { classes } from "@utils/misc";
 import definePlugin from "@utils/types";
 import { findByProps } from "@webpack";
-import { Alerts, Button, Menu, Parser, TooltipContainer, useState } from "@webpack/common";
+import { Alerts, Button, Menu, Parser, TooltipContainer } from "@webpack/common";
 import { Guild, User } from "discord-types/general";
 
 import { Auth, initAuth, updateAuth } from "./auth";
 import { openReviewsModal } from "./components/ReviewModal";
-import ReviewsView from "./components/ReviewsView";
 import { NotificationType } from "./entities";
 import { getCurrentUserInfo, readNotification } from "./reviewDbApi";
 import { settings } from "./settings";
@@ -78,13 +76,6 @@ export default definePlugin({
     },
 
     patches: [
-        {
-            find: "showBorder:null",
-            replacement: {
-                match: /user:(\i),setNote:\i,canDM.+?\}\)/,
-                replace: "$&,$self.getReviewsComponent($1)"
-            }
-        },
         {
             find: ".BITE_SIZE,user:",
             replacement: {
@@ -148,31 +139,6 @@ export default definePlugin({
         }, 4000);
     },
 
-    getReviewsComponent: ErrorBoundary.wrap((user: User) => {
-        const [reviewCount, setReviewCount] = useState<number>();
-
-        return (
-            <ExpandableHeader
-                headerText="User Reviews"
-                onMoreClick={() => openReviewsModal(user.id, user.username)}
-                moreTooltipText={
-                    reviewCount && reviewCount > 50
-                        ? `View all ${reviewCount} reviews`
-                        : "Open Review Modal"
-                }
-                onDropDownClick={state => settings.store.reviewsDropdownState = !state}
-                defaultState={settings.store.reviewsDropdownState}
-            >
-                <ReviewsView
-                    discordId={user.id}
-                    name={user.username}
-                    onFetchReviews={r => setReviewCount(r.reviewCount)}
-                    showInput
-                />
-            </ExpandableHeader>
-        );
-    }, { message: "Failed to render Reviews" }),
-
     BiteSizeReviewsButton: ErrorBoundary.wrap(({ user }: { user: User; }) => {
         return (
             <TooltipContainer text="View Reviews">

src/plugins/showAllRoles/README.md

@@ -1,6 +0,0 @@
-# ShowAllRoles
-
-Display all roles on the new profiles instead of limiting them to the default two rows.
-
-![image](https://github.com/Vendicated/Vencord/assets/71079641/3f021f03-c6f9-4fe5-83ac-a1891b5e4b37)
-

src/plugins/showAllRoles/index.ts

@@ -1,23 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-
-export default definePlugin({
-    name: "ShowAllRoles",
-    description: "Show all roles in new profiles.",
-    authors: [Devs.Luna],
-    patches: [
-        {
-            find: ".Messages.VIEW_ALL_ROLES",
-            replacement: {
-                match: /(\i)\.slice\(0,\i\)/,
-                replace: "$1"
-            }
-        }
-    ]
-});

src/plugins/showConnections/index.tsx

@@ -25,15 +25,12 @@ import { CopyIcon, LinkIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { copyWithToast } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCode, findByProps, findComponentByCode, findStore } from "@webpack";
+import { findByCode, findByProps } from "@webpack";
-import { Text, Tooltip, UserProfileStore } from "@webpack/common";
+import { Tooltip, UserProfileStore } from "@webpack/common";
 import { User } from "discord-types/general";
 
 import { VerifiedIcon } from "./VerifiedIcon";
 
-const Section = findComponentByCode(".lastSection", "children:");
-const ThemeStore = findStore("ThemeStore");
-
 const useLegacyPlatformType: (platform: string) => string = findByCode(".TWITTER_LEGACY:");
 const platforms: { get(type: string): ConnectionPlatform; } = findByProps("isSupported", "getByUrl");
 const getProfileThemeProps = findByCode(".getPreviewThemeColors", "primaryColor:");
@@ -76,7 +73,7 @@ interface ConnectionPlatform {
 }
 
 const profilePopoutComponent = ErrorBoundary.wrap(
-    (props: { user: User; displayProfile?: any; simplified?: boolean; }) => (
+    (props: { user: User; displayProfile?: any; }) => (
         <ConnectionsComponent
             {...props}
             id={props.user.id}
@@ -86,17 +83,7 @@ const profilePopoutComponent = ErrorBoundary.wrap(
     { noop: true }
 );
 
-const profilePanelComponent = ErrorBoundary.wrap(
+function ConnectionsComponent({ id, theme }: { id: string, theme: string; }) {
-    (props: { id: string; simplified?: boolean; }) => (
-        <ConnectionsComponent
-            {...props}
-            theme={ThemeStore.theme}
-        />
-    ),
-    { noop: true }
-);
-
-function ConnectionsComponent({ id, theme, simplified }: { id: string, theme: string, simplified?: boolean; }) {
     const profile = UserProfileStore.getUserProfile(id);
     if (!profile)
         return null;
@@ -105,31 +92,14 @@ function ConnectionsComponent({ id, theme, simplified }: { id: string, theme: st
     if (!connections?.length)
         return null;
 
-    const connectionsContainer = (
+    return (
         <Flex style={{
-            marginTop: !simplified ? "8px" : undefined,
             gap: getSpacingPx(settings.store.iconSpacing),
             flexWrap: "wrap"
         }}>
             {connections.map(connection => <CompactConnectionComponent connection={connection} theme={theme} />)}
         </Flex>
     );
-
-    if (simplified)
-        return connectionsContainer;
-
-    return (
-        <Section>
-            <Text
-                tag="h2"
-                variant="eyebrow"
-                style={{ color: "var(--header-primary)" }}
-            >
-                Connections
-            </Text>
-            {connectionsContainer}
-        </Section>
-    );
 }
 
 function CompactConnectionComponent({ connection, theme }: { connection: Connection, theme: string; }) {
@@ -194,31 +164,17 @@ export default definePlugin({
     name: "ShowConnections",
     description: "Show connected accounts in user popouts",
     authors: [Devs.TheKodeToad],
+    settings,
+
     patches: [
-        {
-            find: "{isUsingGuildBio:null!==(",
-            replacement: {
-                match: /,theme:\i\}\)(?=,.{0,150}setNote:)/,
-                replace: "$&,$self.profilePopoutComponent({ user: arguments[0].user, displayProfile: arguments[0].displayProfile })"
-            }
-        },
-        {
-            find: ".PROFILE_PANEL,",
-            replacement: {
-                // createElement(Divider, {}), createElement(NoteComponent)
-                match: /\(0,\i\.jsx\)\(\i\.\i,\{\}\).{0,100}setNote:(?=.+?channelId:(\i).id)/,
-                replace: "$self.profilePanelComponent({ id: $1.recipients[0] }),$&"
-            }
-        },
         {
             find: '"BiteSizeProfileBody"',
             replacement: {
                 match: /currentUser:\i,guild:\i}\)(?<=user:(\i),bio:null==(\i)\?.+?)/,
-                replace: "$&,$self.profilePopoutComponent({ user: $1, displayProfile: $2, simplified: true })"
+                replace: "$&,$self.profilePopoutComponent({ user: $1, displayProfile: $2 })"
             }
         }
     ],
-    settings,
+
     profilePopoutComponent,
-    profilePanelComponent
 });

src/plugins/userVoiceShow/components/VoiceChannelSection.tsx

@@ -18,12 +18,11 @@
 
 import "./VoiceChannelSection.css";
 
-import { findByProps, findComponentByCode } from "@webpack";
+import { findByProps } from "@webpack";
 import { Button, Forms, PermissionStore, Toasts } from "@webpack/common";
 import { Channel } from "discord-types/general";
 
 const ChannelActions = findByProps("selectChannel", "selectVoiceChannel");
-const UserPopoutSection = findComponentByCode(".lastSection", "children:");
 
 const CONNECT = 1n << 20n;
 
@@ -34,7 +33,8 @@ interface VoiceChannelFieldProps {
 }
 
 export const VoiceChannelSection = ({ channel, label, showHeader }: VoiceChannelFieldProps) => (
-    <UserPopoutSection>
+    // @TODO The div is supposed to be a UserPopoutSection
+    <div>
         {showHeader && <Forms.FormTitle className="vc-uvs-header">In a voice channel</Forms.FormTitle>}
         <Button
             className="vc-uvs-button"
@@ -57,5 +57,5 @@ export const VoiceChannelSection = ({ channel, label, showHeader }: VoiceChannel
         >
             {label}
         </Button>
-    </UserPopoutSection>
+    </div>
 );

src/plugins/userVoiceShow/index.tsx

@@ -84,7 +84,7 @@ export default definePlugin({
         );
     },
 
-    patchPopout: ({ user }: UserProps) => {
+    patchProfilePopout: ({ user }: UserProps) => {
         const isSelfUser = user.id === UserStore.getCurrentUser().id;
         return (
             <div className={isSelfUser ? "vc-uvs-popout-margin-self" : ""}>
@@ -94,21 +94,7 @@ export default definePlugin({
     },
 
     patches: [
-        // above message box
+        // @TODO Maybe patch UserVoiceShow in simplified profile popout
-        {
+        // @TODO Patch new profile modal
-            find: ".popularApplicationCommandIds,",
-            replacement: {
-                match: /(?<=,)(?=!\i&&!\i&&.{0,50}setNote:)/,
-                replace: "$self.patchPopout(arguments[0]),",
-            }
-        },
-        // below username
-        {
-            find: ".Messages.MUTUAL_GUILDS_WITH_END_COUNT", // Lazy-loaded
-            replacement: {
-                match: /\.body.+?displayProfile:\i}\),/,
-                replace: "$&$self.patchModal(arguments[0]),",
-            }
-        }
     ],
 });

src/plugins/viewIcons/index.tsx

@@ -192,14 +192,6 @@ export default definePlugin({
             },
             all: true
         },
-        // 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,
@@ -211,14 +203,6 @@ export default definePlugin({
                     'onClick:ev=>$1&&ev.target.style.backgroundImage&&$self.openImage($2),style:{cursor:$1?"pointer":void 0,'
             }
         })),
-        // Old User DMs "User Profile" popup in the right
-        {
-            find: ".avatarPositionPanel",
-            replacement: {
-                match: /(avatarWrapperNonUserBot.{0,50})onClick:(\i\|\|\i)\?void 0(?<=,avatarSrc:(\i).+?)/,
-                replace: "$1style:($2)?{cursor:\"pointer\"}:{},onClick:$2?()=>{$self.openImage($3)}"
-            }
-        },
         // Group DMs top small & large icon
         {
             find: /\.recipients\.length>=2(?!<isMultiUserDM.{0,50})/,