From 0d275cc739f9a862099c3e12a1ec2a66584a197c Mon Sep 17 00:00:00 2001 From: Arnaud Venturi Date: Thu, 20 May 2021 17:00:10 +0200 Subject: [PATCH 1/3] Fix a typo in event soft rejection schema Signed-off-by: Arnaud Venturi --- content/server-server-api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/server-server-api.md b/content/server-server-api.md index e87e8085..c72dee52 100644 --- a/content/server-server-api.md +++ b/content/server-server-api.md @@ -550,7 +550,7 @@ then any new event `D'` will not reference `C`: / \ B C | - D + D' #### Retrieving event authorization information From 586c4d865a71e451cb7b4ea2abfe06435398b306 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Fri, 21 May 2021 15:36:20 -0400 Subject: [PATCH 2/3] Fix broken ASCII art --- content/server-server-api.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/content/server-server-api.md b/content/server-server-api.md index c72dee52..9013d6c0 100644 --- a/content/server-server-api.md +++ b/content/server-server-api.md @@ -500,15 +500,15 @@ Example As an example consider the event graph: - A - / + A + / B where `B` is a ban of a user `X`. If the user `X` tries to set the topic by sending an event `C` while evading the ban: - A - / \ + A + / \ B C servers that receive `C` after `B` should soft fail event `C`, and so @@ -518,11 +518,11 @@ will neither relay `C` to its clients nor send any events referencing If later another server sends an event `D` that references both `B` and `C` (this can happen if it received `C` before `B`): - A - / \ + A + / \ B C - \ / - D + \ / + D then servers will handle `D` as normal. `D` is sent to the servers' clients (assuming `D` passes auth checks). The state at `D` may resolve @@ -539,15 +539,15 @@ state of the `C` branch. Let's go back to the graph before `D` was sent: - A - / \ + A + / \ B C If all the servers in the room saw `B` before `C` and so soft fail `C`, then any new event `D'` will not reference `C`: - A - / \ + A + / \ B C | D' @@ -584,15 +584,15 @@ state. For example, consider the following event graph (where the oldest event, E0, is at the top): - E0 - | - E1 - / \ + E0 + | + E1 + / \ E2 E4 | | E3 | - \ / - E5 + \ / + E5 Suppose E3 and E4 are both `m.room.name` events which set the name of the room. What should the name of the room be at E5? From 53fedb2c613d2f8af7780773939a4fccc4f05594 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Fri, 21 May 2021 15:38:58 -0400 Subject: [PATCH 3/3] Add changelog --- changelogs/server_server/newsfragments/3207.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/server_server/newsfragments/3207.clarification diff --git a/changelogs/server_server/newsfragments/3207.clarification b/changelogs/server_server/newsfragments/3207.clarification new file mode 100644 index 00000000..3ccb2333 --- /dev/null +++ b/changelogs/server_server/newsfragments/3207.clarification @@ -0,0 +1 @@ +Fix various typos throughout the specification.