From 0b56481caafc56c2e624d4b6506c91fc3913615e Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Fri, 19 Mar 2021 16:11:08 +0100
Subject: Fix lint
---
synapse/handlers/presence.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
(limited to 'synapse/handlers')
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 372017590d..492c4478fa 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -732,12 +732,12 @@ class PresenceHandler(BasePresenceHandler):
PresenceState.ONLINE,
PresenceState.UNAVAILABLE,
PresenceState.OFFLINE,
+ PresenceState.BUSY,
)
- if self._busy_presence_enabled:
- valid_presence += (PresenceState.BUSY,)
-
- if presence not in valid_presence:
+ if presence not in valid_presence or (
+ presence == PresenceState.BUSY and not self._busy_presence_enabled
+ ):
raise SynapseError(400, "Invalid presence state")
user_id = target_user.to_string()
@@ -750,9 +750,8 @@ class PresenceHandler(BasePresenceHandler):
msg = status_msg if presence != PresenceState.OFFLINE else None
new_fields["status_msg"] = msg
- if (
- presence == PresenceState.ONLINE or
- (self._busy_presence_enabled and presence == PresenceState.BUSY)
+ if presence == PresenceState.ONLINE or (
+ self._busy_presence_enabled and presence == PresenceState.BUSY
):
new_fields["last_active_ts"] = self.clock.time_msec()
--
cgit 1.5.1