summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-26 19:40:29 +0100
committerErik Johnston <erik@matrix.org>2014-08-26 19:40:29 +0100
commit67c5f89244b9ff5f1deca199f35ef7240d0549cc (patch)
tree04abccb8896322ecf086bdd18d290f3dbfc537a7 /synapse/handlers/room.py
parentFix exceptions so that the event stream works. Presence like events are turne... (diff)
downloadsynapse-67c5f89244b9ff5f1deca199f35ef7240d0549cc.tar.xz
Enable presence again. Fix up api to match old api.
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 20b4bbb665..6fbe84ea40 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -126,8 +126,8 @@ class MessageHandler(BaseHandler):
 
         chunk = {
             "chunk": [e.get_dict() for e in events],
-            "start_token": from_token.to_string(),
-            "end_token": next_token.to_string(),
+            "start": from_token.to_string(),
+            "end": next_token.to_string(),
         }
 
         defer.returnValue(chunk)