Xtao-Labs/video-stream
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge pull request #41 from levina-lab/beta-test

Browse Source 
push commit
This commit is contained in:
levina 2021-11-07 19:15:19 +07:00 committed by GitHub
commit c7689c4329
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
program/admins.py
View File

@ -188,12 +188,12 @@ async def cbpause(_, query: CallbackQuery):
try:
await call_py.pause_stream(chat_id)
await query.edit_message_text(
"⏸ streaming has paused", reply_markup=bttn
"⏸ the streaming has paused", reply_markup=bttn
)
except Exception as e:
await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl)
else:
await query.edit_message_text("❌ **nothing in streaming**", reply_markup=bcl)
await query.answer("❌ nothing is currently streaming", show_alert=True)
@Client.on_callback_query(filters.regex("cbresume"))
@ -208,12 +208,12 @@ async def cbresume(_, query: CallbackQuery):
try:
await call_py.resume_stream(chat_id)
await query.edit_message_text(
"▶️ streaming has resumed", reply_markup=bttn
"▶️ the streaming has resumed", reply_markup=bttn
)
except Exception as e:
await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl)
else:
await query.edit_message_text("❌ **nothing in streaming**", reply_markup=bcl)
await query.answer("❌ nothing is currently streaming", show_alert=True)
@Client.on_callback_query(filters.regex("cbstop"))
@ -228,11 +228,11 @@ async def cbstop(_, query: CallbackQuery):
try:
await call_py.leave_group_call(chat_id)
clear_queue(chat_id)
await query.edit_message_text("✅ **streaming has ended**", reply_markup=bcl)
await query.edit_message_text("✅ **the streaming has ended**", reply_markup=bcl)
except Exception as e:
await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl)
else:
await query.edit_message_text("❌ **nothing in streaming**", reply_markup=bcl)
await query.answer("❌ nothing is currently streaming", show_alert=True)
@Client.on_callback_query(filters.regex("cbmute"))
@ -252,7 +252,7 @@ async def cbmute(_, query: CallbackQuery):
except Exception as e:
await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl)
else:
await query.edit_message_text("❌ **nothing in streaming**", reply_markup=bcl)
await query.answer("❌ nothing is currently streaming", show_alert=True)
@Client.on_callback_query(filters.regex("cbunmute"))
@ -272,7 +272,7 @@ async def cbunmute(_, query: CallbackQuery):
except Exception as e:
await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl)
else:
await query.edit_message_text("❌ **nothing in streaming**", reply_markup=bcl)
await query.answer("❌ nothing is currently streaming", show_alert=True)
@Client.on_message(

14
program/music.py
View File

@ -5,7 +5,7 @@
import asyncio
import re
from config import ASSISTANT_NAME, BOT_USERNAME, IMG_1, IMG_2
from config import ASSISTANT_NAME, BOT_USERNAME, IMG_1, IMG_2, UPDATES_CHANNEL
from driver.filters import command, other_filters
from driver.queues import QUEUE, add_to_queue
from driver.veez import call_py, user
@ -59,6 +59,8 @@ async def play(c: Client, m: Message):
[
InlineKeyboardButton(text="• Mᴇɴᴜ", callback_data="cbmenu"),
InlineKeyboardButton(text="• Cʟᴏsᴇ", callback_data="cls"),
],[
InlineKeyboardButton(text="✨ Cʜᴀɴɴᴇʟ", url=f"https://t.me/{UPDATES_CHANNEL}"),
]
]
)
@ -103,7 +105,7 @@ async def play(c: Client, m: Message):
try:
await user.join_chat(m.chat.username)
except Exception as e:
await m.reply_text(f"❌ **userbot failed to join**\n\n**reason**:{e}")
await m.reply_text(f"❌ **userbot failed to join**\n\n**reason**: `{e}`")
return
else:
try:
@ -114,7 +116,7 @@ async def play(c: Client, m: Message):
pass
except Exception as e:
return await m.reply_text(
f"❌ **userbot failed to join**\n\n**reason**:{e}"
f"❌ **userbot failed to join**\n\n**reason**: `{e}`"
)
if replied:
@ -268,6 +270,8 @@ async def stream(c: Client, m: Message):
[
InlineKeyboardButton(text="• Mᴇɴᴜ", callback_data="cbmenu"),
InlineKeyboardButton(text="• Cʟᴏsᴇ", callback_data="cls"),
],[
InlineKeyboardButton(text="✨ Cʜᴀɴɴᴇʟ", url=f"https://t.me/{UPDATES_CHANNEL}"),
]
]
)
@ -312,7 +316,7 @@ async def stream(c: Client, m: Message):
try:
await user.join_chat(m.chat.username)
except Exception as e:
await m.reply_text(f"❌ **userbot failed to join**\n\n**reason**:{e}")
await m.reply_text(f"❌ **userbot failed to join**\n\n**reason**: `{e}`")
return
else:
try:
@ -323,7 +327,7 @@ async def stream(c: Client, m: Message):
pass
except Exception as e:
return await m.reply_text(
f"❌ **userbot failed to join**\n\n**reason**:{e}"
f"❌ **userbot failed to join**\n\n**reason**: `{e}`"
)
if len(m.command) < 2:

