diff options
author | Erik Johnston <erik@matrix.org> | 2016-09-05 11:53:11 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-09-05 11:53:11 +0100 |
commit | bb36b93f71bc6f11401cb1154f7415f0b9326009 (patch) | |
tree | 69f8c8fd451458844ceb830df9dbe8332b3d0d0a /synapse/handlers/sync.py | |
parent | Add comments (diff) | |
parent | Merge pull request #1067 from matrix-org/markjh/idempotent (diff) | |
download | synapse-bb36b93f71bc6f11401cb1154f7415f0b9326009.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage
Diffstat (limited to 'synapse/handlers/sync.py')
-rw-r--r-- | synapse/handlers/sync.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 14f2032afa..b5962f4f5a 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -576,7 +576,7 @@ class SyncHandler(object): logger.debug("Getting messages up to %d", now_token.to_device_key) messages, stream_id = yield self.store.get_new_messages_for_device( - user_id, device_id, now_token.to_device_key + user_id, device_id, since_stream_id, now_token.to_device_key ) logger.debug("Got messages up to %d: %r", stream_id, messages) sync_result_builder.now_token = now_token.copy_and_replace( |