diff options
| author | David Teller <D.O.Teller@gmail.com> | 2022-05-23 19:27:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-23 17:27:39 +0000 |
| commit | 28199e93579b5a73841a95ed4d355322227432b5 (patch) | |
| tree | c720d7ca13a54d6d7fd0405dd8bbad7921cd856d /synapse/federation/federation_base.py | |
| parent | Prevent expired events from being filtered out when retention is disabled (#1... (diff) | |
| download | synapse-28199e93579b5a73841a95ed4d355322227432b5.tar.xz | |
Uniformize spam-checker API, part 2: check_event_for_spam (#12808)
Signed-off-by: David Teller <davidt@element.io>
Diffstat (limited to 'synapse/federation/federation_base.py')
| -rw-r--r-- | synapse/federation/federation_base.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py index 41ac49fdc8..1e866b19d8 100644 --- a/synapse/federation/federation_base.py +++ b/synapse/federation/federation_base.py @@ -15,6 +15,7 @@ import logging from typing import TYPE_CHECKING +import synapse from synapse.api.constants import MAX_DEPTH, EventContentFields, EventTypes, Membership from synapse.api.errors import Codes, SynapseError from synapse.api.room_versions import EventFormatVersions, RoomVersion @@ -98,9 +99,9 @@ class FederationBase: ) return redacted_event - result = await self.spam_checker.check_event_for_spam(pdu) + spam_check = await self.spam_checker.check_event_for_spam(pdu) - if result: + if spam_check is not synapse.spam_checker_api.Allow.ALLOW: logger.warning("Event contains spam, soft-failing %s", pdu.event_id) # we redact (to save disk space) as well as soft-failing (to stop # using the event in prev_events). |