@@ -244,28 +244,28 @@ export function guildToTemplateSafeGuild(guild: Guild): TemplateSafeGuild {
244244}
245245
246246export function userToTemplateSafeUser ( user : User | UnknownUser | PartialUser ) : TemplateSafeUser {
247- if ( user instanceof UnknownUser || user . partial ) {
247+ if ( user instanceof User ) {
248248 return new TemplateSafeUser ( {
249249 id : user . id ,
250- username : "Unknown" ,
251- discriminator : "0000" ,
250+ username : user . username ,
251+ discriminator : user . discriminator ,
252+ globalName : user . globalName ,
252253 mention : `<@${ user . id } >` ,
253- tag : "Unknown#0000" ,
254- renderedUsername : "Unknown" ,
254+ tag : user . tag ,
255+ avatarURL : user . displayAvatarURL ?.( ) || "" ,
256+ bot : user . bot ,
257+ createdAt : user . createdTimestamp ,
258+ renderedUsername : renderUsername ( user ) ,
255259 } ) ;
256260 }
257261
258262 return new TemplateSafeUser ( {
259263 id : user . id ,
260- username : user . username ,
261- discriminator : user . discriminator ,
262- globalName : user . globalName ,
264+ username : "Unknown" ,
265+ discriminator : "0000" ,
263266 mention : `<@${ user . id } >` ,
264- tag : user . tag ,
265- avatarURL : user . displayAvatarURL ( ) ,
266- bot : user . bot ,
267- createdAt : user . createdTimestamp ,
268- renderedUsername : renderUsername ( user ) ,
267+ tag : "Unknown#0000" ,
268+ renderedUsername : "Unknown" ,
269269 } ) ;
270270}
271271
0 commit comments