1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 6229ee9bfa..d9809bd6de 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -264,6 +264,10 @@ class MessageHandler(BaseHandler):
                 "room_id": event.room_id,
                 "membership": event.membership,
             }
+
+            if event.membership == Membership.INVITE:
+                d["inviter"] = event.user_id
+
             ret.append(d)
 
             if event.membership != Membership.JOIN:
@@ -279,6 +283,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")