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

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

View File

@ -188,12 +188,12 @@ async def cbpause(_, query: CallbackQuery):
try: try:
await call_py.pause_stream(chat_id) await call_py.pause_stream(chat_id)
await query.edit_message_text( await query.edit_message_text(
"streaming has paused", reply_markup=bttn "the streaming has paused", reply_markup=bttn
) )
except Exception as e: except Exception as e:
await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl) await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl)
else: 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")) @Client.on_callback_query(filters.regex("cbresume"))
@ -208,12 +208,12 @@ async def cbresume(_, query: CallbackQuery):
try: try:
await call_py.resume_stream(chat_id) await call_py.resume_stream(chat_id)
await query.edit_message_text( await query.edit_message_text(
"▶️ streaming has resumed", reply_markup=bttn "▶️ the streaming has resumed", reply_markup=bttn
) )
except Exception as e: except Exception as e:
await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl) await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl)
else: 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")) @Client.on_callback_query(filters.regex("cbstop"))
@ -228,11 +228,11 @@ async def cbstop(_, query: CallbackQuery):
try: try:
await call_py.leave_group_call(chat_id) await call_py.leave_group_call(chat_id)
clear_queue(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: except Exception as e:
await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl) await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl)
else: 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")) @Client.on_callback_query(filters.regex("cbmute"))
@ -252,7 +252,7 @@ async def cbmute(_, query: CallbackQuery):
except Exception as e: except Exception as e:
await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl) await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl)
else: 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")) @Client.on_callback_query(filters.regex("cbunmute"))
@ -272,7 +272,7 @@ async def cbunmute(_, query: CallbackQuery):
except Exception as e: except Exception as e:
await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl) await query.edit_message_text(f"🚫 **error:**\n\n`{e}`", reply_markup=bcl)
else: 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( @Client.on_message(

View File

@ -5,7 +5,7 @@
import asyncio import asyncio
import re 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.filters import command, other_filters
from driver.queues import QUEUE, add_to_queue from driver.queues import QUEUE, add_to_queue
from driver.veez import call_py, user 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="• Mᴇɴ", callback_data="cbmenu"),
InlineKeyboardButton(text="• Cʟsᴇ", callback_data="cls"), 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: try:
await user.join_chat(m.chat.username) await user.join_chat(m.chat.username)
except Exception as e: 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 return
else: else:
try: try:
@ -114,7 +116,7 @@ async def play(c: Client, m: Message):
pass pass
except Exception as e: except Exception as e:
return await m.reply_text( 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: if replied:
@ -268,6 +270,8 @@ async def stream(c: Client, m: Message):
[ [
InlineKeyboardButton(text="• Mᴇɴ", callback_data="cbmenu"), InlineKeyboardButton(text="• Mᴇɴ", callback_data="cbmenu"),
InlineKeyboardButton(text="• Cʟsᴇ", callback_data="cls"), 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: try:
await user.join_chat(m.chat.username) await user.join_chat(m.chat.username)
except Exception as e: 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 return
else: else:
try: try:
@ -323,7 +327,7 @@ async def stream(c: Client, m: Message):
pass pass
except Exception as e: except Exception as e:
return await m.reply_text( 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: if len(m.command) < 2:

View File

@ -5,7 +5,7 @@
import asyncio import asyncio
import re 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.filters import command, other_filters
from driver.queues import QUEUE, add_to_queue from driver.queues import QUEUE, add_to_queue
from driver.veez import call_py, user 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="• Mᴇɴ", callback_data="cbmenu"),
InlineKeyboardButton(text="• Cʟsᴇ", callback_data="cls"), 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: try:
await user.join_chat(m.chat.username) await user.join_chat(m.chat.username)
except Exception as e: 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 return
else: else:
try: try:
@ -120,7 +122,7 @@ async def vplay(c: Client, m: Message):
pass pass
except Exception as e: except Exception as e:
return await m.reply_text( 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: if replied:
@ -298,6 +300,8 @@ async def vstream(c: Client, m: Message):
[ [
InlineKeyboardButton(text="• Mᴇɴ", callback_data="cbmenu"), InlineKeyboardButton(text="• Mᴇɴ", callback_data="cbmenu"),
InlineKeyboardButton(text="• Cʟsᴇ", callback_data="cls"), 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: try:
await user.join_chat(m.chat.username) await user.join_chat(m.chat.username)
except Exception as e: 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 return
else: else:
try: try:
@ -353,7 +357,7 @@ async def vstream(c: Client, m: Message):
pass pass
except Exception as e: except Exception as e:
return await m.reply_text( 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: if len(m.command) < 2:

View File

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