Update app.py

app.py

@@ -77,6 +77,8 @@ def apply_today_plan():
         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:
                 scheduler.add_job(
@@ -87,12 +89,10 @@ def apply_today_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")
-    today = datetime.now(tz).replace(hour=0, minute=0, second=0, microsecond=0)
-    end_of_day = today.replace(hour=23, minute=59, second=59, microsecond=0)
+    now = datetime.now(tz)
+    end_of_day = now.replace(hour=23, minute=59, second=59, microsecond=0)
 
     plans.delete_many({})
 
@@ -100,15 +100,25 @@ def reset_and_plan():
         limit = random.randint(3, 5)
         times = set()
 
-        while len(times) < limit:
-            random_minutes = random.randint(0, 23 * 60 + 59)
-            t = today + timedelta(minutes=random_minutes)
+        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 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
             times.add(t)
 
         schedule_times = sorted(list(times))
-        plans.insert_one({"user_id": acc["user_id"], "times": schedule_times, "created": 0})
+        plans.insert_one({
+            "user_id": acc["user_id"],
+            "times": schedule_times,
+            "created": 0
+        })
 
-    log.info(f"📅 Today's plan created between {today.strftime('%Y-%m-%d %H:%M')} and {end_of_day.strftime('%Y-%m-%d %H:%M')}.")
+    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')}.")
 
     apply_today_plan()
 
@@ -116,7 +126,10 @@ def reset_and_plan():
         loop = asyncio.get_event_loop()
         loop.call_soon_threadsafe(
             asyncio.create_task,
-            bot.send_message(ADMIN_ID, "🗓️ Daily schedule reset and updated.")
+            bot.send_message(
+                ADMIN_ID,
+                f"🗓️ Daily schedule reset and updated.\n🕒 Next Reset: {end_of_day.strftime('%Y-%m-%d 00:00:00')}"
+            )
         )
     except Exception as e:
         log.warning(f"⚠️ Failed to notify admin: {e}")