From 49f06869a3acad50bac67b11e938abbb3cb9efd8 Mon Sep 17 00:00:00 2001
From: "P. Reis" <patrickpereirareal1@gmail.com>
Date: Sat, 20 Apr 2024 21:26:05 -0300
Subject: [PATCH] feat: render account from pubkey if no kind 0 exists -
 /v2/search

---
 src/controllers/api/search.ts | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/controllers/api/search.ts b/src/controllers/api/search.ts
index 5fa268a..c95ea45 100644
--- a/src/controllers/api/search.ts
+++ b/src/controllers/api/search.ts
@@ -6,9 +6,10 @@ import { nostrIdSchema } from '@/schemas/nostr.ts';
 import { searchStore } from '@/storages.ts';
 import { dedupeEvents } from '@/utils.ts';
 import { nip05Cache } from '@/utils/nip05.ts';
-import { renderAccount } from '@/views/mastodon/accounts.ts';
+import { accountFromPubkey, renderAccount } from '@/views/mastodon/accounts.ts';
 import { renderStatus } from '@/views/mastodon/statuses.ts';
 import { hydrateEvents } from '@/storages/hydrate.ts';
+import { decode } from 'npm:nostr-tools@^2.5.0/nip19';
 
 /** Matches NIP-05 names with or without an @ in front. */
 const ACCT_REGEX = /^@?(?:([\w.+-]+)@)?([\w.-]+)$/;
@@ -47,18 +48,30 @@ const searchController: AppController = async (c) => {
     Promise.all(
       results
         .filter((event) => event.kind === 0)
-        .map((event) => renderAccount(event)),
+        .map((event) => renderAccount(event))
+        .filter(Boolean),
     ),
     Promise.all(
       results
         .filter((event) => event.kind === 1)
-        .map((event) => renderStatus(event, { viewerPubkey: c.get('pubkey') })),
+        .map((event) => renderStatus(event, { viewerPubkey: c.get('pubkey') }))
+        .filter(Boolean),
     ),
   ]);
 
+  if ((result.data.type === 'accounts') && (accounts.length < 1) && (result.data.q.match(/npub1\w+/))) {
+    const possibleNpub = result.data.q;
+    try {
+      const npubHex = decode(possibleNpub);
+      accounts.push(await accountFromPubkey(String(npubHex.data)));
+    } catch (e) {
+      console.log(e);
+    }
+  }
+
   return c.json({
-    accounts: accounts.filter(Boolean),
-    statuses: statuses.filter(Boolean),
+    accounts: accounts,
+    statuses: statuses,
     hashtags: [],
   });
 };