fix: use get_video_info_from_bitflow for Bitflow API in /song and /vsong

DragMusic/plugins/plugins/dsong.py

@@ -19,7 +19,7 @@ async def vsong_cmd(client, message):
     infomsg = await message.reply_text("<b>🔍 Searching...</b>", quote=False)
     query = message.text.split(None, 1)[1]
     try:
-        bitflow = await YouTubeAPI().bitflow_video(query, api_key=BITFLOW_API_KEY)
+        bitflow = await YouTubeAPI().get_video_info_from_bitflow(query, video=True)
         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"]
@@ -83,7 +83,7 @@ async def song_cmd(client, message):
     infomsg = await message.reply_text("<b>🔍 Searching...</b>", quote=False)
     query = message.text.split(None, 1)[1]
     try:
-        bitflow = await YouTubeAPI().bitflow_video(query, api_key=BITFLOW_API_KEY)
+        bitflow = await YouTubeAPI().get_video_info_from_bitflow(query, video=False)
         if not bitflow or bitflow.get("status") != "success":
             return await infomsg.edit("<b>🔍 Searching...\n\nNo result from Bitflow API.</b>")
         url = bitflow["url"]

DragMusic/plugins/plugins/nsfw.py

@@ -18,6 +18,7 @@ db_client = AsyncIOMotorClient(MONGO_DB_URI)
 db = db_client['AnonXDatabase']
 nsfw_chats_collection = db['nsfw_chats']
 nsfw_stickers_collection = db['nsfw_stickers']
+nauth_collection = db['nsfw_nauth']
 
 # Logger configuration
 LOGGER_ID = -1002471976725
@@ -74,9 +75,9 @@ async def whoami(client: Client, message: Message):
     try:
         member = await client.get_chat_member(message.chat.id, message.from_user.id)
         await message.reply_text(
-            f"👤 Your user ID: `{message.from_user.id}`\n"
-            f"📢 Chat ID: `{message.chat.id}`\n"
-            f"🛡️ Your status: `{member.status}`",
+            f"👤 Your user ID: {message.from_user.id}\n"
+            f"📢 Chat ID: {message.chat.id}\n"
+            f"🛡️ Your status: {member.status}",
             quote=True,
             parse_mode=ParseMode.HTML
         )
@@ -98,6 +99,9 @@ async def auto_nsfw_scan(client: Client, message: Message):
 
 # NSFW scan handler
 async def scan_media(media_msg: Message, reply_msg: Message):
+    # Ignore scan if user is in nauth list
+    if await is_nauth(reply_msg.chat.id, media_msg.from_user.id):
+        return
     media = media_msg.photo or media_msg.video or media_msg.sticker
     path = None
     image_path = None
@@ -146,32 +150,30 @@ async def scan_media(media_msg: Message, reply_msg: Message):
                 await media_msg.delete()
             except Exception as e:
                 print(f"[NSFW] Failed to delete message: {e}")
-            # Button to go to group
+            await reply_msg.reply(
+                f"🚫 NSFW Detected ({confidence}%) — Message deleted."
+            )
+            log_text = (
+                f"🚨 NSFW Content Detected\n"
+                f"Chat: {reply_msg.chat.title} (`{reply_msg.chat.id}`)\n"
+                f"User: {media_msg.from_user.mention if media_msg.from_user else 'Unknown'}\n"
+                f"Confidence: {confidence}%"
+            )
             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"
-                f"User: {media_msg.from_user.mention if media_msg.from_user else 'Unknown'}\n"
-                f"Confidence: {confidence}%"
-            )
             try:
                 await app.send_message(
                     chat_id=LOGGER_ID,
                     text=log_text,
-                    message_thread_id=LOGGER_TOPIC_ID
+                    message_thread_id=LOGGER_TOPIC_ID,
+                    reply_markup=buttons if group_link else None
                 )
             except Exception as log_err:
                 print(f"[NSFW Logger Error] {log_err}")
@@ -187,3 +189,41 @@ async def scan_media(media_msg: Message, reply_msg: Message):
             os.remove(path)
         if image_path and os.path.exists(image_path):
             os.remove(image_path)
+
+async def is_nauth(chat_id: int, user_id: int) -> bool:
+    doc = await nauth_collection.find_one({"chat_id": chat_id, "user_id": user_id})
+    return bool(doc)
+
+@app.on_message(filters.command(["nauth"]) & filters.group)
+async def approve_handler(client: Client, message: Message):
+    if not await is_admin(client, message.chat.id, message.from_user.id):
+        return await message.reply("❌ Only group admins or the group owner can use this command.")
+    user_id = None
+    if message.reply_to_message and message.reply_to_message.from_user:
+        user_id = message.reply_to_message.from_user.id
+    elif len(message.command) >= 2:
+        try:
+            user_id = int(message.command[1])
+        except Exception:
+            return await message.reply("Invalid user_id.")
+    else:
+        return await message.reply("Usage: /nauth <user_id> or reply to a user.")
+    await nauth_collection.update_one({"chat_id": message.chat.id, "user_id": user_id}, {"$set": {"chat_id": message.chat.id, "user_id": user_id}}, upsert=True)
+    await message.reply(f"User {user_id} will now be ignored by NSFW scan.")
+
+@app.on_message(filters.command(["dauth"]) & filters.group)
+async def dauth_handler(client: Client, message: Message):
+    if not await is_admin(client, message.chat.id, message.from_user.id):
+        return await message.reply("❌ Only group admins or the group owner can use this command.")
+    user_id = None
+    if message.reply_to_message and message.reply_to_message.from_user:
+        user_id = message.reply_to_message.from_user.id
+    elif len(message.command) >= 2:
+        try:
+            user_id = int(message.command[1])
+        except Exception:
+            return await message.reply("Invalid user_id.")
+    else:
+        return await message.reply("Usage: /dauth <user_id> or reply to a user.")
+    await nauth_collection.delete_one({"chat_id": message.chat.id, "user_id": user_id})
+    await message.reply(f"User {user_id} will no longer be ignored by NSFW scan.")