void toggleFavoriteSpell(s)}
+ starTitleAdd={spellStarAddTitle}
+ starTitleRemove={spellStarRemoveTitle}
+ />
+ ))}
+
+ ) : null}
+
+ {followSpells.length > 0 ? (
+ <>
+
+
+ {t('Spells from follows', { count: followSpells.length })}
+
+ {followSpellGroups.map(({ pubkey: authorPk, spells: groupSpells }) => (
+
+
+
+ {groupSpells.map((spell) => (
+ void toggleFavoriteSpell(s)}
+ starTitleAdd={spellStarAddTitle}
+ starTitleRemove={spellStarRemoveTitle}
+ />
+ ))}
+
+
+ {t('Other spells', { count: otherSpells.length })}
+
+ {otherSpellGroups.map(({ pubkey: authorPk, spells: groupSpells }) => (
+
+
+
+ {groupSpells.map((spell) => (
+ void toggleFavoriteSpell(s)}
+ starTitleAdd={spellStarAddTitle}
+ starTitleRemove={spellStarRemoveTitle}
+ />
+ ))}
+
+
-
-
-
- )
-}
-
-function SpellSheetOptionRow({
- spell,
- selected,
- accountPubkey,
- labelFor,
- onPick,
- groupedUnderAuthor = false,
- starred = false,
- onToggleStar,
- starTitleAdd,
- starTitleRemove
-}: {
- spell: Event
- selected: boolean
- accountPubkey: string | undefined
- labelFor: (e: Event) => string
- onPick: (e: Event) => void
- /** Author shown in a header above this block — hide npub under each row */
- groupedUnderAuthor?: boolean
- starred?: boolean
- onToggleStar?: (spell: Event) => void
- starTitleAdd?: string
- starTitleRemove?: string
-}) {
- const { t } = useTranslation()
- const { primary, secondary } = spellPickerPrimaryAndSecondary(spell, accountPubkey, labelFor, {
- omitAuthorNpub: groupedUnderAuthor
- })
- return (
-
-
- {onToggleStar ? (
-
- ) : null}
-
- {t('Starred spells')}
-
- {starredSpellsForPicker.map((spell) => (
- getSpellName(e)}
- onPick={pickSpell}
- starred
- onToggleStar={(s) => void toggleFavoriteSpell(s)}
- starTitleAdd={spellStarAddTitle}
- starTitleRemove={spellStarRemoveTitle}
- />
- ))}
-
-
- ) : null}
- {FAUX_SPELL_ORDER.flatMap((name) => {
- if (
- (name === 'notifications' ||
- name === 'following' ||
- name === 'heatMap' ||
- name === 'bookmarks' ||
- name === 'interests') &&
- !pubkey
- ) {
- return []
- }
- const Icon = FAUX_SPELL_ICON[name]
- const selected = selectedFauxSpell === name
- const builtinRow = (
-
- )
- if (name !== 'following' || !pubkey || followSetListEvents.length === 0) {
- return [builtinRow]
- }
- const setRows = followSetListEvents.flatMap((ev) => {
- const d = getFollowSetDTag(ev)
- if (!d) return []
- const spellId = encodeFollowSetSpellId(d)
- const setSelected = selectedFauxSpell === spellId
- return [
-
- ]
- })
- return [builtinRow, ...setRows]
- })}
-
-
- {ownSpells.length > 0 ? (
- <>
-
-
- {t('spellPickerSectionYours')}
-
- {ownSpells.map((spell) => (
- void toggleFavoriteSpell(s)}
- starTitleAdd={spellStarAddTitle}
- starTitleRemove={spellStarRemoveTitle}
- />
- ))}
-
- ) : null}
-
- {followSpells.length > 0 ? (
- <>
-
-
- {t('Spells from follows', { count: followSpells.length })}
-
- {followSpellGroups.map(({ pubkey: authorPk, spells: groupSpells }) => (
-
-
-
- {groupSpells.map((spell) => (
- void toggleFavoriteSpell(s)}
- starTitleAdd={spellStarAddTitle}
- starTitleRemove={spellStarRemoveTitle}
- />
- ))}
-
-
- {t('Other spells', { count: otherSpells.length })}
-
- {otherSpellGroups.map(({ pubkey: authorPk, spells: groupSpells }) => (
-
-
-
- {groupSpells.map((spell) => (
- void toggleFavoriteSpell(s)}
- starTitleAdd={spellStarAddTitle}
- starTitleRemove={spellStarRemoveTitle}
- />
- ))}
-
-
- {spellPickerList}
+ {spellPickerPanel}
diff --git a/src/pages/primary/SpellsPage/useSpellsPageFeed.ts b/src/pages/primary/SpellsPage/useSpellsPageFeed.ts
new file mode 100644
index 00000000..6fc2a99f
--- /dev/null
+++ b/src/pages/primary/SpellsPage/useSpellsPageFeed.ts
@@ -0,0 +1,453 @@
+import { useCallback, useEffect, useMemo, useState } from 'react'
+import type { Event } from 'nostr-tools'
+import { kinds as nostrKinds } from 'nostr-tools'
+import { ExtendedKind, DEFAULT_FEED_SHOW_KINDS } from '@/constants'
+import { getPubkeysFromPTags } from '@/lib/tag'
+import { normalizeUrl } from '@/lib/url'
+import {
+ augmentSubRequestsWithFavoritesFastReadAndInbox,
+ getRelayUrlsWithFavoritesFastReadAndInbox,
+ userReadRelaysWithHttp
+} from '@/lib/favorites-feed-relays'
+import {
+ computeKind777SpellFeedSubscriptionKey,
+ computeSpellSubRequestsIdentityKey
+} from '@/lib/spell-feed-request-identity'
+import { isUserInEventMentions } from '@/lib/event'
+import {
+ decodeFollowSetSpellId,
+ getFollowSetDTag,
+ isFollowSetSpellId,
+ pubkeysFromFollowSetEvent
+} from '@/lib/follow-set-spell'
+import client from '@/services/client.service'
+import {
+ buildBookmarksSubRequests,
+ buildCalendarSpellFilter,
+ buildDiscussionFilter,
+ buildInterestsSubRequests,
+ buildMediaSpellFilter,
+ buildNotificationsSpellSubRequests,
+ buildWebBookmarksSpellSubRequests,
+ NOTIFICATION_SPELL_LOADING_SAFETY_MS,
+ FAUX_SPELL_EVENT_LIMIT,
+ MEDIA_SPELL_KINDS,
+ NOTIFICATION_SPELL_KINDS,
+ applyFauxSpellCapsToSubRequests
+} from './fauxSpellFeeds'
+import { getRelaysForSpell, spellEventToFilter } from '@/services/spell.service'
+import type { TFeedSubRequest } from '@/types'
+import { isFollowFeedFauxSpellId } from './fauxSpellConfig'
+import storage from '@/services/local-storage.service'
+
+function useNoteListHideReplies() {
+ const [hideReplies, setHideReplies] = useState(() => storage.getNoteListMode() === 'posts')
+
+ useEffect(() => {
+ const sync = () => setHideReplies(storage.getNoteListMode() === 'posts')
+ window.addEventListener('noteListModeChanged', sync)
+ return () => window.removeEventListener('noteListModeChanged', sync)
+ }, [])
+
+ return hideReplies
+}
+
+export type UseSpellsPageFeedArgs = {
+ selectedFauxSpell: string | null
+ selectedSpell: Event | null
+ pubkey: string | null | undefined
+ relayList: { read: string[]; write: string[] } | null | undefined
+ favoriteRelays: string[]
+ blockedRelays: string[]
+ notificationsFeedPubkey: string | null
+ interestListEvent: Event | null | undefined
+ bookmarkListEvent: Event | null | undefined
+ followListEvent: Event | null | undefined
+ contacts: string[]
+ contactsSyncKey: string
+ followSetListEvents: Event[]
+ followSetCatalogLoading: boolean
+ kindFilterShowKinds: number[]
+}
+
+export function useSpellsPageFeed(a: UseSpellsPageFeedArgs) {
+ const {
+ selectedFauxSpell,
+ selectedSpell,
+ pubkey,
+ relayList,
+ favoriteRelays,
+ blockedRelays,
+ notificationsFeedPubkey,
+ interestListEvent,
+ bookmarkListEvent,
+ followListEvent,
+ contacts,
+ contactsSyncKey,
+ followSetListEvents,
+ followSetCatalogLoading,
+ kindFilterShowKinds
+ } = a
+
+ const hideRepliesFollowing = useNoteListHideReplies()
+ const [followingSubRequests, setFollowingSubRequests] = useState([])
+
+ const normalizedReadSorted = relayList
+ ? [...relayList.read].map((u) => normalizeUrl(u) || u).filter(Boolean).sort()
+ : []
+ const normalizedWriteSorted = relayList
+ ? [...relayList.write].map((u) => normalizeUrl(u) || u).filter(Boolean).sort()
+ : []
+
+ const relayMailboxStableKey =
+ relayList == null
+ ? ''
+ : JSON.stringify({ r: normalizedReadSorted, w: normalizedWriteSorted })
+
+ const relayListWriteKey = useMemo(() => {
+ if (!relayList) return '[]'
+ return JSON.stringify(normalizedWriteSorted)
+ }, [relayMailboxStableKey])
+
+ const sortedFavoriteRelaysKey = useMemo(
+ () =>
+ JSON.stringify(
+ [...favoriteRelays].map((u) => normalizeUrl(u) || u).filter(Boolean).sort((x, y) => x.localeCompare(y))
+ ),
+ [favoriteRelays]
+ )
+ const sortedBlockedRelaysKey = useMemo(
+ () =>
+ JSON.stringify(
+ [...blockedRelays].map((u) => normalizeUrl(u) || u).filter(Boolean).sort((x, y) => x.localeCompare(y))
+ ),
+ [blockedRelays]
+ )
+
+ const followSetListStableKey = useMemo(
+ () =>
+ followSetListEvents
+ .map((e) => {
+ const d = getFollowSetDTag(e) ?? ''
+ return `${d}:${e.id}:${e.created_at}`
+ })
+ .sort()
+ .join('|'),
+ [followSetListEvents]
+ )
+
+ useEffect(() => {
+ if (!pubkey || !isFollowFeedFauxSpellId(selectedFauxSpell)) {
+ setFollowingSubRequests([])
+ return
+ }
+
+ const followSetD =
+ selectedFauxSpell && isFollowSetSpellId(selectedFauxSpell)
+ ? decodeFollowSetSpellId(selectedFauxSpell)
+ : null
+
+ if (followSetD && followSetCatalogLoading) {
+ setFollowingSubRequests([])
+ return
+ }
+
+ let cancelled = false
+ void (async () => {
+ const augment = (raw: TFeedSubRequest[]) =>
+ augmentSubRequestsWithFavoritesFastReadAndInbox(
+ raw,
+ favoriteRelays,
+ blockedRelays,
+ userReadRelaysWithHttp(relayList),
+ { userWriteRelays: relayList?.write ?? [] }
+ )
+ try {
+ if (selectedFauxSpell === 'following') {
+ const fromTags = followListEvent ? getPubkeysFromPTags(followListEvent.tags) : []
+ const provisionalAuthors = [...new Set([pubkey, ...fromTags])]
+ let provisionalOk = false
+ try {
+ const rawProv = await client.generateSubRequestsForPubkeys(provisionalAuthors, pubkey)
+ if (!cancelled) {
+ setFollowingSubRequests(augment(rawProv))
+ provisionalOk = true
+ }
+ } catch {
+ /* refined wave may still succeed */
+ }
+
+ let followings = fromTags
+ try {
+ followings = await client.fetchFollowings(pubkey)
+ } catch {
+ followings = followListEvent ? getPubkeysFromPTags(followListEvent.tags) : []
+ }
+ const fullAuthors = [...new Set([pubkey, ...followings])]
+ const sameSet =
+ fullAuthors.length === provisionalAuthors.length &&
+ fullAuthors.every((p) => provisionalAuthors.includes(p)) &&
+ provisionalAuthors.every((p) => fullAuthors.includes(p))
+ if (sameSet) {
+ if (!provisionalOk && !cancelled) {
+ try {
+ const req = await client.generateSubRequestsForPubkeys(fullAuthors, pubkey)
+ if (!cancelled) setFollowingSubRequests(augment(req))
+ } catch {
+ if (!cancelled) setFollowingSubRequests([])
+ }
+ }
+ return
+ }
+ const req = await client.generateSubRequestsForPubkeys(fullAuthors, pubkey)
+ if (!cancelled) setFollowingSubRequests(augment(req))
+ } else if (followSetD) {
+ const ev = followSetListEvents.find((e) => getFollowSetDTag(e) === followSetD)
+ if (!ev) {
+ if (!cancelled) setFollowingSubRequests([])
+ return
+ }
+ const listed = pubkeysFromFollowSetEvent(ev)
+ const authorPubkeys = [pubkey, ...listed]
+ const req = await client.generateSubRequestsForPubkeys(authorPubkeys, pubkey)
+ if (!cancelled) setFollowingSubRequests(augment(req))
+ } else {
+ if (!cancelled) setFollowingSubRequests([])
+ }
+ } catch {
+ if (!cancelled) setFollowingSubRequests([])
+ }
+ })()
+ return () => {
+ cancelled = true
+ }
+ }, [
+ selectedFauxSpell,
+ pubkey,
+ sortedFavoriteRelaysKey,
+ sortedBlockedRelaysKey,
+ relayMailboxStableKey,
+ followSetCatalogLoading,
+ followSetListStableKey,
+ followListEvent?.id,
+ favoriteRelays,
+ blockedRelays,
+ relayList,
+ followListEvent
+ ])
+
+ const interestTagsStableKey = interestListEvent
+ ? JSON.stringify(
+ [...interestListEvent.tags].sort((a, b) => JSON.stringify(a).localeCompare(JSON.stringify(b)))
+ )
+ : ''
+ const bookmarkTagsStableKey = bookmarkListEvent
+ ? JSON.stringify(
+ [...bookmarkListEvent.tags].sort((a, b) => JSON.stringify(a).localeCompare(JSON.stringify(b)))
+ )
+ : ''
+
+ const fauxFeedRelaysDepsKey = [
+ sortedFavoriteRelaysKey,
+ sortedBlockedRelaysKey,
+ interestListEvent?.id ?? '',
+ String(interestListEvent?.created_at ?? ''),
+ interestTagsStableKey,
+ bookmarkListEvent?.id ?? '',
+ String(bookmarkListEvent?.created_at ?? ''),
+ bookmarkTagsStableKey
+ ].join('\0')
+
+ const syncFauxSubRequests = useMemo(() => {
+ if (
+ !selectedFauxSpell ||
+ isFollowFeedFauxSpellId(selectedFauxSpell) ||
+ selectedFauxSpell === 'heatMap'
+ )
+ return []
+ const fauxSpellSkipSocialKindBlocked =
+ selectedFauxSpell === 'calendar' ||
+ selectedFauxSpell === 'followPacks' ||
+ selectedFauxSpell === 'media' ||
+ selectedFauxSpell === 'bookmarks' ||
+ selectedFauxSpell === 'interests'
+ const feedUrls = getRelayUrlsWithFavoritesFastReadAndInbox(
+ favoriteRelays,
+ blockedRelays,
+ userReadRelaysWithHttp(relayList),
+ {
+ userWriteRelays: relayList?.write ?? [],
+ applySocialKindBlockedFilter: fauxSpellSkipSocialKindBlocked ? false : undefined
+ }
+ )
+
+ if (selectedFauxSpell === 'notifications') {
+ if (!notificationsFeedPubkey || !feedUrls.length) return []
+ return buildNotificationsSpellSubRequests(feedUrls, notificationsFeedPubkey)
+ }
+ if (selectedFauxSpell === 'discussions') {
+ if (!feedUrls.length) return []
+ return [{ urls: feedUrls, filter: buildDiscussionFilter() }]
+ }
+ if (selectedFauxSpell === 'media') {
+ if (!feedUrls.length) return []
+ return [{ urls: feedUrls, filter: buildMediaSpellFilter() }]
+ }
+ if (selectedFauxSpell === 'calendar') {
+ if (!feedUrls.length) return []
+ return [{ urls: feedUrls, filter: buildCalendarSpellFilter() }]
+ }
+ if (selectedFauxSpell === 'interests') {
+ if (!pubkey || !interestListEvent) return []
+ const topics = interestListEvent.tags.filter((tag) => tag[0] === 't' && tag[1]).map((tag) => tag[1]!)
+ return buildInterestsSubRequests(feedUrls, topics, DEFAULT_FEED_SHOW_KINDS)
+ }
+ if (selectedFauxSpell === 'bookmarks') {
+ if (!pubkey) return []
+ const idReqs = buildBookmarksSubRequests(bookmarkListEvent ?? null, feedUrls)
+ const webReqs = buildWebBookmarksSpellSubRequests(pubkey, feedUrls)
+ return [...idReqs, ...webReqs]
+ }
+ if (selectedFauxSpell === 'followPacks') {
+ if (!feedUrls.length) return []
+ return [
+ {
+ urls: feedUrls,
+ filter: { kinds: [ExtendedKind.FOLLOW_PACK], limit: FAUX_SPELL_EVENT_LIMIT }
+ }
+ ]
+ }
+ return []
+ }, [selectedFauxSpell, pubkey, notificationsFeedPubkey, fauxFeedRelaysDepsKey, relayMailboxStableKey, interestListEvent, bookmarkListEvent, favoriteRelays, blockedRelays, relayList])
+
+ const fauxSubRequests = useMemo(() => {
+ const base = isFollowFeedFauxSpellId(selectedFauxSpell ?? '')
+ ? followingSubRequests
+ : syncFauxSubRequests
+ return applyFauxSpellCapsToSubRequests(base)
+ }, [selectedFauxSpell, followingSubRequests, syncFauxSubRequests])
+
+ const spellSubRequests = useMemo(() => {
+ if (!selectedSpell) return []
+ const relayListWrite = relayList?.write ?? []
+ const ctx = { pubkey: pubkey ?? null, contacts }
+ const filter = spellEventToFilter(selectedSpell, ctx)
+ if (!filter) return []
+ const relays = getRelaysForSpell(selectedSpell, { relayListWrite })
+ if (!relays.length) return []
+ return [{ urls: relays, filter }]
+ }, [selectedSpell, pubkey, contactsSyncKey, relayListWriteKey, contacts, relayList])
+
+ const subRequests = useMemo(() => {
+ if (selectedFauxSpell) return fauxSubRequests
+ return spellSubRequests
+ }, [selectedFauxSpell, fauxSubRequests, spellSubRequests])
+
+ const spellFeedSubscriptionKey = useMemo(() => {
+ if (selectedFauxSpell) return computeSpellSubRequestsIdentityKey(subRequests)
+ if (selectedSpell) return computeKind777SpellFeedSubscriptionKey(selectedSpell, subRequests)
+ return ''
+ }, [selectedFauxSpell, selectedSpell, subRequests])
+
+ const spellBrowseRelayUrls = useMemo(() => {
+ const set = new Set()
+ for (const req of subRequests) {
+ for (const u of req.urls) {
+ const n = normalizeUrl(u) || u
+ if (n) set.add(n)
+ }
+ }
+ return [...set].sort()
+ }, [subRequests])
+
+ const spellBrowseRelayUrlsKey = spellBrowseRelayUrls.join('|')
+
+ const showKindsTagKey = useMemo(() => {
+ if (!selectedSpell) return ''
+ return selectedSpell.tags
+ .filter((tag) => tag[0] === 'k')
+ .map((tag) => tag[1])
+ .sort()
+ .join(',')
+ }, [selectedSpell?.id])
+
+ const followingShowKindsKey =
+ selectedFauxSpell && isFollowFeedFauxSpellId(selectedFauxSpell)
+ ? JSON.stringify(kindFilterShowKinds)
+ : ''
+
+ const showKinds = useMemo(() => {
+ if (selectedFauxSpell === 'notifications') {
+ return [...NOTIFICATION_SPELL_KINDS]
+ }
+ if (selectedFauxSpell === 'discussions') {
+ return [ExtendedKind.DISCUSSION]
+ }
+ if (selectedFauxSpell && isFollowFeedFauxSpellId(selectedFauxSpell)) {
+ const k = kindFilterShowKinds
+ const out = [...k]
+ if (!out.includes(nostrKinds.Repost)) out.push(nostrKinds.Repost)
+ if (!out.includes(ExtendedKind.GENERIC_REPOST)) out.push(ExtendedKind.GENERIC_REPOST)
+ return out.sort((x, y) => x - y)
+ }
+ if (selectedFauxSpell === 'followPacks') {
+ return [ExtendedKind.FOLLOW_PACK]
+ }
+ if (selectedFauxSpell === 'media') {
+ return [...MEDIA_SPELL_KINDS]
+ }
+ if (selectedFauxSpell === 'calendar') {
+ return [ExtendedKind.CALENDAR_EVENT_DATE, ExtendedKind.CALENDAR_EVENT_TIME]
+ }
+ if (selectedFauxSpell === 'interests') {
+ return [...DEFAULT_FEED_SHOW_KINDS]
+ }
+ if (selectedFauxSpell === 'bookmarks') {
+ const out = [...DEFAULT_FEED_SHOW_KINDS]
+ if (!out.includes(ExtendedKind.WEB_BOOKMARK)) out.push(ExtendedKind.WEB_BOOKMARK)
+ return out.sort((a, b) => a - b)
+ }
+ if (!selectedSpell) return [1]
+ const kinds = selectedSpell.tags
+ .filter((tag) => tag[0] === 'k')
+ .map((tag) => parseInt(tag[1], 10))
+ .filter((n) => !Number.isNaN(n))
+ return kinds.length ? kinds : [1]
+ }, [selectedFauxSpell, selectedSpell?.id, showKindsTagKey, followingShowKindsKey])
+
+ const fauxNoteListUseFilterAsIs = useMemo(() => {
+ if (!selectedFauxSpell) return true
+ if (selectedFauxSpell && isFollowFeedFauxSpellId(selectedFauxSpell)) return false
+ return true
+ }, [selectedFauxSpell])
+
+ const spellFauxMergeTimeline = useMemo(
+ () => !!selectedFauxSpell && isFollowFeedFauxSpellId(selectedFauxSpell),
+ [selectedFauxSpell]
+ )
+
+ const notificationsMentionExtraHide = useCallback(
+ (evt: Event) =>
+ notificationsFeedPubkey ? !isUserInEventMentions(evt, notificationsFeedPubkey) : false,
+ [notificationsFeedPubkey]
+ )
+
+ return {
+ relayMailboxStableKey,
+ sortedFavoriteRelaysKey,
+ sortedBlockedRelaysKey,
+ followingSubRequests,
+ fauxSubRequests,
+ subRequests,
+ spellFeedSubscriptionKey,
+ spellBrowseRelayUrls,
+ spellBrowseRelayUrlsKey,
+ showKinds,
+ fauxNoteListUseFilterAsIs,
+ spellFauxMergeTimeline,
+ notificationsMentionExtraHide,
+ hideRepliesFollowing,
+ NOTIFICATION_SPELL_LOADING_SAFETY_MS,
+ NOTIFICATION_SPELL_KINDS
+ }
+}
diff --git a/src/providers/FeedProvider.tsx b/src/providers/FeedProvider.tsx
index 7104560c..89e3305d 100644
--- a/src/providers/FeedProvider.tsx
+++ b/src/providers/FeedProvider.tsx
@@ -16,6 +16,14 @@ import { useNostr } from './NostrProvider'
export { useFeed } from './feed-context'
export type { TFeedContext } from './feed-context'
+function relayUrlListIdentity(urls: string[]): string {
+ return urls
+ .map((u) => normalizeAnyRelayUrl(u) || u.trim())
+ .filter(Boolean)
+ .sort()
+ .join('\n')
+}
+
export function FeedProvider({ children }: { children: React.ReactNode }) {
const { pubkey, isInitialized, cacheRelayListEvent, httpRelayListEvent } = useNostr()
const { relaySets, favoriteRelays, blockedRelays } = useFavoriteRelays()
@@ -48,6 +56,13 @@ export function FeedProvider({ children }: { children: React.ReactNode }) {
id: DEFAULT_FAVORITE_RELAYS[0]
})
const feedInfoRef = useRef(feedInfo)
+ /** Same logical list as {@link mergeRelayUrlLayers} result — reuse array ref so NoteList does not re-subscribe. */
+ const setRelayUrlsIfChanged = useCallback((next: string[]) => {
+ setRelayUrls((prev) => {
+ if (relayUrlListIdentity(prev) === relayUrlListIdentity(next)) return prev
+ return next
+ })
+ }, [])
const switchFeed = useCallback(async (
feedType: TFeedType,
@@ -81,7 +96,7 @@ export function FeedProvider({ children }: { children: React.ReactNode }) {
logger.component('FeedProvider', 'Setting relay feed info', newFeedInfo)
setFeedInfo(newFeedInfo)
feedInfoRef.current = newFeedInfo
- setRelayUrls([normalizedUrl])
+ setRelayUrlsIfChanged([normalizedUrl])
logger.component('FeedProvider', 'Set relayUrls', { relayUrls: [normalizedUrl] })
storage.setFeedInfo(newFeedInfo, pubkey)
// Reset note list mode to 'posts' when switching to relay feed to ensure main content is shown
@@ -114,7 +129,7 @@ export function FeedProvider({ children }: { children: React.ReactNode }) {
const newFeedInfo = { feedType, id: relaySet.id }
setFeedInfo(newFeedInfo)
feedInfoRef.current = newFeedInfo
- setRelayUrls(relaySet.relayUrls)
+ setRelayUrlsIfChanged(relaySet.relayUrls)
storage.setFeedInfo(newFeedInfo, pubkey)
// Reset note list mode to 'posts' when switching to relay set to ensure main content is shown
storage.setNoteListMode('posts')
@@ -130,7 +145,7 @@ export function FeedProvider({ children }: { children: React.ReactNode }) {
const newFeedInfo = { feedType }
setFeedInfo(newFeedInfo)
feedInfoRef.current = newFeedInfo
- setRelayUrls(finalRelays)
+ setRelayUrlsIfChanged(finalRelays)
storage.setFeedInfo(newFeedInfo, pubkey)
// Reset note list mode to 'posts' when switching to all-favorites to ensure main content is shown
storage.setNoteListMode('posts')
@@ -138,7 +153,44 @@ export function FeedProvider({ children }: { children: React.ReactNode }) {
return
}
setIsReady(true)
- }, [pubkey, favoriteRelays, blockedRelays, relaySets, extraFeedRelayUrls])
+ }, [pubkey, favoriteRelays, blockedRelays, relaySets, extraFeedRelayUrls, setRelayUrlsIfChanged])
+
+ const switchFeedRef = useRef(switchFeed)
+ switchFeedRef.current = switchFeed
+
+ const favoriteRelaysIdentity = useMemo(
+ () =>
+ [...favoriteRelays]
+ .map((u) => normalizeAnyRelayUrl(u) || u.trim())
+ .filter(Boolean)
+ .sort()
+ .join('|'),
+ [favoriteRelays]
+ )
+ const blockedRelaysIdentity = useMemo(
+ () =>
+ [...blockedRelays]
+ .map((u) => normalizeAnyRelayUrl(u) || u.trim())
+ .filter(Boolean)
+ .sort()
+ .join('|'),
+ [blockedRelays]
+ )
+ const relaySetsIdentity = useMemo(
+ () =>
+ relaySets
+ .map((s) => {
+ const urls = [...s.relayUrls]
+ .map((u) => normalizeAnyRelayUrl(u) || u.trim())
+ .filter(Boolean)
+ .sort()
+ .join(',')
+ return `${s.id}:${urls}`
+ })
+ .sort()
+ .join('\n'),
+ [relaySets]
+ )
useEffect(() => {
const init = async () => {
@@ -185,11 +237,11 @@ export function FeedProvider({ children }: { children: React.ReactNode }) {
logger.info('[FeedProvider] Migrated deprecated feed type to all-favorites', {
previous: previousMainFeed
})
- return await switchFeed('all-favorites')
+ return await switchFeedRef.current('all-favorites')
}
if (feedInfo.feedType === 'relays') {
- return await switchFeed('relays', { activeRelaySetId: feedInfo.id })
+ return await switchFeedRef.current('relays', { activeRelaySetId: feedInfo.id })
}
if (feedInfo.feedType === 'relay') {
@@ -199,17 +251,17 @@ export function FeedProvider({ children }: { children: React.ReactNode }) {
feedInfo.id = favoritesFeedRelays[0] ?? DEFAULT_FAVORITE_RELAYS[0]
}
logger.component('FeedProvider', 'Initial relay setup, calling switchFeed', { relayId: feedInfo.id })
- return await switchFeed('relay', { relay: feedInfo.id })
+ return await switchFeedRef.current('relay', { relay: feedInfo.id })
}
if (feedInfo.feedType === 'all-favorites') {
logger.debug('Initializing all-favorites feed')
- return await switchFeed('all-favorites')
+ return await switchFeedRef.current('all-favorites')
}
}
- init()
- }, [pubkey, isInitialized, favoriteRelays, blockedRelays, switchFeed])
+ void init()
+ }, [pubkey, isInitialized, favoriteRelaysIdentity, blockedRelaysIdentity, relaySetsIdentity])
// Update relay URLs when favoriteRelays, blocked, or extra relay lists change while in all-favorites mode
useEffect(() => {
@@ -219,21 +271,8 @@ export function FeedProvider({ children }: { children: React.ReactNode }) {
logger.debug('Updating relay URLs for all-favorites:', finalRelays)
// Same logical list can be merged into a new array each run; keep the previous reference so
// feed consumers (RelaysFeed → NoteList relay subscription) do not re-enter effects in a tight loop.
- const nextKey = finalRelays
- .map((u) => normalizeAnyRelayUrl(u) || u)
- .filter(Boolean)
- .sort()
- .join('\n')
- setRelayUrls((prev) => {
- const prevKey = prev
- .map((u) => normalizeAnyRelayUrl(u) || u)
- .filter(Boolean)
- .sort()
- .join('\n')
- if (prevKey === nextKey) return prev
- return finalRelays
- })
- }, [feedInfo.feedType, favoriteRelays, blockedRelays, extraFeedRelayUrls])
+ setRelayUrlsIfChanged(finalRelays)
+ }, [feedInfo.feedType, favoriteRelays, blockedRelays, extraFeedRelayUrls, setRelayUrlsIfChanged])
return (