Merge branch 'dev'

Author: thororen1234

package.json

@@ -42,7 +42,7 @@
         "@ffmpeg/ffmpeg": "^0.12.10",
         "@ffmpeg/util": "^0.12.1",
         "@intrnl/xxhash64": "^0.1.2",
-        "@song-spotlight/api": "^2.0.1",
+        "@song-spotlight/api": "^2.1.3",
         "@streamparser/json": "^0.0.22",
         "@types/less": "^3.0.8",
         "@types/stylus": "^0.48.42",

packages/vencord-types/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@equicord/types",
     "private": false,
-    "version": "1.14.1",
+    "version": "1.14.2",
     "description": "",
     "types": "index.d.ts",
     "scripts": {
@@ -26,7 +26,7 @@
         "type-fest": "^4.35.0"
     },
     "peerDependencies": {
-        "@types/react": "18.3.1",
-        "@types/react-dom": "18.3.1"
+        "@types/react": "^19.0.10",
+        "@types/react-dom": "19.0.4"
     }
 }

pnpm-lock.yaml

@@ -42,6 +42,7 @@ export { Plugins as plugins };
 import { traceFunction } from "../debug/Tracer";
 import { addAudioProcessor, removeAudioProcessor } from "./AudioPlayer";
 import { addChannelToolbarButton, addHeaderBarButton, removeChannelToolbarButton, removeHeaderBarButton } from "./HeaderBar";
+import { addProfileCollection, removeProfileCollection } from "./ProfileCollections";
 import { addUserAreaButton, removeUserAreaButton } from "./UserArea";
 
 const logger = new Logger("PluginManager", "#a6d189");
