diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-07-14 09:09:19 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-14 09:09:19 +1000 |
| commit | 8532953c048ba8dc258d57d18e56e2243c41b085 (patch) | |
| tree | 1de20a1972e313b196b2c5abcacb5d40413a8b36 /synapse/rest/client/v1/push_rule.py | |
| parent | Make auth & transactions more testable (#3499) (diff) | |
| parent | fix sytests (diff) | |
| download | synapse-8532953c048ba8dc258d57d18e56e2243c41b085.tar.xz | |
Merge pull request #3534 from krombel/use_parse_and_asserts_from_servlet
Use parse and asserts from http.servlet
Diffstat (limited to 'synapse/rest/client/v1/push_rule.py')
| -rw-r--r-- | synapse/rest/client/v1/push_rule.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/push_rule.py b/synapse/rest/client/v1/push_rule.py index 0df7ce570f..7cf6a99774 100644 --- a/synapse/rest/client/v1/push_rule.py +++ b/synapse/rest/client/v1/push_rule.py @@ -21,7 +21,7 @@ from synapse.api.errors import ( SynapseError, UnrecognizedRequestError, ) -from synapse.http.servlet import parse_json_value_from_request +from synapse.http.servlet import parse_json_value_from_request, parse_string from synapse.push.baserules import BASE_RULE_IDS from synapse.push.clientformat import format_push_rules_for_user from synapse.push.rulekinds import PRIORITY_CLASS_MAP @@ -75,11 +75,11 @@ class PushRuleRestServlet(ClientV1RestServlet): except InvalidRuleException as e: raise SynapseError(400, e.message) - before = request.args.get("before", None) + before = parse_string(request, "before") if before: before = _namespaced_rule_id(spec, before[0]) - after = request.args.get("after", None) + after = parse_string(request, "after") if after: after = _namespaced_rule_id(spec, after[0]) |