Browse Source

Fix develop because I broke it :( (#3535)

Amber Brown 5 years ago
parent
commit
8a4f05fefb
3 changed files with 5 additions and 2 deletions
  1. 0 0
      changelog.d/3535.misc
  2. 2 2
      synapse/rest/client/v1/push_rule.py
  3. 3 0
      synapse/streams/config.py

+ 0 - 0
changelog.d/3535.misc


+ 2 - 2
synapse/rest/client/v1/push_rule.py

@@ -77,11 +77,11 @@ class PushRuleRestServlet(ClientV1RestServlet):
 
         before = parse_string(request, "before")
         if before:
-            before = _namespaced_rule_id(spec, before[0])
+            before = _namespaced_rule_id(spec, before)
 
         after = parse_string(request, "after")
         if after:
-            after = _namespaced_rule_id(spec, after[0])
+            after = _namespaced_rule_id(spec, after)
 
         try:
             yield self.store.add_push_rule(

+ 3 - 0
synapse/streams/config.py

@@ -78,6 +78,9 @@ class PaginationConfig(object):
 
         limit = parse_integer(request, "limit", default=default_limit)
 
+        if limit and limit < 0:
+            raise SynapseError(400, "Limit must be 0 or above")
+
         try:
             return PaginationConfig(from_tok, to_tok, direction, limit)
         except Exception: