summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-29 13:28:02 +0100
committerErik Johnston <erik@matrix.org>2014-08-29 13:28:06 +0100
commitee06023573811a06853d28b613cc823282aa3490 (patch)
tree0def411f45674ae0e631465d0fbbf1d40c9fadd8 /synapse/handlers
parentMerge branch 'develop' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-ee06023573811a06853d28b613cc823282aa3490.tar.xz
Get the equalities right.
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/message.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 32548e66fb..3d7f97bcff 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -277,10 +277,13 @@ class MessageHandler(BaseRoomHandler):
                     end_token=now_token.events_key,
                 )
 
+                start_token = now_token.copy_and_replace("events_key", token[0])
+                end_token = now_token.copy_and_replace("events_key", token[1])
+
                 d["messages"] = {
                     "chunk": [m.get_dict() for m in messages],
-                    "start": token[0],
-                    "end": token[1],
+                    "start": start_token.to_string(),
+                    "end": end_token.to_string(),
                 }
 
                 current_state = yield self.store.get_current_state(