From 247e21aad690c84e4c7c6181a8d89585af7d47ab Mon Sep 17 00:00:00 2001
From: brassy endomorph <brassy-endomorph@riseup.net>
Date: Thu, 19 Sep 2024 08:00:46 +0000
Subject: [PATCH] minor pr fixes

---
 hushline/routes.py            | 30 +++++++++++++++---------------
 hushline/settings/__init__.py |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/hushline/routes.py b/hushline/routes.py
index f2b50f01..95f852cd 100644
--- a/hushline/routes.py
+++ b/hushline/routes.py
@@ -284,9 +284,8 @@ def delete_message(message_id: int) -> Response:
             flash("🫥 User not found. Please log in again.")
             return redirect(url_for("login"))
 
-        row_count = (
-            db.delete(Message)
-            .where(
+        row_count = db.session.execute(
+            db.delete(Message).where(
                 Message.id == message_id,
                 Message.username_id.in_(
                     select(Username.user_id)
@@ -294,15 +293,14 @@ def delete_message(message_id: int) -> Response:
                     .filter(Username.user_id == user.id)
                 ),
             )
-            .delete()
-        )
+        ).rowcount
         match row_count:
             case 1:
                 db.session.commit()
                 flash("🗑️ Message deleted successfully.")
             case 0:
                 db.session.rollback()
-                flash("⛔️ Message not found or unauthorized access.")
+                flash("⛔️ Message not found.")
             case _:
                 db.session.rollback()
                 current_app.logger.error(
@@ -349,7 +347,9 @@ def register() -> Response | str | tuple[Response | str, int]:
                         400,
                     )
 
-            if db.session.query(db.exists(Username).where(Username._username == username)).scalar():
+            if db.session.scalar(
+                db.exists(Username).where(Username._username == username).select()
+            ):
                 flash("💔 Username already taken.", "error")
                 return (
                     render_template(
@@ -386,8 +386,8 @@ def login() -> Response | str:
 
         form = LoginForm()
         if form.validate_on_submit():
-            username = Username.query.filter_by(
-                _username=form.username.data.strip(), is_primary=True
+            username = db.session.scalars(
+                select(Username).filter_by(_username=form.username.data.strip(), is_primary=True)
             ).one_or_none()
             if username and username.user.check_password(form.password.data):
                 session.permanent = True
@@ -436,12 +436,12 @@ def verify_2fa_login() -> Response | str | tuple[Response | str, int]:
             rate_limit = False
 
             # If the most recent successful login was made with the same OTP code, reject this one
-            last_login = (
-                AuthenticationLog.query.filter_by(user_id=user.id, successful=True)
+            last_login = db.session.scalars(
+                db.select(AuthenticationLog)
+                .filter_by(user_id=user.id, successful=True)
                 .order_by(AuthenticationLog.timestamp.desc())
                 .limit(1)
-                .first()
-            )
+            ).first()
             if (
                 last_login
                 and last_login.timecode == timecode
@@ -497,13 +497,13 @@ def logout() -> Response:
         return redirect(url_for("index"))
 
     def get_directory_usernames(admin_first: bool = False) -> list[Username]:
-        query = Username.query.filter_by(show_in_directory=True)
+        query = select(Username).filter_by(show_in_directory=True)
         display_ordering = db.func.coalesce(Username._display_name, Username._username)
         if admin_first:
             query = query.order_by(Username.user.is_admin.desc(), display_ordering)
         else:
             query = query.order_by(display_ordering)
-        return query.all()
+        return db.session.scalars(query).all()
 
     @app.route("/directory")
     def directory() -> Response | str:
diff --git a/hushline/settings/__init__.py b/hushline/settings/__init__.py
index 5e383710..832f4469 100644
--- a/hushline/settings/__init__.py
+++ b/hushline/settings/__init__.py
@@ -153,7 +153,7 @@ def handle_change_username_form(
 
     # TODO a better pattern would be to try to commit, catch the exception, and match
     # on the name of the unique index that errored
-    if db.session.query(db.exists(Username).where(Username._username == new_username)).scalar():
+    if db.session.scalar(db.exists(Username).where(Username._username == new_username).select()):
         flash("💔 This username is already taken.")
     else:
         username.username = new_username