fix(worker): Respond with user error if notification already exists

sushiibot · Feb 11, 2024 · 298cb3a · 298cb3a
1 parent 1ec19e2
commit 298cb3a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/packages/sushii-worker/src/db/Notification/Notification.repository.ts b/packages/sushii-worker/src/db/Notification/Notification.repository.ts
@@ -37,6 +37,9 @@ export function insertNotification(
       user_id: userId,
       keyword: cleanKeyword(keyword),
     })
+    .onConflict((oc) =>
+      oc.columns(["guild_id", "user_id", "keyword"]).doNothing(),
+    )
     .executeTakeFirst();
 }
 

diff --git a/packages/sushii-worker/src/interactions/notifications/NotificationCommand.ts b/packages/sushii-worker/src/interactions/notifications/NotificationCommand.ts
@@ -90,12 +90,16 @@ export default class NotificationCommand extends SlashCommandHandler {
       keyword,
     );
 
-    if (res.numInsertedOrUpdatedRows === BigInt(0)) {
+    if (Number(res.numInsertedOrUpdatedRows) === 0) {
+      const embed = new EmbedBuilder()
+        .setTitle("Failed to add notification")
+        .setDescription(
+          `You already have a notification set for \`${keyword}\``,
+        )
+        .setColor(Color.Error);
+
       await interaction.reply({
-        content: t("notification.add.error.duplicate", {
-          ns: "commands",
-          keyword,
-        }),
+        embeds: [embed],
         flags: MessageFlags.Ephemeral,
       });