diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-04 19:12:29 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-04 19:12:29 -0400 |
| commit | faf72a4c403000f7815d171feb8bf1a83b353584 (patch) | |
| tree | d150b317ef4d0cf2245b664a37e51d76c0870352 /synapse/rest/client/v1/presence.py | |
| parent | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys (diff) | |
| parent | Remove bind_email and bind_msisdn (#5964) (diff) | |
| download | synapse-faf72a4c403000f7815d171feb8bf1a83b353584.tar.xz | |
Merge branch 'develop' into cross-signing_keys
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): |