summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-11-05 12:05:11 +0000
committerKegan Dougal <kegan@matrix.org>2014-11-05 12:05:11 +0000
commitd3a02ec03806d7629681895a0b960be24ff9ae1e (patch)
tree9e65ea436af275adf828315e4969df0db20f663f /synapse
parentDon't urlencode event types just yet so older HSes don't 500. (diff)
downloadsynapse-d3a02ec03806d7629681895a0b960be24ff9ae1e.tar.xz
Fix url decoding bugs with /redact and /send APIs.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/room.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py
index d97babea08..7724967061 100644
--- a/synapse/rest/room.py
+++ b/synapse/rest/room.py
@@ -182,7 +182,7 @@ class RoomSendEventRestServlet(RestServlet):
         content = _parse_json(request)
 
         event = self.event_factory.create_event(
-            etype=event_type,
+            etype=urllib.unquote(event_type),
             room_id=urllib.unquote(room_id),
             user_id=user.to_string(),
             content=content
@@ -458,7 +458,7 @@ class RoomRedactEventRestServlet(RestServlet):
             room_id=urllib.unquote(room_id),
             user_id=user.to_string(),
             content=content,
-            redacts=event_id,
+            redacts=urllib.unquote(event_id),
         )
 
         msg_handler = self.handlers.message_handler