diff --git a/src/events/handle-message.ts b/src/events/handle-message.ts index 90aea6a..def9990 100644 --- a/src/events/handle-message.ts +++ b/src/events/handle-message.ts @@ -2,7 +2,7 @@ import { Message as DiscordMessage, GuildBasedChannel, GuildTextBasedChannel, Om import { config } from '../config'; import { Database } from '../shared/Database'; import { E621Post } from '../types'; -import { ALLOWED_MIMETYPES, appealIDRegex, artistIDRegex, blipIDRegex, calculateMD5FromURL, channelIgnoresLinks, channelIsInStaffCategory, channelIsSafe, commentIDRegex, forumTopicIDRegex, getE621Post, getE621PostByMd5, getPostUrl, isEdited, isInSpoilerTags, issueRegex, logDeletion, logEdit, poolIDRegex, PostAction, postIDRegex, prRegex, recordIDRegex, searchLinkRegex, setIDRegex, spoilerOrBlacklist, takedownIDRegex, ticketIDRegex, userIDRegex, wikiLinkRegex } from '../utils'; +import { ALLOWED_MIMETYPES, appealIDRegex, artistIDRegex, blipIDRegex, calculateMD5FromURL, channelIgnoresLinks, channelIsInStaffCategory, channelIsSafe, commentIDRegex, flagIDRegex, forumTopicIDRegex, getE621Post, getE621PostByMd5, getPostUrl, isEdited, isInSpoilerTags, issueRegex, logDeletion, logEdit, poolIDRegex, PostAction, postIDRegex, prRegex, recordIDRegex, searchLinkRegex, setIDRegex, spoilerOrBlacklist, takedownIDRegex, ticketIDRegex, userIDRegex, wikiLinkRegex } from '../utils'; export type Message = OmitPartialGroupDMChannel>; export type Partial = OmitPartialGroupDMChannel; @@ -38,6 +38,7 @@ const regexTesters = [ { runInDev: true, regex: recordIDRegex, handler: idHandler.bind(null, 'user_feedbacks') }, { runInDev: true, regex: ticketIDRegex, handler: idHandler.bind(null, 'tickets') }, { runInDev: true, regex: appealIDRegex, handler: idHandler.bind(null, 'appeals') }, + { runInDev: true, regex: flagIDRegex, handler: idHandler.bind(null, 'flags') }, { runInDev: true, regex: artistIDRegex, handler: idHandler.bind(null, 'artists') }, { runInDev: true, regex: wikiLinkRegex, handler: wikiPageHandler }, { runInDev: true, regex: searchLinkRegex, handler: searchHandler }, diff --git a/src/utils/appeal-events.ts b/src/utils/appeal-events.ts index db3cd47..82c23a0 100644 --- a/src/utils/appeal-events.ts +++ b/src/utils/appeal-events.ts @@ -1,9 +1,9 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, Client, EmbedBuilder } from 'discord.js'; import { config } from '../config'; +import { Database } from '../shared/Database'; import { Appeal, AppealUpdate } from '../types'; import { getAuthor, getColor, getDescription, getFields } from './event-utils'; import { humanizeCapitalization } from './string-utils'; -import { Database } from '../shared/Database'; export async function appealUpdateHandler(client: Client, update: string) { const data: AppealUpdate = JSON.parse(update); @@ -30,7 +30,7 @@ async function postAppeal(client: Client, data: AppealUpdate) { const row = await getButtons(appeal); - const message = await channel.send({ embeds: [embed], components: [row] }); + const message = await channel.send({ embeds: [embed], components: row.components.length > 0 ? [row] : [] }); await Database.putAppeal(appeal.id, message.id); } @@ -96,9 +96,9 @@ async function getButtons(appeal: Appeal): Promise