diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-09-19 20:32:25 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-09-19 20:32:25 +0100 |
| commit | 284e1cb027c2c5e8376a5b83d21d626e18dcbc33 (patch) | |
| tree | 39adfb627d806891d95ffabb0bd7490f1fc737eb /synapse/rest/client/v1/presence.py | |
| parent | Fix a bug with saml attribute maps. (diff) | |
| parent | fix sample config (diff) | |
| download | synapse-284e1cb027c2c5e8376a5b83d21d626e18dcbc33.tar.xz | |
Merge branch 'develop' into rav/fix_attribute_mapping
Diffstat (limited to 'synapse/rest/client/v1/presence.py')
| -rw-r--r-- | synapse/rest/client/v1/presence.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/presence.py b/synapse/rest/client/v1/presence.py index 1eb1068c98..0153525cef 100644 --- a/synapse/rest/client/v1/presence.py +++ b/synapse/rest/client/v1/presence.py @@ -56,7 +56,7 @@ class PresenceStatusRestServlet(RestServlet): state = yield self.presence_handler.get_state(target_user=user) state = format_user_presence_state(state, self.clock.time_msec()) - return (200, state) + return 200, state @defer.inlineCallbacks def on_PUT(self, request, user_id): @@ -88,10 +88,10 @@ class PresenceStatusRestServlet(RestServlet): if self.hs.config.use_presence: yield self.presence_handler.set_state(user, state) - return (200, {}) + return 200, {} def on_OPTIONS(self, request): - return (200, {}) + return 200, {} def register_servlets(hs, http_server): |