From 75ba4a98bffefdf243447bd5f7d1f23311da4b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Mon, 17 Mar 2025 18:34:21 +0100 Subject: [PATCH 1/2] Clarify that `join_authorised_via_users_server` auth event is only necessary for join MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- content/server-server-api.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/server-server-api.md b/content/server-server-api.md index 65494f80..63b393b7 100644 --- a/content/server-server-api.md +++ b/content/server-server-api.md @@ -543,8 +543,8 @@ the following subset of the room state: `third_party_invite` property, the current `m.room.third_party_invite` event with `state_key` matching `content.third_party_invite.signed.token`, if any. - - If `content.join_authorised_via_users_server` is present, - and the [room version supports restricted rooms](/rooms/#feature-matrix), + - If `membership` is `join`, `content.join_authorised_via_users_server` + is present, and the [room version supports restricted rooms](/rooms/#feature-matrix), then the `m.room.member` event with `state_key` matching `content.join_authorised_via_users_server`. From 332d867c862417b84de4bf3b6c11f359f72d0ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Mon, 17 Mar 2025 18:40:52 +0100 Subject: [PATCH 2/2] Add changelog 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/2100.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/server_server/newsfragments/2100.clarification diff --git a/changelogs/server_server/newsfragments/2100.clarification b/changelogs/server_server/newsfragments/2100.clarification new file mode 100644 index 00000000..a488b392 --- /dev/null +++ b/changelogs/server_server/newsfragments/2100.clarification @@ -0,0 +1 @@ +Clarify that auth event of `content.join_authorised_via_users_server` is only necessary for `m.room.member` with a `membership` of `join`.