summary refs log tree commit diff
path: root/synapse/rest/presence.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-12 15:05:37 +0000
committerErik Johnston <erik@matrix.org>2014-12-12 15:05:37 +0000
commit7b43a503f31e47b0eae9fe2b12fbea5e7fd280f5 (patch)
treecd4846d41b43bc9e5964693fa072b2860507c9ae /synapse/rest/presence.py
parentStore json as UTF-8 and not bytes (diff)
downloadsynapse-7b43a503f31e47b0eae9fe2b12fbea5e7fd280f5.tar.xz
Consistently url decode and decode as utf 8 the URL parts
Diffstat (limited to 'synapse/rest/presence.py')
-rw-r--r--synapse/rest/presence.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/rest/presence.py b/synapse/rest/presence.py
index 062c895595..4bcd7ef635 100644
--- a/synapse/rest/presence.py
+++ b/synapse/rest/presence.py
@@ -33,7 +33,6 @@ class PresenceStatusRestServlet(RestServlet):
     @defer.inlineCallbacks
     def on_GET(self, request, user_id):
         auth_user = yield self.auth.get_user_by_req(request)
-        user_id = urllib.unquote(user_id)
         user = self.hs.parse_userid(user_id)
 
         state = yield self.handlers.presence_handler.get_state(
@@ -44,7 +43,6 @@ class PresenceStatusRestServlet(RestServlet):
     @defer.inlineCallbacks
     def on_PUT(self, request, user_id):
         auth_user = yield self.auth.get_user_by_req(request)
-        user_id = urllib.unquote(user_id)
         user = self.hs.parse_userid(user_id)
 
         state = {}
@@ -80,7 +78,6 @@ class PresenceListRestServlet(RestServlet):
     @defer.inlineCallbacks
     def on_GET(self, request, user_id):
         auth_user = yield self.auth.get_user_by_req(request)
-        user_id = urllib.unquote(user_id)
         user = self.hs.parse_userid(user_id)
 
         if not self.hs.is_mine(user):
@@ -101,7 +98,6 @@ class PresenceListRestServlet(RestServlet):
     @defer.inlineCallbacks
     def on_POST(self, request, user_id):
         auth_user = yield self.auth.get_user_by_req(request)
-        user_id = urllib.unquote(user_id)
         user = self.hs.parse_userid(user_id)
 
         if not self.hs.is_mine(user):