summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-09-03 15:37:10 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-09-03 15:37:10 +0100
commitcda31fb7553ba3d880de09a464ae3b62ea6632fc (patch)
tree3349213bfbf925a97f549887e0fd7d13c8cb68b6 /synapse/rest
parentBugfix for back-pagination of presence (diff)
downloadsynapse-cda31fb7553ba3d880de09a464ae3b62ea6632fc.tar.xz
Kill the state
... key from all the Presence messages
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/presence.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/synapse/rest/presence.py b/synapse/rest/presence.py
index 5c5adb4236..9410fcae56 100644
--- a/synapse/rest/presence.py
+++ b/synapse/rest/presence.py
@@ -51,11 +51,7 @@ class PresenceStatusRestServlet(RestServlet):
         try:
             content = json.loads(request.content.read())
 
-            # Legacy handling
-            if "state" in content:
-                state["presence"] = content.pop("state")
-            else:
-                state["presence"] = content.pop("presence")
+            state["presence"] = content.pop("presence")
 
             if "status_msg" in content:
                 state["status_msg"] = content.pop("status_msg")