Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small fixes in helpdesk message handling #28

Merged
merged 4 commits into from
Jun 19, 2024
Merged

Small fixes in helpdesk message handling #28

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfd98ff
chore: Extract sendHelpdeskWelcomeMessage func
bo0tzz Jun 19, 2024
a22ff65
feat: Acknowledge /helpdesk command
bo0tzz Jun 19, 2024
ba9b652
fix: Retry helpdesk welcome message
bo0tzz Jun 19, 2024
940037e
chore: format:fix
bo0tzz Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 31 additions & 29 deletions src/events/helpTicket/helpticket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand All @@ -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' })
Expand Down Expand Up @@ -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);
}
}

Expand All @@ -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' })
Expand Down
Loading