summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-01-13 17:29:24 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-01-13 17:29:24 +0000
commit34a5fbe2b7162c545ab5ae9403147bdd925a58f9 (patch)
tree3cf2c3bb64646d5b6fe76f16baf707845ac784d4 /synapse
parentHave MockClock detect attempts to cancel expired timers, to prevent a repeat ... (diff)
downloadsynapse-34a5fbe2b7162c545ab5ae9403147bdd925a58f9.tar.xz
Have /join/:room_id return the room ID in response anyway, for consistency of clients (SYN-234)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/room.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py
index caafa959e6..48bba2a5f3 100644
--- a/synapse/rest/room.py
+++ b/synapse/rest/room.py
@@ -246,7 +246,7 @@ class JoinRoomAliasServlet(RestServlet):
                 }
             )
 
-            defer.returnValue((200, {}))
+            defer.returnValue((200, {"room_id": identifier.to_string()}))
 
     @defer.inlineCallbacks
     def on_PUT(self, request, room_identifier, txn_id):