diff options
| author | Erik Johnston <erik@matrix.org> | 2017-04-11 15:34:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-04-11 15:35:49 +0100 |
| commit | a8c8e4efd4055be316c2b38624e7afd77c57b971 (patch) | |
| tree | d7e36f5f6b049eba8b80299a3ba316b4f6fa5fd6 | |
| parent | Move get_interested_parties (diff) | |
| download | synapse-a8c8e4efd4055be316c2b38624e7afd77c57b971.tar.xz | |
Comment
| -rw-r--r-- | synapse/federation/send_queue.py | 8 | ||||
| -rw-r--r-- | synapse/federation/transaction_queue.py | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/synapse/federation/send_queue.py b/synapse/federation/send_queue.py index 7e52a55eda..19cb757acc 100644 --- a/synapse/federation/send_queue.py +++ b/synapse/federation/send_queue.py @@ -191,9 +191,15 @@ class FederationRemoteSendQueue(object): self.notifier.on_new_replication_data() def send_presence(self, states): - """As per TransactionQueue""" + """As per TransactionQueue + + Args: + states (list(UserPresenceState)) + """ 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) self.presence_map.update({state.user_id: state for state in local_states}) diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 08ceda31a6..260a472255 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -251,6 +251,8 @@ class TransactionQueue(object): # First we queue up the new presence by user ID, so multiple presence # 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({ state.user_id: state for state in states if self.is_mine_id(state.user_id) |