From cbadfbe7c241ac5a740d85c67478ea2ff9a5a1fb Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Fri, 21 Jul 2023 20:00:36 +0530 Subject: [PATCH 01/23] Update info.py --- info.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/info.py b/info.py index e5b13ee..4b157f2 100644 --- a/info.py +++ b/info.py @@ -1,8 +1,8 @@ -API_ID = -API_HASH = "" -BOT_TOKEN = "" -SESSION = "" -DATABASE_URI = "" -LOG_CHANNEL = -1001884373226 -ADMIN = 1350642629 +API_ID = 25830285 +API_HASH = "0cbcabbf1b9c56a4dfc4b8950d584a2a" +BOT_TOKEN = "6223100452:AAEs6uAxSPJzCh54bhAE-QZSMtuRoTEFEg8" +SESSION = "BQGKI40AwawvpZtk71oauU9kev_oPsIbxu9Opw734HvCBryu3mhzeaTZ0kVsaK6BVMfSRLdbZ_5_B5rPOqbizUB2Aio0CNzkGzZsAQEB5r0YiIzSxIcEVLywLaINg9LDvaGYn8y2rFRPTjSnNDhO0J3jOUCKQKMhxeyCL9VRqaqqUi8tuZrNnPuCUQE1AzMB3gN4uMY3m7ZJN1_ai7GdgCH51Q8meexX4sv8vzKAzPyqa-VLLRG_MHifqdzh6_pxe3D7dRFzLt5Qkfwqyo64aZvGhiiYmozvNZYIYcemYnhGIOYFIE2qn5OWE8THUuo8AoZEpVmhUE_kYsb_CEeUnItvxwCHHgAAAAFrQhqtAA" +DATABASE_URI = "mongodb+srv://786:786@cluster0.i6dbky4.mongodb.net/?retryWrites=true&w=majority" +LOG_CHANNEL = -1001944835958 +ADMIN = 6094461613 CHANNEL = "@GreyMatter_Bots" From 30dcf92a395775030fddf38adcbda899e2f40ed1 Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Fri, 21 Jul 2023 20:02:20 +0530 Subject: [PATCH 02/23] Update script.py --- utils/script.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/script.py b/utils/script.py index 44e7c52..e3dd339 100644 --- a/utils/script.py +++ b/utils/script.py @@ -7,7 +7,7 @@ class script(object): HELP = """To Use me In A Group - Add me in your group & channel with all permissions. -- Send /verify in group & wait for It To Accept Or Directly Contact To Owner After Request @GreyMatter_Bots. +- Send /verify in group & wait for It To Accept Or Directly Contact To Owner After Request @ROYAL_PREET_MEHRA_786. - After verification send /connect YourChannelID - Example : /connect -100xxxxxxxxxx - Done βœ…. Enjoy πŸ’œβ€ ) From cfd30876cb16410c0cfd056793d48f2e73b42621 Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Sat, 22 Jul 2023 09:13:34 +0530 Subject: [PATCH 03/23] Update info.py --- info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.py b/info.py index 4b157f2..15d7aa2 100644 --- a/info.py +++ b/info.py @@ -2,7 +2,7 @@ API_HASH = "0cbcabbf1b9c56a4dfc4b8950d584a2a" BOT_TOKEN = "6223100452:AAEs6uAxSPJzCh54bhAE-QZSMtuRoTEFEg8" SESSION = "BQGKI40AwawvpZtk71oauU9kev_oPsIbxu9Opw734HvCBryu3mhzeaTZ0kVsaK6BVMfSRLdbZ_5_B5rPOqbizUB2Aio0CNzkGzZsAQEB5r0YiIzSxIcEVLywLaINg9LDvaGYn8y2rFRPTjSnNDhO0J3jOUCKQKMhxeyCL9VRqaqqUi8tuZrNnPuCUQE1AzMB3gN4uMY3m7ZJN1_ai7GdgCH51Q8meexX4sv8vzKAzPyqa-VLLRG_MHifqdzh6_pxe3D7dRFzLt5Qkfwqyo64aZvGhiiYmozvNZYIYcemYnhGIOYFIE2qn5OWE8THUuo8AoZEpVmhUE_kYsb_CEeUnItvxwCHHgAAAAFrQhqtAA" -DATABASE_URI = "mongodb+srv://786:786@cluster0.i6dbky4.mongodb.net/?retryWrites=true&w=majority" +DATABASE_URI = "mongodb+srv://hegodal811:obE9Ljvn0AHXbWeL@cluster0.lls1gnb.mongodb.net/?retryWrites=true&w=majority" LOG_CHANNEL = -1001944835958 ADMIN = 6094461613 CHANNEL = "@GreyMatter_Bots" From 5769e02bdcd6b67e9fa8a43108d2f1a535fa81ba Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Sat, 22 Jul 2023 09:20:38 +0530 Subject: [PATCH 04/23] Update info.py --- info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.py b/info.py index 15d7aa2..d37b8dd 100644 --- a/info.py +++ b/info.py @@ -1,6 +1,6 @@ API_ID = 25830285 API_HASH = "0cbcabbf1b9c56a4dfc4b8950d584a2a" -BOT_TOKEN = "6223100452:AAEs6uAxSPJzCh54bhAE-QZSMtuRoTEFEg8" +BOT_TOKEN = "6360916658:AAEoQrtSA0DlvzEPL1jZHSxGfZIHeNewlvw" SESSION = "BQGKI40AwawvpZtk71oauU9kev_oPsIbxu9Opw734HvCBryu3mhzeaTZ0kVsaK6BVMfSRLdbZ_5_B5rPOqbizUB2Aio0CNzkGzZsAQEB5r0YiIzSxIcEVLywLaINg9LDvaGYn8y2rFRPTjSnNDhO0J3jOUCKQKMhxeyCL9VRqaqqUi8tuZrNnPuCUQE1AzMB3gN4uMY3m7ZJN1_ai7GdgCH51Q8meexX4sv8vzKAzPyqa-VLLRG_MHifqdzh6_pxe3D7dRFzLt5Qkfwqyo64aZvGhiiYmozvNZYIYcemYnhGIOYFIE2qn5OWE8THUuo8AoZEpVmhUE_kYsb_CEeUnItvxwCHHgAAAAFrQhqtAA" DATABASE_URI = "mongodb+srv://hegodal811:obE9Ljvn0AHXbWeL@cluster0.lls1gnb.mongodb.net/?retryWrites=true&w=majority" LOG_CHANNEL = -1001944835958 From 6d701e49d87c1bb0113686d6e15345af800df243 Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Sat, 22 Jul 2023 09:26:16 +0530 Subject: [PATCH 05/23] Update info.py --- info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.py b/info.py index d37b8dd..99d11f3 100644 --- a/info.py +++ b/info.py @@ -3,6 +3,6 @@ BOT_TOKEN = "6360916658:AAEoQrtSA0DlvzEPL1jZHSxGfZIHeNewlvw" SESSION = "BQGKI40AwawvpZtk71oauU9kev_oPsIbxu9Opw734HvCBryu3mhzeaTZ0kVsaK6BVMfSRLdbZ_5_B5rPOqbizUB2Aio0CNzkGzZsAQEB5r0YiIzSxIcEVLywLaINg9LDvaGYn8y2rFRPTjSnNDhO0J3jOUCKQKMhxeyCL9VRqaqqUi8tuZrNnPuCUQE1AzMB3gN4uMY3m7ZJN1_ai7GdgCH51Q8meexX4sv8vzKAzPyqa-VLLRG_MHifqdzh6_pxe3D7dRFzLt5Qkfwqyo64aZvGhiiYmozvNZYIYcemYnhGIOYFIE2qn5OWE8THUuo8AoZEpVmhUE_kYsb_CEeUnItvxwCHHgAAAAFrQhqtAA" DATABASE_URI = "mongodb+srv://hegodal811:obE9Ljvn0AHXbWeL@cluster0.lls1gnb.mongodb.net/?retryWrites=true&w=majority" -LOG_CHANNEL = -1001944835958 +LOG_CHANNEL = -1001885390961 ADMIN = 6094461613 CHANNEL = "@GreyMatter_Bots" From 06f23307632a01af1e84df025b7e1ca929ff31de Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Sat, 22 Jul 2023 09:43:12 +0530 Subject: [PATCH 06/23] Update info.py --- info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.py b/info.py index 99d11f3..0783dca 100644 --- a/info.py +++ b/info.py @@ -1,6 +1,6 @@ API_ID = 25830285 API_HASH = "0cbcabbf1b9c56a4dfc4b8950d584a2a" -BOT_TOKEN = "6360916658:AAEoQrtSA0DlvzEPL1jZHSxGfZIHeNewlvw" +BOT_TOKEN = "6575468895:AAEMLGs5nE89TmLwOZhUZYi9eICge9BneUo" SESSION = "BQGKI40AwawvpZtk71oauU9kev_oPsIbxu9Opw734HvCBryu3mhzeaTZ0kVsaK6BVMfSRLdbZ_5_B5rPOqbizUB2Aio0CNzkGzZsAQEB5r0YiIzSxIcEVLywLaINg9LDvaGYn8y2rFRPTjSnNDhO0J3jOUCKQKMhxeyCL9VRqaqqUi8tuZrNnPuCUQE1AzMB3gN4uMY3m7ZJN1_ai7GdgCH51Q8meexX4sv8vzKAzPyqa-VLLRG_MHifqdzh6_pxe3D7dRFzLt5Qkfwqyo64aZvGhiiYmozvNZYIYcemYnhGIOYFIE2qn5OWE8THUuo8AoZEpVmhUE_kYsb_CEeUnItvxwCHHgAAAAFrQhqtAA" DATABASE_URI = "mongodb+srv://hegodal811:obE9Ljvn0AHXbWeL@cluster0.lls1gnb.mongodb.net/?retryWrites=true&w=majority" LOG_CHANNEL = -1001885390961 From eb75b688e5dd91848681713e479529d55d68461b Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Sat, 22 Jul 2023 09:43:39 +0530 Subject: [PATCH 07/23] Update info.py --- info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.py b/info.py index 0783dca..b6ce899 100644 --- a/info.py +++ b/info.py @@ -3,6 +3,6 @@ BOT_TOKEN = "6575468895:AAEMLGs5nE89TmLwOZhUZYi9eICge9BneUo" SESSION = "BQGKI40AwawvpZtk71oauU9kev_oPsIbxu9Opw734HvCBryu3mhzeaTZ0kVsaK6BVMfSRLdbZ_5_B5rPOqbizUB2Aio0CNzkGzZsAQEB5r0YiIzSxIcEVLywLaINg9LDvaGYn8y2rFRPTjSnNDhO0J3jOUCKQKMhxeyCL9VRqaqqUi8tuZrNnPuCUQE1AzMB3gN4uMY3m7ZJN1_ai7GdgCH51Q8meexX4sv8vzKAzPyqa-VLLRG_MHifqdzh6_pxe3D7dRFzLt5Qkfwqyo64aZvGhiiYmozvNZYIYcemYnhGIOYFIE2qn5OWE8THUuo8AoZEpVmhUE_kYsb_CEeUnItvxwCHHgAAAAFrQhqtAA" DATABASE_URI = "mongodb+srv://hegodal811:obE9Ljvn0AHXbWeL@cluster0.lls1gnb.mongodb.net/?retryWrites=true&w=majority" -LOG_CHANNEL = -1001885390961 +LOG_CHANNEL = -1001830551521 ADMIN = 6094461613 CHANNEL = "@GreyMatter_Bots" From df54b9b96c16bc40eb87f999066d0f2ca4202904 Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Sat, 22 Jul 2023 20:30:34 +0530 Subject: [PATCH 08/23] Update info.py --- info.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/info.py b/info.py index b6ce899..de10b5c 100644 --- a/info.py +++ b/info.py @@ -1,8 +1,8 @@ API_ID = 25830285 API_HASH = "0cbcabbf1b9c56a4dfc4b8950d584a2a" -BOT_TOKEN = "6575468895:AAEMLGs5nE89TmLwOZhUZYi9eICge9BneUo" +BOT_TOKEN = "5931458114:AAEGFZnSjsbw6Mlc7Tw149C2en76DpoPXwE" SESSION = "BQGKI40AwawvpZtk71oauU9kev_oPsIbxu9Opw734HvCBryu3mhzeaTZ0kVsaK6BVMfSRLdbZ_5_B5rPOqbizUB2Aio0CNzkGzZsAQEB5r0YiIzSxIcEVLywLaINg9LDvaGYn8y2rFRPTjSnNDhO0J3jOUCKQKMhxeyCL9VRqaqqUi8tuZrNnPuCUQE1AzMB3gN4uMY3m7ZJN1_ai7GdgCH51Q8meexX4sv8vzKAzPyqa-VLLRG_MHifqdzh6_pxe3D7dRFzLt5Qkfwqyo64aZvGhiiYmozvNZYIYcemYnhGIOYFIE2qn5OWE8THUuo8AoZEpVmhUE_kYsb_CEeUnItvxwCHHgAAAAFrQhqtAA" DATABASE_URI = "mongodb+srv://hegodal811:obE9Ljvn0AHXbWeL@cluster0.lls1gnb.mongodb.net/?retryWrites=true&w=majority" -LOG_CHANNEL = -1001830551521 +LOG_CHANNEL = -1001885390961 ADMIN = 6094461613 -CHANNEL = "@GreyMatter_Bots" +CHANNEL = "@Movies_channel_7863" From 8247f66be18cd054d8a06f8ac6a48fcd84512908 Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Sun, 23 Jul 2023 15:41:18 +0530 Subject: [PATCH 09/23] Update README.md --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ab69d5b..4973998 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,11 @@ fsub - Add a Force Subscribe Channel connections - Get connected channels list ``` -#### Credits :- +## Deploy + +[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/PREETMEHRA73638/Channel-Filter-Bot) -[CyniteOfficial](https://github.com/cyniteofficial) - Developer +#### Credits :- +[CyniteOfficial](https://github.com/cyniteofficial) - Develo [@GreyMatter_Bots](https://www.telegram.dog/GreyMatter_Bots) - Me For Promoting This Open Source Project. From f3cb5236b8403614b54e9f30148de9165779d3e2 Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Tue, 14 Nov 2023 17:14:48 +0530 Subject: [PATCH 10/23] Update main.py --- main.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index cd642f0..087b5b4 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,9 @@ from client import Bot - +from pyrogram import Client, filters, idle +from pyrogram.errors import QueryIdInvalid +from pyrogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton, CallbackQuery, InlineQuery, InlineQueryResultArticle, \ + InputTextMessageContent +from plugins. print("Bot Started πŸ’₯") Bot().run() From dac12fd1dacd81acfcdfdeff96037dec9071c54c Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Tue, 14 Nov 2023 17:21:51 +0530 Subject: [PATCH 11/23] Update main.py --- main.py | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index 087b5b4..b8a32fd 100644 --- a/main.py +++ b/main.py @@ -3,7 +3,57 @@ from pyrogram.errors import QueryIdInvalid from pyrogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton, CallbackQuery, InlineQuery, InlineQueryResultArticle, \ InputTextMessageContent -from plugins. +from plugins.fsub.py import fsub.py + +# Bot Client for Inline Search +Bot = Client( + session_name=Config.BOT_SESSION_NAME, + api_id=Config.API_ID, + api_hash=Config.API_HASH, + bot_token=Config.BOT_TOKEN +) + +# User Client for Searching in Channel. +User = Client( + session_name=Config.USER_SESSION_STRING, + api_id=Config.API_ID, + api_hash=Config.API_HASH +) + +@Bot.on_message(filters.incoming) +async def inline_handlers(_, event: Message): + if event.text == '/start': + return + answers = f'**Searching For "{event.text}" πŸ”**' + async for message in User.search_messages(chat_id=Config.CHANNEL_ID, limit=50, query=event.text): + if message.text: + thumb = None + f_text = message.text + msg_text = message.text.html + if "|||" in message.text: + f_text = message.text.split("|||", 1)[0] + msg_text = message.text.html.split("|||", 1)[0] + answers += f'**🍿 Title ➠ ' + '' + f_text.split("\n", 1)[0] + '' + '\n\nπŸ“œ About ➠ ' + '' + f_text.split("\n", 2)[-1] + ' \n\nβ–°β–±β–°β–±β–°β–±β–°β–±β–°β–±β–°β–±β–°β–±\nLink Will Auto Delete In 60Sec...⏰\nβ–°β–±β–°β–±β–°β–±β–°β–±β–°β–±β–°β–±β–°β–±\n\n**' + try: + msg = await event.reply_text(answers) + await asyncio.sleep(60) + await event.delete() + await msg.delete() + except: + print(f"[{Config.BOT_SESSION_NAME}] - Failed to Answer - {event.from_user.first_name}") + + +# Start Clients +Bot.start() +User.start() +# Loop Clients till Disconnects +idle() +# After Disconnects, +# Stop Clients +Bot.stop() +User.stop() + + print("Bot Started πŸ’₯") Bot().run() From bb67321c1c89ebb19fc8cb42cd48b7f4a7166ed2 Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Tue, 14 Nov 2023 17:22:37 +0530 Subject: [PATCH 12/23] Update main.py --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index b8a32fd..4dd83ac 100644 --- a/main.py +++ b/main.py @@ -3,7 +3,7 @@ from pyrogram.errors import QueryIdInvalid from pyrogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton, CallbackQuery, InlineQuery, InlineQueryResultArticle, \ InputTextMessageContent -from plugins.fsub.py import fsub.py +from plugins.fsub import fsub # Bot Client for Inline Search Bot = Client( From 28689c77c11c256f091b4e44852361475cb293e4 Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Tue, 14 Nov 2023 17:25:16 +0530 Subject: [PATCH 13/23] Update info.py --- info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.py b/info.py index de10b5c..1c56197 100644 --- a/info.py +++ b/info.py @@ -1,6 +1,6 @@ API_ID = 25830285 API_HASH = "0cbcabbf1b9c56a4dfc4b8950d584a2a" -BOT_TOKEN = "5931458114:AAEGFZnSjsbw6Mlc7Tw149C2en76DpoPXwE" +BOT_TOKEN = "6643363347:AAGt8cOiwVRVHMM9fHvqFnfcG1J0Gn9YtDw" SESSION = "BQGKI40AwawvpZtk71oauU9kev_oPsIbxu9Opw734HvCBryu3mhzeaTZ0kVsaK6BVMfSRLdbZ_5_B5rPOqbizUB2Aio0CNzkGzZsAQEB5r0YiIzSxIcEVLywLaINg9LDvaGYn8y2rFRPTjSnNDhO0J3jOUCKQKMhxeyCL9VRqaqqUi8tuZrNnPuCUQE1AzMB3gN4uMY3m7ZJN1_ai7GdgCH51Q8meexX4sv8vzKAzPyqa-VLLRG_MHifqdzh6_pxe3D7dRFzLt5Qkfwqyo64aZvGhiiYmozvNZYIYcemYnhGIOYFIE2qn5OWE8THUuo8AoZEpVmhUE_kYsb_CEeUnItvxwCHHgAAAAFrQhqtAA" DATABASE_URI = "mongodb+srv://hegodal811:obE9Ljvn0AHXbWeL@cluster0.lls1gnb.mongodb.net/?retryWrites=true&w=majority" LOG_CHANNEL = -1001885390961 From a3c3e3d814cb0bbda6c337ac66352bdde15c2408 Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Tue, 14 Nov 2023 17:27:51 +0530 Subject: [PATCH 14/23] Update info.py --- info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.py b/info.py index 1c56197..fc75e82 100644 --- a/info.py +++ b/info.py @@ -3,6 +3,6 @@ BOT_TOKEN = "6643363347:AAGt8cOiwVRVHMM9fHvqFnfcG1J0Gn9YtDw" SESSION = "BQGKI40AwawvpZtk71oauU9kev_oPsIbxu9Opw734HvCBryu3mhzeaTZ0kVsaK6BVMfSRLdbZ_5_B5rPOqbizUB2Aio0CNzkGzZsAQEB5r0YiIzSxIcEVLywLaINg9LDvaGYn8y2rFRPTjSnNDhO0J3jOUCKQKMhxeyCL9VRqaqqUi8tuZrNnPuCUQE1AzMB3gN4uMY3m7ZJN1_ai7GdgCH51Q8meexX4sv8vzKAzPyqa-VLLRG_MHifqdzh6_pxe3D7dRFzLt5Qkfwqyo64aZvGhiiYmozvNZYIYcemYnhGIOYFIE2qn5OWE8THUuo8AoZEpVmhUE_kYsb_CEeUnItvxwCHHgAAAAFrQhqtAA" DATABASE_URI = "mongodb+srv://hegodal811:obE9Ljvn0AHXbWeL@cluster0.lls1gnb.mongodb.net/?retryWrites=true&w=majority" -LOG_CHANNEL = -1001885390961 +LOG_CHANNEL = -1001961336094 ADMIN = 6094461613 CHANNEL = "@Movies_channel_7863" From ddc1a1ebfc5a3bff38b4d17bcbc5700bd27b427d Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Tue, 14 Nov 2023 18:32:22 +0530 Subject: [PATCH 15/23] Update search.py --- plugins/search.py | 133 ++++++++++++++++------------------------------ 1 file changed, 47 insertions(+), 86 deletions(-) diff --git a/plugins/search.py b/plugins/search.py index ae51925..227bf4b 100644 --- a/plugins/search.py +++ b/plugins/search.py @@ -1,93 +1,54 @@ import asyncio -from info import * -from utils import * -from time import time -from client import User -from pyrogram import Client, filters -from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton +from pyrogram import Client, filters, idle +from pyrogram.errors import QueryIdInvalid +from pyrogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton, CallbackQuery, InlineQuery, InlineQueryResultArticle, \ + InputTextMessageContent +from plugins.fsub import fsub -@Client.on_message(filters.text & filters.group & filters.incoming & ~filters.command(["verify", "connect", "id"])) -async def search(bot, message): - f_sub = await force_sub(bot, message) - if f_sub==False: - return - channels = (await get_group(message.chat.id))["channels"] - if bool(channels)==False: - return - if message.text.startswith("/"): - return - query = message.text - head = "Here is the results πŸ‘‡\n\nPromoted By @GreyMatter_Bots\n\n" - results = "" - try: - for channel in channels: - async for msg in User.search_messages(chat_id=channel, query=query): - name = (msg.text or msg.caption).split("\n")[0] - if name in results: - continue - results += f"♻️ {name}\nπŸ”— {msg.link}\n\n" - if bool(results)==False: - movies = await search_imdb(query) - buttons = [] - for movie in movies: - buttons.append([InlineKeyboardButton(movie['title'], callback_data=f"recheck_{movie['id']}")]) - msg = await message.reply_photo(photo="https://telegra.ph/file/cf6706158b0bfaf436f54.jpg", - caption="I Couldn't find anything related to Your QueryπŸ˜•.\nDid you mean any of these?", - reply_markup=InlineKeyboardMarkup(buttons)) - else: - msg = await message.reply_text(text=head+results, disable_web_page_preview=True) - _time = (int(time()) + (15*60)) - await save_dlt_message(msg, _time) - except: - pass - +# Bot Client for Inline Search +Bot = Client( + session_name=Config.BOT_SESSION_NAME, + api_id=Config.API_ID, + api_hash=Config.API_HASH, + bot_token=Config.BOT_TOKEN +) +# User Client for Searching in Channel. +User = Client( + session_name=Config.USER_SESSION_STRING, + api_id=Config.API_ID, + api_hash=Config.API_HASH +) -@Client.on_callback_query(filters.regex(r"^recheck")) -async def recheck(bot, update): - clicked = update.from_user.id - try: - typed = update.message.reply_to_message.from_user.id - except: - return await update.message.delete(2) - if clicked != typed: - return await update.answer("That's not for you! πŸ‘€", show_alert=True) - - m=await update.message.edit("Searching..πŸ’₯") - id = update.data.split("_")[-1] - query = await search_imdb(id) - channels = (await get_group(update.message.chat.id))["channels"] - head = "I Have Searched Movie With Wrong Spelling But Take care next time πŸ‘‡\n\nPromoted By @GreyMatter_Bots\n\n" - results = "" +@Bot.on_message(filters.incoming) +async def inline_handlers(_, event: Message): + if event.text == '/start': + return + answers = f'**Searching For "{event.text}" πŸ”**' + async for message in User.search_messages(chat_id=Config.CHANNEL_ID, limit=50, query=event.text): + if message.text: + thumb = None + f_text = message.text + msg_text = message.text.html + if "|||" in message.text: + f_text = message.text.split("|||", 1)[0] + msg_text = message.text.html.split("|||", 1)[0] + answers += f'**🍿 Title ➠ ' + '' + f_text.split("\n", 1)[0] + '' + '\n\nπŸ“œ About ➠ ' + '' + f_text.split("\n", 2)[-1] + ' \n\nβ–°β–±β–°β–±β–°β–±β–°β–±β–°β–±β–°β–±β–°β–±\nLink Will Auto Delete In 60Sec...⏰\nβ–°β–±β–°β–±β–°β–±β–°β–±β–°β–±β–°β–±β–°β–±\n\n**' try: - for channel in channels: - async for msg in User.search_messages(chat_id=channel, query=query): - name = (msg.text or msg.caption).split("\n")[0] - if name in results: - continue - results += f"β™»οΈπŸΏ {name}\n\nπŸ”— {msg.link}\n\n" - if bool(results)==False: - return await update.message.edit("Still no results found! Please Request To Group Admin", reply_markup=InlineKeyboardMarkup([[InlineKeyboardButton("🎯 Request To Admin 🎯", callback_data=f"request_{id}")]])) - await update.message.edit(text=head+results, disable_web_page_preview=True) - except Exception as e: - await update.message.edit(f"❌ Error: `{e}`") - - -@Client.on_callback_query(filters.regex(r"^request")) -async def request(bot, update): - clicked = update.from_user.id - try: - typed = update.message.reply_to_message.from_user.id + msg = await event.reply_text(answers) + await asyncio.sleep(60) + await event.delete() + await msg.delete() except: - return await update.message.delete() - if clicked != typed: - return await update.answer("That's not for you! πŸ‘€", show_alert=True) + print(f"[{Config.BOT_SESSION_NAME}] - Failed to Answer - {event.from_user.first_name}") + - admin = (await get_group(update.message.chat.id))["user_id"] - id = update.data.split("_")[1] - name = await search_imdb(id) - url = "https://www.imdb.com/title/tt"+id - text = f"#RequestFromYourGroup\n\nName: {name}\nIMDb: {url}" - await bot.send_message(chat_id=admin, text=text, disable_web_page_preview=True) - await update.answer("βœ… Request Sent To Admin", show_alert=True) - await update.message.delete(60) +# Start Clients +Bot.start() +User.start() +# Loop Clients till Disconnects +idle() +# After Disconnects, +# Stop Clients +Bot.stop() +User.stop() From a3171068210ca1cb1965c7c44526798cbacb739f Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Tue, 14 Nov 2023 18:38:34 +0530 Subject: [PATCH 16/23] Update main.py --- main.py | 55 ------------------------------------------------------- 1 file changed, 55 deletions(-) diff --git a/main.py b/main.py index 4dd83ac..6e8f2fa 100644 --- a/main.py +++ b/main.py @@ -1,59 +1,4 @@ from client import Bot -from pyrogram import Client, filters, idle -from pyrogram.errors import QueryIdInvalid -from pyrogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton, CallbackQuery, InlineQuery, InlineQueryResultArticle, \ - InputTextMessageContent -from plugins.fsub import fsub - -# Bot Client for Inline Search -Bot = Client( - session_name=Config.BOT_SESSION_NAME, - api_id=Config.API_ID, - api_hash=Config.API_HASH, - bot_token=Config.BOT_TOKEN -) - -# User Client for Searching in Channel. -User = Client( - session_name=Config.USER_SESSION_STRING, - api_id=Config.API_ID, - api_hash=Config.API_HASH -) - -@Bot.on_message(filters.incoming) -async def inline_handlers(_, event: Message): - if event.text == '/start': - return - answers = f'**Searching For "{event.text}" πŸ”**' - async for message in User.search_messages(chat_id=Config.CHANNEL_ID, limit=50, query=event.text): - if message.text: - thumb = None - f_text = message.text - msg_text = message.text.html - if "|||" in message.text: - f_text = message.text.split("|||", 1)[0] - msg_text = message.text.html.split("|||", 1)[0] - answers += f'**🍿 Title ➠ ' + '' + f_text.split("\n", 1)[0] + '' + '\n\nπŸ“œ About ➠ ' + '' + f_text.split("\n", 2)[-1] + ' \n\nβ–°β–±β–°β–±β–°β–±β–°β–±β–°β–±β–°β–±β–°β–±\nLink Will Auto Delete In 60Sec...⏰\nβ–°β–±β–°β–±β–°β–±β–°β–±β–°β–±β–°β–±β–°β–±\n\n**' - try: - msg = await event.reply_text(answers) - await asyncio.sleep(60) - await event.delete() - await msg.delete() - except: - print(f"[{Config.BOT_SESSION_NAME}] - Failed to Answer - {event.from_user.first_name}") - - -# Start Clients -Bot.start() -User.start() -# Loop Clients till Disconnects -idle() -# After Disconnects, -# Stop Clients -Bot.stop() -User.stop() - print("Bot Started πŸ’₯") Bot().run() - From 0de4c4eb0f160cbdd25ef823938d4c210c6f50be Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Tue, 14 Nov 2023 18:46:16 +0530 Subject: [PATCH 17/23] Update search.py --- plugins/search.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/search.py b/plugins/search.py index 227bf4b..bef5f8c 100644 --- a/plugins/search.py +++ b/plugins/search.py @@ -3,7 +3,6 @@ from pyrogram.errors import QueryIdInvalid from pyrogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton, CallbackQuery, InlineQuery, InlineQueryResultArticle, \ InputTextMessageContent -from plugins.fsub import fsub # Bot Client for Inline Search Bot = Client( From 9f38d1a993895f91ac2b8c20986adf22433c97b0 Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Tue, 14 Nov 2023 18:51:21 +0530 Subject: [PATCH 18/23] Update search.py --- plugins/search.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/search.py b/plugins/search.py index bef5f8c..f74181b 100644 --- a/plugins/search.py +++ b/plugins/search.py @@ -6,7 +6,7 @@ # Bot Client for Inline Search Bot = Client( - session_name=Config.BOT_SESSION_NAME, + session_name=info.py.SESSION, api_id=Config.API_ID, api_hash=Config.API_HASH, bot_token=Config.BOT_TOKEN @@ -14,7 +14,7 @@ # User Client for Searching in Channel. User = Client( - session_name=Config.USER_SESSION_STRING, + session_name=info.py.SESSION, api_id=Config.API_ID, api_hash=Config.API_HASH ) From 77b5bd7208ab7d945489f8625e3d317e0b89d3de Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Tue, 14 Nov 2023 19:48:09 +0530 Subject: [PATCH 19/23] Update search.py --- plugins/search.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/search.py b/plugins/search.py index f74181b..1c7c3e6 100644 --- a/plugins/search.py +++ b/plugins/search.py @@ -6,7 +6,7 @@ # Bot Client for Inline Search Bot = Client( - session_name=info.py.SESSION, + session_name=info.SESSION, api_id=Config.API_ID, api_hash=Config.API_HASH, bot_token=Config.BOT_TOKEN @@ -14,7 +14,7 @@ # User Client for Searching in Channel. User = Client( - session_name=info.py.SESSION, + session_name=info.SESSION, api_id=Config.API_ID, api_hash=Config.API_HASH ) From 9db4d93e086b0009dfdff072a23b2ff5dbc47ec5 Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Tue, 14 Nov 2023 19:49:08 +0530 Subject: [PATCH 20/23] Update search.py --- plugins/search.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/search.py b/plugins/search.py index 1c7c3e6..b220875 100644 --- a/plugins/search.py +++ b/plugins/search.py @@ -7,16 +7,16 @@ # Bot Client for Inline Search Bot = Client( session_name=info.SESSION, - api_id=Config.API_ID, - api_hash=Config.API_HASH, - bot_token=Config.BOT_TOKEN + api_id=info.API_ID, + api_hash=info.API_HASH, + bot_token=info.BOT_TOKEN ) # User Client for Searching in Channel. User = Client( session_name=info.SESSION, - api_id=Config.API_ID, - api_hash=Config.API_HASH + api_id=info.API_ID, + api_hash=info.API_HASH ) @Bot.on_message(filters.incoming) From 193cd4d4c8820bc0fe2791268a6f10cb72e0f08b Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Tue, 14 Nov 2023 19:53:25 +0530 Subject: [PATCH 21/23] Update search.py --- plugins/search.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/search.py b/plugins/search.py index b220875..b95eb9d 100644 --- a/plugins/search.py +++ b/plugins/search.py @@ -24,7 +24,7 @@ async def inline_handlers(_, event: Message): if event.text == '/start': return answers = f'**Searching For "{event.text}" πŸ”**' - async for message in User.search_messages(chat_id=Config.CHANNEL_ID, limit=50, query=event.text): + async for message in User.search_messages(chat_id=info.CHANNELS, limit=50, query=event.text): if message.text: thumb = None f_text = message.text @@ -39,7 +39,7 @@ async def inline_handlers(_, event: Message): await event.delete() await msg.delete() except: - print(f"[{Config.BOT_SESSION_NAME}] - Failed to Answer - {event.from_user.first_name}") + print(f"[{info.SESSION}] - Failed to Answer - {event.from_user.first_name}") # Start Clients From c6b5054a53e9436ba55c61ddd95f62b67ac76e77 Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Tue, 14 Nov 2023 19:54:49 +0530 Subject: [PATCH 22/23] Update search.py --- plugins/search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/search.py b/plugins/search.py index b95eb9d..80a62be 100644 --- a/plugins/search.py +++ b/plugins/search.py @@ -24,7 +24,7 @@ async def inline_handlers(_, event: Message): if event.text == '/start': return answers = f'**Searching For "{event.text}" πŸ”**' - async for message in User.search_messages(chat_id=info.CHANNELS, limit=50, query=event.text): + async for message in User.search_messages(chat_id=info.CHANNEL, limit=50, query=event.text): if message.text: thumb = None f_text = message.text From fc6aaa0a03cdfa6a0529f34c187f11ca50c886a6 Mon Sep 17 00:00:00 2001 From: PREETMEHRA73638 <109457025+PREETMEHRA73638@users.noreply.github.com> Date: Thu, 16 Nov 2023 13:17:27 +0530 Subject: [PATCH 23/23] Update search.py --- plugins/search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/search.py b/plugins/search.py index 80a62be..813aea1 100644 --- a/plugins/search.py +++ b/plugins/search.py @@ -3,7 +3,7 @@ from pyrogram.errors import QueryIdInvalid from pyrogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton, CallbackQuery, InlineQuery, InlineQueryResultArticle, \ InputTextMessageContent - +from plugins.fsub import fsub # Bot Client for Inline Search Bot = Client( session_name=info.SESSION,