Update app.py

app.py

@@ -363,75 +363,69 @@ async def save_progress(source_id, dest_id, msg_id):
     except Exception as e: print(f"Error saving progress: {e}")
 
 
-# ================= AUTO SHARE LOGIC (5 videos / 5 mins) =================
+# ================= FIXED AUTO SHARE LOGIC (Without get_chat_history) =================
 async def auto_share_loop(client, target_chat_id, delay=300):
     global auto_share_running
     
     while auto_share_running:
         try:
-            # Check maximum message ID to avoid infinite blank search
-            latest_msg_id = 0
-            async for m in client.get_chat_history(STORAGE_CHANNEL_ID, limit=1):
-                latest_msg_id = m.id
-                break
-                
             progress_res = await db_query(lambda: supabase.table('clone_progress').select('last_copied_id').eq('source_id', STORAGE_CHANNEL_ID).eq('dest_id', target_chat_id).execute())
             last_checked_id = 0
             if progress_res.data:
                 last_checked_id = progress_res.data[0]['last_copied_id']
-            
-            if latest_msg_id > 0 and last_checked_id >= latest_msg_id:
-                await asyncio.sleep(60) 
-                continue
 
             batch_to_send = []
-            while len(batch_to_send) < 5 and auto_share_running:
-                if latest_msg_id > 0 and last_checked_id >= latest_msg_id:
-                    break
-                    
-                chunk_ids = list(range(last_checked_id + 1, min(last_checked_id + 51, latest_msg_id + 1)))
-                if not chunk_ids:
-                    break
-                    
-                try:
-                    msgs = await client.get_messages(STORAGE_CHANNEL_ID, chunk_ids)
-                    for idx, msg in enumerate(msgs):
-                        msg_expected_id = chunk_ids[idx]
-                        if msg is None or getattr(msg, "empty", False):
-                            last_checked_id = max(last_checked_id, msg_expected_id)
-                            continue
-                            
+            current_id = last_checked_id + 1
+            search_limit = 50 
+            highest_valid_id = last_checked_id
+
+            chunk_ids = list(range(current_id, current_id + search_limit))
+
+            try:
+                msgs = await client.get_messages(STORAGE_CHANNEL_ID, chunk_ids)
+                valid_messages_found = False
+
+                for msg in msgs:
+                    if not auto_share_running: break
+                    if msg and not getattr(msg, "empty", False):
+                        valid_messages_found = True
+                        highest_valid_id = msg.id 
+
                         if msg.video or (msg.document and msg.document.mime_type and "video" in msg.document.mime_type) or msg.photo:
                             batch_to_send.append(msg)
-                            last_checked_id = max(last_checked_id, msg.id)
                             if len(batch_to_send) == 5:
                                 break
-                        else:
-                            last_checked_id = max(last_checked_id, msg.id)
-                except FloodWait as e:
-                    await asyncio.sleep(e.value + 1)
-                except Exception as e:
-                    print(f"Fetch error in auto share: {e}")
-                    await asyncio.sleep(5)
-                    
+            except FloodWait as e:
+                await asyncio.sleep(e.value + 1)
+                continue
+            except Exception as e:
+                print(f"Fetch error in auto share: {e}")
+                await asyncio.sleep(5)
+                continue
+
             if not batch_to_send:
-                await save_progress(STORAGE_CHANNEL_ID, target_chat_id, last_checked_id)
-                await asyncio.sleep(10)
+                if valid_messages_found and highest_valid_id > last_checked_id:
+                    await save_progress(STORAGE_CHANNEL_ID, target_chat_id, highest_valid_id)
+                await asyncio.sleep(30) 
                 continue
                 
+            last_sent_id = highest_valid_id
             sent_message_ids = []
+            
             for msg in batch_to_send:
                 if not auto_share_running: break
                 try:
                     sent = await msg.copy(target_chat_id)
                     sent_message_ids.append(sent.id)
+                    last_sent_id = msg.id 
                     await asyncio.sleep(1.5) 
                 except FloodWait as e:
                     await asyncio.sleep(e.value + 1)
                 except Exception as e:
                     print(f"Error copying msg {msg.id}: {e}")
                     
-            await save_progress(STORAGE_CHANNEL_ID, target_chat_id, last_checked_id)
+            if last_sent_id > last_checked_id:
+                await save_progress(STORAGE_CHANNEL_ID, target_chat_id, last_sent_id)
             
             for _ in range(delay):
                 if not auto_share_running: break
@@ -476,6 +470,34 @@ async def stop_sharing_cmd(client, message):
     await message.reply("🛑 <b>Auto-sharing stopped successfully!</b>", parse_mode=enums.ParseMode.HTML)
 
 
+# ================= HELP COMMAND =================
+@bot.on_message(filters.command("help"))
+async def help_command(client, message):
+    user_id = message.from_user.id
+    is_admin = user_id in ADMIN_IDS
+
+    help_text = "🛠 **Bot Commands Help Menu**\n\n"
+
+    if is_admin:
+        help_text += "👑 **Admin Commands:**\n"
+        help_text += "👉 `/stats` - Check total users, videos, and groups.\n"
+        help_text += "👉 `/broadcast` - Send a message to all bot users.\n"
+        help_text += "👉 `/clone <source_id> <dest_id>` - Clone videos from one group to another.\n"
+        help_text += "👉 `/sendto <group_id>` - Reply to a media to forward it directly to a specific group.\n"
+        help_text += "👉 `/upload <telegram/byse>` - Change video upload server (Local or byse.sx).\n"
+        help_text += "👉 `/blur <percentage>` - Enable video/photo blur (e.g., `/blur 60`). Send `/blur 0` to disable.\n"
+        help_text += "👉 `/clean` - Scan and kick dead/deleted users from the Premium channel.\n"
+        help_text += "👉 `/startshare` - Start auto-forwarding 5 videos to the target group every 5 minutes.\n"
+        help_text += "👉 `/startshare reset` - Reset auto-forward progress to the first video.\n"
+        help_text += "👉 `/stopshare` - Stop the auto-forwarding process.\n\n"
+
+    help_text += "👤 **User Commands:**\n"
+    help_text += "👉 `/start` - Start the bot and get the WebApp link.\n"
+
+    await message.reply(help_text, parse_mode=enums.ParseMode.MARKDOWN)
+# ================================================
+
+
 # ================= TELEGRAM BOT COMMANDS =================
 @bot.on_message(filters.command("start"))
 async def start(client, message):
@@ -1174,7 +1196,7 @@ async def auto_clean_channel_loop():
             print(f"Auto clean error: {e}")
         await asyncio.sleep(4 * 3600) 
 
-@bot.on_message(filters.private & filters.user(ADMIN_IDS) & ~filters.command(["start", "stats", "users", "broadcast", "png", "addvideo", "blur", "clean", "sendto", "clone", "upload", "startshare", "stopshare"]))
+@bot.on_message(filters.private & filters.user(ADMIN_IDS) & ~filters.command(["start", "stats", "users", "broadcast", "png", "addvideo", "blur", "clean", "sendto", "clone", "upload", "startshare", "stopshare", "help"]))
 async def catch_admin_steps(client, message):
     state = admin_states.get(message.chat.id, {})
     if state.get("step") == 1: