From 9d9d5d0a6583d68da2180e63f23e657c56e56e11 Mon Sep 17 00:00:00 2001
From: Mike Dilger <mike@mikedilger.com>
Date: Fri, 9 Aug 2024 13:15:48 +1200
Subject: [PATCH] Change global feed to show all volatile events

---
 gossip-lib/src/feed/mod.rs | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/gossip-lib/src/feed/mod.rs b/gossip-lib/src/feed/mod.rs
index 6b9e8953..7bda0c65 100644
--- a/gossip-lib/src/feed/mod.rs
+++ b/gossip-lib/src/feed/mod.rs
@@ -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();
             }
         }