Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clarify when an event is returned from /send_join. #1840

Merged
merged 3 commits into from
Jun 11, 2024
Merged

Clarify when an event is returned from /send_join. #1840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
353b615
Clarify when an event is returned from /send_join.
clokep Jun 5, 2024
a3b5f99
Newsfragment
clokep Jun 5, 2024
2c117ba
Another attempt.
clokep Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion changelogs/server_server/newsfragments/1834.clarification
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +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.
Clarify that the `event` field of the `/v2/send_join` response is only required when the event is signed by the resident server.
1 change: 1 addition & 0 deletions changelogs/server_server/newsfragments/1840.clarification
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Clarify that the `event` field of the `/v2/send_join` response is only required when the event is signed by the resident server.
6 changes: 3 additions & 3 deletions data/api/server-server/joins-v2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,9 @@ paths:
title: SignedMembershipEvent
x-addedInMatrixVersion: "1.2"
description: |-
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.
The membership event sent to other servers by the resident server including a signature
from the resident server. Required if the room is [restricted](/client-server-api/#restricted-rooms)
and the joining user is authorised by one of the conditions.
servers_in_room:
type: array
x-addedInMatrixVersion: "1.6"
Expand Down