Merge branch 'master' into cashu-wallet

1 files changed, 30 insertions, 14 deletions

diff --git a/29.md b/29.md
index 74dfd66..6232f8b 100644
--- a/29.md
+++ b/29.md
@@ -16,7 +16,7 @@ Normally a group will originally belong to one specific relay, but the community
 
 ## Relay-generated events
 
-Relays are supposed to generate the events that describe group metadata and group admins. These are parameterized replaceable events signed by the relay keypair directly, with the group _id_ as the `d` tag.
+Relays are supposed to generate the events that describe group metadata and group admins. These are _addressable_ events signed by the relay keypair directly, with the group _id_ as the `d` tag.
 
 ## Group identifier
 
@@ -42,14 +42,14 @@ Relays should prevent late publication (messages published now with a timestamp
 
 This is the basic unit of a "microblog" root text note sent to a group.
 
-```js
+```jsonc
   "kind": 11,
   "content": "hello my friends lovers of pizza",
   "tags": [
     ["h", "<group-id>"],
-    ["previous", "<event-id-first-chars>", "<event-id-first-chars>", ...]
+    ["previous", "<event-id-first-chars>", "<event-id-first-chars>", /*...*/]
   ]
-  ...
+  // other fields...
 ```
 
 - *threaded text reply* (`kind:12`)
@@ -63,14 +63,14 @@ This is the basic unit of a "microblog" reply note sent to a group. It's the sam
 
 This is the basic unit of a _chat message_ sent to a group.
 
-```js
+```jsonc
   "kind": 9,
   "content": "hello my friends lovers of pizza",
   "tags": [
     ["h", "<group-id>"],
-    ["previous", "<event-id-first-chars>", "<event-id-first-chars>", ...]
+    ["previous", "<event-id-first-chars>", "<event-id-first-chars>", /*...*/]
   ]
-  ...
+  // other fields...
 ```
 
 - *chat message threaded reply* (`kind:10`)
@@ -83,7 +83,7 @@ Similar to `kind:12`, this is the basic unit of a chat message sent to a group.
 
 Any user can send one of these events to the relay in order to be automatically or manually added to the group. If the group is `open` the relay will automatically issue a `kind:9000` in response adding this user. Otherwise group admins may choose to query for these requests and act upon them.
 
-```js
+```json
 {
   "kind": 9021,
   "content": "optional reason",
@@ -93,17 +93,31 @@ Any user can send one of these events to the relay in order to be automatically
 }
 ```
 
+- *leave request* (`kind:9022`)
+
+Any user can send one of these events to the relay in order to be automatically removed from the group. The relay will automatically issue a `kind:9001` in response removing this user.
+
+```json
+{
+  "kind": 9022,
+  "content": "optional reason",
+  "tags": [
+    ["h", "<group-id>"]
+  ]
+}
+```
+
 - *moderation events* (`kinds:9000-9020`) (optional)
 
 Clients can send these events to a relay in order to accomplish a moderation action. Relays must check if the pubkey sending the event is capable of performing the given action. The relay may discard the event after taking action or keep it as a moderation log.
 
-```js
+```json
 {
   "kind": 90xx,
   "content": "optional reason",
   "tags": [
     ["h", "<group-id>"],
-    ["previous", ...]
+    ["previous", /*...*/]
   ]
 }
 ```
@@ -120,6 +134,7 @@ Each moderation action uses a different kind and requires different arguments, w
 | 9005 | `delete-event`      | `e` (id hex)                              |
 | 9006 | `edit-group-status` | `public` or `private`, `open` or `closed` |
 | 9007 | `create-group`      |                                           |
+| 9008 | `delete-group`      |                                           |
 
 - *group metadata* (`kind:39000`) (optional)
 
@@ -127,7 +142,7 @@ This event defines the metadata for the group -- basically how clients should di
 
 If the group is forked and hosted in multiple relays, there will be multiple versions of this event in each different relay and so on.
 
-```js
+```jsonc
 {
   "kind": 39000,
   "content": "",
@@ -139,7 +154,7 @@ If the group is forked and hosted in multiple relays, there will be multiple ver
     ["public"], // or ["private"]
     ["open"] // or ["closed"]
   ]
-  ...
+  // other fields...
 }
 ```
 
@@ -160,8 +175,9 @@ The list of capabilities, as defined by this NIP, for now, is the following:
 - `add-permission`
 - `remove-permission`
 - `edit-group-status`
+- `delete-group`
 
-```js
+```json
 {
   "kind": 39001,
   "content": "list of admins for the pizza lovers group",
@@ -170,7 +186,7 @@ The list of capabilities, as defined by this NIP, for now, is the following:
     ["p", "<pubkey1-as-hex>", "ceo", "add-user", "edit-metadata", "delete-event", "remove-user"],
     ["p", "<pubkey2-as-hex>", "secretary", "add-user", "delete-event"]
   ]
-  ...
+  // other fields...
 }
 ```