Merge #163: Rename EventBuilder arg

rust-nostr · Sep 12, 2023 · f2b2e05 · f2b2e05
2 parents 5ce0e4b + 4519344
commit f2b2e05
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/bindings/nostr-ffi/src/event/builder.rs b/bindings/nostr-ffi/src/event/builder.rs
@@ -130,14 +130,14 @@ impl EventBuilder {
         sender_keys: Arc<Keys>,
         receiver_pubkey: Arc<PublicKey>,
         content: String,
-        reply: Option<Arc<EventId>>,
+        reply_to: Option<Arc<EventId>>,
     ) -> Result<Self> {
         Ok(Self {
             builder: EventBuilderSdk::new_encrypted_direct_msg(
                 sender_keys.deref(),
                 *receiver_pubkey.as_ref().deref(),
                 content,
-                reply.map(|id| id.as_ref().into()),
+                reply_to.map(|id| id.as_ref().into()),
             )?,
         })
     }

diff --git a/bindings/nostr-ffi/src/nostr.udl b/bindings/nostr-ffi/src/nostr.udl
@@ -288,7 +288,7 @@ interface EventBuilder {
     [Name=set_contact_list]
     constructor(sequence<Contact> list);
     [Throws=NostrError, Name=new_encrypted_direct_msg]
-    constructor(Keys sender_keys, PublicKey receiver_pubkey, string content, EventId? reply);
+    constructor(Keys sender_keys, PublicKey receiver_pubkey, string content, EventId? reply_to);
     [Name=delete]
     constructor(sequence<EventId> ids, optional string? reason = null);
     [Name=new_reaction]

diff --git a/bindings/nostr-js/src/event/builder.rs b/bindings/nostr-js/src/event/builder.rs
@@ -104,14 +104,14 @@ impl JsEventBuilder {
         sender_keys: &JsKeys,
         receiver_pubkey: &JsPublicKey,
         content: String,
-        reply: Option<JsEventId>,
+        reply_to: Option<JsEventId>,
     ) -> Result<JsEventBuilder> {
         Ok(Self {
             builder: EventBuilder::new_encrypted_direct_msg(
                 sender_keys.deref(),
                 receiver_pubkey.into(),
                 content,
-                reply.map(|id| id.into()),
+                reply_to.map(|id| id.into()),
             )
             .map_err(into_err)?,
         })

diff --git a/bindings/nostr-sdk-ffi/src/nostr_sdk.udl b/bindings/nostr-sdk-ffi/src/nostr_sdk.udl
@@ -308,7 +308,7 @@ interface EventBuilder {
     [Name=set_contact_list]
     constructor(sequence<Contact> list);
     [Throws=NostrError, Name=new_encrypted_direct_msg]
-    constructor(Keys sender_keys, PublicKey receiver_pubkey, string content, EventId? reply);
+    constructor(Keys sender_keys, PublicKey receiver_pubkey, string content, EventId? reply_to);
     [Name=delete]
     constructor(sequence<EventId> ids, optional string? reason = null);
     [Name=new_reaction]

diff --git a/crates/nostr-sdk/src/client/mod.rs b/crates/nostr-sdk/src/client/mod.rs
@@ -986,7 +986,7 @@ impl Client {
         &self,
         receiver: XOnlyPublicKey,
         msg: S,
-        reply: Option<EventId>,
+        reply_to: Option<EventId>,
     ) -> Result<EventId, Error>
     where
         S: Into<String>,
@@ -1010,11 +1010,11 @@ impl Client {
                 return Err(Error::ResponseNotMatchRequest);
             }
         } else {
-            EventBuilder::new_encrypted_direct_msg(&self.keys, receiver, msg, reply)?
+            EventBuilder::new_encrypted_direct_msg(&self.keys, receiver, msg, reply_to)?
         };
 
         #[cfg(not(feature = "nip46"))]
-        let builder = EventBuilder::new_encrypted_direct_msg(&self.keys, receiver, msg, reply)?;
+        let builder = EventBuilder::new_encrypted_direct_msg(&self.keys, receiver, msg, reply_to)?;
 
         self.send_event_builder(builder).await
     }

diff --git a/crates/nostr/src/event/builder.rs b/crates/nostr/src/event/builder.rs
@@ -363,14 +363,14 @@ impl EventBuilder {
         sender_keys: &Keys,
         receiver_pubkey: XOnlyPublicKey,
         content: S,
-        reply: Option<EventId>,
+        reply_to: Option<EventId>,
     ) -> Result<Self, Error>
     where
         S: Into<String>,
     {
         let mut tags: Vec<Tag> = vec![Tag::PubKey(receiver_pubkey, None)];
-        if let Some(reply) = reply {
-            tags.push(Tag::Event(reply, None, None));
+        if let Some(reply_to) = reply_to {
+            tags.push(Tag::Event(reply_to, None, None));
         }
         Ok(Self::new(
             Kind::EncryptedDirectMessage,