summary refs log tree commit diff
path: root/synapse/api/streams
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-15 15:28:54 +0100
committerErik Johnston <erik@matrix.org>2014-08-15 15:28:54 +0100
commit01f089d9fbb9b89fa143ac44e51529fa8ed7ec12 (patch)
tree1f3544621b65749fd379fbb328a1745d775ef2fa /synapse/api/streams
parentStart chagning the events stream to work with the new DB schema (diff)
downloadsynapse-01f089d9fbb9b89fa143ac44e51529fa8ed7ec12.tar.xz
Correctly return new token when returning events. Serialize events correctly.
Diffstat (limited to 'synapse/api/streams')
-rw-r--r--synapse/api/streams/event.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/api/streams/event.py b/synapse/api/streams/event.py
index 427363cad4..895a96b5b9 100644
--- a/synapse/api/streams/event.py
+++ b/synapse/api/streams/event.py
@@ -160,7 +160,7 @@ class EventStream(PaginationStream):
                 self.user_id, from_pkey, to_pkey, limit
             )
 
-            chunk += event_chunk
+            chunk += [e.get_dict() for e in event_chunk]
             next_ver.append(str(max_pkey))
 
         defer.returnValue((chunk, EventStream.SEPARATOR.join(next_ver)))