From 0b9cc09beba1303fcbf3c3afa76eb00b99f4f27d Mon Sep 17 00:00:00 2001
From: rubyowo <perhaps-you-know@what-is.ml>
Date: Mon, 3 Jul 2023 18:36:35 +0400
Subject: [PATCH] fix

---
 backend/src/utils.ts                     | 4 +++-
 backend/src/utils/templateSafeObjects.ts | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/src/utils.ts b/backend/src/utils.ts
index ed7837f8..2743af24 100644
--- a/backend/src/utils.ts
+++ b/backend/src/utils.ts
@@ -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);
 }
diff --git a/backend/src/utils/templateSafeObjects.ts b/backend/src/utils/templateSafeObjects.ts
index 6c9b5e08..beeea760 100644
--- a/backend/src/utils/templateSafeObjects.ts
+++ b/backend/src/utils/templateSafeObjects.ts
@@ -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,
   });
 }