nostr: add NIP-50 support to Filter::match_event method

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

Author: yukibtc

CHANGELOG.md

@@ -33,6 +33,7 @@
 * nostr: ensure that NIP-59 rumor has `EventId` ([Yuki Kishimoto])
 * nostr: update `PartialEvent` methods ([Yuki Kishimoto])
 * nostr: change `EventBuilder::award_badge` fingerprint ([Yuki Kishimoto])
+* nostr: add NIP-50 support to `Filter::match_event` method ([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-ffi/src/types/filter.rs

@@ -406,8 +406,7 @@ impl Filter {
     }
 
     /// Determine if `Filter` match given `Event`.
-    ///
-    /// The `search` filed is not supported yet!
+    #[inline]
     pub fn match_event(&self, event: &Event) -> bool {
         self.inner.match_event(event.deref())
     }

bindings/nostr-js/src/types/filter.rs

@@ -449,8 +449,7 @@ impl JsFilter {
     }
 
     /// Determine if `Filter` match given `Event`.
-    ///
-    /// The `search` filed is not supported yet!
+    #[inline]
     #[wasm_bindgen(js_name = matchEvent)]
     pub fn match_event(&self, event: &JsEvent) -> bool {
         self.inner.match_event(event.deref())

crates/nostr/src/types/filter.rs

@@ -745,9 +745,18 @@ impl Filter {
         })
     }
 
+    #[inline]
+    fn search_match(&self, event: &Event) -> bool {
+        match &self.search {
+            Some(query) => event
+                .content
+                .split_whitespace()
+                .any(|word| word.eq_ignore_ascii_case(query)),
+            None => true,
+        }
+    }
+
     /// Determine if [Filter] match given [Event].
-    ///
-    /// The `search` field is not supported yet!
     #[inline]
     pub fn match_event(&self, event: &Event) -> bool {
         self.ids_match(event)
@@ -756,6 +765,7 @@ impl Filter {
             && self.since.map_or(true, |t| event.created_at >= t)
             && self.until.map_or(true, |t| event.created_at <= t)
             && self.tag_match(event)
+            && self.search_match(event)
     }
 }
 
@@ -1109,6 +1119,10 @@ mod tests {
         let filter: Filter = Filter::new().hashtag("this-should-not-match");
         assert!(!filter.match_event(&event));
         assert!(!filter.match_event(&event_with_empty_tags));
+
+        // Test match search
+        let filter: Filter = Filter::new().search("test").into();
+        assert!(filter.match_event(&event));
     }
 }