summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-10-13 15:48:12 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-10-13 15:48:12 +0100
commit17dffef5ec74d789f68096c95d29cdcad57ce5c7 (patch)
treec28e54f40c79a4640aaeb1671efe8c1133980c13 /synapse/rest
parentMerge branch 'develop' into daniel/3pidinvites (diff)
downloadsynapse-17dffef5ec74d789f68096c95d29cdcad57ce5c7.tar.xz
Move event contents into third_party_layout field
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/room.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index ff84affea3..1cb6ba4f1f 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -456,7 +456,8 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
         }
 
         if membership_action == "join" and ThirdPartyInvites.has_join_keys(content):
-            ThirdPartyInvites.copy_join_keys(content, event_content)
+            event_content["third_party_invite"] = {}
+            ThirdPartyInvites.copy_join_keys(content, event_content["third_party_invite"])
 
         yield msg_handler.create_and_send_event(
             {