summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-15 09:46:33 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-15 09:46:33 +0100
commitbf6fa6dd3dbaf929e2a15c1100ac6650aed65944 (patch)
treebedb2fad2cb22eb99189879adf04258a0076f46e /synapse/handlers
parentUpdated spec and api docs to desired new format. (diff)
parentBF: presence and eventMap were not reset at logout. (diff)
downloadsynapse-bf6fa6dd3dbaf929e2a15c1100ac6650aed65944.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index a0d0f2af16..310cb46fe7 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -593,6 +593,12 @@ class RoomListHandler(BaseHandler):
     @defer.inlineCallbacks
     def get_public_room_list(self):
         chunk = yield self.store.get_rooms(is_public=True)
+        for room in chunk:
+            joined_members = yield self.store.get_room_members(
+                room_id=room["room_id"],
+                membership=Membership.JOIN
+            )
+            room["num_joined_members"] = len(joined_members)
         # FIXME (erikj): START is no longer a valid value
         defer.returnValue({"start": "START", "end": "END", "chunk": chunk})