diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-15 13:10:30 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-15 13:10:30 +0100 |
| commit | 643b5fcdc81d8f2e39a97dd1a94c78cd8769c613 (patch) | |
| tree | b05cfe5f96645b69635e46d235b963a277c1410b /synapse/federation | |
| parent | Merge branch 'develop' into daniel/3pidinvites (diff) | |
| download | synapse-643b5fcdc81d8f2e39a97dd1a94c78cd8769c613.tar.xz | |
Look for keys on the right objects
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_client.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index d974e920c3..f5b430e046 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -364,7 +364,9 @@ class FederationClient(FederationBase): args = {} if third_party_invites.join_has_third_party_invite(content): - args = third_party_invites.extract_join_keys(content) + args = third_party_invites.extract_join_keys( + content["third_party_invite"] + ) try: ret = yield self.transport_layer.make_join( destination, room_id, user_id, args |