search: fix nip05 lookups

src/controllers/api/search.ts

@@ -6,8 +6,7 @@ import { AppController } from '@/app.ts';
 import { booleanParamSchema } from '@/schema.ts';
 import { Storages } from '@/storages.ts';
 import { hydrateEvents } from '@/storages/hydrate.ts';
-import { bech32ToPubkey } from '@/utils.ts';
+import { extractIdentifier, lookupPubkey } from '@/utils/lookup.ts';
-import { ACCT_REGEX, extractIdentifier } from '@/utils/lookup.ts';
 import { nip05Cache } from '@/utils/nip05.ts';
 import { accountFromPubkey, renderAccount } from '@/views/mastodon/accounts.ts';
 import { renderStatus } from '@/views/mastodon/statuses.ts';
@@ -36,7 +35,7 @@ const searchController: AppController = async (c) => {
 
   // Render account from pubkey.
   if (!event && lookup) {
-    const pubkey = bech32ToPubkey(lookup);
+    const pubkey = await lookupPubkey(lookup);
     return c.json({
       accounts: pubkey ? [await accountFromPubkey(pubkey)] : [],
       statuses: [],
@@ -120,51 +119,55 @@ async function lookupEvent(query: SearchQuery, signal: AbortSignal): Promise<Nos
 
 /** Get filters to lookup the input value. */
 async function getLookupFilters({ q, type, resolve }: SearchQuery, signal: AbortSignal): Promise<NostrFilter[]> {
-  const filters: NostrFilter[] = [];
-
   const accounts = !type || type === 'accounts';
   const statuses = !type || type === 'statuses';
 
   if (!resolve || type === 'hashtags') {
+    return [];
+  }
+
+  if (n.id().safeParse(q).success) {
+    const filters: NostrFilter[] = [];
+    if (accounts) filters.push({ kinds: [0], authors: [q] });
+    if (statuses) filters.push({ kinds: [1], ids: [q] });
     return filters;
   }
 
   const lookup = extractIdentifier(q);
-  if (lookup) {
+  if (!lookup) return [];
-    try {
+
-      const result = nip19.decode(lookup);
+  try {
-      switch (result.type) {
+    const result = nip19.decode(lookup);
-        case 'npub':
+    const filters: NostrFilter[] = [];
-          if (accounts) filters.push({ kinds: [0], authors: [result.data] });
+    switch (result.type) {
-          break;
+      case 'npub':
-        case 'nprofile':
+        if (accounts) filters.push({ kinds: [0], authors: [result.data] });
-          if (accounts) filters.push({ kinds: [0], authors: [result.data.pubkey] });
+        break;
-          break;
+      case 'nprofile':
-        case 'note':
+        if (accounts) filters.push({ kinds: [0], authors: [result.data.pubkey] });
-          if (statuses) filters.push({ kinds: [1], ids: [result.data] });
+        break;
-          break;
+      case 'note':
-        case 'nevent':
+        if (statuses) filters.push({ kinds: [1], ids: [result.data] });
-          if (statuses) filters.push({ kinds: [1], ids: [result.data.id] });
+        break;
-          break;
+      case 'nevent':
-      }
+        if (statuses) filters.push({ kinds: [1], ids: [result.data.id] });
-    } catch {
+        break;
-      // do nothing
-    }
-  } else if (n.id().safeParse(q).success) {
-    if (accounts) filters.push({ kinds: [0], authors: [q] });
-    if (statuses) filters.push({ kinds: [1], ids: [q] });
-  } else if (accounts && ACCT_REGEX.test(q)) {
-    try {
-      const { pubkey } = await nip05Cache.fetch(q, { signal });
-      if (pubkey) {
-        filters.push({ kinds: [0], authors: [pubkey] });
-      }
-    } catch {
-      // do nothing
     }
+    return filters;
+  } catch {
+    // do nothing
   }
 
-  return filters;
+  try {
+    const { pubkey } = await nip05Cache.fetch(lookup, { signal });
+    if (pubkey) {
+      return [{ kinds: [0], authors: [pubkey] }];
+    }
+  } catch {
+    // do nothing
+  }
+
+  return [];
 }
 
 export { searchController };

src/utils/lookup.ts

@@ -7,9 +7,6 @@ import { bech32ToPubkey } from '@/utils.ts';
 import { nip05Cache } from '@/utils/nip05.ts';
 import { Stickynotes } from '@soapbox/stickynotes';
 
-/** Matches NIP-05 names with or without an @ in front. */
-export const ACCT_REGEX = /^@?(?:([\w.+-]+)@)?([\w.-]+)$/;
-
 /** Resolve a bech32 or NIP-05 identifier to an account. */
 export async function lookupAccount(
   value: string,
@@ -43,6 +40,8 @@ export async function lookupPubkey(value: string, signal?: AbortSignal): Promise
 
 /** Extract an acct or bech32 identifier out of a URL or of itself. */
 export function extractIdentifier(value: string): string | undefined {
+  value = value.trim();
+
   try {
     const uri = new URL(value);
     switch (uri.protocol) {
@@ -79,11 +78,13 @@ export function extractIdentifier(value: string): string | undefined {
     // do nothing
   }
 
+  value = value.replace(/^@/, '');
+
   if (n.bech32().safeParse(value).success) {
     return value;
   }
 
-  if (ACCT_REGEX.test(value)) {
+  if (NIP05.regex().test(value)) {
     return value;
   }
 }