Update app.py

app.py

@@ -66,69 +66,69 @@ def create_today_plan():
 
 def apply_today_plan():
     tz = pytz.timezone("Asia/Kolkata")
-    now = datetime.now(tz)
-
-    plans_today = list(plans.find())
-    for plan in plans_today:
+    for plan in plans.find():
         acc = accounts.find_one({"user_id": plan["user_id"]})
         if not acc or plan.get("created", 0) >= len(plan["times"]):
             continue
 
         for run_time in plan["times"]:
+            now = datetime.now(tz)
             run_time = run_time.astimezone(tz)
-            if run_time > now:
+
+            # Only schedule if it's at least 5 seconds in the future
+            if run_time > now + timedelta(seconds=5):
                 scheduler.add_job(
                     auto_create_groups,
                     trigger='date',
                     run_date=run_time,
                     args=[userbots[plan["user_id"]], acc, plan]
                 )
+
 def reset_and_plan():
     tz = pytz.timezone("Asia/Kolkata")
-    plans.delete_many({})  # Clear existing plans
-    end_of_day = datetime.now(tz).replace(hour=23, minute=59, second=0, microsecond=0)
+    now = datetime.now(tz).replace(second=0, microsecond=0)
+    midnight = (now + timedelta(days=1)).replace(hour=0, minute=0, second=0, microsecond=0)
+    minutes_left = int((midnight - now).total_seconds() // 60)
+
+    plans.delete_many({})  # Clear old plans
 
     for acc in accounts.find():
-        limit = random.randint(3, 5)
-        times = set()
-        attempts = 0
+        if acc["user_id"] not in userbots:
+            continue
+
+        # Only generate times if there's enough time left in the day
+        if minutes_left < 20:
+            continue
 
-        while len(times) < limit and attempts < 10:
+        times = []
+        used_minutes = set()
+        while len(times) < 3:
             now = datetime.now(tz).replace(second=0, microsecond=0)
-            attempts += 1
+            minutes_left = int(((now + timedelta(days=1)).replace(hour=0, minute=0) - now).total_seconds() // 60)
 
-            minutes_left = int((end_of_day - now).total_seconds() // 60)
-            if minutes_left <= 10:
-                break  # Not enough time left in the day
+            if minutes_left < 10:
+                break
 
-            random_minutes = random.randint(6, minutes_left)  # ✅ At least 6 minutes in future
+            random_minutes = random.randint(6, minutes_left)
+            if random_minutes in used_minutes:
+                continue
+
+            used_minutes.add(random_minutes)
             future_time = now + timedelta(minutes=random_minutes)
 
-            # Only add if it's at least 5 minutes in the future
-            if future_time > now + timedelta(minutes=5):
-                times.add(future_time.replace(second=0, microsecond=0))
+            # Skip if time is already past
+            if future_time <= now:
+                continue
 
-        if times:
-            plans.insert_one({
-                "user_id": acc["user_id"],
-                "times": sorted(times),
-                "created": 0
-            })
+            times.append(future_time)
 
-    log.info("✅ Today's plans reset with future-safe times.")
-    apply_today_plan()
+        plans.insert_one({
+            "user_id": acc["user_id"],
+            "times": sorted(times),
+            "created": 0
+        })
 
-    try:
-        loop = asyncio.get_event_loop()
-        loop.call_soon_threadsafe(
-            asyncio.create_task,
-            bot.send_message(
-                ADMIN_ID,
-                f"📊 Plans reset!\n🗓️ Date: {datetime.now(tz).strftime('%d/%m/%Y')}\n🕛 Next Reset: 24/07/2025 12:00 AM IST"
-            )
-        )
-    except Exception as e:
-        log.warning(f"⚠️ Failed to notify admin: {e}")
+    log.info("🔁 All plans have been reset and regenerated.")
 
 @bot.on(events.NewMessage(pattern=r'^/stats$'))
 async def handle_stats(event):