Merge pull request #2986 from jplatte/join_reponse_room_id

Add room_id to the response of `rooms/{roomId}/join`
This commit is contained in:
Richard van der Hoff 2018-04-05 17:29:06 +01:00 committed by GitHub
commit c7f0969731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -655,7 +655,12 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
content=event_content,
)
defer.returnValue((200, {}))
return_value = {}
if membership_action == "join":
return_value["room_id"] = room_id
defer.returnValue((200, return_value))
def _has_3pid_invite_keys(self, content):
for key in {"id_server", "medium", "address"}: