StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-07-10 12:37:19 +00:00
Code Releases Activity

fix

Browse source
This commit is contained in:
rubyowo 2023-07-03 18:36:35 +04:00
parent b5c12770dc
commit 0b9cc09beb
No known key found for this signature in database
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/src/utils.ts
View file

@ -1611,6 +1611,8 @@ export function renderUsername(username: string, discriminator: string): string
} }
export function renderUserUsername(user: GuildMember | User | UnknownUser): string { export function renderUserUsername(user: GuildMember | User | UnknownUser): string {
user instanceof GuildMember ? (user = user.user) : null; if(user instanceof GuildMember) {
return renderUsername(user.user.username, user.user.discriminator);
}
return renderUsername(user.username, user.discriminator); return renderUsername(user.username, user.discriminator);
} }

4
backend/src/utils/templateSafeObjects.ts
View file

@ -259,7 +259,7 @@ export function userToTemplateSafeUser(user: User | UnknownUser): TemplateSafeUs
discriminator: user.discriminator, discriminator: user.discriminator,
mention: `<@${user.id}>`, mention: `<@${user.id}>`,
tag: user.tag, tag: user.tag,
avatarURL: user.displayAvatarURL(), avatarURL: user.displayAvatarURL?.(),
bot: user.bot, bot: user.bot,
createdAt: user.createdTimestamp, createdAt: user.createdTimestamp,
renderedUsername: renderUserUsername(user), renderedUsername: renderUserUsername(user),
@ -285,7 +285,7 @@ export function memberToTemplateSafeMember(member: GuildMember | PartialGuildMem
nick: member.nickname ?? "*None*", nick: member.nickname ?? "*None*",
roles: [...member.roles.cache.mapValues((r) => roleToTemplateSafeRole(r)).values()], roles: [...member.roles.cache.mapValues((r) => roleToTemplateSafeRole(r)).values()],
joinedAt: member.joinedTimestamp ?? undefined, joinedAt: member.joinedTimestamp ?? undefined,
guildAvatarURL: member.displayAvatarURL(), guildAvatarURL: member.displayAvatarURL?.(),
guildName: member.guild.name, guildName: member.guild.name,
}); });
} }