ffi(nostr-sdk): add Client::send_event_builder

Author: yukibtc

bindings/nostr-sdk-ffi/src/client/mod.rs

@@ -9,7 +9,8 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use nostr_ffi::{
-    ClientMessage, Event, EventId, FileMetadata, Filter, Metadata, PublicKey, RelayMessage,
+    ClientMessage, Event, EventBuilder, EventId, FileMetadata, Filter, Metadata, PublicKey,
+    RelayMessage,
 };
 use nostr_sdk::client::blocking::Client as ClientSdk;
 use nostr_sdk::relay::RelayPoolNotification as RelayPoolNotificationSdk;
@@ -174,14 +175,10 @@ impl Client {
         Ok(self.inner.send_msg(msg.into())?)
     }
 
-    // TODO: add send_msg_with_custom_wait
-
     pub fn send_msg_to(&self, url: String, msg: ClientMessage) -> Result<()> {
         Ok(self.inner.send_msg_to(url, msg.into())?)
     }
 
-    // TODO: add send_msg_to_with_custom_wait
-
     pub fn send_event(&self, event: Arc<Event>) -> Result<Arc<EventId>> {
         Ok(Arc::new(
             self.inner
@@ -190,8 +187,6 @@ impl Client {
         ))
     }
 
-    // TODO: add send_event_with_custom_wait
-
     pub fn send_event_to(&self, url: String, event: Arc<Event>) -> Result<Arc<EventId>> {
         Ok(Arc::new(
             self.inner
@@ -200,7 +195,31 @@ impl Client {
         ))
     }
 
-    // TODO: add send_event_to_with_custom_wait
+    /// Take an [`EventBuilder`], sign it by using the [`ClientSigner`] and broadcast to all relays.
+    ///
+    /// Rise an error if the [`ClientSigner`] is not set.
+    pub fn send_event_builder(&self, builder: Arc<EventBuilder>) -> Result<Arc<EventId>> {
+        Ok(Arc::new(
+            self.inner
+                .send_event_builder(builder.as_ref().deref().clone())?
+                .into(),
+        ))
+    }
+
+    /// Take an [`EventBuilder`], sign it by using the [`ClientSigner`] and broadcast to specific relays.
+    ///
+    /// Rise an error if the [`ClientSigner`] is not set.
+    pub fn send_event_builder_to(
+        &self,
+        url: String,
+        builder: Arc<EventBuilder>,
+    ) -> Result<Arc<EventId>> {
+        Ok(Arc::new(
+            self.inner
+                .send_event_builder_to(url, builder.as_ref().deref().clone())?
+                .into(),
+        ))
+    }
 
     pub fn set_metadata(&self, metadata: Arc<Metadata>) -> Result<Arc<EventId>> {
         Ok(Arc::new(

crates/nostr-sdk/src/client/blocking.rs

@@ -11,7 +11,9 @@ use std::time::Duration;
 use nostr::key::XOnlyPublicKey;
 use nostr::nips::nip94::FileMetadata;
 use nostr::url::Url;
-use nostr::{ClientMessage, Contact, Event, EventId, Filter, Keys, Metadata, Result, Tag};
+use nostr::{
+    ClientMessage, Contact, Event, EventBuilder, EventId, Filter, Keys, Metadata, Result, Tag,
+};
 use nostr_database::DynNostrDatabase;
 use tokio::sync::broadcast;
 
@@ -241,6 +243,18 @@ impl Client {
         RUNTIME.block_on(async { self.client.send_event_to(url, event).await })
     }
 
+    pub fn send_event_builder(&self, builder: EventBuilder) -> Result<EventId, Error> {
+        RUNTIME.block_on(async { self.client.send_event_builder(builder).await })
+    }
+
+    pub fn send_event_builder_to<U>(&self, url: U, builder: EventBuilder) -> Result<EventId, Error>
+    where
+        U: TryIntoUrl,
+        pool::Error: From<<U as TryIntoUrl>::Err>,
+    {
+        RUNTIME.block_on(async { self.client.send_event_builder_to(url, builder).await })
+    }
+
     pub fn set_metadata(&self, metadata: &Metadata) -> Result<EventId, Error> {
         RUNTIME.block_on(async { self.client.set_metadata(metadata).await })
     }