diff --git a/src/buttons/close-mod-ticket.ts b/src/buttons/close-mod-ticket.ts index ddffe29..0224abc 100644 --- a/src/buttons/close-mod-ticket.ts +++ b/src/buttons/close-mod-ticket.ts @@ -1,4 +1,5 @@ import { ButtonInteraction, Client, MessageFlags, ChannelType, PermissionFlagsBits } from 'discord.js'; +import { closeTicket } from '../utils'; export default { name: 'close-mod-ticket', @@ -19,14 +20,9 @@ export default { components: [] }); - await channel.send('This ticket has been closed by staff.'); + if (!await closeTicket(client, channel, `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({ - name: `[CLOSED] ${channel.name}`.slice(0, 100), - archived: true, - locked: true - }); } }; \ No newline at end of file diff --git a/src/buttons/close-ticket.ts b/src/buttons/close-ticket.ts index 4401aab..e8caeec 100644 --- a/src/buttons/close-ticket.ts +++ b/src/buttons/close-ticket.ts @@ -5,7 +5,6 @@ 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.' }); @@ -20,7 +19,7 @@ export default { }); 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.' }); + return await interaction.editReply({ content: 'An error occurred while trying to close this ticket.' }); await interaction.editReply({ content: 'Ticket closed.' }); } diff --git a/src/utils/private-help-utils.ts b/src/utils/private-help-utils.ts index 42da283..89362bf 100644 --- a/src/utils/private-help-utils.ts +++ b/src/utils/private-help-utils.ts @@ -40,14 +40,14 @@ export async function closeTicket(context: Client, thread: ThreadChannel, reason return true; } catch (error) { - console.log('An error occured while trying to close the ticket:', 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; }