From c5096876e0c31cf9ce8e208005bf5f82257c9065 Mon Sep 17 00:00:00 2001 From: levina <82658782+levina-lab@users.noreply.github.com> Date: Mon, 21 Feb 2022 06:30:34 +0700 Subject: [PATCH] [check] something --- program/video.py | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/program/video.py b/program/video.py index 17e49bb..4c47f0d 100644 --- a/program/video.py +++ b/program/video.py @@ -425,49 +425,60 @@ async def vstream(c: Client, m: Message): ) if len(m.command) < 2: - await m.reply("» give me a live-link/m3u8 url/youtube link to stream.") + await m.reply("» Give me a youtube live url/m3u8 url to stream.") else: if len(m.command) == 2: - link = m.text.split(None, 1)[1] Q = 720 + url = m.text.split(None, 1)[1] + search = ytsearch(url) loser = await c.send_message(chat_id, "🔍 **Loading...**") elif len(m.command) == 3: op = m.text.split(None, 1)[1] - link = op.split(None, 1)[0] + url = op.split(None, 1)[0] quality = op.split(None, 1)[1] + search = ytsearch(op) if quality == "720" or "480" or "360": Q = int(quality) else: Q = 720 await m.reply( - "» only 720, 480, 360 allowed\n\n💡 now streaming video in **720p**" + "» Streaming the video in 720p quality" ) loser = await c.send_message(chat_id, "🔍 **Loading...**") else: - await m.reply("`/vstream` {link} {720/480/360}") + await m.reply(f"`/vstream` {url} (720/480/360)") regex = r"^(https?\:\/\/)?(www\.youtube\.com|youtu\.?be)\/.+" - match = re.match(regex, link) + match = re.match(regex, url) + if match: - veez, livelink = await ytdl(link) + veez, livelink = await ytdl(url) else: - livelink = link + livelink = url veez = 1 if veez == 0: await loser.edit(f"❌ yt-dl issues detected\n\n» `{livelink}`") else: + title = search[0] + songname = search[0] + thumbnail = search[1] + userid = m.from_user.id + gcname = m.chat.title + ctitle = await CHAT_TITLE(gcname) + image = await thumb(thumbnail, title, userid, ctitle) if chat_id in QUEUE: await loser.edit("🔄 Queueing Track...") - pos = add_to_queue(chat_id, "Live Stream", livelink, link, "Video", Q) + pos = add_to_queue(chat_id, "Live Stream", livelink, url, "Video", Q) await loser.delete() requester = f"[{m.from_user.first_name}](tg://user?id={m.from_user.id})" buttons = stream_markup(user_id) await m.reply_photo( - photo=f"{IMG_1}", + photo=image, reply_markup=InlineKeyboardMarkup(buttons), - caption=f"💡 **Track added to queue »** `{pos}`\n\n💭 **Chat:** `{chat_id}`\n🧸 **Request by:** {requester}", + caption=f"💡 **Track added to queue »** `{pos}`\n\n🗂 **Name:** [{songname}]({url}) | `live video`\n🧸 **Requested by:** {requester}", ) + remove_if_exists(image) else: if Q == 720: amaze = HighQualityVideo() @@ -488,17 +499,19 @@ async def vstream(c: Client, m: Message): ), stream_type=StreamType().live_stream, ) - add_to_queue(chat_id, "Live Stream", livelink, link, "Video", Q) + add_to_queue(chat_id, "Live Stream", livelink, url, "Video", Q) await loser.delete() requester = ( f"[{m.from_user.first_name}](tg://user?id={m.from_user.id})" ) buttons = stream_markup(user_id) await m.reply_photo( - photo=f"{IMG_2}", + photo=image", reply_markup=InlineKeyboardMarkup(buttons), - caption=f"💡 **[Video Live]({link}) stream started.**\n\n💭 **Chat:** `{chat_id}`\n🧸 **Request by:** {requester}", + caption=f"🗂 **Name:** [{songname}]({url}) | `live video`\n🧸 **Requested by:** {requester}", ) + await idle() + remove_if_exists(image) except Exception as ep: await loser.delete() await remove_active_chat(chat_id)