diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-09 13:50:29 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-09 13:50:37 +0000 |
| commit | 82631c5f948cfb3cb133379e0e5ad10811d706a2 (patch) | |
| tree | 1658266f7984753dd51675fbe5a63b6b201be921 /synapse/handlers/sync.py | |
| parent | Merge pull request #560 from matrix-org/daniel/tox (diff) | |
| download | synapse-82631c5f948cfb3cb133379e0e5ad10811d706a2.tar.xz | |
Fix unit tests
Diffstat (limited to 'synapse/handlers/sync.py')
| -rw-r--r-- | synapse/handlers/sync.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 3e5f27046e..446f8bbe93 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -629,7 +629,10 @@ class SyncHandler(BaseHandler): room_key = now_token.room_key end_key = room_key - limited = recents is None or newly_joined_room or timeline_limit < len(recents) + if recents is None or newly_joined_room or timeline_limit < len(recents): + limited = True + else: + limited = False if recents is not None: recents = sync_config.filter_collection.filter_room_timeline(recents) |