diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-05-17 10:43:19 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-05-17 10:43:19 +0100 |
| commit | 1ed33784a6a7a7fb59ba96edf78df3367cff5a44 (patch) | |
| tree | 71b6969dc6785e03e20eaca7d771bde7ece1eab2 /synapse/handlers/sync.py | |
| parent | Merge pull request #787 from matrix-org/markjh/liberate_presence_handler (diff) | |
| parent | Remove unused get_joined_rooms_for_user (diff) | |
| download | synapse-1ed33784a6a7a7fb59ba96edf78df3367cff5a44.tar.xz | |
Merge pull request #789 from matrix-org/markjh/member_cleanup
Cleanup room member handler
Diffstat (limited to 'synapse/handlers/sync.py')
| -rw-r--r-- | synapse/handlers/sync.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index b30102f472..4bdb0aef84 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -485,7 +485,6 @@ class SyncHandler(BaseHandler): sync_config, now_token, since_token ) - rm_handler = self.hs.get_handlers().room_member_handler app_service = yield self.store.get_app_service_by_user_id( sync_config.user.to_string() ) @@ -493,9 +492,10 @@ class SyncHandler(BaseHandler): rooms = yield self.store.get_app_service_rooms(app_service) joined_room_ids = set(r.room_id for r in rooms) else: - joined_room_ids = yield rm_handler.get_joined_rooms_for_user( - sync_config.user + rooms = yield self.store.get_rooms_for_user( + sync_config.user.to_string() ) + joined_room_ids = set(r.room_id for r in rooms) user_id = sync_config.user.to_string() |