diff options
| author | Erik Johnston <erik@matrix.org> | 2016-05-09 13:21:06 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-05-09 13:21:06 +0100 |
| commit | c9eb6dfc1bceb3a7fe9e5cb599df9ba8a05ff839 (patch) | |
| tree | e6791617720f3d92c417afd97d382eadb2123242 /synapse/handlers/presence.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user (diff) | |
| parent | Merge pull request #773 from matrix-org/erikj/get_domian_from_id (diff) | |
| download | synapse-c9eb6dfc1bceb3a7fe9e5cb599df9ba8a05ff839.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
Diffstat (limited to 'synapse/handlers/presence.py')
| -rw-r--r-- | synapse/handlers/presence.py | 4 |
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 |