|
|
|
@ -61,6 +61,8 @@ import NoteCard, { NoteCardLoadingSkeleton } from '../NoteCard' |
|
|
|
|
|
|
|
|
|
|
|
const LIMIT = 100 // Increased from 200 to load more events per request
|
|
|
|
const LIMIT = 100 // Increased from 200 to load more events per request
|
|
|
|
const ALGO_LIMIT = 200 // Increased from 500 for algorithm feeds
|
|
|
|
const ALGO_LIMIT = 200 // Increased from 500 for algorithm feeds
|
|
|
|
|
|
|
|
/** Single-relay explore: kindless REQ cap (relay returns whatever it has, up to this many). */ |
|
|
|
|
|
|
|
const RELAY_EXPLORE_LIMIT = 200 |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* Vite HMR replaces this module and remounts NoteList; timeline refs reset while the subscription can briefly look |
|
|
|
* Vite HMR replaces this module and remounts NoteList; timeline refs reset while the subscription can briefly look |
|
|
|
@ -97,11 +99,13 @@ function mergeEventBatchesById(prev: Event[], incoming: Event[], cap: number): E |
|
|
|
|
|
|
|
|
|
|
|
/** When omitting `kinds` from a live REQ, require another scope so we never subscribe to a whole relay. */ |
|
|
|
/** When omitting `kinds` from a live REQ, require another scope so we never subscribe to a whole relay. */ |
|
|
|
function timelineFilterHasNonKindScope(f: Filter): boolean { |
|
|
|
function timelineFilterHasNonKindScope(f: Filter): boolean { |
|
|
|
|
|
|
|
const search = f.search |
|
|
|
return ( |
|
|
|
return ( |
|
|
|
(Array.isArray(f.authors) && f.authors.length > 0) || |
|
|
|
(Array.isArray(f.authors) && f.authors.length > 0) || |
|
|
|
(Array.isArray(f.ids) && f.ids.length > 0) || |
|
|
|
(Array.isArray(f.ids) && f.ids.length > 0) || |
|
|
|
(Array.isArray(f['#p']) && f['#p']!.length > 0) || |
|
|
|
(Array.isArray(f['#p']) && f['#p']!.length > 0) || |
|
|
|
(Array.isArray(f['#e']) && f['#e']!.length > 0) |
|
|
|
(Array.isArray(f['#e']) && f['#e']!.length > 0) || |
|
|
|
|
|
|
|
(typeof search === 'string' && search.trim().length > 0) |
|
|
|
) |
|
|
|
) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -114,6 +118,10 @@ const NoteList = forwardRef( |
|
|
|
showKind1Replies = true, |
|
|
|
showKind1Replies = true, |
|
|
|
showKind1111 = true, |
|
|
|
showKind1111 = true, |
|
|
|
seeAllFeedEvents = false, |
|
|
|
seeAllFeedEvents = false, |
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* Single-relay Explore / home chip: REQ omits `kinds`, limit 200, no feed kind filter (relay decides what to send). |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
allowKindlessRelayExplore = false, |
|
|
|
filterMutedNotes = true, |
|
|
|
filterMutedNotes = true, |
|
|
|
hideReplies = false, |
|
|
|
hideReplies = false, |
|
|
|
hideUntrustedNotes = false, |
|
|
|
hideUntrustedNotes = false, |
|
|
|
@ -184,6 +192,7 @@ const NoteList = forwardRef( |
|
|
|
showKind1111?: boolean |
|
|
|
showKind1111?: boolean |
|
|
|
/** Omit REQ kinds and skip client-side kind filtering (main feed testing). Ignored when useFilterAsIs. */ |
|
|
|
/** Omit REQ kinds and skip client-side kind filtering (main feed testing). Ignored when useFilterAsIs. */ |
|
|
|
seeAllFeedEvents?: boolean |
|
|
|
seeAllFeedEvents?: boolean |
|
|
|
|
|
|
|
allowKindlessRelayExplore?: boolean |
|
|
|
filterMutedNotes?: boolean |
|
|
|
filterMutedNotes?: boolean |
|
|
|
hideReplies?: boolean |
|
|
|
hideReplies?: boolean |
|
|
|
hideUntrustedNotes?: boolean |
|
|
|
hideUntrustedNotes?: boolean |
|
|
|
@ -376,11 +385,15 @@ const NoteList = forwardRef( |
|
|
|
() => |
|
|
|
() => |
|
|
|
JSON.stringify({ |
|
|
|
JSON.stringify({ |
|
|
|
feed: timelineSubscriptionKey, |
|
|
|
feed: timelineSubscriptionKey, |
|
|
|
|
|
|
|
...(allowKindlessRelayExplore |
|
|
|
|
|
|
|
? { relayKindless: true } |
|
|
|
|
|
|
|
: { |
|
|
|
kinds: showKindsKey, |
|
|
|
kinds: showKindsKey, |
|
|
|
op: showKind1OPs, |
|
|
|
op: showKind1OPs, |
|
|
|
rep: showKind1Replies, |
|
|
|
rep: showKind1Replies, |
|
|
|
c1111: showKind1111, |
|
|
|
c1111: showKind1111, |
|
|
|
seeAll: seeAllFeedEvents |
|
|
|
seeAll: seeAllFeedEvents |
|
|
|
|
|
|
|
}) |
|
|
|
}), |
|
|
|
}), |
|
|
|
[ |
|
|
|
[ |
|
|
|
timelineSubscriptionKey, |
|
|
|
timelineSubscriptionKey, |
|
|
|
@ -388,14 +401,22 @@ const NoteList = forwardRef( |
|
|
|
showKind1OPs, |
|
|
|
showKind1OPs, |
|
|
|
showKind1Replies, |
|
|
|
showKind1Replies, |
|
|
|
showKind1111, |
|
|
|
showKind1111, |
|
|
|
seeAllFeedEvents |
|
|
|
seeAllFeedEvents, |
|
|
|
|
|
|
|
allowKindlessRelayExplore |
|
|
|
] |
|
|
|
] |
|
|
|
) |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** Kindless relay explore ignores the feed kind picker; avoid re-subscribing when it changes. */ |
|
|
|
|
|
|
|
const timelineResubscribeKindKey = allowKindlessRelayExplore |
|
|
|
|
|
|
|
? 'kindless-relay-explore' |
|
|
|
|
|
|
|
: `${showKindsKey}|${showKind1OPs}|${showKind1Replies}|${showKind1111}` |
|
|
|
|
|
|
|
|
|
|
|
const showKindsRef = useRef(showKinds) |
|
|
|
const showKindsRef = useRef(showKinds) |
|
|
|
showKindsRef.current = showKinds |
|
|
|
showKindsRef.current = showKinds |
|
|
|
const seeAllFeedEventsRef = useRef(seeAllFeedEvents) |
|
|
|
const seeAllFeedEventsRef = useRef(seeAllFeedEvents) |
|
|
|
seeAllFeedEventsRef.current = seeAllFeedEvents |
|
|
|
seeAllFeedEventsRef.current = seeAllFeedEvents |
|
|
|
|
|
|
|
const allowKindlessRelayExploreRef = useRef(allowKindlessRelayExplore) |
|
|
|
|
|
|
|
allowKindlessRelayExploreRef.current = allowKindlessRelayExplore |
|
|
|
const useFilterAsIsRef = useRef(useFilterAsIs) |
|
|
|
const useFilterAsIsRef = useRef(useFilterAsIs) |
|
|
|
useFilterAsIsRef.current = useFilterAsIs |
|
|
|
useFilterAsIsRef.current = useFilterAsIs |
|
|
|
const clientSideKindFilterRef = useRef(clientSideKindFilter) |
|
|
|
const clientSideKindFilterRef = useRef(clientSideKindFilter) |
|
|
|
@ -464,7 +485,7 @@ const NoteList = forwardRef( |
|
|
|
const idSet = new Set<string>() |
|
|
|
const idSet = new Set<string>() |
|
|
|
|
|
|
|
|
|
|
|
return events.slice(0, showCount).filter((evt) => { |
|
|
|
return events.slice(0, showCount).filter((evt) => { |
|
|
|
if (!seeAllFeedEvents) { |
|
|
|
if (!seeAllFeedEvents && !allowKindlessRelayExplore) { |
|
|
|
if (!showKinds.includes(evt.kind)) return false |
|
|
|
if (!showKinds.includes(evt.kind)) return false |
|
|
|
// Kind 1: show only OPs if showKind1OPs, only replies if showKind1Replies
|
|
|
|
// Kind 1: show only OPs if showKind1OPs, only replies if showKind1Replies
|
|
|
|
if (evt.kind === kinds.ShortTextNote) { |
|
|
|
if (evt.kind === kinds.ShortTextNote) { |
|
|
|
@ -492,7 +513,8 @@ const NoteList = forwardRef( |
|
|
|
showKind1OPs, |
|
|
|
showKind1OPs, |
|
|
|
showKind1Replies, |
|
|
|
showKind1Replies, |
|
|
|
showKind1111, |
|
|
|
showKind1111, |
|
|
|
seeAllFeedEvents |
|
|
|
seeAllFeedEvents, |
|
|
|
|
|
|
|
allowKindlessRelayExplore |
|
|
|
]) |
|
|
|
]) |
|
|
|
|
|
|
|
|
|
|
|
useLayoutEffect(() => { |
|
|
|
useLayoutEffect(() => { |
|
|
|
@ -538,7 +560,7 @@ const NoteList = forwardRef( |
|
|
|
const idSet = new Set<string>() |
|
|
|
const idSet = new Set<string>() |
|
|
|
|
|
|
|
|
|
|
|
return newEvents.filter((event: Event) => { |
|
|
|
return newEvents.filter((event: Event) => { |
|
|
|
if (!seeAllFeedEvents) { |
|
|
|
if (!seeAllFeedEvents && !allowKindlessRelayExplore) { |
|
|
|
if (!showKinds.includes(event.kind)) return false |
|
|
|
if (!showKinds.includes(event.kind)) return false |
|
|
|
if (event.kind === kinds.ShortTextNote) { |
|
|
|
if (event.kind === kinds.ShortTextNote) { |
|
|
|
const isReply = isReplyNoteEvent(event) |
|
|
|
const isReply = isReplyNoteEvent(event) |
|
|
|
@ -565,7 +587,8 @@ const NoteList = forwardRef( |
|
|
|
showKind1OPs, |
|
|
|
showKind1OPs, |
|
|
|
showKind1Replies, |
|
|
|
showKind1Replies, |
|
|
|
showKind1111, |
|
|
|
showKind1111, |
|
|
|
seeAllFeedEvents |
|
|
|
seeAllFeedEvents, |
|
|
|
|
|
|
|
allowKindlessRelayExplore |
|
|
|
]) |
|
|
|
]) |
|
|
|
|
|
|
|
|
|
|
|
useLayoutEffect(() => { |
|
|
|
useLayoutEffect(() => { |
|
|
|
@ -792,8 +815,16 @@ const NoteList = forwardRef( |
|
|
|
const mappedSubRequests = subRequestsRef.current.map(({ urls, filter }) => { |
|
|
|
const mappedSubRequests = subRequestsRef.current.map(({ urls, filter }) => { |
|
|
|
const baseLimit = filter.limit ?? (areAlgoRelays ? ALGO_LIMIT : LIMIT) |
|
|
|
const baseLimit = filter.limit ?? (areAlgoRelays ? ALGO_LIMIT : LIMIT) |
|
|
|
if (useFilterAsIs) { |
|
|
|
if (useFilterAsIs) { |
|
|
|
const finalFilter: Filter = { ...filter, limit: baseLimit } |
|
|
|
|
|
|
|
const hasKindsInRequest = Array.isArray(filter.kinds) && filter.kinds.length > 0 |
|
|
|
const hasKindsInRequest = Array.isArray(filter.kinds) && filter.kinds.length > 0 |
|
|
|
|
|
|
|
if (allowKindlessRelayExplore && urls.length === 1 && !hasKindsInRequest) { |
|
|
|
|
|
|
|
const finalFilter: Filter = { |
|
|
|
|
|
|
|
...filter, |
|
|
|
|
|
|
|
limit: filter.limit ?? RELAY_EXPLORE_LIMIT |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
delete finalFilter.kinds |
|
|
|
|
|
|
|
return { urls, filter: finalFilter } |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
const finalFilter: Filter = { ...filter, limit: baseLimit } |
|
|
|
if (clientSideKindFilter) { |
|
|
|
if (clientSideKindFilter) { |
|
|
|
if (hasKindsInRequest) { |
|
|
|
if (hasKindsInRequest) { |
|
|
|
finalFilter.kinds = filter.kinds |
|
|
|
finalFilter.kinds = filter.kinds |
|
|
|
@ -828,10 +859,13 @@ const NoteList = forwardRef( |
|
|
|
}) |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
const filterMissingKinds = (f: Filter) => !f.kinds || f.kinds.length === 0 |
|
|
|
const filterMissingKinds = (f: Filter) => !f.kinds || f.kinds.length === 0 |
|
|
|
const invalidFilters = mappedSubRequests.filter(({ filter: f }) => { |
|
|
|
const invalidFilters = mappedSubRequests.filter(({ urls, filter: f }) => { |
|
|
|
if (seeAllNoSpell) return false |
|
|
|
if (seeAllNoSpell) return false |
|
|
|
if (!filterMissingKinds(f)) return false |
|
|
|
if (!filterMissingKinds(f)) return false |
|
|
|
if (useFilterAsIs && clientSideKindFilter && timelineFilterHasNonKindScope(f)) return false |
|
|
|
if (useFilterAsIs && clientSideKindFilter && timelineFilterHasNonKindScope(f)) return false |
|
|
|
|
|
|
|
if (useFilterAsIs && allowKindlessRelayExplore && urls.length === 1) { |
|
|
|
|
|
|
|
return false |
|
|
|
|
|
|
|
} |
|
|
|
return true |
|
|
|
return true |
|
|
|
}) |
|
|
|
}) |
|
|
|
if (invalidFilters.length > 0) { |
|
|
|
if (invalidFilters.length > 0) { |
|
|
|
@ -849,7 +883,7 @@ const NoteList = forwardRef( |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
const narrowLiveBatch = (evs: Event[]) => { |
|
|
|
const narrowLiveBatch = (evs: Event[]) => { |
|
|
|
if (seeAllNoSpell) return evs |
|
|
|
if (seeAllFeedEventsRef.current || allowKindlessRelayExploreRef.current) return evs |
|
|
|
if (!useFilterAsIs || !clientSideKindFilter) return evs |
|
|
|
if (!useFilterAsIs || !clientSideKindFilter) return evs |
|
|
|
return evs.filter((e) => showKinds.includes(e.kind)) |
|
|
|
return evs.filter((e) => showKinds.includes(e.kind)) |
|
|
|
} |
|
|
|
} |
|
|
|
@ -886,7 +920,12 @@ const NoteList = forwardRef( |
|
|
|
let merged = [...byId.values()] |
|
|
|
let merged = [...byId.values()] |
|
|
|
.sort((a, b) => b.created_at - a.created_at) |
|
|
|
.sort((a, b) => b.created_at - a.created_at) |
|
|
|
.slice(0, cap) |
|
|
|
.slice(0, cap) |
|
|
|
if (useFilterAsIs && clientSideKindFilter) { |
|
|
|
if ( |
|
|
|
|
|
|
|
useFilterAsIs && |
|
|
|
|
|
|
|
clientSideKindFilter && |
|
|
|
|
|
|
|
!seeAllFeedEventsRef.current && |
|
|
|
|
|
|
|
!allowKindlessRelayExploreRef.current |
|
|
|
|
|
|
|
) { |
|
|
|
merged = merged.filter((e) => showKinds.includes(e.kind)) |
|
|
|
merged = merged.filter((e) => showKinds.includes(e.kind)) |
|
|
|
} |
|
|
|
} |
|
|
|
if (sessionSnap?.length && !userPulledRefresh) { |
|
|
|
if (sessionSnap?.length && !userPulledRefresh) { |
|
|
|
@ -970,7 +1009,11 @@ const NoteList = forwardRef( |
|
|
|
}, subscribeSetupRaceMs) |
|
|
|
}, subscribeSetupRaceMs) |
|
|
|
}) |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
const eventCap = areAlgoRelays ? ALGO_LIMIT : LIMIT |
|
|
|
const eventCap = allowKindlessRelayExplore |
|
|
|
|
|
|
|
? RELAY_EXPLORE_LIMIT |
|
|
|
|
|
|
|
: areAlgoRelays |
|
|
|
|
|
|
|
? ALGO_LIMIT |
|
|
|
|
|
|
|
: LIMIT |
|
|
|
|
|
|
|
|
|
|
|
timelineSubscribePromise = client.subscribeTimeline( |
|
|
|
timelineSubscribePromise = client.subscribeTimeline( |
|
|
|
mappedSubRequests as Array<{ urls: string[]; filter: TSubRequestFilter }>, |
|
|
|
mappedSubRequests as Array<{ urls: string[]; filter: TSubRequestFilter }>, |
|
|
|
@ -1084,10 +1127,9 @@ const NoteList = forwardRef( |
|
|
|
onNew: (event: Event) => { |
|
|
|
onNew: (event: Event) => { |
|
|
|
if (!effectActive) return |
|
|
|
if (!effectActive) return |
|
|
|
feedRelayReturnedAnyEventRef.current = true |
|
|
|
feedRelayReturnedAnyEventRef.current = true |
|
|
|
const seeAll = seeAllFeedEventsRef.current && !useFilterAsIs |
|
|
|
if (!seeAllFeedEventsRef.current && !allowKindlessRelayExploreRef.current) { |
|
|
|
if (!seeAll && !useFilterAsIs && !showKinds.includes(event.kind)) return |
|
|
|
if (!useFilterAsIs && !showKinds.includes(event.kind)) return |
|
|
|
if (clientSideKindFilter && useFilterAsIs && !showKinds.includes(event.kind)) return |
|
|
|
if (clientSideKindFilter && useFilterAsIs && !showKinds.includes(event.kind)) return |
|
|
|
if (!seeAll) { |
|
|
|
|
|
|
|
if (event.kind === kinds.ShortTextNote) { |
|
|
|
if (event.kind === kinds.ShortTextNote) { |
|
|
|
const isReply = isReplyNoteEvent(event) |
|
|
|
const isReply = isReplyNoteEvent(event) |
|
|
|
if (isReply && !showKind1Replies) return |
|
|
|
if (isReply && !showKind1Replies) return |
|
|
|
@ -1179,10 +1221,7 @@ const NoteList = forwardRef( |
|
|
|
mergeTimelineWhenSubRequestFiltersMatch, |
|
|
|
mergeTimelineWhenSubRequestFiltersMatch, |
|
|
|
feedTimelineScopeKey, |
|
|
|
feedTimelineScopeKey, |
|
|
|
refreshCount, |
|
|
|
refreshCount, |
|
|
|
showKindsKey, |
|
|
|
timelineResubscribeKindKey, |
|
|
|
showKind1OPs, |
|
|
|
|
|
|
|
showKind1Replies, |
|
|
|
|
|
|
|
showKind1111, |
|
|
|
|
|
|
|
seeAllFeedEvents, |
|
|
|
seeAllFeedEvents, |
|
|
|
useFilterAsIs, |
|
|
|
useFilterAsIs, |
|
|
|
areAlgoRelays, |
|
|
|
areAlgoRelays, |
|
|
|
@ -1194,7 +1233,8 @@ const NoteList = forwardRef( |
|
|
|
oneShotGlobalTimeoutMs, |
|
|
|
oneShotGlobalTimeoutMs, |
|
|
|
oneShotEoseTimeoutMs, |
|
|
|
oneShotEoseTimeoutMs, |
|
|
|
oneShotFirstRelayGraceMs, |
|
|
|
oneShotFirstRelayGraceMs, |
|
|
|
clientSideKindFilter |
|
|
|
clientSideKindFilter, |
|
|
|
|
|
|
|
allowKindlessRelayExplore |
|
|
|
]) |
|
|
|
]) |
|
|
|
|
|
|
|
|
|
|
|
const oneShotDebugPrevLoadingRef = useRef(false) |
|
|
|
const oneShotDebugPrevLoadingRef = useRef(false) |
|
|
|
@ -1458,14 +1498,17 @@ const NoteList = forwardRef( |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
let fetchBatch = newEvents |
|
|
|
let fetchBatch = newEvents |
|
|
|
let toAppend = |
|
|
|
const narrowLoadMore = |
|
|
|
useFilterAsIsRef.current && clientSideKindFilterRef.current |
|
|
|
useFilterAsIsRef.current && |
|
|
|
|
|
|
|
clientSideKindFilterRef.current && |
|
|
|
|
|
|
|
!seeAllFeedEventsRef.current && |
|
|
|
|
|
|
|
!allowKindlessRelayExploreRef.current |
|
|
|
|
|
|
|
let toAppend = narrowLoadMore |
|
|
|
? fetchBatch.filter((e) => showKindsRef.current.includes(e.kind)) |
|
|
|
? fetchBatch.filter((e) => showKindsRef.current.includes(e.kind)) |
|
|
|
: fetchBatch |
|
|
|
: fetchBatch |
|
|
|
|
|
|
|
|
|
|
|
if ( |
|
|
|
if ( |
|
|
|
useFilterAsIsRef.current && |
|
|
|
narrowLoadMore && |
|
|
|
clientSideKindFilterRef.current && |
|
|
|
|
|
|
|
toAppend.length === 0 && |
|
|
|
toAppend.length === 0 && |
|
|
|
fetchBatch.length > 0 |
|
|
|
fetchBatch.length > 0 |
|
|
|
) { |
|
|
|
) { |
|
|
|
|
