Merge branch 'beta' of https://github.com/Gojo-Bots/Gojo_Satoru into beta

Powers/database/flood_db.py

@@ -1,5 +1,7 @@
 from threading import RLock
+from traceback import format_exc
 
+from Powers import LOGGER
 from Powers.database import MongoDB
 from Powers.utils.msg_types import Types
 
@@ -7,11 +9,11 @@ INSERTION_LOCK = RLock()
 
 class Floods(MongoDB):
     """Class to store flood limit and action of a chat"""
+    try:
+        db_name = "flood"
 
-    db_name = "flood"
-
-    def __init__(self):
-        super().__init__(self.db_name)
+        def __init__(self):
+            super().__init__(self.db_name)
 
     def save_flood(
         self,
@@ -21,7 +23,7 @@ class Floods(MongoDB):
         action: str,
     ):
         with INSERTION_LOCK:
-            curr = self.find_one({"chat_id": chat_id})
+            curr = self.find_one({"chat_id": chat_id, "limit": limit, "within": within, "action": action})
             if curr:
                 if not(limit == int(curr['limit']) or within == int(curr['within']) or action == str(curr['action'])):
                     return self.update(
@@ -32,17 +34,14 @@ class Floods(MongoDB):
                             "action": action,
                         }
                     )
-                else:
-                    return False
-            else:
-                return self.insert_one(
-                    {
-                        "chat_id" : chat_id,
-                        "limit": limit,
-                        "within": within,
-                        "action" : action
-                    },
-                )
+            return self.insert_one(
+                {
+                    "chat_id" : chat_id,
+                    "limit": limit,
+                    "within": within,
+                    "action" : action
+                },
+            )
     
     def is_chat(self, chat_id: int):
         with INSERTION_LOCK:

Powers/plugins/flood.py

@@ -21,7 +21,7 @@ from Powers.vars import Config
 
 Flood = Floods()
 
-approve = Approve()
+
 
 on_key = ["on", "start", "disable"]
 off_key = ["off", "end", "enable", "stop"]
@@ -31,7 +31,7 @@ close_kb =InlineKeyboardMarkup(
         [
             InlineKeyboardButton(
                 "Close ❌",
-                callback_data="close"
+                callback_data="fclose"
             )
         ]
     ]
@@ -42,15 +42,15 @@ action_kb = InlineKeyboardMarkup(
         [
             InlineKeyboardButton(
                 "Mute 🔇",
-                callback_data="mute"
+                callback_data="f_mute"
             ),
             InlineKeyboardButton(
                 "Ban 🚷",
-                callback_data="ban"
+                callback_data="f_ban"
             ),
             InlineKeyboardButton(
-                "Kick",
-                callback_data="kick"
+                "Kick 🦿",
+                callback_data="f_kick"
             )
         ]
     ]
@@ -61,15 +61,15 @@ within_kb = InlineKeyboardMarkup(
         [
             InlineKeyboardButton(
                 "5",
-                callback_data="5"
+                callback_data="f_f_5"
             ),
             InlineKeyboardButton(
                 "10",
-                callback_data="10"
+                callback_data="f_f_10"
             ),
             InlineKeyboardButton(
                 "15",
-                callback_data="15"
+                callback_data="f_f_15"
             )
         ]
     ]
@@ -80,15 +80,15 @@ limit_kb = InlineKeyboardMarkup(
         [
             InlineKeyboardButton(
                 "5",
-                callback_data="l_5"
+                callback_data="f_5"
             ),
             InlineKeyboardButton(
                 "10",
-                callback_data="l_10"
+                callback_data="f_10"
             ),
             InlineKeyboardButton(
                 "15",
-                callback_data="l_15"
+                callback_data="f_15"
             )
         ]
     ]
