From 4eb8f84aa8fc735e228f66d11c355625bb14c1cf Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 18 Aug 2014 16:20:21 +0100
Subject: Make snapshot_all_rooms return results in the correct form, including
 start and end tokens.

---
 synapse/handlers/room.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'synapse/handlers/room.py')

diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index cdc98d2b08..9e10235fa0 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -269,11 +269,16 @@ class MessageHandler(BaseHandler):
             if event.membership != Membership.JOIN:
                 continue
             try:
-                messages = yield self.store.get_recent_events_for_room(
+                messages, token = yield self.store.get_recent_events_for_room(
                     event.room_id,
                     limit=50,
                 )
-                d["messages"] = [m.get_dict() for m in messages]
+
+                d["messages"] = {
+                    "chunk": [m.get_dict() for m in messages],
+                    "start": token[0],
+                    "end": token[1],
+                }
             except:
                 pass
 
-- 
cgit 1.4.1