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/federation/federation_client.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/federation/federation_client.py')
| -rw-r--r-- | synapse/federation/federation_client.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index 06b0c7adcf..6be83d82e7 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -363,8 +363,8 @@ class FederationClient(FederationBase): continue args = {} - if ThirdPartyInvites.has_join_keys(content): - ThirdPartyInvites.copy_join_keys(content, args) + if ThirdPartyInvites.join_has_third_party_invite(content): + ThirdPartyInvites.copy_join_keys(content["third_party_invite"], args) try: ret = yield self.transport_layer.make_join( destination, room_id, user_id, args |