diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-07 10:55:28 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-07 10:55:28 +0000 |
| commit | 3cb678f84cb3252f08788a31bef1a205edffde9c (patch) | |
| tree | 01ad785dc284526ecd4aa1a04ce132bcf639f5ac /synapse | |
| parent | Fix joining over federation (diff) | |
| parent | Don't cache isWebRTCSupported because whether webRTC is supported might chang... (diff) | |
| download | synapse-3cb678f84cb3252f08788a31bef1a205edffde9c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Diffstat (limited to 'synapse')
| -rwxr-xr-x | synapse/app/homeserver.py | 5 | ||||
| -rw-r--r-- | synapse/rest/room.py | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index a20376b9d6..43164c8d67 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -42,6 +42,7 @@ import os import re import sys import sqlite3 +import syweb logger = logging.getLogger(__name__) @@ -58,7 +59,9 @@ class SynapseHomeServer(HomeServer): return JsonResource() def build_resource_for_web_client(self): - return File("webclient") # TODO configurable? + syweb_path = os.path.dirname(syweb.__file__) + webclient_path = os.path.join(syweb_path, "webclient") + return File(webclient_path) # TODO configurable? def build_resource_for_content_repo(self): return ContentRepoResource( diff --git a/synapse/rest/room.py b/synapse/rest/room.py index 997895dab0..5c9c9d3af4 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -148,7 +148,7 @@ class RoomStateEventRestServlet(RestServlet): content = _parse_json(request) event = self.event_factory.create_event( - etype=event_type, + etype=urllib.unquote(event_type), content=content, room_id=urllib.unquote(room_id), user_id=user.to_string(), @@ -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 |