Fixed Ticket Permissions for Roles

Author: xyzjesper

src/helper/ticketHelper.ts

@@ -575,8 +575,14 @@ export async function ticketHelper(
 
 export async function ticketErrorMessage(message: string, interaction: ChatInputCommandInteraction | ButtonInteraction | ModalSubmitInteraction | AnySelectMenuInteraction, client: ExtendedClient) {
     return await interaction.reply({
-        flags: MessageFlags.Ephemeral,
-        content: `## ${await convertToEmojiToPng("error")} Your ticket action failed with: ${message}`,
+        flags: MessageFlags.Ephemeral | MessageFlags.IsComponentsV2,
+        components: [
+            new ContainerBuilder()
+                .addTextDisplayComponents(
+                    new TextDisplayBuilder()
+                        .setContent(`## ${await convertToEmojiToPng("error")} Your ticket action failed with: ${message}`)
+                )
+        ]
     })
 }
 
@@ -957,11 +963,6 @@ export async function handleCloseAction(client: ExtendedClient, guild: Guild, ch
 
         }
     }
-    if (!actions.includes("not_thread_close")) {
-        if (data.ChannelType == ChannelType.PrivateThread) {
-            await (channel as ThreadChannel).setArchived(true, "Moderator Action from Ticket with Id " + ticketId)
-        }
-    }
     if (data.OldTicketCategoryId) {
         actionCounter += 1
 
@@ -1012,6 +1013,11 @@ export async function handleCloseAction(client: ExtendedClient, guild: Guild, ch
                 })
         }
     }
+    if (!actions.includes("not_thread_close")) {
+        if (data.ChannelType == ChannelType.PrivateThread) {
+            await (channel as ThreadChannel).setArchived(true, "Moderator Action from Ticket with Id " + ticketId)
+        }
+    }
 
     if (!isAuto)
         await interaction.editReply({
@@ -1650,10 +1656,10 @@ export async function hasTicketPermission(permission: string, user: GuildMember,
 
     for (const perms of data.TicketSetup.TicketPermissions) {
         if (guildMember.roles.cache.has(perms.DiscordRoleId)) {
-            return !perms.TicketPermissions.includes(permission);
+            return perms.TicketPermissions.includes(permission);
         }
         if (perms.DiscordUserId == guildMember.id) {
-            return !perms.TicketPermissions.includes(permission);
+            return perms.TicketPermissions.includes(permission);
         }
     }
     return false

src/modules/ticket/buttons/ticket-close-request-cancel.ts

@@ -8,7 +8,7 @@ import {handleCloseAction, hasTicketPermission, ticketErrorMessage} from "../../
 import {convertToEmojiToPng} from "../../../helper/emojis.js";
 
 export default {
-    id: "ticket-infos",
+    id: "ticket-close-request-cancel",
 
     /**
      *

src/modules/ticket/buttons/ticket-close-request.ts

@@ -58,12 +58,11 @@ export default {
                         new ActionRowBuilder<ButtonBuilder>().addComponents(
                             new ButtonBuilder()
                                 .setEmoji("<:x_:1322169218682322955>")
-                                .setDisabled(!(await hasTicketPermission("confirm-user-close", interaction.member as GuildMember, data.TicketId, client) || await hasTicketPermission("all", interaction.member as GuildMember, data.TicketId, client)))
                                 .setCustomId("ticket-close:" + uuid)
                                 .setStyle(ButtonStyle.Secondary),
                             new ButtonBuilder()
                                 .setEmoji("<:arrowbackregular24:1301119279088799815>")
-                                .setCustomId("ticket-close-request-cancel")
+                                .setCustomId("ticket-close-request-cancel:" + uuid)
                                 .setStyle(ButtonStyle.Secondary)
                         )
                     )

src/modules/ticket/buttons/ticket-close.ts

@@ -1,9 +1,10 @@
 import {
-    ButtonInteraction, PrivateThreadChannel, TextChannel,
+    ButtonInteraction, GuildMember, PrivateThreadChannel, TextChannel,
 } from "discord.js";
 import {ExtendedClient} from "../../../types/client.js";
 import {database} from "../../../main/database.js";
-import {handleCloseAction, ticketErrorMessage} from "../../../helper/ticketHelper.js";
+import {handleCloseAction, hasTicketPermission, ticketErrorMessage} from "../../../helper/ticketHelper.js";
+import ticket from "../commands/ticket.js";
 
 export default {
     id: "ticket-close",
@@ -23,6 +24,11 @@ export default {
             }
         })
 
+        const permission = !(await hasTicketPermission("confirm-user-close", interaction.member as GuildMember, data.TicketId, client) || await hasTicketPermission("all", interaction.member as GuildMember, data.TicketId, client))
+        if (permission) {
+            return ticketErrorMessage("No Permissions", interaction, client)
+        }
+
         if (!data) {
             return ticketErrorMessage("No Ticket found", interaction, client)
         }

src/modules/ticket/commands/ticket.ts

@@ -52,8 +52,10 @@ export default {
             })
         }
 
-        if (!data?.TicketId) {
-            await ticketActionsHelper(client, data.TicketId, interaction)
-        }
+        await interaction.deferReply({
+            flags: MessageFlags.Ephemeral,
+        })
+        await ticketActionsHelper(client, data.TicketId, interaction)
+
     }
 };