From d87be4c2ed4de7466cc19111b48bd3e7a2ad6d32 Mon Sep 17 00:00:00 2001 From: Mike Dilger Date: Tue, 23 Jul 2024 04:13:56 +1200 Subject: [PATCH] Fix general feed: loading the right amount of events from relays --- gossip-lib/src/overlord/minion/filter_fns.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gossip-lib/src/overlord/minion/filter_fns.rs b/gossip-lib/src/overlord/minion/filter_fns.rs index c199031d..2158f21d 100644 --- a/gossip-lib/src/overlord/minion/filter_fns.rs +++ b/gossip-lib/src/overlord/minion/filter_fns.rs @@ -34,7 +34,8 @@ pub fn general_feed(authors: &[PublicKey], range: FeedRange) -> Vec { let pkp: Vec = authors.iter().map(|pk| pk.into()).collect(); - let event_kinds = crate::feed::feed_related_event_kinds(false); + // Do not load feed related event kinds, or the limit will be wrong + let event_kinds = crate::feed::feed_displayable_event_kinds(false); let (since, until, limit) = range.since_until_limit(); @@ -127,6 +128,7 @@ pub fn giftwraps(range: FeedRange) -> Vec { pub fn person_feed(pubkey: PublicKey, range: FeedRange) -> Vec { // Allow all feed related event kinds (excluding DMs) + // Do not load feed related or the limit will be wrong let event_kinds = crate::feed::feed_displayable_event_kinds(false); let (since, until, limit) = range.since_until_limit();