Merge origin/main: the tree-wide ruff pass beside the Music reconnect work

1 files changed, 10 insertions, 6 deletions

diff --git a/packages/meshbay-hub/src/meshbay_hub/api/admin.py b/packages/meshbay-hub/src/meshbay_hub/api/admin.py
index 7ca1e68..b4b2f4f 100644
--- a/packages/meshbay-hub/src/meshbay_hub/api/admin.py
+++ b/packages/meshbay-hub/src/meshbay_hub/api/admin.py
@@ -6,19 +6,18 @@ Separate from moderation.py (which handles public reporting and content blocklis
 """
 
 import logging
-from datetime import datetime, timezone
 
 from fastapi import APIRouter, Depends, HTTPException, Query
 from pydantic import BaseModel
 from sqlalchemy import func, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from meshbay_hub.auth import decrypt_email
+from meshbay_hub import hub_settings
 from meshbay_hub.api.deps import require_admin, require_moderator, user_is_admin
 from meshbay_hub.api.revocation import get_connected_node_count, is_node_connected
+from meshbay_hub.auth import decrypt_email
 from meshbay_hub.db.engine import get_db
 from meshbay_hub.db.models import Group, GroupMember, IPLog, Node, User
-from meshbay_hub import hub_settings
 
 log = logging.getLogger(__name__)
 
@@ -318,7 +317,8 @@ async def admin_patch_user(
         if body.role not in ("user", "moderator", "admin"):
             raise HTTPException(status_code=422, detail="role must be user, moderator, or admin")
         user.role = body.role
-        log.info("User %s role changed to %s by %s", user.username, body.role, current_user.username)
+        log.info("User %s role changed to %s by %s",
+                 user.username, body.role, current_user.username)
         await create_notification(
             db, user.id, "role_change",
             f"Your role has been changed to {body.role}",
@@ -326,7 +326,9 @@ async def admin_patch_user(
 
     if body.status is not None:
         if body.status not in ("active", "suspended", "revoked"):
-            raise HTTPException(status_code=422, detail="status must be active, suspended, or revoked")
+            raise HTTPException(
+                status_code=422,
+                detail="status must be active, suspended, or revoked")
         user.status = body.status
         log.info("User %s status changed to %s by %s",
                  user.username, body.status, current_user.username)
@@ -484,7 +486,9 @@ async def admin_patch_group(
 
     if body.status is not None:
         if body.status not in ("active", "suspended", "revoked"):
-            raise HTTPException(status_code=422, detail="status must be active, suspended, or revoked")
+            raise HTTPException(
+                status_code=422,
+                detail="status must be active, suspended, or revoked")
         group.status = body.status
         log.info("Group %s status changed to %s by %s",
                  group.name, body.status, current_user.username)