summary refs log tree commit diff
path: root/synapse/federation/federation_client.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-10-13 18:00:38 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-10-13 18:00:38 +0100
commit0c38e8637ff549a21c763f02f52306b5c729d26b (patch)
tree0716833810464862098b2ec939126b59a1de2cd6 /synapse/federation/federation_client.py
parentMove logic into handler (diff)
downloadsynapse-0c38e8637ff549a21c763f02f52306b5c729d26b.tar.xz
Remove unnecessary class-wrapping
Diffstat (limited to 'synapse/federation/federation_client.py')
-rw-r--r--synapse/federation/federation_client.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index 6be83d82e7..d974e920c3 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -25,7 +25,7 @@ from synapse.api.errors import (
 from synapse.util import unwrapFirstError
 from synapse.util.caches.expiringcache import ExpiringCache
 from synapse.util.logutils import log_function
-from synapse.util.thirdpartyinvites import ThirdPartyInvites
+from synapse.util import third_party_invites
 from synapse.events import FrozenEvent
 import synapse.metrics
 
@@ -363,8 +363,8 @@ class FederationClient(FederationBase):
                 continue
 
             args = {}
-            if ThirdPartyInvites.join_has_third_party_invite(content):
-                ThirdPartyInvites.copy_join_keys(content["third_party_invite"], args)
+            if third_party_invites.join_has_third_party_invite(content):
+                args = third_party_invites.extract_join_keys(content)
             try:
                 ret = yield self.transport_layer.make_join(
                     destination, room_id, user_id, args