summary refs log tree commit diff
path: root/synapse/handlers/message.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-08-29 18:39:09 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-08-29 19:00:55 +0100
commit4bfdec1eb28aa272391607b2cf1f24c781d9ba74 (patch)
tree2020a1ff8ff167ab2ed6de764f8fa0e8e91593e1 /synapse/handlers/message.py
parentGive basic feedback on the state of VoIP calls in the UI. (diff)
downloadsynapse-4bfdec1eb28aa272391607b2cf1f24c781d9ba74.tar.xz
Rename 'events_key' to 'room_key' so it matches the name of the event source
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r--synapse/handlers/message.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 3d7f97bcff..c8ff34e5f5 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -274,11 +274,11 @@ class MessageHandler(BaseRoomHandler):
                 messages, token = yield self.store.get_recent_events_for_room(
                     event.room_id,
                     limit=limit,
-                    end_token=now_token.events_key,
+                    end_token=now_token.room_key,
                 )
 
-                start_token = now_token.copy_and_replace("events_key", token[0])
-                end_token = now_token.copy_and_replace("events_key", token[1])
+                start_token = now_token.copy_and_replace("room_key", token[0])
+                end_token = now_token.copy_and_replace("room_key", token[1])
 
                 d["messages"] = {
                     "chunk": [m.get_dict() for m in messages],