@@ -196,7 +197,7 @@ export const startPlugin = traceFunction("startPlugin", function startPlugin(p:
         onBeforeMessageEdit, onBeforeMessageSend, onMessageClick,
         renderChatBarButton, chatBarButton, renderMemberListDecorator, renderMessageAccessory, renderMessageDecoration, renderMessagePopoverButton, messagePopoverButton,
         // Custom
-        renderNicknameIcon, headerBarButton, audioProcessor, userAreaButton
+        renderNicknameIcon, headerBarButton, audioProcessor, userAreaButton, renderProfileCollection
     } = p;
 
     if (p.start) {
@@ -267,6 +268,7 @@ export const startPlugin = traceFunction("startPlugin", function startPlugin(p:
     }
     if (audioProcessor) addAudioProcessor(name, audioProcessor);
     if (userAreaButton) addUserAreaButton(name, userAreaButton.render, userAreaButton.priority);
+    if (renderProfileCollection) addProfileCollection(name, renderProfileCollection);
 
     return true;
 }, p => `startPlugin ${p.name}`);
@@ -277,7 +279,7 @@ export const stopPlugin = traceFunction("stopPlugin", function stopPlugin(p: Plu
         onBeforeMessageEdit, onBeforeMessageSend, onMessageClick,
         renderChatBarButton, chatBarButton, renderMemberListDecorator, renderMessageAccessory, renderMessageDecoration, renderMessagePopoverButton, messagePopoverButton,
         // Custom
-        renderNicknameIcon, headerBarButton, audioProcessor, userAreaButton
+        renderNicknameIcon, headerBarButton, audioProcessor, userAreaButton, renderProfileCollection
     } = p;
 
     if (p.stop) {
@@ -342,6 +344,7 @@ export const stopPlugin = traceFunction("stopPlugin", function stopPlugin(p: Plu
     }
     if (audioProcessor) removeAudioProcessor(name);
     if (userAreaButton) removeUserAreaButton(name);
+    if (renderProfileCollection) removeProfileCollection(name);
 
     return true;
 }, p => `stopPlugin ${p.name}`);
@@ -354,7 +357,7 @@ export const initPluginManager = onlyOnce(function init() {
         "onBeforeMessageEdit", "onBeforeMessageSend", "onMessageClick",
         "renderChatBarButton", "renderMemberListDecorator", "renderMessageAccessory", "renderMessageDecoration", "renderMessagePopoverButton",
         // Custom
-        "renderNicknameIcon"
+        "renderNicknameIcon", "renderProfileCollection"
     ];
 
     const neededApiPlugins = new Set<string>();
@@ -396,6 +399,7 @@ export const initPluginManager = onlyOnce(function init() {
         if (p.headerBarButton) neededApiPlugins.add("HeaderBarAPI");
         if (p.audioProcessor) neededApiPlugins.add("AudioPlayerAPI");
         if (p.userAreaButton) neededApiPlugins.add("UserAreaAPI");
+        if (p.renderProfileCollection) neededApiPlugins.add("ProfileCollectionsAPI");
 
         for (const key of pluginKeysToBind) {
             p[key] &&= p[key].bind(p) as any;

src/api/PluginManager.ts

@@ -0,0 +1,70 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2025 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import ErrorBoundary from "@components/ErrorBoundary";
+import { Logger } from "@utils/Logger";
+import { useEffect, useState } from "@webpack/common";
+import type { ReactNode } from "react";
+
+const logger = new Logger("ProfileCollectionAPI");
+
+export type ProfileCollectionFactory = (props: any) => ReactNode | null;
+
+interface CollectionEntry {
+    render: ProfileCollectionFactory;
+}
+
+const profileCollections = new Map<string, CollectionEntry>();
+const profileCollectionListeners = new Set<() => void>();
+
+/**
+ * Adds a collection to the user profile panel.
+ *
+ * @param id - Unique identifier for the collection (e.g., "my-plugin-profile-collection")
+ * @param render - Function that returns the collection JSX. Receives the full profile props object.
+ * @param priority - Higher values appear first. Default: 0
+ *
+ * @example
+ * addProfileCollection("my-collection", (props) => (
+ *     <div>Custom content for {props.user.id}</div>
+ * ));
+ */
+export function addProfileCollection(id: string, render: ProfileCollectionFactory, priority = 0) {
+    profileCollections.set(id, { render });
+    profileCollectionListeners.forEach(listener => listener());
+}
+
+/**
+ * Removes a collection from the user profile panel.
+ *
+ * @param id - The identifier used when adding the collection
+ */
+export function removeProfileCollection(id: string) {
+    profileCollections.delete(id);
+    profileCollectionListeners.forEach(listener => listener());
+}
+
+function ProfileCollections({ props }: { props: any; }) {
+    const [, forceUpdate] = useState(0);
+
+    useEffect(() => {
+        const listener = () => forceUpdate(n => n + 1);
+        profileCollectionListeners.add(listener);
+        return () => { profileCollectionListeners.delete(listener); };
+    }, []);
+
+    return Array.from(profileCollections)
+        .map(([id, { render: Collection }]) => (
+            <ErrorBoundary noop key={id} onError={e => logger.error(`Failed to render profile collection: ${id}`, e.error)}>
+                {Collection({ ...props, user: props.user ?? props.currentUser })}
+            </ErrorBoundary>
+        ));
+}
+
+/** @internal Injected by ProfileCollectionAPI patch (do NOT call directly) */
+export function renderProfileCollections(props: any) {
+    return <ProfileCollections props={props} />;
+}

src/api/ProfileCollections.tsx

@@ -312,7 +312,6 @@ export function migrateSettingToPlugin(newName: string, oldName: string, setting
 
 export function migrateSettingsFromPlugin(newPlugin: string, oldPlugin: string, ...settings: string[]) {
     const { plugins } = SettingsStore.plain;
-
     const oldSettings = plugins[oldPlugin];
     const newSettings = plugins[newPlugin];
     if (!oldSettings || !newSettings) return;
@@ -330,6 +329,21 @@ export function migrateSettingsFromPlugin(newPlugin: string, oldPlugin: string,
     SettingsStore.markAsChanged();
 }
 
+export function migrateOldSettingToNewPlugin(newPlugin: string, newSetting: string, oldPlugin: string, oldSetting: string,) {
+    const { plugins } = SettingsStore.plain;
+    const oldSettings = plugins[oldPlugin];
+    const newSettings = plugins[newPlugin];
+    if (!oldSettings || !newSettings) return;
+
+    if (!Object.hasOwn(oldSettings, oldSetting) || Object.hasOwn(newSettings, newSetting)) return;
+
+    logger.info(`Migrating plugin setting "${oldSetting}" from ${oldPlugin} to "${newSetting}" on ${newPlugin}`);
+
+    newSettings[newSetting] = oldSettings[oldSetting];
+    delete oldSettings[oldSetting];
+    SettingsStore.markAsChanged();
+}
+
 export function definePluginSettings<
     Def extends SettingsDefinition,
     Checks extends SettingsChecks<Def>,

src/api/Settings.ts

@@ -34,6 +34,7 @@ import * as $Notices from "./Notices";
 import * as $Notifications from "./Notifications";
 import * as $UserArea from "./UserArea";
 export * as PluginManager from "./PluginManager";
+import * as $ProfileCollections from "./ProfileCollections";
 import * as $ServerList from "./ServerList";
 import * as $Settings from "./Settings";
 import * as $Styles from "./Styles";
@@ -170,3 +171,8 @@ export const UserArea = $UserArea;
  * Just used to identify if user is on Equicord as Vencord doesn't have this.
  */
 export const isEquicord = true;
+
+/**
+ * An API allowing you to add other collections where discords game collection is.
+ */
+export const ProfileCollections = $ProfileCollections;

src/api/index.ts

@@ -0,0 +1,37 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2025 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: "ProfileCollectionsAPI",
+    description: "API to add collections to the user profile panel like discords game collection.",
+    authors: [Devs.thororen],
+    patches: [
+        {
+            find: /\.POPOUT,onClose:\i}\),nicknameIcons:.+?\.isProvisional/,
+            replacement: {
+                match: /user:\i,widgets:.{0,100}?\}\),/,
+                replace: "$&Vencord.Api.ProfileCollections.renderProfileCollections(arguments[0]),",
+            }
+        },
+        {
+            find: '"UserProfileAccountPopout"',
+            replacement: {
+                match: /user:\i,widgets:.{0,100}}\),/,
+                replace: "$&Vencord.Api.ProfileCollections.renderProfileCollections(arguments[0]),",
+            },
+        },
+        {
+            find: ".SIDEBAR,disableToolbar:",
+            replacement: {
+                match: /user:(\i),widgets:.{0,100}?\}\),/,
+                replace: "$&Vencord.Api.ProfileCollections.renderProfileCollections({...arguments[0],isSideBar:true}),"
+            }
+        }
+    ]
+});

