diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2022-05-23 19:18:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-23 17:18:23 +0000 |
| commit | 4cc4229cd7a55d2556c798fecbb1c9660dc821c8 (patch) | |
| tree | bdcd296a05ae4fa0a147ccfe1e545e16f48ecd49 /synapse/handlers/pagination.py | |
| parent | add SpamChecker callback for silently dropping inbound federated events (#12744) (diff) | |
| download | synapse-4cc4229cd7a55d2556c798fecbb1c9660dc821c8.tar.xz | |
Prevent expired events from being filtered out when retention is disabled (#12611)
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
Diffstat (limited to 'synapse/handlers/pagination.py')
| -rw-r--r-- | synapse/handlers/pagination.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index 6ae88add95..19a4407050 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -239,7 +239,7 @@ class PaginationHandler: # defined in the server's configuration, we can safely assume that's the # case and use it for this room. max_lifetime = ( - retention_policy["max_lifetime"] or self._retention_default_max_lifetime + retention_policy.max_lifetime or self._retention_default_max_lifetime ) # Cap the effective max_lifetime to be within the range allowed in the |