Update app.py

app.py

@@ -75,20 +75,15 @@ def apply_today_plan():
             continue
 
         for run_time in plan["times"]:
-            if run_time.tzinfo is None:
-                run_time = tz.localize(run_time)
-            else:
-                run_time = run_time.astimezone(tz)
-
-            if run_time.date() == now.date() and run_time > now:
+            run_time = run_time.astimezone(tz)
+            if run_time > now:
                 scheduler.add_job(
                     auto_create_groups,
                     trigger='date',
                     run_date=run_time,
                     args=[userbots[plan["user_id"]], acc, plan]
                 )
-            elif run_time <= now:
-                log.warning(f"⏰ Missed scheduled time for {acc['name']}: {run_time}")
+
 def reset_and_plan():
     tz = pytz.timezone("Asia/Kolkata")
     now = datetime.now(tz)
@@ -100,26 +95,27 @@ def reset_and_plan():
         limit = random.randint(3, 5)
         times = set()
 
-        minutes_left = int((end_of_day - now).total_seconds() // 60)
-        if minutes_left <= 0:
-            log.warning(f"⏳ Not enough time left to schedule for {acc['name']}. Skipping.")
-            continue
+        while len(times) < limit:
+            # Always calculate from *latest current time* in loop
+            now = datetime.now(tz)
+            minutes_left = int((end_of_day - now).total_seconds() // 60)
+            if minutes_left <= 1:
+                break  # Not enough time left
 
-        while len(times) < limit and len(times) < minutes_left:
             random_minutes = random.randint(1, minutes_left)
             t = now + timedelta(minutes=random_minutes)
-            t = t.astimezone(tz)  # Ensure timezone-aware
+            t = t.replace(second=0, microsecond=0)  # clean seconds
             times.add(t)
 
         schedule_times = sorted(list(times))
-        plans.insert_one({
-            "user_id": acc["user_id"],
-            "times": schedule_times,
-            "created": 0
-        })
-
-    log.info(f"📅 Today's plan created between {now.strftime('%Y-%m-%d %H:%M')} and {end_of_day.strftime('%Y-%m-%d %H:%M')}.")
-
+        if schedule_times:
+            plans.insert_one({
+                "user_id": acc["user_id"],
+                "times": schedule_times,
+                "created": 0
+            })
+
+    log.info(f"📅 Plans created for today between {now.strftime('%Y-%m-%d %I:%M %p')} and {end_of_day.strftime('%I:%M %p')} IST.")
     apply_today_plan()
 
     try:
@@ -128,7 +124,7 @@ def reset_and_plan():
             asyncio.create_task,
             bot.send_message(
                 ADMIN_ID,
-                f"🗓️ Daily schedule reset and updated.\n🕒 Next Reset: {end_of_day.strftime('%Y-%m-%d 00:00:00')}"
+                f"✅ Plans reset for today ({now.strftime('%d/%m/%Y')}), all future only.\nNext reset: 00:00 IST"
             )
         )
     except Exception as e:
@@ -137,27 +133,36 @@ def reset_and_plan():
 @bot.on(events.NewMessage(pattern=r'^/stats$'))
 async def handle_stats(event):
     tz = pytz.timezone("Asia/Kolkata")
+    now = datetime.now(tz)
+
     msg = "📊 **Today's Schedule:**\n\n"
+    msg += f"🗓️ Date: {now.strftime('%d/%m/%Y')}\n"
+    msg += f"🕒 Time: {now.strftime('%I:%M %p')} IST\n\n"
+
     plans_today = list(plans.find())
     if not plans_today:
         return await event.reply("📭 No plans found today.")
+
     for plan in plans_today:
         acc = accounts.find_one({"user_id": plan["user_id"]})
         if not acc:
             continue
         name = acc["name"]
-        times_str = ", ".join([t.astimezone(tz).strftime("%H:%M") for t in plan["times"]])
+        times_str = ", ".join([t.astimezone(tz).strftime("%I:%M %p") for t in plan["times"]])
         created = plan.get("created", 0)
         msg += f"👤 **{name}** → `{times_str}`\n✅ Created: `{created}`\n\n"
+
     next_run = None
     for job in scheduler.get_jobs():
         if job.id == "daily_reset_job":
             next_run = job.next_run_time
             break
     if next_run:
-        msg += f"🕒 Next Reset: `{next_run.astimezone(tz).strftime('%Y-%m-%d %H:%M:%S')}`"
+        msg += f"🕛 Next Reset: `{next_run.astimezone(tz).strftime('%d/%m/%Y %I:%M %p')} IST`"
+
     await event.reply(msg)
 
+
 @bot.on(events.NewMessage(pattern=r'^/reset$'))
 async def handle_reset(event):
     sender = await event.get_sender()