Fix additional conflicts manually.

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(() => {});
     }

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(() => {});
     }

src/utils/private-help-utils.ts

@@ -1,35 +1,64 @@
 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 './modal-utils';
+import { CreateDefaultEmbed, createTextInput, createYesNoMenu, SetSeverity } from '.';
 
 export async function closeOldTickets(client: Client) {
   for (const ticket of await Database.getAllOpenPrivateHelpTickets()) {
     try {
       const thread = await client.channels.fetch(ticket.thread_id) as ThreadChannel;
       const latestMessage = (await thread.messages.fetch({ limit: 1 })).at(0);
-      if (latestMessage && latestMessage.createdTimestamp <= Date.now() - 432e6) {
+
+      // Only process stale tickets. (Tickets with 5 days since the last message.)
+      if (latestMessage && latestMessage.createdTimestamp > Date.now() - 432e6) continue;
+
+      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('This ticket has been closed due to inactivity.');
+    await thread.send({
+      embeds: [{
+        ...CreateDefaultEmbed(context),
+        ...SetSeverity('info'),
 
-        thread.edit({
-          archived: true,
-          locked: true
+        title: 'Ticket Closed',
+        description: reason,
+      }],
     });
-      }
-    } catch (e) {
-      console.error('Error closing ticket due to inactivity:');
-      console.error(e);
-    }
+
+    await thread.edit({
+      name: `[CLOSED] ${thread.name}`.slice(0, 100),
+      archived: true,
+      locked: true,
+    });
+
+    return true;
+  } catch (error) {
+    console.error('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.',
+      }],
+    }).catch(() => {});
+
+    return false;
   }
 }
 
 export async function createPrivateHelpTicketThread(client: Client, guild: Guild, creator: GuildMember | null, reason: string, customTitle: string = '', additionalMembersToAdd: string[] = []): Promise<PrivateThreadChannel | null> {
-  const guildSettings = await Database.getOrCreateSettings(guild.id);
+  const settings = await Database.getOrCreateSettings(guild.id);
 
-  if (!guildSettings || !guildSettings.private_help_channel_id || !guildSettings.private_help_role_id) return null;
+  if (!settings.private_help_channel_id || !settings.private_help_role_id) return null;
 
-  const channel = await client.channels.fetch(guildSettings.private_help_channel_id) as TextChannel;
+  const channel = await client.channels.fetch(settings.private_help_channel_id) as TextChannel;
 
   const thread = await channel.threads.create({
     name: customTitle ? customTitle : (creator ? `${creator.displayName}'s Ticket` : 'Mod Ticket'),
@@ -54,11 +83,11 @@ export async function createPrivateHelpTicketThread(client: Client, guild: Guild
     const row = new ActionRowBuilder<ButtonBuilder>().addComponents(closeButton, claimButton);
 
     await thread.send({
-      content: `${creator} feel free to direct your questions at any <@&${guildSettings.private_help_role_id}>. Only you and staff members can see this channel.\n\n**Reason for contact:**\n${reason}\n\n-# Tickets will automatically close after 5 days of inactivity.`,
+      content: `${creator} feel free to direct your questions at any <@&${settings.private_help_role_id}>. Only you and staff members can see this channel.\n\n**Reason for contact:**\n${reason}\n\n-# Tickets will automatically close after 5 days of inactivity.`,
       components: [row],
       allowedMentions: {
         users: [creator.id],
-        roles: [guildSettings.private_help_role_id]
+        roles: [settings.private_help_role_id]
       }
     });
   } else {