diff --git a/LICENSE b/LICENSE index d467a123..d3a7f040 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 TroJanzHEX +Copyright (c) 2021 KicchaRequest Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 258d70b3..8f557eb6 100644 --- a/README.md +++ b/README.md @@ -71,11 +71,11 @@ Thanks to [InfotelGroup](https://telegram.dog/InFoTelGroup) and [Erich Daniken]( ## Installation ### Deploy to Heroku -[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/TroJanzHEX/Auto-Filter-Bot-V2) +[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/sachin9742s/Auto-Filter-Bot-V2) ### Deploy in your vps ```sh -git clone https://github.com/TroJanzHEX/Auto-Filter-Bot-V2 +git clone https://github.com/sachin9742s/Auto-Filter-Bot-V2 cd Auto-Filter-Bot-V2 pip3 install -r requirements.txt # diff --git a/app.json b/app.json index ef655654..f1a76afd 100644 --- a/app.json +++ b/app.json @@ -1,16 +1,16 @@ { - "name": "Auto Filter Bot", + "name": "Kiccha Auto Filter Bot", "description": "Kind of a filter bot where you don't have to add filters manually.", - "logo": "https://telegra.ph/file/71aaa621508cd696ab538.jpg", + "logo": "https://telegra.ph/file/52714d7aec32e13ee51a4.jpg", "keywords": [ "Auto", "Filter", "Telegram Bot", - "TroJanzHEX" + "KicchaRequest" ], - "website": "https://TroJanzHEX.me", + "website": "https://t.me/KicchaRequest.me", "repository": "https://github.com/TroJanzHEX/Auto-Filter-Bot-V2", - "success_url": "https://telegram.dog/TroJanzHEX", + "success_url": "https://telegram.dog/KicchaRequest", "env": { "TG_BOT_TOKEN": { "description": "You Telegram Bot Token from @BotFather", @@ -64,4 +64,4 @@ "size": "free" } } -} \ No newline at end of file +} diff --git a/bot.py b/bot.py index 45b672f9..6b6029ee 100644 --- a/bot.py +++ b/bot.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# @trojanzhex +# @sachin_official_admin from pyrogram import ( diff --git a/image_search_1626511470933.jpg b/image_search_1626511470933.jpg new file mode 100644 index 00000000..f60500ad Binary files /dev/null and b/image_search_1626511470933.jpg differ diff --git a/plugins/channel.py b/plugins/channel.py index 7cb8bc77..eccdb529 100644 --- a/plugins/channel.py +++ b/plugins/channel.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# @trojanzhex +# @KicchaRequest import re @@ -38,7 +38,7 @@ async def addchannel(client: Bot, message: Message): await message.reply_text( "Enter in correct format!\n\n/add channelid or\n" "/add @channelusername" - "\n\nGet Channel id from @ChannelidHEXbot", + "\n\nGet Channel id from @GD_FILMCLUB", ) return try: diff --git a/plugins/commands.py b/plugins/commands.py index 10bdf930..b70b671a 100644 --- a/plugins/commands.py +++ b/plugins/commands.py @@ -1,78 +1,58 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# @trojanzhex +# (c) @sachin_official_admin +class Translation(object): + + START_TEXT = """Hey {}!! +Am Just A Kiccha Auto Filter Bot....😉 -from pyrogram import Client, filters -from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton -from script import script +Just Add Me To Your Group And Channel And Connect Them And See My Pevers 🔥🔥😝 +For More Details Click Help Button Below.. +@KicchaRequest +""" + + HELP_TEXT = """ +How To Use Me!? -@Client.on_message(filters.command(["start"]) & filters.private) -async def start(client, message): - try: - await message.reply_text( - text=script.START_MSG.format(message.from_user.mention), - disable_web_page_preview=True, - reply_markup=InlineKeyboardMarkup( - [ - [ - InlineKeyboardButton("HELP", callback_data="help_data"), - InlineKeyboardButton("ABOUT", callback_data="about_data"), - ], - [ - InlineKeyboardButton( - "⭕️ JOIN OUR CHANNEL ⭕️", url="https://t.me/TroJanzHEX") - ] - ] - ), - reply_to_message_id=message.message_id - ) - except: - pass + +-> Add Me To Any Group And Make Me Admin +-> Add Me To Your Desired Channel + -@Client.on_message(filters.command(["help"]) & filters.private) -async def help(client, message): - try: - await message.reply_text( - text=script.HELP_MSG, - disable_web_page_preview=True, - reply_markup=InlineKeyboardMarkup( - [ - [ - InlineKeyboardButton("BACK", callback_data="start_data"), - InlineKeyboardButton("ABOUT", callback_data="about_data"), - ], - [ - InlineKeyboardButton( - "⭕️ SUPPORT ⭕️", url="https://t.me/TroJanzSupport") - ] - ] - ), - reply_to_message_id=message.message_id - ) - except: - pass +Bot Commands (Works Only In Groups) : -@Client.on_message(filters.command(["about"]) & filters.private) -async def about(client, message): - try: - await message.reply_text( - text=script.ABOUT_MSG, - disable_web_page_preview=True, - reply_markup=InlineKeyboardMarkup( - [ - [ - InlineKeyboardButton("BACK", callback_data="help_data"), - InlineKeyboardButton("START", callback_data="start_data"), - ], - [ - InlineKeyboardButton( - "SOURCE CODE", url="https://github.com/TroJanzHEX/Auto-Filter-Bot-V2") - ] - ] - ), - reply_to_message_id=message.message_id - ) - except: - pass \ No newline at end of file + -> /kicchaadd chat_id + OR - To Connect A Group With A Channel (Bot Should Be Admin With Full Previlages In Both Group And Channel) + /kicchaadd @Username + + -> /kicchadel chat_id + OR - To disconnect A Group With A Channel + /kicchadel @Username + + -> /kicchadelall - This Command Will Disconnect All Connected Channel With The Group And Deletes All Its File From DB + + -> /settings - This Command Will Display You A Settings Pannel Instance Which Can Be Used To Tweek Bot's Settings Accordingly + + -> Channel - Button Will Show You All The Connected Chats With The Group And Will Show Buttons Correspnding To There Order For Furthur Controls + + -> Filter Types - Button Will Show You The 3 Filter Option Available In Bot... Pressing Each Buttons Will Either Enable or Disable Them And This Will Take Into Action As Soon As You Use Them Without The Need Of A Restart + + -> Configure - Button Will Helps You To Change No. of Pages/ Buttons Per Page/ Total Result Without Acutally Editing The Repo... Also It Provide Option To Enable/Disable For Showing Invite Link In Each Results + + -> Status - Button Will Shows The Stats Of Your Channel + +@KicchaRequest +""" + + ABOUT_TEXT = """➥ Name : Auto Filter Bot + +➥ Creator : Sachin_S + +➥ Language : Python3 + +➥ Library : Pyrogram Asyncio 1.13.0 + +➥ Source Code : Click Me +""" diff --git a/plugins/filters.py b/plugins/filters.py index c05e0610..4b6e55dc 100644 --- a/plugins/filters.py +++ b/plugins/filters.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# @trojanzhex +# @KicchaRequest import re @@ -62,7 +62,9 @@ async def filter(client: Bot, message: Message): [InlineKeyboardButton(text="📃 Pages 1/1",callback_data="pages")] ) await message.reply_text( - f" Here is the result for {message.text}", + f" 🎬 Title : +🎞 Year : +💿 Quality : {message.text}", reply_markup=InlineKeyboardMarkup(buttons) ) return @@ -71,14 +73,16 @@ async def filter(client: Bot, message: Message): buttons = data['buttons'][0].copy() buttons.append( - [InlineKeyboardButton(text="NEXT ⏩",callback_data=f"next_0_{keyword}")] + [InlineKeyboardButton(text="🎸 NEXT 🎸",callback_data=f"next_0_{keyword}")] ) buttons.append( - [InlineKeyboardButton(text=f"📃 Pages 1/{data['total']}",callback_data="pages")] + [InlineKeyboardButton(text=f"🎶 Pages 1/{data['total']}",callback_data="pages")] ) await message.reply_text( - f" Here is the result for {message.text}", + f" 🎬 Title : +🎞 Year : +💿 Quality : {message.text}", reply_markup=InlineKeyboardMarkup(buttons) ) @@ -99,10 +103,10 @@ async def cb_handler(client: Bot, query: CallbackQuery): buttons = data['buttons'][int(index)+1].copy() buttons.append( - [InlineKeyboardButton("⏪ BACK", callback_data=f"back_{int(index)+1}_{keyword}")] + [InlineKeyboardButton("🎵 BACK 🎵", callback_data=f"back_{int(index)+1}_{keyword}")] ) buttons.append( - [InlineKeyboardButton(f"📃 Pages {int(index)+2}/{data['total']}", callback_data="pages")] + [InlineKeyboardButton(f"🎶 Pages {int(index)+2}/{data['total']}", callback_data="pages")] ) await query.edit_message_reply_markup( @@ -113,10 +117,10 @@ async def cb_handler(client: Bot, query: CallbackQuery): buttons = data['buttons'][int(index)+1].copy() buttons.append( - [InlineKeyboardButton("⏪ BACK", callback_data=f"back_{int(index)+1}_{keyword}"),InlineKeyboardButton("NEXT ⏩", callback_data=f"next_{int(index)+1}_{keyword}")] + [InlineKeyboardButton("🎵 BACK 🎵", callback_data=f"back_{int(index)+1}_{keyword}"),InlineKeyboardButton("🎸 NEXT 🎸", callback_data=f"next_{int(index)+1}_{keyword}")] ) buttons.append( - [InlineKeyboardButton(f"📃 Pages {int(index)+2}/{data['total']}", callback_data="pages")] + [InlineKeyboardButton(f"🎶 Pages {int(index)+2}/{data['total']}", callback_data="pages")] ) await query.edit_message_reply_markup( @@ -134,10 +138,10 @@ async def cb_handler(client: Bot, query: CallbackQuery): buttons = data['buttons'][int(index)-1].copy() buttons.append( - [InlineKeyboardButton("NEXT ⏩", callback_data=f"next_{int(index)-1}_{keyword}")] + [InlineKeyboardButton("🎸 NEXT 🎸", callback_data=f"next_{int(index)-1}_{keyword}")] ) buttons.append( - [InlineKeyboardButton(f"📃 Pages {int(index)}/{data['total']}", callback_data="pages")] + [InlineKeyboardButton(f"🎶 Pages {int(index)}/{data['total']}", callback_data="pages")] ) await query.edit_message_reply_markup( @@ -148,10 +152,10 @@ async def cb_handler(client: Bot, query: CallbackQuery): buttons = data['buttons'][int(index)-1].copy() buttons.append( - [InlineKeyboardButton("⏪ BACK", callback_data=f"back_{int(index)-1}_{keyword}"),InlineKeyboardButton("NEXT ⏩", callback_data=f"next_{int(index)-1}_{keyword}")] + [InlineKeyboardButton("🎵 BACK 🎵", callback_data=f"back_{int(index)-1}_{keyword}"),InlineKeyboardButton("🎸 NEXT 🎸", callback_data=f"next_{int(index)-1}_{keyword}")] ) buttons.append( - [InlineKeyboardButton(f"📃 Pages {int(index)}/{data['total']}", callback_data="pages")] + [InlineKeyboardButton(f"🎶 Pages {int(index)}/{data['total']}", callback_data="pages")] ) await query.edit_message_reply_markup( @@ -167,9 +171,9 @@ async def cb_handler(client: Bot, query: CallbackQuery): elif query.data == "start_data": await query.answer() keyboard = InlineKeyboardMarkup([ - [InlineKeyboardButton("HELP", callback_data="help_data"), - InlineKeyboardButton("ABOUT", callback_data="about_data")], - [InlineKeyboardButton("⭕️ JOIN OUR CHANNEL ⭕️", url="https://t.me/TroJanzHEX")] + [InlineKeyboardButton("⚚ HELP", callback_data="help_data"), + InlineKeyboardButton("ABOUT ⚚", callback_data="about_data")], + [InlineKeyboardButton("꧁ JOIN OUR CHANNEL ꧂", url="https://t.me/ROCKHDMOVIES2021")] ]) await query.message.edit_text( @@ -184,7 +188,7 @@ async def cb_handler(client: Bot, query: CallbackQuery): keyboard = InlineKeyboardMarkup([ [InlineKeyboardButton("BACK", callback_data="start_data"), InlineKeyboardButton("ABOUT", callback_data="about_data")], - [InlineKeyboardButton("⭕️ SUPPORT ⭕️", url="https://t.me/TroJanzSupport")] + [InlineKeyboardButton("〠 SUPPORT 〠", url="https://t.me/KicchaRequest")] ]) await query.message.edit_text( @@ -199,7 +203,7 @@ async def cb_handler(client: Bot, query: CallbackQuery): keyboard = InlineKeyboardMarkup([ [InlineKeyboardButton("BACK", callback_data="help_data"), InlineKeyboardButton("START", callback_data="start_data")], - [InlineKeyboardButton("SOURCE CODE", url="https://github.com/TroJanzHEX/Auto-Filter-Bot-V2")] + [InlineKeyboardButton("SOURCE CODE", url="https://t.me/KicchaRequest")] ]) await query.message.edit_text( diff --git a/user.py b/user.py index 5d13fb45..95ac3b75 100644 --- a/user.py +++ b/user.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# @trojanzhex +# @KicchaRequest from pyrogram import (