diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-31 16:08:20 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-31 16:08:20 +0100 |
| commit | 3eb45eba0e387dacb67158efe323f19731799c79 (patch) | |
| tree | 79d942de91b8c9a940e787da9b4a329047139a80 /synapse/handlers/message.py | |
| parent | Add store for server certificates and keys (diff) | |
| parent | Add config tree to synapse. Add support for reading config from a file (diff) | |
| download | synapse-3eb45eba0e387dacb67158efe323f19731799c79.tar.xz | |
Merge branch 'develop' into server2server_tls
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( |