diff options
| author | Dennis Fink | 2026-11-13 20:49:15 +0100 |
|---|---|---|
| committer | Dennis Fink | 2026-11-13 20:49:15 +0100 |
| commit | ca71bf1f30e118dd5bade3cff817d5bbd09f680a (patch) | |
| tree | 9c20d8e948581eb7689eacc9e531360ab7b459ff /webmentions_ssg | |
| parent | 82495162be98323fc56a35f2c2a59c143a765136 (diff) | |
| download | webmentions-ssg-ca71bf1f30e118dd5bade3cff817d5bbd09f680a.tar.gz webmentions-ssg-ca71bf1f30e118dd5bade3cff817d5bbd09f680a.zip | |
refactor(core): clarify Webmention mutation APIs
Make in-place reset and reopen helpers return `None` so callers no
longer perform pointless self-reassignment.
Split explicit resend behavior into its own method instead of hiding it
behind a boolean flag on `reopen`.
Diffstat (limited to 'webmentions_ssg')
| -rw-r--r-- | webmentions_ssg/models.py | 27 | ||||
| -rw-r--r-- | webmentions_ssg/tasks/scanner.py | 6 | ||||
| -rw-r--r-- | webmentions_ssg/views/admin.py | 8 |
3 files changed, 17 insertions, 24 deletions
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() |
