[pull] main from CrazyBotsz:main

Readme.md → README.md

@@ -1,18 +1,18 @@
 # Adv Auto Filter Bot V2
 
 <p align="center">
-  <a href="https://github.com/AlbertEinsteinTG/Adv-Auto-Filter-Bot-V2/stargazers">
-    <img src="https://img.shields.io/github/stars/AlbertEinsteinTG/Adv-Auto-Filter-Bot-V2?style=social">
+  <a href="https://github.com/CrazyBotsz/Adv-Auto-Filter-Bot-V2/stargazers">
+    <img src="https://img.shields.io/github/stars/CrazyBotsz/Adv-Auto-Filter-Bot-V2?style=social">
 
   </a>
 
-  <a href="https://github.com/AlbertEinsteinTG/Adv-Auto-Filter-Bot-V2/fork">
-    <img src="https://img.shields.io/github/forks/AlbertEinsteinTG/Adv-Auto-Filter-Bot-V2?label=Fork&style=social">
+  <a href="https://github.com/CrazyBotsz/Adv-Auto-Filter-Bot-V2/fork">
+    <img src="https://img.shields.io/github/forks/CrazyBotsz/Adv-Auto-Filter-Bot-V2?label=Fork&style=social">
 
   </a>  
 </p>
 
-__This Is Just An Simple Advance Auto Filter Bot Complete Rewritten Version Of [Adv-Filter-Bot](https://github.com/AlbertEinsteinTG/Adv-Auto-Filter-Bot)..__
+__This Is Just An Simple Advance Auto Filter Bot Complete Rewritten Version Of [Adv-Filter-Bot](https://github.com/CrazyBotsz/Adv-Auto-Filter-Bot)..__
 
 __Just Sent Any Text As Query It Will Search For All Connected Chat's Files In Its MongoDB And Reply You With The Message Link As A Button__
 
@@ -73,7 +73,7 @@ You can deploy this bot anywhere.
 <details><summary>Deploy To Heroku</summary>
 <p>
 <br>
-<a href="https://heroku.com/deploy?template=https://github.com/AlbertEinsteinTG/Adv-Auto-Filter-Bot-V2/tree/main">
+<a href="https://github.com/AlbertEinsteinTG/af-deploy-script">
   <img src="https://www.herokucdn.com/deploy/button.svg" alt="Deploy">
 </a>
 </p>
@@ -82,8 +82,8 @@ You can deploy this bot anywhere.
 <details><summary>Deploy To VPS</summary>
 <p>
 <pre>
-git clone https://github.com/AlbertEinsteinTG/Adv-Auto-Filter-Bot-V2/tree/blob/main
-cd Adv-Auto-Filter-Bot-ReMaster
+git clone https://github.com/CrazyBotsz/Adv-Auto-Filter-Bot-V2
+cd Adv-Auto-Filter-Bot-V2
 pip3 install -r requirements.txt
 # Change The Vars Of bot/__init__.py File Accordingly
 python3 -m bot
@@ -99,11 +99,12 @@ Do Fork And Star The Repository If You Liked It.
 
 ## Disclaimer
 [![GNU Affero General Public License v3.0](https://www.gnu.org/graphics/agplv3-155x51.png)](https://www.gnu.org/licenses/agpl-3.0.en.html#header)    
-Licensed under [GNU AGPL v3.0.](https://github.com/AlbertEinsteinTG/Adv-Auto-Filter-Bot-V2/blob/main/LICENSE)
+Licensed under [GNU AGPL v3.0.](https://github.com/CrazyBotsz/Adv-Auto-Filter-Bot-V2/blob/main/LICENSE)
 Selling The Codes To Other People For Money Is *Strictly Prohibited*.
 
 
 ## Credits
 
  - Thanks To Dan For His Awsome [Libary](https://github.com/pyrogram/pyrogram)
  - Thanks To SpEcHiDe For His Awesome [DeleteMessagesRoBot](https://github.com/SpEcHiDe/DeleteMessagesRoBot)
+ - [Thanks To Me 👀](https://github.com/AlbertEinsteinTG)

app.json

@@ -7,8 +7,8 @@
         "Filter",
         "Mongo DB"
     ],
-    "website": "https://github.com/AlbertEinsteinTG",
-    "repository": "https://github.com/AlbertEinsteinTG/Adv-Auto-Filter-Bot-V2",
+    "website": "https://github.com/CrazyBotsz",
+    "repository": "https://github.com/CrazyBotsz/Adv-Auto-Filter-Bot-V2",
     "success_url": "https://telegram.dog/CrazyBotsz",
     "env": {
         "APP_ID": {

bot/bot.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # (c) @SpEcHIDe
 
-from pyrogram import Client, __version__
+from pyrogram import Client, enums, __version__
 
 from . import API_HASH, APP_ID, LOGGER, BOT_TOKEN 
 
@@ -20,7 +20,7 @@ def __init__(self):
             plugins={
                 "root": "bot/plugins"
             },
-            workers=4,
+            workers=200,
             bot_token=BOT_TOKEN,
             sleep_threshold=10
         )
@@ -29,7 +29,7 @@ def __init__(self):
     async def start(self):
         await super().start()
         bot_details = await self.get_me()
-        self.set_parse_mode("html")
+        self.set_parse_mode(enums.ParseMode.HTML)
         self.LOGGER(__name__).info(
             f"@{bot_details.username}  started! "
         )

bot/database/database.py

@@ -1,21 +1,14 @@
+import os
 import motor.motor_asyncio # pylint: disable=import-error
 from bot import DB_URI
 
-class Singleton(type):
-    __instances__ = {}
+DB_NAME = os.environ.get("DB_NAME", "Adv_Auto_Filter")
 
-    def __call__(cls, *args, **kwargs):
-        if cls not in cls.__instances__:
-            cls.__instances__[cls] = super(Singleton, cls).__call__(*args, **kwargs)
-
-        return cls.__instances__[cls]
-
-
-class Database(metaclass=Singleton):
+class Database:
 
     def __init__(self):
         self._client = motor.motor_asyncio.AsyncIOMotorClient(DB_URI)
-        self.db = self._client["Adv_Auto_Filter"]
+        self.db = self._client[DB_NAME]
         self.col = self.db["Main"]
         self.acol = self.db["Active_Chats"]
         self.fcol = self.db["Filter_Collection"]
@@ -165,9 +158,7 @@ async def del_chat(self, group_id: int, channel_id: int):
                                 channel_id
                             }
                         }
-                    },
-                False,
-                True
+                    }
             )
 
             await self.del_active(group_id, channel_id)
@@ -302,7 +293,7 @@ async def del_active(self, group_id: int, channel_id: int):
         templ = {"$pull": {"chats": dict(chat_id = channel_id)}}
 
         try:
-            await self.acol.update_one({"_id": group_id}, templ, False, True)
+            await self.acol.update_one({"_id": group_id}, templ)
         except Exception as e:
             print(e)
             pass

bot/plugins/auto_filter.py

@@ -2,7 +2,7 @@
 import logging
 import asyncio
 
-from pyrogram import Client, filters
+from pyrogram import Client, filters, enums
 from pyrogram.types import Message, InlineKeyboardButton, InlineKeyboardMarkup, CallbackQuery
 from pyrogram.errors import ButtonDataInvalid, FloodWait
 
@@ -15,7 +15,7 @@
 ACTIVE_CHATS = {}
 db = Database()
 
-@Bot.on_message(filters.text & filters.group & ~filters.bot, group=0)
+@Bot.on_message(filters.text & filters.group, group=0)
 async def auto_filter(bot, update):
     """
     A Funtion To Handle Incoming Text And Reply With Appropriate Results
@@ -112,7 +112,7 @@ async def auto_filter(bot, update):
                         bot_= await bot.get_me()
                         FIND["bot_details"] = bot_
                     except FloodWait as e:
-                        asyncio.sleep(e.x)
+                        await asyncio.sleep(e.value)
                         bot_= await bot.get_me()
                         FIND["bot_details"] = bot_
 
@@ -205,8 +205,8 @@ async def auto_filter(bot, update):
                 chat_id = update.chat.id,
                 text=f"Found {(len_results)} Results For Your Query: <code>{query}</code>",
                 reply_markup=reply_markup,
-                parse_mode="html",
-                reply_to_message_id=update.message_id
+                parse_mode=enums.ParseMode.HTML,
+                reply_to_message_id=update.id
             )
 
         except ButtonDataInvalid: