diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-10 16:14:17 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-10 16:14:17 +0000 |
| commit | 61fc37e467bafe8b1178ec35daf0655049b3cc73 (patch) | |
| tree | fd47305db5a3d6d8f08514d0c1620628b35495a2 /synapse/rest | |
| parent | import Image as PIL.Image. (diff) | |
| parent | point the entry_point for synapse-homeserver at the right method (diff) | |
| download | synapse-61fc37e467bafe8b1178ec35daf0655049b3cc73.tar.xz | |
Merge branch 'develop' into media_repository
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/room.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py index 4f6d039b61..3147d7a60b 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=urllib.unquote(event_type), + etype=event_type, # already urldecoded content=content, room_id=urllib.unquote(room_id), user_id=user.to_string(), @@ -327,7 +327,9 @@ class RoomMessageListRestServlet(RestServlet): @defer.inlineCallbacks def on_GET(self, request, room_id): user = yield self.auth.get_user_by_req(request) - pagination_config = PaginationConfig.from_request(request) + pagination_config = PaginationConfig.from_request(request, + default_limit=10, + ) with_feedback = "feedback" in request.args handler = self.handlers.message_handler msgs = yield handler.get_messages( |