From 68b9eb694f0896f11f0699a7e01bd7fb9210dba4 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 15 Apr 2021 14:13:45 +0100 Subject: Tidy up hs.get_federation_sender() calls --- synapse/handlers/presence.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'synapse/handlers/presence.py') diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index 1255ceca55..8b1d8c5ad6 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -287,9 +287,7 @@ class WorkerPresenceHandler(BasePresenceHandler): self.notifier = hs.get_notifier() self.instance_id = hs.get_instance_id() - self._federation = None - if hs.should_send_federation(): - self._federation = hs.get_federation_sender() + self._federation = hs.get_federation_sender() # user_id -> last_sync_ms. Lists the users that have stopped syncing # but we haven't notified the master of that yet @@ -506,9 +504,7 @@ class PresenceHandler(BasePresenceHandler): self.presence_router = hs.get_presence_router() self._presence_enabled = hs.config.use_presence - self.federation_sender = None - if hs.should_send_federation(): - self.federation_sender = hs.get_federation_sender() + self.federation_sender = hs.get_federation_sender() federation_registry = hs.get_federation_registry() @@ -1900,11 +1896,9 @@ class PresenceFederationQueue: self._queue_presence_updates = True # The federation sender if this instance is a federation sender. - self._federation = None - - if hs.should_send_federation(): - self._federation = hs.get_federation_sender() + self._federation = hs.get_federation_sender() + if self._federation: # We don't bother queuing up presence states if only this instance # is sending federation. if hs.config.worker.federation_shard_config.instances == [ -- cgit 1.5.1