src/equicordplugins/_api/profileCollections.ts

@@ -7,6 +7,7 @@
 import "./style.css";
 
 import { definePluginSettings } from "@api/Settings";
+import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs, EquicordDevs } from "@utils/constants";
 import { classNameFactory } from "@utils/css";
 import definePlugin, { OptionType } from "@utils/types";
@@ -33,7 +34,7 @@ export default definePlugin({
             replacement: [
                 {
                     match: /(textValue:.{0,50}channelId:\i\.id\}\),)\i/,
-                    replace: "$1$self.getCharCounter(arguments[0].textValue)"
+                    replace: "$1$self.renderCharCounter(arguments[0].textValue)"
                 }
             ]
         },
@@ -45,8 +46,8 @@ export default definePlugin({
             }
         }
     ],
-    getCharCounter(text: string) {
-        const premiumType = (UserStore.getCurrentUser().premiumType ?? 0);
+    renderCharCounter: ErrorBoundary.wrap(text => {
+        const premiumType = (UserStore.getCurrentUser()?.premiumType ?? 0);
         const charMax = premiumType === 2 ? 4000 : 2000;
         const { length } = text;
 
@@ -59,11 +60,12 @@ export default definePlugin({
             else color = "var(--red-360)";
         }
 
+        if (!length) return null;
         return (
             <div className={cl("counter")} style={{ color }}>
                 <span className={cl("count")} >{length}</span>/
                 <span className={cl("max")} >{charMax}</span>
             </div>
         );
-    }
+    }, { noop: true })
 });