Update app.py

app.py

@@ -42,93 +42,96 @@ scheduler = AsyncIOScheduler()
 def random_group_name():
     return f"{random.choice(adjectives)} {random.choice(nouns)}"
 
-def create_today_plan():
-    tz = pytz.timezone("Asia/Kolkata")
-    now = datetime.now(tz)
-    end_of_day = now.replace(hour=23, minute=59, second=59, microsecond=0)
+import random
+from datetime import datetime, timedelta
+from pymongo import MongoClient
+from apscheduler.schedulers.asyncio import AsyncIOScheduler
+from apscheduler.triggers.cron import CronTrigger
+import pytz
+from telethon import events
 
-    plans.delete_many({})
+# MongoDB setup
+client = MongoClient("mongodb://localhost:27017/")
+db = client["mydb"]
+accounts = db["accounts"]
+plans = db["plans"]
 
-    for acc in accounts.find():
-        limit = random.randint(3, 5)
-        times = set()
+# Scheduler
+scheduler = AsyncIOScheduler()
+scheduler.start()
 
-        while len(times) < limit:
-            random_minutes = random.randint(0, (end_of_day - now).seconds // 60)
-            t = now + timedelta(minutes=random_minutes)
-            times.add(t)
+# Timezone
+tz = pytz.timezone("Asia/Kolkata")
 
-        schedule_times = sorted(list(times))
-        plans.insert_one({"user_id": acc["user_id"], "times": schedule_times, "created": 0})
+# Dummy userbot registry
+userbots = {}  # Fill this with: {user_id: bot_instance}
 
-    log.info(f"📅 Today's plan created with times from {now.strftime('%Y-%m-%d %H:%M')} to {end_of_day.strftime('%Y-%m-%d %H:%M')}.")
+def create_plan(account, limit):
+    now = datetime.now(tz)
+    end_of_day = now.replace(hour=23, minute=59, second=59, microsecond=0)
+    time_gap = (end_of_day - now) / limit
 
+    times = []
+    for i in range(limit):
+        planned_time = now + i * time_gap
+        # Ensure future time
+        if planned_time <= now:
+            planned_time = now + timedelta(minutes=1)
+        times.append(planned_time)
 
-def apply_today_plan():
-    tz = pytz.timezone("Asia/Kolkata")
+    for t in times:
+        plans.insert_one({
+            "account_id": account["_id"],
+            "scheduled_time": t.isoformat()
+        })
+
+def apply_plan():
+    now = datetime.now(tz)
     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
+        plan_time = datetime.fromisoformat(plan["scheduled_time"]).astimezone(tz)
+        if plan_time > now:
+            account = accounts.find_one({"_id": plan["account_id"]})
+            if not account:
+                continue
 
-        for run_time in plan["times"]:
-            now = datetime.now(tz)
-            run_time = run_time.astimezone(tz)
+            userbot = userbots.get(account["_id"])
+            if not userbot:
+                continue
 
-            # 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 job_wrapper(acc_id):
+                def job():
+                    print(f"Running job for account {acc_id} at {datetime.now(tz)}")
+                    # Your action here
+                return job
 
-def reset_and_plan():
-    tz = pytz.timezone("Asia/Kolkata")
-    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
+            scheduler.add_job(job_wrapper(account["_id"]), trigger='date', run_date=plan_time)
 
+def reset_and_plan():
+    print("🔁 Resetting plans and scheduling new ones...")
+    plans.delete_many({})  # Clear all plans
     for acc in accounts.find():
-        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
-
-        times = []
-        used_minutes = set()
-        while len(times) < 3:
-            now = datetime.now(tz).replace(second=0, microsecond=0)
-            minutes_left = int(((now + timedelta(days=1)).replace(hour=0, minute=0) - now).total_seconds() // 60)
-
-            if minutes_left < 10:
-                break
-
-            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)
+        limit = random.randint(3, 5)
+        create_plan(acc, limit)
+    apply_plan()
+    print("✅ Plans created and scheduled.")
 
-            # Skip if time is already past
-            if future_time <= now:
-                continue
+# Schedule reset daily at 00:00 IST
+scheduler.add_job(reset_and_plan, CronTrigger(hour=0, minute=0, timezone="Asia/Kolkata"), id="daily_reset_job", replace_existing=True)
 
-            times.append(future_time)
+# Telethon /reset command
+@bot.on(events.NewMessage(pattern=r'^/reset$'))
+async def handle_reset(event):
+    sender = await event.get_sender()
+    if sender.id != ADMIN_ID:
+        return await event.reply("❌ You are not authorized to run this command.")
 
-        plans.insert_one({
-            "user_id": acc["user_id"],
-            "times": sorted(times),
-            "created": 0
-        })
+    for job in scheduler.get_jobs():
+        if job.func.__name__ == "reset_and_plan" or job.id == "daily_reset_job":
+            job.remove()
 
-    log.info("🔁 All plans have been reset and regenerated.")
+    reset_and_plan()
+    scheduler.add_job(reset_and_plan, CronTrigger(hour=0, minute=0, timezone="Asia/Kolkata"), id="daily_reset_job", replace_existing=True)
+    await event.reply("✅ Schedule reset and re-planned for tonight 00:00 IST.")
 
 @bot.on(events.NewMessage(pattern=r'^/stats$'))
 async def handle_stats(event):
@@ -163,23 +166,6 @@ async def handle_stats(event):
     await event.reply(msg)
 
 
-@bot.on(events.NewMessage(pattern=r'^/reset$'))
-async def handle_reset(event):
-    sender = await event.get_sender()
-    if sender.id != ADMIN_ID:
-        return await event.reply("❌ You are not authorized to run this command.")
-    for job in scheduler.get_jobs():
-        if job.func.__name__ == "reset_and_plan" or job.id == "daily_reset_job":
-            job.remove()
-    reset_and_plan()
-    scheduler.add_job(reset_and_plan, CronTrigger(hour=0, minute=0, timezone="Asia/Kolkata"), id="daily_reset_job", replace_existing=True)
-    await event.reply("✅ Schedule reset and re-planned for tonight 00:00 IST.")
-
-scheduler.add_job(reset_and_plan, CronTrigger(hour=0, minute=0, timezone="Asia/Kolkata"), id="daily_reset_job", replace_existing=True)
-
-# Continue with rest of your previous unchanged functions and endpoints...
-# (like auto_create_groups, start_userbot, load_all_userbots, Flask setup, etc.)
-
 async def auto_create_groups(userbot, acc_doc, plan_doc=None):
     if plan_doc and plan_doc["created"] >= len(plan_doc["times"]):
         await bot.send_message(ADMIN_ID, f"❌ Group creation skipped: Limit exceeded for {acc_doc['name']}")