diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..1f41649 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @levina-lab diff --git a/LICENSE b/LICENSE index f288702..ec10009 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. @@ -672,3 +672,8 @@ may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . + + This repository is developed by Veez Music Team project, changing any code +it's allowed, but removed an important credits named as veez music developer +it's prohibited, our team will report your repository and your account to the +GitHub communities to takedown your repository and banned your account too. diff --git a/README.md b/README.md index d9581fb..5cd2a36 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ telegram bot project for streaming video on telegram video chat, powered by [py- 📝 Note: From now, /vstream & /vstop command can only be used by group admins. -## 🧪 Get STRING_SESSION from below: +## 🧪 Get SESSION_NAME from below: TAP THIS: [![GenerateString](https://img.shields.io/badge/repl.it-generateString-yellowgreen)](https://replit.com/@levinalab/StringSession#main.py) @@ -149,11 +149,13 @@ jobs: # Special Credits 💖 -- [Levina](https://github.com/levina-lab) Dev -- [Sammy-XD](https://github.com/Sammy-XD) Dev -- [Zxce3](https://github.com/Zxce3) Dev -- [Laky's](https://github.com/Laky-64) for [pytgcalls](https://github.com/MarshalX) -- [Dan](https://github.com/delivrance) for [Pyrogram](https://github.com/pyrogram) +- [Levina](https://github.com/levina-lab) ``Dev`` +- [Sammy-XD](https://github.com/Sammy-XD) ``Dev`` +- [Zxce3](https://github.com/Zxce3) ``Dev`` +- [DoellBarr](https://github.com/DoellBarr) ``Dev`` +- [tofikdn](https://github.com/tofikdn) ``Dev`` +- [Laky's](https://github.com/Laky-64) for [``pytgcalls``](https://github.com/MarshalX) +- [Dan](https://github.com/delivrance) for [``Pyrogram``](https://github.com/pyrogram) ### Support & Updates 🎑 diff --git a/app.json b/app.json index aa64b8f..01d6bb0 100644 --- a/app.json +++ b/app.json @@ -1,8 +1,6 @@ -// Copyright (C) 2021 By VeezMusicProject - { "name": "Veez Video Stream Bot", - "description": "bot to stream video on telegram video chat, powered by pytgcalls and pyrogram", + "description": "telegram bot for streaming video trought the telegram group video chat, powered by pytgcalls and pyrogram", "logo": "https://telegra.ph/file/103a5208bb1698a8b33de.png", "keywords": [ "pytgcalls", diff --git a/bot/__main__.py b/bot/__main__.py index 3697a94..afc21ba 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -66,11 +66,11 @@ if __name__ == '__main__': loop.run_until_complete(start()) -# bot.start() -# print("[STATUS]:✅ »» BOT CLIENT STARTED ««") -# app.start() -# print("[STATUS]:✅ »» USERBOT CLIENT STARTED ««") -# call_py.start() -# print("[STATUS]:✅ »» PYTGCALLS CLIENT STARTED ««") -# idle() -# print("[STATUS]:❌ »» BOT STOPPED ««") +bot.start() +print("[STATUS]:✅ »» BOT CLIENT STARTED ««") +app.start() +print("[STATUS]:✅ »» USERBOT CLIENT STARTED ««") +call_py.start() +print("[STATUS]:✅ »» PYTGCALLS CLIENT STARTED ««") +idle() +print("[STATUS]:❌ »» BOT STOPPED ««") diff --git a/bot/song.py b/bot/song.py index 66bdc64..1ce1237 100644 --- a/bot/song.py +++ b/bot/song.py @@ -27,10 +27,7 @@ from helpers.decorators import humanbytes @Client.on_message(command(["song", f"song@{Veez.BOT_USERNAME}"]) & ~filters.channel) def song(_, message): - query = "" - for i in message.command[1:]: - query += " " + str(i) - print(query) + query = " ".join(message.command[1:]) m = message.reply("🔎 finding song...") ydl_ops = {"format": "bestaudio[ext=m4a]"} try: @@ -238,7 +235,7 @@ async def vsong(client, message): 'outtmpl':'%(title)s.%(ext)s', 'quite':True } - query = message.command[1] + query = " ".join(message.command[1:]) try: results = YoutubeSearch(query, max_results=1).to_dict() link = f"https://youtube.com{results[0]['url_suffix']}" diff --git a/bot/videoplayer.py b/bot/videoplayer.py index bed3ad9..64064ba 100644 --- a/bot/videoplayer.py +++ b/bot/videoplayer.py @@ -212,7 +212,7 @@ async def stopvideo(client, m: Message): async def handler(client: PyTgCalls, update: Update): LOG.info(f"called ended stream") chat_id = update.chat_id - await call_py.leave_group_call(chat_id) + await call_py.leave_group_call(chat_id) @Client.on_message(command(["cplay", f"cplay@{Veez.BOT_USERNAME}"]) & filters.group & ~filters.edited) diff --git a/helpers/utils.py b/helpers/utils.py index ee89ffe..445bedf 100644 --- a/helpers/utils.py +++ b/helpers/utils.py @@ -18,7 +18,7 @@ def raw_converter(dl, song, video): ) async def leave_call(chat_id: int): - process = FFMPEG_PROCESSES.get(chat_id) + process = FFMPEG_PROCESS.get(chat_id) if process: try: process.send_signal(SIGINT) @@ -41,4 +41,3 @@ def youtube(url: str): return None, None except Exception: return None, None - diff --git a/requirements.txt b/requirements.txt index 049b44d..ef00db2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,6 @@ ffmpeg-python googletrans==4.0.0rc1 py-tgcalls==0.8.0 youtube_dl -pafy==0.5.5 -pytube==11.0.1 git+https://github.com/pyrogram/pyrogram@master youtube_search_python==1.4.6 youtube_search @@ -19,4 +17,4 @@ psutil future gTTS wget -yt_dlp \ No newline at end of file +yt_dlp diff --git a/sample.env b/sample.env index 172a8a3..4bec0f0 100644 --- a/sample.env +++ b/sample.env @@ -1,13 +1,13 @@ # Your Session SESSION_NAME= -# Username Bot +# Your Bot username without @ BOT_USERNAME= # Bot TOKEN from @botfather BOT_TOKEN= -# Your BOT NAME +# Your 2nd account username without @ ASSISTANT_NAME= # Your API ID from my.telegram.org