From a285fdf29e59c3b957247ea9241943c7202e9a28 Mon Sep 17 00:00:00 2001 From: Dennis Fink Date: Fri, 13 Nov 2026 21:20:40 +0100 Subject: 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. --- webmentions_ssg/views/endpoint.py | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) (limited to 'webmentions_ssg/views/endpoint.py') diff --git a/webmentions_ssg/views/endpoint.py b/webmentions_ssg/views/endpoint.py index e3f1368..a7badfd 100644 --- a/webmentions_ssg/views/endpoint.py +++ b/webmentions_ssg/views/endpoint.py @@ -6,15 +6,15 @@ import uuid from datetime import UTC, datetime, timedelta -from typing import Any, cast +from typing import cast import sqlalchemy as sa import sqlalchemy.exc as sa_exc -from flask import Response, abort, current_app, render_template, url_for +from flask import Response, current_app, render_template, url_for from flask.typing import ResponseReturnValue -from sqlalchemy.engine import CursorResult from .. import forms +from ..db_helpers import rows_affected from ..extensions import csrf, db, limiter from ..models import ReceivedWebmention, received_url_digest from ..tasks.receiver import verify_webmention @@ -63,20 +63,17 @@ def reopen_if_cooled_down(webmention: ReceivedWebmention) -> bool: seconds=current_app.config["ENDPOINT_REVERIFY_COOLDOWN_SECONDS"] ) - result = cast( - CursorResult[Any], - db.session.execute( - sa.update(ReceivedWebmention) - .where( - ReceivedWebmention.uuid == webmention.uuid, - ReceivedWebmention.updated_at <= cutoff, - ) - .values(ReceivedWebmention.verification_reset_values(at=now)) - .execution_options(synchronize_session=False) - ), + result = db.session.execute( + sa.update(ReceivedWebmention) + .where( + ReceivedWebmention.uuid == webmention.uuid, + ReceivedWebmention.updated_at <= cutoff, + ) + .values(ReceivedWebmention.verification_reset_values(at=now)) + .execution_options(synchronize_session=False) ) db.session.commit() - return result.rowcount == 1 + return rows_affected(result) == 1 def submit_received(source: str, target: str) -> tuple[uuid.UUID, bool] | None: @@ -144,10 +141,7 @@ def status(identifier: uuid.UUID) -> ResponseReturnValue: :param identifier: Identifier of the Webmention to display. :return: Rendered Webmention status page. """ - webmention = db.session.get(ReceivedWebmention, identifier) - - if webmention is None: - abort(404) + webmention = db.get_or_404(ReceivedWebmention, identifier) return render_template( "status.html", title="Webmention status", webmention=webmention -- cgit v1.3.1