From be76197e3ac92ceae17a50db907fda4b4ee91a76 Mon Sep 17 00:00:00 2001
From: "P. Reis" <patrickpereirareal1@gmail.com>
Date: Fri, 13 Sep 2024 15:08:36 -0300
Subject: [PATCH] refactor: remove handleAuthorSearch() function and put its
 logic inside parseMetadata() function

---
 src/pipeline.ts | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/pipeline.ts b/src/pipeline.ts
index b208e9e2..aeba0150 100644
--- a/src/pipeline.ts
+++ b/src/pipeline.ts
@@ -58,7 +58,6 @@ async function handleEvent(event: DittoEvent, signal: AbortSignal): Promise<void
   await Promise.all([
     storeEvent(purifyEvent(event), signal),
     handleZaps(kysely, event),
-    handleAuthorSearch(kysely, event),
     parseMetadata(event, signal),
     generateSetEvents(event),
     streamOut(event),
@@ -134,8 +133,28 @@ async function parseMetadata(event: NostrEvent, signal: AbortSignal): Promise<vo
   const metadata = n.json().pipe(n.metadata()).catch({}).safeParse(event.content);
   if (!metadata.success) return;
 
+  const kysely = await Storages.kysely();
+
   // Get nip05.
-  const { nip05 } = metadata.data;
+  const { name, nip05 } = metadata.data;
+
+  // Populate author_search.
+  try {
+    const search = [name, nip05].filter(Boolean).join(' ').trim();
+
+    await kysely.insertInto('author_search').values({
+      pubkey: event.pubkey,
+      search,
+    }).onConflict(
+      (oc) =>
+        oc.column('pubkey')
+          .doUpdateSet({ search }),
+    )
+      .execute();
+  } catch {
+    // do nothing
+  }
+
   if (!nip05) return;
 
   // Fetch nip05.
@@ -148,7 +167,6 @@ async function parseMetadata(event: NostrEvent, signal: AbortSignal): Promise<vo
 
   // Track pubkey domain.
   try {
-    const kysely = await Storages.kysely();
     const { domain } = parseNip05(nip05);
 
     await sql`
@@ -248,24 +266,4 @@ async function handleZaps(kysely: Kysely<DittoTables>, event: NostrEvent) {
   }
 }
 
-async function handleAuthorSearch(kysely: Kysely<DittoTables>, event: NostrEvent) {
-  if (event.kind !== 0) return;
-  const { name, nip05 } = n.json().pipe(n.metadata()).catch({}).parse(event.content);
-  const search = [name, nip05].filter(Boolean).join(' ').trim();
-
-  try {
-    await kysely.insertInto('author_search').values({
-      pubkey: event.pubkey,
-      search,
-    }).onConflict(
-      (oc) =>
-        oc.column('pubkey')
-          .doUpdateSet({ search }),
-    )
-      .execute();
-  } catch {
-    // do nothing
-  }
-}
-
 export { handleEvent, handleZaps };