aboutsummaryrefslogtreecommitdiff
path: root/webmentions_ssg/tasks/retention.py
diff options
context:
space:
mode:
authorDennis Fink2026-11-13 21:20:40 +0100
committerDennis Fink2026-11-13 21:20:40 +0100
commita285fdf29e59c3b957247ea9241943c7202e9a28 (patch)
tree17ceeb703de23af1e67081d99a8864bbe353fb46 /webmentions_ssg/tasks/retention.py
parent78ecd8bc227bdcbbd0e45eea025f7223252ed0da (diff)
downloadwebmentions-ssg-a285fdf29e59c3b957247ea9241943c7202e9a28.tar.gz
webmentions-ssg-a285fdf29e59c3b957247ea9241943c7202e9a28.zip
refactor(core): consolidate repeated helper logic
Centralize SQL row counts, hostname parsing, and content-type normalization so tasks, forms, and scanners share consistent implementations. Simplify periodic task registration and admin lookups with table-driven setup and Flask-SQLAlchemy's built-in 404 helper.
Diffstat (limited to 'webmentions_ssg/tasks/retention.py')
-rw-r--r--webmentions_ssg/tasks/retention.py29
1 files changed, 12 insertions, 17 deletions
diff --git a/webmentions_ssg/tasks/retention.py b/webmentions_ssg/tasks/retention.py
index 754c891..86283b7 100644
--- a/webmentions_ssg/tasks/retention.py
+++ b/webmentions_ssg/tasks/retention.py
@@ -5,12 +5,11 @@
"""Delete old received Webmentions in terminal unsuccessful states."""
from datetime import UTC, datetime, timedelta
-from typing import Any, cast
import sqlalchemy as sa
from flask import current_app
-from sqlalchemy.engine import CursorResult
+from ..db_helpers import rows_affected
from ..extensions import db
from ..models import ReceivedStatus, ReceivedWebmention
@@ -26,22 +25,18 @@ def purge_old_received_webmentions() -> int:
days=current_app.config["RECEIVED_RETENTION_DAYS"]
)
- result = cast(
- CursorResult[Any],
- db.session.execute(
- sa.delete(ReceivedWebmention).where(
- ReceivedWebmention.status.in_(
- (ReceivedStatus.FAILED, ReceivedStatus.DELETED)
- ),
- ReceivedWebmention.updated_at < cutoff,
- )
- ),
+ result = db.session.execute(
+ sa.delete(ReceivedWebmention).where(
+ ReceivedWebmention.status.in_(
+ (ReceivedStatus.FAILED, ReceivedStatus.DELETED)
+ ),
+ ReceivedWebmention.updated_at < cutoff,
+ )
)
db.session.commit()
- if result.rowcount:
- current_app.logger.info(
- "Purged %d old failed/deleted Webmentions", result.rowcount
- )
+ count = rows_affected(result)
+ if count:
+ current_app.logger.info("Purged %d old failed/deleted Webmentions", count)
- return result.rowcount
+ return count