Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-09-22 09:54:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary class-wrapping

Browse source
This commit is contained in:
Daniel Wagner-Hall 2015-10-13 18:00:38 +01:00
parent 14edea1aff
commit 0c38e8637f
8 changed files with 94 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/federation/federation_client.py
View file

@ -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

6
synapse/federation/federation_server.py
View file

@ -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",