1 files changed, 27 insertions, 1 deletions
diff --git a/packages/meshbay-hub/src/meshbay_hub/tasks/cleanup.py b/packages/meshbay-hub/src/meshbay_hub/tasks/cleanup.py
index c387100..6fa62a4 100644
--- a/packages/meshbay-hub/src/meshbay_hub/tasks/cleanup.py
+++ b/packages/meshbay-hub/src/meshbay_hub/tasks/cleanup.py
@@ -7,7 +7,7 @@ from datetime import datetime, timedelta, timezone
 from sqlalchemy import delete, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from meshbay_hub.db.models import Group, GroupMember, IPLog
+from meshbay_hub.db.models import EmailVerification, Group, GroupMember, IPLog, User
 
 log = logging.getLogger(__name__)
 
@@ -22,6 +22,26 @@ async def purge_old_ip_logs(db: AsyncSession, retention_days: int = RETENTION_DA
     return result.rowcount
 
 
+PENDING_USER_EXPIRY_DAYS = 7
+
+
+async def purge_expired_verifications(db: AsyncSession) -> int:
+    now = datetime.now(timezone.utc)
+    result = await db.execute(
+        delete(EmailVerification).where(EmailVerification.expires_at < now))
+    await db.commit()
+    return result.rowcount
+
+
+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)
+    result = await db.execute(
+        delete(User).where(User.status == "pending", User.created_at < cutoff))
+    await db.commit()
+    return result.rowcount
+
+
 async def cleanup_loop(get_session):
     """Run cleanup once at startup, then every 24 hours."""
     try:
@@ -31,6 +51,12 @@ async def cleanup_loop(get_session):
                     deleted = await purge_old_ip_logs(db)
                     if deleted:
                         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)
+                    stale = await purge_stale_pending_users(db)
+                    if stale:
+                        log.info("Purged %d stale pending users", stale)
             except asyncio.CancelledError:
                 raise
             except Exception as e: