Merge branch 'master' into clarify-json-serialization

1 files changed, 31 insertions, 4 deletions

diff --git a/25.md b/25.md
index f74bcc0..3b4aa59 100644
--- a/25.md
+++ b/25.md
@@ -5,9 +5,9 @@ NIP-25
 Reactions
 ---------
 
-`draft` `optional` `author:jb55`
+`draft` `optional`
 
-A reaction is a `kind 7` note that is used to react to other notes.
+A reaction is a `kind 7` event that is used to react to other events.
 
 The generic reaction, represented by the `content` set to a `+` string, SHOULD
 be interpreted as a "like" or "upvote".
@@ -18,8 +18,9 @@ downvote or dislike on a post. A client MAY also choose to tally likes against
 dislikes in a reddit-like system of upvotes and downvotes, or display them as
 separate tallies.
 
-The `content` MAY be an emoji, in this case it MAY be interpreted as a "like" or "dislike",
-or the client MAY display this emoji reaction on the post.
+The `content` MAY be an emoji, or [NIP-30](30.md) custom emoji in this case it MAY be interpreted as a "like" or "dislike",
+or the client MAY display this emoji reaction on the post. If the `content` is an empty string then the client should
+consider it a "+".
 
 Tags
 ----
@@ -33,6 +34,9 @@ The last `e` tag MUST be the `id` of the note that is being reacted to.
 
 The last `p` tag MUST be the `pubkey` of the event being reacted to.
 
+The reaction event MAY include a `k` tag with the stringified kind number
+of the reacted event as its value.
+
 Example code
 
 ```swift
@@ -42,8 +46,31 @@ func make_like_event(pubkey: String, privkey: String, liked: NostrEvent) -> Nost
     }
     tags.append(["e", liked.id])
     tags.append(["p", liked.pubkey])
+    tags.append(["k", liked.kind])
     let ev = NostrEvent(content: "+", pubkey: pubkey, kind: 7, tags: tags)
     ev.calculate_id()
     ev.sign(privkey: privkey)
     return ev
 }
+```
+
+Custom Emoji Reaction
+---------------------
+
+The client may specify a custom emoji ([NIP-30](30.md)) `:shortcode:` in the
+reaction content. The client should refer to the emoji tag and render the
+content as an emoji if shortcode is specified.
+
+```json
+{
+  "kind": 7,
+  "content": ":soapbox:",
+  "tags": [
+    ["emoji", "soapbox", "https://gleasonator.com/emoji/Gleasonator/soapbox.png"]
+  ],
+  "pubkey": "79c2cae114ea28a981e7559b4fe7854a473521a8d22a66bbab9fa248eb820ff6",
+  "created_at": 1682790000
+}
+```
+
+The content can be set only one `:shortcode:`. And emoji tag should be one.