summary refs log tree commit diff
path: root/synapse/handlers/presence.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-05-09 13:21:00 +0100
committerErik Johnston <erik@matrix.org>2016-05-09 13:21:00 +0100
commit3f84da139c99e6b5f38c01bd1614e9f0a55c2e27 (patch)
tree80847097e45ffdf986eb21eb2fd4e0f0171a662f /synapse/handlers/presence.py
parentMerge pull request #764 from matrix-org/erikj/replication_logging (diff)
parentAdd and use get_domian_from_id (diff)
downloadsynapse-3f84da139c99e6b5f38c01bd1614e9f0a55c2e27.tar.xz
Merge pull request #773 from matrix-org/erikj/get_domian_from_id
Add and use get_domain_from_id
Diffstat (limited to 'synapse/handlers/presence.py')
-rw-r--r--synapse/handlers/presence.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 639567953a..a8529cce42 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -33,7 +33,7 @@ from synapse.util.logcontext import preserve_fn
 from synapse.util.logutils import log_function
 from synapse.util.metrics import Measure
 from synapse.util.wheel_timer import WheelTimer
-from synapse.types import UserID
+from synapse.types import UserID, get_domian_from_id
 import synapse.metrics
 
 from ._base import BaseHandler
@@ -440,7 +440,7 @@ class PresenceHandler(BaseHandler):
             if not local_states:
                 continue
 
-            host = UserID.from_string(user_id).domain
+            host = get_domian_from_id(user_id)
             hosts_to_states.setdefault(host, []).extend(local_states)
 
         # TODO: de-dup hosts_to_states, as a single host might have multiple