diff options
| author | David Baker <dave@matrix.org> | 2016-05-10 14:40:19 +0200 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-05-10 14:40:19 +0200 |
| commit | 997db0464828c8e8eac7dfa055f4fcd25e89cd29 (patch) | |
| tree | d10252566e9bc96a9bdf95bcd37e4db4ead6ab62 /synapse/storage/roommember.py | |
| parent | More consistent config naming (diff) | |
| parent | Merge pull request #773 from matrix-org/erikj/get_domian_from_id (diff) | |
| download | synapse-997db0464828c8e8eac7dfa055f4fcd25e89cd29.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
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 |