From 82f74067bd6e522a63b6703d9ef87911e6719d22 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Wed, 21 Dec 2022 22:39:54 +0530 Subject: [PATCH 01/26] Update utils.py --- utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils.py b/utils.py index 215b9b9..2aba976 100644 --- a/utils.py +++ b/utils.py @@ -379,7 +379,7 @@ def humanbytes(size): #shortzy -shortz = shortzy.Shortzy(SHORTENER_API, "shareus.in") +shortz = shortzy.Shortzy(SHORTENER_API, "MdiskShortner.link") async def get_shortlink(link): if SHORTENER_API: if LONG_DROPLINK_URL =="True" or LONG_DROPLINK_URL is True: From 2b50ef19ab52956007cda811f4ce445035cb9912 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Thu, 22 Dec 2022 20:17:48 +0530 Subject: [PATCH 02/26] Update info.py --- info.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/info.py b/info.py index 4e98afd..e610266 100644 --- a/info.py +++ b/info.py @@ -39,9 +39,9 @@ def is_enabled(value, default): # Others LOG_CHANNEL = int(environ.get('LOG_CHANNEL', 0)) SUPPORT_CHAT = environ.get('SUPPORT_CHAT', 'TeamEvamaria') -P_TTI_SHOW_OFF = is_enabled((environ.get('P_TTI_SHOW_OFF', "False")), False) +P_TTI_SHOW_OFF = is_enabled((environ.get('P_TTI_SHOW_OFF', "True")), True) IMDB = is_enabled((environ.get('IMDB', "False")), False) -SINGLE_BUTTON = is_enabled((environ.get('SINGLE_BUTTON', "False")), False) +SINGLE_BUTTON = is_enabled((environ.get('SINGLE_BUTTON', "True")), True) CUSTOM_FILE_CAPTION = environ.get("CUSTOM_FILE_CAPTION", None) BATCH_FILE_CAPTION = environ.get("BATCH_FILE_CAPTION", CUSTOM_FILE_CAPTION) IMDB_TEMPLATE = environ.get("IMDB_TEMPLATE", "Query: {query} \nβ€Œβ€Œβ€Œβ€ŒIMDb Data:\n\n🏷 Title: {title}\n🎭 Genres: {genres}\nπŸ“† Year: {year}\n🌟 Rating: {rating} / 10") From 3107d1fb4e4ccdcad1908a45cc8874691db03369 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Thu, 22 Dec 2022 20:20:54 +0530 Subject: [PATCH 03/26] Update commands.py --- plugins/commands.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/commands.py b/plugins/commands.py index e9f04b2..14c2bf1 100644 --- a/plugins/commands.py +++ b/plugins/commands.py @@ -45,7 +45,7 @@ async def start(client, message): InlineKeyboardButton('βž• Add Me To Your Groups βž•', url=f'http://t.me/{temp.U_NAME}?startgroup=true') ],[ InlineKeyboardButton('πŸ” Search', switch_inline_query_current_chat=''), - InlineKeyboardButton('πŸ€– Updates', url='https://t.me/TeamEvamaria') + InlineKeyboardButton('πŸ€– Updates', url='https://t.me/pthan_Moviess') ],[ InlineKeyboardButton('ℹ️ Help', callback_data='help'), InlineKeyboardButton('😊 About', callback_data='about') @@ -91,7 +91,7 @@ async def start(client, message): InlineKeyboardButton('βž• Add Me To Your Groups βž•', url=f'http://t.me/{temp.U_NAME}?startgroup=true') ],[ InlineKeyboardButton('πŸ” Search', switch_inline_query_current_chat=''), - InlineKeyboardButton('πŸ€– Updates', url='https://t.me/TeamEvamaria') + InlineKeyboardButton('πŸ€– Updates', url='https://t.me/pthan_Moviess') ],[ InlineKeyboardButton('ℹ️ Help', callback_data='help'), InlineKeyboardButton('😊 About', callback_data='about') From a09cde1e8ae4f1ccb9142f76e117fbbd0ae48c53 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Thu, 22 Dec 2022 20:21:25 +0530 Subject: [PATCH 04/26] Update commands.py --- plugins/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/commands.py b/plugins/commands.py index 14c2bf1..427323d 100644 --- a/plugins/commands.py +++ b/plugins/commands.py @@ -23,7 +23,7 @@ async def start(client, message): if message.chat.type in [enums.ChatType.GROUP, enums.ChatType.SUPERGROUP]: buttons = [ [ - InlineKeyboardButton('πŸ€– Updates', url='https://t.me/TeamEvamaria') + InlineKeyboardButton('πŸ€– Updates', url='https://t.me/pthan_Moviess') ], [ InlineKeyboardButton('ℹ️ Help', url=f"https://t.me/{temp.U_NAME}?start=help"), From 655aa922f15b188d22a832b8decff535873c5049 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Thu, 22 Dec 2022 20:22:29 +0530 Subject: [PATCH 05/26] Update pm_filter.py --- plugins/pm_filter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/pm_filter.py b/plugins/pm_filter.py index 73126c8..c4de155 100644 --- a/plugins/pm_filter.py +++ b/plugins/pm_filter.py @@ -407,7 +407,7 @@ async def cb_handler(client: Client, query: CallbackQuery): InlineKeyboardButton('βž• Add Me To Your Groups βž•', url=f'http://t.me/{temp.U_NAME}?startgroup=true') ], [ InlineKeyboardButton('πŸ” Search', switch_inline_query_current_chat=''), - InlineKeyboardButton('πŸ€– Updates', url='https://t.me/TeamEvamaria') + InlineKeyboardButton('πŸ€– Updates', url='https://t.me/pthan_Moviess') ], [ InlineKeyboardButton('ℹ️ Help', callback_data='help'), InlineKeyboardButton('😊 About', callback_data='about') From 4121afdba484e1dbdff799fbb50eff3fe737fce2 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Thu, 22 Dec 2022 20:29:08 +0530 Subject: [PATCH 06/26] Update pm_filter.py --- plugins/pm_filter.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/pm_filter.py b/plugins/pm_filter.py index c4de155..98e1b16 100644 --- a/plugins/pm_filter.py +++ b/plugins/pm_filter.py @@ -107,6 +107,9 @@ async def next_page(bot, query): InlineKeyboardButton("NEXT ⏩", callback_data=f"next_{req}_{key}_{n_offset}") ], ) + btn.insert(0, [ + InlineKeyboardButton("πŸ”Ή How to download πŸ”Ή", url='https://t.me/Actor_Actores_collection/287') + ]) try: await query.edit_message_reply_markup( reply_markup=InlineKeyboardMarkup(btn) @@ -673,6 +676,9 @@ async def auto_filter(client, msg, spoll=False): btn.append( [InlineKeyboardButton(text="πŸ—“ 1/1", callback_data="pages")] ) + btn.insert(0, [ + InlineKeyboardButton("πŸ”Ή How to download πŸ”Ή", url='https://t.me/Actor_Actores_collection/287') + ]) imdb = await get_poster(search, file=(files[0]).file_name) if settings["imdb"] else None TEMPLATE = settings['template'] if imdb: From 75248256aefead6b449839522bdc153d1b8f416e Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Thu, 22 Dec 2022 20:31:29 +0530 Subject: [PATCH 07/26] Update Script.py --- Script.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script.py b/Script.py index 39e7c18..cb9c521 100644 --- a/Script.py +++ b/Script.py @@ -4,7 +4,7 @@ class script(object): HELP_TXT = """π™·π™΄πšˆ {} π™·π™΄πšπ™΄ π™Έπš‚ πšƒπ™·π™΄ 𝙷𝙴𝙻𝙿 π™΅π™Ύπš π™Όπšˆ π™²π™Ύπ™Όπ™Όπ™°π™½π™³πš‚.""" ABOUT_TXT = """✯ π™Όπšˆ 𝙽𝙰𝙼𝙴: {} -✯ π™²πšπ™΄π™°πšƒπ™Ύπš: Team Eva Maria +✯ π™²πšπ™΄π™°πšƒπ™Ύπš: Jatt Hacker ✯ π™»π™Έπ™±πšπ™°πšπšˆ: π™Ώπšˆπšπ™Ύπ™Άπšπ™°π™Ό ✯ π™»π™°π™½π™Άπš„π™°π™Άπ™΄: π™Ώπšˆπšƒπ™·π™Ύπ™½ 𝟹 ✯ π™³π™°πšƒπ™° π™±π™°πš‚π™΄: 𝙼𝙾𝙽𝙢𝙾 𝙳𝙱 From 32998c862829e8c48f65be3e7597d9058901dc10 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Thu, 22 Dec 2022 20:38:59 +0530 Subject: [PATCH 08/26] Update commands.py --- plugins/commands.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugins/commands.py b/plugins/commands.py index 427323d..bb9c01c 100644 --- a/plugins/commands.py +++ b/plugins/commands.py @@ -245,7 +245,14 @@ async def start(client, message): file_id=file_id, caption=f_caption, protect_content=True if pre == 'filep' else False, + reply_markup=InlineKeyboardMarkup( + [ + [ + InlineKeyboardButton('♻️ 𝐉𝐨𝐒𝐧 𝙂𝙧𝙀π™ͺπ™₯ ', url="https://t.me/+ZONAmseBbjZoPdoq") + ] + ] ) + ) @Client.on_message(filters.command('channel') & filters.user(ADMINS)) From dd198b25a4716395036bf9037325a7e0ca74f2a1 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Thu, 22 Dec 2022 20:39:54 +0530 Subject: [PATCH 09/26] Update info.py --- info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.py b/info.py index e610266..6d783a1 100644 --- a/info.py +++ b/info.py @@ -42,7 +42,7 @@ def is_enabled(value, default): P_TTI_SHOW_OFF = is_enabled((environ.get('P_TTI_SHOW_OFF', "True")), True) IMDB = is_enabled((environ.get('IMDB', "False")), False) SINGLE_BUTTON = is_enabled((environ.get('SINGLE_BUTTON', "True")), True) -CUSTOM_FILE_CAPTION = environ.get("CUSTOM_FILE_CAPTION", None) +CUSTOM_FILE_CAPTION = environ.get("CUSTOM_FILE_CAPTION", "{file_name}\n\nβ”β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β€’β”β”β”β”β”“\nβœ°πŸ‘‘ 𝐉𝐨𝐒𝐧  [ π™ˆπ™€π™«π™žπ™šπ™¨ 𝙂𝙧𝙀π™ͺπ™₯ ](https://t.me/+FAgX05kGByNkZjJl)Β  πŸ‘‘βœ°\nβ”—β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β”β”β”β”β”›") BATCH_FILE_CAPTION = environ.get("BATCH_FILE_CAPTION", CUSTOM_FILE_CAPTION) IMDB_TEMPLATE = environ.get("IMDB_TEMPLATE", "Query: {query} \nβ€Œβ€Œβ€Œβ€ŒIMDb Data:\n\n🏷 Title: {title}\n🎭 Genres: {genres}\nπŸ“† Year: {year}\n🌟 Rating: {rating} / 10") LONG_IMDB_DESCRIPTION = is_enabled(environ.get("LONG_IMDB_DESCRIPTION", "False"), False) From 0e566facec19de0326267e5497af68415beb743c Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Thu, 22 Dec 2022 20:41:23 +0530 Subject: [PATCH 10/26] Update info.py --- info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.py b/info.py index 6d783a1..d142424 100644 --- a/info.py +++ b/info.py @@ -42,7 +42,7 @@ def is_enabled(value, default): P_TTI_SHOW_OFF = is_enabled((environ.get('P_TTI_SHOW_OFF', "True")), True) IMDB = is_enabled((environ.get('IMDB', "False")), False) SINGLE_BUTTON = is_enabled((environ.get('SINGLE_BUTTON', "True")), True) -CUSTOM_FILE_CAPTION = environ.get("CUSTOM_FILE_CAPTION", "{file_name}\n\nβ”β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β€’β”β”β”β”β”“\nβœ°πŸ‘‘ 𝐉𝐨𝐒𝐧  [ π™ˆπ™€π™«π™žπ™šπ™¨ 𝙂𝙧𝙀π™ͺπ™₯ ](https://t.me/+FAgX05kGByNkZjJl)Β  πŸ‘‘βœ°\nβ”—β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β”β”β”β”β”›") +CUSTOM_FILE_CAPTION = environ.get("CUSTOM_FILE_CAPTION", "{file_name}\n\nβ”β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β€’β”β”β”β”β”“\nβœ°πŸ‘‘ 𝐉𝐨𝐒𝐧  [ π™ˆπ™€π™«π™žπ™šπ™¨ 𝙂𝙧𝙀π™ͺπ™₯ ](https://t.me/+ZONAmseBbjZoPdoq)Β  πŸ‘‘βœ°\nβ”—β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β”β”β”β”β”›") BATCH_FILE_CAPTION = environ.get("BATCH_FILE_CAPTION", CUSTOM_FILE_CAPTION) IMDB_TEMPLATE = environ.get("IMDB_TEMPLATE", "Query: {query} \nβ€Œβ€Œβ€Œβ€ŒIMDb Data:\n\n🏷 Title: {title}\n🎭 Genres: {genres}\nπŸ“† Year: {year}\n🌟 Rating: {rating} / 10") LONG_IMDB_DESCRIPTION = is_enabled(environ.get("LONG_IMDB_DESCRIPTION", "False"), False) From ace22d0a3816313101c3786b30391f2a08d212b1 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Fri, 23 Dec 2022 13:41:28 +0530 Subject: [PATCH 11/26] Update info.py --- info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.py b/info.py index d142424..283430d 100644 --- a/info.py +++ b/info.py @@ -42,7 +42,7 @@ def is_enabled(value, default): P_TTI_SHOW_OFF = is_enabled((environ.get('P_TTI_SHOW_OFF', "True")), True) IMDB = is_enabled((environ.get('IMDB', "False")), False) SINGLE_BUTTON = is_enabled((environ.get('SINGLE_BUTTON', "True")), True) -CUSTOM_FILE_CAPTION = environ.get("CUSTOM_FILE_CAPTION", "{file_name}\n\nβ”β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β€’β”β”β”β”β”“\nβœ°πŸ‘‘ 𝐉𝐨𝐒𝐧  [ π™ˆπ™€π™«π™žπ™šπ™¨ 𝙂𝙧𝙀π™ͺπ™₯ ](https://t.me/+ZONAmseBbjZoPdoq)Β  πŸ‘‘βœ°\nβ”—β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β”β”β”β”β”›") +CUSTOM_FILE_CAPTION = environ.get("CUSTOM_FILE_CAPTION", "{file_name}\n\nβ”β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β€’β”β”β”β”β”“\nβœ°πŸ‘‘ 𝐉𝐨𝐒𝐧  [ π™ˆπ™–π™žπ™£ π˜Ύπ™π™–π™£π™£π™šπ™‘ ](https://t.me/New_Relese_Movies_Hindi)Β  πŸ‘‘βœ°\nβ”—β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β”β”β”β”β”›") BATCH_FILE_CAPTION = environ.get("BATCH_FILE_CAPTION", CUSTOM_FILE_CAPTION) IMDB_TEMPLATE = environ.get("IMDB_TEMPLATE", "Query: {query} \nβ€Œβ€Œβ€Œβ€ŒIMDb Data:\n\n🏷 Title: {title}\n🎭 Genres: {genres}\nπŸ“† Year: {year}\n🌟 Rating: {rating} / 10") LONG_IMDB_DESCRIPTION = is_enabled(environ.get("LONG_IMDB_DESCRIPTION", "False"), False) From b094bcfce5387cda2428d21f221e26e7a3585a95 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Fri, 23 Dec 2022 20:42:37 +0530 Subject: [PATCH 12/26] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 810c373..9ac78b2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,5 +6,5 @@ marshmallow==3.14.1 umongo==3.0.1 requests bs4 -imdbpy==2021.4.18 +git+https://github.com/Sahidmalik001/cinemagoer shortzy From fb512d1848804a777307ef7baadafc5afed45e5e Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Fri, 23 Dec 2022 20:43:10 +0530 Subject: [PATCH 13/26] Update utils.py --- utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils.py b/utils.py index 2aba976..139c374 100644 --- a/utils.py +++ b/utils.py @@ -2,7 +2,7 @@ import shortzy from pyrogram.errors import InputUserDeactivated, UserNotParticipant, FloodWait, UserIsBlocked, PeerIdInvalid from info import LONG_DROPLINK_URL, SHORTENER_API, AUTH_CHANNEL, LONG_IMDB_DESCRIPTION, MAX_LIST_ELM -from imdb import IMDb +from imdb import Cinemagoer import asyncio from pyrogram.types import Message, InlineKeyboardButton from pyrogram import enums @@ -22,7 +22,7 @@ r"(\[([^\[]+?)\]\((buttonurl|buttonalert):(?:/{0,2})(.+?)(:same)?\))" ) -imdb = IMDb() +imdb = Cinemagoer() BANNED = {} SMART_OPEN = 'β€œ' From ef910334e4bf57857d873200a76a00bdac8fa6e2 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Fri, 23 Dec 2022 20:43:46 +0530 Subject: [PATCH 14/26] Update info.py --- info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.py b/info.py index 283430d..4289afe 100644 --- a/info.py +++ b/info.py @@ -40,7 +40,7 @@ def is_enabled(value, default): LOG_CHANNEL = int(environ.get('LOG_CHANNEL', 0)) SUPPORT_CHAT = environ.get('SUPPORT_CHAT', 'TeamEvamaria') P_TTI_SHOW_OFF = is_enabled((environ.get('P_TTI_SHOW_OFF', "True")), True) -IMDB = is_enabled((environ.get('IMDB', "False")), False) +IMDB = is_enabled((environ.get('IMDB', "True")), True) SINGLE_BUTTON = is_enabled((environ.get('SINGLE_BUTTON', "True")), True) CUSTOM_FILE_CAPTION = environ.get("CUSTOM_FILE_CAPTION", "{file_name}\n\nβ”β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β€’β”β”β”β”β”“\nβœ°πŸ‘‘ 𝐉𝐨𝐒𝐧  [ π™ˆπ™–π™žπ™£ π˜Ύπ™π™–π™£π™£π™šπ™‘ ](https://t.me/New_Relese_Movies_Hindi)Β  πŸ‘‘βœ°\nβ”—β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β”β”β”β”β”›") BATCH_FILE_CAPTION = environ.get("BATCH_FILE_CAPTION", CUSTOM_FILE_CAPTION) From 15ee3317242cea1fe428f226d2be6171e59e9562 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Fri, 23 Dec 2022 20:49:07 +0530 Subject: [PATCH 15/26] Update pm_filter.py --- plugins/pm_filter.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/plugins/pm_filter.py b/plugins/pm_filter.py index 98e1b16..6827db2 100644 --- a/plugins/pm_filter.py +++ b/plugins/pm_filter.py @@ -717,17 +717,28 @@ async def auto_filter(client, msg, spoll=False): cap = f"Here is what i found for your query {search}" if imdb and imdb.get('poster'): try: - await message.reply_photo(photo=imdb.get('poster'), caption=cap[:1024], - reply_markup=InlineKeyboardMarkup(btn)) + bb = await message.reply_photo(photo=imdb.get('poster'), caption=cap[:1024],reply_markup=InlineKeyboardMarkup(btn)) + await asyncio.sleep(240) + await bb.delete() + await msg.delete() except (MediaEmpty, PhotoInvalidDimensions, WebpageMediaEmpty): pic = imdb.get('poster') poster = pic.replace('.jpg', "._V1_UX360.jpg") - await message.reply_photo(photo=poster, caption=cap[:1024], reply_markup=InlineKeyboardMarkup(btn)) + bbn = await message.reply_photo(photo=poster, caption=cap[:1024], reply_markup=InlineKeyboardMarkup(btn)) + await asyncio.sleep(240) + await bbn.delete() + await msg.delete() except Exception as e: logger.exception(e) - await message.reply_text(cap, reply_markup=InlineKeyboardMarkup(btn)) + bbbn = await message.reply_text(cap, reply_markup=InlineKeyboardMarkup(btn)) + await asyncio.sleep(240) + await bbbn.delete() + await msg.delete() else: - await message.reply_text(cap, reply_markup=InlineKeyboardMarkup(btn)) + aa = await message.reply_text(cap, reply_markup=InlineKeyboardMarkup(btn)) + await asyncio.sleep(240) + await aa.delete() + await msg.delete() if spoll: await msg.message.delete() @@ -782,9 +793,11 @@ async def advantage_spell_chok(msg): ) ] for k, movie in enumerate(movielist)] btn.append([InlineKeyboardButton(text="Close", callback_data=f'spolling#{user}#close_spellcheck')]) - await msg.reply("I couldn't find anything related to that\nDid you mean any one of these?", + kb= await msg.reply("I couldn't find anything related to that\nDid you mean any one of these?", reply_markup=InlineKeyboardMarkup(btn)) - + await asyncio.sleep(120) + await kb.delete() + await msg.delete() async def manual_filters(client, message, text=False): group_id = message.chat.id From a9138491814ec0d81bf8d310a2ced5f27763fd1b Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Sat, 24 Dec 2022 20:51:02 +0530 Subject: [PATCH 16/26] Update pm_filter.py --- plugins/pm_filter.py | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/plugins/pm_filter.py b/plugins/pm_filter.py index 6827db2..391f574 100644 --- a/plugins/pm_filter.py +++ b/plugins/pm_filter.py @@ -717,28 +717,16 @@ async def auto_filter(client, msg, spoll=False): cap = f"Here is what i found for your query {search}" if imdb and imdb.get('poster'): try: - bb = await message.reply_photo(photo=imdb.get('poster'), caption=cap[:1024],reply_markup=InlineKeyboardMarkup(btn)) - await asyncio.sleep(240) - await bb.delete() - await msg.delete() + await message.reply_photo(photo=imdb.get('poster'), caption=cap[:1024],reply_markup=InlineKeyboardMarkup(btn)) except (MediaEmpty, PhotoInvalidDimensions, WebpageMediaEmpty): pic = imdb.get('poster') poster = pic.replace('.jpg', "._V1_UX360.jpg") - bbn = await message.reply_photo(photo=poster, caption=cap[:1024], reply_markup=InlineKeyboardMarkup(btn)) - await asyncio.sleep(240) - await bbn.delete() - await msg.delete() + await message.reply_photo(photo=poster, caption=cap[:1024], reply_markup=InlineKeyboardMarkup(btn)) except Exception as e: logger.exception(e) - bbbn = await message.reply_text(cap, reply_markup=InlineKeyboardMarkup(btn)) - await asyncio.sleep(240) - await bbbn.delete() - await msg.delete() + await message.reply_text(cap, reply_markup=InlineKeyboardMarkup(btn)) else: - aa = await message.reply_text(cap, reply_markup=InlineKeyboardMarkup(btn)) - await asyncio.sleep(240) - await aa.delete() - await msg.delete() + await message.reply_text(cap, reply_markup=InlineKeyboardMarkup(btn)) if spoll: await msg.message.delete() @@ -795,7 +783,7 @@ async def advantage_spell_chok(msg): btn.append([InlineKeyboardButton(text="Close", callback_data=f'spolling#{user}#close_spellcheck')]) kb= await msg.reply("I couldn't find anything related to that\nDid you mean any one of these?", reply_markup=InlineKeyboardMarkup(btn)) - await asyncio.sleep(120) + await asyncio.sleep(300) await kb.delete() await msg.delete() From c8c475a0c33d62f43ae7f90424d72f7d09263a27 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka12 <121882652+Mukeshdhaka12@users.noreply.github.com> Date: Tue, 3 Jan 2023 21:04:22 +0530 Subject: [PATCH 17/26] Update Dockerfile --- Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index fe9af8c..77d217a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,13 @@ -FROM python:3.8-slim-buster +FROM python:3.10 RUN apt update && apt upgrade -y RUN apt install git -y COPY requirements.txt /requirements.txt RUN cd / -RUN pip3 install -U pip && pip3 install -U -r requirements.txt -RUN mkdir /EvaMaria -WORKDIR /EvaMaria -COPY start.sh /start.sh -CMD ["/bin/bash", "/start.sh"] +RUN pip install -U pip && pip install -U -r requirements.txt +WORKDIR /app + +COPY . . + +CMD ["python", "bot.py"] From d28a4aeef84c2f8f343f809007048263365e1942 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka12 <121882652+Mukeshdhaka12@users.noreply.github.com> Date: Tue, 3 Jan 2023 21:04:41 +0530 Subject: [PATCH 18/26] Delete start.sh --- start.sh | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 start.sh diff --git a/start.sh b/start.sh deleted file mode 100644 index fb1333b..0000000 --- a/start.sh +++ /dev/null @@ -1,12 +0,0 @@ -if [ -z $UPSTREAM_REPO ] -then - echo "Cloning main Repository" - git clone https://github.com/EvamariaTG/EvaMaria.git /EvaMaria -else - echo "Cloning Custom Repo from $UPSTREAM_REPO " - git clone $UPSTREAM_REPO /EvaMaria -fi -cd /EvaMaria -pip3 install -U -r requirements.txt -echo "Starting Bot...." -python3 bot.py \ No newline at end of file From f7e325d95d95067182a702618604aa727adf8a7f Mon Sep 17 00:00:00 2001 From: Mukeshdhaka12 <121882652+Mukeshdhaka12@users.noreply.github.com> Date: Tue, 3 Jan 2023 21:06:25 +0530 Subject: [PATCH 19/26] Update bot.py --- bot.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bot.py b/bot.py index 8bb7a23..f6d19fd 100644 --- a/bot.py +++ b/bot.py @@ -16,6 +16,10 @@ from typing import Union, Optional, AsyncGenerator from pyrogram import types +from plugins.render import web_server +from aiohttp import web + + class Bot(Client): def __init__(self): @@ -42,6 +46,10 @@ async def start(self): self.username = '@' + me.username logging.info(f"{me.first_name} with for Pyrogram v{__version__} (Layer {layer}) started on {me.username}.") logging.info(LOG_STR) + app = web.AppRunner(await web_server()) + await app.setup() + bind_address = "0.0.0.0" + await web.TCPSite(app, bind_address, 8080).start() async def stop(self, *args): await super().stop() From f3d7ebed499a8bb09eca5271cad16e1a8a1a3a2a Mon Sep 17 00:00:00 2001 From: Mukeshdhaka12 <121882652+Mukeshdhaka12@users.noreply.github.com> Date: Tue, 3 Jan 2023 21:08:18 +0530 Subject: [PATCH 20/26] Create render.py --- plugins/render.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 plugins/render.py diff --git a/plugins/render.py b/plugins/render.py new file mode 100644 index 0000000..fc62d79 --- /dev/null +++ b/plugins/render.py @@ -0,0 +1,12 @@ +from aiohttp import web + +routes = web.RouteTableDef() + +@routes.get("/", allow_head=True) +async def root_route_handler(request): + return web.json_response("Mα΄‹Ι΄ Bᴏᴛᴒ") + +async def web_server(): + web_app = web.Application(client_max_size=30000000) + web_app.add_routes(routes) + return web_app From 2ed39739e8094f81a074b5df0a93eab74ce3353d Mon Sep 17 00:00:00 2001 From: Mukeshdhaka12 <121882652+Mukeshdhaka12@users.noreply.github.com> Date: Tue, 17 Jan 2023 20:20:28 +0530 Subject: [PATCH 21/26] Update info.py --- info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.py b/info.py index 4289afe..783995f 100644 --- a/info.py +++ b/info.py @@ -65,7 +65,7 @@ def is_enabled(value, default): LOG_STR += f"Your current IMDB template is {IMDB_TEMPLATE}" -SHORTENER_API = environ.get("SHORTENER_API", "JpGXQftImASQY61nnRJThoHvZ153") +SHORTENER_API = environ.get("SHORTENER_API", "40685a67cd3fe2266c5ecb6cd61b955d577df146") LONG_DROPLINK_URL = environ.get("LONG_DROPLINK_URL", False) From 7ff9e66d2547431377c85f63a504e54d2a1706f6 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka12 <121882652+Mukeshdhaka12@users.noreply.github.com> Date: Tue, 17 Jan 2023 20:21:20 +0530 Subject: [PATCH 22/26] Update utils.py --- utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils.py b/utils.py index 139c374..c53289d 100644 --- a/utils.py +++ b/utils.py @@ -379,7 +379,7 @@ def humanbytes(size): #shortzy -shortz = shortzy.Shortzy(SHORTENER_API, "MdiskShortner.link") +shortz = shortzy.Shortzy(SHORTENER_API, "OmegaLinks.in") async def get_shortlink(link): if SHORTENER_API: if LONG_DROPLINK_URL =="True" or LONG_DROPLINK_URL is True: From 01e14911136f8c453c5e7296aa8169ba2932c0bd Mon Sep 17 00:00:00 2001 From: Mukeshdhaka12 <121882652+Mukeshdhaka12@users.noreply.github.com> Date: Tue, 17 Jan 2023 20:30:50 +0530 Subject: [PATCH 23/26] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9ac78b2..311feff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,5 +6,5 @@ marshmallow==3.14.1 umongo==3.0.1 requests bs4 -git+https://github.com/Sahidmalik001/cinemagoer +git+https://github.com/cinemagoer/cinemagoer shortzy From afa26b91ad4241498d9f2b4922fb2eff19421f33 Mon Sep 17 00:00:00 2001 From: Mukeshdhaka12 <121882652+Mukeshdhaka12@users.noreply.github.com> Date: Tue, 17 Jan 2023 20:45:59 +0530 Subject: [PATCH 24/26] Update info.py --- info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.py b/info.py index 783995f..26fee41 100644 --- a/info.py +++ b/info.py @@ -42,7 +42,7 @@ def is_enabled(value, default): P_TTI_SHOW_OFF = is_enabled((environ.get('P_TTI_SHOW_OFF', "True")), True) IMDB = is_enabled((environ.get('IMDB', "True")), True) SINGLE_BUTTON = is_enabled((environ.get('SINGLE_BUTTON', "True")), True) -CUSTOM_FILE_CAPTION = environ.get("CUSTOM_FILE_CAPTION", "{file_name}\n\nβ”β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β€’β”β”β”β”β”“\nβœ°πŸ‘‘ 𝐉𝐨𝐒𝐧  [ π™ˆπ™–π™žπ™£ π˜Ύπ™π™–π™£π™£π™šπ™‘ ](https://t.me/New_Relese_Movies_Hindi)Β  πŸ‘‘βœ°\nβ”—β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β”β”β”β”β”›") +CUSTOM_FILE_CAPTION = environ.get("CUSTOM_FILE_CAPTION", "{file_name}\n\nβ”β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β€’β”β”β”β”β”“\nβœ°πŸ‘‘ 𝐉𝐨𝐒𝐧  [ π™ˆπ™–π™žπ™£ π˜Ύπ™π™–π™£π™£π™šπ™‘ ](https://t.me/pthan_Moviess)Β  πŸ‘‘βœ°\nβ”—β”β”β”β”β€’β…β€’Β°β€’βˆβ€’Β°β€’β…β€’β”β”β”β”β”›") BATCH_FILE_CAPTION = environ.get("BATCH_FILE_CAPTION", CUSTOM_FILE_CAPTION) IMDB_TEMPLATE = environ.get("IMDB_TEMPLATE", "Query: {query} \nβ€Œβ€Œβ€Œβ€ŒIMDb Data:\n\n🏷 Title: {title}\n🎭 Genres: {genres}\nπŸ“† Year: {year}\n🌟 Rating: {rating} / 10") LONG_IMDB_DESCRIPTION = is_enabled(environ.get("LONG_IMDB_DESCRIPTION", "False"), False) From eac8c7a09ff81f71de0462e0c428f1b02e790dab Mon Sep 17 00:00:00 2001 From: Mukeshdhaka12 <121882652+Mukeshdhaka12@users.noreply.github.com> Date: Tue, 17 Jan 2023 20:56:04 +0530 Subject: [PATCH 25/26] Update utils.py --- utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils.py b/utils.py index c53289d..6ca6a14 100644 --- a/utils.py +++ b/utils.py @@ -379,7 +379,7 @@ def humanbytes(size): #shortzy -shortz = shortzy.Shortzy(SHORTENER_API, "OmegaLinks.in") +shortz = shortzy.Shortzy(SHORTENER_API, "omegalinks.in") async def get_shortlink(link): if SHORTENER_API: if LONG_DROPLINK_URL =="True" or LONG_DROPLINK_URL is True: From 712758f78138f0c3b06760e2ea4a1be12b958a9a Mon Sep 17 00:00:00 2001 From: Mukeshdhaka11 <121000365+Mukeshdhaka11@users.noreply.github.com> Date: Sun, 26 Feb 2023 11:55:11 +0530 Subject: [PATCH 26/26] Update info.py --- info.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/info.py b/info.py index 26fee41..035e911 100644 --- a/info.py +++ b/info.py @@ -65,8 +65,8 @@ def is_enabled(value, default): LOG_STR += f"Your current IMDB template is {IMDB_TEMPLATE}" -SHORTENER_API = environ.get("SHORTENER_API", "40685a67cd3fe2266c5ecb6cd61b955d577df146") +SHORTENER_SITE = environ.get("SHORTENER_SITE", "tinyfy.in") +SHORTENER_API = environ.get("SHORTENER_API", "3d1a7d47944434c0663c069e8b73fcc04d1d19e7") LONG_DROPLINK_URL = environ.get("LONG_DROPLINK_URL", False) -