From e70876f1e50d5428a752a46e23939d26bc388343 Mon Sep 17 00:00:00 2001
From: Chen Asraf <casraf@pm.me>
Date: Sat, 10 Aug 2024 16:02:28 +0300
Subject: [PATCH] fix(quotes): user mentions

---
 src/core/logger.ts         | 3 ++-
 src/utils/discord_utils.ts | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/core/logger.ts b/src/core/logger.ts
index 4ac293d..01f9320 100644
--- a/src/core/logger.ts
+++ b/src/core/logger.ts
@@ -23,8 +23,9 @@ const _logger = winston.createLogger({
           silly: 35, // magenta
         }
         const color = `\x1b[${colorMap[i.level as LogLevel]}m`
+        const reset = '\x1b[0m'
         const level = `[${i.level.toUpperCase()}]`.padStart(10, ' ')
-        return `${color}${level} ${i.message}`
+        return `${color}${level} ${i.message}${reset}`
       }),
     }),
   ],
diff --git a/src/utils/discord_utils.ts b/src/utils/discord_utils.ts
index a7c0d8c..1802c2a 100644
--- a/src/utils/discord_utils.ts
+++ b/src/utils/discord_utils.ts
@@ -1,3 +1,4 @@
+import { logger } from '@/core/logger'
 import Discord, { PermissionsBitField } from 'discord.js'
 
 export const MENTION_REGEX = /<@!?(\d+)>/g
@@ -13,7 +14,13 @@ export async function isAdministrator(member: Discord.GuildMember): Promise<bool
  * If clean is true (default), will try to fetch nickname from CA style - "Real Name (Nickname)"
  */
 export function getMentionUsername(message: Discord.Message, userId: string, clean = true): string {
-  const displayName = message.mentions.members!.get(userId)?.nickname ?? 'Unknown'
+  logger.debug('getMentionUsername', {
+    userId,
+    mentions: message.mentions.members!.toJSON(),
+    userMention: message.mentions.members!.get(userId),
+  })
+  const mention = message.mentions.members!.get(userId)
+  const displayName = mention?.nickname ?? mention?.displayName ?? 'Unknown'
   if (clean) {
     const startParenIdx = displayName.indexOf('(')
     const endParenIdx = displayName.indexOf(')')