diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-12 18:19:32 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-12 18:19:32 +0100 |
| commit | e3aec9bc818e203a4883f8863acb96b9c273112a (patch) | |
| tree | 762f87365f917f510f00bc6aee7a4068cdd56e76 /synapse/handlers/room.py | |
| parent | fix embarassing bug where in-progress messages get vaped when the previous on... (diff) | |
| parent | Bump version and change log (diff) | |
| download | synapse-e3aec9bc818e203a4883f8863acb96b9c273112a.tar.xz | |
Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse
Conflicts: webclient/room/room-controller.js
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 6 |
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}) |