Merge pull request #86 from Gojo-Bots/beta

Powers/plugins/watchers.py

@@ -17,7 +17,7 @@ from Powers.database.warns_db import Warns, WarnSettings
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
 from Powers.utils.parser import mention_html
 from Powers.utils.regex_utils import regex_searcher
-from PhoenixScanner import Phoenix
+from RiZoeLX.functions import update_scanlist
 
 # Initialise
 gban_db = GBan()
@@ -167,6 +167,13 @@ async def bl_watcher(_, m: Message):
     return
 
 
+SCANLIST = []
+
+@Gojo.on_message(filters.command(["start", "ping"])
+async def updatescanlist(_, message: Message):
+   global SCANLIST
+   SCANLIST = update_scanlist()
+
 @Gojo.on_message(filters.user(list(ANTISPAM_BANNED)) & filters.group)
 async def gban_watcher(c: Gojo, m: Message):
     from Powers import SUPPORT_GROUP
@@ -206,26 +213,21 @@ async def gban_watcher(c: Gojo, m: Message):
         <b>Chat:</b> <code>{m.chat.id}</code>
         <b>Error:</b> <code>{ef}</code>""",
             )
-    
-    Red7_Client = Phoenix("RED7-yppfpzmakyopbjiwyccs")
-    try:
+
+    elif m.from_user.id in SCANLIST:
        msg = f"""
 ** Alert ⚠️**
 User {m.from_user.mention} is officially
 Scanned by TeamRed7 | Phoenix API ;)
 Appeal [Here](https://t.me/Red7WatchSupport)
        """
-       check = Red7_Client.check(m.from_user.id)
-       if check['is_gban']:
-          try:
-             await c.ban_chat_member(m.chat.id, user.id)
-             await c.send_message(m.chat.id, msg, disable_web_page_preview=True)
-          except Exception as a:
-             LOGGER.error(a)
-    except Exception as eror:
-       LOGGER.error(eror)
-       LOGGER.error(format_exc())
-       return
+       try:
+          await c.ban_chat_member(m.chat.id, user.id)
+          await c.send_message(m.chat.id, msg, disable_web_page_preview=True)
+       except Exception as a:
+          LOGGER.error(a)
+          LOGGER.error(format_exc())
+          return
 
 
 @Gojo.on_message(filters.chat(BLACKLIST_CHATS))

requirements.txt

@@ -31,4 +31,4 @@ typing-extensions==4.3.0; python_full_version >= "3.6.2" and python_version >= "
 ujson==5.7.0; python_version >= "3.7"
 urllib3==1.26.11; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.7"
 wikipedia==1.4.0
-PhoenixScanner 
+pyRiZoeLX