diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-22 10:33:00 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-22 10:33:00 +0100 |
| commit | 4429e720ae2abb64a8bb58a6b8fa9b01c53429a3 (patch) | |
| tree | a4ff9a599d7840541949e5fcc5f74ac26b0695e3 /synapse/handlers/room.py | |
| parent | Oops, get_rooms_for_user returns a namedtuple, not a room_id (diff) | |
| parent | Changelog (diff) | |
| download | synapse-4429e720ae2abb64a8bb58a6b8fa9b01c53429a3.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
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, |