14
program/video.py
View File

@ -5,7 +5,7 @@
import asyncio
import re
from config import ASSISTANT_NAME, BOT_USERNAME, IMG_1, IMG_2
from config import ASSISTANT_NAME, BOT_USERNAME, IMG_1, IMG_2, UPDATES_CHANNEL
from driver.filters import command, other_filters
from driver.queues import QUEUE, add_to_queue
from driver.veez import call_py, user
@ -65,6 +65,8 @@ async def vplay(c: Client, m: Message):
[
InlineKeyboardButton(text="• Mᴇɴᴜ", callback_data="cbmenu"),
InlineKeyboardButton(text="• Cʟᴏsᴇ", callback_data="cls"),
],[
InlineKeyboardButton(text="✨ Cʜᴀɴɴᴇʟ", url=f"https://t.me/{UPDATES_CHANNEL}"),
]
]
)
@ -109,7 +111,7 @@ async def vplay(c: Client, m: Message):
try:
await user.join_chat(m.chat.username)
except Exception as e:
await m.reply_text(f"❌ **userbot failed to join**\n\n**reason**:{e}")
await m.reply_text(f"❌ **userbot failed to join**\n\n**reason**: `{e}`")
return
else:
try:
@ -120,7 +122,7 @@ async def vplay(c: Client, m: Message):
pass
except Exception as e:
return await m.reply_text(
f"❌ **userbot failed to join**\n\n**reason**: {e}"
f"❌ **userbot failed to join**\n\n**reason**: `{e}`"
)
if replied:
@ -298,6 +300,8 @@ async def vstream(c: Client, m: Message):
[
InlineKeyboardButton(text="• Mᴇɴᴜ", callback_data="cbmenu"),
InlineKeyboardButton(text="• Cʟᴏsᴇ", callback_data="cls"),
],[
InlineKeyboardButton(text="✨ Cʜᴀɴɴᴇʟ", url=f"https://t.me/{UPDATES_CHANNEL}"),
]
]
)
@ -342,7 +346,7 @@ async def vstream(c: Client, m: Message):
try:
await user.join_chat(m.chat.username)
except Exception as e:
await m.reply_text(f"❌ **userbot failed to join**\n\n**reason**:{e}")
await m.reply_text(f"❌ **userbot failed to join**\n\n**reason**: `{e}`")
return
else:
try:
@ -353,7 +357,7 @@ async def vstream(c: Client, m: Message):
pass
except Exception as e:
return await m.reply_text(
f"❌ **userbot failed to join**\n\n**reason**:{e}"
f"❌ **userbot failed to join**\n\n**reason**: `{e}`"
)
if len(m.command) < 2:

2
runtime.txt
View File

@ -1 +1 @@
python-3.9.7
python-3.10.0