aboutsummaryrefslogtreecommitdiff
path: root/webmentions_ssg/tasks/retention.py
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--webmentions_ssg/tasks/retention.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/webmentions_ssg/tasks/retention.py b/webmentions_ssg/tasks/retention.py
index 727b186..bf79512 100644
--- a/webmentions_ssg/tasks/retention.py
+++ b/webmentions_ssg/tasks/retention.py
@@ -11,8 +11,8 @@ import sqlalchemy as sa
from flask import current_app
from sqlalchemy.engine import CursorResult
-from .. import DATABASE as db
-from ..models import ReceivedWebmention
+from ..extensions import DATABASE as db
+from ..models import ReceivedStatus, ReceivedWebmention
def purge_old_received_webmentions() -> int:
@@ -25,17 +25,22 @@ def purge_old_received_webmentions() -> int:
cutoff = datetime.now(UTC) - timedelta(
days=current_app.config["RECEIVED_RETENTION_DAYS"]
)
+
result = cast(
CursorResult[Any],
db.session.execute(
sa.delete(ReceivedWebmention).where(
- ReceivedWebmention.status.in_(("failed", "deleted")),
+ ReceivedWebmention.status.in_(
+ (ReceivedStatus.FAILED, ReceivedStatus.DELETED)
+ ),
ReceivedWebmention.updated_at < cutoff,
)
),
)
db.session.commit()
+
removed = result.rowcount
if removed:
current_app.logger.info("Purged %d old failed/deleted Webmentions", removed)
+
return removed