upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src/lib/client.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/client.rs')
-rw-r--r--src/lib/client.rs16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/lib/client.rs b/src/lib/client.rs
index 6f28cff..c1e7e69 100644
--- a/src/lib/client.rs
+++ b/src/lib/client.rs
@@ -32,15 +32,15 @@ use mockall::*;
32use nostr::{ 32use nostr::{
33 Event, 33 Event,
34 event::{TagKind, TagStandard, UnsignedEvent}, 34 event::{TagKind, TagStandard, UnsignedEvent},
35 filter::Alphabet, 35 filter::{Alphabet, MatchEventOptions},
36 nips::{nip01::Coordinate, nip19::Nip19Coordinate}, 36 nips::{nip01::Coordinate, nip19::Nip19Coordinate},
37 signer::SignerBackend, 37 signer::SignerBackend,
38}; 38};
39use nostr_database::{NostrEventsDatabase, SaveEventStatus}; 39use nostr_database::{NostrDatabase, SaveEventStatus};
40use nostr_lmdb::NostrLMDB; 40use nostr_lmdb::NostrLMDB;
41use nostr_relay_pool::relay::ReqExitPolicy; 41use nostr_relay_pool::relay::ReqExitPolicy;
42use nostr_sdk::{ 42use nostr_sdk::{
43 EventBuilder, EventId, Kind, NostrSigner, Options, PublicKey, RelayUrl, SingleLetterTag, 43 ClientOptions, EventBuilder, EventId, Kind, NostrSigner, PublicKey, RelayUrl, SingleLetterTag,
44 Timestamp, Url, prelude::RelayLimits, 44 Timestamp, Url, prelude::RelayLimits,
45}; 45};
46 46
@@ -144,12 +144,12 @@ impl Connect for Client {
144 Client { 144 Client {
145 client: if let Some(keys) = opts.keys { 145 client: if let Some(keys) = opts.keys {
146 nostr_sdk::ClientBuilder::new() 146 nostr_sdk::ClientBuilder::new()
147 .opts(Options::new().relay_limits(RelayLimits::disable())) 147 .opts(ClientOptions::new().relay_limits(RelayLimits::disable()))
148 .signer(keys) 148 .signer(keys)
149 .build() 149 .build()
150 } else { 150 } else {
151 nostr_sdk::ClientBuilder::new() 151 nostr_sdk::ClientBuilder::new()
152 .opts(Options::new().relay_limits(RelayLimits::disable())) 152 .opts(ClientOptions::new().relay_limits(RelayLimits::disable()))
153 .build() 153 .build()
154 }, 154 },
155 relay_default_set: opts.relay_default_set, 155 relay_default_set: opts.relay_default_set,
@@ -605,7 +605,11 @@ impl Connect for Client {
605 .await? 605 .await?
606 .iter() 606 .iter()
607 // don't process events that don't match filters 607 // don't process events that don't match filters
608 .filter(|e| filters.iter().any(|f| f.match_event(e))) 608 .filter(|e| {
609 filters
610 .iter()
611 .any(|f| f.match_event(e, MatchEventOptions::default()))
612 })
609 .cloned() 613 .cloned()
610 .collect(); 614 .collect();
611 // TODO: try reconcile 615 // TODO: try reconcile