Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-18 08:24:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Check presence token interval is less than 100, rather than the token itself

Browse Source
This commit is contained in:
Erik Johnston 2016-02-23 15:47:37 +00:00
parent e3e0ac6ec7
commit b5f77eb12a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/handlers/presence.py
View File

@ -854,13 +854,15 @@ class PresenceEventSource(object):
else: else:
room_ids = set(room_ids) room_ids = set(room_ids)
max_token = self.store.get_current_presence_token()
plist = yield self.store.get_presence_list_accepted(user.localpart) plist = yield self.store.get_presence_list_accepted(user.localpart)
friends = set(row["observed_user_id"] for row in plist) friends = set(row["observed_user_id"] for row in plist)
friends.add(user_id) # So that we receive our own presence friends.add(user_id) # So that we receive our own presence
user_ids_changed = set() user_ids_changed = set()
changed = None changed = None
if from_key and from_key < 100: if from_key and max_token - from_key < 100:
# For small deltas, its quicker to get all changes and then # For small deltas, its quicker to get all changes and then
# work out if we share a room or they're in our presence list # work out if we share a room or they're in our presence list
changed = stream_change_cache.get_all_entities_changed(from_key) changed = stream_change_cache.get_all_entities_changed(from_key)
@ -883,8 +885,7 @@ class PresenceEventSource(object):
users = yield self.store.get_users_in_room(room_id) users = yield self.store.get_users_in_room(room_id)
user_ids_to_check.update(users) user_ids_to_check.update(users)
plist = yield self.store.get_presence_list_accepted(user.localpart) user_ids_to_check.update(friends)
user_ids_to_check.update([row["observed_user_id"] for row in plist])
# Always include yourself. Only really matters for when the user is # Always include yourself. Only really matters for when the user is
# not in any rooms, but still. # not in any rooms, but still.
@ -899,7 +900,6 @@ class PresenceEventSource(object):
updates = yield presence.current_state_for_users(user_ids_changed) updates = yield presence.current_state_for_users(user_ids_changed)
max_token = self.store.get_current_presence_token()
now = self.clock.time_msec() now = self.clock.time_msec()
defer.returnValue(([ defer.returnValue(([