pool: fix Event notification variant sent also for events sent by the SDK

Closes #508

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

Author: yukibtc

CHANGELOG.md

@@ -60,6 +60,7 @@
 
 ### Fixed
 
+* pool: fix `Event` notification variant sent also for events sent by the SDK ([Yuki Kishimoto])
 * database: fix indexes `QueryPattern` ([Yuki Kishimoto])
 
 ### Removed

crates/nostr-database/src/memory.rs

@@ -79,15 +79,21 @@ impl MemoryDatabase {
         &self,
         seen_event_ids: &mut LruCache<EventId, HashSet<Url>>,
         event_id: EventId,
-        relay_url: Url,
+        relay_url: Option<Url>,
     ) {
         match seen_event_ids.get_mut(&event_id) {
             Some(set) => {
-                set.insert(relay_url);
+                if let Some(url) = relay_url {
+                    set.insert(url);
+                }
             }
             None => {
-                let mut set = HashSet::with_capacity(1);
-                set.insert(relay_url);
+                let mut set: HashSet<Url> = HashSet::new();
+
+                if let Some(url) = relay_url {
+                    set.insert(url);
+                }
+
                 seen_event_ids.put(event_id, set);
             }
         }
@@ -125,6 +131,10 @@ impl NostrDatabase for MemoryDatabase {
                 Ok(false)
             }
         } else {
+            // Mark it as seen
+            let mut seen_event_ids = self.seen_event_ids.lock().await;
+            self._event_id_seen(&mut seen_event_ids, event.id(), None);
+
             Ok(false)
         }
     }
@@ -178,7 +188,7 @@ impl NostrDatabase for MemoryDatabase {
 
     async fn event_id_seen(&self, event_id: EventId, relay_url: Url) -> Result<(), Self::Err> {
         let mut seen_event_ids = self.seen_event_ids.lock().await;
-        self._event_id_seen(&mut seen_event_ids, event_id, relay_url);
+        self._event_id_seen(&mut seen_event_ids, event_id, Some(relay_url));
         Ok(())
     }
 

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

@@ -1024,25 +1024,25 @@ impl InternalRelay {
                     return Err(Error::EventExpired);
                 }
 
-                // Check if saved
-                if !saved {
-                    // Verify event
+                // Verify event
+                if !seen && !saved {
                     event.verify()?;
+                }
 
-                    // Save event
+                // Save event
+                if !saved {
                     self.database.save_event(&event).await?;
                 }
 
                 // Box event
-                let event: Box<Event> = Box::new(event);
+                let boxed_event: Box<Event> = Box::new(event);
 
-                // Check if seen
-                if !seen {
-                    // Send notification
+                // Send notification
+                if !seen && !saved {
                     self.send_notification(
                         RelayNotification::Event {
                             subscription_id: SubscriptionId::new(&subscription_id),
-                            event: event.clone(),
+                            event: boxed_event.clone(),
                         },
                         true,
                     )
@@ -1051,7 +1051,7 @@ impl InternalRelay {
 
                 Ok(Some(RelayMessage::Event {
                     subscription_id: SubscriptionId::new(subscription_id),
-                    event,
+                    event: boxed_event,
                 }))
             }
             m => Ok(Some(RelayMessage::try_from(m)?)),