From ed6cd9062719f9742952d4fc4d5df8617f615c26 Mon Sep 17 00:00:00 2001
From: Tarrgon <61888458+Tarrgon@users.noreply.github.com>
Date: Tue, 18 Nov 2025 11:49:09 -0500
Subject: [PATCH] Add user id to user-related messages

---
 src/commands/notes.ts            | 6 +++---
 src/events/handle-member-join.ts | 2 +-
 src/utils/alt-utils.ts           | 2 +-
 src/utils/whois.ts               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/commands/notes.ts b/src/commands/notes.ts
index a5d3178..3dda5d1 100644
--- a/src/commands/notes.ts
+++ b/src/commands/notes.ts
@@ -128,7 +128,7 @@ export default {
 
       await Database.putNote(user.id, reason, interaction.user.id);
 
-      interaction.editReply(`Note added to <@${user.id}>.\n\nReason:\n${reason}`);
+      interaction.editReply(`Note added to <@${user.id}> (${user.id}).\n\nReason:\n${reason}`);
     } else if (subcommand == 'remove') {
       const noteId = interaction.options.getInteger('note', true);
 
@@ -203,11 +203,11 @@ export default {
 
       await Database.editNote(noteId, note.reason, reason, interaction.user.id);
 
-      interaction.editReply(`Note on <@${user.id}> edited.\n\nNew reason:\n${reason}`);
+      interaction.editReply(`Note on <@${user.id}> (${user.id}) edited.\n\nNew reason:\n${reason}`);
     } else if (subcommand == 'list') {
       const noteMessage = await getNoteMessage(user.id, 1);
 
-      if (!noteMessage) return interaction.editReply(`No notes found for <@${user.id}>`);
+      if (!noteMessage) return interaction.editReply(`No notes found for <@${user.id}> (${user.id})`);
 
       interaction.editReply(noteMessage);
     }
diff --git a/src/events/handle-member-join.ts b/src/events/handle-member-join.ts
index b098248..302c3ae 100644
--- a/src/events/handle-member-join.ts
+++ b/src/events/handle-member-join.ts
@@ -9,7 +9,7 @@ export async function handleMemberJoin(member: GuildMember) {
     const channel = await member.guild.channels.fetch(guildSettings.new_member_channel_id) as GuildTextBasedChannel;
 
     if (channel) {
-      const content = `${member.toString()}'s e621 and discord account(s):\n${await getE621Alts(member.id, member.guild)}`;
+      const content = `${member.toString()}'s (${member.id}) e621 and discord account(s):\n${await getE621Alts(member.id, member.guild)}`;
 
       channel.send(content).catch(console.error);
 
diff --git a/src/utils/alt-utils.ts b/src/utils/alt-utils.ts
index 7b9c14b..b7dbc18 100644
--- a/src/utils/alt-utils.ts
+++ b/src/utils/alt-utils.ts
@@ -46,7 +46,7 @@ export async function getDiscordAlts(e621Id: number, guild: Guild, depth = 1, ig
       banned = !!(await guild.bans.fetch(discordId));
     } catch (e) { }
 
-    content += `${' '.repeat((depth - 1) * 2)}- <@${discordId}>${banned ? ' [BANNED]' : ''}\n${alts}`;
+    content += `${' '.repeat((depth - 1) * 2)}- <@${discordId}> (${discordId})${banned ? ' [BANNED]' : ''}\n${alts}`;
   }
 
   return content;
diff --git a/src/utils/whois.ts b/src/utils/whois.ts
index 9756c74..bf143fc 100644
--- a/src/utils/whois.ts
+++ b/src/utils/whois.ts
@@ -14,5 +14,5 @@ export async function handleWhoIsInteraction(interaction: CommandInteraction, va
 
   const content = await getE621Alts(user.id, interaction.guild!);
 
-  interaction.editReply(`<@${user.id}>'s e621 and discord account(s):\n${content}`);
+  interaction.editReply(`<@${user.id}>'s (${user.id}) e621 and discord account(s):\n${content}`);
 }
\ No newline at end of file