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
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index d71ab44271..7934f740e0 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -27,7 +27,7 @@ from synapse.api.errors import FederationError, SynapseError, Codes
from synapse.crypto.event_signing import compute_event_signature
-from synapse.util.thirdpartyinvites import ThirdPartyInvites
+from synapse.util import third_party_invites
import simplejson as json
import logging
@@ -232,8 +232,8 @@ class FederationServer(FederationBase):
@defer.inlineCallbacks
def on_make_join_request(self, room_id, user_id, query):
threepid_details = {}
- if ThirdPartyInvites.has_join_keys(query):
- for k in ThirdPartyInvites.JOIN_KEYS:
+ if third_party_invites.has_join_keys(query):
+ for k in third_party_invites.JOIN_KEYS:
if not isinstance(query[k], list) or len(query[k]) != 1:
raise FederationError(
"FATAL",
|
