mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 14:20:23 +00:00
Change the way we figure out presence updates for small deltas
This commit is contained in:
parent
02e928cf9b
commit
c77dae7a1a
2 changed files with 52 additions and 17 deletions
|
@ -845,11 +845,31 @@ class PresenceEventSource(object):
|
|||
room_ids = room_ids or []
|
||||
|
||||
presence = self.hs.get_handlers().presence_handler
|
||||
stream_change_cache = self.store.presence_stream_cache
|
||||
|
||||
if not room_ids:
|
||||
rooms = yield self.store.get_rooms_for_user(user_id)
|
||||
room_ids = set(e.room_id for e in rooms)
|
||||
else:
|
||||
room_ids = set(room_ids)
|
||||
|
||||
plist = yield self.store.get_presence_list_accepted(user.localpart)
|
||||
friends = set(row["observed_user_id"] for row in plist)
|
||||
friends.add(user_id) # So that we receive our own presence
|
||||
|
||||
user_ids_changed = set()
|
||||
if from_key and from_key < 100:
|
||||
changed = stream_change_cache.get_all_entities_changed(from_key)
|
||||
|
||||
for other_user_id in changed:
|
||||
if other_user_id in friends:
|
||||
user_ids_changed.add(other_user_id)
|
||||
continue
|
||||
other_rooms = yield self.store.get_rooms_for_user(other_user_id)
|
||||
if room_ids.intersection(e.room_id for e in other_rooms):
|
||||
user_ids_changed.add(other_user_id)
|
||||
continue
|
||||
else:
|
||||
user_ids_to_check = set()
|
||||
for room_id in room_ids:
|
||||
users = yield self.store.get_users_in_room(room_id)
|
||||
|
@ -862,10 +882,8 @@ class PresenceEventSource(object):
|
|||
# not in any rooms, but still.
|
||||
user_ids_to_check.add(user_id)
|
||||
|
||||
max_token = self.store.get_current_presence_token()
|
||||
|
||||
if from_key:
|
||||
user_ids_changed = self.store.presence_stream_cache.get_entities_changed(
|
||||
user_ids_changed = stream_change_cache.get_entities_changed(
|
||||
user_ids_to_check, from_key,
|
||||
)
|
||||
else:
|
||||
|
@ -873,6 +891,7 @@ class PresenceEventSource(object):
|
|||
|
||||
updates = yield presence.current_state_for_users(user_ids_changed)
|
||||
|
||||
max_token = self.store.get_current_presence_token()
|
||||
now = self.clock.time_msec()
|
||||
|
||||
defer.returnValue(([
|
||||
|
|
|
@ -85,6 +85,22 @@ class StreamChangeCache(object):
|
|||
|
||||
return result
|
||||
|
||||
def get_all_entities_changed(self, stream_pos):
|
||||
"""Returns all entites that have had new things since the given
|
||||
position. If the position is too old it will return None.
|
||||
"""
|
||||
assert type(stream_pos) is int
|
||||
|
||||
if stream_pos >= self._earliest_known_stream_pos:
|
||||
keys = self._cache.keys()
|
||||
i = keys.bisect_right(stream_pos)
|
||||
|
||||
return (
|
||||
self._cache[k] for k in keys[i:]
|
||||
)
|
||||
else:
|
||||
return None
|
||||
|
||||
def entity_has_changed(self, entity, stream_pos):
|
||||
"""Informs the cache that the entity has been changed at the given
|
||||
position.
|
||||
|
|
Loading…
Reference in a new issue