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

1 files changed, 13 insertions, 8 deletions

diff --git a/packages/meshbay-hub/src/meshbay_hub/api/groups.py b/packages/meshbay-hub/src/meshbay_hub/api/groups.py
index 72ba194..3a11345 100644
--- a/packages/meshbay-hub/src/meshbay_hub/api/groups.py
+++ b/packages/meshbay-hub/src/meshbay_hub/api/groups.py
@@ -1,22 +1,27 @@
 """Group endpoints — /v1/groups/*"""
 
 import re
+from datetime import UTC, datetime
 
 from fastapi import APIRouter, Depends, HTTPException, Query, Request
 from pydantic import BaseModel
-from datetime import datetime, timezone
 from sqlalchemy import func, or_, select, update
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from meshbay_hub import hub_settings, mail
-from meshbay_hub.auth import decrypt_email
 from meshbay_hub.api.deps import get_current_user, require_user_scope
 from meshbay_hub.api.middleware import limiter
 from meshbay_hub.api.netutil import client_ip
+from meshbay_hub.auth import decrypt_email
 from meshbay_hub.db.engine import get_db
 from meshbay_hub.db.models import (
-    FederatedGroup, Group, GroupMember, IPLog, SwarmSource, User,
+    FederatedGroup,
+    Group,
+    GroupMember,
+    IPLog,
+    SwarmSource,
+    User,
 )
 
 router = APIRouter(prefix="/v1/groups", tags=["groups"])
@@ -97,7 +102,7 @@ async def touch_group_activity(
     await db.execute(
         update(Group)
         .where(Group.id == group_id)
-        .values(last_activity_at=datetime.now(timezone.utc)))
+        .values(last_activity_at=datetime.now(UTC)))
     await db.commit()
     return {"ok": True}
 
@@ -261,9 +266,9 @@ async def swarm_register(
             detail="endpoint must be '<webrtc|quic>:<port>' — a port on the "
                    "registering node, not an address")
 
-    from datetime import datetime, timezone
+    from datetime import datetime
     existing = await db.get(SwarmSource, (body.content_hash, current_user.id))
-    now = datetime.now(timezone.utc)
+    now = datetime.now(UTC)
     if existing:
         existing.endpoint  = body.endpoint
         existing.last_seen = now
@@ -297,8 +302,8 @@ async def swarm_sources(
     Authenticated (H7): an open endpoint lets anyone probe whether a given file
     exists anywhere in the network and which node holds it.
     """
-    from datetime import datetime, timezone, timedelta
-    cutoff = datetime.now(timezone.utc) - timedelta(minutes=30)
+    from datetime import datetime, timedelta
+    cutoff = datetime.now(UTC) - timedelta(minutes=30)
     result = await db.execute(
         select(SwarmSource)
         .where(