{relayWavePendingBannerEl}
{feedClientFilterActive && filteredEvents.length > 0 && clientFilteredEvents.length === 0 ? (
diff --git a/src/components/ParentNotePreview/index.tsx b/src/components/ParentNotePreview/index.tsx
index 848599e9..6e7bd274 100644
--- a/src/components/ParentNotePreview/index.tsx
+++ b/src/components/ParentNotePreview/index.tsx
@@ -4,7 +4,7 @@ import { useFetchEvent } from '@/hooks'
import { cn } from '@/lib/utils'
import client from '@/services/client.service'
import { useTranslation } from 'react-i18next'
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { Event } from 'nostr-tools'
import ContentPreview from '../ContentPreview'
import UserAvatar from '../UserAvatar'
@@ -14,16 +14,23 @@ export default function ParentNotePreview({
eventId,
className,
onClick,
+ /** NIP-10 `e` relay hints from the child note — speeds up parent fetch in notifications and feeds. */
+ relayHints,
/** Inline hint without pill background (e.g. reply thread rows). */
appearance = 'default'
}: {
eventId: string
className?: string
onClick?: React.MouseEventHandler | undefined
+ relayHints?: string[]
appearance?: 'default' | 'subtle'
}) {
const { t } = useTranslation()
- const { event, isFetching } = useFetchEvent(eventId)
+ const fetchOpts = useMemo(
+ () => (relayHints?.length ? { relayHints } : undefined),
+ [relayHints]
+ )
+ const { event, isFetching } = useFetchEvent(eventId, undefined, fetchOpts)
const [fallbackEvent, setFallbackEvent] = useState(undefined)
const [isFetchingFallback, setIsFetchingFallback] = useState(false)
/** One automatic searchable-relay attempt per eventId; without this, the effect re-fires forever after each 20s timeout. */
diff --git a/src/components/ReplyNote/index.tsx b/src/components/ReplyNote/index.tsx
index f7097860..b9eb7dd4 100644
--- a/src/components/ReplyNote/index.tsx
+++ b/src/components/ReplyNote/index.tsx
@@ -14,6 +14,7 @@ import {
import { getZapInfoFromEvent } from '@/lib/event-metadata'
import { isMentioningMutedUsers, isNip25ReactionKind } from '@/lib/event'
import { getWebExternalReactionTargetUrl } from '@/lib/rss-article'
+import { relayHintsFromEventTags } from '@/lib/relay-list-builder'
import { toNote } from '@/lib/link'
import { cn } from '@/lib/utils'
import { useContentPolicy } from '@/providers/ContentPolicyProvider'
@@ -68,6 +69,7 @@ export default function ReplyNote({
event.kind === ExtendedKind.EXTERNAL_REACTION ? getWebExternalReactionTargetUrl(event) : undefined,
[event]
)
+ const parentFetchRelayHints = useMemo(() => relayHintsFromEventTags(event), [event])
const headerUserId = useMemo(() => {
if (event.kind !== kinds.Zap) return event.pubkey
const info = getZapInfoFromEvent(event)
@@ -155,6 +157,7 @@ export default function ReplyNote({
appearance="subtle"
className="mt-1.5"
eventId={parentEventId}
+ relayHints={parentFetchRelayHints}
onClick={(e) => {
e.stopPropagation()
onClickParent()
diff --git a/src/components/ReplyNoteList/index.tsx b/src/components/ReplyNoteList/index.tsx
index 87a12a39..e00bf82f 100644
--- a/src/components/ReplyNoteList/index.tsx
+++ b/src/components/ReplyNoteList/index.tsx
@@ -88,7 +88,8 @@ function chunkKindsForThreadReq(list: readonly number[], size = MAX_KINDS_PER_TH
}
return out
}
-const THREAD_PROFILE_BATCH_DEBOUNCE_MS = 50
+/** Short debounce so thread / detail headers populate avatars quickly after events arrive. */
+const THREAD_PROFILE_BATCH_DEBOUNCE_MS = 16
const THREAD_PROFILE_CHUNK = 80
function partitionZapReceipts(items: NEvent[]) {
diff --git a/src/components/WebPreview/index.tsx b/src/components/WebPreview/index.tsx
index a8edead7..fed9a3f9 100644
--- a/src/components/WebPreview/index.tsx
+++ b/src/components/WebPreview/index.tsx
@@ -138,7 +138,10 @@ export default function WebPreview({ url, className }: { url: string; className?
const { isSmallScreen } = useScreenSize()
const cleanedUrl = useMemo(() => cleanUrl(url), [url])
- const { title, description, image, ogLoading } = useFetchWebMetadata(cleanedUrl)
+ /** Link cards and URLs in highlights stay visible on cellular; OG fetch is gated by the same policy as heavy media. */
+ const { title, description, image, ogLoading } = useFetchWebMetadata(cleanedUrl, {
+ fetchEnabled: autoLoadMedia
+ })
const hostname = useMemo(() => {
try {
@@ -459,11 +462,6 @@ export default function WebPreview({ url, className }: { url: string; className?
img.src = image
}, [image])
- // Early return after ALL hooks are called
- if (!autoLoadMedia) {
- return null
- }
-
// Prefer the page's own Open Graph / meta when the fetch returns anything useful.
const hasOpengraphData = !isInternalAppLink && (title || description || image)
diff --git a/src/hooks/useFetchWebMetadata.tsx b/src/hooks/useFetchWebMetadata.tsx
index 3dd2d5a5..efb52fda 100644
--- a/src/hooks/useFetchWebMetadata.tsx
+++ b/src/hooks/useFetchWebMetadata.tsx
@@ -4,12 +4,18 @@ import webService from '@/services/web.service'
import logger from '@/lib/logger'
import { isLikelyWebPageUrl } from '@/lib/url'
-export function useFetchWebMetadata(url: string) {
+export function useFetchWebMetadata(
+ url: string,
+ options?: { /** When false, skip OG fetch (e.g. cellular + “Wi‑Fi only” media policy); caller still renders a link card. */ fetchEnabled?: boolean }
+) {
+ const fetchEnabled = options?.fetchEnabled !== false
const [metadata, setMetadata] = useState({})
- const [ogLoading, setOgLoading] = useState(() => Boolean(url && isLikelyWebPageUrl(url)))
+ const [ogLoading, setOgLoading] = useState(() =>
+ Boolean(fetchEnabled && url && isLikelyWebPageUrl(url))
+ )
useEffect(() => {
- if (!url || !isLikelyWebPageUrl(url)) {
+ if (!fetchEnabled || !url || !isLikelyWebPageUrl(url)) {
setMetadata({})
setOgLoading(false)
return
@@ -31,7 +37,7 @@ export function useFetchWebMetadata(url: string) {
.finally(() => {
setOgLoading(false)
})
- }, [url])
+ }, [url, fetchEnabled])
return { ...metadata, ogLoading }
}
diff --git a/src/hooks/useNotificationReactionDisplay.ts b/src/hooks/useNotificationReactionDisplay.ts
index 3a0bb688..d4101372 100644
--- a/src/hooks/useNotificationReactionDisplay.ts
+++ b/src/hooks/useNotificationReactionDisplay.ts
@@ -4,6 +4,7 @@ import {
isDiscussionUpvoteEmoji
} from '@/lib/discussion-votes'
import { getRootEventHexId } from '@/lib/event'
+import { relayHintsFromEventTags } from '@/lib/relay-list-builder'
import { getFirstHexEventIdFromETags } from '@/lib/tag'
import { eventService } from '@/services/client.service'
import { Event, kinds } from 'nostr-tools'
@@ -26,6 +27,8 @@ export function useNotificationReactionDisplay(event: Event): NotificationReacti
return getFirstHexEventIdFromETags(event.tags)
}, [event.kind, event.tags])
+ const reactionRelayHints = useMemo(() => relayHintsFromEventTags(event), [event])
+
const [state, setState] = useState(() =>
event.kind === kinds.Reaction ? { status: 'pending' } : { status: 'default' }
)
@@ -47,8 +50,10 @@ export function useNotificationReactionDisplay(event: Event): NotificationReacti
let cancelled = false
setState({ status: 'pending' })
+ const fetchOpts = reactionRelayHints.length ? { relayHints: reactionRelayHints } : undefined
+
;(async () => {
- const target = await eventService.fetchEvent(targetId)
+ const target = await eventService.fetchEvent(targetId, fetchOpts)
if (cancelled) return
if (!target) {
setState({ status: 'default' })
@@ -59,7 +64,9 @@ export function useNotificationReactionDisplay(event: Event): NotificationReacti
if (!inDiscussion && target.kind === ExtendedKind.COMMENT) {
const rootId = getRootEventHexId(target)
if (rootId) {
- const root = await eventService.fetchEvent(rootId)
+ const rootHints = relayHintsFromEventTags(target)
+ const rootOpts = rootHints.length ? { relayHints: rootHints } : fetchOpts
+ const root = await eventService.fetchEvent(rootId, rootOpts)
if (cancelled) return
inDiscussion = root?.kind === ExtendedKind.DISCUSSION
}
@@ -83,7 +90,7 @@ export function useNotificationReactionDisplay(event: Event): NotificationReacti
return () => {
cancelled = true
}
- }, [event.id, event.kind, event.content, targetId])
+ }, [event.id, event.kind, event.content, targetId, reactionRelayHints])
return state
}
diff --git a/src/pages/secondary/NotePage/index.tsx b/src/pages/secondary/NotePage/index.tsx
index f02840b6..e29a122f 100644
--- a/src/pages/secondary/NotePage/index.tsx
+++ b/src/pages/secondary/NotePage/index.tsx
@@ -26,6 +26,7 @@ import { getLongFormArticleMetadataFromEvent } from '@/lib/event-metadata'
import { toNote, toNoteList } from '@/lib/link'
import { stripMarkupForPreview } from '@/lib/parent-reply-blurb'
import { tagNameEquals } from '@/lib/tag'
+import { relayHintsFromEventTags } from '@/lib/relay-list-builder'
import { cn } from '@/lib/utils'
import { Ellipsis } from 'lucide-react'
import type { Event } from 'nostr-tools'
@@ -111,10 +112,18 @@ const NotePage = forwardRef(({ id, index, hideTitlebar = false, initialEvent }:
() => (finalEvent?.kind === ExtendedKind.COMMENT ? finalEvent.tags.find(tagNameEquals('I')) : undefined),
[finalEvent]
)
+ const threadRelayHints = useMemo(
+ () => (finalEvent ? relayHintsFromEventTags(finalEvent) : []),
+ [finalEvent]
+ )
+ const parentRootFetchOpts = useMemo(
+ () => (threadRelayHints.length ? { relayHints: threadRelayHints } : undefined),
+ [threadRelayHints]
+ )
const { isFetching: isFetchingRootEvent, event: rootEvent, refetch: refetchRoot } =
- useFetchEvent(rootEventId)
+ useFetchEvent(rootEventId, undefined, parentRootFetchOpts)
const { isFetching: isFetchingParentEvent, event: parentEvent, refetch: refetchParent } =
- useFetchEvent(parentEventId)
+ useFetchEvent(parentEventId, undefined, parentRootFetchOpts)
const selfHex = finalEvent?.id?.toLowerCase()
const rootEventForStrip =
diff --git a/src/services/media-extraction.service.ts b/src/services/media-extraction.service.ts
index 05a1cb9b..a77bdc5c 100644
--- a/src/services/media-extraction.service.ts
+++ b/src/services/media-extraction.service.ts
@@ -25,6 +25,7 @@ export function extractAllMediaFromEvent(
event: Event,
content?: string
): ExtractedMedia {
+ const textBody = content ?? event.content ?? ''
const seenUrls = new Set()
const allMedia: TImetaInfo[] = []
@@ -124,13 +125,13 @@ export function extractAllMediaFromEvent(
}
})
- // 4. Extract from content (if provided)
- if (content) {
+ // 4. Extract from note content (plain URLs, markdown images) — callers may omit `content`; default to `event.content`.
+ if (textBody) {
// First, extract from markdown image syntax:  or [](link)
// This handles images inside links
const markdownImageRegex = /!\[[^\]]*\]\(([^)]+)\)/g
let imgMatch
- while ((imgMatch = markdownImageRegex.exec(content)) !== null) {
+ while ((imgMatch = markdownImageRegex.exec(textBody)) !== null) {
if (imgMatch[1]) {
const url = imgMatch[1]
if (isEmbeddableMediaUrl(cleanUrl(url) || url)) {
@@ -141,7 +142,7 @@ export function extractAllMediaFromEvent(
// Then extract directly from raw content (catch any URLs that weren't parsed)
const urlRegex = /https?:\/\/[^\s<>"']+/g
- const urlMatches = content.matchAll(urlRegex)
+ const urlMatches = textBody.matchAll(urlRegex)
for (const match of urlMatches) {
const url = match[0]
const c = cleanUrl(url) || url