summary refs log tree commit diff
path: root/synapse/rest/client/v1/room.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-04-05 17:29:06 +0100
committerGitHub <noreply@github.com>2018-04-05 17:29:06 +0100
commitc7f096973180f4225eac0bea99838b0f46f514b1 (patch)
tree6167c12c11d9c9df3578d0c6810efc4d6688ed25 /synapse/rest/client/v1/room.py
parentMerge pull request #3068 from matrix-org/rav/fix_cache_invalidation (diff)
parentAdd room_id to the response of `rooms/{roomId}/join` (diff)
downloadsynapse-c7f096973180f4225eac0bea99838b0f46f514b1.tar.xz
Merge pull request #2986 from jplatte/join_reponse_room_id
Add room_id to the response of `rooms/{roomId}/join`
Diffstat (limited to 'synapse/rest/client/v1/room.py')
-rw-r--r--synapse/rest/client/v1/room.py7
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"}: