Merge pull request #28 from immich-app/fix/helpdesk-handling

immich-app · Jun 19, 2024 · 3c69a4b · 3c69a4b
2 parents 74011af + 940037e
commit 3c69a4b
Showing 1 changed file with 31 additions and 29 deletions.
diff --git a/src/events/helpTicket/helpticket.ts b/src/events/helpTicket/helpticket.ts
@@ -13,13 +13,13 @@ import {
 import { ArgsOf, ButtonComponent, Discord, On, Slash, SlashChoice, SlashOption } from 'discordx';
 import { Constants } from '../../constants.js';
 import {
-  getLogsUploadModel,
-  getHelpDeskWelcomeMessage,
-  getComposeUploadModal,
-  getEnvUploadModal,
   getComposeButton,
+  getComposeUploadModal,
   getEnvButton,
+  getEnvUploadModal,
+  getHelpDeskWelcomeMessage,
   getLogsButton,
+  getLogsUploadModel,
 } from './util.js';
 
 const submitButton = new ButtonBuilder({
@@ -36,6 +36,20 @@ const mainButtonRow = new ActionRowBuilder<MessageActionRowComponentBuilder>().a
   submitButton,
 );
 
+async function sendHelpdeskWelcomeMessage(user: string, thread: ThreadChannel) {
+  const welcomeMessage = getHelpDeskWelcomeMessage(user);
+  const message = await thread.send({
+    content: welcomeMessage,
+    components: [mainButtonRow],
+    flags: [MessageFlags.SuppressEmbeds],
+  });
+
+  const itemCount = welcomeMessage.match(new RegExp(Constants.Icons.Unchecked, 'g'))?.length ?? 0;
+  for (let i = 1; i <= itemCount; i++) {
+    await message.react(`${i}️⃣`);
+  }
+}
+
 @Discord()
 export class HelpTicket {
   @ButtonComponent({ id: 'submit' })
@@ -93,18 +107,13 @@ export class HelpTicket {
       return;
     }
 
-    const welcomeMessage = getHelpDeskWelcomeMessage(thread.ownerId ?? '');
-    const message = await thread.fetch().then((thread) =>
-      thread.send({
-        content: welcomeMessage,
-        components: [mainButtonRow],
-        flags: [MessageFlags.SuppressEmbeds],
-      }),
-    );
-
-    const itemCount = welcomeMessage.match(new RegExp(Constants.Icons.Unchecked, 'g'))?.length ?? 0;
-    for (let i = 1; i <= itemCount; i++) {
-      await message.react(`${i}️⃣`);
+    const user = thread.ownerId ?? '';
+    const t = await thread.fetch();
+    try {
+      await sendHelpdeskWelcomeMessage(user, t);
+    } catch (e) {
+      console.error('Retrying helpdesk welcome message:', e);
+      setTimeout(async () => await sendHelpdeskWelcomeMessage(user, t), 5000);
     }
   }
 
@@ -118,19 +127,12 @@ export class HelpTicket {
       return;
     }
 
-    const welcomeMessage = getHelpDeskWelcomeMessage(interaction.channel.ownerId ?? '');
-    const message = await interaction.channel.fetch().then((thread) =>
-      thread.send({
-        content: welcomeMessage,
-        components: [mainButtonRow],
-        flags: [MessageFlags.SuppressEmbeds],
-      }),
-    );
-
-    const itemCount = welcomeMessage.match(new RegExp(Constants.Icons.Unchecked, 'g'))?.length ?? 0;
-    for (let i = 1; i <= itemCount; i++) {
-      await message.react(`${i}️⃣`);
-    }
+    const user = interaction.channel.ownerId ?? '';
+    await sendHelpdeskWelcomeMessage(user, await interaction.channel.fetch());
+    await interaction.reply({
+      content: 'Helpdesk welcome message sent',
+      flags: [MessageFlags.Ephemeral],
+    });
   }
 
   @ButtonComponent({ id: 'openTicket' })