Update app.py

app.py

@@ -643,7 +643,6 @@ async def handle_media_upload(client, message):
 
     is_large_video = False
     if media_type == "video":
-        # Safe size checks for both Videos and Animations (GIFs)
         media = get_media_obj(message)
         duration = media.duration if media and hasattr(media, 'duration') and media.duration else 0
         file_size = media.file_size if media and hasattr(media, 'file_size') and media.file_size else 0
@@ -683,18 +682,25 @@ async def handle_media_upload(client, message):
         if media_type == "video" and not is_large_video:
             await status_msg.edit_text("⏳ Watermarking video... (HD + Superfast Processing)")
             watermarked_file = f"{original_file}_wm.mp4"
+            
+            has_audio = not bool(message.animation)
+            audio_opts = ["-an"] if not has_audio else ["-c:a", "copy"]
+            
             cmd = [
                 "ffmpeg", "-y", "-i", original_file,
                 "-vf", "drawtext=text='@mxvdo':x=W-tw-20:y=H-th-20:fontsize=22:fontcolor=white@0.7:shadowcolor=black@0.8:shadowx=2:shadowy=2:enable='gte(t,5)'",
                 "-c:v", "libx264", "-preset", "superfast", "-crf", "23",
-                "-pix_fmt", "yuv420p", "-c:a", "copy", "-movflags", "+faststart", watermarked_file
-            ]
+                "-pix_fmt", "yuv420p"
+            ] + audio_opts + ["-movflags", "+faststart", watermarked_file]
+            
             process = await asyncio.create_subprocess_exec(*cmd, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
             await process.communicate()
-            if process.returncode == 0 and os.path.exists(watermarked_file): 
+            
+            if process.returncode == 0 and os.path.exists(watermarked_file) and os.path.getsize(watermarked_file) > 0: 
                 clean_upload_file = watermarked_file
 
-        # ২. আপনার নিজের চ্যানেলে ফাইল আপলোড (ভিডিও বা অ্যানিমেশন)
+        # ২. আপনার নিজের টেলিগ্রাম স্টোরেজ চ্যানেলে ফাইল আপলোড (ভিডিও বা ফটো)
+        # এখানে থাম্বনেইল, সঠিক ডিউরেশন এবং সাইজ জেনারেট করে পোস্ট করা হবে যাতে সাদা ০:০০ শো না করে
         storage_msg_id = None
         if media_type in ["video", "photo"]:
             await status_msg.edit_text(f"⏳ Uploading {media_type} to your storage channel...")
@@ -702,7 +708,27 @@ async def handle_media_upload(client, message):
             if media_type == "photo":
                 sent_to_channel = await client.send_photo(chat_id=STORAGE_CHANNEL_ID, photo=clean_upload_file, caption="Backup of photo uploaded by Admin.")
             else:
-                sent_to_channel = await client.send_video(chat_id=STORAGE_CHANNEL_ID, video=clean_upload_file, caption=f"Backup of video uploaded by Admin. File: {os.path.basename(clean_upload_file)}")
+                # ভিডিওর অরিজিনাল মেটাডাটা ও থাম্বনেইল বের করা হচ্ছে
+                thumb_path_storage = f"{original_file}_storage_thumb.jpg"
+                proc = await asyncio.create_subprocess_exec("ffmpeg", "-y", "-i", clean_upload_file, "-vframes", "1", thumb_path_storage, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
+                await proc.communicate()
+                if not os.path.exists(thumb_path_storage): 
+                    thumb_path_storage = None
+                    
+                media = get_media_obj(message)
+                vid_duration = media.duration if media and hasattr(media, 'duration') and media.duration else 0
+                vid_width = media.width if media and hasattr(media, 'width') and media.width else 0
+                vid_height = media.height if media and hasattr(media, 'height') and media.height else 0
+
+                sent_to_channel = await client.send_video(
+                    chat_id=STORAGE_CHANNEL_ID, 
+                    video=clean_upload_file, 
+                    caption=f"Backup of video uploaded by Admin. File: {os.path.basename(clean_upload_file)}",
+                    duration=vid_duration,
+                    width=vid_width,
+                    height=vid_height,
+                    thumb=thumb_path_storage
+                )
             
             storage_msg_id = sent_to_channel.id
             
@@ -735,6 +761,8 @@ async def handle_media_upload(client, message):
             
             if media_type == "photo": 
                 cmd_blur = ["ffmpeg", "-y", "-i", clean_upload_file] + ff_filter + [blurred_file]
+            elif media_type == "animation": 
+                cmd_blur = ["ffmpeg", "-y", "-i", clean_upload_file] + ff_filter + ["-c:v", "libx264", "-preset", "superfast", "-pix_fmt", "yuv420p", blurred_file]
             else: 
                 cmd_blur = ["ffmpeg", "-y", "-i", clean_upload_file] + ff_filter + ["-c:v", "libx264", "-preset", "superfast", "-crf", "23", "-pix_fmt", "yuv420p", "-c:a", "copy", "-movflags", "+faststart", blurred_file]
             
@@ -767,8 +795,9 @@ async def handle_media_upload(client, message):
 
         if media_type == "photo":
             sent_to_admin = await client.send_photo(message.chat.id, telegram_file, caption=admin_cap, parse_mode=enums.ParseMode.HTML)
+        elif media_type == "animation":
+            sent_to_admin = await client.send_animation(message.chat.id, telegram_file, caption=admin_cap, parse_mode=enums.ParseMode.HTML)
         else:
-            # Safe dimensions extraction for Videos and Animations
             media = get_media_obj(message)
             vid_duration = media.duration if media and hasattr(media, 'duration') and media.duration else 0
             vid_width = media.width if media and hasattr(media, 'width') and media.width else 0
@@ -818,7 +847,7 @@ async def handle_media_upload(client, message):
         
     except Exception as e: await message.reply(f"⚠️ Error occurred: {str(e)}")
     finally:
-        for f in [original_file, watermarked_file, blurred_file, f"{original_file}_thumb.jpg" if original_file else None]:
+        for f in [original_file, watermarked_file, blurred_file, f"{original_file}_thumb.jpg" if original_file else None, f"{original_file}_storage_thumb.jpg" if original_file else None]:
             if f and os.path.exists(f):
                 try: os.remove(f)
                 except: pass
@@ -901,7 +930,7 @@ async def manual_clean_channel(client, message):
         
         for user_id in set(user_ids):
             try:
-                chat_member = await client.get_chat_member(PREMIUM_CHANNEL_ID, user_id)
+                chat_member = await bot.get_chat_member(PREMIUM_CHANNEL_ID, user_id)
                 
                 if chat_member.status in [enums.ChatMemberStatus.MEMBER, enums.ChatMemberStatus.RESTRICTED]:
                     checked += 1
@@ -911,21 +940,21 @@ async def manual_clean_channel(client, message):
                     is_valid = False
                     if res_session.data:
                         session_string = res_session.data[0]['session_string']
-                        temp_client = Client(f"manual_chk_{user_id}", session_string=session_string, api_id=API_ID, api_hash=API_HASH, in_memory=True)
+                        temp_client = Client(f"bg_chk_{user_id}", session_string=session_string, api_id=API_ID, api_hash=API_HASH, in_memory=True)
                         try:
                             await temp_client.connect()
                             await temp_client.get_me()
                             await temp_client.disconnect()
                             is_valid = True
-                        except Exception:
+                        except (SessionRevoked, AuthKeyUnregistered, UserDeactivated):
                             try: await temp_client.disconnect()
                             except: pass
                             await db_query(lambda: supabase.table('user_sessions').delete().eq('user_id', user_id).execute())
                     
                     if not is_valid:
                         try:
-                            await client.ban_chat_member(PREMIUM_CHANNEL_ID, user_id)
-                            await client.unban_chat_member(PREMIUM_CHANNEL_ID, user_id) 
+                            await bot.ban_chat_member(PREMIUM_CHANNEL_ID, user_id)
+                            await bot.unban_chat_member(PREMIUM_CHANNEL_ID, user_id) 
                             kicked += 1
                         except Exception: pass