fix: include generic status code in failure DM

Signed-off-by: Michael Cramer <michael@bigmichi1.de>

Author: BigMichi1

src/bot/bot.ts

@@ -197,16 +197,11 @@ client.on(Events.MessageCreate, async (message) => {
       // Deduplicate in case the same code appears multiple times in one message.
       const uniqueCodes = [...new Set(foundCodes)];
 
-      // Persist all found codes to pending_codes immediately so /catchup can
-      // recover them if auto-redeem has no enabled users or the API fails.
-      // addPendingCode returns true only for a newly inserted row, giving us
-      // at-most-once insert semantics (onConflictDoNothing) that also eliminate
+      // Persist all found codes to pending_codes in a single batch INSERT.
+      // onConflictDoNothing gives at-most-once insert semantics and eliminates
       // the TOCTOU race of a pre-read snapshot under concurrent MessageCreate events.
-      const newCodes: string[] = [];
-      for (const code of uniqueCodes) {
-        const isNew = await codeManager.addPendingCode(code);
-        if (isNew) newCodes.push(code);
-      }
+      // Only newly inserted codes trigger DM notifications.
+      const newCodes = await codeManager.addNewPendingCodes(uniqueCodes);
 
       // DM users who opted in for code-detection notifications (independent of autoredeem).
       // A single bulk query resolves per-recipient redeemed status, then a short delay

src/bot/database/codeManager.test.ts

@@ -313,6 +313,24 @@ describe('pending codes', () => {
     await codeManager.clearPendingCodes(USER_A);
     expect(await codeManager.getPendingCodes()).toEqual(['PEND5678EFGH']);
   });
+
+  test('addNewPendingCodes returns only newly inserted codes', async () => {
+    const result = await codeManager.addNewPendingCodes(['CODE1111AAAA', 'CODE2222BBBB']);
+    expect(result).toContain('CODE1111AAAA');
+    expect(result).toContain('CODE2222BBBB');
+  });
+
+  test('addNewPendingCodes skips already-present codes', async () => {
+    await codeManager.addPendingCode('CODE1111AAAA');
+    const result = await codeManager.addNewPendingCodes(['CODE1111AAAA', 'CODE2222BBBB']);
+    expect(result).not.toContain('CODE1111AAAA');
+    expect(result).toContain('CODE2222BBBB');
+  });
+
+  test('addNewPendingCodes returns empty array for empty input', async () => {
+    const result = await codeManager.addNewPendingCodes([]);
+    expect(result).toEqual([]);
+  });
 });
 
 // ---------------------------------------------------------------------------

src/bot/database/codeManager.ts

@@ -261,6 +261,21 @@ class CodeManager {
     return rows.length > 0;
   }
 
+  /**
+   * Batch-insert multiple codes into pending_codes in a single query.
+   * Returns only the codes that were newly inserted (already-present codes are skipped via onConflictDoNothing).
+   */
+  async addNewPendingCodes(codes: string[]): Promise<string[]> {
+    if (codes.length === 0) return [];
+    const rows = db
+      .insert(pendingCodes)
+      .values(codes.map((code) => ({ code, discordId: null })))
+      .onConflictDoNothing()
+      .returning({ code: pendingCodes.code })
+      .all();
+    return rows.map((r) => r.code);
+  }
+
   async getPendingCodes(discordId?: string): Promise<string[]> {
     const results = discordId
       ? db.select({ code: pendingCodes.code }).from(pendingCodes).where(eq(pendingCodes.discordId, discordId)).orderBy(sql`${pendingCodes.foundAt} ASC`).all()

src/bot/handlers/autoRedeemer.ts

@@ -175,7 +175,7 @@ async function redeemCodeForUser(code: string, credentials: UserCredentials): Pr
       logger.error(
         `[AUTO REDEEMER] submitCode returned GenericResponse status=${generic.status} for code ${code}, user ${discordId}`
       );
-      if (credentials.dmOnFailure) sendFailureDm(discordId, code, 'Server Error');
+      if (credentials.dmOnFailure) sendFailureDm(discordId, code, `Server Error (status ${generic.status})`);
       return;
     }
   }