Put room state in room initialSync output - I guess this is right; I really can't find any other tests similar...

1 files changed, 5 insertions, 2 deletions

diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py

index bb1290fd05..d8764a8933 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -336,10 +336,13 @@ class MessageHandler(BaseHandler):
                       feedback=False):
         yield self.auth.check_joined_room(room_id, user_id)
 
+        state_tuples = yield self.store.get_current_state(room_id)
+        state = [self.hs.serialize_event(x) for x in state_tuples]
+
         defer.returnValue({
             #"membership": membership,
             "room_id": room_id,
             #"messages": messages,
-            #"state": state,
-            #"presence": presence,
+            "state": state,
+            #"presence": presence
         })