Merge branch 'master' into patch-1

author: Jon Staab <jstaab@protonmail.com> 2023-05-12 05:10:45 -0700
committer: GitHub <noreply@github.com> 2023-05-12 05:10:45 -0700
commit: e5302f84c74cf42d878a3ed18257a16bc0d3b748 (patch)
tree: b1a3ad9c0317bf7c38f34c500559b66ff7c0a22d /10.md
parent: 1c728516dfdc7508ce27eda222bde78466e3457d (diff)
parent: 4208652dc7a39c63c39559b13c656ec30400fcba (diff)
1 files changed, 3 insertions, 3 deletions
diff --git a/10.md b/10.md
index 8b617f6..6494796 100644
--- a/10.md
+++ b/10.md
@@ -43,10 +43,10 @@ They are citings from this event.  `root-id` and `reply-id` are as above.
 Where:
 * `<event-id>` is the id of the event being referenced.
- * `<relay-url>` is the URL of a recommended relay associated with the reference.  It is NOT optional.
+ * `<relay-url>` is the URL of a recommended relay associated with the reference. Clients SHOULD add a valid `<relay-URL>` field, but may instead leave it as `""`.
- * `<marker>` is optional and if present is one of `"reply"` or `"root"`
+ * `<marker>` is optional and if present is one of `"reply"`, `"root"`, or `"mention"`.
-**The order of marked "e" tags is not relevant.**  Those marked with `"reply"` denote the `<reply-id>`.  Those marked with `"root"` denote the root id of the reply thread.
+**The order of marked "e" tags is not relevant.**  Those marked with `"reply"` denote the id of the reply event being responded to.  Those marked with `"root"` denote the root id of the reply thread being responded to. For top level replies (those replying directly to the root event), only the `"root"` marker should be used. Those marked with `"mention"` denote a quoted or reposted event id.
 A direct reply to the root of a thread should have a single marked "e" tag of type "root".
author	Jon Staab <jstaab@protonmail.com>	2023-05-12 05:10:45 -0700
committer	GitHub <noreply@github.com>	2023-05-12 05:10:45 -0700
commit	e5302f84c74cf42d878a3ed18257a16bc0d3b748 (patch)
tree	b1a3ad9c0317bf7c38f34c500559b66ff7c0a22d /10.md
parent	1c728516dfdc7508ce27eda222bde78466e3457d (diff)
parent	4208652dc7a39c63c39559b13c656ec30400fcba (diff)

diff --git a/10.md b/10.md index 8b617f6..6494796 100644 --- a/10.md +++ b/10.md
@@ -43,10 +43,10 @@ They are citings from this event. `root-id` and `reply-id` are as above.
43	Where:	43	Where:
44		44
45	* `<event-id>` is the id of the event being referenced.	45	* `<event-id>` is the id of the event being referenced.
46	* `<relay-url>` is the URL of a recommended relay associated with the reference. It is NOT optional.	46	* `<relay-url>` is the URL of a recommended relay associated with the reference. Clients SHOULD add a valid `<relay-URL>` field, but may instead leave it as `""`.
47	* `<marker>` is optional and if present is one of `"reply"` or `"root"`	47	* `<marker>` is optional and if present is one of `"reply"`, `"root"`, or `"mention"`.
48		48
49	The order of marked "e" tags is not relevant. Those marked with `"reply"` denote the `<reply-id>`. Those marked with `"root"` denote the root id of the reply thread.	49	The order of marked "e" tags is not relevant. Those marked with `"reply"` denote the id of the reply event being responded to. Those marked with `"root"` denote the root id of the reply thread being responded to. For top level replies (those replying directly to the root event), only the `"root"` marker should be used. Those marked with `"mention"` denote a quoted or reposted event id.
50		50
51	A direct reply to the root of a thread should have a single marked "e" tag of type "root".	51	A direct reply to the root of a thread should have a single marked "e" tag of type "root".
52		52