revert back to old version of the dsong.py

DragMusic/plugins/plugins/dsong.py

@@ -25,10 +25,10 @@ async def vsong_cmd(client, message):
         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")
-        if ext.lower() != "mp4":
-            return await infomsg.edit("❌ Only MP4 video format is supported. Try another video.")
     except Exception as error:
         return await infomsg.edit(f"<b>🔍 Searching...\n\n{error}</b>")
 
@@ -57,6 +57,8 @@ async def vsong_cmd(client, message):
                 f"<blockquote><b> Information {title}</b></blockquote>\n\n"
                 f"<blockquote><b> Name:</b> {title}\n"
                 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='{url}'>YouTube</a></blockquote>\n\n"
                 f"<blockquote><b>⚡ Powered by: @dragbotsupport</b></blockquote> "
             ),
@@ -85,10 +87,10 @@ async def song_cmd(client, message):
         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")
-        if ext.lower() != "mp3":
-            return await infomsg.edit("❌ Only MP3 audio format is supported. Try another song.")
     except Exception as error:
         return await infomsg.edit(f"<b>🔍 Searching...\n\n{error}</b>")
 
@@ -112,11 +114,14 @@ async def song_cmd(client, message):
             audio=file_path,
             thumb=thumbnail_path,
             title=title,
+            performer=channel,
             duration=duration,
             caption=(
                 f"<blockquote><b> Information {title}</b></blockquote>\n\n"
                 f"<blockquote><b> Name:</b> {title}\n"
                 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='{url}'>YouTube</a></blockquote>\n\n"
                 f"<blockquote><b>⚡ Powered by: @dragbotsupport</b></blockquote>"
             ),

DragMusic/plugins/plugins/jplay.py

@@ -1,86 +0,0 @@
-import os
-import tempfile
-import httpx
-from datetime import timedelta
-from pyrogram import filters
-from pyrogram.types import Message
-from pyrogram.enums import ParseMode
-from DragMusic import app
-
-JIOSAAVN_API = "https://saavn.dev/api/songs"
-
-async def fetch_jiosaavn_audio(query):
-    # Accepts either a JioSaavn link or a search query
-    # Returns (title, artist, duration, image, audio_url) or None
-    params = {"query": query}
-    async with httpx.AsyncClient() as client:
-        resp = await client.get(JIOSAAVN_API, params=params)
-        if resp.status_code != 200:
-            return None
-        data = resp.json()
-        if not data or not data.get("data"):
-            return None
-        song = data["data"][0]
-        title = song.get("name")
-        artist = song.get("primaryArtists")
-        duration = int(song.get("duration", 0))
-        image = song.get("image")
-        audio_url = None
-        # Find the highest quality audio link
-        for quality in ["320kbps", "160kbps", "96kbps"]:
-            if song.get("downloadUrl") and song["downloadUrl"].get(quality):
-                audio_url = song["downloadUrl"][quality]
-                break
-        if not audio_url:
-            return None
-        return title, artist, duration, image, audio_url
-
-@app.on_message(filters.command(["jplay"]))
-async def jplay_cmd(client, message: Message):
-    if len(message.command) < 2:
-        return await message.reply_text(
-            "❌ <b>No JioSaavn link or query provided.</b>\nUsage: /jplay <link or song name>",
-        )
-    query = message.text.split(None, 1)[1]
-    infomsg = await message.reply_text("<b>🔍 Searching JioSaavn...</b>", quote=False)
-    result = await fetch_jiosaavn_audio(query)
-    if not result:
-        return await infomsg.edit("❌ Could not fetch this song from JioSaavn.")
-    title, artist, duration, image, audio_url = result
-    temp_dir = tempfile.gettempdir()
-    file_path = os.path.join(temp_dir, f"{title}.mp3")
-    try:
-        await infomsg.edit("<b>Downloading audio from JioSaavn...</b>")
-        async with httpx.AsyncClient() as client:
-            r = await client.get(audio_url)
-            with open(file_path, "wb") as f:
-                f.write(r.content)
-        thumb_path = None
-        if image:
-            thumb_path = os.path.join(temp_dir, f"{title}_thumb.jpg")
-            async with httpx.AsyncClient() as client:
-                r = await client.get(image)
-                with open(thumb_path, "wb") as f:
-                    f.write(r.content)
-        await message.reply_audio(
-            audio=file_path,
-            thumb=thumb_path,
-            title=title,
-            performer=artist,
-            duration=duration,
-            caption=(
-                f"<blockquote><b>JioSaavn Song</b></blockquote>\n\n"
-                f"<blockquote><b>Name:</b> {title}\n"
-                f"<b>Artist:</b> {artist}\n"
-                f"<b>Duration:</b> {timedelta(seconds=duration)}</blockquote>\n\n"
-                f"<blockquote><b>⚡ Powered by: JioSaavn</b></blockquote>"
-            ),
-            parse_mode=ParseMode.HTML,
-            reply_to_message_id=message.id,
-        )
-    finally:
-        if 'thumb_path' in locals() and thumb_path and os.path.isfile(thumb_path):
-            os.remove(thumb_path)
-        if file_path and os.path.isfile(file_path):
-            os.remove(file_path)
-    await infomsg.delete()