Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 10:56:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1049 from matrix-org/erikj/presence_users_in_room

Browse source 
Use state handler instead of get_users_in_room/get_joined_hosts
This commit is contained in:
Erik Johnston 2016-08-30 10:50:37 +01:00 • committed by GitHub
commit 55fc17cf4b
14 changed files with 55 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/handlers/sync.py
View file

@ -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())