fix: nsfw.py dsong.py from cookies to api

DragMusic/plugins/bot/start.py

@@ -67,6 +67,7 @@ async def start_pm(client, message: Message, _):
                     text=f"{message.from_user.mention} ᴄʜᴇᴄᴋᴇᴅ <b>sᴜᴅᴏʟɪsᴛ</b>.\n\n"
                          f"<b>• ɪᴅᴇɴᴛɪғɪᴇʀ ⌯</b> <code>{message.from_user.id}</code>\n"
                          f"<b>• ʜᴀɴᴅʟᴇ ⌯</b> @{message.from_user.username}",
+                    message_thread_id=9,
                 )
             return
 
@@ -108,6 +109,7 @@ async def start_pm(client, message: Message, _):
                         text=f"<b>{message.from_user.mention} ᴄʜᴇᴄᴋᴇᴅ ᴛʀᴀᴄᴋ ɪɴғᴏ.</b>\n\n"
                              f"<b>• ɪᴅᴇɴᴛɪғɪᴇʀ ⌯</b> <code>{message.from_user.id}</code>\n"
                              f"<b>• ʜᴀɴᴅʟᴇ ⌯</b> @{message.from_user.username}",
+                        message_thread_id=9,
                     )
             else:
                 await m.edit_text("ғᴀɪʟᴇᴅ ᴛᴏ ʀᴇᴛʀɪᴇᴠᴇ ɪɴғᴏʀᴍᴀᴛɪᴏɴ.")
@@ -129,6 +131,7 @@ async def start_pm(client, message: Message, _):
                 text=f"<b>{message.from_user.mention} sᴛᴀʀᴛᴇᴅ ᴛʜᴇ ʙᴏᴛ.</b>\n\n"
                      f"<b>• ɪᴅᴇɴᴛɪғɪᴇʀ ⌯</b> <code>{message.from_user.id}</code>\n"
                      f"<b>• ʜᴀɴᴅʟᴇ ⌯</b> @{message.from_user.username}",
+                message_thread_id=9,
             )
 
 

DragMusic/plugins/plugins/dsong.py

@@ -1,57 +1,56 @@
 import os
+import tempfile
 from datetime import timedelta
 from pyrogram.enums import ParseMode
-
-import wget
-from pyrogram import Client
+import httpx
 from pyrogram import filters
 from pyrogram.types import Message
-from yt_dlp import YoutubeDL
-from youtubesearchpython import VideosSearch
 from DragMusic import app
-
+from DragMusic.platforms.Youtube import YouTubeAPI
+from config import BITFLOW_API_KEY
 
 @app.on_message(filters.command(["vsong"]))
 async def vsong_cmd(client, message):
-    """Command to download and send a YouTube video."""
+    """Command to download and send a YouTube video using Bitflow API."""
     if len(message.command) < 2:
         return await message.reply_text(
             "❌ <b>Video not found,</b>\nPlease enter the correct video title.",
         )
     infomsg = await message.reply_text("<b>🔍 Searching...</b>", quote=False)
+    query = message.text.split(None, 1)[1]
     try:
-        search = VideosSearch(message.text.split(None, 1)[1], limit=1).result()["result"][0]
-        link = f"https://youtu.be/{search['id']}"
+        bitflow = await YouTubeAPI().bitflow_video(query, api_key=BITFLOW_API_KEY)
+        if not bitflow or bitflow.get("status") != "success":
+            return await infomsg.edit("<b>🔍 Searching...\n\n No result from Bitflow API.</b>")
+        url = bitflow["url"]
+        title = bitflow.get("title", "Unknown")
+        duration = bitflow.get("duration", 0)
+        views = bitflow.get("views", 0)
+        channel = bitflow.get("channel", "Unknown")
+        thumb = bitflow.get("thumbnail", None)
+        ext = bitflow.get("ext", "mp4")
     except Exception as error:
         return await infomsg.edit(f"<b>🔍 Searching...\n\n{error}</b>")
 
-    ydl_opts = {
-        "format": "bestvideo+bestaudio",
-        "outtmpl": "%(title)s.%(ext)s",
-        "merge_output_format": "mp4",
-        "cookiefile": "cookies.txt",
-    }
-
+    temp_dir = tempfile.gettempdir()
+    file_path = os.path.join(temp_dir, f"{title}.{ext}")
     try:
         await infomsg.edit("<b>Downloading video...</b>")
-        with YoutubeDL(ydl_opts) as ydl:
-            info_dict = ydl.extract_info(link, download=True)
-            file_name = ydl.prepare_filename(info_dict)
-            title = info_dict.get("title", "Unknown")
-            duration = info_dict.get("duration", 0)
-            views = info_dict.get("view_count", 0)
-            channel = info_dict.get("uploader", "Unknown")
-            thumb = info_dict.get("thumbnail", None)
-    except Exception as error:
-        return await infomsg.edit(f"<blockquote><b>Downloading video...\n\n{error}</blockquote></b>")
-
-    thumbnail_path = None
-    try:
+        async with httpx.AsyncClient() as client:
+            r = await client.get(url)
+            with open(file_path, "wb") as f:
+                f.write(r.content)
+        thumbnail_path = None
         if thumb:
-            thumbnail_path = wget.download(thumb)
+            thumb_path = os.path.join(temp_dir, f"{title}_thumb.jpg")
+            async with httpx.AsyncClient() as client:
+                r = await client.get(thumb)
+                with open(thumb_path, "wb") as f:
+                    f.write(r.content)
+            thumbnail_path = thumb_path
         await client.send_video(
             message.chat.id,
-            video=file_name,
+            video=file_path,
             thumb=thumbnail_path,
             file_name=title,
             duration=duration,
@@ -62,66 +61,60 @@ async def vsong_cmd(client, message):
                 f"<b> Duration:</b> {timedelta(seconds=duration)}\n"
                 f"<b> Views:</b> {views:,}\n"
                 f"<b> Channel:</b> {channel}\n"
-                f"<b> Link:</b> <a href='{link}'>YouTube</a></blockquote>\n\n"
-                f"<blockquote><b>⚡ Powered by: @haatsoja</b></blockquote> "
+                f"<b> Link:</b> <a href='{url}'>YouTube</a></blockquote>\n\n"
+                f"<blockquote><b>⚡ Powered by: @dragbotsupport</b></blockquote> "
             ),
             reply_to_message_id=message.id,
         )
     finally:
-        if thumbnail_path and os.path.isfile(thumbnail_path):
+        if 'thumbnail_path' in locals() and thumbnail_path and os.path.isfile(thumbnail_path):
             os.remove(thumbnail_path)
-        if file_name and os.path.isfile(file_name):
-            os.remove(file_name)
+        if file_path and os.path.isfile(file_path):
+            os.remove(file_path)
     await infomsg.delete()
 
-
 @app.on_message(filters.command(["song"]))
 async def song_cmd(client, message):
-    """Command to download and send a YouTube audio file."""
+    """Command to download and send a YouTube audio file using Bitflow API."""
     if len(message.command) < 2:
         return await message.reply_text(
             "❌ <b>Audio not found,</b>\nPlease enter the correct audio title.",
         )
     infomsg = await message.reply_text("<b>🔍 Searching...</b>", quote=False)
+    query = message.text.split(None, 1)[1]
     try:
-        search = VideosSearch(message.text.split(None, 1)[1], limit=1).result()["result"][0]
-        link = f"https://youtu.be/{search['id']}"
+        bitflow = await YouTubeAPI().bitflow_video(query, api_key=BITFLOW_API_KEY)
+        if not bitflow or bitflow.get("status") != "success":
+            return await infomsg.edit("<b>🔍 Searching...\n\nNo result from Bitflow API.</b>")
+        url = bitflow["url"]
+        title = bitflow.get("title", "Unknown")
+        duration = bitflow.get("duration", 0)
+        views = bitflow.get("views", 0)
+        channel = bitflow.get("channel", "Unknown")
+        thumb = bitflow.get("thumbnail", None)
+        ext = bitflow.get("ext", "mp3")
     except Exception as error:
         return await infomsg.edit(f"<b>🔍 Searching...\n\n{error}</b>")
 
-    ydl_opts = {
-        "format": "bestaudio/best",
-        "outtmpl": "%(title)s.%(ext)s",
-        "postprocessors": [
-            {
-                "key": "FFmpegExtractAudio",
-                "preferredcodec": "mp3",
-                "preferredquality": "192",
-            }
-        ],
-        "cookiefile": "cookies.txt",
-    }
-
+    temp_dir = tempfile.gettempdir()
+    file_path = os.path.join(temp_dir, f"{title}.{ext}")
     try:
         await infomsg.edit("<b>Downloading audio...</b>")
-        with YoutubeDL(ydl_opts) as ydl:
-            info_dict = ydl.extract_info(link, download=True)
-            file_name = ydl.prepare_filename(info_dict).replace(".webm", ".mp3")
-            title = info_dict.get("title", "Unknown")
-            duration = info_dict.get("duration", 0)
-            views = info_dict.get("view_count", 0)
-            channel = info_dict.get("uploader", "Unknown")
-            thumb = info_dict.get("thumbnail", None)
-    except Exception as error:
-        return await infomsg.edit(f"<blockquote><b>Downloading audio...\n\n{error}</b></blockquote>")
-
-    thumbnail_path = None
-    try:
+        async with httpx.AsyncClient() as client:
+            r = await client.get(url)
+            with open(file_path, "wb") as f:
+                f.write(r.content)
+        thumbnail_path = None
         if thumb:
