Merge pull request #935 from Merit-Systems/fix-discord-notifications

Fix Discord notifications not firing for new signups

Author: onchainlu

apps/scan/src/app/api/resources/sync/route.ts

@@ -1,10 +1,14 @@
 import { NextResponse } from 'next/server';
 
 import { scrapeOriginData } from '@/services/scraper';
-import { upsertOrigin } from '@/services/db/resources/origin';
+import {
+  getOriginResourceCount,
+  upsertOrigin,
+} from '@/services/db/resources/origin';
 import { upsertResource } from '@/services/db/resources/resource';
 
 import { checkCronSecret } from '@/lib/cron';
+import { notifyNewServer } from '@/lib/discord-notifications';
 import { getOriginFromUrl } from '@/lib/url';
 import { normalizeChainId } from '@/lib/x402';
 
@@ -56,6 +60,24 @@ export const GET = async (request: NextRequest) => {
       );
     }
 
+    // Step 1.5: Snapshot current resource counts per origin so we can detect
+    // new origins after upserts (origins that go from 0 → >0 active resources).
+    const preexistingOrigins = new Set<string>();
+    const allOrigins = new Set<string>();
+    for (const resource of resources) {
+      try {
+        allOrigins.add(getOriginFromUrl(resource.resource));
+      } catch {
+        // Origin extraction failed, skip
+      }
+    }
+    await Promise.all(
+      Array.from(allOrigins).map(async origin => {
+        const count = await getOriginResourceCount(origin);
+        if (count > 0) preexistingOrigins.add(origin);
+      })
+    );
+
     // Step 2: Process resources (upsert to database)
     console.log('Starting resource processing');
     const resourceProcessingStart = Date.now();
@@ -153,7 +175,19 @@ export const GET = async (request: NextRequest) => {
           };
 
           // Upsert origin to database
-          await upsertOrigin(originData);
+          const upsertedOrigin = await upsertOrigin(originData);
+
+          if (!preexistingOrigins.has(origin) && upsertedOrigin) {
+            notifyNewServer(
+              {
+                originId: upsertedOrigin.id,
+                origin,
+                title: originData.title ?? null,
+                description: originData.description ?? null,
+              },
+              { merchantResearch: false }
+            );
+          }
 
           return { origin, success: true };
         } catch (error) {

apps/scan/src/lib/discord-notifications.ts

@@ -18,18 +18,23 @@ interface DiscordConfig {
   appUrl: string;
 }
 
-export function notifyNewServer(notification: NewServerNotification) {
+export function notifyNewServer(
+  notification: NewServerNotification,
+  options?: { merchantResearch?: boolean }
+) {
   scheduleDiscordNotification({
     webhookUrl: env.DISCORD_NOTIFICATIONS_WEBHOOK_URL,
     username: NEW_SERVER_USERNAME,
     embed: config => buildNewServerEmbed(notification, config),
   });
 
-  scheduleDiscordNotification({
-    webhookUrl: env.DISCORD_MERCHANT_RESEARCH_WEBHOOK_URL,
-    username: NEW_SERVER_USERNAME,
-    embed: config => buildMerchantResearchEmbed(notification, config),
-  });
+  if (options?.merchantResearch ?? true) {
+    scheduleDiscordNotification({
+      webhookUrl: env.DISCORD_MERCHANT_RESEARCH_WEBHOOK_URL,
+      username: NEW_SERVER_USERNAME,
+      embed: config => buildMerchantResearchEmbed(notification, config),
+    });
+  }
 }
 
 function scheduleDiscordNotification(options: {

apps/scan/src/services/db/resources/origin.ts

@@ -129,7 +129,7 @@ export const getOriginResourceCount = async (origin: string) => {
     select: {
       _count: {
         select: {
-          resources: true,
+          resources: { where: { deprecatedAt: null } },
         },
       },
     },