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

1 files changed, 7 insertions, 6 deletions

diff --git a/packages/meshbay-hub/src/meshbay_hub/tasks/cleanup.py b/packages/meshbay-hub/src/meshbay_hub/tasks/cleanup.py
index 5c52387..1ef7796 100644
--- a/packages/meshbay-hub/src/meshbay_hub/tasks/cleanup.py
+++ b/packages/meshbay-hub/src/meshbay_hub/tasks/cleanup.py
@@ -2,7 +2,7 @@
 
 import asyncio
 import logging
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 
 from sqlalchemy import delete, select
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -16,7 +16,7 @@ CLEANUP_INTERVAL_HOURS = 24
 
 
 async def purge_old_ip_logs(db: AsyncSession, retention_days: int = RETENTION_DAYS) -> int:
-    cutoff = datetime.now(timezone.utc) - timedelta(days=retention_days)
+    cutoff = datetime.now(UTC) - timedelta(days=retention_days)
     result = await db.execute(delete(IPLog).where(IPLog.timestamp < cutoff))
     await db.commit()
     return result.rowcount
@@ -26,7 +26,7 @@ PENDING_USER_EXPIRY_DAYS = 7
 
 
 async def purge_expired_verifications(db: AsyncSession) -> int:
-    now = datetime.now(timezone.utc)
+    now = datetime.now(UTC)
     result = await db.execute(
         delete(EmailVerification).where(EmailVerification.expires_at < now))
     await db.commit()
@@ -35,7 +35,7 @@ async def purge_expired_verifications(db: AsyncSession) -> int:
 
 async def purge_stale_pending_users(db: AsyncSession,
                                      expiry_days: int = PENDING_USER_EXPIRY_DAYS) -> int:
-    cutoff = datetime.now(timezone.utc) - timedelta(days=expiry_days)
+    cutoff = datetime.now(UTC) - timedelta(days=expiry_days)
     result = await db.execute(
         delete(User).where(User.status == "pending", User.created_at < cutoff))
     await db.commit()
@@ -50,7 +50,8 @@ async def cleanup_loop(get_session):
                 async with get_session() as db:
                     deleted = await purge_old_ip_logs(db)
                     if deleted:
-                        log.info("Purged %d IP log entries older than %d days", deleted, RETENTION_DAYS)
+                        log.info("Purged %d IP log entries older than %d days",
+                                 deleted, RETENTION_DAYS)
                     expired = await purge_expired_verifications(db)
                     if expired:
                         log.info("Purged %d expired email verifications", expired)
@@ -93,7 +94,7 @@ async def find_unhosted_groups(db: AsyncSession, grace_days: int = UNHOSTED_GRAC
     whole reason the column exists rather than a check against the live socket
     registry, which would delete every group during a hub restart.
     """
-    cutoff = datetime.now(timezone.utc) - timedelta(days=grace_days)
+    cutoff = datetime.now(UTC) - timedelta(days=grace_days)
     result = await db.execute(
         select(Group).where(Group.hosted_at.is_(None), Group.created_at < cutoff))
     return list(result.scalars().all())