summary refs log tree commit diff
path: root/synapse/federation/federation_server.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_server.py
parentMove logic into handler (diff)
downloadsynapse-0c38e8637ff549a21c763f02f52306b5c729d26b.tar.xz
Remove unnecessary class-wrapping
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r--synapse/federation/federation_server.py6
1 files changed, 3 insertions, 3 deletions
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",