This commit is contained in:
Erik Johnston 2017-04-11 15:34:55 +01:00
parent 414522aed5
commit a8c8e4efd4
2 changed files with 9 additions and 1 deletions

View File

@ -191,9 +191,15 @@ class FederationRemoteSendQueue(object):
self.notifier.on_new_replication_data() self.notifier.on_new_replication_data()
def send_presence(self, states): def send_presence(self, states):
"""As per TransactionQueue""" """As per TransactionQueue
Args:
states (list(UserPresenceState))
"""
pos = self._next_pos() pos = self._next_pos()
# We only want to send presence for our own users, so lets always just
# filter here just in case.
local_states = filter(lambda s: self.is_mine_id(s.user_id), states) local_states = filter(lambda s: self.is_mine_id(s.user_id), states)
self.presence_map.update({state.user_id: state for state in local_states}) self.presence_map.update({state.user_id: state for state in local_states})

View File

@ -251,6 +251,8 @@ class TransactionQueue(object):
# First we queue up the new presence by user ID, so multiple presence # First we queue up the new presence by user ID, so multiple presence
# updates in quick successtion are correctly handled # updates in quick successtion are correctly handled
# We only want to send presence for our own users, so lets always just
# filter here just in case.
self.pending_presence.update({ self.pending_presence.update({
state.user_id: state for state in states state.user_id: state for state in states
if self.is_mine_id(state.user_id) if self.is_mine_id(state.user_id)