diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-30 10:50:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-30 10:50:37 +0100 |
| commit | 55fc17cf4bdc550ece6feb5d4e5bdf10ab452010 (patch) | |
| tree | 16ba7b22e28eedcb4e42043e1487c285fc89546a /synapse/handlers/sync.py | |
| parent | Merge pull request #1050 from matrix-org/erikj/fix_device_sync (diff) | |
| parent | Add to slave store (diff) | |
| download | synapse-55fc17cf4bdc550ece6feb5d4e5bdf10ab452010.tar.xz | |
Merge pull request #1049 from matrix-org/erikj/presence_users_in_room
Use state handler instead of get_users_in_room/get_joined_hosts
Diffstat (limited to '')
| -rw-r--r-- | synapse/handlers/sync.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 5b9bce7f9e..91934b0c81 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -142,6 +142,7 @@ class SyncHandler(object): self.event_sources = hs.get_event_sources() self.clock = hs.get_clock() self.response_cache = ResponseCache(hs) + self.state = hs.get_state_handler() def wait_for_sync_for_user(self, sync_config, since_token=None, timeout=0, full_state=False): @@ -670,7 +671,7 @@ class SyncHandler(object): extra_users_ids = set(newly_joined_users) for room_id in newly_joined_rooms: - users = yield self.store.get_users_in_room(room_id) + users = yield self.state.get_current_user_in_room(room_id) extra_users_ids.update(users) extra_users_ids.discard(user.to_string()) |