summary refs log tree commit diff
path: root/synapse/handlers/message.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-10 14:25:54 +0100
committerErik Johnston <erik@matrix.org>2015-09-10 14:25:54 +0100
commit49ae42bbe1176b9061c17cf7e3829008f608c0a4 (patch)
treed233638a43fc49eae6cadacf7b6df5055096c250 /synapse/handlers/message.py
parentMerge pull request #274 from matrix-org/add_threepid_fix (diff)
downloadsynapse-49ae42bbe1176b9061c17cf7e3829008f608c0a4.tar.xz
Bundle in some room state in the unsigned bit of the invite when sending to invited servers
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r--synapse/handlers/message.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 23b779ad7c..a5d9df8804 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -354,8 +354,12 @@ class MessageHandler(BaseHandler):
             }
 
             if event.membership == Membership.INVITE:
+                time_now = self.clock.time_msec()
                 d["inviter"] = event.sender
 
+                invite_event = yield self.store.get_event(event.event_id)
+                d["invite"] = serialize_event(invite_event, time_now, as_client_event)
+
             rooms_ret.append(d)
 
             if event.membership != Membership.JOIN: