diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-04-11 10:59:00 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-04-11 10:59:00 +0100 |
| commit | 427e6c4059e2eff5eacf114dc6708e2972ca36d2 (patch) | |
| tree | 608df478fe94531db9a789e3c8d1e827a34d8302 /synapse/rest/client/v1/room.py | |
| parent | Update README.rst (diff) | |
| parent | bump version/changelog (diff) | |
| download | synapse-427e6c4059e2eff5eacf114dc6708e2972ca36d2.tar.xz | |
Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse v0.27.3
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -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 70d788deea..d06cbdc35e 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"}: |