From 07a6b27eacc9cb80b0858ae8d7042287567ea790 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Fri, 22 Mar 2024 15:51:28 +0000
Subject: ClientSigner renamed ~> NostrSigner

to reflect new name in rust-nostr
---
 src/client.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/client.rs')

diff --git a/src/client.rs b/src/client.rs
index 539d45a..7eaa322 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -19,7 +19,7 @@ use indicatif::{MultiProgress, ProgressBar, ProgressState, ProgressStyle};
 #[cfg(test)]
 use mockall::*;
 use nostr::Event;
-use nostr_sdk::ClientSigner;
+use nostr_sdk::NostrSigner;
 
 #[allow(clippy::struct_field_names)]
 pub struct Client {
@@ -101,7 +101,7 @@ impl Connect for Client {
 
     async fn set_keys(&mut self, keys: &nostr::Keys) {
         self.client
-            .set_signer(Some(ClientSigner::Keys(keys.clone())))
+            .set_signer(Some(NostrSigner::Keys(keys.clone())))
             .await;
     }
 
@@ -125,7 +125,7 @@ impl Connect for Client {
     async fn send_event_to(&self, url: &str, event: Event) -> Result<nostr::EventId> {
         self.client.add_relay(url).await?;
         self.client.connect_relay(url).await?;
-        Ok(self.client.send_event_to(url, event).await?)
+        Ok(self.client.send_event_to(vec![url], event).await?)
     }
 
     async fn get_events(
-- 
cgit v1.2.3


From 04a8bce2c58dfb697410ae9bb83ab6abbf95406a Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Mon, 25 Mar 2024 09:47:04 +0000
Subject: fix: relay connection timeout panic

upgrade from rust-nostr v0.27 ~> v0.28 introduces this panic

presumably get_events attempted to write to the MultiProgress
just after it has been removed
---
 src/client.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/client.rs')

diff --git a/src/client.rs b/src/client.rs
index 7eaa322..e271a9f 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -144,7 +144,7 @@ impl Connect for Client {
         let m = MultiProgress::new();
         let pb_style = ProgressStyle::with_template(" {spinner} {prefix} {msg} {timeout_in}")?
             .with_key("timeout_in", |state: &ProgressState, w: &mut dyn Write| {
-                if state.elapsed().as_secs() > 3 {
+                if state.elapsed().as_secs() > 3 && state.elapsed().as_secs() < GET_EVENTS_TIMEOUT {
                     write!(
                         w,
                         "timeout in {:.1}s",
-- 
cgit v1.2.3


From 4171733090d25732029a149cf0976c6b1103d0ea Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Thu, 28 Mar 2024 08:30:57 +0000
Subject: refactor: allow pedantic clippy warning large_futures

rust-nostr author suggested this might be a false positive
https://github.com/rust-nostr/nostr/pull/375#issuecomment-2022245832
---
 src/client.rs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/client.rs')

diff --git a/src/client.rs b/src/client.rs
index e271a9f..2dbd238 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -124,6 +124,7 @@ impl Connect for Client {
 
     async fn send_event_to(&self, url: &str, event: Event) -> Result<nostr::EventId> {
         self.client.add_relay(url).await?;
+        #[allow(clippy::large_futures)]
         self.client.connect_relay(url).await?;
         Ok(self.client.send_event_to(vec![url], event).await?)
     }
@@ -200,6 +201,7 @@ impl Connect for Client {
                 } else {
                     None
                 };
+                #[allow(clippy::large_futures)]
                 match get_events_of(relay, filters, &pb).await {
                     Err(error) => {
                         if let Some(pb) = pb {
@@ -246,6 +248,7 @@ async fn get_events_of(
     pb: &Option<ProgressBar>,
 ) -> Result<Vec<Event>> {
     if !relay.is_connected().await {
+        #[allow(clippy::large_futures)]
         relay.connect(None).await;
     }
 
-- 
cgit v1.2.3