summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-05-24 11:44:55 +0100
committerErik Johnston <erik@matrix.org>2016-05-24 11:44:55 +0100
commit69003039973169097592359f3f34fc32c5bbaeb0 (patch)
tree518e163b17e872be08d51999802b50daa9636534 /synapse/handlers
parentOnly work out newly_joined_users for incremental sync (diff)
downloadsynapse-69003039973169097592359f3f34fc32c5bbaeb0.tar.xz
Don't send down all ephemeral events
Diffstat (limited to '')
-rw-r--r--synapse/handlers/sync.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 476dcf38e2..6f7dd45ef3 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -655,7 +655,9 @@ class SyncHandler(object):
         user_id = sync_result_builder.sync_config.user.to_string()
 
         now_token, ephemeral_by_room = yield self.ephemeral_by_room(
-            sync_result_builder.sync_config, sync_result_builder.now_token
+            sync_result_builder.sync_config,
+            now_token=sync_result_builder.now_token,
+            since_token=sync_result_builder.since_token,
         )
         sync_result_builder.now_token = now_token