From b6ed4f55acf7af44af1d33097407d2dd7f08b5a5 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Fri, 19 Mar 2021 18:19:50 +0100
Subject: [PATCH] Incorporate review
---
synapse/handlers/presence.py | 2 +-
synapse/rest/client/versions.py | 2 +-
2 files changed, 2 insertions(+), 2 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()
diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py
index f387d29b57..3e3d8839f4 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -82,7 +82,7 @@ class VersionsRestServlet(RestServlet):
"io.element.e2ee_forced.private": self.e2ee_forced_private,
"io.element.e2ee_forced.trusted_private": self.e2ee_forced_trusted_private,
# Supports the busy presence state described in MSC3026.
- "org.matrix.msc3026.busy_presence": True,
+ "org.matrix.msc3026.busy_presence": self.config.experimental.msc3026_enabled,
},
},
)
--
GitLab