From 75a2506c51993c7e44be8d53cd0055264ae65eab Mon Sep 17 00:00:00 2001
From: Etorix <92535668+EtorixDev@users.noreply.github.com>
Date: Tue, 2 Sep 2025 09:42:17 -0700
Subject: [PATCH 1/6]  ViewRaw: Adjust icon size to match other icons (#3605)

---
 src/plugins/viewRaw/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/viewRaw/index.tsx b/src/plugins/viewRaw/index.tsx
index e6781784d..1dcef31b2 100644
--- a/src/plugins/viewRaw/index.tsx
+++ b/src/plugins/viewRaw/index.tsx
@@ -32,7 +32,7 @@ import { Button, ChannelStore, Forms, GuildRoleStore, Menu, Text } from "@webpac
 
 
 const CopyIcon = () => {
-    return <svg viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" width="18" height="18">
+    return <svg viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" width="20" height="20">
         <path d="M12.9297 3.25007C12.7343 3.05261 12.4154 3.05226 12.2196 3.24928L11.5746 3.89824C11.3811 4.09297 11.3808 4.40733 11.5739 4.60245L16.5685 9.64824C16.7614 9.84309 16.7614 10.1569 16.5685 10.3517L11.5739 15.3975C11.3808 15.5927 11.3811 15.907 11.5746 16.1017L12.2196 16.7507C12.4154 16.9477 12.7343 16.9474 12.9297 16.7499L19.2604 10.3517C19.4532 10.1568 19.4532 9.84314 19.2604 9.64832L12.9297 3.25007Z" />
         <path d="M8.42616 4.60245C8.6193 4.40733 8.61898 4.09297 8.42545 3.89824L7.78047 3.24928C7.58466 3.05226 7.26578 3.05261 7.07041 3.25007L0.739669 9.64832C0.5469 9.84314 0.546901 10.1568 0.739669 10.3517L7.07041 16.7499C7.26578 16.9474 7.58465 16.9477 7.78047 16.7507L8.42545 16.1017C8.61898 15.907 8.6193 15.5927 8.42616 15.3975L3.43155 10.3517C3.23869 10.1569 3.23869 9.84309 3.43155 9.64824L8.42616 4.60245Z" />
     </svg>;

From 5c69d340d967084a567da6f3d6d276cbe715c9d7 Mon Sep 17 00:00:00 2001
From: thororen <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 2 Sep 2025 19:44:25 -0400
Subject: [PATCH 2/6] Fix MutualGroupDMs & Decor broken patches (#3644)

---
 src/plugins/decor/ui/modals/CreateDecorationModal.tsx | 2 +-
 src/plugins/mutualGroupDMs/index.tsx                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/decor/ui/modals/CreateDecorationModal.tsx b/src/plugins/decor/ui/modals/CreateDecorationModal.tsx
index d772ac4a4..6feb3b4f8 100644
--- a/src/plugins/decor/ui/modals/CreateDecorationModal.tsx
+++ b/src/plugins/decor/ui/modals/CreateDecorationModal.tsx
@@ -17,7 +17,7 @@ import { useCurrentUserDecorationsStore } from "../../lib/stores/CurrentUserDeco
 import { cl, DecorationModalStyles, requireAvatarDecorationModal, requireCreateStickerModal } from "../";
 import { AvatarDecorationModalPreview } from "../components";
 
-const FileUpload = findComponentByCodeLazy("fileUploadInput,");
+const FileUpload = findComponentByCodeLazy(".fileUpload),");
 
 const { HelpMessage, HelpMessageTypes } = mapMangledModuleLazy('POSITIVE="positive', {
     HelpMessageTypes: filters.byProps("POSITIVE", "WARNING", "INFO"),
diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx
index 288899237..6909fbd25 100644
--- a/src/plugins/mutualGroupDMs/index.tsx
+++ b/src/plugins/mutualGroupDMs/index.tsx
@@ -109,14 +109,14 @@ export default definePlugin({
         },
         // User Profile Modal v2
         {
-            find: ".tabBarPanel,{[",
+            find: ".WIDGETS?",
             replacement: [
                 {
                     match: /items:(\i),.+?(?=return\(0,\i\.jsxs?\)\("div)/,
                     replace: "$&$self.pushSection($1,arguments[0].user);"
                 },
                 {
-                    match: /\.tabBarPanel,.+?children:(?=.+?section:(\i))/,
+                    match: /\.tabBarPanel,.*?children:(?=.+?section:(\i))/,
                     replace: "$&$1==='MUTUAL_GDMS'?$self.renderMutualGDMs(arguments[0]):"
                 },
                 // Make the gap between each item smaller so our tab can fit.

From 4ff3614dc0a96ebfd825dc5fd3ef9e77de7d1da1 Mon Sep 17 00:00:00 2001
From: ayuxia <vi@placeq.com>
Date: Tue, 2 Sep 2025 22:19:12 -0300
Subject: [PATCH 3/6] ShowMeYourName: support friend nicknames (#3639)

Co-authored-by: V <vendicated@riseup.net>
---
 packages/discord-types/enums/channel.ts       | 15 +++++++
 packages/discord-types/enums/index.ts         |  1 +
 src/plugins/noReplyMention/index.tsx          |  2 +-
 src/plugins/onePingPerDM/index.ts             |  6 +--
 src/plugins/relationshipNotifier/functions.ts |  3 +-
 src/plugins/relationshipNotifier/types.ts     |  4 --
 src/plugins/relationshipNotifier/utils.ts     |  3 +-
 src/plugins/showMeYourName/index.tsx          | 45 +++++++++++++++----
 src/utils/constants.ts                        |  6 +--
 9 files changed, 61 insertions(+), 24 deletions(-)
 create mode 100644 packages/discord-types/enums/channel.ts

diff --git a/packages/discord-types/enums/channel.ts b/packages/discord-types/enums/channel.ts
new file mode 100644
index 000000000..7aae546bd
--- /dev/null
+++ b/packages/discord-types/enums/channel.ts
@@ -0,0 +1,15 @@
+export const enum ChannelType {
+    GUILD_TEXT = 0,
+    DM = 1,
+    GUILD_VOICE = 2,
+    GROUP_DM = 3,
+    GUILD_CATEGORY = 4,
+    GUILD_ANNOUNCEMENT = 5,
+    ANNOUNCEMENT_THREAD = 10,
+    PUBLIC_THREAD = 11,
+    PRIVATE_THREAD = 12,
+    GUILD_STAGE_VOICE = 13,
+    GUILD_DIRECTORY = 14,
+    GUILD_FORUM = 15,
+    GUILD_MEDIA = 16
+}
\ No newline at end of file
diff --git a/packages/discord-types/enums/index.ts b/packages/discord-types/enums/index.ts
index e2227d09f..0ab498877 100644
--- a/packages/discord-types/enums/index.ts
+++ b/packages/discord-types/enums/index.ts
@@ -1,2 +1,3 @@
 export * from "./commands";
 export * from "./messages";
+export * from "./channel";
\ No newline at end of file
diff --git a/src/plugins/noReplyMention/index.tsx b/src/plugins/noReplyMention/index.tsx
index b4de573f1..4af78ee29 100644
--- a/src/plugins/noReplyMention/index.tsx
+++ b/src/plugins/noReplyMention/index.tsx
@@ -53,7 +53,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "NoReplyMention",
     description: "Disables reply pings by default",
-    authors: [Devs.DustyAngel47, Devs.axyie, Devs.pylix, Devs.outfoxxed],
+    authors: [Devs.DustyAngel47, Devs.rae, Devs.pylix, Devs.outfoxxed],
     settings,
 
     shouldMention(message: Message, isHoldingShift: boolean) {
diff --git a/src/plugins/onePingPerDM/index.ts b/src/plugins/onePingPerDM/index.ts
index 0ef817816..b6192fb64 100644
--- a/src/plugins/onePingPerDM/index.ts
+++ b/src/plugins/onePingPerDM/index.ts
@@ -8,13 +8,9 @@ import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 import { MessageJSON } from "@vencord/discord-types";
+import { ChannelType } from "@vencord/discord-types/enums";
 import { ChannelStore, ReadStateStore, UserStore } from "@webpack/common";
 
-const enum ChannelType {
-    DM = 1,
-    GROUP_DM = 3
-}
-
 const settings = definePluginSettings({
     channelToAffect: {
         type: OptionType.SELECT,
diff --git a/src/plugins/relationshipNotifier/functions.ts b/src/plugins/relationshipNotifier/functions.ts
index 5bff474b6..19f360866 100644
--- a/src/plugins/relationshipNotifier/functions.ts
+++ b/src/plugins/relationshipNotifier/functions.ts
@@ -17,10 +17,11 @@
 */
 
 import { getUniqueUsername, openUserProfile } from "@utils/discord";
+import { ChannelType } from "@vencord/discord-types/enums";
 import { UserUtils } from "@webpack/common";
 
 import settings from "./settings";
-import { ChannelDelete, ChannelType, GuildDelete, RelationshipRemove, RelationshipType } from "./types";
+import { ChannelDelete, GuildDelete, RelationshipRemove, RelationshipType } from "./types";
 import { deleteGroup, deleteGuild, getGroup, getGuild, GuildAvailabilityStore, notify } from "./utils";
 
 let manuallyRemovedFriend: string | undefined;
diff --git a/src/plugins/relationshipNotifier/types.ts b/src/plugins/relationshipNotifier/types.ts
index f2e482d67..5d3d12d46 100644
--- a/src/plugins/relationshipNotifier/types.ts
+++ b/src/plugins/relationshipNotifier/types.ts
@@ -52,10 +52,6 @@ export interface SimpleGuild {
     iconURL?: string;
 }
 
-export const enum ChannelType {
-    GROUP_DM = 3,
-}
-
 export const enum RelationshipType {
     FRIEND = 1,
     BLOCKED = 2,
diff --git a/src/plugins/relationshipNotifier/utils.ts b/src/plugins/relationshipNotifier/utils.ts
index aaef783b0..78371f13d 100644
--- a/src/plugins/relationshipNotifier/utils.ts
+++ b/src/plugins/relationshipNotifier/utils.ts
@@ -20,11 +20,12 @@ import { DataStore, Notices } from "@api/index";
 import { showNotification } from "@api/Notifications";
 import { getUniqueUsername, openUserProfile } from "@utils/discord";
 import { FluxStore } from "@vencord/discord-types";
+import { ChannelType } from "@vencord/discord-types/enums";
 import { findStoreLazy } from "@webpack";
 import { ChannelStore, GuildMemberStore, GuildStore, RelationshipStore, UserStore, UserUtils } from "@webpack/common";
 
 import settings from "./settings";
-import { ChannelType, RelationshipType, SimpleGroupChannel, SimpleGuild } from "./types";
+import { RelationshipType, SimpleGroupChannel, SimpleGuild } from "./types";
 
 export const GuildAvailabilityStore = findStoreLazy("GuildAvailabilityStore") as FluxStore & {
     totalGuilds: number;
diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx
index 018fa3052..623c70ca0 100644
--- a/src/plugins/showMeYourName/index.tsx
+++ b/src/plugins/showMeYourName/index.tsx
@@ -10,10 +10,12 @@ import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { Message, User } from "@vencord/discord-types";
+import { Channel, Message, User } from "@vencord/discord-types";
+import { RelationshipStore } from "@webpack/common";
 
 interface UsernameProps {
-    author: { nick: string; };
+    author: { nick: string; authorId: string; };
+    channel: Channel;
     message: Message;
     withMentionPrefix?: boolean;
     isRepliedMessage: boolean;
@@ -30,6 +32,15 @@ const settings = definePluginSettings({
             { label: "Username only", value: "user" },
         ],
     },
+    friendNicknames: {
+        type: OptionType.SELECT,
+        description: "How to prioritise friend nicknames over server nicknames",
+        options: [
+            { label: "Show friend nicknames only in direct messages", value: "dms", default: true },
+            { label: "Prefer friend nicknames over server nicknames", value: "always" },
+            { label: "Prefer server nicknames over friend nicknames", value: "fallback" }
+        ]
+    },
     displayNames: {
         type: OptionType.BOOLEAN,
         description: "Use display names in place of usernames",
@@ -45,7 +56,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "ShowMeYourName",
     description: "Display usernames next to nicks, or no nicks at all",
-    authors: [Devs.Rini, Devs.TheKodeToad],
+    authors: [Devs.Rini, Devs.TheKodeToad, Devs.rae],
     patches: [
         {
             find: '="SYSTEM_TAG"',
@@ -58,23 +69,39 @@ export default definePlugin({
     ],
     settings,
 
-    renderUsername: ErrorBoundary.wrap(({ author, message, isRepliedMessage, withMentionPrefix, userOverride }: UsernameProps) => {
+    renderUsername: ErrorBoundary.wrap(({ author, channel, message, isRepliedMessage, withMentionPrefix, userOverride }: UsernameProps) => {
         try {
+            const { mode, friendNicknames, displayNames, inReplies } = settings.store;
+
             const user = userOverride ?? message.author;
             let { username } = user;
-            if (settings.store.displayNames)
+
+            if (displayNames)
                 username = user.globalName || username;
 
-            const { nick } = author;
+            let { nick } = author;
+
+            const friendNickname = RelationshipStore.getNickname(author.authorId);
+
+            if (friendNickname) {
+                const shouldUseFriendNickname =
+                    friendNicknames === "always" ||
+                    (friendNicknames === "dms" && channel.isPrivate()) ||
+                    (friendNicknames === "fallback" && !nick);
+
+                if (shouldUseFriendNickname)
+                    nick = friendNickname;
+            }
+
             const prefix = withMentionPrefix ? "@" : "";
 
-            if (isRepliedMessage && !settings.store.inReplies || username.toLowerCase() === nick.toLowerCase())
+            if (isRepliedMessage && !inReplies || username.toLowerCase() === nick.toLowerCase())
                 return <>{prefix}{nick}</>;
 
-            if (settings.store.mode === "user-nick")
+            if (mode === "user-nick")
                 return <>{prefix}{username} <span className="vc-smyn-suffix">{nick}</span></>;
 
-            if (settings.store.mode === "nick-user")
+            if (mode === "nick-user")
                 return <>{prefix}{nick} <span className="vc-smyn-suffix">{username}</span></>;
 
             return <>{prefix}{username}</>;
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 7c7488b68..705b1451d 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -197,9 +197,9 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "sunnie",
         id: 406028027768733696n
     },
-    axyie: {
-        name: "'ax",
-        id: 929877747151548487n,
+    rae: {
+        name: "rae",
+        id: 1398136199503282277n
     },
     pointy: {
         name: "pointy",

From 8789973bf5ee233a68318e80e9223c853ddc86b3 Mon Sep 17 00:00:00 2001
From: sadan4 <117494111+sadan4@users.noreply.github.com>
Date: Tue, 2 Sep 2025 21:41:46 -0400
Subject: [PATCH 4/6] WhoReacted: remove ugly more users tooltip (#3640)

Co-authored-by: Vendicated <vendicated@riseup.net>
---
 src/plugins/whoReacted/index.tsx | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/plugins/whoReacted/index.tsx b/src/plugins/whoReacted/index.tsx
index af6d8fdbf..2faedfa28 100644
--- a/src/plugins/whoReacted/index.tsx
+++ b/src/plugins/whoReacted/index.tsx
@@ -24,7 +24,7 @@ import { useForceUpdater } from "@utils/react";
 import definePlugin from "@utils/types";
 import { CustomEmoji, Message, ReactionEmoji, User } from "@vencord/discord-types";
 import { findByPropsLazy } from "@webpack";
-import { ChannelStore, Constants, FluxDispatcher, React, RestAPI, Tooltip, useEffect, useLayoutEffect, UserSummaryItem } from "@webpack/common";
+import { ChannelStore, Constants, FluxDispatcher, React, RestAPI, useEffect, useLayoutEffect, UserSummaryItem } from "@webpack/common";
 
 const AvatarStyles = findByPropsLazy("moreUsers", "emptyUser", "avatarContainer", "clickableAvatar");
 let Scroll: any = null;
@@ -73,24 +73,6 @@ function getReactionsWithQueue(msg: Message, e: ReactionEmoji, type: number) {
     return cache.users;
 }
 
-function makeRenderMoreUsers(users: User[]) {
-    return function renderMoreUsers(_label: string, _count: number) {
-        return (
-            <Tooltip text={users.slice(4).map(u => u.username).join(", ")} >
-                {({ onMouseEnter, onMouseLeave }) => (
-                    <div
-                        className={AvatarStyles.moreUsers}
-                        onMouseEnter={onMouseEnter}
-                        onMouseLeave={onMouseLeave}
-                    >
-                        +{users.length - 4}
-                    </div>
-                )}
-            </Tooltip >
-        );
-    };
-}
-
 function handleClickAvatar(event: React.UIEvent<HTMLElement, Event>) {
     event.stopPropagation();
 }
@@ -163,7 +145,7 @@ export default definePlugin({
             <div
                 style={{ marginLeft: "0.5em", transform: "scale(0.9)" }}
             >
-                <div onClick={handleClickAvatar} onKeyPress={handleClickAvatar}>
+                <div onClick={handleClickAvatar} onKeyDown={handleClickAvatar}>
                     <UserSummaryItem
                         users={users}
                         guildId={ChannelStore.getChannel(message.channel_id)?.guild_id}
@@ -171,7 +153,6 @@ export default definePlugin({
                         max={5}
                         showDefaultAvatarsForNullUsers
                         showUserPopout
-                        renderMoreUsers={makeRenderMoreUsers(users)}
                     />
                 </div>
             </div>

From 65c85a522202bdd090f9fcf7bd7702b2c5eba165 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 3 Sep 2025 04:26:33 +0200
Subject: [PATCH 5/6] CallTimer: fix overflow when using aligned chat input

Co-Authored-By: sadan4 <117494111+sadan4@users.noreply.github.com>
Co-Authored-By: God
---
 src/plugins/callTimer/alignedChatInputFix.css | 4 ++++
 src/plugins/callTimer/index.tsx               | 3 +++
 2 files changed, 7 insertions(+)
 create mode 100644 src/plugins/callTimer/alignedChatInputFix.css

diff --git a/src/plugins/callTimer/alignedChatInputFix.css b/src/plugins/callTimer/alignedChatInputFix.css
new file mode 100644
index 000000000..9bb4a039e
--- /dev/null
+++ b/src/plugins/callTimer/alignedChatInputFix.css
@@ -0,0 +1,4 @@
+.align-chat-input [class*="panels"] [class*="inner_"],
+.align-chat-input [class*="rtcConnectionStatus_"] {
+    height: fit-content;
+}
\ No newline at end of file
diff --git a/src/plugins/callTimer/index.tsx b/src/plugins/callTimer/index.tsx
index dcab05516..ae98a7878 100644
--- a/src/plugins/callTimer/index.tsx
+++ b/src/plugins/callTimer/index.tsx
@@ -23,6 +23,8 @@ import { useTimer } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
 import { React } from "@webpack/common";
 
+import alignedChatInputFix from "./alignedChatInputFix.css";
+
 function formatDuration(ms: number) {
     // here be dragons (moment fucking sucks)
     const human = Settings.plugins.CallTimer.format === "human";
@@ -50,6 +52,7 @@ export default definePlugin({
     name: "CallTimer",
     description: "Adds a timer to vcs",
     authors: [Devs.Ven],
+    managedStyle: alignedChatInputFix,
 
     startTime: 0,
     interval: void 0 as NodeJS.Timeout | undefined,

From 9700ec9cd289e67a5af5398a2ceaf74737e1b5ef Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 3 Sep 2025 04:37:38 +0200
Subject: [PATCH 6/6] fix minor bugs

---
 src/plugins/_api/badges/fixDiscordBadgePadding.css | 8 ++++----
 src/plugins/_api/badges/index.tsx                  | 1 -
 src/plugins/callTimer/index.tsx                    | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/plugins/_api/badges/fixDiscordBadgePadding.css b/src/plugins/_api/badges/fixDiscordBadgePadding.css
index eb1d60d5c..7e7702a37 100644
--- a/src/plugins/_api/badges/fixDiscordBadgePadding.css
+++ b/src/plugins/_api/badges/fixDiscordBadgePadding.css
@@ -1,5 +1,5 @@
 /* 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;
-}
+[class*="profile_"] [class*="tags_"] [class*="container_"] {
+    /* Discord has gap set to 2px instead of 1px, which causes the 12th badge to wrap to a new line. */
+    gap: 1px;
+}
\ No newline at end of file
diff --git a/src/plugins/_api/badges/index.tsx b/src/plugins/_api/badges/index.tsx
index 4118435af..8742a4bd3 100644
--- a/src/plugins/_api/badges/index.tsx
+++ b/src/plugins/_api/badges/index.tsx
@@ -57,7 +57,6 @@ async function loadBadges(noCache = false) {
 let intervalId: any;
 
 function BadgeContextMenu({ badge }: { badge: ProfileBadge & BadgeUserArgs; }) {
-    console.log(badge);
     return (
         <Menu.Menu
             navId="vc-badge-context"
diff --git a/src/plugins/callTimer/index.tsx b/src/plugins/callTimer/index.tsx
index ae98a7878..76b3efd69 100644
--- a/src/plugins/callTimer/index.tsx
+++ b/src/plugins/callTimer/index.tsx
@@ -23,7 +23,7 @@ import { useTimer } from "@utils/react";
 import definePlugin, { OptionType } from "@utils/types";
 import { React } from "@webpack/common";
 
-import alignedChatInputFix from "./alignedChatInputFix.css";
+import alignedChatInputFix from "./alignedChatInputFix.css?managed";
 
 function formatDuration(ms: number) {
     // here be dragons (moment fucking sucks)