mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-11 09:44:56 -04:00
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
This commit is contained in:
commit
088d52ba6c
10 changed files with 401 additions and 149 deletions
|
@ -599,14 +599,14 @@ class PresenceHandler(object):
|
|||
for user_id in user_ids
|
||||
}
|
||||
|
||||
missing = [user_id for user_id, state in states.items() if not state]
|
||||
missing = [user_id for user_id, state in states.iteritems() if not state]
|
||||
if missing:
|
||||
# There are things not in our in memory cache. Lets pull them out of
|
||||
# the database.
|
||||
res = yield self.store.get_presence_for_users(missing)
|
||||
states.update(res)
|
||||
|
||||
missing = [user_id for user_id, state in states.items() if not state]
|
||||
missing = [user_id for user_id, state in states.iteritems() if not state]
|
||||
if missing:
|
||||
new = {
|
||||
user_id: UserPresenceState.default(user_id)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue