Update app.py

app.py

@@ -8,7 +8,7 @@ import sqlite3
 import json
 import random
 import time
-from datetime import datetime
+from datetime import datetime, timedelta
 from typing import Dict, List, Optional, Tuple
 from dataclasses import dataclass, asdict
 from enum import Enum
@@ -252,39 +252,42 @@ class GameDatabase:
         print(f"🎮 Game started in room {room_id}!")
     
     def cleanup_old_rooms(self):
-        """Remove empty or stale rooms (no activity for 1 day)"""
+        """Remove empty or stale rooms."""
         with self.lock, self.get_connection() as conn:
-            cutoff_time = datetime.now().timestamp() - 86400  # 24 hours ago
-            
-            # Find stale rooms
-            stale_rooms = conn.execute("""
-                SELECT room_id FROM rooms 
-                WHERE status = 'waiting' 
-                AND strftime('%s', created_at) < ?
-            """, (cutoff_time,)).fetchall()
-            
-            # Also find empty rooms (no players after 1 hour)
-            empty_cutoff = datetime.now().timestamp() - 3600  # 1 hour ago
-            empty_rooms = conn.execute("""
-                SELECT r.room_id FROM rooms r
-                LEFT JOIN players p ON r.room_id = p.room_id
-                WHERE r.status = 'waiting'
-                AND p.room_id IS NULL
-                AND strftime('%s', r.created_at) < ?
-            """, (empty_cutoff,)).fetchall()
-            
-            rooms_to_delete = set(
-                [r['room_id'] for r in stale_rooms] + 
-                [r['room_id'] for r in empty_rooms]
+            # Using ISO 8601 format for comparisons
+            stale_cutoff = (datetime.now() - timedelta(hours=24)).isoformat()
+            empty_cutoff = (datetime.now() - timedelta(hours=1)).isoformat()
+
+            # Find rooms waiting for more than 24 hours
+            stale_rooms_q = conn.execute(
+                "SELECT room_id FROM rooms WHERE status = 'waiting' AND created_at < ?",
+                (stale_cutoff,)
             )
-            
+            stale_ids = {row['room_id'] for row in stale_rooms_q.fetchall()}
+
+            # Find rooms waiting for more than 1 hour with no players
+            empty_rooms_q = conn.execute(
+                """
+                SELECT room_id FROM rooms
+                WHERE status = 'waiting'
+                AND created_at < ?
+                AND room_id NOT IN (SELECT DISTINCT room_id FROM players WHERE room_id IS NOT NULL)
+                """,
+                (empty_cutoff,)
+            )
+            empty_ids = {row['room_id'] for row in empty_rooms_q.fetchall()}
+
+            rooms_to_delete = stale_ids.union(empty_ids)
+
+            if not rooms_to_delete:
+                return 0
+
             for room_id in rooms_to_delete:
-                # Delete associated data
+                conn.execute("DELETE FROM rooms WHERE room_id = ?", (room_id,))
                 conn.execute("DELETE FROM players WHERE room_id = ?", (room_id,))
                 conn.execute("DELETE FROM spectators WHERE room_id = ?", (room_id,))
-                conn.execute("DELETE FROM rooms WHERE room_id = ?", (room_id,))
-                print(f"🧹 Cleaned up stale room: {room_id}")
-            
+                print(f"🧹 Cleaned up stale/empty room: {room_id}")
+
             conn.commit()
             return len(rooms_to_delete)