summary refs log tree commit diff
path: root/synapse/handlers
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/handlers
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/handlers')
-rw-r--r--synapse/handlers/room.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 3451250008..9261984b7e 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -255,7 +255,10 @@ class MessageHandler(BaseHandler):
         ret = []
 
         for event in room_list:
-            d = event.get_dict()
+            d = {
+                "room_id": event.room_id,
+                "membership": event.membership,
+            }
             ret.append(d)
 
             if event.membership != Membership.JOIN: