From eedecf863a100986ff1833d100538b88bba330ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <76261501+zecakeh@users.noreply.github.com> Date: Tue, 25 Feb 2025 21:34:23 +0100 Subject: [PATCH] Clarify that join rules must be in auth events for knock events (#2063) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- changelogs/server_server/newsfragments/2063.clarification | 1 + content/server-server-api.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelogs/server_server/newsfragments/2063.clarification diff --git a/changelogs/server_server/newsfragments/2063.clarification b/changelogs/server_server/newsfragments/2063.clarification new file mode 100644 index 00000000..4e3df516 --- /dev/null +++ b/changelogs/server_server/newsfragments/2063.clarification @@ -0,0 +1 @@ +Clarify that `m.join_rules` should be in the `auth_events` of an `m.room.member` event with a `membership` of `knock`. \ No newline at end of file diff --git a/content/server-server-api.md b/content/server-server-api.md index 8e99c431..65494f80 100644 --- a/content/server-server-api.md +++ b/content/server-server-api.md @@ -537,7 +537,7 @@ the following subset of the room state: - If type is `m.room.member`: - The target's current `m.room.member` event, if any. - - If `membership` is `join` or `invite`, the current + - If `membership` is `join`, `invite` or `knock`, the current `m.room.join_rules` event, if any. - If membership is `invite` and `content` contains a `third_party_invite` property, the current