From 0fbb8918dcb9e7238aaf1c5fbfd69b8ad886267c Mon Sep 17 00:00:00 2001
From: Nix Krystik <nix@archwing.dev>
Date: Wed, 14 Oct 2026 13:36:55 +0800
Subject: [PATCH] (modals): Implement `add-note-modal` modal.

---
 src/modals/add-note-modal.ts | 64 +++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/modals/add-note-modal.ts b/src/modals/add-note-modal.ts
index 6347710..70e44dd 100644
--- a/src/modals/add-note-modal.ts
+++ b/src/modals/add-note-modal.ts
@@ -1,40 +1,38 @@
-import { Client, MessageFlags, ModalSubmitInteraction } from 'discord.js';
+import { Client, ModalSubmitInteraction } from 'discord.js';
 import { Database } from '../shared/Database';
-import { logCustomEvent } from '../utils';
+import { deferInteraction, logCustomEvent } from '../utils';
+import { Modal } from '../types';
 
-export default {
-  name: 'add-note-modal',
-  handler: async function (client: Client, interaction: ModalSubmitInteraction, id: string) {
-    const message = interaction.fields.getTextInputValue('note-message');
+class AddNoteModal implements Modal<Client> {
+  id = 'add-note-modal';
 
-    const user = await client.users.fetch(id);
+  async execute(context: Client<boolean>, interaction: ModalSubmitInteraction, id: string): Promise<void> {
+    if (!interaction.inGuild()) return;
+    await deferInteraction(interaction);
 
-    logCustomEvent(interaction.guild!, {
-      title: 'Note Added',
-      description: null,
-      color: 0x00FF00,
-      timestamp: new Date(),
-      fields: [
-        {
-          name: 'Moderator',
-          value: `<@${interaction.user.id}>\n${interaction.user.username}`,
-          inline: true
-        },
-        {
-          name: 'User',
-          value: `<@${id}>\n${user.username}`,
-          inline: true
-        },
-        {
-          name: 'Note',
-          value: message,
-          inline: true
-        }
-      ]
-    });
+    try {
+      const message = interaction.fields.getTextInputValue('note-message');
+      const guild = await context.guilds.fetch(interaction.guildId);
+      const user = await context.users.fetch(id);
 
-    await Database.putNote(id, message, interaction.user.id);
+      await logCustomEvent(guild, {
+        title: 'Note Added',
+        description: null,
+        color: 0x00FF00,
+        timestamp: new Date(),
+        fields: [
+          { name: 'Moderator', value: `${interaction.user} (${interaction.user.id})`, inline: false },
+          { name: 'User', value: `${user.username} (${user.id})`, inline: false },
+          { name: 'Note', value: message, inline: false },
+        ],
+      });
 
-    interaction.reply({ flags: [MessageFlags.Ephemeral], content: 'Note added' });
+      await Database.putNote(id, message, interaction.user.id);
+      await interaction.editReply({ content: 'Note added.' });
+    } catch (error: Error | any) {
+      await interaction.editReply({ content: error.message }).catch(() => {});
+    }
   }
-};
\ No newline at end of file
+}
+
+export default new AddNoteModal();
\ No newline at end of file