wip: update nostr sdk

crates/chat/src/lib.rs

@@ -195,8 +195,8 @@ impl ChatRegistry {
             let mut notifications = client.notifications();
             let mut processed_events = HashSet::new();
 
-            while let Ok(notification) = notifications.recv().await {
-                let RelayPoolNotification::Message { message, .. } = notification else {
+            while let Some(notification) = notifications.next().await {
+                let ClientNotification::Message { message, .. } = notification else {
                     // Skip non-message notifications
                     continue;
                 };
@@ -432,7 +432,7 @@ impl ChatRegistry {
         let client = nostr.read(cx).client();
 
         cx.background_spawn(async move {
-            let signer = client.signer().await?;
+            let signer = client.signer().context("Signer not found")?;
             let public_key = signer.get_public_key().await?;
             let contacts = client.database().contacts_public_keys(public_key).await?;
 
@@ -597,8 +597,8 @@ impl ChatRegistry {
         };
 
         // Try with the user's signer
-        let user_signer = client.signer().await?;
-        let unwrapped = UnwrappedGift::from_gift_wrap(&user_signer, gift_wrap).await?;
+        let user_signer = client.signer().context("Signer not found")?;
+        let unwrapped = UnwrappedGift::from_gift_wrap(user_signer, gift_wrap).await?;
 
         Ok(unwrapped)
     }

crates/chat/src/room.rs

@@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet};
 use std::hash::{Hash, Hasher};
 use std::time::Duration;
 
-use anyhow::Error;
+use anyhow::{Context as AnyhowContext, Error};
 use common::EventUtils;
 use gpui::{App, AppContext, Context, EventEmitter, SharedString, Task};
 use itertools::Itertools;
@@ -325,7 +325,7 @@ impl Room {
         let id = SubscriptionId::new(format!("room-{}", self.id));
 
         cx.background_spawn(async move {
-            let signer = client.signer().await?;
+            let signer = client.signer().context("Signer not found")?;
             let public_key = signer.get_public_key().await?;
 
             // Subscription options
@@ -343,7 +343,9 @@ impl Room {
 
                 // Subscribe to get member's gossip relays
                 client
-                    .subscribe_with_id(id.clone(), filter, Some(opts))
+                    .subscribe(filter)
+                    .close_on(opts)
+                    .with_id(id.clone())
                     .await?;
             }
 
@@ -458,7 +460,7 @@ impl Room {
         let task = self.members_with_relays(cx);
 
         cx.background_spawn(async move {
-            let signer = client.signer().await?;
+            let signer = client.signer().context("Signer not found")?;
             let current_user_relays = current_user_relays.await;
             let mut members = task.await;
 
@@ -484,10 +486,10 @@ impl Room {
 
                 // Construct the gift wrap event
                 let event =
-                    EventBuilder::gift_wrap(&signer, &receiver, rumor.clone(), vec![]).await?;
+                    EventBuilder::gift_wrap(signer, &receiver, rumor.clone(), vec![]).await?;
 
                 // Send the gift wrap event to the messaging relays
-                match client.send_event_to(relays, &event).await {
+                match client.send_event(&event).to(&relays).await {
                     Ok(output) => {
                         let id = output.id().to_owned();
                         let auth = output.failed.iter().any(|(_, s)| s.starts_with("auth-"));
@@ -525,7 +527,7 @@ impl Room {
 
             // Construct the gift-wrapped event
             let event =
-                EventBuilder::gift_wrap(&signer, &current_user, rumor.clone(), vec![]).await?;
+                EventBuilder::gift_wrap(signer, &current_user, rumor.clone(), vec![]).await?;
 
             // Only send a backup message to current user if sent successfully to others
             if reports.iter().all(|r| r.is_sent_success()) {
@@ -580,7 +582,7 @@ impl Room {
 
                     if let Some(event) = client.database().event_by_id(id).await? {
                         for url in urls.into_iter() {
-                            let relay = client.pool().relay(url).await?;
+                            let relay = client.relay(url).await?.context("Relay not found")?;
                             let id = relay.send_event(&event).await?;
 
                             let resent: Output<EventId> = Output {