diff options
author | Mark Haines <mjark@negativecurvature.net> | 2016-05-17 10:09:34 +0100 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2016-05-17 10:09:34 +0100 |
commit | 3fd8a07fca986db4fbf049f3446570ccda1fb431 (patch) | |
tree | eaf722ed248dbdd4eac823a616dfc4679e709d59 /synapse/handlers/federation.py | |
parent | Fix emailpusher import (diff) | |
parent | Spell "domain" correctly (diff) | |
download | synapse-3fd8a07fca986db4fbf049f3446570ccda1fb431.tar.xz |
Merge pull request #788 from matrix-org/markjh/domian
Spell "domain" correctly
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r-- | synapse/handlers/federation.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index c21d9d4d83..648a505e65 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -33,7 +33,7 @@ from synapse.util.frozenutils import unfreeze from synapse.crypto.event_signing import ( compute_event_signature, add_hashes_and_signatures, ) -from synapse.types import UserID, get_domian_from_id +from synapse.types import UserID, get_domain_from_id from synapse.events.utils import prune_event @@ -453,7 +453,7 @@ class FederationHandler(BaseHandler): joined_domains = {} for u, d in joined_users: try: - dom = get_domian_from_id(u) + dom = get_domain_from_id(u) old_d = joined_domains.get(dom) if old_d: joined_domains[dom] = min(d, old_d) @@ -744,7 +744,7 @@ class FederationHandler(BaseHandler): try: if k[0] == EventTypes.Member: if s.content["membership"] == Membership.JOIN: - destinations.add(get_domian_from_id(s.state_key)) + destinations.add(get_domain_from_id(s.state_key)) except: logger.warn( "Failed to get destination from event %s", s.event_id @@ -970,7 +970,7 @@ class FederationHandler(BaseHandler): try: if k[0] == EventTypes.Member: if s.content["membership"] == Membership.LEAVE: - destinations.add(get_domian_from_id(s.state_key)) + destinations.add(get_domain_from_id(s.state_key)) except: logger.warn( "Failed to get destination from event %s", s.event_id |