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/storage | |
| 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/storage')
| -rw-r--r-- | synapse/storage/roommember.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 08a54cbdd1..9d6bfd5245 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -21,7 +21,7 @@ from ._base import SQLBaseStore from synapse.util.caches.descriptors import cached, cachedInlineCallbacks from synapse.api.constants import Membership -from synapse.types import UserID +from synapse.types import get_domian_from_id import logging @@ -273,10 +273,7 @@ class RoomMemberStore(SQLBaseStore): room_id, membership=Membership.JOIN ) - joined_domains = set( - UserID.from_string(r["user_id"]).domain - for r in rows - ) + joined_domains = set(get_domian_from_id(r["user_id"]) for r in rows) return joined_domains |