Conflicts.

This is the most painful part of this whole thing. I hate merge conflicts. Merge conflicts suck and I wish they didn't exist.

src/buttons/close-mod-ticket.ts

@@ -1,5 +1,4 @@
 import { ButtonInteraction, Client, MessageFlags, ChannelType, PermissionFlagsBits } from 'discord.js';
-import { closeTicket } from '../utils';
 
 export default {
   name: 'close-mod-ticket',
@@ -20,9 +19,13 @@ export default {
       components: []
     });
 
-    if (!await closeTicket(client, channel, 'This ticket has been closed by staff.'))
+    await channel.send('This ticket has been closed by staff.');
-      return await interaction.editReply({ content: 'An error occurred while trying to close this ticket.' });
 
     await interaction.editReply({ content: 'Ticket closed.' });
+
+    channel.edit({
+      archived: true,
+      locked: true
+    });
   }
 };

src/buttons/close-ticket.ts

@@ -1,26 +1,28 @@
 import { ButtonInteraction, Client, MessageFlags, ChannelType } from 'discord.js';
-import { closeTicket } from '../utils';
+import { Database } from '../shared/Database';
 
 export default {
   name: 'close-ticket',
   handler: async function (client: Client, interaction: ButtonInteraction) {
     const channel = await interaction.channel?.fetch();
-    if (!channel || !channel.isThread() || !channel.isSendable() || channel.type != ChannelType.PrivateThread)
-      return await interaction.reply({ flags: [MessageFlags.Ephemeral], content: 'Oops. Something went wrong. Please report this to a staff member.' });
 
-    await interaction.reply({
+    if (!channel || !channel.isThread() || !channel.isSendable() || channel.type != ChannelType.PrivateThread)
-      content: 'Closing, please wait...',
+      return interaction.reply({ flags: [MessageFlags.Ephemeral], content: 'Oops. Something went wrong. Please report this to a staff member.' });
-      flags: MessageFlags.Ephemeral
-    });
 
     await interaction.message.edit({
       content: interaction.message.content,
       components: []
     });
 
-    if (!await closeTicket(client, channel, `This ticket has been closed by ${interaction.user}`))
+    await Database.closePrivateHelpTicket(channel.id);
-      return await interaction.editReply({ content: 'An error occurred while trying to close this ticket.' });
 
-    await interaction.editReply({ content: 'Ticket closed.' });
+    await channel.send(`This ticket has been closed by ${interaction.user}`);
+
+    await interaction.reply({ flags: [MessageFlags.Ephemeral], content: 'Ticket closed.' });
+
+    channel.edit({
+      archived: true,
+      locked: true
+    });
   }
 };

src/utils/private-help-utils.ts

@@ -121,8 +121,9 @@ export async function openModTicketModal(interaction: UserContextMenuCommandInte
 
   const titleLabel = createTextInput('title', 'Title', `The name of the thread. Defaults to "Mod Ticket For ${member.displayName}" if left empty`, false, TextInputStyle.Short, 100, null);
   const initialMessageLabel = createTextInput('initial-message', 'Inital Message', 'The inital message sent in the thread', false, TextInputStyle.Paragraph, 1800, null);
-  const autoJoinLabel = createCheckbox('auto-join-thread', 'Auto Join Thread', 'Whether or not to automatically add you to the thread.', true);
+  const autoJoinLabel = createCheckbox('auto-join-thread', 'Auto Join Thread', 'Whether or not to join you to the thread. Selecting no will not notify you of messages sent!', true);
 
   modal.addLabelComponents(titleLabel, initialMessageLabel, autoJoinLabel);
+
   interaction.showModal(modal);
 }