From 8fe7737a491d6056d6e865bfdecd02e3dda3e8f5 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Thu, 31 Jul 2025 12:02:08 +0100
Subject: chore: bump rust-nostr v0.43

with trival breaking changes. nip05 changes will
be done seperately.
---
 src/lib/client.rs        | 16 ++++++++++------
 src/lib/git/nostr_url.rs |  1 +
 src/lib/login/fresh.rs   |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'src')

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::*;
 use nostr::{
     Event,
     event::{TagKind, TagStandard, UnsignedEvent},
-    filter::Alphabet,
+    filter::{Alphabet, MatchEventOptions},
     nips::{nip01::Coordinate, nip19::Nip19Coordinate},
     signer::SignerBackend,
 };
-use nostr_database::{NostrEventsDatabase, SaveEventStatus};
+use nostr_database::{NostrDatabase, SaveEventStatus};
 use nostr_lmdb::NostrLMDB;
 use nostr_relay_pool::relay::ReqExitPolicy;
 use nostr_sdk::{
-    EventBuilder, EventId, Kind, NostrSigner, Options, PublicKey, RelayUrl, SingleLetterTag,
+    ClientOptions, EventBuilder, EventId, Kind, NostrSigner, PublicKey, RelayUrl, SingleLetterTag,
     Timestamp, Url, prelude::RelayLimits,
 };
 
@@ -144,12 +144,12 @@ impl Connect for Client {
         Client {
             client: if let Some(keys) = opts.keys {
                 nostr_sdk::ClientBuilder::new()
-                    .opts(Options::new().relay_limits(RelayLimits::disable()))
+                    .opts(ClientOptions::new().relay_limits(RelayLimits::disable()))
                     .signer(keys)
                     .build()
             } else {
                 nostr_sdk::ClientBuilder::new()
-                    .opts(Options::new().relay_limits(RelayLimits::disable()))
+                    .opts(ClientOptions::new().relay_limits(RelayLimits::disable()))
                     .build()
             },
             relay_default_set: opts.relay_default_set,
@@ -605,7 +605,11 @@ impl Connect for Client {
                 .await?
                 .iter()
                 // don't process events that don't match filters
-                .filter(|e| filters.iter().any(|f| f.match_event(e)))
+                .filter(|e| {
+                    filters
+                        .iter()
+                        .any(|f| f.match_event(e, MatchEventOptions::default()))
+                })
                 .cloned()
                 .collect();
             // TODO: try reconcile
diff --git a/src/lib/git/nostr_url.rs b/src/lib/git/nostr_url.rs
index e9b482f..8abf3f7 100644
--- a/src/lib/git/nostr_url.rs
+++ b/src/lib/git/nostr_url.rs
@@ -206,6 +206,7 @@ impl NostrUrlDecoded {
                             if s.len() == 2 { s[1] } else { s[0] }
                         };
                         term.write_line(&format!("fetching pubic key info from {domain}..."))?;
+                        // TODO we now need to implement our own wrapper for this
                         let res = nip05::profile(npub_or_nip05, None).await.context(format!(
                             "failed to get nostr public key for {npub_or_nip05} from {domain}"
                         ))?;
diff --git a/src/lib/login/fresh.rs b/src/lib/login/fresh.rs
index 358045a..aec8df5 100644
--- a/src/lib/login/fresh.rs
+++ b/src/lib/login/fresh.rs
@@ -384,6 +384,7 @@ pub fn generate_nostr_connect_app(
 pub async fn fetch_nip46_uri_from_nip05(nip05: &str) -> Result<NostrConnectURI> {
     let term = console::Term::stderr();
     term.write_line("contacting login service provider...")?;
+    // TODO we now need to implement our own wrapper for this
     let res = nip05::profile(&nip05, None).await;
     term.clear_last_lines(1)?;
     match res {
-- 
cgit v1.2.3