Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix import in module_api module and docs on the new check_event_for_spam signature #12918

Merged
merged 16 commits into from
May 31, 2022
Merged

Fix import in module_api module and docs on the new check_event_for_spam signature #12918

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
59220a1
Fix import in module_api module
babolivier May 30, 2022
2a6bce8
Changelog
babolivier May 30, 2022
319cd89
Fix export
babolivier May 30, 2022
e70ead2
Also fix upgrade notes
babolivier May 30, 2022
9df86d0
Turns out the doc was also wrong on some things, ugh
babolivier May 30, 2022
791c94d
Change Allow.ALLOW into NOT_SPAM
babolivier May 30, 2022
14b91ed
Amend changelog
babolivier May 30, 2022
3a71525
Hopefully make the condition block clearer
babolivier May 30, 2022
db4c2e8
Apply suggestions from code review
babolivier May 30, 2022
3007fa5
Incorporate review
babolivier May 30, 2022
4a1f98a
Fix phrasing
babolivier May 30, 2022
5f0de4f
Fix lint and types, and move check to callback layer
babolivier May 30, 2022
11a1b9a
Update synapse/events/spamcheck.py
babolivier May 31, 2022
f4c574b
Incorporate review
babolivier May 31, 2022
2384f1c
Merge branch 'babolivier/allow' of github.com:matrix-org/synapse into…
babolivier May 31, 2022
9f5d43e
Lint
babolivier May 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/12918.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a bug introduced in Synapse 1.60.0rc1 that would prevent importing the `Allow` type from `synapse.module_api`.
babolivier marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions synapse/module_api/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
from twisted.internet import defer
from twisted.web.resource import Resource

from synapse import spam_checker_api
from synapse.api.errors import SynapseError
from synapse.events import EventBase
from synapse.events.presence_router import (
Expand Down Expand Up @@ -101,6 +100,7 @@
)
from synapse.metrics.background_process_metrics import run_as_background_process
from synapse.rest.client.login import LoginResponse
from synapse.spam_checker_api import Allow
from synapse.storage import DataStore
from synapse.storage.background_updates import (
DEFAULT_BATCH_SIZE_CALLBACK,
Expand Down Expand Up @@ -141,7 +141,7 @@

PRESENCE_ALL_USERS = PresenceRouter.ALL_USERS

ALLOW = spam_checker_api.Allow.ALLOW
ALLOW = Allow.ALLOW
richvdh marked this conversation as resolved.
Show resolved Hide resolved
# Singleton value used to mark a message as permitted.

__all__ = [
Expand Down