summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-08-15 16:47:50 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-08-15 16:47:50 +0100
commitec1fd20e594ec58e550d8cd51a9700c05f9ff660 (patch)
tree8157c1aa10ff4b253e90ec262fbc63ddb544e87a /synapse/rest
parentFix imsync's SELECT query to only find the rooms I'm actually joined in, not ... (diff)
downloadsynapse-ec1fd20e594ec58e550d8cd51a9700c05f9ff660.tar.xz
Also include users' presence when responding to /rooms/:room_id/members/list
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/room.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py
index 1fc0c996b8..799dd58b2d 100644
--- a/synapse/rest/room.py
+++ b/synapse/rest/room.py
@@ -348,6 +348,13 @@ class RoomMemberListRestServlet(RestServlet):
             room_id=urllib.unquote(room_id),
             user_id=user.to_string())
 
+        for event in members["chunk"]:
+            target_user = self.hs.parse_userid(event["target_user_id"])
+            presence_state = yield self.handlers.presence_handler.get_state(
+                target_user=target_user, auth_user=user
+            )
+            event["content"].update(presence_state)
+
         defer.returnValue((200, members))