summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorCallum Brown <callum@calcuode.com>2021-05-27 18:42:23 +0100
committerGitHub <noreply@github.com>2021-05-27 18:42:23 +0100
commit8fb9af570f942d2057e8acb4a047d61ed7048f58 (patch)
treea2d6ddf916c755d288a9e5e4db2d0f511b2bd863 /synapse/rest
parentLimit the number of events sent over replication when persisting events. (#10... (diff)
downloadsynapse-8fb9af570f942d2057e8acb4a047d61ed7048f58.tar.xz
Make reason and score optional for report_event (#10077)
Implements MSC2414: https://github.com/matrix-org/matrix-doc/pull/2414
See #8551 

Signed-off-by: Callum Brown <callum@calcuode.com>
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/report_event.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/synapse/rest/client/v2_alpha/report_event.py b/synapse/rest/client/v2_alpha/report_event.py

index 2c169abbf3..07ea39a8a3 100644 --- a/synapse/rest/client/v2_alpha/report_event.py +++ b/synapse/rest/client/v2_alpha/report_event.py
@@ -16,11 +16,7 @@ import logging from http import HTTPStatus from synapse.api.errors import Codes, SynapseError -from synapse.http.servlet import ( - RestServlet, - assert_params_in_dict, - parse_json_object_from_request, -) +from synapse.http.servlet import RestServlet, parse_json_object_from_request from ._base import client_patterns @@ -42,15 +38,14 @@ class ReportEventRestServlet(RestServlet): user_id = requester.user.to_string() body = parse_json_object_from_request(request) - assert_params_in_dict(body, ("reason", "score")) - if not isinstance(body["reason"], str): + if not isinstance(body.get("reason", ""), str): raise SynapseError( HTTPStatus.BAD_REQUEST, "Param 'reason' must be a string", Codes.BAD_JSON, ) - if not isinstance(body["score"], int): + if not isinstance(body.get("score", 0), int): raise SynapseError( HTTPStatus.BAD_REQUEST, "Param 'score' must be an integer", @@ -61,7 +56,7 @@ class ReportEventRestServlet(RestServlet): room_id=room_id, event_id=event_id, user_id=user_id, - reason=body["reason"], + reason=body.get("reason"), content=body, received_ts=self.clock.time_msec(), )