Merge branch 'master' into vending-machine

1 files changed, 23 insertions, 1 deletions

diff --git a/25.md b/25.md
index f74bcc0..86ce763 100644
--- a/25.md
+++ b/25.md
@@ -18,7 +18,7 @@ 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",
+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.
 
 Tags
@@ -47,3 +47,25 @@ func make_like_event(pubkey: String, privkey: String, liked: NostrEvent) -> Nost
     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.