diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-13 15:48:12 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-13 15:48:12 +0100 |
| commit | 17dffef5ec74d789f68096c95d29cdcad57ce5c7 (patch) | |
| tree | c28e54f40c79a4640aaeb1671efe8c1133980c13 /synapse/handlers/federation.py | |
| parent | Merge branch 'develop' into daniel/3pidinvites (diff) | |
| download | synapse-17dffef5ec74d789f68096c95d29cdcad57ce5c7.tar.xz | |
Move event contents into third_party_layout field
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 8197d8b2d0..8606c0d285 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -705,7 +705,8 @@ class FederationHandler(BaseHandler): """ event_content = {"membership": Membership.JOIN} if ThirdPartyInvites.has_join_keys(query): - ThirdPartyInvites.copy_join_keys(query, event_content) + event_content["third_party_invite"] = {} + ThirdPartyInvites.copy_join_keys(query, event_content["third_party_invite"]) builder = self.event_builder_factory.new({ "type": EventTypes.Member, @@ -721,7 +722,7 @@ class FederationHandler(BaseHandler): self.auth.check(event, auth_events=context.current_state) - if ThirdPartyInvites.has_join_keys(event.content): + if ThirdPartyInvites.join_has_third_party_invite(event.content): ThirdPartyInvites.check_key_valid(self.hs.get_simple_http_client(), event) defer.returnValue(event) |