diff options
| author | David Baker <dbkr@matrix.org> | 2014-12-02 13:50:05 +0000 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-12-02 13:50:05 +0000 |
| commit | 7642d95d5e90bab130b33dc27f10e347072e0294 (patch) | |
| tree | 08c618bc5daeceb90bb8a47e3800b88c12d83427 /synapse/handlers/message.py | |
| parent | More work on pushers. Attempt to do HTTP pokes. Not sure if the actual HTTP p... (diff) | |
| parent | Add non-working jitsi meet bridge (diff) | |
| download | synapse-7642d95d5e90bab130b33dc27f10e347072e0294.tar.xz | |
Merge branch 'develop' into pushers
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 06a4e173f6..42dc4d46f3 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -243,7 +243,7 @@ class MessageHandler(BaseHandler): public_room_ids = [r["room_id"] for r in public_rooms] limit = pagin_config.limit - if not limit: + if limit is None: limit = 10 for event in room_list: @@ -306,7 +306,7 @@ class MessageHandler(BaseHandler): auth_user = self.hs.parse_userid(user_id) # TODO: These concurrently - state_tuples = yield self.store.get_current_state(room_id) + state_tuples = yield self.state_handler.get_current_state(room_id) state = [self.hs.serialize_event(x) for x in state_tuples] member_event = (yield self.store.get_room_member( |