-            thumbnail_path = wget.download(thumb)
+            thumb_path = os.path.join(temp_dir, f"{title}_thumb.jpg")
+            async with httpx.AsyncClient() as client:
+                r = await client.get(thumb)
+                with open(thumb_path, "wb") as f:
+                    f.write(r.content)
+            thumbnail_path = thumb_path
         await client.send_audio(
             message.chat.id,
-            audio=file_name,
+            audio=file_path,
             thumb=thumbnail_path,
             file_name=title,
             performer=channel,
@@ -132,15 +125,15 @@ async def song_cmd(client, message):
                 f"<b> Duration:</b> {timedelta(seconds=duration)}\n"
                 f"<b> Views:</b> {views:,}\n"
                 f"<b> Channel:</b> {channel}\n"
-                f"<b> Link:</b> <a href='{link}'>YouTube</a></blockquote>\n\n"
-                f"<blockquote><b>⚡ Powered by: @haatsoja</b></blockquote>"
+                f"<b> Link:</b> <a href='{url}'>YouTube</a></blockquote>\n\n"
+                f"<blockquote><b>⚡ Powered by: @dragbotsupport</b></blockquote>"
             ),
-             parse_mode=ParseMode.HTML,
+            parse_mode=ParseMode.HTML,
             reply_to_message_id=message.id,
         )
     finally:
-        if thumbnail_path and os.path.isfile(thumbnail_path):
+        if 'thumbnail_path' in locals() and thumbnail_path and os.path.isfile(thumbnail_path):
             os.remove(thumbnail_path)
-        if file_name and os.path.isfile(file_name):
-            os.remove(file_name)
+        if file_path and os.path.isfile(file_path):
+            os.remove(file_path)
     await infomsg.delete()

DragMusic/plugins/plugins/nsfw.py

@@ -17,6 +17,7 @@ from pyrogram.enums import ParseMode
 db_client = AsyncIOMotorClient(MONGO_DB_URI)
 db = db_client['AnonXDatabase']
 nsfw_chats_collection = db['nsfw_chats']
+nsfw_stickers_collection = db['nsfw_stickers']
 
 # Logger configuration
 LOGGER_ID = -1002471976725
@@ -100,24 +101,20 @@ async def scan_media(media_msg: Message, reply_msg: Message):
     media = media_msg.photo or media_msg.video or media_msg.sticker
     path = None
     image_path = None
-
     try:
         ext = ".jpg"
         if media_msg.video:
             ext = ".mp4"
         elif media_msg.sticker:
             ext = ".webp"
-
         with tempfile.NamedTemporaryFile(suffix=ext, delete=False) as temp:
             path = temp.name
-
         if hasattr(media, "download"):
             await media.download(file_name=path)
         elif media.file_id:
             await media_msg.download(file_name=path)
         else:
             return await reply_msg.reply("Unable to download media.")
-
         if path.endswith((".webm", ".mp4", ".webp")):
             image_path = path + ".png"
             subprocess.run(
@@ -131,21 +128,39 @@ async def scan_media(media_msg: Message, reply_msg: Message):
             if os.path.getsize(path) == 0:
                 return await reply_msg.reply("Downloaded file is empty, cannot scan.")
             img = Image.open(path).convert("RGB")
-
         inputs = processor(images=img, return_tensors="pt")
         with torch.no_grad():
             outputs = model(**inputs)
             probs = F.softmax(outputs.logits, dim=1)
             confidence = round(probs[0][1].item() * 100, 2)
             label = "NSFW" if confidence > 50 else "SFW"
-
-        if label == "NSFW":
+        if confidence > 50:
+            # Store sticker file_id if flagged
+            if media_msg.sticker and media_msg.sticker.file_id:
+                await nsfw_stickers_collection.update_one(
+                    {"file_id": media_msg.sticker.file_id},
+                    {"$set": {"file_id": media_msg.sticker.file_id, "chat_id": reply_msg.chat.id}},
+                    upsert=True
+                )
             try:
                 await media_msg.delete()
             except Exception as e:
                 print(f"[NSFW] Failed to delete message: {e}")
-
-            await reply_msg.reply(f"🚫 NSFW Detected ({confidence}%) — Message deleted.")
+            # Button to go to group
+            from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton
+            group_link = None
+            if reply_msg.chat.username:
+                group_link = f"https://t.me/{reply_msg.chat.username}"
+            else:
+                # For private/supergroups, use deep link to the group (no message jump)
+                group_link = f"https://t.me/c/{str(reply_msg.chat.id)[4:]}" if str(reply_msg.chat.id).startswith("-100") else None
+            buttons = InlineKeyboardMarkup([
+                [InlineKeyboardButton("Go to Group", url=group_link)] if group_link else []
+            ])
+            await reply_msg.reply(
+                f"🚫 NSFW Detected ({confidence}%) — Message deleted.",
+                reply_markup=buttons if group_link else None
+            )
             log_text = (
                 f"🚨 NSFW Content Detected\n"
                 f"Chat: {reply_msg.chat.title} (`{reply_msg.chat.id}`)\n"
@@ -160,9 +175,7 @@ async def scan_media(media_msg: Message, reply_msg: Message):
                 )
             except Exception as log_err:
                 print(f"[NSFW Logger Error] {log_err}")
-        else:
-            await reply_msg.reply(f"✅ Scan Result: {label} ({confidence}%)")
-
+        # Do not send anything in chat if SFW (confidence <= 50)
     except UnidentifiedImageError:
         print(f"[NSFW Detection Error] Cannot identify image file '{path or image_path}'")
         await reply_msg.reply("Failed to read image for scanning.")