diff options
Diffstat (limited to 'webmentions_ssg/tasks')
| -rw-r--r-- | webmentions_ssg/tasks/scanner.py | 5 | ||||
| -rw-r--r-- | webmentions_ssg/tasks/sender.py | 20 |
2 files changed, 5 insertions, 20 deletions
diff --git a/webmentions_ssg/tasks/scanner.py b/webmentions_ssg/tasks/scanner.py index 263b8a5..f3665ee 100644 --- a/webmentions_ssg/tasks/scanner.py +++ b/webmentions_ssg/tasks/scanner.py @@ -226,10 +226,7 @@ def scan_sources_task() -> None: for identifier in db.session.scalars( sa.select(SentWebmention.uuid) .where( - sa.or_( - SentWebmention.processed_revision.is_(None), - SentWebmention.processed_revision < SentWebmention.desired_revision, - ), + SentWebmention.pending, sa.or_( SentWebmention.next_retry_at.is_(None), SentWebmention.next_retry_at <= scan_time, diff --git a/webmentions_ssg/tasks/sender.py b/webmentions_ssg/tasks/sender.py index cd6c64a..804b6f6 100644 --- a/webmentions_ssg/tasks/sender.py +++ b/webmentions_ssg/tasks/sender.py @@ -43,10 +43,7 @@ def attempt_is_current(webmention: SentWebmention, revision: int) -> bool: """ db.session.refresh(webmention) - return webmention.desired_revision == revision and ( - webmention.processed_revision is None - or webmention.processed_revision < revision - ) + return webmention.desired_revision == revision and webmention.pending def retry_delay(attempt: int) -> timedelta: @@ -89,10 +86,7 @@ def send_webmention_task(webmention_uuid: uuid.UUID) -> None: ) return - if ( - webmention.processed_revision is not None - and webmention.processed_revision >= webmention.desired_revision - ): + if not webmention.pending: return revision = webmention.desired_revision @@ -116,10 +110,7 @@ def send_webmention_task(webmention_uuid: uuid.UUID) -> None: SentWebmention.uuid == webmention_uuid, SentWebmention.desired_revision == revision, SentWebmention.attempt_count >= max_attempts, - sa.or_( - SentWebmention.processed_revision.is_(None), - SentWebmention.processed_revision < revision, - ), + SentWebmention.pending, sa.or_( SentWebmention.next_retry_at.is_(None), SentWebmention.next_retry_at <= now, @@ -150,10 +141,7 @@ def send_webmention_task(webmention_uuid: uuid.UUID) -> None: SentWebmention.uuid == webmention_uuid, SentWebmention.desired_revision == revision, SentWebmention.attempt_count == attempt - 1, - sa.or_( - SentWebmention.processed_revision.is_(None), - SentWebmention.processed_revision < revision, - ), + SentWebmention.pending, sa.or_( SentWebmention.next_retry_at.is_(None), SentWebmention.next_retry_at <= now, |
