Update app.py

app.py

@@ -15,7 +15,6 @@ from telethon import TelegramClient, events, Button
 from telethon.sessions import StringSession
 from telethon.tl import functions
 
-# ───── Logging ─────
 logging.basicConfig(
     level=logging.INFO,
     format="%(asctime)s | %(message)s",
@@ -23,7 +22,6 @@ logging.basicConfig(
 )
 log = logging.getLogger("app")
 
-# ───── Setup ─────
 nest_asyncio.apply()
 API_ID = int(os.getenv("API_ID", 3704772))
 API_HASH = os.getenv("API_HASH", "b8e50a035abb851c0dd424e14cac4c06")
@@ -34,116 +32,80 @@ ADMIN_ID = int(os.getenv("ADMIN_ID", 6574063018))
 client = MongoClient(MONGO_URI)
 db = client["telethon_bots"]
 accounts = db["accounts"]
-
 bot = TelegramClient("main_bot", API_ID, API_HASH).start(bot_token=BOT_TOKEN)
 userbots = {}
 
 scheduler = AsyncIOScheduler(timezone=pytz.timezone("Asia/Kolkata"))
 
-# ───── Reset Daily Counts ─────
-def reset_daily_counts():
-    accounts.update_many({}, {"$set": {"created": 0}})
-    asyncio.create_task(bot.send_message(ADMIN_ID, "🔄 Daily group creation count reset."))
-    log.info("🔄 Daily reset of group creation count")
-
-scheduler.add_job(reset_daily_counts, CronTrigger(hour=0, minute=0))
-
-adjectives = [
-    "Silent", "Crazy", "Golden", "Hidden", "Brave",
-    "Fierce", "Mysterious", "Savage", "Royal", "Witty",
-    "Legendary", "Epic", "Noble", "Clever", "Loyal",
-    "Wild", "Electric", "Fearless", "Crimson", "Frozen",
-    "Charming", "Rebel", "Turbo", "Lone", "Radiant",
-    "Raging", "Dusty", "Majestic", "Grumpy", "Shadow"
-]
-nouns = [
-    "Warriors", "Coders", "Friends", "Legends", "Pirates",
-    "Tigers", "Wolves", "Hackers", "Ninjas", "Riders",
-    "Hunters", "Kings", "Queens", "Giants", "Lords",
-    "Champions", "Stormers", "Creators", "Ghosts", "Wizards",
-    "Knights", "Samurais", "Explorers", "Titans", "Outlaws",
-    "Rebels", "Squad", "Troopers", "Dreamers", "Avengers"
-]
+# ───── Reset + Plan ─────
+def reset_and_plan():
+    accounts.update_many({}, {"$set": {"created": 0, "schedule_times": []}})
+    all_accounts = list(accounts.find())
+    
+    for acc in all_accounts:
+        limit = random.randint(3, 5)
+        times = []
+        while len(times) < limit:
+            h, m = random.randint(0, 23), random.randint(0, 59)
+            dt = datetime.now(pytz.timezone("Asia/Kolkata")).replace(hour=h, minute=m, second=0, microsecond=0)
+            if dt not in times:
+                times.append(dt)
+        times.sort()
+        accounts.update_one({"_id": acc["_id"]}, {"$set": {"schedule_times": times}})
+        
+        if acc["user_id"] in userbots:
+            for run_time in times:
+                scheduler.add_job(auto_create_groups, 'date', run_date=run_time, args=[userbots[acc["user_id"]], acc])
+    
+    asyncio.create_task(bot.send_message(ADMIN_ID, "🔄 Daily limits & schedules updated."))
+    log.info("🔄 Daily plan and reset done.")
+
+scheduler.add_job(reset_and_plan, CronTrigger(hour=0, minute=0))
+
+adjectives = ["Silent", "Crazy", "Golden", "Hidden", "Brave", "Fierce", "Mysterious", "Savage", "Royal", "Witty", "Legendary", "Epic", "Noble", "Clever", "Loyal", "Wild", "Electric", "Fearless", "Crimson", "Frozen", "Charming", "Rebel", "Turbo", "Lone", "Radiant", "Raging", "Dusty", "Majestic", "Grumpy", "Shadow"]
+nouns = ["Warriors", "Coders", "Friends", "Legends", "Pirates", "Tigers", "Wolves", "Hackers", "Ninjas", "Riders", "Hunters", "Kings", "Queens", "Giants", "Lords", "Champions", "Stormers", "Creators", "Ghosts", "Wizards", "Knights", "Samurais", "Explorers", "Titans", "Outlaws", "Rebels", "Squad", "Troopers", "Dreamers", "Avengers"]
 
 def random_group_name():
     return f"{random.choice(adjectives)} {random.choice(nouns)}"
 
-# Group name generator (with internal clean)
 async def auto_create_groups(userbot, acc_doc):
-    created = 0
     try:
-        for _ in range(random.randint(3, 5)):
-            title = random_group_name()
-            me = await userbot.get_me()
-
-            result = await userbot(functions.channels.CreateChannelRequest(
-                title=title,
-                about=",",  # already clean
-                megagroup=True
-            ))
-
-            group = result.chats[0].id
-            if not group:
-                raise Exception("Couldn't find created group")
-
-            # Send intro messages
-            for _ in range(4):
-                await userbot.send_message(group, random_group_name())
-                await asyncio.sleep(2)
-
-            # Send random sticker from a predefined list (example)
-            try:
-                stickers = ["CAACAgUAAxkBAAEKZStlTxkC-cvQJwABvHoUjRacAVIHCFcAAgECAALaTqVVCpx_Lc2ZoLguBA"]
-                await userbot.send_file(group, random.choice(stickers))
-            except Exception:
-                pass  # If sticker fails, skip
-
-            created += 1
-            await asyncio.sleep(1)
-
-        # Update DB with total created and last IST time
-        ist_time = datetime.now(pytz.timezone("Asia/Kolkata"))
+        if acc_doc["created"] >= len(acc_doc.get("schedule_times", [])):
+            return
+
+        title = random_group_name()
+        me = await userbot.get_me()
+        result = await userbot(functions.channels.CreateChannelRequest(
+            title=title,
+            about=",",
+            megagroup=True
+        ))
+        group = result.chats[0].id
+
+        for _ in range(4):
+            await userbot.send_message(group, random_group_name())
+            await asyncio.sleep(2)
+
+        try:
+            stickers = ["CAACAgUAAxkBAAEKZStlTxkC-cvQJwABvHoUjRacAVIHCFcAAgECAALaTqVVCpx_Lc2ZoLguBA"]
+            await userbot.send_file(group, random.choice(stickers))
+        except Exception:
+            pass
+
         accounts.update_one(
             {"_id": acc_doc["_id"]},
-            {"$inc": {"created": created}, "$set": {"last_created": ist_time}}
+            {"$inc": {"created": 1}, "$set": {"last_created": datetime.now(pytz.timezone("Asia/Kolkata"))}}
         )
 
         info = await userbot.get_me()
         await bot.send_message(
             ADMIN_ID,
-            f"✅ Created {created} groups\n👤 {info.first_name}\n🔗 @{info.username or 'N/A'}\n📊 Total today: {acc_doc['created'] + created}"
+            f"✅ Created 1 group\n👤 {info.first_name}\n🔗 @{info.username or 'N/A'}\n📊 Total today: {acc_doc['created'] + 1}"
         )
-        log.info(f"👥 {created} groups created for {acc_doc['name']}")
-
+        log.info(f"👥 1 group created for {acc_doc['name']}")
     except Exception as e:
-        try:
-            name = acc_doc['name'] if acc_doc else "Unknown"
-            await bot.send_message(ADMIN_ID, f"❌ Group creation failed for {name}: {e}")
-        except Exception:
-            pass
+        await bot.send_message(ADMIN_ID, f"❌ Group creation failed for {acc_doc['name']}: {e}")
         log.error(f"❌ Group creation failed: {e}")
-# ───── Scheduler ─────
-def schedule_random_group_creation(userbot, acc_doc):
-    async def job():
-        try:
-            if acc_doc["user_id"] not in userbots:
-                return
-            acc_doc = accounts.find_one({"user_id": acc_doc["user_id"]})
-            if acc_doc["created"] < 5:  # daily limit per account
-                await auto_create_groups(userbot, acc_doc)
-        except Exception as e:
-            await bot.send_message(ADMIN_ID, f"❌ Error for {acc_doc['name']}: {e}")
-        finally:
-            schedule_random_group_creation(userbot, acc_doc)
-
-    now = datetime.now(pytz.timezone("Asia/Kolkata"))
-    random_minute = random.randint(1, 59)
-    random_hour = random.randint(0, 23)
-    run_time = now.replace(hour=random_hour, minute=random_minute, second=0, microsecond=0)
-    if run_time < now:
-        run_time += timedelta(days=1)
-
-    scheduler.add_job(job, trigger='date', run_date=run_time)
 
 # ───── Userbot Setup ─────
 async def start_userbot(session_str, owner_id):