Fixed Close-Request Bug and refetch Database after feedback creation.

xyzjesper · xyzjesper · commit 32f83ad0b5bd · 2025-08-31T12:45:04.000+02:00
diff --git a/src/modules/ticket/buttons/ticket-add-component-feedback.ts b/src/modules/ticket/buttons/ticket-add-component-feedback.ts
@@ -3,7 +3,7 @@ import {
     ButtonBuilder,
     ButtonInteraction,
     ButtonStyle,
-    ChannelSelectMenuBuilder,
+    ChannelSelectMenuBuilder, ChannelType,
     ContainerBuilder,
     MessageFlags, ModalBuilder, RoleSelectMenuBuilder, SeparatorBuilder, SeparatorComponent, SeparatorSpacingSize,
     StringSelectMenuBuilder,
@@ -50,19 +50,24 @@ export default {
 
         } else {
 
-            await database.ticketSetups.update({
-                where: {
-                    CustomId: uuid
-                },
-                data: {
-                    WithTicketFeedback: true
-                }
-            })
 
             await interaction.reply({
-                flags: MessageFlags.Ephemeral,
-                content: `## ${await convertToEmojiPng("check", client.user.id)} Enabled User Feedback after Close`
+                flags: MessageFlags.Ephemeral | MessageFlags.IsComponentsV2,
+                components: [
+                    new ContainerBuilder()
+                        .addActionRowComponents(
+                            new ActionRowBuilder<ChannelSelectMenuBuilder>().addComponents(
+                                new ChannelSelectMenuBuilder()
+                                    .setCustomId("ticket-add-component-feedback-channel:" + uuid)
+                                    .setPlaceholder("Select Channel the Feedback result.")
+                                    .setChannelTypes(ChannelType.GuildText)
+                                    .setMaxValues(1)
+                                    .setMinValues(1)
+                            )
+                        )
+                ]
             })
+
         }
     }
 
diff --git a/src/modules/ticket/buttons/ticket-add-component-ticket-limit.ts b/src/modules/ticket/buttons/ticket-add-component-ticket-limit.ts
@@ -30,7 +30,7 @@ export default {
             .setCustomId("limit")
             .setLabel("Ticket Limit")
             .setStyle(TextInputStyle.Short)
-            .setRequired(true);
+            .setRequired(false);
 
         modal.addComponents(new ActionRowBuilder<TextInputBuilder>().addComponents(uuid));
 
diff --git a/src/modules/ticket/buttons/ticket-close-request.ts b/src/modules/ticket/buttons/ticket-close-request.ts
@@ -50,16 +50,16 @@ export default {
                     .addTextDisplayComponents(new TextDisplayBuilder()
                         .setContent(
                             [
-                                `### ${await convertToEmojiPng("ticket", client.user.id)} ${interaction.user} ask to close this ticket from <@${data.TicketOwnerId}`,
+                                `### ${await convertToEmojiPng("ticket", client.user.id)} ${interaction.user} ask to close this ticket from <@${data.TicketOwnerId}>`,
                                 `> -# Claimed: ${data.IsClaimed ? "Yes" : "No"}`,
-                                `> -# User Claimed: <@${data.UserWhoHasClaimedId}>`,
+                                `> -# User Claimed:  ${data.UserWhoHasClaimedId ? `<@${data.UserWhoHasClaimedId}>` : "N/A"}`,
                             ].join("\n")))
                     .addActionRowComponents(
                         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")
+                                .setCustomId("ticket-close:" + uuid)
                                 .setStyle(ButtonStyle.Secondary),
                             new ButtonBuilder()
                                 .setEmoji("<:arrowbackregular24:1301119279088799815>")
diff --git a/src/modules/ticket/modals/ticket-add-component-ticket-limit-modal.ts b/src/modules/ticket/modals/ticket-add-component-ticket-limit-modal.ts
@@ -23,7 +23,7 @@ export default {
                     CustomId: uuid
                 },
                 data: {
-                    TicketLimit: Number(limit)
+                    TicketLimit: limit ? Number(limit) : null
                 }
             }
         );
diff --git a/src/modules/ticket/modals/ticket-close-action-feedback-comment-modal.ts b/src/modules/ticket/modals/ticket-close-action-feedback-comment-modal.ts
@@ -35,12 +35,12 @@ export default {
 
         if (!data) return await ticketErrorMessage("No Data!", interaction, client)
 
-        const feedback = await database.ticketFeedback.findFirst({
+        let feedback = await database.ticketFeedback.findFirst({
             where: {
                 TicketId: uuid
             }
         })
-        if (!feedback)
+        if (!feedback) {
             await database.ticketFeedback.create(
                 {
                     data: {
@@ -55,7 +55,12 @@ export default {
                     }
                 }
             )
-
+            feedback = await database.ticketFeedback.findFirst({
+                where: {
+                    TicketId: uuid
+                }
+            })
+        }
         await database.ticketFeedback.update({
             where: {
                 id: feedback.id
diff --git a/src/modules/ticket/selectmenus/ticket-add-component-feedback-channel.ts b/src/modules/ticket/selectmenus/ticket-add-component-feedback-channel.ts
@@ -0,0 +1,32 @@
+import {ChannelType, Client, UserSelectMenuInteraction} from "discord.js";
+import {ExtendedClient} from "../../../types/client.js";
+import {database} from "../../../main/database.js";
+
+export default {
+    id: "ticket-add-component-feedback-channel",
+
+    /**
+     * @param {UserSelectMenuInteraction} interaction
+     * @param {Client} client
+     */
+    async execute(
+        interaction: UserSelectMenuInteraction,
+        client: ExtendedClient
+    ) {
+        for (const value of interaction.values) {
+
+
+            await database.ticketSetups.update({
+                where: {
+                    CustomId: interaction.customId.split(":")[1]
+                },
+                data: {
+                    WithTicketFeedback: true,
+                    TicketFeedbackChannelId: value
+                }
+            })
+
+            await interaction.deferUpdate();
+        }
+    }
+};
diff --git a/src/modules/ticket/selectmenus/ticket-close-action-feedback.ts b/src/modules/ticket/selectmenus/ticket-close-action-feedback.ts
@@ -29,46 +29,57 @@ export default {
      * @param {Client} client
      */
     async execute(interaction: StringSelectMenuInteraction, client: ExtendedClient) {
-        const uuid = interaction.customId.split(":")[1]
-        const data = await database.tickets.findFirst({
-            where: {
-                TicketId: uuid
-            }
-        })
+        try {
+            const uuid = interaction.customId.split(":")[1]
+            const data = await database.tickets.findFirst({
+                where: {
+                    TicketId: uuid
+                }
+            })
 
-        if (!data) return await ticketErrorMessage("No Data!", interaction, client)
+            if (!data) return await ticketErrorMessage("No Data!", interaction, client)
 
-        const feedback = await database.ticketFeedback.findFirst({
-            where: {
-                TicketId: uuid
-            }
-        })
-        if (!feedback)
-            await database.ticketFeedback.create(
-                {
-                    data: {
-                        Sent: false,
-                        SubmittedAt: new Date(),
-                        Ticket: {
-                            connect: {
-                                TicketId: uuid
-                            }
-                        },
-                        Rating: interaction.values.includes("one") ? 1 : interaction.values.includes("two") ? 2 : interaction.values.includes("three") ? 3 : interaction.values.includes("four") ? 4 : interaction.values.includes("five") ? 5 : 0
-                    }
+            let feedback = await database.ticketFeedback.findFirst({
+                where: {
+                    TicketId: uuid
                 }
-            )
-
-        await database.ticketFeedback.update({
-            where: {
-                id: feedback.id
-            },
-            data: {
-                SubmittedAt: new Date(),
-                Rating: interaction.values.includes("one") ? 1 : interaction.values.includes("two") ? 2 : interaction.values.includes("three") ? 3 : interaction.values.includes("four") ? 4 : interaction.values.includes("five") ? 5 : 0
+            })
+            if (!feedback) {
+                await database.ticketFeedback.create(
+                    {
+                        data: {
+                            Sent: false,
+                            SubmittedAt: new Date(),
+                            Ticket: {
+                                connect: {
+                                    TicketId: uuid
+                                }
+                            },
+                            Rating: interaction.values.includes("one") ? 1 : interaction.values.includes("two") ? 2 : interaction.values.includes("three") ? 3 : interaction.values.includes("four") ? 4 : interaction.values.includes("five") ? 5 : 0
+                        }
+                    }
+                )
+                feedback = await database.ticketFeedback.findFirst({
+                    where: {
+                        TicketId: uuid
+                    }
+                })
             }
-        })
 
-        await interaction.deferUpdate()
+            await database.ticketFeedback.update({
+                where: {
+                    id: feedback.id
+                },
+                data: {
+                    SubmittedAt: new Date(),
+                    Rating: interaction.values.includes("one") ? 1 : interaction.values.includes("two") ? 2 : interaction.values.includes("three") ? 3 : interaction.values.includes("four") ? 4 : interaction.values.includes("five") ? 5 : 0
+                }
+            })
+
+            await interaction.deferUpdate()
+        } catch (error) {
+            console.log(error)
+            return await ticketErrorMessage("Please try again - We can't get your Feedback", interaction, client)
+        }
     },
 };

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export default {`
`23`	`23`	`CustomId: uuid`
`24`	`24`	`},`
`25`	`25`	`data: {`
`26`		`- TicketLimit: Number(limit)`
	`26`	`+ TicketLimit: limit ? Number(limit) : null`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`);`
Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,12 @@ export default {`
`35`	`35`
`36`	`36`	`if (!data) return await ticketErrorMessage("No Data!", interaction, client)`
`37`	`37`
`38`		`- const feedback = await database.ticketFeedback.findFirst({`
	`38`	`+ let feedback = await database.ticketFeedback.findFirst({`
`39`	`39`	`where: {`
`40`	`40`	`TicketId: uuid`
`41`	`41`	`}`
`42`	`42`	`})`
`43`		`- if (!feedback)`
	`43`	`+ if (!feedback) {`
`44`	`44`	`await database.ticketFeedback.create(`
`45`	`45`	`{`
`46`	`46`	`data: {`
`@@ -55,7 +55,12 @@ export default {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`)`
`58`		`-`
	`58`	`+ feedback = await database.ticketFeedback.findFirst({`
	`59`	`+ where: {`
	`60`	`+ TicketId: uuid`
	`61`	`+ }`
	`62`	`+ })`
	`63`	`+ }`
`59`	`64`	`await database.ticketFeedback.update({`
`60`	`65`	`where: {`
`61`	`66`	`id: feedback.id`