From 0762d44a9ec3d8a5477e171933428cd9749e0659 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Mon, 22 Jul 2024 15:26:44 +0100
Subject: chore: bump rust-nostr to v0.33.0

bump all rust-nostr packages

move from using patched nip46 nip05 function to profile function in v33

fix send_events_to error message
---
 src/client.rs            |  9 ++++++++-
 src/login.rs             | 12 ++++++------
 src/sub_commands/send.rs |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/client.rs b/src/client.rs
index 880cb6b..29d390f 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -204,11 +204,18 @@ impl Connect for Client {
         #[allow(clippy::large_futures)]
         self.client.connect_relay(url).await?;
         let res = self.client.send_event_to(vec![url], event.clone()).await?;
+        if let Some(err) = res.failed.get(&Url::parse(url)?) {
+            bail!(if let Some(err) = err {
+                err.to_string()
+            } else {
+                "error: unknown".to_string()
+            });
+        }
         save_event_in_cache(git_repo_path, &event).await?;
         if event.kind().eq(&Kind::Custom(REPO_REF_KIND)) {
             save_event_in_global_cache(git_repo_path, &event).await?;
         }
-        Ok(res)
+        Ok(event.id())
     }
 
     async fn get_events(
diff --git a/src/login.rs b/src/login.rs
index 9c7ca78..be358de 100644
--- a/src/login.rs
+++ b/src/login.rs
@@ -2,7 +2,7 @@ use std::{collections::HashSet, path::Path, str::FromStr, time::Duration};
 
 use anyhow::{bail, Context, Result};
 use nostr::{
-    nips::{nip05::get_nip46, nip46::NostrConnectURI},
+    nips::{nip05, nip46::NostrConnectURI},
     PublicKey,
 };
 use nostr_sdk::{
@@ -404,17 +404,17 @@ async fn fresh_login(
 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 = get_nip46(&nip05, None).await;
+    let res = nip05::profile(&nip05, None).await;
     term.clear_last_lines(1)?;
     match res {
-        Ok((signer_public_key, relays)) => {
-            if relays.is_empty() {
+        Ok(profile) => {
+            if profile.nip46.is_empty() {
                 println!("nip05 provider isn't configured for remote login");
                 bail!("nip05 provider isn't configured for remote login")
             }
             Ok(NostrConnectURI::Bunker {
-                signer_public_key,
-                relays,
+                signer_public_key: profile.public_key,
+                relays: profile.nip46,
                 secret: None,
             })
         }
diff --git a/src/sub_commands/send.rs b/src/sub_commands/send.rs
index 95d3eb0..33ce104 100644
--- a/src/sub_commands/send.rs
+++ b/src/sub_commands/send.rs
@@ -405,7 +405,7 @@ pub async fn send_events(
                         console::style(
                             e.to_string()
                                 .replace("relay pool error:", "error:")
-                                .replace("event not published: ", ""),
+                                .replace("event not published: ", "error: "),
                         )
                         .for_stderr()
                         .red()
-- 
cgit v1.2.3