From 426d30cf4a9b37e45c97762bdfa9564159098b72 Mon Sep 17 00:00:00 2001 From: Zinan100 <97530806+Zinan100@users.noreply.github.com> Date: Mon, 7 Feb 2022 21:03:13 +0530 Subject: [PATCH 1/3] Update Commands.py --- DonLee_Robot_V2/Commands.py | 44 +++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/DonLee_Robot_V2/Commands.py b/DonLee_Robot_V2/Commands.py index 9221544..1fea3de 100644 --- a/DonLee_Robot_V2/Commands.py +++ b/DonLee_Robot_V2/Commands.py @@ -13,12 +13,17 @@ @DonLee_Robot_V2.on_message(filters.command(["start", "alive"]) & filters.private) async def start(bot: DonLee_Robot_V2, msg: Import.Msg): - START_BUTTON = [[ - Import.Button("➕ 𝖠𝖽𝖽 𝖬𝖾 𝖳𝗈 𝖸𝗈𝗎𝗋 𝖢𝗁𝖺𝗍𝗌 ➕", url=f"http://t.me/{Config.BOT_USERNAME}?startgroup=true") - ],[ - Import.Button("⚠️ 𝖧𝖾𝗅𝗉", callback_data="help"), - Import.Button("𝖠𝖻𝗈𝗎𝗍 🤠", callback_data="about") - ]] + START_BUTTON = [[ + InlineKeyboardButton('⚚ ΛᎠᎠ MΞ ϮԾ YԾUᏒ GᏒԾUᎮ ⚚', url=f'http://t.me/{temp.U_NAME}?startgroup=true') + ],[ + InlineKeyboardButton('💠 GᏒԾUᎮ 💠', url='https://t.me/moviespot001100'), + InlineKeyboardButton('💠 CHΛИИΞL 💠', url='https://t.me/moviespot00100') + ],[ + InlineKeyboardButton('♻️ HΞLᎮ ♻️', callback_data='help'), + InlineKeyboardButton('♻️ ΛBOUT ♻️', callback_data='about') + ],[ + InlineKeyboardButton('💠 SΞΛᏒCH HΞᏒΞ 💠', switch_inline_query_current_chat='') + ]] if not await db.is_user_exist(msg.from_user.id): await db.add_user(msg.from_user.id) try: @@ -37,7 +42,7 @@ async def start(bot: DonLee_Robot_V2, msg: Import.Msg): await msg.reply_text( text=Config.FORCE_SUB_TEXT.format(msg.from_user.mention), reply_markup=Import.Markup([ - [ Import.Button(text="🔔 𝖩𝗈𝗂𝗇", url=f"https://t.me/{Config.FORCE_CHANNEL}"), + [ Import.Button(text="🔔 𝖩𝗈𝗂𝗇", url=f"https://t.me/moviespot00100"), Import.Button(text="𝖱𝖾𝖿𝗋𝖾𝗌𝗁 🔃", url=f"https://t.me/{Config.BOT_USERNAME}?start={file_uid}")] ]) ) @@ -67,7 +72,7 @@ async def start(bot: DonLee_Robot_V2, msg: Import.Msg): return button = [[ - Import.Button('➕ Add Me To Your Groups ➕', url='http://t.me/donlee_robot?startgroup=true') + Import.Button('➕ Add Me To Your Groups ➕', url='http://t.me/Rexer0BOT_BOT?startgroup=true') ]] await msg.reply_photo( photo=random.choice(Config.PHOTO), @@ -100,6 +105,9 @@ async def help(bot: DonLee_Robot_V2, msg: Import.Msg): Import.Button("🏠𝖧𝗈𝗆𝖾", callback_data="home"), Import.Button("𝖲𝗍𝖺𝗍𝗎𝗌", callback_data="status"), Import.Button("𝖠𝖻𝗈𝗎𝗍🤠", callback_data="about") + ],[ + InlineKeyboardButton('💠 GᏒԾUᎮ 💠', url='https://t.me/moviespot001100'), + InlineKeyboardButton('💠 CHΛИИΞL 💠', url='https://t.me/moviespot00100') ]] await bot.send_photo( chat_id=msg.chat.id, @@ -115,12 +123,12 @@ async def help(bot: DonLee_Robot_V2, msg: Import.Msg): @DonLee_Robot_V2.on_message(filters.command(["about"]) & filters.private, group=1) async def about(bot: DonLee_Robot_V2, msg: Import.Msg): button = [[ - Import.Button("👨‍💻𝖣𝖾𝗉𝗅𝗈𝗒", url='https://www.youtube.com/watch?v=NrbMc93aCzA'), - Import.Button("𝖲𝗈𝗎𝗋𝖼𝖾📦", callback_data="source") - ],[ - Import.Button("⚠️𝖧𝖾𝗅𝗉", callback_data="help"), Import.Button("🏠𝖧𝗈𝗆𝖾", callback_data="home"), - Import.Button("𝖢𝗅𝗈𝗌𝖾🗑️", callback_data="close") + Import.Button("𝖲𝗍𝖺𝗍𝗎𝗌", callback_data="status"), + Import.Button("𝖠𝖻𝗈𝗎𝗍🤠", callback_data="about") + ],[ + InlineKeyboardButton('💠 GᏒԾUᎮ 💠', url='https://t.me/moviespot001100'), + InlineKeyboardButton('💠 CHΛИИΞL 💠', url='https://t.me/moviespot00100') ]] await bot.send_photo( chat_id=msg.chat.id, @@ -135,14 +143,8 @@ async def about(bot: DonLee_Robot_V2, msg: Import.Msg): @DonLee_Robot_V2.on_message(filters.command(["sub", "subscribe"]) & filters.private, group=1) async def sub(bot: DonLee_Robot_V2, msg: Import.Msg): button = [[ - Import.Button("🖥️𝖵𝗂𝖽𝖾𝗈", url="https://www.youtube.com/watch?v=NrbMc93aCzA"), - Import.Button("𝖲𝗎𝗉𝗉𝗈𝗋𝗍🤝", url="https://www.youtube.com/watch?v=NrbMc93aCzA") - ],[ - Import.Button("📢𝖴𝗉𝖽𝖺𝗍𝖾𝗌", url="https://www.youtube.com/watch?v=NrbMc93aCzA"), - Import.Button("𝖸𝗈𝗎𝖳𝗎𝖻𝖾💞", url="https://www.youtube.com/watch?v=NrbMc93aCzA") - ],[ - Import.Button("📦𝖦𝗂𝗍𝗁𝗎𝖻", url="http://github.com/PR0FESS0R_99"), - Import.Button("𝖨𝗇𝗌𝗍𝖺😁", url="https://www.instagram.com/mrk_yt_") + Import.Button("💠 GᏒԾUᎮ 💠", url="https://t.me/moviespot001100"), + Import.Button("💠 CHΛИИΞL 💠", url="https://t.me/moviespot00100") ],[ Import.Button("𝖢𝗅𝗈𝗌𝖾🗑️", callback_data="close") ]] From f67345fd9171aaf96eb80ef94fdb6d18aa5bbddd Mon Sep 17 00:00:00 2001 From: Zinan100 <97530806+Zinan100@users.noreply.github.com> Date: Mon, 7 Feb 2022 21:05:25 +0530 Subject: [PATCH 2/3] Update start.sh --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index e51db2e..fcf3241 100644 --- a/start.sh +++ b/start.sh @@ -1,7 +1,7 @@ if [ -z $UPSTREAM_REPO ] then echo "Cloning main Repository" - git clone https://github.com/PR0FESS0R-99/DonLee-Robot-V2.git /DonLee-Robot-V2 + git clone https://github.com/Zinan100/DonLee-Robot-V2/tree/patch-2 /DonLee-Robot-V2 else echo "Cloning Custom Repo from $UPSTREAM_REPO " git clone $UPSTREAM_REPO /DonLee-Robot-V2 From 04d6990a377b4dc19dd26d402b3eb944a56f1047 Mon Sep 17 00:00:00 2001 From: Sourcery AI <> Date: Mon, 7 Feb 2022 15:35:39 +0000 Subject: [PATCH 3/3] 'Refactored by Sourcery' --- DonLee_Robot_V2/Commands.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DonLee_Robot_V2/Commands.py b/DonLee_Robot_V2/Commands.py index 1fea3de..b7aa8ab 100644 --- a/DonLee_Robot_V2/Commands.py +++ b/DonLee_Robot_V2/Commands.py @@ -23,14 +23,14 @@ async def start(bot: DonLee_Robot_V2, msg: Import.Msg): InlineKeyboardButton('♻️ ΛBOUT ♻️', callback_data='about') ],[ InlineKeyboardButton('💠 SΞΛᏒCH HΞᏒΞ 💠', switch_inline_query_current_chat='') - ]] + ]] if not await db.is_user_exist(msg.from_user.id): await db.add_user(msg.from_user.id) try: file_uid = msg.command[1] except IndexError: file_uid = False - + if file_uid: try: user = await bot.get_chat_member(Config.FORCE_CHANNEL, msg.chat.id) @@ -49,14 +49,14 @@ async def start(bot: DonLee_Robot_V2, msg: Import.Msg): return file_id, file_name, file_caption, file_type = await db.get_file(file_uid) - - if (file_id or file_type) == None: + + if ((file_id or file_type)) is None: return if Config.CAPTION_BOLD_OR_MONO == "bold": caption = ("" + file_name + "") else: - caption = ("" + file_name + "") + caption = f'{file_name}' try: await msg.reply_cached_media( file_id,