diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-22 16:10:42 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-22 16:10:42 +0100 |
| commit | 74b7de83ece889e585878c9974070e85a08d1a49 (patch) | |
| tree | 318942c37864d8e8683739ab83ac68f7b99c922c /synapse/handlers/room.py | |
| parent | Actually return something from lambda (diff) | |
| parent | Merge pull request #156 from matrix-org/erikj/join_perf (diff) | |
| download | synapse-74b7de83ece889e585878c9974070e85a08d1a49.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_fixes
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 401cc677d1..4bd027d9bb 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -536,9 +536,7 @@ class RoomListHandler(BaseHandler): chunk = yield self.store.get_rooms(is_public=True) results = yield defer.gatherResults( [ - self.store.get_users_in_room( - room_id=room["room_id"], - ) + self.store.get_users_in_room(room["room_id"]) for room in chunk ], consumeErrors=True, |