From 27481e6e04cf2151eea15559edcbd7503fd91c7c Mon Sep 17 00:00:00 2001
From: Nix Krystik <nix@archwing.dev>
Date: Tue, 20 Oct 2026 16:30:59 +0000
Subject: [PATCH] Fix additional conflicts manually.

---
 src/buttons/closeModTicket.ts | 11 +++++------
 src/buttons/closeTicket.ts    | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/buttons/closeModTicket.ts b/src/buttons/closeModTicket.ts
index 05e7b87..67440a5 100644
--- a/src/buttons/closeModTicket.ts
+++ b/src/buttons/closeModTicket.ts
@@ -1,5 +1,6 @@
 import { ButtonInteraction, Client, MessageFlags, ChannelType } from 'discord.js';
 import { Button } from '../types';
+import { closeTicket } from '../utils';
 
 class CloseModTicketButton implements Button<Client> {
   id = 'close-mod-ticket';
@@ -22,14 +23,12 @@ class CloseModTicketButton implements Button<Client> {
         components: []
       });
 
-      await channel.send('This ticket has been closed by staff.');
+      if (!await closeTicket(context, channel, 'This ticket has been closed by staff.')) {
+        await interaction.editReply({ content: 'An error occurred while trying to close this ticket.' });
+        return;
+      }
 
       await interaction.editReply({ content: 'Ticket closed.' });
-
-      await channel.edit({
-        archived: true,
-        locked: true
-      });
     } catch (error: Error | any) {
       await interaction.editReply({ content: error.message }).catch(() => {});
     }
diff --git a/src/buttons/closeTicket.ts b/src/buttons/closeTicket.ts
index 8d38def..0c504c3 100644
--- a/src/buttons/closeTicket.ts
+++ b/src/buttons/closeTicket.ts
@@ -1,6 +1,6 @@
 import { ButtonInteraction, Client, MessageFlags, ChannelType } from 'discord.js';
-import { Database } from '../shared/Database';
 import { Button } from '../types';
+import { closeTicket } from '../utils';
 
 class CloseTicketButton implements Button<Client> {
   id = 'close-ticket';
@@ -16,21 +16,22 @@ class CloseTicketButton implements Button<Client> {
       if (!channel.isThread() || channel.type != ChannelType.PrivateThread) throw new Error('This interaction was not run in a ticket thread.');
       if (!channel.isSendable()) throw new Error("I don't have permission to send messages in this channel.");
 
+      await interaction.reply({
+        content: 'Closing, please wait...',
+        flags: MessageFlags.Ephemeral
+      });
+
       await interaction.message.edit({
         content: interaction.message.content,
         components: []
       });
 
-      await Database.closePrivateHelpTicket(channel.id);
-
-      await channel.send(`This ticket has been closed by ${interaction.user}`);
+      if (!await closeTicket(context, channel, `This ticket has been closed by ${interaction.user}`)) {
+        await interaction.editReply({ content: 'An error occurred while trying to close this ticket.' });
+        return;
+      }
 
       await interaction.editReply({ content: 'Ticket closed.' });
-
-      await channel.edit({
-        archived: true,
-        locked: true
-      });
     } catch (error: Error | any) {
       await interaction.editReply({ content: error.message }).catch(() => {});
     }