aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--tests/test_models.py42
-rw-r--r--webmentions_ssg/models.py27
-rw-r--r--webmentions_ssg/tasks/scanner.py6
-rw-r--r--webmentions_ssg/views/admin.py8
4 files changed, 55 insertions, 28 deletions
diff --git a/tests/test_models.py b/tests/test_models.py
index 7ec7df7..bb95be2 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -233,14 +233,14 @@ def test_received_verification_reset_is_reusable_for_atomic_updates() -> None:
failure_reason="Old error",
recovery_attempts=3,
)
- assert mention.reset_for_verification() is mention
+ assert mention.reset_for_verification() is None
assert mention.status == ReceivedStatus.RECEIVED
assert mention.failure_reason is None
assert mention.recovery_attempts == 0
assert mention.updated_at is not None
-def test_reopen_preserves_delivery_history_unless_explicit_resend() -> None:
+def test_reopen_preserves_delivery_history() -> None:
from webmentions_ssg.models import SentWebmentionStatus
sent_at = datetime.now(UTC)
@@ -255,7 +255,7 @@ def test_reopen_preserves_delivery_history_unless_explicit_resend() -> None:
next_retry_at=sent_at,
last_sent_at=sent_at,
)
- assert mention.reopen(3, False) is mention
+ assert mention.reopen(3, False) is None
assert mention.desired_revision == 3
assert mention.active is False
assert mention.attempt_count == 0
@@ -263,10 +263,44 @@ def test_reopen_preserves_delivery_history_unless_explicit_resend() -> None:
assert mention.status == SentWebmentionStatus.SENT
assert mention.sent_revision == 2
- assert mention.reopen(3, True, resend=True) is mention
+
+
+def test_resend_requeues_current_revision_without_losing_send_history() -> None:
+ from webmentions_ssg.models import SentWebmentionStatus
+
+ sent_at = datetime.now(UTC)
+ mention = SentWebmention(
+ target="https://example.com/post",
+ active=True,
+ desired_revision=3,
+ processed_revision=3,
+ sent_revision=2,
+ status=SentWebmentionStatus.FAILED,
+ failure_reason="Previous failure",
+ endpoint="https://example.com/webmention",
+ response_status=503,
+ status_url="https://example.com/status",
+ attempt_count=3,
+ next_retry_at=sent_at,
+ last_attempted_at=sent_at,
+ last_sent_at=sent_at,
+ )
+ assert not mention.pending
+
+ assert mention.resend() is None
+ assert mention.desired_revision == 3
+ assert mention.active is True
+ assert mention.pending
assert mention.processed_revision is None
assert mention.status is None
+ assert mention.failure_reason is None
+ assert mention.endpoint is None
+ assert mention.response_status is None
+ assert mention.status_url is None
+ assert mention.attempt_count == 0
+ assert mention.next_retry_at is None
assert mention.sent_revision == 2
+ assert mention.last_attempted_at == sent_at
assert mention.last_sent_at == sent_at
diff --git a/webmentions_ssg/models.py b/webmentions_ssg/models.py
index ae2f076..dbbb7ad 100644
--- a/webmentions_ssg/models.py
+++ b/webmentions_ssg/models.py
@@ -163,11 +163,10 @@ class ReceivedWebmention(Base):
"updated_at": at,
}
- def reset_for_verification(self) -> ReceivedWebmention:
- """Reopen an existing row for manual verification and return it."""
+ def reset_for_verification(self) -> None:
+ """Reopen an existing row for manual verification."""
for key, value in self.verification_reset_values(at=datetime.now(UTC)).items():
setattr(self, key, value)
- return self
@property
def verified(self) -> bool:
@@ -299,24 +298,22 @@ class SentWebmention(Base):
"""Represent the sent Webmention by its target URL."""
return f"<SentWebmention {self.target!r}>"
- def reopen(
- self, revision: int, active: bool, *, resend: bool = False
- ) -> SentWebmention:
+ def reopen(self, revision: int, active: bool) -> None:
"""Reopen delivery for a revision while preserving send history."""
self.desired_revision = revision
self.active = active
self.attempt_count = 0
self.next_retry_at = None
- if resend:
- self.processed_revision = None
- self.status = None
- self.failure_reason = None
- self.endpoint = None
- self.response_status = None
- self.status_url = None
-
- return self
+ def resend(self) -> None:
+ """Retry the current revision, clearing its previous delivery result."""
+ self.reopen(self.desired_revision, self.active)
+ self.processed_revision = None
+ self.status = None
+ self.failure_reason = None
+ self.endpoint = None
+ self.response_status = None
+ self.status_url = None
@hybrid_property
def pending(self) -> bool:
diff --git a/webmentions_ssg/tasks/scanner.py b/webmentions_ssg/tasks/scanner.py
index f3665ee..1db52a5 100644
--- a/webmentions_ssg/tasks/scanner.py
+++ b/webmentions_ssg/tasks/scanner.py
@@ -81,9 +81,7 @@ def update_source(
existing = {webmention.target: webmention for webmention in source.sent_webmentions}
for webmention in existing.values():
- webmention = webmention.reopen(
- source.revision, webmention.target in scanned.targets
- )
+ webmention.reopen(source.revision, webmention.target in scanned.targets)
if not webmention.active and webmention.sent_revision is None:
webmention.processed_revision = source.revision
@@ -214,7 +212,7 @@ def scan_sources_task() -> None:
source.deleted_at = scan_time
for webmention in source.sent_webmentions:
- webmention = webmention.reopen(source.revision, False)
+ webmention.reopen(source.revision, False)
if webmention.sent_revision is None:
webmention.processed_revision = source.revision
diff --git a/webmentions_ssg/views/admin.py b/webmentions_ssg/views/admin.py
index 461d329..1ca06b5 100644
--- a/webmentions_ssg/views/admin.py
+++ b/webmentions_ssg/views/admin.py
@@ -89,7 +89,7 @@ def reverify_received_webmention(identifier: uuid.UUID) -> ResponseReturnValue:
if webmention is None:
abort(404)
- webmention = webmention.reset_for_verification()
+ webmention.reset_for_verification()
db.session.commit()
@@ -194,12 +194,10 @@ def resend_sent_webmention(
if webmention is None or webmention.source_id != source_identifier:
abort(404)
- # Reopen the existing desired revision instead of inventing a new source
+ # Requeue the existing desired revision instead of inventing a new source
# revision. send_webmention() otherwise exits when this revision has already
# been processed.
- webmention = webmention.reopen(
- webmention.desired_revision, webmention.active, resend=True
- )
+ webmention.resend()
db.session.commit()