wip: update nostr sdk

crates/coop/src/dialogs/screening.rs

@@ -1,6 +1,7 @@
+use std::collections::HashMap;
 use std::time::Duration;
 
-use anyhow::Error;
+use anyhow::{Context as AnyhowContext, Error};
 use common::{shorten_pubkey, RenderedProfile, RenderedTimestamp, BOOTSTRAP_RELAYS};
 use gpui::prelude::FluentBuilder;
 use gpui::{
@@ -45,7 +46,7 @@ impl Screening {
         let contact_check: Task<Result<(bool, Vec<Profile>), Error>> = cx.background_spawn({
             let client = nostr.read(cx).client();
             async move {
-                let signer = client.signer().await?;
+                let signer = client.signer().context("Signer not found")?;
                 let signer_pubkey = signer.get_public_key().await?;
 
                 // Check if user is in contact list
@@ -74,8 +75,15 @@ impl Screening {
             let filter = Filter::new().author(public_key).limit(1);
             let mut activity: Option<Timestamp> = None;
 
+            // Construct target for subscription
+            let target = BOOTSTRAP_RELAYS
+                .into_iter()
+                .map(|relay| (relay, vec![filter.clone()]))
+                .collect::<HashMap<_, _>>();
+
             if let Ok(mut stream) = client
-                .stream_events_from(BOOTSTRAP_RELAYS, filter, Duration::from_secs(2))
+                .stream_events(target)
+                .timeout(Duration::from_secs(2))
                 .await
             {
                 while let Some((_url, event)) = stream.next().await {
@@ -162,12 +170,12 @@ impl Screening {
         let public_key = self.profile.public_key();
 
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
-            let signer = client.signer().await?;
             let tag = Tag::public_key_report(public_key, Report::Impersonation);
-            let event = EventBuilder::report(vec![tag], "").sign(&signer).await?;
+            let builder = EventBuilder::report(vec![tag], "");
+            let event = client.sign_event_builder(builder).await?;
 
             // Send the report to the public relays
-            client.send_event_to(BOOTSTRAP_RELAYS, &event).await?;
+            client.send_event(&event).to(BOOTSTRAP_RELAYS).await?;
 
             Ok(())
         });

crates/coop/src/panels/messaging_relays.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 use std::time::Duration;
 
-use anyhow::{anyhow, Error};
+use anyhow::{anyhow, Context as AnyhowContext, Error};
 use dock::panel::{Panel, PanelEvent};
 use gpui::prelude::FluentBuilder;
 use gpui::{
@@ -89,7 +89,7 @@ impl MessagingRelayPanel {
     }
 
     async fn load(client: &Client) -> Result<Vec<RelayUrl>, Error> {
-        let signer = client.signer().await?;
+        let signer = client.signer().context("Signer not found")?;
         let public_key = signer.get_public_key().await?;
 
         let filter = Filter::new()
@@ -162,20 +162,17 @@ impl MessagingRelayPanel {
 
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
             let urls = write_relays.await;
-            let signer = client.signer().await?;
 
             let tags: Vec<Tag> = relays
                 .iter()
                 .map(|relay| Tag::relay(relay.clone()))
                 .collect();
 
-            let event = EventBuilder::new(Kind::InboxRelays, "")
-                .tags(tags)
-                .sign(&signer)
-                .await?;
+            let builder = EventBuilder::new(Kind::InboxRelays, "").tags(tags);
+            let event = client.sign_event_builder(builder).await?;
 
             // Set messaging relays
-            client.send_event_to(urls, &event).await?;
+            client.send_event(&event).to(urls).await?;
 
             // Connect to messaging relays
             for relay in relays.iter() {

crates/coop/src/panels/relay_list.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 use std::time::Duration;
 
-use anyhow::{anyhow, Error};
+use anyhow::{anyhow, Context as AnyhowContext, Error};
 use common::BOOTSTRAP_RELAYS;
 use dock::panel::{Panel, PanelEvent};
 use gpui::prelude::FluentBuilder;
@@ -96,7 +96,7 @@ impl RelayListPanel {
     }
 
     async fn load(client: &Client) -> Result<Vec<(RelayUrl, Option<RelayMetadata>)>, Error> {
-        let signer = client.signer().await?;
+        let signer = client.signer().context("Signer not found")?;
         let public_key = signer.get_public_key().await?;
 
         let filter = Filter::new()
@@ -167,11 +167,11 @@ impl RelayListPanel {
         let relays = self.relays.clone();
 
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
-            let signer = client.signer().await?;
-            let event = EventBuilder::relay_list(relays).sign(&signer).await?;
+            let builder = EventBuilder::relay_list(relays);
+            let event = client.sign_event_builder(builder).await?;
 
             // Set relay list for current user
-            client.send_event_to(BOOTSTRAP_RELAYS, &event).await?;
+            client.send_event(&event).to(BOOTSTRAP_RELAYS).await?;
 
             Ok(())
         });