diff options
| author | Jonas Platte <jplatte+git@posteo.de> | 2018-03-13 14:10:07 +0100 |
|---|---|---|
| committer | Jonas Platte <jplatte+git@posteo.de> | 2018-03-13 14:48:12 +0100 |
| commit | 47ce527f459e0a28a45a2299db799ea18d632021 (patch) | |
| tree | 9f6842bc1234ad930bdc19c049366c6d84c09d02 /synapse | |
| parent | Merge pull request #2979 from matrix-org/erikj/no_handlers (diff) | |
| download | synapse-47ce527f459e0a28a45a2299db799ea18d632021.tar.xz | |
Add room_id to the response of `rooms/{roomId}/join`
Fixes #2349
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index f8999d64d7..6dc31bf9ae 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -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"}: |