upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src/client.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/client.rs')
-rw-r--r--src/client.rs11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/client.rs b/src/client.rs
index 539d45a..2dbd238 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -19,7 +19,7 @@ use indicatif::{MultiProgress, ProgressBar, ProgressState, ProgressStyle};
19#[cfg(test)] 19#[cfg(test)]
20use mockall::*; 20use mockall::*;
21use nostr::Event; 21use nostr::Event;
22use nostr_sdk::ClientSigner; 22use nostr_sdk::NostrSigner;
23 23
24#[allow(clippy::struct_field_names)] 24#[allow(clippy::struct_field_names)]
25pub struct Client { 25pub struct Client {
@@ -101,7 +101,7 @@ impl Connect for Client {
101 101
102 async fn set_keys(&mut self, keys: &nostr::Keys) { 102 async fn set_keys(&mut self, keys: &nostr::Keys) {
103 self.client 103 self.client
104 .set_signer(Some(ClientSigner::Keys(keys.clone()))) 104 .set_signer(Some(NostrSigner::Keys(keys.clone())))
105 .await; 105 .await;
106 } 106 }
107 107
@@ -124,8 +124,9 @@ impl Connect for Client {
124 124
125 async fn send_event_to(&self, url: &str, event: Event) -> Result<nostr::EventId> { 125 async fn send_event_to(&self, url: &str, event: Event) -> Result<nostr::EventId> {
126 self.client.add_relay(url).await?; 126 self.client.add_relay(url).await?;
127 #[allow(clippy::large_futures)]
127 self.client.connect_relay(url).await?; 128 self.client.connect_relay(url).await?;
128 Ok(self.client.send_event_to(url, event).await?) 129 Ok(self.client.send_event_to(vec![url], event).await?)
129 } 130 }
130 131
131 async fn get_events( 132 async fn get_events(
@@ -144,7 +145,7 @@ impl Connect for Client {
144 let m = MultiProgress::new(); 145 let m = MultiProgress::new();
145 let pb_style = ProgressStyle::with_template(" {spinner} {prefix} {msg} {timeout_in}")? 146 let pb_style = ProgressStyle::with_template(" {spinner} {prefix} {msg} {timeout_in}")?
146 .with_key("timeout_in", |state: &ProgressState, w: &mut dyn Write| { 147 .with_key("timeout_in", |state: &ProgressState, w: &mut dyn Write| {
147 if state.elapsed().as_secs() > 3 { 148 if state.elapsed().as_secs() > 3 && state.elapsed().as_secs() < GET_EVENTS_TIMEOUT {
148 write!( 149 write!(
149 w, 150 w,
150 "timeout in {:.1}s", 151 "timeout in {:.1}s",
@@ -200,6 +201,7 @@ impl Connect for Client {
200 } else { 201 } else {
201 None 202 None
202 }; 203 };
204 #[allow(clippy::large_futures)]
203 match get_events_of(relay, filters, &pb).await { 205 match get_events_of(relay, filters, &pb).await {
204 Err(error) => { 206 Err(error) => {
205 if let Some(pb) = pb { 207 if let Some(pb) = pb {
@@ -246,6 +248,7 @@ async fn get_events_of(
246 pb: &Option<ProgressBar>, 248 pb: &Option<ProgressBar>,
247) -> Result<Vec<Event>> { 249) -> Result<Vec<Event>> {
248 if !relay.is_connected().await { 250 if !relay.is_connected().await {
251 #[allow(clippy::large_futures)]
249 relay.connect(None).await; 252 relay.connect(None).await;
250 } 253 }
251 254