summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-09-02 16:18:34 +0100
committerGitHub <noreply@github.com>2016-09-02 16:18:34 +0100
commit81b94c5750979488eadeb8435013540ad11b30d1 (patch)
treee04dd85d44ee456cd2cfb687f55b516406f21241 /synapse/handlers
parentExplicitly specify state_key for history_visibility fetching (diff)
parentOnly return new device messages in /sync (diff)
downloadsynapse-81b94c5750979488eadeb8435013540ad11b30d1.tar.xz
Merge pull request #1066 from matrix-org/markjh/direct_to_device_lowerbound
Only return new device messages in /sync
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/sync.py2
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(