diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-01-13 11:46:07 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-01-13 11:46:07 +0000 |
| commit | f4dad9f63995c8aa493ef884f793ee0155549a50 (patch) | |
| tree | 879daa5a1d430dadc74df56bbf1c97136381b59f /synapse/handlers/sync.py | |
| parent | Delete the table objects from TransactionStore (diff) | |
| parent | bulk_get_push_rules should handle empty lists (diff) | |
| download | synapse-f4dad9f63995c8aa493ef884f793ee0155549a50.tar.xz | |
Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into markjh/table_name
Conflicts: synapse/storage/push_rule.py
Diffstat (limited to 'synapse/handlers/sync.py')
| -rw-r--r-- | synapse/handlers/sync.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 27fdbe28ee..33c1a4512c 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -585,7 +585,8 @@ class SyncHandler(BaseHandler): sync_config, leave_event, since_token, tags_by_room, account_data_by_room ) - archived.append(room_sync) + if room_sync: + archived.append(room_sync) invited = [ InvitedSyncResult(room_id=event.room_id, invite=event) @@ -726,6 +727,9 @@ class SyncHandler(BaseHandler): leave_token = since_token.copy_and_replace("room_key", stream_token) + if since_token.is_after(leave_token): + defer.returnValue(None) + batch = yield self.load_filtered_recents( leave_event.room_id, sync_config, leave_token, since_token, ) |