From 4da6175cf58b1fa6144bdc71ec806766d32c1025 Mon Sep 17 00:00:00 2001 From: PalmDevs Date: Sun, 4 Aug 2024 02:51:49 +0700 Subject: [PATCH] fix(bots/discord): await when putting entries into db --- .../discord/messageCreate/messageScan.ts | 2 +- .../messageReactionAdd/correctResponse.ts | 23 ++++++++----------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/bots/discord/src/events/discord/messageCreate/messageScan.ts b/bots/discord/src/events/discord/messageCreate/messageScan.ts index ef5d3c4..452a470 100644 --- a/bots/discord/src/events/discord/messageCreate/messageScan.ts +++ b/bots/discord/src/events/discord/messageCreate/messageScan.ts @@ -40,7 +40,7 @@ withContext(on, 'messageCreate', async (context, msg) => { }) if (label) { - db.insert(responses).values({ + await db.insert(responses).values({ replyId: reply.id, channelId: reply.channel.id, guildId: reply.guild!.id, diff --git a/bots/discord/src/events/discord/messageReactionAdd/correctResponse.ts b/bots/discord/src/events/discord/messageReactionAdd/correctResponse.ts index 4e73609..75d8ea5 100644 --- a/bots/discord/src/events/discord/messageReactionAdd/correctResponse.ts +++ b/bots/discord/src/events/discord/messageReactionAdd/correctResponse.ts @@ -20,7 +20,8 @@ const PossibleReactions = Object.values(Reactions) as string[] withContext(on, 'messageReactionAdd', async (context, rct, user) => { if (user.bot) return - + await rct.users.remove(user.id) + const { database: db, logger, config } = context const { messageScan: msConfig } = config @@ -35,10 +36,7 @@ withContext(on, 'messageReactionAdd', async (context, rct, user) => { if (!isAdmin(reactionMessage.member || reactionMessage.author)) { // User is in guild, and config has member requirements - if ( - reactionMessage.inGuild() && - (msConfig.humanCorrections.allow?.members || msConfig.humanCorrections.allow?.users) - ) { + if (reactionMessage.inGuild() && msConfig.humanCorrections.allow) { const { allow: { users: allowedUsers, members: allowedMembers }, } = msConfig.humanCorrections @@ -54,20 +52,19 @@ withContext(on, 'messageReactionAdd', async (context, rct, user) => { ) ) return - } else if (allowedUsers) { - if (!allowedUsers.includes(user.id)) return - } else { - return void logger.warn( - 'No member or user requirements set for human corrections, all requests will be ignored', - ) - } - } + } else if (!allowedUsers?.includes(user.id)) return + } else + return void logger.warn( + 'No member or user requirements set for human corrections, all requests will be ignored', + ) } // Sanity check const response = await db.query.responses.findFirst({ where: eq(responses.replyId, rct.message.id) }) if (!response || response.correctedById) return + logger.debug(`User ${user.id} is trying to correct the response ${rct.message.id}`) + const handleCorrection = (label: string) => handleUserResponseCorrection(context, response, reactionMessage, label, user)