Merge pull request #2986 from jplatte/join_reponse_room_id

Add room_id to the response of `rooms/{roomId}/join`
matrix-org · Apr 5, 2018 · c7f0969 · c7f0969
2 parents 3449da3 + 47ce527
commit c7f0969
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
@@ -655,7 +655,12 @@ def on_POST(self, request, room_id, membership_action, txn_id=None):
             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"}: