mirror of
https://github.com/mikedilger/gossip.git
synced 2024-09-29 00:11:01 +00:00
Change global feed to show all volatile events
This commit is contained in:
parent
82acc9bf99
commit
9d9d5d0a65
@ -5,7 +5,6 @@ use crate::comms::{ToMinionMessage, ToMinionPayload, ToMinionPayloadDetail, ToOv
|
||||
use crate::error::{Error, ErrorKind};
|
||||
use crate::globals::GLOBALS;
|
||||
use crate::people::PersonList;
|
||||
use crate::relay::Relay;
|
||||
use dashmap::DashMap;
|
||||
use nostr_types::{Event, EventKind, EventReference, Filter, Id, NAddr, Unixtime};
|
||||
use parking_lot::RwLock;
|
||||
@ -388,22 +387,10 @@ impl Feed {
|
||||
*self.current_feed_events.write() = ids;
|
||||
}
|
||||
FeedKind::Global => {
|
||||
let global_relays = Relay::choose_relay_urls(Relay::GLOBAL, |_| true)?;
|
||||
let filter = {
|
||||
let mut filter = Filter::new();
|
||||
filter.kinds = feed_displayable_event_kinds(false);
|
||||
filter
|
||||
};
|
||||
let events = Self::load_event_range(anchor, filter, true, false, |e| {
|
||||
if let Ok(vec) = GLOBALS.storage.get_event_seen_on_relay(e.id) {
|
||||
vec.iter()
|
||||
.any(|(seen_on_url, _when)| global_relays.contains(seen_on_url))
|
||||
} else {
|
||||
false
|
||||
}
|
||||
})
|
||||
.await?;
|
||||
*self.current_feed_events.write() = events;
|
||||
let dismissed = GLOBALS.dismissed.read().await.clone();
|
||||
let screen = |e: &Event| basic_screen(e, false, false, &dismissed);
|
||||
let events = GLOBALS.storage.load_volatile_events(screen);
|
||||
*self.current_feed_events.write() = events.iter().map(|e| e.id).collect();
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user