summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-21 15:06:22 +0100
committerErik Johnston <erik@matrix.org>2014-08-21 15:06:22 +0100
commitc6950b18cca665f6afe8ac00fcfa2322d8b35544 (patch)
tree22692afbdc4cffd4072a70d27e146ff35236606e /synapse/handlers
parentStop internal keys from getting into SynapseEvents (diff)
downloadsynapse-c6950b18cca665f6afe8ac00fcfa2322d8b35544.tar.xz
Return the current state in the initial sync api.
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 6229ee9bfa..91415afbba 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -279,6 +279,9 @@ class MessageHandler(BaseHandler):
                     "start": token[0],
                     "end": token[1],
                 }
+
+                current_state = yield self.store.get_current_state(event.room_id)
+                d["state"] = [c.get_dict() for c in current_state]
             except:
                 logger.exception("Failed to get snapshot")