diff options
author | Erik Johnston <erik@matrix.org> | 2014-08-29 14:22:04 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-08-29 14:22:04 +0100 |
commit | 8e2d4c6da55d2a21492f8610d595046f07d9887e (patch) | |
tree | 85ca2f67dd9552a3884d76d7d645adfb88e179e4 /synapse/handlers/message.py | |
parent | Create the correct events with the right configuration when creating a new room. (diff) | |
parent | Merge branch 'release-v0.1.0' into develop (diff) | |
download | synapse-8e2d4c6da55d2a21492f8610d595046f07d9887e.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r-- | synapse/handlers/message.py | 7 |
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( |