diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-05-16 12:59:41 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-05-16 12:59:41 +0100 |
| commit | dd95eb4cb5f1519bfd328249f97f8731c4a11b64 (patch) | |
| tree | 96220dc54d2d6d0b36999c5c01db8d5f5b13b851 /synapse/storage/roommember.py | |
| parent | add a url_preview_ip_range_whitelist config param so we can whitelist the mat... (diff) | |
| parent | fix logo (diff) | |
| download | synapse-dd95eb4cb5f1519bfd328249f97f8731c4a11b64.tar.xz | |
Merge branch 'develop' into matthew/preview_url_ip_whitelist
Diffstat (limited to 'synapse/storage/roommember.py')
| -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 |