summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-03-19 18:19:50 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-03-19 18:19:50 +0100
commitb6ed4f55acf7af44af1d33097407d2dd7f08b5a5 (patch)
treee4877c8022cda6b7953edc8066a6af8dc329082a /synapse/handlers
parentMerge branch 'develop' into babolivier/msc3026 (diff)
downloadsynapse-b6ed4f55acf7af44af1d33097407d2dd7f08b5a5.tar.xz
Incorporate review
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/presence.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 492c4478fa..da92feacc9 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -751,7 +751,7 @@ class PresenceHandler(BasePresenceHandler):
             new_fields["status_msg"] = msg
 
         if presence == PresenceState.ONLINE or (
-            self._busy_presence_enabled and presence == PresenceState.BUSY
+            presence == PresenceState.BUSY and self._busy_presence_enabled
         ):
             new_fields["last_active_ts"] = self.clock.time_msec()