From 9d1a9fecae1c7cdc4673a31ba89da3ea56941ac2 Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 09:12:38 +0530 Subject: [PATCH 01/16] Create package.json --- package.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 package.json diff --git a/package.json b/package.json new file mode 100644 index 0000000..b89c568 --- /dev/null +++ b/package.json @@ -0,0 +1,20 @@ +{ + "name": "Elsa-Bot", + "version": "1.0.0", + "description": "Telegram bot", + "scripts": { + "build": "echo \"No build specified\" && exit 1", + "test": "echo \"No test specified\" && exit 1", + "start": "node index.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/anthappanorg/Elsa-Bot.git" + }, + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/anthappanorg/Elsa-Bot/issues" + }, + "homepage": "https://github.com/anthappanorg/Elsa-Bot#readme" +} From 7f63fabb936cafcccc065cbcbeda120a53d034a6 Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 09:20:42 +0530 Subject: [PATCH 02/16] Update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index b89c568..7db395d 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "Elsa-Bot", "version": "1.0.0", "description": "Telegram bot", + "Main": "bot.py", "scripts": { "build": "echo \"No build specified\" && exit 1", "test": "echo \"No test specified\" && exit 1", From 068cb26c7d5a80a72e76ce40c34bf25faf060fb3 Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 09:22:06 +0530 Subject: [PATCH 03/16] Create index.js --- index.js | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 index.js diff --git a/index.js b/index.js new file mode 100644 index 0000000..a6bb270 --- /dev/null +++ b/index.js @@ -0,0 +1,7 @@ +const express = require('express') +const app = express() +app.all('/', (req, res) => { + console.log("Just got a request!") + res.send('YO !') +}) +app.listen(process.env.PORT || 3000) From 36d5e593ab38fe4dae6c985c005641b6815d5789 Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 09:50:26 +0530 Subject: [PATCH 04/16] Delete package.json --- package.json | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 package.json diff --git a/package.json b/package.json deleted file mode 100644 index 7db395d..0000000 --- a/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "Elsa-Bot", - "version": "1.0.0", - "description": "Telegram bot", - "Main": "bot.py", - "scripts": { - "build": "echo \"No build specified\" && exit 1", - "test": "echo \"No test specified\" && exit 1", - "start": "node index.js" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/anthappanorg/Elsa-Bot.git" - }, - "author": "", - "license": "ISC", - "bugs": { - "url": "https://github.com/anthappanorg/Elsa-Bot/issues" - }, - "homepage": "https://github.com/anthappanorg/Elsa-Bot#readme" -} From f36fd2d685b0057857881f06b67a3b281c90a138 Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 09:50:37 +0530 Subject: [PATCH 05/16] Delete index.js --- index.js | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 index.js diff --git a/index.js b/index.js deleted file mode 100644 index a6bb270..0000000 --- a/index.js +++ /dev/null @@ -1,7 +0,0 @@ -const express = require('express') -const app = express() -app.all('/', (req, res) => { - console.log("Just got a request!") - res.send('YO !') -}) -app.listen(process.env.PORT || 3000) From a1e4b8bb268776ec2f2c2bdf382885394a6e97ff Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 09:57:02 +0530 Subject: [PATCH 06/16] Create .gitignore --- .gitignore | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..27bc52c --- /dev/null +++ b/.gitignore @@ -0,0 +1,148 @@ +# Personal files +*.session +*.session-journal +.vscode +*test*.py +setup.cfg + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ +config.py +.goutputstream-VAFWB1 +result.json From fbb2ecab17771bc798b8ae68abd98e8ff83fb6a8 Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 10:28:53 +0530 Subject: [PATCH 07/16] 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 0305a85..546ca75 100644 --- a/plugins/commands.py +++ b/plugins/commands.py @@ -360,7 +360,7 @@ async def delete_all_index(bot, message): @Client.on_callback_query(filters.regex(r'^autofilter_delete')) async def delete_all_index_confirm(bot, message): await Media.collection.drop() - await message.answer('♥️ Thank You LazyDeveloper ♥️') + await message.answer('♥️ Elsa-Bot ♥️') await message.message.edit('Succesfully Deleted All The Indexed Files.') From 33dd0a08c84a095e6514db6d60ac5902c6bd30a8 Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 10:45:30 +0530 Subject: [PATCH 08/16] Update pm_filter.py --- plugins/pm_filter.py | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/plugins/pm_filter.py b/plugins/pm_filter.py index 9ebf790..157f04b 100644 --- a/plugins/pm_filter.py +++ b/plugins/pm_filter.py @@ -127,7 +127,7 @@ async def advantage_spoll_choker(bot, query): if not movies: return await query.answer("You are clicking on an old button which is expired.", show_alert=True) movie = movies[(int(movie_))] - await query.answer('Checking for Movie in database...') + await query.answer('wait, Checking for Movie in database...') k = await manual_filters(bot, query.message, text=movie) if k == False: files, offset, total_results = await get_search_results(movie, offset=0, filter=True) @@ -157,20 +157,20 @@ async def cb_handler(client: Client, query: CallbackQuery): title = chat.title except: await query.message.edit_text("Make sure I'm present in your group!!", quote=True) - return await query.answer('🔄 Elsa Bot 🔄') + return else: await query.message.edit_text( "I'm not connected to any groups!\nCheck /connections or connect to any groups", quote=True ) - return await query.answer('🔄 Elsa Bot 🔄') + return elif chat_type in [enums.ChatType.GROUP, enums.ChatType.SUPERGROUP]: grp_id = query.message.chat.id title = query.message.chat.title else: - return await query.answer('🔄 Elsa Bot 🔄') + return st = await client.get_chat_member(grp_id, userid) if (st.status == enums.ChatMemberStatus.OWNER) or (str(userid) in ADMINS): @@ -224,7 +224,7 @@ async def cb_handler(client: Client, query: CallbackQuery): reply_markup=keyboard, parse_mode=enums.ParseMode.MARKDOWN ) - return await query.answer('🔄 Elsa Bot 🔄') + return elif "connectcb" in query.data: await query.answer() @@ -245,7 +245,7 @@ async def cb_handler(client: Client, query: CallbackQuery): ) else: await query.message.edit_text('Some error occurred!!', parse_mode=enums.ParseMode.MARKDOWN) - return await query.answer('🔄 Elsa Bot 🔄') + return elif "disconnect" in query.data: await query.answer() @@ -268,7 +268,7 @@ async def cb_handler(client: Client, query: CallbackQuery): f"Some error occurred!!", parse_mode=enums.ParseMode.MARKDOWN ) - return await query.answer('🔄 Elsa Bot 🔄') + return elif "deletecb" in query.data: await query.answer() @@ -286,7 +286,7 @@ async def cb_handler(client: Client, query: CallbackQuery): f"Some error occurred!!", parse_mode=enums.ParseMode.MARKDOWN ) - return await query.answer('♥️ Elsa Bot ♥️') + return elif query.data == "backcb": await query.answer() @@ -297,7 +297,7 @@ async def cb_handler(client: Client, query: CallbackQuery): await query.message.edit_text( "There are no active connections!! Connect to some groups first.", ) - return await query.answer('♥️ Elsa Bot ♥️') + return buttons = [] for groupid in groupids: try: @@ -366,7 +366,7 @@ async def cb_handler(client: Client, query: CallbackQuery): ) await query.answer('Check PM, I have sent files in pm', show_alert=True) except UserIsBlocked: - await query.answer('Unblock the bot mahn !', show_alert=True) + await query.answer('Unblock the bot man !', show_alert=True) except PeerIdInvalid: await query.answer(url=f"https://t.me/{temp.U_NAME}?start={ident}_{file_id}") except Exception as e: @@ -404,7 +404,7 @@ async def cb_handler(client: Client, query: CallbackQuery): await query.answer() elif query.data == "start": buttons = [[ - InlineKeyboardButton('➕↖️ Add Me To Your Groups ↗️➕', url=f'http://t.me/{temp.U_NAME}?startgroup=true') + 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/Private_Botz') @@ -418,7 +418,6 @@ async def cb_handler(client: Client, query: CallbackQuery): reply_markup=reply_markup, parse_mode=enums.ParseMode.HTML ) - await query.answer('♥️ Thank You LazyDeveloper ♥️') elif query.data == "help": buttons = [[ InlineKeyboardButton('Manual Filter', callback_data='manuelfilter'), @@ -438,7 +437,7 @@ async def cb_handler(client: Client, query: CallbackQuery): ) elif query.data == "about": buttons = [[ - InlineKeyboardButton('🔔 Updates 🤖', url='https://t.me/LazyDeveloper'), + InlineKeyboardButton('🔔 Updates 🤖', url='https://t.me/CodeHouse_TG'), InlineKeyboardButton('♥️ Source', callback_data='source') ], [ InlineKeyboardButton('🏠 Home', callback_data='start'), @@ -565,7 +564,7 @@ async def cb_handler(client: Client, query: CallbackQuery): if str(grp_id) != str(grpid): await query.message.edit("Your Active Connection Has Been Changed. Go To /settings.") - return await query.answer('♥️ ELsa ♥️') + return if status == "True": await save_group_settings(grpid, set_type, False) @@ -612,7 +611,6 @@ async def cb_handler(client: Client, query: CallbackQuery): ] reply_markup = InlineKeyboardMarkup(buttons) await query.message.edit_reply_markup(reply_markup) - await query.answer('♥️ Elsa-Bot ♥️') async def auto_filter(client, msg, spoll=False): From ea0ffa0aa9a0af23c7ee26bcd2cc8882cb435d96 Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 10:50:19 +0530 Subject: [PATCH 09/16] Update commands.py --- plugins/commands.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/commands.py b/plugins/commands.py index 546ca75..16014d4 100644 --- a/plugins/commands.py +++ b/plugins/commands.py @@ -42,10 +42,10 @@ async def start(client, message): await client.send_message(LOG_CHANNEL, script.LOG_TEXT_P.format(message.from_user.id, message.from_user.mention)) if len(message.command) != 2: buttons = [[ - InlineKeyboardButton('➕↖️ Add Me To Your Groups ↗️➕', url=f'http://t.me/{temp.U_NAME}?startgroup=true') + 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/Private_Botz') + InlineKeyboardButton('🔔 Updates 🤖', url='https://t.me/CodeHouse_TG') ],[ InlineKeyboardButton('🙆🏻 Help 🦾', callback_data='help'), InlineKeyboardButton('♥️ About ♥️', callback_data='about') @@ -88,10 +88,10 @@ async def start(client, message): return if len(message.command) == 2 and message.command[1] in ["subscribe", "error", "okay", "help"]: buttons = [[ - InlineKeyboardButton('➕↖️ Add Me To Your Groups ↗️➕', url=f'http://t.me/{temp.U_NAME}?startgroup=true') + 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/Private_Botz') + InlineKeyboardButton('🔔 Updates 🤖', url='https://t.me/CodeHouse_TG') ],[ InlineKeyboardButton('🙆🏻 Help 🦾', callback_data='help'), InlineKeyboardButton('♥️ About ♥️', callback_data='about') @@ -360,7 +360,6 @@ async def delete_all_index(bot, message): @Client.on_callback_query(filters.regex(r'^autofilter_delete')) async def delete_all_index_confirm(bot, message): await Media.collection.drop() - await message.answer('♥️ Elsa-Bot ♥️') await message.message.edit('Succesfully Deleted All The Indexed Files.') From c9ac729ceabf3936bc2c052f931b6ab9af9da113 Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 10:54:03 +0530 Subject: [PATCH 10/16] Update p_ttishow.py --- plugins/p_ttishow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/p_ttishow.py b/plugins/p_ttishow.py index 1b2140e..48549ad 100644 --- a/plugins/p_ttishow.py +++ b/plugins/p_ttishow.py @@ -38,7 +38,7 @@ async def save_group(bot, message): return buttons = [[ InlineKeyboardButton('🤥 Help', url=f"https://t.me/{temp.U_NAME}?start=help"), - InlineKeyboardButton('🔔 Updates', url='https://t.me/Private_Botz') + InlineKeyboardButton('🔔 Updates', url='https://t.me/COdeHouse_TG') ]] reply_markup=InlineKeyboardMarkup(buttons) await message.reply_text( From 0709c323a0a207c3783e209822abda4b40bcb892 Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 10:55:06 +0530 Subject: [PATCH 11/16] 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 157f04b..57c681f 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/Private_Botz') + InlineKeyboardButton('🔔 Updates 🤖', url='https://t.me/COdeHouse_TG') ], [ InlineKeyboardButton('🙆🏻 Help 🦾', callback_data='help'), InlineKeyboardButton('♥️ About ♥️', callback_data='about') From d417ef3df26268d5ebd43bce7477e442ec032843 Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 10:59:23 +0530 Subject: [PATCH 12/16] Update Script.py --- Script.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Script.py b/Script.py index d678d4d..04b4c2b 100644 --- a/Script.py +++ b/Script.py @@ -1,10 +1,10 @@ class script(object): START_TXT = """𝙷𝙴𝙻𝙾 {}, -𝙼𝚈 𝙽𝙰𝙼𝙴 𝙸𝚂 {},\n\n � 𝙲𝙰𝙽 𝙿𝚁𝙾𝚅𝙸𝙳𝙴 𝙼𝙾𝚅𝙸𝙴𝚂, 𝙹𝚄𝚂𝚃 𝙰𝙳𝙳 𝙼𝙴 𝚃𝙾 𝚈𝙾𝚄𝚁 𝙶𝚁𝙾𝚄𝙿 𝙰𝙽𝙳 𝙴𝙽𝙹𝙾𝚈 😍 \n\n...""" +𝙼𝚈 𝙽𝙰𝙼𝙴 𝙸𝚂 {},\n\n � 𝙲𝙰𝙽 𝙿𝚁𝙾𝚅𝙸𝙳𝙴 𝙼𝙾𝚅𝙸𝙴𝚂, 𝙹𝚄𝚂𝚃 𝙰𝙳𝙳 𝙼𝙴 𝚃𝙾 𝚈𝙾𝚄𝚁 𝙶𝚁𝙾𝚄𝙿 𝙰𝙽𝙳 𝙴𝙽𝙹𝙾𝚈 😍 \n @ELSA_ROBOT""" HELP_TXT = """𝙷𝙴𝚈 {} Here is the help for my COMMANDS.""" ABOUT_TXT = """✯ 𝙼𝚈 𝙽𝙰𝙼𝙴: {} -✯ 𝙲𝚁𝙴𝙰𝚃𝙾𝚁: Adwin +✯ 𝙲𝚁𝙴𝙰𝚃𝙾𝚁: Adwin ✯ 𝙻𝙸𝙱𝚁𝙰𝚁𝚈: 𝙿𝚈𝚁𝙾𝙶𝚁𝙰𝙼 ✯ 𝙻𝙰𝙽𝙶𝚄𝙰𝙶𝙴: 𝙿𝚈𝚃𝙷𝙾𝙽 𝟹 ✯ 𝙳𝙰𝚃𝙰 𝙱𝙰𝚂𝙴: 𝙼𝙾𝙽𝙶𝙾 𝙳𝙱 @@ -12,7 +12,7 @@ class script(object): ✯ 𝙱𝚄𝙸𝙻𝙳 𝚂𝚃𝙰𝚃𝚄𝚂: v1.0.1 [ 𝙱𝙴𝚃𝙰 ]""" SOURCE_TXT = """NOTE: - This Bot is an open source project. -- Source - https://github.com/Private-Botz/Elsa-Bot +- Source - https://github.com/CodeHouse-TG/Elsa-Bot DEVS: - Archive_codes""" @@ -40,7 +40,7 @@ class script(object): 3. Buttons should be properly parsed as markdown format URL buttons: -[Button Text](buttonurl:https://t.me/Private_Botz) +[Button Text](buttonurl:https://t.me/CodeHouse_TG) Alert buttons: [Button Text](buttonalert:This is an alert message)""" From 956d6d5f8ab57edb572ef376a549420a7470d949 Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 11:06:37 +0530 Subject: [PATCH 13/16] Update pm_filter.py --- plugins/pm_filter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/pm_filter.py b/plugins/pm_filter.py index 57c681f..9ed92f0 100644 --- a/plugins/pm_filter.py +++ b/plugins/pm_filter.py @@ -427,7 +427,7 @@ async def cb_handler(client: Client, query: CallbackQuery): InlineKeyboardButton('Extra Mods', callback_data='extra') ], [ InlineKeyboardButton('🏠 Home', callback_data='start'), - InlineKeyboardButton('🦠 Status', callback_data='stats') + InlineKeyboardButton('🔮 Status', callback_data='stats') ]] reply_markup = InlineKeyboardMarkup(buttons) await query.message.edit_text( @@ -438,7 +438,7 @@ async def cb_handler(client: Client, query: CallbackQuery): elif query.data == "about": buttons = [[ InlineKeyboardButton('🔔 Updates 🤖', url='https://t.me/CodeHouse_TG'), - InlineKeyboardButton('♥️ Source', callback_data='source') + InlineKeyboardButton('♥️ Source ♥️', callback_data='source') ], [ InlineKeyboardButton('🏠 Home', callback_data='start'), InlineKeyboardButton('🔐 Close', callback_data='close_data') @@ -706,7 +706,7 @@ async def auto_filter(client, msg, spoll=False): **locals() ) else: - cap = f"Baby, Here is what i found for your query {search}" + 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], From 2e66cc315e9521dfd1b697b95aab38f9228b086d Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 11:11:02 +0530 Subject: [PATCH 14/16] Update pm_filter.py --- plugins/pm_filter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/pm_filter.py b/plugins/pm_filter.py index 9ed92f0..40c5001 100644 --- a/plugins/pm_filter.py +++ b/plugins/pm_filter.py @@ -762,8 +762,8 @@ async def advantage_spell_chok(msg): movielist += [(re.sub(r'(\-|\(|\)|_)', '', i, flags=re.IGNORECASE)).strip() for i in gs_parsed] movielist = list(dict.fromkeys(movielist)) # removing duplicates if not movielist: - k = await msg.reply("Hey {Mention} ! i coudn't found anything in your {query}, 🤷‍♀️!\nPlease check your spelling once again 🤦‍♀️... or \n Discuss your problem with our admin here 👉 @MH_Feedback_bot ") - await asyncio.sleep(8) + k = await msg.reply("I couldn't find anything related to that🤷‍♀️!\nPlease check your spelling once again 🤦‍♀️... \n Report admin our admin here 👉 @MH_Feedback_bot ") + await asyncio.sleep(15) await k.delete() return SPELL_CHECK[msg.id] = movielist @@ -774,7 +774,7 @@ 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("Hey {Mention} ! i coudn't found anything in your {query}, 🤷‍♀️!\nPlease check your spelling once again 🤦‍♀️... or \n Discuss your problem with our admin here 👉 @MH_Feedback_bot ", + await msg.reply("I couldn't find anything related to that🤷‍♀️!\nPlease check your spelling once again 🤦‍♀️... \n Report admin our admin here 👉 @MH_Feedback_bot ", reply_markup=InlineKeyboardMarkup(btn)) From 0ff672f78ff79133dc69bf05817ee89c59c1deb5 Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 11:26:53 +0530 Subject: [PATCH 15/16] Update inline.py --- plugins/inline.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/plugins/inline.py b/plugins/inline.py index 4ba9af3..faa2a3f 100644 --- a/plugins/inline.py +++ b/plugins/inline.py @@ -10,11 +10,8 @@ cache_time = 0 if AUTH_USERS or AUTH_CHANNEL else CACHE_TIME async def inline_users(query: InlineQuery): - if AUTH_USERS: - if query.from_user and query.from_user.id in AUTH_USERS: - return True - else: - return False + if AUTH_USERS and query.from_user and query.from_user.id in AUTH_USERS: + return True if query.from_user and query.from_user.id not in temp.BANNED_USERS: return True return False @@ -26,14 +23,14 @@ async def answer(bot, query): if not await inline_users(query): await query.answer(results=[], cache_time=0, - switch_pm_text='Results', + switch_pm_text='okDa', switch_pm_parameter="hehe") return if AUTH_CHANNEL and not await is_subscribed(bot, query): await query.answer(results=[], cache_time=0, - switch_pm_text='You have to subscribe main channel to use the bot', + switch_pm_text='You have to subscribe my channel to use the bot', switch_pm_parameter="subscribe") return @@ -88,6 +85,10 @@ async def answer(bot, query): pass except Exception as e: logging.exception(str(e)) + await query.answer(results=[], is_personal=True, + cache_time=cache_time, + switch_pm_text=str(e)[:63], + switch_pm_parameter="error") else: switch_pm_text = f'{emoji.CROSS_MARK} No results' if string: @@ -108,6 +109,3 @@ def get_reply_markup(query): ] return InlineKeyboardMarkup(buttons) - - - From 2aa83661a30cd7d006b409eb9649a4f0919af80c Mon Sep 17 00:00:00 2001 From: Annuay Raj-k <100431877+anthappanorg@users.noreply.github.com> Date: Sun, 18 Dec 2022 11:34:01 +0530 Subject: [PATCH 16/16] Update Script.py --- Script.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Script.py b/Script.py index 04b4c2b..4226782 100644 --- a/Script.py +++ b/Script.py @@ -1,6 +1,6 @@ class script(object): START_TXT = """𝙷𝙴𝙻𝙾 {}, -𝙼𝚈 𝙽𝙰𝙼𝙴 𝙸𝚂 {},\n\n � 𝙲𝙰𝙽 𝙿𝚁𝙾𝚅𝙸𝙳𝙴 𝙼𝙾𝚅𝙸𝙴𝚂, 𝙹𝚄𝚂𝚃 𝙰𝙳𝙳 𝙼𝙴 𝚃𝙾 𝚈𝙾𝚄𝚁 𝙶𝚁𝙾𝚄𝙿 𝙰𝙽𝙳 𝙴𝙽𝙹𝙾𝚈 😍 \n @ELSA_ROBOT""" +𝙼𝚈 𝙽𝙰𝙼𝙴 𝙸𝚂 {},\n\n � 𝙲𝙰𝙽 𝙿𝚁𝙾𝚅𝙸𝙳𝙴 𝙼𝙾𝚅𝙸𝙴𝚂, 𝙹𝚄𝚂𝚃 𝙰𝙳𝙳 𝙼𝙴 𝚃𝙾 𝚈𝙾𝚄𝚁 𝙶𝚁𝙾𝚄𝙿 𝙰𝙽𝙳 𝙴𝙽𝙹𝙾𝚈 😍 \n @LISA_ROBOT""" HELP_TXT = """𝙷𝙴𝚈 {} Here is the help for my COMMANDS.""" ABOUT_TXT = """✯ 𝙼𝚈 𝙽𝙰𝙼𝙴: {} @@ -18,7 +18,7 @@ class script(object): - Archive_codes""" MANUELFILTER_TXT = """Help: Filters -- Filter is the feature were users can set automated replies for a particular keyword and LazyPriness will respond whenever that keyword hits the message +- Filter is the feature were users can set automated replies for a particular keyword and Bot will respond whenever that keyword hits the message NOTE: 1. BOT should have admin privillage.