ulysia/Vencord
1
0
Fork 0
Code Pull requests Activity

fix(PronounDB): don't use guild pronouns in global profile modal (#1462)

Browse source
This commit is contained in:
alexia 2023-07-26 01:34:51 +02:00 committed by GitHub
parent abf62f28db
commit f2c6fcaa3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/pronoundb/index.ts
View file

@ -69,7 +69,7 @@ export default definePlugin({
replacement: [ replacement: [
{ {
match: /getGlobalName\(\i\);(?<=displayProfile.{0,200})/, match: /getGlobalName\(\i\);(?<=displayProfile.{0,200})/,
replace: "$&const [vcPronounce,vcPronounSource]=$self.useProfilePronouns(arguments[0].user.id);if(arguments[0].displayProfile&&vcPronounce)arguments[0].displayProfile.pronouns=vcPronounce;" replace: "$&const [vcPronounce,vcPronounSource]=$self.useProfilePronouns(arguments[0].user.id,true);if(arguments[0].displayProfile&&vcPronounce)arguments[0].displayProfile.pronouns=vcPronounce;"
}, },
PRONOUN_TOOLTIP_PATCH PRONOUN_TOOLTIP_PATCH
] ]

16
src/plugins/pronoundb/pronoundbUtils.ts
View file

@ -58,16 +58,20 @@ const bulkFetch = debounce(async () => {
} }
}); });
function getDiscordPronouns(id: string) { function getDiscordPronouns(id: string, useGlobalProfile: boolean = false) {
const globalPronouns = UserProfileStore.getUserProfile(id)?.pronouns;
if (useGlobalProfile) return globalPronouns;
return ( return (
UserProfileStore.getGuildMemberProfile(id, getCurrentChannel()?.guild_id)?.pronouns UserProfileStore.getGuildMemberProfile(id, getCurrentChannel()?.guild_id)?.pronouns
|| UserProfileStore.getUserProfile(id)?.pronouns || globalPronouns
); );
} }
export function useFormattedPronouns(id: string): PronounsWithSource { export function useFormattedPronouns(id: string, useGlobalProfile: boolean = false): PronounsWithSource {
// Discord is so stupid you can put tons of newlines in pronouns // Discord is so stupid you can put tons of newlines in pronouns
const discordPronouns = getDiscordPronouns(id)?.trim().replace(NewLineRe, " "); const discordPronouns = getDiscordPronouns(id, useGlobalProfile)?.trim().replace(NewLineRe, " ");
const [result] = useAwaiter(() => fetchPronouns(id), { const [result] = useAwaiter(() => fetchPronouns(id), {
fallbackValue: getCachedPronouns(id), fallbackValue: getCachedPronouns(id),
@ -83,8 +87,8 @@ export function useFormattedPronouns(id: string): PronounsWithSource {
return [discordPronouns, "Discord"]; return [discordPronouns, "Discord"];
} }
export function useProfilePronouns(id: string): PronounsWithSource { export function useProfilePronouns(id: string, useGlobalProfile: boolean = false): PronounsWithSource {
const pronouns = useFormattedPronouns(id); const pronouns = useFormattedPronouns(id, useGlobalProfile);
if (!settings.store.showInProfile) return EmptyPronouns; if (!settings.store.showInProfile) return EmptyPronouns;
if (!settings.store.showSelf && id === UserStore.getCurrentUser().id) return EmptyPronouns; if (!settings.store.showSelf && id === UserStore.getCurrentUser().id) return EmptyPronouns;