From 7ff785fc38d08c206afae79ec842a46b29eeced5 Mon Sep 17 00:00:00 2001 From: Matthias Ahouansou Date: Mon, 3 Jun 2024 13:09:40 +0000 Subject: [PATCH] Clarify that the event field of the send_join is only required when performing a restricted join (#1834) --- changelogs/server_server/newsfragments/1834.clarification | 1 + data/api/server-server/joins-v2.yaml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 changelogs/server_server/newsfragments/1834.clarification diff --git a/changelogs/server_server/newsfragments/1834.clarification b/changelogs/server_server/newsfragments/1834.clarification new file mode 100644 index 000000000..fa927ccaf --- /dev/null +++ b/changelogs/server_server/newsfragments/1834.clarification @@ -0,0 +1 @@ +Clarify that the `event` field of the `/v2/send_join` response is only required when `join_authorised_via_users_server` was present in the `content` field of the request. diff --git a/data/api/server-server/joins-v2.yaml b/data/api/server-server/joins-v2.yaml index 8dcdaaf00..7804a6f64 100644 --- a/data/api/server-server/joins-v2.yaml +++ b/data/api/server-server/joins-v2.yaml @@ -207,9 +207,9 @@ paths: title: SignedMembershipEvent x-addedInMatrixVersion: "1.2" description: |- - Required if the room version [supports restricted join rules](/rooms/#feature-matrix). The signed - copy of the membership event sent to other servers by the resident server, including the resident - server's signature. + Required if the `content` of the event in the request contained the `join_authorised_via_users_server` + field. The signed copy of the membership event sent to other servers by the resident server, + including the resident server's signature. servers_in_room: type: array x-addedInMatrixVersion: "1.6"