aboutsummaryrefslogtreecommitdiff
path: root/webmentions_ssg/views
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--webmentions_ssg/views/admin.py93
1 files changed, 88 insertions, 5 deletions
diff --git a/webmentions_ssg/views/admin.py b/webmentions_ssg/views/admin.py
index 23abe65..5246d3a 100644
--- a/webmentions_ssg/views/admin.py
+++ b/webmentions_ssg/views/admin.py
@@ -5,6 +5,7 @@
"""Authenticated incoming and outgoing Webmention management."""
import uuid
+from datetime import UTC, datetime, time
from http import HTTPStatus
import sqlalchemy as sa
@@ -15,12 +16,49 @@ from sqlalchemy.orm import selectinload
from .. import forms
from ..extensions import db
-from ..models import ReceivedWebmention, SentWebmention, SourceDocument
+from ..models import (
+ ReceivedWebmention,
+ ReceivedWebmentionStatus,
+ SentWebmention,
+ SourceDocument,
+)
from ..tasks.scanner import manual_scan_sources
from ..tasks.sender import send_webmention
from ..tasks.verification import verify_webmention
from .blueprint import webmentions_bp
+RECEIVED_STATUS_FILTERS = {
+ "pending": (ReceivedWebmentionStatus.RECEIVED,),
+ "verifying": (ReceivedWebmentionStatus.VERIFYING,),
+ "verified": (ReceivedWebmentionStatus.VERIFIED,),
+ "declined": (
+ ReceivedWebmentionStatus.FAILED,
+ ReceivedWebmentionStatus.SOURCE_REMOVED,
+ ),
+}
+
+
+def received_filter_form() -> forms.ReceivedWebmentionFilterForm:
+ """Validate query-string filters without requiring CSRF on the GET form."""
+ form = forms.ReceivedWebmentionFilterForm(
+ formdata=request.args, meta={"csrf": False}
+ )
+ if not form.validate():
+ abort(HTTPStatus.BAD_REQUEST)
+ form.q.data = (form.q.data or "").strip()
+ return form
+
+
+def received_filter_args(form: forms.ReceivedWebmentionFilterForm) -> dict[str, str]:
+ """Return validated, nonempty filters for pagination and redirects."""
+ values = {
+ "status": form.status.data,
+ "q": form.q.data,
+ "date_from": form.date_from.data.isoformat() if form.date_from.data else "",
+ "date_to": form.date_to.data.isoformat() if form.date_to.data else "",
+ }
+ return {key: value for key, value in values.items() if value}
+
@webmentions_bp.route("/received")
@login_required
@@ -29,15 +67,44 @@ def received_list() -> ResponseReturnValue:
:returns: Rendered page containing the paginated received Webmentions.
"""
+ filter_form = received_filter_form()
+ filters = received_filter_args(filter_form)
+
+ query = sa.select(ReceivedWebmention)
+
+ if status := filter_form.status.data:
+ query = query.where(
+ ReceivedWebmention.status.in_(RECEIVED_STATUS_FILTERS[status])
+ )
+
+ if text := filter_form.q.data:
+ query = query.where(
+ sa.or_(
+ ReceivedWebmention.source.icontains(text, autoescape=True),
+ ReceivedWebmention.target.icontains(text, autoescape=True),
+ )
+ )
+
+ if (start := filter_form.date_from.data) is not None:
+ query = query.where(
+ ReceivedWebmention.updated_at >= datetime.combine(start, time.min, UTC)
+ )
+
+ if (end := filter_form.date_to.data) is not None:
+ query = query.where(
+ ReceivedWebmention.updated_at <= datetime.combine(end, time.max, UTC)
+ )
+
webmentions = db.paginate(
- sa.select(ReceivedWebmention).order_by(ReceivedWebmention.uuid.desc()),
- per_page=25,
+ query.order_by(ReceivedWebmention.uuid.desc()), per_page=25
)
return render_template(
"received.html",
title="Received Webmentions",
webmentions=webmentions,
+ filters=filters,
+ filter_form=filter_form,
action_form=forms.ConfirmActionForm(),
)
@@ -53,6 +120,7 @@ def delete_received_webmention(webmention_uuid: uuid.UUID) -> ResponseReturnValu
if not forms.ConfirmActionForm().validate_on_submit():
abort(HTTPStatus.BAD_REQUEST)
+ filters = received_filter_args(received_filter_form())
webmention = db.get_or_404(ReceivedWebmention, webmention_uuid)
db.session.delete(webmention)
@@ -61,7 +129,14 @@ def delete_received_webmention(webmention_uuid: uuid.UUID) -> ResponseReturnValu
flash(f"Webmention {webmention.uuid} deleted.", "success")
return redirect(
- url_for("webmentions.received_list", page=request.args.get("page", 1, type=int))
+ url_for(
+ "webmentions.received_list",
+ page=request.args.get("page", 1, type=int),
+ status=filters.get("status"),
+ q=filters.get("q"),
+ date_from=filters.get("date_from"),
+ date_to=filters.get("date_to"),
+ )
)
@@ -78,6 +153,7 @@ def reverify_received_webmention(webmention_uuid: uuid.UUID) -> ResponseReturnVa
if not forms.ConfirmActionForm().validate_on_submit():
abort(HTTPStatus.BAD_REQUEST)
+ filters = received_filter_args(received_filter_form())
webmention = db.get_or_404(ReceivedWebmention, webmention_uuid)
webmention.reopen_verification()
@@ -89,7 +165,14 @@ def reverify_received_webmention(webmention_uuid: uuid.UUID) -> ResponseReturnVa
flash(f"Webmention {webmention.uuid} queued for reverification.", "success")
return redirect(
- url_for("webmentions.received_list", page=request.args.get("page", 1, type=int))
+ url_for(
+ "webmentions.received_list",
+ page=request.args.get("page", 1, type=int),
+ status=filters.get("status"),
+ q=filters.get("q"),
+ date_from=filters.get("date_from"),
+ date_to=filters.get("date_to"),
+ )
)