diff options
| author | David Baker <dave@matrix.org> | 2016-01-19 18:17:23 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-01-19 18:17:23 +0000 |
| commit | afb7b377f23b275bf0274d6cbbfae462362cfc8c (patch) | |
| tree | 212e275af6f3d52dba6e4367553ea649d9965d33 /synapse/streams/config.py | |
| parent | Use the unread notification count to send accurate badge counts in push notif... (diff) | |
| parent | Merge pull request #505 from matrix-org/erikj/push_fast (diff) | |
| download | synapse-afb7b377f23b275bf0274d6cbbfae462362cfc8c.tar.xz | |
Merge branch 'develop' into push_badge_counts
Diffstat (limited to 'synapse/streams/config.py')
| -rw-r--r-- | synapse/streams/config.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/streams/config.py b/synapse/streams/config.py index 8c082bf4e0..4f089bfb94 100644 --- a/synapse/streams/config.py +++ b/synapse/streams/config.py @@ -22,6 +22,9 @@ import logging logger = logging.getLogger(__name__) +MAX_LIMIT = 1000 + + class SourcePaginationConfig(object): """A configuration object which stores pagination parameters for a @@ -32,7 +35,7 @@ class SourcePaginationConfig(object): self.from_key = from_key self.to_key = to_key self.direction = 'f' if direction == 'f' else 'b' - self.limit = int(limit) if limit is not None else None + self.limit = min(int(limit), MAX_LIMIT) if limit is not None else None def __repr__(self): return ( @@ -49,7 +52,7 @@ class PaginationConfig(object): self.from_token = from_token self.to_token = to_token self.direction = 'f' if direction == 'f' else 'b' - self.limit = int(limit) if limit is not None else None + self.limit = min(int(limit), MAX_LIMIT) if limit is not None else None @classmethod def from_request(cls, request, raise_invalid_params=True, |