diff --git a/src/i18n/locales/de.ts b/src/i18n/locales/de.ts
index 5cfeca9c..8f6c41e1 100644
--- a/src/i18n/locales/de.ts
+++ b/src/i18n/locales/de.ts
@@ -1060,6 +1060,8 @@ export default {
'Keine aktuellen Beiträge von diesem Nutzer in dieser Abfrage',
'Loading trending notes from your relays...': 'Trendende Notizen werden geladen …',
'Trending on Nostr': 'Trending auf Nostr',
+ 'Home trending slice notice':
+ 'Dieser Feed enthält eine Trending-Spur (nostrarchives). Notizen, die von diesem Relay kamen, zeigen unter der Karte „Trending auf Nostr“.',
Sort: 'Sortierung',
newest: 'neueste',
oldest: 'älteste',
diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
index 09a13e83..ebffb132 100644
--- a/src/i18n/locales/en.ts
+++ b/src/i18n/locales/en.ts
@@ -1058,6 +1058,8 @@ export default {
'No recent posts from this user in the current fetch',
'Loading trending notes from your relays...': 'Loading trending notes from your relays...',
'Trending on Nostr': 'Trending on Nostr',
+ 'Home trending slice notice':
+ 'This feed includes a trending slice (nostrarchives). Notes that reached you from that relay show “Trending on Nostr” under the card.',
Sort: 'Sort',
newest: 'newest',
oldest: 'oldest',
diff --git a/src/lib/url.ts b/src/lib/url.ts
index 54b73723..a324acb1 100644
--- a/src/lib/url.ts
+++ b/src/lib/url.ts
@@ -336,6 +336,44 @@ export function isSafeMediaUrl(url: string): boolean {
return t.startsWith('http://') || t.startsWith('https://')
}
+/**
+ * Primal R2A CDN URL for media keyed by SHA-256 (same object as `https://blossom.primal.net/{hash}.ext`).
+ * Used when the blossom host fails in-browser; aligns with NIP-B7-style alternate retrieval.
+ */
+export function primalR2aUploads2UrlFromSha256(hash: string, extensionWithDot?: string): string | null {
+ const h = hash.toLowerCase()
+ if (!/^[0-9a-f]{64}$/.test(h)) return null
+ const ext =
+ extensionWithDot && extensionWithDot.startsWith('.') ? extensionWithDot.toLowerCase() : ''
+ const a = h.slice(0, 1)
+ const b = h.slice(1, 3)
+ const c = h.slice(3, 5)
+ return `https://r2a.primal.net/uploads2/${a}/${b}/${c}/${h}${ext}`
+}
+
+/**
+ * If `url` is on `blossom.primal.net` with a 64-hex blob id in the path, return the r2a CDN mirror URL.
+ */
+export function primalR2aMirrorForBlossomPrimalUrl(url: string | URL): string | null {
+ try {
+ const u = url instanceof URL ? url : new URL(url)
+ if (u.hostname !== 'blossom.primal.net') return null
+ const m = u.pathname.match(/([0-9a-f]{64})(\.\w+)?$/i)
+ if (!m) return null
+ return primalR2aUploads2UrlFromSha256(m[1].toLowerCase(), m[2] || '')
+ } catch {
+ return null
+ }
+}
+
+/**
+ * Prefer Primal’s CDN URL for `img src` when the note points at `blossom.primal.net/…`.
+ * Same file as the blossom URL; avoids browsers that block or hang on the blossom host (Primal/Wisp-style delivery).
+ */
+export function preferBlossomPrimalDisplayUrl(url: string): string {
+ return primalR2aMirrorForBlossomPrimalUrl(url) ?? url
+}
+
/**
* Remove tracking parameters from URLs
* Removes common tracking parameters like utm_*, fbclid, gclid, etc.
diff --git a/src/lib/wisp-trending-relay.ts b/src/lib/wisp-trending-relay.ts
index 8ccda9e1..68977879 100644
--- a/src/lib/wisp-trending-relay.ts
+++ b/src/lib/wisp-trending-relay.ts
@@ -1,3 +1,5 @@
+import { normalizeUrl } from '@/lib/url'
+
/**
* Trending notes stream from nostrarchives, consumed by
* {@link https://github.com/barrydeen/wisp | Wisp} (Android). Same URL shape as Wisp’s
@@ -16,3 +18,18 @@ export function buildWispTrendingNotesRelayUrl(
/** Wisp `FeedSubscriptionManager` FEED_KINDS when subscribing to trending notes. */
export const WISP_TRENDING_FEED_KINDS: readonly number[] = [1, 6, 1068, 6969, 30023, 20, 21, 22]
+
+/** True when `url` is any nostrarchives notes trending WebSocket feed (path `/notes/trending/...`). */
+export function isWispTrendingNotesRelayUrl(url: string): boolean {
+ const raw = (normalizeUrl(url) || url).trim()
+ const forParse = raw.replace(/^ws:\/\//i, 'http://').replace(/^wss:\/\//i, 'https://')
+ try {
+ const u = new URL(forParse)
+ return (
+ u.hostname.toLowerCase() === 'feeds.nostrarchives.com' &&
+ u.pathname.toLowerCase().startsWith('/notes/trending/')
+ )
+ } catch {
+ return false
+ }
+}
diff --git a/src/pages/primary/NoteListPage/FollowingFeed.tsx b/src/pages/primary/NoteListPage/FollowingFeed.tsx
index f0f930bd..123a01ff 100644
--- a/src/pages/primary/NoteListPage/FollowingFeed.tsx
+++ b/src/pages/primary/NoteListPage/FollowingFeed.tsx
@@ -169,6 +169,15 @@ const FollowingFeed = forwardRef<
i18n.language
])
+ const trendingFeedNotice = useMemo(
+ () => (
+
+ {t('Home trending slice notice')}
+
+ ),
+ [t]
+ )
+
return (
)
})
diff --git a/src/pages/primary/NoteListPage/RelaysFeed.tsx b/src/pages/primary/NoteListPage/RelaysFeed.tsx
index 582e7592..62914202 100644
--- a/src/pages/primary/NoteListPage/RelaysFeed.tsx
+++ b/src/pages/primary/NoteListPage/RelaysFeed.tsx
@@ -2,6 +2,10 @@ import NormalFeed from '@/components/NormalFeed'
import type { TNoteListRef } from '@/components/NoteList'
import { SINGLE_RELAY_KINDLESS_REQ_LIMIT } from '@/constants'
import { checkAlgoRelay } from '@/lib/relay'
+import {
+ isWispTrendingNotesRelayUrl,
+ WISP_TRENDING_FEED_KINDS
+} from '@/lib/wisp-trending-relay'
import { normalizeUrl } from '@/lib/url'
import { useFeed } from '@/providers/FeedProvider'
import { useKindFilterOrDefaults } from '@/providers/KindFilterProvider'
@@ -93,6 +97,12 @@ const RelaysFeed = forwardRef<
return undefined
}, [feedInfo.feedType, feedInfo.id])
+ const wispTrendingSingleRelay =
+ feedInfo.feedType === 'relay' &&
+ relayUrls.length === 1 &&
+ !!relayUrls[0] &&
+ isWispTrendingNotesRelayUrl(relayUrls[0])
+
/** New relay chip / set: try kindless first again. */
useEffect(() => {
setSingleRelayKindFallback(false)
@@ -110,7 +120,8 @@ const RelaysFeed = forwardRef<
feedInfo.feedType === 'relay' &&
relayUrls.length === 1 &&
!kindsOverride?.length &&
- !singleRelayKindFallback
+ !singleRelayKindFallback &&
+ !wispTrendingSingleRelay
const feedTopNotice = singleRelayKindFallback ? (
{t('singleRelayKindFallbackNotice')}
@@ -119,6 +130,14 @@ const RelaysFeed = forwardRef<
// Hooks must run every render — never place useMemo after conditional returns.
const subRequests = useMemo(() => {
if (!canRenderFeed) return []
+ if (wispTrendingSingleRelay) {
+ return [
+ {
+ urls: relayUrls,
+ filter: { kinds: [...WISP_TRENDING_FEED_KINDS], limit: 100 }
+ }
+ ]
+ }
if (singleRelayKindlessExplore) {
return [{ urls: relayUrls, filter: { limit: SINGLE_RELAY_KINDLESS_REQ_LIMIT } }]
}
@@ -130,7 +149,14 @@ const RelaysFeed = forwardRef<
}
}
]
- }, [canRenderFeed, relayUrls, defaultKinds, kindsOverride, singleRelayKindlessExplore])
+ }, [
+ canRenderFeed,
+ relayUrls,
+ defaultKinds,
+ kindsOverride,
+ singleRelayKindlessExplore,
+ wispTrendingSingleRelay
+ ])
if (!canRenderFeed) {
return null
diff --git a/src/services/client-replaceable-events.service.ts b/src/services/client-replaceable-events.service.ts
index 7a55df89..4a975203 100644
--- a/src/services/client-replaceable-events.service.ts
+++ b/src/services/client-replaceable-events.service.ts
@@ -6,12 +6,13 @@ import {
METADATA_BATCH_QUERY_EOSE_TIMEOUT_MS,
METADATA_BATCH_QUERY_GLOBAL_TIMEOUT_MS,
PROFILE_FETCH_RELAY_URLS,
- READ_ONLY_RELAY_URLS
+ READ_ONLY_RELAY_URLS,
+ RECOMMENDED_BLOSSOM_SERVERS
} from '@/constants'
import { kinds, nip19 } from 'nostr-tools'
import type { Event as NEvent, Filter } from 'nostr-tools'
import DataLoader from 'dataloader'
-import { normalizeUrl } from '@/lib/url'
+import { normalizeHttpUrl, normalizeUrl } from '@/lib/url'
import { getProfileFromEvent } from '@/lib/event-metadata'
import { formatPubkey, pubkeyToNpub, userIdToPubkey } from '@/lib/pubkey'
import { getPubkeysFromPTags, getServersFromServerTags } from '@/lib/tag'
@@ -1128,8 +1129,18 @@ export class ReplaceableEventService {
*/
async fetchBlossomServerList(pubkey: string): Promise
{
const evt = await this.fetchBlossomServerListEvent(pubkey)
- if (!evt) return []
- return getServersFromServerTags(evt.tags)
+ const fromEvent = evt ? getServersFromServerTags(evt.tags) : []
+ const seen = new Set()
+ const out: string[] = []
+ const add = (raw: string) => {
+ const n = normalizeHttpUrl(raw)
+ if (!n || seen.has(n)) return
+ seen.add(n)
+ out.push(n)
+ }
+ fromEvent.forEach(add)
+ RECOMMENDED_BLOSSOM_SERVERS.forEach(add)
+ return out
}
/**