diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-01 13:29:17 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-01 13:29:17 +0100 |
| commit | a9512d0994bba12cd3684d37030ce68ebe9330b3 (patch) | |
| tree | 6a80e8f1fa89fccf0cd90ea251edb7c1fb28224c /synapse/handlers/message.py | |
| parent | Merge branch 'develop' into server2server_tls (diff) | |
| parent | add another public wishlist item (diff) | |
| download | synapse-a9512d0994bba12cd3684d37030ce68ebe9330b3.tar.xz | |
Merge branch 'develop' into server2server_tls
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 6 |
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], |