diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-12 16:55:55 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-12 16:55:55 +0000 |
| commit | ea47760bd8cb73e86590eddfeafa9b32116f2c12 (patch) | |
| tree | ec44351e01ed3b999427b8566604351b4de31292 /synapse | |
| parent | Merge pull request #478 from matrix-org/daniel/userobject (diff) | |
| parent | Don't include old left rooms (diff) | |
| download | synapse-ea47760bd8cb73e86590eddfeafa9b32116f2c12.tar.xz | |
Merge pull request #481 from matrix-org/erikj/SYN-589
Don't include old left rooms in /sync
Diffstat (limited to 'synapse')
| -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, ) |