Revert "pool: get events only from remote relay when calling Relay::get_events_of"

This reverts commit dcf8485

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

CHANGELOG.md

@@ -33,7 +33,6 @@
 * nostr: ensure that NIP-59 rumor has `EventId` ([Yuki Kishimoto])
 * nostr: update `PartialEvent` methods ([Yuki Kishimoto])
 * nostr: change `EventBuilder::award_badge` fingerprint ([Yuki Kishimoto])
-* pool: get events only from remote relay when calling `Relay::get_events_of` ([Yuki Kishimoto])
 * pool: take mutex ownership instead of clone in `InternalRelayPool::get_events_from` ([Yuki Kishimoto])
 * pool: remove IDs collection from `InternalRelayPool::get_events_from` ([Yuki Kishimoto])
 * pool: better checks before perform queries or send messages to relays ([Yuki Kishimoto])

bindings/nostr-sdk-ffi/src/relay/mod.rs

@@ -332,7 +332,9 @@ impl Relay {
         Ok(self.inner.unsubscribe_all(**opts).await?)
     }
 
-    /// Get events that matches filters from remote relay
+    /// Get events of filters
+    ///
+    /// Get events from local database and relay
     pub async fn get_events_of(
         &self,
         filters: Vec<Arc<Filter>>,

bindings/nostr-sdk-js/src/relay/mod.rs

@@ -261,7 +261,9 @@ impl JsRelay {
         self.inner.unsubscribe_all(**opts).await.map_err(into_err)
     }
 
-    /// Get events that matches filters from remote relay
+    /// Get events of filters
+    ///
+    /// Get events from local database and relay
     #[wasm_bindgen(js_name = getEventsOf)]
     pub async fn get_events_of(
         &self,

crates/nostr-relay-pool/src/relay/internal.rs

@@ -5,7 +5,7 @@
 //! Internal Relay
 
 use std::cmp;
-use std::collections::{HashMap, HashSet};
+use std::collections::{BTreeSet, HashMap, HashSet};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
@@ -24,7 +24,7 @@ use nostr::{
     ClientMessage, Event, EventId, Filter, JsonUtil, Keys, Kind, MissingPartialEvent, PartialEvent,
     RawRelayMessage, RelayMessage, SubscriptionId, Timestamp, Url,
 };
-use nostr_database::DynNostrDatabase;
+use nostr_database::{DynNostrDatabase, Order};
 use tokio::sync::mpsc::{self, Receiver, Sender};
 use tokio::sync::{broadcast, oneshot, watch, Mutex, MutexGuard, RwLock};
 
@@ -1595,13 +1595,18 @@ impl InternalRelay {
         timeout: Duration,
         opts: FilterOptions,
     ) -> Result<Vec<Event>, Error> {
-        let events: Mutex<Vec<Event>> = Mutex::new(Vec::new());
+        let stored_events: Vec<Event> = self
+            .database
+            .query(filters.clone(), Order::Desc)
+            .await
+            .unwrap_or_default();
+        let events: Mutex<BTreeSet<Event>> = Mutex::new(stored_events.into_iter().collect());
         self.get_events_of_with_callback(filters, timeout, opts, |event| async {
             let mut events = events.lock().await;
-            events.push(event);
+            events.insert(event);
         })
         .await?;
-        Ok(events.into_inner())
+        Ok(events.into_inner().into_iter().rev().collect())
     }
 
     pub async fn count_events_of(

crates/nostr-relay-pool/src/relay/mod.rs

@@ -376,7 +376,9 @@ impl Relay {
             .await
     }
 
-    /// Get events that matches filters from remote relay
+    /// Get events of filters
+    ///
+    /// Get events from local database and relay
     #[inline]
     pub async fn get_events_of(
         &self,