From 8115c27d560f75ae952963f2e0448c91a57b7960 Mon Sep 17 00:00:00 2001
From: Nix Krystik <nix@archwing.dev>
Date: Tue, 13 Oct 2026 22:50:31 +0800
Subject: [PATCH] (tickets): Move ticket closure functionality to a seperate
 utilities function & replace close-ticket logic with .

---
 src/buttons/close-ticket.ts     | 22 ++++++-------
 src/utils/private-help-utils.ts | 57 ++++++++++++++++++++++++---------
 2 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/src/buttons/close-ticket.ts b/src/buttons/close-ticket.ts
index f0742a7..69f7ca3 100644
--- a/src/buttons/close-ticket.ts
+++ b/src/buttons/close-ticket.ts
@@ -1,5 +1,5 @@
 import { ButtonInteraction, Client, MessageFlags, ChannelType } from 'discord.js';
-import { Database } from '../shared/Database';
+import { closeTicket } from '../utils';
 
 export default {
   name: 'close-ticket',
@@ -7,23 +7,21 @@ export default {
     const channel = await interaction.channel?.fetch();
 
     if (!channel || !channel.isThread() || !channel.isSendable() || channel.type != ChannelType.PrivateThread)
-      return interaction.reply({ flags: [MessageFlags.Ephemeral], content: 'Oops. Something went wrong. Please report this to a staff member.' });
+      return await interaction.reply({ flags: [MessageFlags.Ephemeral], content: 'Oops. Something went wrong. Please report this to a staff member.' });
+
+    await interaction.reply({
+      content: 'Closing, please wait...',
+      flags: MessageFlags.Ephemeral
+    });
 
     await interaction.message.edit({
       content: interaction.message.content,
       components: []
     });
 
-    await Database.closePrivateHelpTicket(channel.id);
+    if (await closeTicket(client, channel, `This ticket has been closed by ${interaction.user}`))
+      return await interaction.editReply({ content: 'An error occured while trying to close this ticket.' });
 
-    await channel.send(`This ticket has been closed by ${interaction.user}`);
-
-    await interaction.reply({ flags: [MessageFlags.Ephemeral], content: 'Ticket closed.' });
-
-    channel.edit({
-      name: `[CLOSED] ${channel.name}`.slice(0, 100),
-      archived: true,
-      locked: true
-    });
+    await interaction.editReply({ content: 'Ticket closed.' });
   }
 };
\ No newline at end of file
diff --git a/src/utils/private-help-utils.ts b/src/utils/private-help-utils.ts
index 371d73f..5eb2600 100644
--- a/src/utils/private-help-utils.ts
+++ b/src/utils/private-help-utils.ts
@@ -1,31 +1,58 @@
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ChannelType, ChatInputCommandInteraction, Client, Guild, GuildMember, ModalBuilder, PrivateThreadChannel, TextChannel, TextInputStyle, ThreadAutoArchiveDuration, ThreadChannel, UserContextMenuCommandInteraction } from 'discord.js';
 import { Database } from '../shared/Database';
-import { createTextInput, createYesNoMenu } from '.';
+import { CreateDefaultEmbed, createTextInput, createYesNoMenu, SetSeverity } from '.';
 
 export async function closeOldTickets(client: Client) {
   for (const ticket of await Database.getAllOpenPrivateHelpTickets()) {
-    const thread = await client.channels.fetch(ticket.thread_id) as ThreadChannel;
-    const latestMessage = (await thread.messages.fetch({ limit: 1 })).at(0);
-
-    // We only process tickets older than 5 days.
-    if (latestMessage && latestMessage.createdTimestamp > Date.now() - 432e6) continue;
-
     try {
-      await Database.closePrivateHelpTicket(thread.id);
+      const thread = await client.channels.fetch(ticket.thread_id) as ThreadChannel;
+      const latestMessage = (await thread.messages.fetch({ limit: 1 })).at(0);
+  
+      // Only process stale tickets. (Tickets with 5 days since the last message.)
+      if (latestMessage && latestMessage.createdTimestamp > Date.now() - 432e6) continue;
 
-      await thread.send('This ticket has been closed due to inactivity.');
-
-      await thread.edit({
-        name: `[CLOSED] ${thread.name}`,
-        archived: true,
-        locked: true,
-      });
+      await closeTicket(client, thread, 'This ticket has been closed due to inactivity.');
     } catch (e) {
       console.error('Error closing ticket due to inactivity:', e);
     }
   }
 }
 
+export async function closeTicket(context: Client, thread: ThreadChannel, reason: string): Promise<boolean> {
+  try {
+    await Database.closePrivateHelpTicket(thread.id);
+
+    await thread.send({
+      embeds: [{
+        ...CreateDefaultEmbed(context),
+        ...SetSeverity('info'),
+
+        title: 'Ticket Closed',
+        description: reason,
+      }],
+    });
+
+    await thread.edit({
+      name: `[CLOSED] ${thread.name}`.slice(0, 100),
+      archived: true,
+      locked: true,
+    });
+
+    return true;
+  } catch (error) {
+    console.log('An error occured while trying to close the ticket:', error);
+
+    await thread.send({
+      embeds: [{
+        ...SetSeverity('error'),
+        description: 'I encountered an error while trying to close this ticket.',
+      }],
+    });
+
+    return false;
+  }
+}
+
 export async function createPrivateHelpTicketThread(client: Client, guild: Guild, creator: GuildMember | null, reason: string, customTitle: string = '', additionalMembersToAdd: string[] = []): Promise<PrivateThreadChannel | null> {
   const settings = await Database.getOrCreateSettings(guild.id);