summary refs log tree commit diff
path: root/synapse/handlers/message.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-03-04 16:35:08 +0000
committerMark Haines <mjark@negativecurvature.net>2016-03-04 16:35:08 +0000
commitb7a3be693b06b325d74060df6f809580e1225acd (patch)
tree6ccd3c898749e0ea98e820c586895b66cbc626b2 /synapse/handlers/message.py
parentMerge pull request #625 from matrix-org/erikj/kick_ban_sync (diff)
parentPrefill from the correct stream (diff)
downloadsynapse-b7a3be693b06b325d74060df6f809580e1225acd.tar.xz
Merge pull request #618 from matrix-org/markjh/pushrule_stream
Add a stream for push rule updates
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r--synapse/handlers/message.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index e92c74d07b..5c50c611ba 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -662,8 +662,8 @@ class MessageHandler(BaseHandler):
             user_id, messages, is_peeking=is_peeking
         )
 
-        start_token = StreamToken(token[0], 0, 0, 0, 0)
-        end_token = StreamToken(token[1], 0, 0, 0, 0)
+        start_token = StreamToken.START.copy_and_replace("room_key", token[0])
+        end_token = StreamToken.START.copy_and_replace("room_key", token[1])
 
         time_now = self.clock.time_msec()