Merge branch 'rust-nostr-v0.43'

4 files changed, 74 insertions, 18 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(
diff --git a/src/lib/git/nostr_url.rs b/src/lib/git/nostr_url.rs
index e9b482f..5e92a84 100644
--- a/src/lib/git/nostr_url.rs
+++ b/src/lib/git/nostr_url.rs
@@ -2,10 +2,11 @@ use core::fmt;
 use std::{collections::HashMap, str::FromStr};
 
 use anyhow::{Context, Error, Result, anyhow, bail};
-use nostr::nips::{nip01::Coordinate, nip05, nip19::Nip19Coordinate};
+use nostr::nips::{nip01::Coordinate, nip19::Nip19Coordinate};
 use nostr_sdk::{FromBech32, PublicKey, RelayUrl, ToBech32, Url};
 
 use super::{Repo, get_git_config_item, save_git_config_item};
+use crate::client::nip05_query;
 
 #[derive(Debug, PartialEq, Default, Clone)]
 pub enum ServerProtocol {
@@ -206,7 +207,7 @@ impl NostrUrlDecoded {
                             if s.len() == 2 { s[1] } else { s[0] }
                         };
                         term.write_line(&format!("fetching pubic key info from {domain}..."))?;
-                        let res = nip05::profile(npub_or_nip05, None).await.context(format!(
+                        let res = nip05_query(npub_or_nip05).await.context(format!(
                             "failed to get nostr public key for {npub_or_nip05} from {domain}"
                         ))?;
                         term.clear_last_lines(1)?;
diff --git a/src/lib/git_events.rs b/src/lib/git_events.rs
index 2e1f215..79f5772 100644
--- a/src/lib/git_events.rs
+++ b/src/lib/git_events.rs
@@ -184,7 +184,7 @@ pub async fn generate_patch_event(
                         event_tag_from_nip19_or_hex(
                             &event_ref,
                             "proposal",
-                            Marker::Reply,
+                            EventRefType::Reply,
                             false,
                             false,
                         )?,
@@ -277,10 +277,17 @@ pub async fn generate_patch_event(
     .context("failed to sign event")
 }
 
+#[derive(Debug, PartialEq)]
+pub enum EventRefType {
+    Root,
+    Reply,
+    Quote,
+}
+
 pub fn event_tag_from_nip19_or_hex(
     reference: &str,
     reference_name: &str,
-    marker: Marker,
+    ref_type: EventRefType,
     allow_npub_reference: bool,
     prompt_for_correction: bool,
 ) -> Result<nostr::Tag> {
@@ -291,22 +298,41 @@ pub fn event_tag_from_nip19_or_hex(
                 PromptInputParms::default().with_prompt(format!("{reference_name} reference")),
             )?;
         }
+        let marker = match ref_type {
+            EventRefType::Root => Some(Marker::Root),
+            EventRefType::Reply => Some(Marker::Reply),
+            EventRefType::Quote => None,
+        };
         if let Ok(nip19) = Nip19::from_bech32(&bech32) {
             match nip19 {
                 Nip19::Event(n) => {
+                    if ref_type == EventRefType::Quote {
+                        break Ok(Tag::from_standardized(nostr_sdk::TagStandard::Quote {
+                            event_id: n.event_id,
+                            relay_url: n.relays.first().cloned(),
+                            public_key: None,
+                        }));
+                    }
                     break Ok(Tag::from_standardized(nostr_sdk::TagStandard::Event {
                         event_id: n.event_id,
                         relay_url: n.relays.first().cloned(),
-                        marker: Some(marker),
+                        marker,
                         public_key: None,
                         uppercase: false,
                     }));
                 }
                 Nip19::EventId(id) => {
+                    if ref_type == EventRefType::Quote {
+                        break Ok(Tag::from_standardized(nostr_sdk::TagStandard::Quote {
+                            event_id: id,
+                            relay_url: None,
+                            public_key: None,
+                        }));
+                    }
                     break Ok(Tag::from_standardized(nostr_sdk::TagStandard::Event {
                         event_id: id,
                         relay_url: None,
-                        marker: Some(marker),
+                        marker,
                         public_key: None,
                         uppercase: false,
                     }));
@@ -335,7 +361,7 @@ pub fn event_tag_from_nip19_or_hex(
             break Ok(Tag::from_standardized(nostr_sdk::TagStandard::Event {
                 event_id: id,
                 relay_url: None,
-                marker: Some(marker),
+                marker,
                 public_key: None,
                 uppercase: false,
             }));
@@ -574,7 +600,7 @@ pub async fn generate_cover_letter_and_patch_events(
                     Tag::hashtag("root"),
                     Tag::hashtag("revision-root"),
                     // TODO check if id is for a root proposal (perhaps its for an issue?)
-                    event_tag_from_nip19_or_hex(&event_ref,"proposal",Marker::Reply, false, false)?,
+                    event_tag_from_nip19_or_hex(&event_ref,"proposal",EventRefType::Reply, false, false)?,
                 ]
             } else {
                 vec![
diff --git a/src/lib/login/fresh.rs b/src/lib/login/fresh.rs
index 358045a..a9cf845 100644
--- a/src/lib/login/fresh.rs
+++ b/src/lib/login/fresh.rs
@@ -3,7 +3,7 @@ use std::{str::FromStr, sync::Arc, time::Duration};
 use anyhow::{Context, Result, bail};
 use console::Style;
 use dialoguer::theme::{ColorfulTheme, Theme};
-use nostr::nips::{nip05, nip46::NostrConnectURI};
+use nostr::nips::nip46::NostrConnectURI;
 use nostr_connect::client::NostrConnect;
 use nostr_sdk::{EventBuilder, Keys, Metadata, NostrSigner, PublicKey, RelayUrl, ToBech32};
 use qrcode::QrCode;
@@ -25,7 +25,7 @@ use crate::{
         Interactor, InteractorPrompt, Printer, PromptChoiceParms, PromptConfirmParms,
         PromptInputParms, PromptPasswordParms,
     },
-    client::{Connect, send_events},
+    client::{Connect, nip05_query, send_events},
     git::{Repo, RepoActions, remove_git_config_item, save_git_config_item},
 };
 
@@ -384,7 +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...")?;
-    let res = nip05::profile(&nip05, None).await;
+    let res = nip05_query(nip05).await;
     term.clear_last_lines(1)?;
     match res {
         Ok(profile) => {