diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-23 15:51:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-23 15:51:48 +0000 |
| commit | 9b1e552b5163aad84a3ae4fd70116d3e782fb443 (patch) | |
| tree | 19d827838d10688da26e3fa5503c63b71fd34db0 /synapse/storage | |
| parent | Add storage method have_events (diff) | |
| parent | Update .gitignore (diff) | |
| download | synapse-9b1e552b5163aad84a3ae4fd70116d3e782fb443.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/roommember.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index e59e65529b..c69dd995ce 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -20,6 +20,7 @@ from collections import namedtuple from ._base import SQLBaseStore from synapse.api.constants import Membership +from synapse.types import UserID import logging @@ -39,7 +40,7 @@ class RoomMemberStore(SQLBaseStore): """ try: target_user_id = event.state_key - domain = self.hs.parse_userid(target_user_id).domain + domain = UserID.from_string(target_user_id).domain except: logger.exception( "Failed to parse target_user_id=%s", target_user_id @@ -84,7 +85,7 @@ class RoomMemberStore(SQLBaseStore): for e in member_events: try: joined_domains.add( - self.hs.parse_userid(e.state_key).domain + UserID.from_string(e.state_key).domain ) except: # FIXME: How do we deal with invalid user ids in the db? |