OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Incorporate review

pull/9644/head
Brendan Abolivier 2021-03-19 18:19:50 +01:00
parent 592d6305fd
commit b6ed4f55ac
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/handlers/presence.py
View File

@ -751,7 +751,7 @@ class PresenceHandler(BasePresenceHandler):
new_fields["status_msg"] = msg new_fields["status_msg"] = msg
if presence == PresenceState.ONLINE or ( 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() new_fields["last_active_ts"] = self.clock.time_msec()

2
synapse/rest/client/versions.py
View File

@ -82,7 +82,7 @@ class VersionsRestServlet(RestServlet):
"io.element.e2ee_forced.private": self.e2ee_forced_private, "io.element.e2ee_forced.private": self.e2ee_forced_private,
"io.element.e2ee_forced.trusted_private": self.e2ee_forced_trusted_private, "io.element.e2ee_forced.trusted_private": self.e2ee_forced_trusted_private,
# Supports the busy presence state described in MSC3026. # Supports the busy presence state described in MSC3026.
"org.matrix.msc3026.busy_presence": True, "org.matrix.msc3026.busy_presence": self.config.experimental.msc3026_enabled,
}, },
}, },
) )