Update DragMusic/plugins/play/play.py

DragMusic/plugins/play/play.py

@@ -3,18 +3,19 @@ import string
 import asyncio
 
 from pyrogram import filters
-from pyrogram.types import InlineKeyboardMarkup, InputMediaPhoto, Message
 from pyrogram.errors import FloodWait, RandomIdDuplicate
+from pyrogram.types import InlineKeyboardMarkup, InputMediaPhoto, Message
 from pytgcalls.exceptions import NoActiveGroupCall
 
 import config
+from config import BANNED_USERS, lyrical, AYU
 from DragMusic import Apple, Resso, SoundCloud, Spotify, Telegram, YouTube, app
 from DragMusic.core.call import Drag
 from DragMusic.utils import seconds_to_min, time_to_seconds
 from DragMusic.utils.channelplay import get_channeplayCB
 from DragMusic.utils.decorators.language import languageCB
 from DragMusic.utils.decorators.play import PlayWrapper
-from DragMusic.utils.errors import capture_internal_err
+from DragMusic.utils.errors import capture_err, capture_callback_err
 from DragMusic.utils.formatters import formats
 from DragMusic.utils.inline import (
     botplaylist_markup,
@@ -25,7 +26,6 @@ from DragMusic.utils.inline import (
 )
 from DragMusic.utils.logger import play_logs
 from DragMusic.utils.stream.stream import stream
-from config import BANNED_USERS, lyrical, AYU
 
 
 @app.on_message(
@@ -35,7 +35,7 @@ from config import BANNED_USERS, lyrical, AYU
     ]) & filters.group & ~BANNED_USERS
 )
 @PlayWrapper
-@capture_internal_err
+@capture_err
 async def play_command(client, message: Message, _, chat_id, video, channel, playmode, url, fplay):
     try:
         mystic = await message.reply_text(
@@ -98,8 +98,7 @@ async def play_command(client, message: Message, _, chat_id, video, channel, pla
                     forceplay=fplay,
                 )
             except Exception as e:
-                ex_type = type(e).__name__
-                err = e if ex_type == "AssistantErr" else _["general_2"].format(ex_type)
+                err = e if type(e).__name__ == "AssistantErr" else _["general_2"].format(type(e).__name__)
                 return await mystic.edit_text(err)
 
             return await mystic.delete()
@@ -154,8 +153,7 @@ async def play_command(client, message: Message, _, chat_id, video, channel, pla
                     forceplay=fplay,
                 )
             except Exception as e:
-                ex_type = type(e).__name__
-                err = e if ex_type == "AssistantErr" else _["general_2"].format(ex_type)
+                err = e if type(e).__name__ == "AssistantErr" else _["general_2"].format(type(e).__name__)
                 return await mystic.edit_text(err)
 
             return await mystic.delete()
@@ -169,27 +167,27 @@ async def play_command(client, message: Message, _, chat_id, video, channel, pla
                 except:
                     return await mystic.edit_text(_["play_3"])
 
-                streamtype = "playlist"
                 plist_type = "yt"
-                if "&" in url:
-                    plist_id = (url.split("=")[1]).split("&")[0]
-                else:
-                    plist_id = url.split("=")[1]
+                plist_id = (url.split("="))[1].split("&")[0] if "&" in url else (url.split("="))[1]
                 img = config.PLAYLIST_IMG_URL
                 cap = _["play_9"]
+                streamtype = "playlist"
+
             else:
                 try:
                     details, track_id = await YouTube.track(url)
-                except Exception:
+                except:
                     return await mystic.edit_text(_["play_3"])
-                streamtype = "youtube"
+
                 img = details["thumb"]
                 cap = _["play_10"].format(details["title"], details["duration_min"])
+                streamtype = "youtube"
+
         elif await Spotify.valid(url):
             spotify = True
             if not config.SPOTIFY_CLIENT_ID or not config.SPOTIFY_CLIENT_SECRET:
                 return await mystic.edit_text(
-                    "» sᴘᴏᴛɪғʏ ɪs ɴᴏᴛ sᴜᴘᴘᴏʀᴛᴇᴅ ʏᴇᴛ.\n\nᴘʟᴇᴀsᴇ ᴛʀʏ ᴀɢᴀɪɴ ʟᴀᴛᴇʀ."
+                    "»  sᴘᴏᴛɪғʏ ɪs ɴᴏᴛ sᴜᴘᴘᴏʀᴛᴇᴅ ʏᴇᴛ.\n\nᴘʟᴇᴀsᴇ ᴛʀʏ ᴀɢᴀɪɴ ʟᴀᴛᴇʀ."
                 )
 
             if "track" in url:
@@ -197,74 +195,95 @@ async def play_command(client, message: Message, _, chat_id, video, channel, pla
                     details, track_id = await Spotify.track(url)
                 except:
                     return await mystic.edit_text(_["play_3"])
-                streamtype = "youtube"
+
                 img = details["thumb"]
                 cap = _["play_10"].format(details["title"], details["duration_min"])
+                streamtype = "youtube"
+
             elif "playlist" in url:
                 try:
                     details, plist_id = await Spotify.playlist(url)
                 except:
                     return await mystic.edit_text(_["play_3"])
-                streamtype = "playlist"
+
                 plist_type = "spplay"
                 img = config.SPOTIFY_PLAYLIST_IMG_URL
                 cap = _["play_11"].format(app.mention, message.from_user.mention)
+                streamtype = "playlist"
+
             elif "album" in url:
                 try:
                     details, plist_id = await Spotify.album(url)
                 except:
                     return await mystic.edit_text(_["play_3"])
-                streamtype = "playlist"
+
                 plist_type = "spalbum"
                 img = config.SPOTIFY_ALBUM_IMG_URL
                 cap = _["play_11"].format(app.mention, message.from_user.mention)
+                streamtype = "playlist"
+
             elif "artist" in url:
                 try:
                     details, plist_id = await Spotify.artist(url)
                 except:
                     return await mystic.edit_text(_["play_3"])
-                streamtype = "playlist"
+
                 plist_type = "spartist"
                 img = config.SPOTIFY_ARTIST_IMG_URL
                 cap = _["play_11"].format(message.from_user.first_name)
+                streamtype = "playlist"
+
             else:
                 return await mystic.edit_text(_["play_15"])
+
         elif await Apple.valid(url):
             if "album" in url:
                 try:
                     details, track_id = await Apple.track(url)
                 except:
                     return await mystic.edit_text(_["play_3"])
-                streamtype = "youtube"
+
                 img = details["thumb"]
                 cap = _["play_10"].format(details["title"], details["duration_min"])
+                streamtype = "youtube"
+
             elif "playlist" in url:
                 spotify = True
                 try:
                     details, plist_id = await Apple.playlist(url)
                 except:
                     return await mystic.edit_text(_["play_3"])
-                streamtype = "playlist"
+
                 plist_type = "apple"
                 img = url
                 cap = _["play_12"].format(app.mention, message.from_user.mention)
+                streamtype = "playlist"
+
             else:
                 return await mystic.edit_text(_["play_3"])
+
         elif await Resso.valid(url):
             try:
                 details, track_id = await Resso.track(url)
             except:
                 return await mystic.edit_text(_["play_3"])
-            streamtype = "youtube"
+
             img = details["thumb"]
             cap = _["play_10"].format(details["title"], details["duration_min"])
+            streamtype = "youtube"
+
         elif await SoundCloud.valid(url):
             try:
                 details, track_path = await SoundCloud.download(url)
-                if details["duration_sec"] > config.DURATION_LIMIT:
-                    return await mystic.edit_text(
-                        _["play_6"].format(config.DURATION_LIMIT_MIN, app.mention)
-                    )
+            except:
+                return await mystic.edit_text(_["play_3"])
+
+            if details["duration_sec"] > config.DURATION_LIMIT:
+                return await mystic.edit_text(
+                    _["play_6"].format(config.DURATION_LIMIT_MIN, app.mention)
+                )
+
+            try:
                 await stream(
                     _,
                     mystic,
@@ -277,10 +296,11 @@ async def play_command(client, message: Message, _, chat_id, video, channel, pla
                     forceplay=fplay,
                 )
             except Exception as e:
-                ex_type = type(e).__name__
-                err = e if ex_type == "AssistantErr" else _["general_2"].format(ex_type)
+                err = e if type(e).__name__ == "AssistantErr" else _["general_2"].format(type(e).__name__)
                 return await mystic.edit_text(err)
+
             return await mystic.delete()
+
         else:
             try:
                 await Drag.stream_call(url)
@@ -308,10 +328,11 @@ async def play_command(client, message: Message, _, chat_id, video, channel, pla
                     forceplay=fplay,
                 )
             except Exception as e:
-                ex_type = type(e).__name__
-                err = e if ex_type == "AssistantErr" else _["general_2"].format(ex_type)
+                err = e if type(e).__name__ == "AssistantErr" else _["general_2"].format(type(e).__name__)
                 return await mystic.edit_text(err)
+
             return await play_logs(message, streamtype="M3U8 or Index Link")
+
     else:
         if len(message.command) < 2:
             buttons = botplaylist_markup(_)
@@ -319,14 +340,17 @@ async def play_command(client, message: Message, _, chat_id, video, channel, pla
                 _["play_18"],
                 reply_markup=InlineKeyboardMarkup(buttons),
             )
+
         slider = True
         query = message.text.split(None, 1)[1]
         if "-v" in query:
             query = query.replace("-v", "")
+
         try:
-            details, track_id = await YouTube.search(query)
+            details, track_id = await YouTube.track(query)
         except:
             return await mystic.edit_text(_["play_3"])
+
         streamtype = "youtube"
 
     if str(playmode) == "Direct":
@@ -366,11 +390,12 @@ async def play_command(client, message: Message, _, chat_id, video, channel, pla
                 forceplay=fplay,
             )
         except Exception as e:
-            ex_type = type(e).__name__
-            err = e if ex_type == "AssistantErr" else _["general_2"].format(ex_type)
+            err = e if type(e).__name__ == "AssistantErr" else _["general_2"].format(type(e).__name__)
             return await mystic.edit_text(err)
+
         await mystic.delete()
         return await play_logs(message, streamtype=streamtype)
+
     else:
         if plist_type:
             ran_hash = "".join(random.choices(string.ascii_uppercase + string.digits, k=10))
@@ -385,11 +410,12 @@ async def play_command(client, message: Message, _, chat_id, video, channel, pla
             )
             await mystic.delete()
             await message.reply_photo(
-                photo=(details["thumb"] if plist_type == "yt" else img),
+                photo=(details["thumb"] if plist_type == "yt" else (details if plist_type == "apple" else img)),
                 caption=cap,
                 reply_markup=InlineKeyboardMarkup(buttons),
             )
             return await play_logs(message, streamtype=f"Playlist : {plist_type}")
+
         else:
             if slider:
                 buttons = slider_markup(
@@ -411,6 +437,7 @@ async def play_command(client, message: Message, _, chat_id, video, channel, pla
                     reply_markup=InlineKeyboardMarkup(buttons),
                 )
                 return await play_logs(message, streamtype="Searched on YouTube")
+
             else:
                 buttons = track_markup(
                     _,
@@ -421,16 +448,18 @@ async def play_command(client, message: Message, _, chat_id, video, channel, pla
                 )
                 await mystic.delete()
                 await message.reply_photo(
-                    photo=img,
-                    caption=cap,
+                    photo=details["thumb"],
+                    caption=_["play_10"].format(
+                        details["title"],
+                        details["duration_min"],
+                    ),
                     reply_markup=InlineKeyboardMarkup(buttons),
                 )
                 return await play_logs(message, streamtype="URL Search Inline")
 
-
 @app.on_callback_query(filters.regex("MusicStream") & ~BANNED_USERS)
 @languageCB
-@capture_internal_err
+@capture_callback_err
 async def play_music(client, CallbackQuery, _):
     try:
         callback_data = CallbackQuery.data.split(None, 1)[1]
@@ -440,20 +469,31 @@ async def play_music(client, CallbackQuery, _):
             return await CallbackQuery.answer(_["playcb_1"], show_alert=True)
 
         chat_id, channel = await get_channeplayCB(_, cplay, CallbackQuery)
+
         user_name = CallbackQuery.from_user.first_name
         await CallbackQuery.message.delete()
         await CallbackQuery.answer()
 
         try:
-            mystic = await app.send_message(chat_id, random.choice(AYU))
-        except (FloodWait, RandomIdDuplicate):
-            pass
+            mystic = await CallbackQuery.message.reply_text(
+                _["play_2"].format(channel) if channel else random.choice(AYU)
+            )
+        except FloodWait as e:
+            await asyncio.sleep(e.value)
+            mystic = await CallbackQuery.message.reply_text(
+                _["play_2"].format(channel) if channel else random.choice(AYU)
+            )
+        except RandomIdDuplicate:
+            mystic = await app.send_message(
+                CallbackQuery.message.chat.id,
+                _["play_2"].format(channel) if channel else random.choice(AYU)
+            )
 
-        details, track_id = await YouTube.track(vidid, videoid=True)
+        details, track_id = await YouTube.track(vidid, videoid=vidid)
 
         if details.get("duration_min"):
             duration_sec = time_to_seconds(details["duration_min"])
-            if duration_sec > config.DURATION_LIMIT:
+            if duration_sec and duration_sec > config.DURATION_LIMIT:
                 return await mystic.edit_text(
                     _["play_6"].format(config.DURATION_LIMIT_MIN, app.mention)
                 )
@@ -485,28 +525,32 @@ async def play_music(client, CallbackQuery, _):
             streamtype="youtube",
             forceplay=forceplay,
         )
+
         await mystic.delete()
+
     except Exception as e:
-        ex_type = type(e).__name__
-        err = e if ex_type == "AssistantErr" else _["general_2"].format(ex_type)
+        err = e if type(e).__name__ == "AssistantErr" else _["general_2"].format(type(e).__name__)
         return await CallbackQuery.message.reply_text(err)
 
 
-@app.on_callback_query(filters.regex("DragmousAdmin") & ~BANNED_USERS)
-@capture_internal_err
+@app.on_callback_query(filters.regex("AnonymousAdmin") & ~BANNED_USERS)
+@capture_callback_err
 async def anonymous_check(client, CallbackQuery):
-    await CallbackQuery.answer(
-        "» ʀᴇᴠᴇʀᴛ ʙᴀᴄᴋ ᴛᴏ ᴜsᴇʀ ᴀᴄᴄᴏᴜɴᴛ :\n\n"
-        "ᴏᴘᴇɴ ʏᴏᴜʀ ɢʀᴏᴜᴘ sᴇᴛᴛɪɴɢs.\n"
-        "-> ᴀᴅᴍɪɴɪsᴛʀᴀᴛᴏʀs\n-> ᴄʟɪᴄᴋ ᴏɴ ʏᴏᴜʀ ɴᴀᴍᴇ\n"
-        "-> ᴜɴᴄʜᴇᴄᴋ ᴀɴᴏɴʏᴍᴏᴜs ᴀᴅᴍɪɴ ᴘᴇʀᴍɪssɪᴏɴs.",
-        show_alert=True,
-    )
+    try:
+        await CallbackQuery.answer(
+            "» ʀᴇᴠᴇʀᴛ ʙᴀᴄᴋ ᴛᴏ ᴜsᴇʀ ᴀᴄᴄᴏᴜɴᴛ :\n\n"
+            "ᴏᴘᴇɴ ʏᴏᴜʀ ɢʀᴏᴜᴘ sᴇᴛᴛɪɴɢs.\n"
+            "-> ᴀᴅᴍɪɴɪsᴛʀᴀᴛᴏʀs\n-> ᴄʟɪᴄᴋ ᴏɴ ʏᴏᴜʀ ɴᴀᴍᴇ\n"
+            "-> ᴜɴᴄʜᴇᴄᴋ ᴀɴᴏɴʏᴍᴏᴜs ᴀᴅᴍɪɴ ᴘᴇʀᴍɪssɪᴏɴs.",
+            show_alert=True,
+        )
+    except:
+        pass
 
 
-@app.on_callback_query(filters.regex("AviaxPlaylists") & ~BANNED_USERS)
+@app.on_callback_query(filters.regex("AnniePlaylists") & ~BANNED_USERS)
 @languageCB
-@capture_internal_err
+@capture_callback_err
 async def play_playlists_command(client, CallbackQuery, _):
     try:
         callback_data = CallbackQuery.data.split(None, 1)[1]
@@ -521,9 +565,19 @@ async def play_playlists_command(client, CallbackQuery, _):
         await CallbackQuery.answer()
 
         try:
-            mystic = await app.send_message(chat_id, random.choice(AYU))
-        except (FloodWait, RandomIdDuplicate):
-            pass
+            mystic = await CallbackQuery.message.reply_text(
+                _["play_2"].format(channel) if channel else random.choice(AYU)
+            )
+        except FloodWait as e:
+            await asyncio.sleep(e.value)
+            mystic = await CallbackQuery.message.reply_text(
+                _["play_2"].format(channel) if channel else random.choice(AYU)
+            )
+        except RandomIdDuplicate:
+            mystic = await app.send_message(
+                CallbackQuery.message.chat.id,
+                _["play_2"].format(channel) if channel else random.choice(AYU)
+            )
 
         videoid = lyrical.get(videoid)
         video = mode == "v"
@@ -557,16 +611,17 @@ async def play_playlists_command(client, CallbackQuery, _):
             spotify=spotify,
             forceplay=forceplay,
         )
+
         await mystic.delete()
+
     except Exception as e:
-        ex_type = type(e).__name__
-        err = e if ex_type == "AssistantErr" else _["general_2"].format(ex_type)
+        err = e if type(e).__name__ == "AssistantErr" else _["general_2"].format(type(e).__name__)
         return await CallbackQuery.message.reply_text(err)
 
 
 @app.on_callback_query(filters.regex("slider") & ~BANNED_USERS)
 @languageCB
-@capture_internal_err
+@capture_callback_err
 async def slider_queries(client, CallbackQuery, _):
     try:
         callback_data = CallbackQuery.data.split(None, 1)[1]
@@ -577,6 +632,7 @@ async def slider_queries(client, CallbackQuery, _):
 
         rtype = int(rtype)
         query_type = (rtype + 1) if what == "F" else (rtype - 1)
+
         if query_type > 9:
             query_type = 0
         if query_type < 0:
@@ -592,9 +648,11 @@ async def slider_queries(client, CallbackQuery, _):
                 duration_min,
             ),
         )
+
         await CallbackQuery.edit_message_media(
             media=med, reply_markup=InlineKeyboardMarkup(buttons)
         )
         await CallbackQuery.answer(_["playcb_2"])
-    except:
-        pass
+
+    except Exception:
+        pass