diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx index 54935a6ec..6ae62fa65 100644 --- a/src/plugins/showMeYourName/index.tsx +++ b/src/plugins/showMeYourName/index.tsx @@ -56,7 +56,7 @@ const symbolPattern = /^[\p{S}\p{P}]{1,3}$/iu; const templatePattern = /(?:\{(?:custom|friend|nick|display|user)(?:,\s*(?:custom|friend|nick|display|user))*\})/iu; type CustomNicknameData = Record; -let customNicknames: CustomNicknameData = {}; +export let customNicknames: CustomNicknameData = {}; let toCSSCache: Map | null = null; let toCSSProbe: HTMLDivElement | null = null; diff --git a/src/plugins/typingTweaks/index.tsx b/src/plugins/typingTweaks/index.tsx index 4ff4f540b..4634a3440 100644 --- a/src/plugins/typingTweaks/index.tsx +++ b/src/plugins/typingTweaks/index.tsx @@ -19,6 +19,7 @@ import { definePluginSettings, migratePluginToSettings, Settings } from "@api/Settings"; import ErrorBoundary from "@components/ErrorBoundary"; import { getCustomColorString } from "@equicordplugins/customUserColors"; +import { customNicknames } from "@plugins/showMeYourName"; import { Devs, EquicordDevs } from "@utils/constants"; import { classNameFactory } from "@utils/css"; import { openUserProfile } from "@utils/discord"; @@ -104,7 +105,8 @@ const TypingUser = ErrorBoundary.wrap(function TypingUser({ user, guildId }: Typ size="SIZE_16" src={user.getAvatarURL(guildId, 128)} /> )} - {GuildMemberStore.getNick(guildId!, user.id) + {customNicknames[user.id] + || GuildMemberStore.getNick(guildId!, user.id) || (!guildId && RelationshipStore.getNickname(user.id)) || (user as any).globalName || user.username