@@ -98,15 +98,16 @@ limit_kb = InlineKeyboardMarkup(
 async def flood_action(c: Gojo, m: Message):
     bot = await c.get_chat_member(m.chat.id, Config.BOT_ID)
     status = bot.status
-    if not status in [CMS.OWNER, CMS.ADMINISTRATOR] and not bot.privileges.can_restrict_members:
+    if not status in [CMS.OWNER, CMS.ADMINISTRATOR]:
+      if not bot.privileges.can_restrict_members:
         return await m.reply_text("Give me permission to restict member first")
     if m.chat.type == CT.PRIVATE:
         await m.reply_text("Use this command in group")
         return
     c_id = m.chat.id
     is_flood = Flood.is_chat(c_id)
-    saction = is_flood[2]
     if is_flood:
+        saction = is_flood[2]
         await m.reply_text(
             f"Choose a action given bellow to do when flood happens.\n **CURRENT ACTION** is {saction}",
             reply_markup=action_kb
@@ -115,82 +116,123 @@ async def flood_action(c: Gojo, m: Message):
     await m.reply_text("Switch on the flood protection first.")
     return
 
-@Gojo.on_message(command(['setflood', 'flood']) & ~filters.bot & admin_filter)
+@Gojo.on_message(command(['isflood', 'flood']) & ~filters.bot)
+async def flood_on_off(c: Gojo, m: Message):
+    if m.chat.type == CT.PRIVATE:   
+      return await m.reply_text("This command is ment to be used in groups.")
+    c_id = m.chat.id
+    is_flood = Flood.is_chat(c_id)
+    c_id = m.chat.id
+    if is_flood:
+      saction = is_flood[2]
+      slimit = is_flood[0]
+      swithin = is_flood[1]
+      return await m.reply_text(f"Flood is on for this chat\n**Action**: {saction}\n**Messages**: {slimit} within {swithin} sec")
+    return await m.reply_text("Flood protection is off for this chat.")
+
+@Gojo.on_message(command(['setflood']) & ~filters.bot & admin_filter)
 async def flood_set(c: Gojo, m: Message):
     bot = await c.get_chat_member(m.chat.id, Config.BOT_ID)
     status = bot.status
-    if not status in [CMS.OWNER, CMS.ADMINISTRATOR] and not bot.privileges.can_restrict_members:
+    if not status in [CMS.OWNER, CMS.ADMINISTRATOR]:
+      if not bot.privileges.can_restrict_members:
         return await m.reply_text("Give me permission to restict member first")
     if m.chat.type == CT.PRIVATE:
         return await m.reply_text("This command is ment to be used in groups.")
     split = m.text.split(None, 1)
     c_id = m.chat.id
     is_flood = Flood.is_chat(c_id)
-    saction = is_flood[2]
-    slimit = is_flood[0]
-    swithin = is_flood[1]
     if len(split) == 1:
         c_id = m.chat.id
         if is_flood:
+            saction = is_flood[2]
+            slimit = is_flood[0]
+            swithin = is_flood[1]
             return await m.reply_text(f"Flood is on for this chat\n**Action**:{saction}\n**Messages**:{slimit} within {swithin} sec")
         return await m.reply_text("Flood protection is off of this chat.")
     
-    elif len(split) == 2:
+    if len(split) == 2:
+        if is_flood:
+            saction = is_flood[2]
+            slimit = is_flood[0]
+            swithin = is_flood[1]
         c_id = m.chat.id
         if split[1].lower() in on_key:
-            if not is_flood:
-                Flood.save_flood(m.chat.id, 5, 5, 'mute')
-                await m.reply_text("Flood protection has been started for this group.")
-                return
-            return await m.reply_text(f"Flood is on for this chat\n**Action**:{saction}\n**Messages**:{slimit} within {swithin} sec") 
+            Flood.save_flood(m.chat.id, 5, 5, 'mute')
+            await m.reply_text("Flood protection has been started for this group.")
+            return
         if split[1].lower() in off_key:
-            Flood.rm_flood(m.chat.id, slimit, swithin, saction)
+            Flood.rm_flood(c_id, slimit, swithin, saction)
             await m.reply_text("Flood protection has been stopped for this chat")
             return
     await m.reply_text("**Usage:**\n `/setflood on/off`")
     return
 
-@Gojo.on_callback_query()
+@Gojo.on_callback_query(filters.regex("^f_"))
 async def callbacks(c: Gojo, q: CallbackQuery):
     data = q.data
-    if data == "close":
+    if data == "fclose":
         await q.answer("Closed")
         await q.message.delete()
         return
     c_id = q.message.chat.id
     is_flood = Flood.is_chat(c_id)
-    saction = is_flood[2]
-    slimit = is_flood[0]
-    swithin = is_flood[1]
+    if is_flood:
+      saction = is_flood[2]
+      slimit = is_flood[0]
+      swithin = is_flood[1]
     user = q.from_user.id
     user_status = (await q.message.chat.get_member(q.from_user.id)).status
     if user in SUPPORT_STAFF or user_status in [CMS.OWNER, CMS.ADMINISTRATOR]:
-        if data in ["mute", "ban", "kick"]:
-            Flood.save_flood(c_id, slimit, swithin, data)
-            await q.answer("Updated action", show_alert=True)
-            await q.edit_message_caption(
-                f"Set the limit of message after the flood protection will be activated\n **CURRENT LIMIT** {slimit} messages",
-                reply_markup=limit_kb
-            )
-            return
-        if data in ["l_5", "l_10", "l_15"]:
+        if data in ["f_mute", "f_ban", "f_kick"]:
+            change = data.split("_")[1]
+            if not change == saction:
+              Flood.save_flood(c_id, slimit, swithin, change)
+              await q.answer("Updated action", show_alert=True)
+              await q.edit_message_caption(
+                  f"Set the limit of message after the flood protection will be activated\n **CURRENT LIMIT** {slimit} messages",
+                  reply_markup=limit_kb
+              )
+              return
+            else:
+              await q.answer("Updated action", show_alert=True)
+              await q.edit_message_caption(
+                  f"Set the limit of message after the flood protection will be activated\n **CURRENT LIMIT** {slimit} messages",
+                  reply_markup=limit_kb
+              )
+        elif data in ["f_5", "f_10", "f_15"]: 
             change = int(data.split("_")[1])
-            Flood.save_flood(c_id, change, swithin, saction)
-            await q.answer("Updated limit", show_alert=True)
-            await q.edit_message_caption(
-                f"Set the time with the number of message recived treated as flood\n **CUURENT TIME** {swithin}",
-                reply_markup=within_kb
-            )
-            return
-        if data in ["5", "10", "15"]:
+            if not change == slimit:
+              Flood.save_flood(c_id, change, swithin, saction)
+              await q.answer("Updated limit", show_alert=True)
+              await q.edit_message_caption(
+                  f"Set the time with the number of message recived treated as flood\n **CUURENT TIME** {swithin}",
+                  reply_markup=within_kb
+              )
+              return
+            else:
+              await q.answer("Updated action", show_alert=True)
+              await q.edit_message_caption(
+                  f"Set the limit of message after the flood protection will be activated\n **CURRENT LIMIT** {slimit} messages",
+                  reply_markup=limit_kb
+              )
+        elif data in ["f_f_5", "f_f_10", "f_f_15"]:
+            data = data.split("_")[-1]
             change = int(data)
-            Flood.save_flood(c_id, slimit, change, saction)
-            await q.answer("Updated", show_alert=True)
-            await q.edit_message_caption(
-                "Flood protection setting has been updated",
-                reply_markup=close_kb
-            )
-            return
+            if not change == swithin:
+              Flood.save_flood(c_id, slimit, change, saction)
+              await q.answer("Updated", show_alert=True)
+              await q.edit_message_caption(
+                  "Flood protection setting has been updated",
+                  reply_markup=close_kb
+              )
+              return
+            else:
+              await q.answer("Updated action", show_alert=True)
+              await q.edit_message_caption(
+                  f"Set the limit of message after the flood protection will be activated\n **CURRENT LIMIT** {slimit} messages",
+                  reply_markup=limit_kb
+              )
     else:
         await q.answer(
             "You don't have enough permission to do this!\nStay in your limits!",
@@ -389,6 +431,34 @@ async def flood_watcher(c: Gojo, m: Message):
                     dic[c_id][u_id][1].clear()
                     dic[c_id][u_id][0].clear()
                     return
+    elif y-x > within:
+      try:
+        dic[c_id][u_id][1].clear()
+        dic[c_id][u_id][0].clear()
+        return
+      except Exception:
+        pass
     else:
         return
 
+
+__PLUGIN__ = "flood"
+__alt_name__ = [
+  "anit-flood",
+  "flood",
+  "spam",
+  "anti-spam",
+]
+__HELP__ = """
+**Anti Flood**
+**User Commands:**
+• /flood: to check weather the group is protected from spam or not.
+
+**Admin only:**
+• /setflood `on/off`: To activate or deactivate the flood protection
+• /floodaction: To customize the flood settings.
+
+**Example:**
+`/setflood on`
+"""
+

Powers/plugins/search.py

@@ -237,7 +237,7 @@ __alt_name__ = [
 __HELP__ = """
 **Search**
 
-**Admin only:**
+**Available commands:**
 • /google `<query>` : Search the google for the given query.
 • /anime `<query>`  : Search myanimelist for the given query.
 • /stack `<query>`  : Search stackoverflow for the given query.

Powers/utils/extras.py

@@ -663,30 +663,4 @@ StartPic = [
     "https://te.legra.ph/file/1751252a9f0483811e9b9.jpg",
     "https://te.legra.ph/file/380b862e0248225cc1a45.jpg",
     "https://te.legra.ph/file/f314f89640ce4b4118e9e.jpg",
-    "https://te.legra.ph/file/37423e9680e3f79c9eb15.jpg",
-    "https://te.legra.ph/file/4a9c4663d0120cff7cc82.jpg",
-    "https://te.legra.ph/file/56d72d125005a16dba7b8.jpg",
-    "https://te.legra.ph/file/c10f1b32adaf93c1a9fe1.jpg",
-    "https://te.legra.ph/file/68c607517cca7d08e8910.jpg",
-    "https://te.legra.ph/file/c86855e6d5a5668748ce1.jpg",
-    "https://te.legra.ph/file/b480c0989f1e4a9ea63c7.jpg",
-    "https://te.legra.ph/file/4cdf315e2925d8b4ef6ae.jpg",
-    "https://te.legra.ph/file/fe9c620d294f4f47f4350.jpg",
-    "https://te.legra.ph/file/6d4ae604c118cb49ab7ed.jpg",
-    "https://te.legra.ph/file/a7a78ff8d710583f28e72.jpg",
-    "https://te.legra.ph/file/a7a78ff8d710583f28e72.jpg",
-    "https://te.legra.ph/file/c74c4f4be365971311510.jpg",
-    "https://te.legra.ph/file/23e0a389fb5df7900c686.jpg",
-    "https://te.legra.ph/file/fc0557000a350267adc0d.jpg",
-    "https://te.legra.ph/file/cd381fd6f9960555664f6.jpg",
-    "https://te.legra.ph/file/322466833973279848e60.jpg",
-    "https://te.legra.ph/file/122cf568eef282ad3472a.jpg",
-    "https://te.legra.ph/file/cd6aa9cbe621c7c3a12ea.jpg",
-    "https://te.legra.ph/file/83c61271b95fdf421a9a0.jpg",
-    "https://te.legra.ph/file/2f27c940f5e912c01aa63.jpg",
-    "https://te.legra.ph/file/43780c4a5c3071af3de3c.jpg",
-    "https://te.legra.ph/file/68d18ae5b2a4b67e793a4.jpg",
-    "https://te.legra.ph/file/633bd27c1607fe98920b6.jpg",
-    "https://te.legra.ph/file/52d92a67f0c6ce0a9f89f.jpg",
-    "https://te.legra.ph/file/d91e7353b3803a8148bfc.jpg",
 ]

requirements.txt

@@ -4,7 +4,7 @@ anyio==3.6.2; python_full_version >= "3.6.2" and python_version >= "3.6"
 asyncio==3.4.3
 beautifulsoup4==4.11.1; python_full_version >= "3.6"
 cachetools==5.2.0; python_version >= "3.7" and python_version < "4.0"
-certifi==2022.6.15; python_version >= "3.7" and python_version < "4"
+certifi==2022.12.7; python_version >= "3.7" and python_version < "4"
 charset-normalizer==2.1.0; python_version >= "3.7" and python_version < "4" and python_full_version >= "3.6.0"
 dnspython==2.2.1; python_version >= "3.6" and python_version < "4.0"
 google==3.0.0