ryanamay/ModularVencord
1
0
Fork 0
mirror of https://github.com/Vendicated/Vencord.git synced 2024-09-20 06:30:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge e4ec89e0ba into c7e5295da0

Browse source
This commit is contained in:
Andrio Celos 2024-09-18 21:34:12 +02:00 committed by GitHub
commit 65aa55383d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/plugins/vcNarrator/index.tsx
View file

@ -148,7 +148,8 @@ function playSample(tempSettings: any, type: string) {
const currentUser = UserStore.getCurrentUser(); const currentUser = UserStore.getCurrentUser();
const myGuildId = SelectedGuildStore.getGuildId(); const myGuildId = SelectedGuildStore.getGuildId();
speak(formatText(settings[type + "Message"], currentUser.username, "general", (currentUser as any).globalName ?? currentUser.username, GuildMemberStore.getNick(myGuildId, currentUser.id) ?? currentUser.username), settings); const displayName = (currentUser as any).globalName ?? currentUser.username;
speak(formatText(settings[type + "Message"], currentUser.username, "general", displayName, GuildMemberStore.getNick(myGuildId, currentUser.id) ?? displayName), settings);
} }
export default definePlugin({ export default definePlugin({
@ -179,7 +180,7 @@ export default definePlugin({
const template = Settings.plugins.VcNarrator[type + "Message"]; const template = Settings.plugins.VcNarrator[type + "Message"];
const user = isMe && !Settings.plugins.VcNarrator.sayOwnName ? "" : UserStore.getUser(userId).username; const user = isMe && !Settings.plugins.VcNarrator.sayOwnName ? "" : UserStore.getUser(userId).username;
const displayName = user && ((UserStore.getUser(userId) as any).globalName ?? user); const displayName = user && ((UserStore.getUser(userId) as any).globalName ?? user);
const nickname = user && (GuildMemberStore.getNick(myGuildId, userId) ?? user); const nickname = user && (GuildMemberStore.getNick(myGuildId, userId) ?? displayName);
const channel = ChannelStore.getChannel(id).name; const channel = ChannelStore.getChannel(id).name;
speak(formatText(template, user, channel, displayName, nickname)); speak(formatText(template, user, channel, displayName, nickname));