Merge branch 'rust-nostr-v0.43'

1 files changed, 36 insertions, 7 deletions

diff --git a/src/lib/client.rs b/src/lib/client.rs
index 6f28cff..b27f9b1 100644
--- a/src/lib/client.rs
+++ b/src/lib/client.rs
@@ -32,17 +32,22 @@ use mockall::*;
 use nostr::{
     Event,
     event::{TagKind, TagStandard, UnsignedEvent},
-    filter::Alphabet,
-    nips::{nip01::Coordinate, nip19::Nip19Coordinate},
+    filter::{Alphabet, MatchEventOptions},
+    nips::{
+        nip01::Coordinate,
+        nip05::{Nip05Address, Nip05Profile},
+        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,
 };
+use serde_json::Value;
 
 use crate::{
     get_dirs,
@@ -144,12 +149,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 +610,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
@@ -880,6 +889,26 @@ pub async fn fetch_public_key(signer: &Arc<dyn NostrSigner>) -> Result<nostr::Pu
     }
 }
 
+pub async fn nip05_query(nip05_addr: &str) -> Result<Nip05Profile> {
+    let addr_deconstructed = Nip05Address::parse(nip05_addr)
+        .context(format!("cannot parse nip05 address: {nip05_addr}"))?;
+    let json_res: Value = reqwest::Client::new()
+        .get(addr_deconstructed.url().to_string())
+        .send()
+        .await
+        .context(format!(
+            "nip05 server is not responding for address: {nip05_addr}"
+        ))?
+        .json()
+        .await
+        .context(format!(
+            "nip05 server response did not respond with json when querying address: {nip05_addr}"
+        ))?;
+    Nip05Profile::from_json(&addr_deconstructed, &json_res).context(format!(
+        "cannot get public key for nip05 address: {nip05_addr}"
+    ))
+}
+
 fn pb_style() -> Result<ProgressStyle> {
     Ok(
         ProgressStyle::with_template(" {spinner} {prefix} {msg} {timeout_in}")?.with_key(