From ba9c8c81188a22d97a0d715519b2c1e0cd42eb53 Mon Sep 17 00:00:00 2001 From: kingomes <83099848+kingomes@users.noreply.github.com> Date: Sat, 2 Nov 2024 22:37:45 -0500 Subject: [PATCH] removed entry can't win giveaway --- src/commands/giveaway.ts | 4 +++- src/events/embedReact.ts | 10 ++++++---- src/events/embedRemoveReact.ts | 15 +++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 src/events/embedRemoveReact.ts diff --git a/src/commands/giveaway.ts b/src/commands/giveaway.ts index 4de5cb5..67fc241 100644 --- a/src/commands/giveaway.ts +++ b/src/commands/giveaway.ts @@ -144,6 +144,8 @@ export default commandModule({ ) embedMessage.edit({embeds: [embed]}) + + embedMessage.reply(`Congratulations <@${winnerId}> on winning the ${item} giveaway!`) } else if (stmt.length > 1 && stmt[winnerIndex].user_id === ctx.userId) { winnerIndex = Math.floor(Math.random() * stmt.length) @@ -164,4 +166,4 @@ export default commandModule({ db.prepare(`DELETE FROM entrees`).run() } -}) +}) \ No newline at end of file diff --git a/src/events/embedReact.ts b/src/events/embedReact.ts index da6b01a..c346e55 100644 --- a/src/events/embedReact.ts +++ b/src/events/embedReact.ts @@ -6,10 +6,12 @@ export default discordEvent({ execute: async (reaction, potentialWinners) => { const startTime = reaction.message.createdTimestamp - const stmt = db.prepare(`INSERT INTO entrees(timestamp, user_id) VALUES (?, ?)`) + if (reaction.emoji.name === '🎉') { + const stmt = db.prepare(`INSERT INTO entrees(timestamp, user_id) VALUES (?, ?)`) - if (potentialWinners.bot === false) { - stmt.run([startTime, potentialWinners.id]) + if (potentialWinners.bot === false) { + stmt.run([startTime, potentialWinners.id]) + } } } -}) +}) \ No newline at end of file diff --git a/src/events/embedRemoveReact.ts b/src/events/embedRemoveReact.ts new file mode 100644 index 0000000..0d20f2a --- /dev/null +++ b/src/events/embedRemoveReact.ts @@ -0,0 +1,15 @@ +import { discordEvent } from "@sern/handler"; +import { db } from "../utils/db.js" + +export default discordEvent({ + name: 'messageReactionRemove', + execute: async (reaction, deletedEntry) => { + const deletedId = deletedEntry.id + + if (reaction.emoji.name === '🎉') { + const stmt = db.prepare(`DELETE FROM entrees WHERE user_id = ?`) + + stmt.run(deletedId) + } + } +}) \ No newline at end of file