diff options
author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-10-14 16:47:08 +0100 |
---|---|---|
committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-10-14 16:48:15 +0100 |
commit | 13b560971e71a87bf44c35ae9cb4591333dd576c (patch) | |
tree | e85c5823a8e7212ca2fce97c5279c9cd1ea32b9e | |
parent | SYN-103: Ignore the 'origin' key in received EDUs. Instead take the origin fr... (diff) | |
download | synapse-13b560971e71a87bf44c35ae9cb4591333dd576c.tar.xz |
Make sure to return an empty JSON object ({}) from presence PUT/POST requests rather than an empty string ("") because most deserialisers won't like the latter
-rw-r--r-- | synapse/rest/presence.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/presence.py b/synapse/rest/presence.py index 7fc8ce4404..138cc88a05 100644 --- a/synapse/rest/presence.py +++ b/synapse/rest/presence.py @@ -68,7 +68,7 @@ class PresenceStatusRestServlet(RestServlet): yield self.handlers.presence_handler.set_state( target_user=user, auth_user=auth_user, state=state) - defer.returnValue((200, "")) + defer.returnValue((200, {})) def on_OPTIONS(self, request): return (200, {}) @@ -141,7 +141,7 @@ class PresenceListRestServlet(RestServlet): yield defer.DeferredList(deferreds) - defer.returnValue((200, "")) + defer.returnValue((200, {})) def on_OPTIONS(self, request): return (200, {}) |