diff options
Diffstat (limited to 'webmentions_ssg/tasks')
| -rw-r--r-- | webmentions_ssg/tasks/notifications.py | 2 | ||||
| -rw-r--r-- | webmentions_ssg/tasks/retention.py | 2 | ||||
| -rw-r--r-- | webmentions_ssg/tasks/scanner.py | 2 | ||||
| -rw-r--r-- | webmentions_ssg/tasks/sender.py | 2 | ||||
| -rw-r--r-- | webmentions_ssg/tasks/verification.py | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/webmentions_ssg/tasks/notifications.py b/webmentions_ssg/tasks/notifications.py index c503e1f..6a0e6b9 100644 --- a/webmentions_ssg/tasks/notifications.py +++ b/webmentions_ssg/tasks/notifications.py @@ -11,7 +11,7 @@ from flask import current_app from flask_mail import Message from ..extensions import db, huey, mail -from ..models import ReceivedWebmention, ReceivedWebmentionStatus +from ..models.received import ReceivedWebmention, ReceivedWebmentionStatus def email_verified_digest() -> None: diff --git a/webmentions_ssg/tasks/retention.py b/webmentions_ssg/tasks/retention.py index b882493..b4b6a83 100644 --- a/webmentions_ssg/tasks/retention.py +++ b/webmentions_ssg/tasks/retention.py @@ -11,7 +11,7 @@ from flask import current_app from ..db_helpers import rows_affected from ..extensions import db -from ..models import ReceivedWebmention, ReceivedWebmentionStatus +from ..models.received import ReceivedWebmention, ReceivedWebmentionStatus def purge_old_received_webmentions() -> int: diff --git a/webmentions_ssg/tasks/scanner.py b/webmentions_ssg/tasks/scanner.py index 6869477..1f98702 100644 --- a/webmentions_ssg/tasks/scanner.py +++ b/webmentions_ssg/tasks/scanner.py @@ -14,7 +14,7 @@ from huey.exceptions import RetryTask, TaskLockedException from sqlalchemy.orm import selectinload from ..extensions import db, huey -from ..models import SentWebmention, SourceDocument +from ..models.sources import SentWebmention, SourceDocument from ..net import is_http_url from .sender import send_webmention from .source_parser import ScannedSource, SourceScanError, scan_source_file diff --git a/webmentions_ssg/tasks/sender.py b/webmentions_ssg/tasks/sender.py index 6b14ace..fc70f27 100644 --- a/webmentions_ssg/tasks/sender.py +++ b/webmentions_ssg/tasks/sender.py @@ -15,7 +15,7 @@ from huey.exceptions import TaskLockedException from ..db_helpers import rows_affected from ..extensions import db, huey -from ..models import SentWebmention, SentWebmentionStatus +from ..models.sources import SentWebmention, SentWebmentionStatus from ..net import ( AddressResolutionError, UnsafeAddressError, diff --git a/webmentions_ssg/tasks/verification.py b/webmentions_ssg/tasks/verification.py index d55608c..ca45777 100644 --- a/webmentions_ssg/tasks/verification.py +++ b/webmentions_ssg/tasks/verification.py @@ -15,7 +15,8 @@ from flask import current_app from ..db_helpers import rows_affected from ..extensions import db, huey -from ..models import ReceivedWebmention, ReceivedWebmentionStatus +from ..models.received import ReceivedWebmention, ReceivedWebmentionStatus +from ..moderation_policy import rejection_reason from ..net import ( AddressResolutionError, ResponseTooLargeError, @@ -25,7 +26,6 @@ from ..net import ( media_type_of, read_limited_body, ) -from ..source_policy import source_rejection_reason from ..version import APP_NAME, VERSION from .target_matching import html_mentions_target, text_mentions_target @@ -201,7 +201,7 @@ def determine_verification_outcome( :raises httpx.RequestError: If a transient HTTP request error should be retried. """ # Recheck at worker time: a source may have been blocked since submission. - if reason := source_rejection_reason(claim.source): + if reason := rejection_reason(claim.source): return ReceivedWebmentionStatus.FAILED, reason try: |
