nostr: add nip25::ReactionTarget and update EventBuilder::reaction

Fixes https://gitworkshop.dev/yukikishimoto.com/rust-nostr/issues/note1065nmxmzlympsvzexddma4czwnuvxygfpe9akyr0ulujv2zhgfkqkvw8kv

Pull-Request: #1063
Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

crates/nostr/CHANGELOG.md

@@ -30,6 +30,8 @@
 - Set `payment_hash` as optional in `MakeInvoiceResponse` (https://github.com/rust-nostr/nostr/pull/1045)
 - Remove `hex` module (https://github.com/rust-nostr/nostr/pull/1051)
 - Use `Cow` for non-copy fields in `nip22::CommentTarget` enum (https://github.com/rust-nostr/nostr/pull/1053)
+- Change `EventBuilder::reaction` args (https://github.com/rust-nostr/nostr/pull/1063)
+- Remove `EventBuilder::reaction_extended` (https://github.com/rust-nostr/nostr/pull/1063)
 
 ### Added
 
@@ -45,6 +47,7 @@
 - Add `CommentTarget::as_vec` to convert the comment target into a vector of tags (https://github.com/rust-nostr/nostr/pull/1038)
 - Support NIP-A0 (Voice Messages) (https://github.com/rust-nostr/nostr/pull/1032)
 - Add `hex` dependency (https://github.com/rust-nostr/nostr/pull/1051)
+- Add `nip25::ReactionTarget` (https://github.com/rust-nostr/nostr/pull/1063)
 
 ### Changed
 

crates/nostr/src/event/builder.rs

@@ -691,38 +691,11 @@ impl EventBuilder {
     ///
     /// <https://github.com/nostr-protocol/nips/blob/master/25.md>
     #[inline]
-    pub fn reaction<S>(event: &Event, reaction: S) -> Self
+    pub fn reaction<S>(target: ReactionTarget, reaction: S) -> Self
     where
         S: Into<String>,
     {
-        Self::reaction_extended(event.id, event.pubkey, Some(event.kind), reaction)
-    }
-
-    /// Add reaction (like/upvote, dislike/downvote or emoji) to an event
-    ///
-    /// <https://github.com/nostr-protocol/nips/blob/master/25.md>
-    pub fn reaction_extended<S>(
-        event_id: EventId,
-        public_key: PublicKey,
-        kind: Option<Kind>,
-        reaction: S,
-    ) -> Self
-    where
-        S: Into<String>,
-    {
-        let mut tags: Vec<Tag> = Vec::with_capacity(2 + usize::from(kind.is_some()));
-
-        tags.push(Tag::event(event_id));
-        tags.push(Tag::public_key(public_key));
-
-        if let Some(kind) = kind {
-            tags.push(Tag::from_standardized_without_cell(TagStandard::Kind {
-                kind,
-                uppercase: false,
-            }));
-        }
-
-        Self::new(Kind::Reaction, reaction).tags(tags)
+        Self::new(Kind::Reaction, reaction).tags(target.into_tags())
     }
 
     /// Create a new channel

crates/nostr/src/nips/mod.rs

@@ -22,6 +22,7 @@ pub mod nip17;
 pub mod nip19;
 pub mod nip21;
 pub mod nip22;
+pub mod nip25;
 pub mod nip34;
 pub mod nip35;
 pub mod nip38;

crates/nostr/src/nips/nip25.rs

@@ -0,0 +1,76 @@
+// Copyright (c) 2022-2023 Yuki Kishimoto
+// Copyright (c) 2023-2025 Rust Nostr Developers
+// Distributed under the MIT software license
+
+//! NIP25: Reactions
+//!
+//! <https://github.com/nostr-protocol/nips/blob/master/25.md>
+
+use super::nip01::Coordinate;
+use crate::{Event, EventId, Kind, PublicKey, RelayUrl, Tag, TagStandard, Tags};
+
+/// Reaction target
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct ReactionTarget {
+    /// Event ID
+    pub event_id: EventId,
+    /// Public Key
+    pub public_key: PublicKey,
+    /// Coordinate
+    pub coordinate: Option<Coordinate>,
+    /// Kind
+    pub kind: Option<Kind>,
+    /// Relay hint
+    pub relay_hint: Option<RelayUrl>,
+}
+
+impl ReactionTarget {
+    /// Construct a new reaction target
+    pub fn new(event: &Event, relay_hint: Option<RelayUrl>) -> Self {
+        Self {
+            event_id: event.id,
+            public_key: event.pubkey,
+            coordinate: event.coordinate().map(|c| c.into_owned()),
+            kind: Some(event.kind),
+            relay_hint,
+        }
+    }
+
+    pub(crate) fn into_tags(self) -> Tags {
+        let mut tags: Tags = Tags::with_capacity(
+            2 + usize::from(self.coordinate.is_some()) + usize::from(self.kind.is_some()),
+        );
+
+        // Serialization order: keep the `e` and `a` tags together, followed by the `p` and other tags.
+
+        tags.push(Tag::from_standardized_without_cell(TagStandard::Event {
+            event_id: self.event_id,
+            relay_url: self.relay_hint.clone(),
+            public_key: Some(self.public_key),
+            marker: None,
+            uppercase: false,
+        }));
+
+        if let Some(coordinate) = self.coordinate {
+            tags.push(Tag::coordinate(coordinate, self.relay_hint.clone()));
+        }
+
+        tags.push(Tag::from_standardized_without_cell(
+            TagStandard::PublicKey {
+                public_key: self.public_key,
+                relay_url: self.relay_hint,
+                alias: None,
+                uppercase: false,
+            },
+        ));
+
+        if let Some(kind) = self.kind {
+            tags.push(Tag::from_standardized_without_cell(TagStandard::Kind {
+                kind,
+                uppercase: false,
+            }));
+        }
+
+        tags
+    }
+}

crates/nostr/src/prelude.rs

@@ -44,6 +44,7 @@ pub use crate::nips::nip17::{self, *};
 pub use crate::nips::nip19::{self, *};
 pub use crate::nips::nip21::{self, *};
 pub use crate::nips::nip22::{self, *};
+pub use crate::nips::nip25::{self, *};
 pub use crate::nips::nip34::{self, *};
 pub use crate::nips::nip35::{self, *};
 pub use crate::nips::nip38::{self, *};