diff options
author | Erik Johnston <erik@matrix.org> | 2021-02-22 12:55:32 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-02-22 12:55:32 +0000 |
commit | 5d405f7e7a292691e30a33a762b7834d9854209b (patch) | |
tree | 40863c9e510ac4ad8aa2eada7bbdab6c9760cb27 /synapse/api/ratelimiting.py | |
parent | Merge remote-tracking branch 'origin/release-v1.28.0' into matrix-org-hotfixes (diff) | |
parent | Clean up the user directory sample config section (#9385) (diff) | |
download | synapse-5d405f7e7a292691e30a33a762b7834d9854209b.tar.xz |
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/api/ratelimiting.py')
-rw-r--r-- | synapse/api/ratelimiting.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/synapse/api/ratelimiting.py b/synapse/api/ratelimiting.py index 5d9d5a228f..c3f07bc1a3 100644 --- a/synapse/api/ratelimiting.py +++ b/synapse/api/ratelimiting.py @@ -14,7 +14,7 @@ # limitations under the License. from collections import OrderedDict -from typing import Any, Optional, Tuple +from typing import Hashable, Optional, Tuple from synapse.api.errors import LimitExceededError from synapse.types import Requester @@ -42,7 +42,9 @@ class Ratelimiter: # * How many times an action has occurred since a point in time # * The point in time # * The rate_hz of this particular entry. This can vary per request - self.actions = OrderedDict() # type: OrderedDict[Any, Tuple[float, int, float]] + self.actions = ( + OrderedDict() + ) # type: OrderedDict[Hashable, Tuple[float, int, float]] def can_requester_do_action( self, @@ -82,7 +84,7 @@ class Ratelimiter: def can_do_action( self, - key: Any, + key: Hashable, rate_hz: Optional[float] = None, burst_count: Optional[int] = None, update: bool = True, @@ -175,7 +177,7 @@ class Ratelimiter: def ratelimit( self, - key: Any, + key: Hashable, rate_hz: Optional[float] = None, burst_count: Optional[int] = None, update: bool = True, |