diff options
| author | kaiyou <pierre@jaury.eu> | 2018-04-14 12:27:16 +0200 |
|---|---|---|
| committer | kaiyou <pierre@jaury.eu> | 2018-04-14 12:27:16 +0200 |
| commit | 041b41a825e456db180a89a9e4df6ea9f3d01c5b (patch) | |
| tree | db669225768b3322fe4d63451fdd05799634599a /synapse/rest/client/v1/room.py | |
| parent | Merge remote-tracking branch 'upstream/master' into feat-dockerfile (diff) | |
| parent | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse (diff) | |
| download | synapse-041b41a825e456db180a89a9e4df6ea9f3d01c5b.tar.xz | |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
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"}: |