mirror of
https://github.com/ZeppelinBot/Zeppelin.git
synced 2025-07-10 04:27:20 +00:00
fix
This commit is contained in:
parent
b5c12770dc
commit
0b9cc09beb
2 changed files with 5 additions and 3 deletions
|
@ -1611,6 +1611,8 @@ export function renderUsername(username: string, discriminator: string): 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);
|
||||
}
|
||||
|
|
|
@ -259,7 +259,7 @@ export function userToTemplateSafeUser(user: User | UnknownUser): TemplateSafeUs
|
|||
discriminator: user.discriminator,
|
||||
mention: `<@${user.id}>`,
|
||||
tag: user.tag,
|
||||
avatarURL: user.displayAvatarURL(),
|
||||
avatarURL: user.displayAvatarURL?.(),
|
||||
bot: user.bot,
|
||||
createdAt: user.createdTimestamp,
|
||||
renderedUsername: renderUserUsername(user),
|
||||
|
@ -285,7 +285,7 @@ export function memberToTemplateSafeMember(member: GuildMember | PartialGuildMem
|
|||
nick: member.nickname ?? "*None*",
|
||||
roles: [...member.roles.cache.mapValues((r) => roleToTemplateSafeRole(r)).values()],
|
||||
joinedAt: member.joinedTimestamp ?? undefined,
|
||||
guildAvatarURL: member.displayAvatarURL(),
|
||||
guildAvatarURL: member.displayAvatarURL?.(),
|
||||
guildName: member.guild.name,
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue