From b7e62eb952c84928f905faa30e23bd721d4f063a Mon Sep 17 00:00:00 2001 From: AzeMusic <99508889+AzeMusic@users.noreply.github.com> Date: Fri, 4 Mar 2022 17:42:24 +0400 Subject: [PATCH 01/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4fa8044..d4bf662 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ sudo apt-get install youtube-dl -y 3) Cloning the Repo ```bash -git clone https://github.com/lushaimusic/vc-userbot +git clone https://github.com/AzeMusic/vc-userbot cd vc-userbot ``` From f8a16ba73003a8dabd68bb1baa788451a48d519c Mon Sep 17 00:00:00 2001 From: AzeMusic <99508889+AzeMusic@users.noreply.github.com> Date: Fri, 4 Mar 2022 17:49:33 +0400 Subject: [PATCH 02/12] Update app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 7289a80..bfa4566 100644 --- a/app.json +++ b/app.json @@ -1,6 +1,6 @@ { "name": "vc-userbot", - "description": "A Telegram Userbot to play Songs/Videos/Radio/ Live Stream in Voice Chat", + "description": "Mahnıları/Videoları/Radioları/Səsli Çatda Canlı Yayımı oynamaq üçün Telegram İstifadəçi Botu ", "logo": "https://telegra.ph/file/26effbfca2917f15a9e5e.png", "keywords": [ "Telegram", From 728cb34e7c53f117407f6164bde75c6cd0569057 Mon Sep 17 00:00:00 2001 From: AzeMusic <99508889+AzeMusic@users.noreply.github.com> Date: Fri, 4 Mar 2022 17:50:30 +0400 Subject: [PATCH 03/12] Update app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index bfa4566..33e336b 100644 --- a/app.json +++ b/app.json @@ -7,7 +7,7 @@ "VCBot", "MusicPlayer" ], - "repository": "https://github.com/lushaimusic/vc-userbot", + "repository": "https://github.com/AzeMusic/vc-userbot", "env": { "SESSION": { "description": "Pyrogram String Session. Get from https://replit.com/@ZauteKm/GenerateStringSession", From 7a9f164187d270f2cd63ff02f85abc551c65c754 Mon Sep 17 00:00:00 2001 From: AzeMusic <99508889+AzeMusic@users.noreply.github.com> Date: Fri, 4 Mar 2022 17:52:45 +0400 Subject: [PATCH 04/12] Update app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 33e336b..04ec22a 100644 --- a/app.json +++ b/app.json @@ -10,7 +10,7 @@ "repository": "https://github.com/AzeMusic/vc-userbot", "env": { "SESSION": { - "description": "Pyrogram String Session. Get from https://replit.com/@ZauteKm/GenerateStringSession", + "description": "Pyrogram String Session", "required": true }, "API_ID": { From c3d5276649f8404abf61c8fa0ee95470e018557c Mon Sep 17 00:00:00 2001 From: AzeMusic <99508889+AzeMusic@users.noreply.github.com> Date: Fri, 4 Mar 2022 17:54:54 +0400 Subject: [PATCH 05/12] Update app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 04ec22a..0ec7a99 100644 --- a/app.json +++ b/app.json @@ -22,7 +22,7 @@ "required": true }, "HNDLR": { - "description": "Handler | Default (!)", + "description": "İşləyici | Defolt (!)", "value": "!", "required": false }, From 4dc38c72632eeb198e4054c93642e8a7f79549b7 Mon Sep 17 00:00:00 2001 From: AzeMusic <99508889+AzeMusic@users.noreply.github.com> Date: Fri, 4 Mar 2022 17:59:23 +0400 Subject: [PATCH 06/12] Update app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 0ec7a99..5919a0f 100644 --- a/app.json +++ b/app.json @@ -27,7 +27,7 @@ "required": false }, "GROUP_MODE": { - "description": "Anyone can play, if set to True. Set it to False to restrict play access to Sudo Users/Contacts only", + "description": "True olaraq təyin olunarsa, hər kəs oynaya bilər. Yalnız Sudo İstifadəçiləri/Kontaktlar üçün oyun girişini məhdudlaşdırmaq üçün onu False olaraq təyin edin", "value": "True", "required": true } From 7acccc4f8e402e62e358004187684472d3a273d8 Mon Sep 17 00:00:00 2001 From: AzeMusic <99508889+AzeMusic@users.noreply.github.com> Date: Fri, 4 Mar 2022 18:13:02 +0400 Subject: [PATCH 07/12] Update song_video.py --- plugins/modules/song_video.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/modules/song_video.py b/plugins/modules/song_video.py index d6724e8..def09e1 100644 --- a/plugins/modules/song_video.py +++ b/plugins/modules/song_video.py @@ -24,10 +24,10 @@ async def song(client, message: Message): if not urlissed: await client.send_message( message.chat.id, - f"⚠️ Check spelling!\n\nExample: `{HNDLR}song monody`", reply_to_message_id=reply_id + f"⚠️ Check spelling!\n\nExample: `{HNDLR}song nazli qizim`", reply_to_message_id=reply_id ) return - pablo = await client.send_message(message.chat.id, f"**🔎 Searching** `{urlissed}`", reply_to_message_id=reply_id) + pablo = await client.send_message(message.chat.id, f"**🔎 axtarilir** `{urlissed}`", reply_to_message_id=reply_id) search = SearchVideos(f"{urlissed}", offset=1, mode="dict", max_results=1) mi = search.result() mio = mi["search_result"] @@ -56,7 +56,7 @@ async def song(client, message: Message): ], "outtmpl": "%(id)s.mp3", "quiet": True, - "logtostderr": False, + "logtostderr": True, } try: with YoutubeDL(opts) as ytdl: From 5fb1154da73efacb978fc6a6d50b5cf0deac55c6 Mon Sep 17 00:00:00 2001 From: AzeMusic <99508889+AzeMusic@users.noreply.github.com> Date: Fri, 4 Mar 2022 18:25:52 +0400 Subject: [PATCH 08/12] Update song_video.py --- plugins/modules/song_video.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/modules/song_video.py b/plugins/modules/song_video.py index def09e1..8f7d105 100644 --- a/plugins/modules/song_video.py +++ b/plugins/modules/song_video.py @@ -30,12 +30,12 @@ async def song(client, message: Message): pablo = await client.send_message(message.chat.id, f"**🔎 axtarilir** `{urlissed}`", reply_to_message_id=reply_id) search = SearchVideos(f"{urlissed}", offset=1, mode="dict", max_results=1) mi = search.result() - mio = mi["search_result"] + mio = mi[axtaris_neticesi"] mo = mio[0]["link"] - mio[0]["duration"] + mio[0]["muddet"] thum = mio[0]["title"] fridayz = mio[0]["id"] - mio[0]["channel"] + mio[0]["kanal"] kekme = f"https://img.youtube.com/vi/{fridayz}/hqdefault.jpg" await asyncio.sleep(0.6) sedlyf = wget.download(kekme) @@ -62,7 +62,7 @@ async def song(client, message: Message): with YoutubeDL(opts) as ytdl: ytdl_data = ytdl.extract_info(mo, download=True) except Exception as e: - await pablo.edit(f"**Failed To Download** \n**Error :** `{str(e)}`") + await pablo.edit(f"**endirmək alinmadi** \n**Error :** `{str(e)}`") return c_time = time.time() capy = f""" @@ -81,7 +81,7 @@ async def song(client, message: Message): progress_args=( pablo, c_time, - f"**📥 Download** `{urlissed}`", + f"**📥 yuklənir** `{urlissed}`", file_stark, ), ) @@ -124,7 +124,7 @@ async def progress(current, total, message, start, type_of_ps, file_name=None): elapsed_time = round(diff) * 1000 if elapsed_time == 0: return - time_to_completion = round((total - current) / speed) * 1000 + time_to_completion = round((total - current) / speed) * 10000 estimated_total_time = elapsed_time + time_to_completion progress_str = "{0}{1} {2}%\n".format( "".join("▣" for i in range(math.floor(percentage / 10))), @@ -138,7 +138,7 @@ async def progress(current, total, message, start, type_of_ps, file_name=None): if file_name: try: await message.edit( - "{}\n**File Name:** `{}`\n{}".format(type_of_ps, file_name, tmp) + "{}\n**File Name:** `{}`\n{}".format(type_of_ps, fayl_adi, tmp) ) except FloodWait as e: await asyncio.sleep(e.x) @@ -176,7 +176,7 @@ def get_readable_time(seconds: int) -> int: time_suffix_list = ["s", "m", "h", "days"] while count < 4: count += 1 - remainder, result = divmod(seconds, 60) if count < 3 else divmod(seconds, 24) + remainder, result = divmod(seconds, 10) if count < 3 else divmod(seconds, 15) if seconds == 0 and remainder == 0: break time_list.append(int(result)) @@ -237,7 +237,7 @@ async def vsong(client, message: Message): reply_id = message.reply_to_message.message_id if message.reply_to_message else message.message_id pablo = await client.send_message( - message.chat.id, f"**🔎 Searching..** `{urlissed}`", reply_to_message_id=reply_id + message.chat.id, f"**🔎 axtarilir..** `{urlissed}`", reply_to_message_id=reply_id ) if not urlissed: await pablo.edit("Invalid Command Syntax Please Check help Menu To Know More!") @@ -270,12 +270,12 @@ async def vsong(client, message: Message): with YoutubeDL(opts) as ytdl: ytdl_data = ytdl.extract_info(url, download=True) except Exception as e: - await event.edit(event, f"**Download Failed** \n**Error :** `{str(e)}`") + await event.edit(event, f"**endirme uğursuz** \n**Error :** `{str(e)}`") return c_time = time.time() file_stark = f"{ytdl_data['id']}.mp4" capy = f""" -**🏷️ Video :** [{thum}]({mo}) +**🌹 Video :** [{thum}]({mo}) """ await client.send_video( message.chat.id, reply_to_message_id=reply_id, @@ -289,7 +289,7 @@ async def vsong(client, message: Message): progress_args=( pablo, c_time, - f"**📥 Download** `{urlissed}`", + f"**📥 yüklenir** `{urlissed}`", file_stark, ), ) From 9897ac70a52dd48976743f47e60ee1e6b3497202 Mon Sep 17 00:00:00 2001 From: AzeMusic <99508889+AzeMusic@users.noreply.github.com> Date: Fri, 4 Mar 2022 18:37:14 +0400 Subject: [PATCH 09/12] Update ping.py --- plugins/ping.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/plugins/ping.py b/plugins/ping.py index bf95042..d62902a 100644 --- a/plugins/ping.py +++ b/plugins/ping.py @@ -37,7 +37,7 @@ async def ping(client, m: Message): delta_ping = time() - start uptime_sec = (current_time - START_TIME).total_seconds() uptime = await _human_time_duration(int(uptime_sec)) - await m_reply.edit(f"`{delta_ping * 1000:.3f} ms` \n**Uptime ⏳** - `{uptime}`") + await m_reply.edit(f"`{delta_ping * 1000:.3f} ms` \n**pong🇦🇿🔥** - `{uptime}`") @Client.on_message(contact_filter & filters.command(['restart'], prefixes=f"{HNDLR}")) async def restart(client, m: Message): @@ -49,29 +49,29 @@ async def restart(client, m: Message): @Client.on_message(contact_filter & filters.command(['help'], prefixes=f"{HNDLR}")) async def help(client, m: Message): HELP = f""" -**HELP MENU 🛠** +**Komandalar 🌹** -**USER COMMANDS** -(Anyone can Use if `GROUP_MODE` is set to `True`): -`{HNDLR}play` -`{HNDLR}vplay` +**User komandalar** +(İstifadə edilir): +`{HNDLR}play` (mahnı adı/link) +`{HNDLR}vplay` (video ad/link) `{HNDLR}stream` (For Radio links) -`{HNDLR}vstream` (For .m3u8 / live links) -`{HNDLR}playfrom [channel] ; [n]` - Plays last n songs from channel +`{HNDLR}vstream` (For .m3u8 / radio link) +`{HNDLR}playfrom [kanal] ; [n]` - kanalda mahnı oxudmaq `{HNDLR}playlist` / `{HNDLR}queue` -**SUDO COMMANDS** (Can only be accessed by You and Your Contacts): -`{HNDLR}ping` +**SUDO komandalar** +`{HNDLR}ping` `{HNDLR}skip` `{HNDLR}pause` and `{HNDLR}resume` -`{HNDLR}stop` -`{HNDLR}end` -`{HNDLR}help` -`{HNDLR}restart` +`{HNDLR}stop` (saxla) +`{HNDLR}end` (video chatdan endir) +`{HNDLR}help` komandalar +`{HNDLR}restart` yenidən başlat -**EXTRA COMMANDS** -`{HNDLR}song` - Download Song from Youtube server. -`{HNDLR}video` - Download Video from Youtube server. +**EXTRA komandalar** +`{HNDLR}song` - youtubdən mahnı yuklə. +`{HNDLR}video` - youtubdən video yuklê `{HNDLR}json` - Reply any message & Showing Json. """ await m.reply(HELP) From d76879e25113927e2573e40765086c4d86dab695 Mon Sep 17 00:00:00 2001 From: AzeMusic <99508889+AzeMusic@users.noreply.github.com> Date: Fri, 4 Mar 2022 18:42:02 +0400 Subject: [PATCH 10/12] Update handlers.py --- plugins/vc/handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/vc/handlers.py b/plugins/vc/handlers.py index 7abef4c..c7fdbc2 100644 --- a/plugins/vc/handlers.py +++ b/plugins/vc/handlers.py @@ -77,7 +77,7 @@ async def on_end_handler(client, update: Update): if op==1: await bot.send_message(chat_id, "`Queue is Empty, Leaving Voice Chat...`") elif op==2: - await bot.send_message(chat_id, "**Some Error Occurred** \n`Clearing the Queues and Leaving the Voice Chat...`") + await bot.send_message(chat_id, "**Xəta Baş Verdi** \n `Növbələrin Təmizlənməsi və Səsli Söhbətdən Çıxılması...`") else: await bot.send_message(chat_id, f"**🎧 Now Playing** \n[{op[0]}]({op[1]}) | `{op[2]}`", disable_web_page_preview=True) else: From e843552aa498247fd43ea2e05fd36bae6b1c6020 Mon Sep 17 00:00:00 2001 From: AzeMusic <99508889+AzeMusic@users.noreply.github.com> Date: Fri, 4 Mar 2022 18:44:15 +0400 Subject: [PATCH 11/12] =?UTF-8?q?Update=20and=20rename=20plugins/vc/handle?= =?UTF-8?q?rs.py=20to=20plaginl=C9=99r/vc/handlers.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/vc/handlers.py => "plaginl\311\231r/vc/handlers.py" | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename plugins/vc/handlers.py => "plaginl\311\231r/vc/handlers.py" (94%) diff --git a/plugins/vc/handlers.py "b/plaginl\311\231r/vc/handlers.py" similarity index 94% rename from plugins/vc/handlers.py rename to "plaginl\311\231r/vc/handlers.py" index c7fdbc2..1e4f0c7 100644 --- a/plugins/vc/handlers.py +++ "b/plaginl\311\231r/vc/handlers.py" @@ -75,11 +75,11 @@ async def on_end_handler(client, update: Update): print(chat_id) op = await skip_current_song(chat_id) if op==1: - await bot.send_message(chat_id, "`Queue is Empty, Leaving Voice Chat...`") + await bot.send_message(chat_id, "`Növbə Boşdur, Səsli Çatı tərk edir...`") elif op==2: await bot.send_message(chat_id, "**Xəta Baş Verdi** \n `Növbələrin Təmizlənməsi və Səsli Söhbətdən Çıxılması...`") else: - await bot.send_message(chat_id, f"**🎧 Now Playing** \n[{op[0]}]({op[1]}) | `{op[2]}`", disable_web_page_preview=True) + await bot.send_message(chat_id, f"**🎧 indi oxuyur** \n[{op[0]}]({op[1]}) | `{op[2]}`", disable_web_page_preview=True) else: pass From fa5dec0210ef78e01d2aeed5729f6107ba5129e9 Mon Sep 17 00:00:00 2001 From: AzeMusic <99508889+AzeMusic@users.noreply.github.com> Date: Fri, 4 Mar 2022 18:46:14 +0400 Subject: [PATCH 12/12] Update handlers.py --- "plaginl\311\231r/vc/handlers.py" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/plaginl\311\231r/vc/handlers.py" "b/plaginl\311\231r/vc/handlers.py" index 1e4f0c7..5a5b93d 100644 --- "a/plaginl\311\231r/vc/handlers.py" +++ "b/plaginl\311\231r/vc/handlers.py" @@ -84,7 +84,7 @@ async def on_end_handler(client, update: Update): pass -# When someone ends the Voice Chat without stopping the Playback +# Kimsə Oxumanı dayandırmadan Səsli Söhbəti bitirdikdə @call_py.on_closed_voice_chat() async def close_handler(client: PyTgCalls, chat_id: int):