bug-fixes

src/components/Embedded/EmbeddedNote.tsx

@@ -18,6 +18,32 @@ import { contentParserService } from '@/services/content-parser.service'
 import { useSmartNoteNavigation } from '@/PageManager'
 import { toNote } from '@/lib/link'
 
+/** Embedded `noteId` is often raw hex from parsers; must accept A–F and normalize for REQ `ids`. */
+function hexEventIdFromNoteId(noteId: string): string | null {
+  const trimmed = noteId.trim()
+  if (/^[0-9a-f]{64}$/i.test(trimmed)) {
+    return trimmed.toLowerCase()
+  }
+  try {
+    const { type, data } = nip19.decode(noteId)
+    if (type === 'note') return data
+    if (type === 'nevent') return data.id
+    return null
+  } catch {
+    return null
+  }
+}
+
+/** True if `fetchEventWithExternalRelays(noteId, …)` can build a REQ filter (hex, note, nevent, naddr). */
+function canSearchOnExternalRelays(noteId: string): boolean {
+  if (hexEventIdFromNoteId(noteId)) return true
+  try {
+    return nip19.decode(noteId.trim()).type === 'naddr'
+  } catch {
+    return false
+  }
+}
+
 export function EmbeddedNote({ 
   noteId, 
   className,
@@ -140,6 +166,9 @@ function EmbeddedNoteNotFound({
   const [triedExternal, setTriedExternal] = useState(false)
   const [externalRelays, setExternalRelays] = useState<string[]>([])
   const [hexEventId, setHexEventId] = useState<string | null>(null)
+  const [externalSearchDetail, setExternalSearchDetail] = useState<
+    null | 'unparseable' | 'no_relays' | 'searched'
+  >(null)
 
   // Calculate which external relays would be tried when user clicks "Try external relays".
   // IMPORTANT: For embedded events, we should search:
@@ -179,30 +208,29 @@ function EmbeddedNoteNotFound({
         }
       }
 
-      // 2. Extract hints from bech32 ID and embedded event author
-      if (!/^[0-9a-f]{64}$/.test(noteId)) {
-        try {
-          const { type, data } = nip19.decode(noteId)
-
-          if (type === 'nevent') {
-            extractedHexEventId = data.id
-            if (data.relays) hintRelays.push(...data.relays)
-            if (data.author) {
-              const authorRelayList = await client.fetchRelayList(data.author).catch(() => ({ read: [] as string[], write: [] as string[] }))
-              hintRelays.push(...(authorRelayList.read ?? []).slice(0, 10), ...(authorRelayList.write ?? []).slice(0, 10))
-            }
-          } else if (type === 'naddr') {
-            if (data.relays) hintRelays.push(...data.relays)
-            const authorRelayList = await client.fetchRelayList(data.pubkey).catch(() => ({ read: [] as string[], write: [] as string[] }))
+      // 2. Hex id (any case) or bech32; hints from nevent/naddr for extra relays
+      const quickHex = hexEventIdFromNoteId(noteId)
+      if (quickHex) {
+        extractedHexEventId = quickHex
+      }
+      try {
+        const { type, data } = nip19.decode(noteId)
+        if (type === 'nevent') {
+          extractedHexEventId = data.id
+          if (data.relays) hintRelays.push(...data.relays)
+          if (data.author) {
+            const authorRelayList = await client.fetchRelayList(data.author).catch(() => ({ read: [] as string[], write: [] as string[] }))
             hintRelays.push(...(authorRelayList.read ?? []).slice(0, 10), ...(authorRelayList.write ?? []).slice(0, 10))
-          } else if (type === 'note') {
-            extractedHexEventId = data
           }
-        } catch (err) {
-          logger.error('Failed to parse external relays', { error: err, noteId })
+        } else if (type === 'naddr') {
+          if (data.relays) hintRelays.push(...data.relays)
+          const authorRelayList = await client.fetchRelayList(data.pubkey).catch(() => ({ read: [] as string[], write: [] as string[] }))
+          hintRelays.push(...(authorRelayList.read ?? []).slice(0, 10), ...(authorRelayList.write ?? []).slice(0, 10))
+        } else if (type === 'note') {
+          extractedHexEventId = data
         }
-      } else {
-        extractedHexEventId = noteId
+      } catch {
+        // Plain hex ids are not valid bech32 — already handled via quickHex
       }
       
       setHexEventId(extractedHexEventId)
@@ -244,61 +272,81 @@ function EmbeddedNoteNotFound({
     }
 
     getExternalRelays()
-  }, [noteId])
+    // containingEvent supplies e/a/q relay hints + author NIP-65 list — must rerun when parent loads
+  }, [noteId, containingEvent?.id])
 
   const handleTryExternalRelays = async () => {
-    if (!hexEventId || isSearchingExternal) return
+    if (isSearchingExternal) return
+
+    if (!canSearchOnExternalRelays(noteId)) {
+      logger.warn('External relay search skipped: unsupported note id', { noteId })
+      setExternalSearchDetail('unparseable')
+      setTriedExternal(true)
+      return
+    }
 
     if (externalRelays.length === 0) {
-      logger.warn('No external relays to search', { noteId, hexEventId })
+      logger.warn('No external relays to search', { noteId })
+      setExternalSearchDetail('no_relays')
       setTriedExternal(true)
       return
     }
 
     setIsSearchingExternal(true)
+    setExternalSearchDetail(null)
+    let found: Event | undefined
     try {
+      const idLog = hexEventId ?? hexEventIdFromNoteId(noteId) ?? noteId.slice(0, 16)
       logger.info('Searching external relays', {
         noteId,
-        hexEventId, 
+        hexOrHint: idLog,
         relayCount: externalRelays.length,
-        relays: externalRelays.slice(0, 5) // Log first 5 relays
+        relays: externalRelays.slice(0, 5)
       })
 
-      const event = await client.fetchEventWithExternalRelays(hexEventId, externalRelays)
+      const event = await client.fetchEventWithExternalRelays(noteId, externalRelays)
 
       if (event) {
-        logger.info('Event found on external relay', { noteId, hexEventId })
-        if (onEventFound) {
-          onEventFound(event)
-        }
+        logger.info('Event found on external relay', { noteId })
+        found = event
+        onEventFound?.(event)
       } else {
         logger.info('Event not found on external relays', {
           noteId,
-          hexEventId, 
           relayCount: externalRelays.length
         })
+        setExternalSearchDetail('searched')
       }
     } catch (error) {
-      logger.error('External relay fetch failed', { error, noteId, hexEventId, externalRelays })
+      logger.error('External relay fetch failed', { error, noteId, externalRelays })
+      setExternalSearchDetail('searched')
     } finally {
       setIsSearchingExternal(false)
-      setTriedExternal(true)
+      if (!found) {
+        setTriedExternal(true)
+      }
     }
   }
 
   const hasExternalRelays = externalRelays.length > 0
+  const showExternalTryButton =
+    !triedExternal && hasExternalRelays && canSearchOnExternalRelays(noteId)
 
   return (
     <div className={cn('text-left p-3 border rounded-lg', className)}>
       <div className="flex flex-col items-center text-muted-foreground gap-3">
         <div className="text-sm font-medium">{t('Note not found')}</div>
         
-        {!triedExternal && hasExternalRelays && (
+        {showExternalTryButton && (
           <div className="flex flex-col items-center gap-2 w-full">
             <Button
               variant="outline"
               size="sm"
-              onClick={handleTryExternalRelays}
+              onClick={(e) => {
+                e.stopPropagation()
+                e.preventDefault()
+                void handleTryExternalRelays()
+              }}
               disabled={isSearchingExternal}
               className="gap-2 w-full"
             >
@@ -333,7 +381,27 @@ function EmbeddedNoteNotFound({
           <div className="text-xs text-center">{t('No external relay hints available')}</div>
         )}
 
-        {triedExternal && (
+        {!triedExternal && hasExternalRelays && !canSearchOnExternalRelays(noteId) && (
+          <div className="text-xs text-center text-muted-foreground">
+            {t('External relay search is not available for this link type')}
+          </div>
+        )}
+
+        {triedExternal && externalSearchDetail === 'unparseable' && (
+          <div className="text-xs text-center">{t('External relay search is not available for this link type')}</div>
+        )}
+
+        {triedExternal && externalSearchDetail === 'no_relays' && (
+          <div className="text-xs text-center">{t('No external relay hints available')}</div>
+        )}
+
+        {triedExternal && externalSearchDetail === 'searched' && (
+          <div className="text-xs text-center">
+            {t('Searched external relays not found', { count: externalRelays.length })}
+          </div>
+        )}
+
+        {triedExternal && !externalSearchDetail && (
           <div className="text-xs text-center">{t('Note could not be found anywhere')}</div>
         )}
         

src/components/ParentNotePreview/index.tsx

@@ -5,7 +5,7 @@ import { cn } from '@/lib/utils'
 import client from '@/services/client.service'
 import { useTranslation } from 'react-i18next'
 import { useCallback, useEffect, useRef, useState } from 'react'
-import { Event, nip19 } from 'nostr-tools'
+import { Event } from 'nostr-tools'
 import ContentPreview from '../ContentPreview'
 import UserAvatar from '../UserAvatar'
 import logger from '@/lib/logger'
@@ -26,34 +26,13 @@ export default function ParentNotePreview({
   /** One automatic searchable-relay attempt per eventId; without this, the effect re-fires forever after each 20s timeout. */
   const autoSearchableAttemptedRef = useRef(false)
 
-  // Helper function to decode event ID
-  const getHexEventId = (id: string): string | null => {
-    if (/^[0-9a-f]{64}$/.test(id)) {
-      return id
-    }
-    try {
-      const { type, data } = nip19.decode(id)
-      if (type === 'note') {
-        return data
-      } else if (type === 'nevent') {
-        return data.id
-      }
-      // Can't fetch naddr with fetchEventWithExternalRelays
-      return null
-    } catch (err) {
-      // Invalid bech32 or already hex
-      return null
-    }
-  }
-
-  // Helper function to fetch from searchable relays
+  // Helper function to fetch from searchable relays (hex, note1, nevent1, naddr1)
   const fetchFromSearchableRelays = useCallback(async () => {
-    const hexEventId = getHexEventId(eventId)
-    if (!hexEventId) return
+    if (!eventId?.trim()) return
 
     setIsFetchingFallback(true)
     try {
-      const foundEvent = await client.fetchEventWithExternalRelays(hexEventId, SEARCHABLE_RELAY_URLS)
+      const foundEvent = await client.fetchEventWithExternalRelays(eventId, SEARCHABLE_RELAY_URLS)
       if (foundEvent) {
         setFallbackEvent(foundEvent)
       }

src/hooks/useFetchProfile.tsx

@@ -73,29 +73,12 @@ export function useFetchProfile(id?: string, skipCache = false) {
         pubkey: pubkey.substring(0, 8)
       })
       try {
-        // Add timeout to prevent waiting forever on a stuck promise
-        const timeoutPromise = new Promise<null>((resolve) => {
-          setTimeout(() => {
-            logger.warn('[useFetchProfile] Existing promise timeout, not starting duplicate fetch', {
-              pubkey: pubkey.substring(0, 8)
-            })
-            resolve(null)
-          }, PROFILE_FETCH_PROMISE_TIMEOUT_MS)
-        })
-
-        const existingProfile = await Promise.race([existingPromise, timeoutPromise])
+        // Await the shared promise only — it already races fetchProfileEvent with
+        // PROFILE_FETCH_PROMISE_TIMEOUT_MS. Per-waiter Promise.race timers caused N identical
+        // "timeout" warnings (one per mounted component) and premature map deletion.
+        const existingProfile = await existingPromise
         if (cancelled.current) return null
 
-        // If timeout won: do NOT start a new fetch (avoids pile-up of parallel fetches for same pubkey).
-        // Return null so caller can show fallback; the original fetch may still complete and update cache.
-        // Set a cooldown period to prevent immediate retries from other components
-        if (existingProfile === null && !cancelled.current) {
-          globalFetchPromises.delete(pubkey)
-          globalFetchingPubkeys.delete(pubkey)
-          // Set cooldown for 10 seconds to prevent cascade of duplicate fetches
-          globalFetchCooldowns.set(pubkey, Date.now() + 10000)
-          return null
-        }
         if (existingProfile) {
           // Update state for this instance
           setProfile(existingProfile)
@@ -130,26 +113,9 @@ export function useFetchProfile(id?: string, skipCache = false) {
       const retryPromise = globalFetchPromises.get(pubkey)
       if (retryPromise) {
         try {
-          // Add timeout protection here too
-          const timeoutPromise = new Promise<null>((resolve) => {
-            setTimeout(() => {
-              logger.warn('[useFetchProfile] Retry promise timeout, not starting duplicate fetch', {
-                pubkey: pubkey.substring(0, 8)
-              })
-            resolve(null)
-          }, PROFILE_FETCH_PROMISE_TIMEOUT_MS)
-          })
-
-          const retryProfile = await Promise.race([retryPromise, timeoutPromise])
+          const retryProfile = await retryPromise
           if (cancelled.current) return null
 
-          if (retryProfile === null && !cancelled.current) {
-            globalFetchPromises.delete(pubkey)
-            globalFetchingPubkeys.delete(pubkey)
-            // Set cooldown for 10 seconds to prevent cascade of duplicate fetches
-            globalFetchCooldowns.set(pubkey, Date.now() + 10000)
-            return null
-          }
           if (retryProfile) {
             // Update state for this instance
             setProfile(retryProfile)

src/i18n/locales/ar.ts

@@ -404,6 +404,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': 'لا توجد مزيد من الردود',
     'Relay sets': 'مجموعات الريلاي',
     'Favorite Relays': 'الريلايات المفضلة',

src/i18n/locales/de.ts

@@ -413,6 +413,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'Externe Relay-Suche ist für diesen Linktyp nicht verfügbar.',
+    'Searched external relays not found':
+      '{{count}} externe Relays durchsucht; die Note wurde nicht gefunden.',
     'no more replies': 'keine weiteren Antworten',
     'Relay sets': 'Relay-Sets',
     'Favorite Relays': 'Lieblings-Relays',

src/i18n/locales/en.ts

@@ -405,6 +405,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': 'no more replies',
     'Relay sets': 'Relay sets',
     'Favorite Relays': 'Favorite Relays',

src/i18n/locales/es.ts

@@ -408,6 +408,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': 'no hay más respuestas',
     'Relay sets': 'Conjuntos de relés',
     'Favorite Relays': 'Relés favoritos',

src/i18n/locales/fa.ts

@@ -407,6 +407,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': 'پاسخ بیشتری وجود ندارد',
     'Relay sets': 'مجموعه‌های رله',
     'Favorite Relays': 'رله‌های مورد علاقه',

src/i18n/locales/fr.ts

@@ -407,6 +407,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': 'aucune autre réponse',
     'Relay sets': 'Groupes de relais',
     'Favorite Relays': 'Relais favoris',

src/i18n/locales/hi.ts

@@ -408,6 +408,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': 'कोई और उत्तर नहीं',
     'Relay sets': 'रिले सेट',
     'Favorite Relays': 'पसंदीदा रिले',

src/i18n/locales/it.ts

@@ -408,6 +408,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': 'niente più repliche',
     'Relay sets': 'Set di Relay',
     'Favorite Relays': 'Relay preferiti',

src/i18n/locales/ja.ts

@@ -405,6 +405,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': 'これ以上の返信はありません',
     'Relay sets': 'リレイセット',
     'Favorite Relays': 'お気に入りのリレイ',

src/i18n/locales/ko.ts

@@ -404,6 +404,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': '더 이상 답글 없음',
     'Relay sets': '릴레이 세트',
     'Favorite Relays': '즐겨찾는 릴레이',

src/i18n/locales/pl.ts

@@ -405,6 +405,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': 'brak kolejnych odpowiedzi',
     'Relay sets': 'Zestawy transmiterów',
     'Favorite Relays': 'Ulubione transmitery',

src/i18n/locales/pt-BR.ts

@@ -407,6 +407,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': 'não há mais respostas',
     'Relay sets': 'Conjuntos de relay',
     'Favorite Relays': 'Relays favoritos',

src/i18n/locales/pt-PT.ts

@@ -407,6 +407,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': 'não há mais respostas',
     'Relay sets': 'Conjuntos de Relé',
     'Favorite Relays': 'Relés Favoritos',

src/i18n/locales/ru.ts

@@ -408,6 +408,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': 'больше нет ответов',
     'Relay sets': 'Наборы ретрансляторов',
     'Favorite Relays': 'Избранные ретрансляторы',

src/i18n/locales/th.ts

@@ -404,6 +404,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': 'ไม่มีการตอบกลับเพิ่มเติม',
     'Relay sets': 'ชุดรีเลย์',
     'Favorite Relays': 'รีเลย์โปรด',

src/i18n/locales/zh.ts

@@ -403,6 +403,10 @@ export default {
     'Searching...': 'Searching...',
     'Show relays': 'Show relays',
     'No external relay hints available': 'No external relay hints available',
+    'External relay search is not available for this link type':
+      'External relay search is not available for this link type.',
+    'Searched external relays not found':
+      'Searched {{count}} external relays; the note was still not found.',
     'no more replies': '没有更多回复了',
     'Relay sets': '服务器组',
     'Favorite Relays': '收藏的服务器',

src/pages/secondary/NotePage/NotFound.tsx

@@ -135,7 +135,7 @@ export default function NotFound({
   }, [bech32Id])
 
   const handleTryExternalRelays = async () => {
-    if (!hexEventId || isSearchingExternal) return
+    if (!bech32Id || isSearchingExternal) return
 
     if (externalRelays.length === 0) {
       logger.warn('No external relays to search (NotFound)', { bech32Id, hexEventId })
@@ -152,7 +152,7 @@ export default function NotFound({
         relays: externalRelays.slice(0, 5) // Log first 5 relays
       })
 
-      const event = await client.fetchEventWithExternalRelays(hexEventId, externalRelays)
+      const event = await client.fetchEventWithExternalRelays(bech32Id, externalRelays)
       
       if (event) {
         logger.info('Event found on external relay (NotFound)', { bech32Id, hexEventId })

src/services/client-events.service.ts

@@ -10,8 +10,8 @@ import { isReplaceableEvent } from '@/lib/event'
 import { buildComprehensiveRelayList } from '@/lib/relay-list-builder'
 
 /**
- * Build comprehensive relay list: author's outboxes + user's inboxes + relay hints + defaults
- * Uses the shared relay list builder utility
+ * Build comprehensive relay list for event-by-id fetch: user's inboxes (+ cache), relay hints,
+ * author outboxes/inboxes when known, FAST_READ_RELAY_URLS, and SEARCHABLE_RELAY_URLS.
  */
 async function buildComprehensiveRelayListForEvents(
   authorPubkey: string | undefined,
@@ -26,6 +26,7 @@ async function buildComprehensiveRelayListForEvents(
     seenRelays,
     containingEventRelays,
     includeFastReadRelays: true,
+    includeSearchableRelays: true,
     includeLocalRelays: true
   })
 }
@@ -86,35 +87,69 @@ export class EventService {
   }
 
   /**
-   * Fetch event with external relays
+   * REQ filter for searching a note/nevent/naddr/hex id on arbitrary relays.
    */
-  async fetchEventWithExternalRelays(eventId: string, externalRelays: string[]): Promise<NEvent | undefined> {
+  private filterForExternalRelayFetch(noteId: string): Filter | null {
+    const trimmed = noteId.trim()
+    if (/^[0-9a-f]{64}$/i.test(trimmed)) {
+      return { ids: [trimmed.toLowerCase()], limit: 1 }
+    }
+    try {
+      const { type, data } = nip19.decode(trimmed)
+      if (type === 'note') return { ids: [data], limit: 1 }
+      if (type === 'nevent') return { ids: [data.id], limit: 1 }
+      if (type === 'naddr') {
+        return {
+          kinds: [data.kind],
+          authors: [data.pubkey],
+          '#d': [data.identifier],
+          limit: 1
+        }
+      }
+    } catch {
+      /* invalid id */
+    }
+    return null
+  }
+
+  /**
+   * Fetch event with external relays (hex, note1, nevent1, or naddr1)
+   */
+  async fetchEventWithExternalRelays(noteId: string, externalRelays: string[]): Promise<NEvent | undefined> {
     if (!externalRelays || externalRelays.length === 0) {
-      logger.warn('fetchEventWithExternalRelays: No external relays provided', { eventId })
+      logger.warn('fetchEventWithExternalRelays: No external relays provided', { noteId })
       return undefined
     }
 
+    const filter = this.filterForExternalRelayFetch(noteId)
+    if (!filter) {
+      logger.warn('fetchEventWithExternalRelays: unparseable note id', {
+        noteIdPrefix: noteId.slice(0, 24)
+      })
+      return undefined
+    }
+
+    const logKey =
+      'ids' in filter && filter.ids?.[0]
+        ? filter.ids[0].slice(0, 8)
+        : `${filter.kinds?.[0]}:${(filter.authors?.[0] ?? '').slice(0, 8)}`
+
     logger.debug('fetchEventWithExternalRelays: Starting search', {
-      eventId: eventId.substring(0, 8),
+      noteIdKey: logKey,
       relayCount: externalRelays.length,
       relays: externalRelays
     })
 
     const startTime = Date.now()
-    const events = await this.queryService.query(
-      externalRelays,
-      { ids: [eventId], limit: 1 },
-      undefined,
-      {
-        eoseTimeout: 10000,
-        globalTimeout: 20000,
-        immediateReturn: true
-      }
-    )
+    const events = await this.queryService.query(externalRelays, filter, undefined, {
+      eoseTimeout: 10000,
+      globalTimeout: 20000,
+      immediateReturn: true
+    })
     const duration = Date.now() - startTime
 
     logger.debug('fetchEventWithExternalRelays: Search completed', {
-      eventId: eventId.substring(0, 8),
+      noteIdKey: logKey,
       relayCount: externalRelays.length,
       eventsFound: events.length,
       durationMs: duration
@@ -271,7 +306,7 @@ export class EventService {
 
   /**
    * Private: Try harder to fetch event from relays
-   * ALWAYS uses: author's outboxes + user's inboxes + relay hints + seen relays + defaults
+   * Uses: hints, seen, author relays when known, user's inboxes + cache, fast read + searchable relays.
    */
   private async tryHarderToFetchEvent(
     relayHints: string[],
@@ -328,7 +363,7 @@ export class EventService {
 
   /**
    * Private: Fetch events from big relays (batch)
-   * Uses comprehensive relay list: user's inboxes + defaults
+   * Uses same comprehensive list as single-event fetch (inboxes, fast read, searchable, cache).
    */
   private async fetchEventsFromBigRelays(ids: readonly string[]): Promise<(NEvent | undefined)[]> {
     // Build comprehensive relay list (user's inboxes + defaults)