diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-08-18 01:08:45 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-18 01:08:45 +1000 |
| commit | c334ca67bb89039b3a00b7c9a1ce610e99859653 (patch) | |
| tree | bc70fc575b225a0cd25694bbd371f3c78bea3b43 /synapse/rest/client | |
| parent | Remove v1/register's broken shared secret functionality (#3703) (diff) | |
| download | synapse-c334ca67bb89039b3a00b7c9a1ce610e99859653.tar.xz | |
Integrate presence from hotfixes (#3694)
Diffstat (limited to 'synapse/rest/client')
| -rw-r--r-- | synapse/rest/client/v1/presence.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/presence.py b/synapse/rest/client/v1/presence.py index a14f0c807e..b5a6d6aebf 100644 --- a/synapse/rest/client/v1/presence.py +++ b/synapse/rest/client/v1/presence.py @@ -84,7 +84,8 @@ class PresenceStatusRestServlet(ClientV1RestServlet): except Exception: raise SynapseError(400, "Unable to parse state") - yield self.presence_handler.set_state(user, state) + if self.hs.config.use_presence: + yield self.presence_handler.set_state(user, state) defer.returnValue((200, {})) |