Working on `v 2.2.0`

Powers/database/locks_db.py

@@ -5,6 +5,7 @@ from Powers.database import MongoDB
 
 INSERTION_LOCK = RLock()
 
+lock_t = ["anti_c_send", "anti_fwd", "anti_fwd_u", "anti_fwd_c", "anti_links"]
 class LOCKS(MongoDB):
     """Class to store locks"""
     
@@ -15,8 +16,17 @@ class LOCKS(MongoDB):
 
     def insert_lock_channel(self, chat: int, locktype: str):
         """
-        locktypes: anti_c_send, anti_fwd, anti_fwd_u, anti_fwd_c, anti_links
+        locktypes: all, anti_c_send, anti_fwd, anti_fwd_u, anti_fwd_c, anti_links
         """
+        if locktype == "all":
+            for i in lock_t:
+                    curr = self.find_one({"chat_id":chat,"locktype":i})
+                    if curr:
+                        continue
+                    if i in ["anti_fwd_u", "anti_fwd_c"]:
+                        continue
+                    self.insert_one({"chat_id":chat,"locktype":i})
+            return True
         curr = self.find_one({"chat_id":chat,"locktype":locktype})
         if curr:
             return False
@@ -29,8 +39,14 @@ class LOCKS(MongoDB):
 
     def remove_lock_channel(self, chat: int, locktype: str):
         """
-        locktypes: anti_c_send, anti_fwd, anti_fwd_u, anti_fwd_c, anti_links
+        locktypes: all, anti_c_send, anti_fwd, anti_fwd_u, anti_fwd_c, anti_links
         """
+        if locktype == "all":
+            for i in lock_t:
+                    curr = self.find_one({"chat_id":chat,"locktype":i})
+                    if curr:
+                        self.delete_one({"chat_id":chat,"locktype":i})
+            return True
         curr = self.find_one({"chat_id":chat,"locktype":locktype})
         if curr:
             with INSERTION_LOCK:

Powers/plugins/admin.py

@@ -24,8 +24,6 @@ from Powers.utils.extract_user import extract_user
 from Powers.utils.parser import mention_html
 from Powers.vars import Config
 
-SUPPORT_STAFF = get_support_staff()
-DEV_LEVEL = get_support_staff("dev_level")
 
 @Gojo.on_message(command("adminlist"))
 async def adminlist_show(_, m: Message):
@@ -110,6 +108,7 @@ async def reload_admins(_, m: Message):
         return await m.reply_text(
             "This command is made to be used in groups only!",
         )
+    SUPPORT_STAFF = get_support_staff()
     if (
         (m.chat.id in set(TEMP_ADMIN_CACHE_BLOCK.keys()))
         and (m.from_user.id not in SUPPORT_STAFF)
@@ -420,6 +419,8 @@ async def demote_usr(c: Gojo, m: Message):
 @Gojo.on_message(command("invitelink"))
 async def get_invitelink(c: Gojo, m: Message):
     # Bypass the bot devs, sudos and owner
+    
+    DEV_LEVEL = get_support_staff("dev_level")
     if m.from_user.id not in DEV_LEVEL:
         user = await m.chat.get_member(m.from_user.id)
         if not user.privileges.can_invite_users and user.status != CMS.OWNER:

Powers/plugins/antispam.py

@@ -18,7 +18,6 @@ from Powers.vars import Config
 
 # Initialize
 db = GBan()
-SUPPORT_STAFF = get_support_staff()
 
 @Gojo.on_message(command(["gban", "globalban"], sudo_cmd=True))
 async def gban(c: Gojo, m: Message):
@@ -39,6 +38,8 @@ async def gban(c: Gojo, m: Message):
     else:
         gban_reason = m.text.split(None, 2)[2]
 
+    SUPPORT_STAFF = get_support_staff()
+
     if user_id in SUPPORT_STAFF:
         await m.reply_text(text="This user is part of my Support!, Can't ban our own!")
         return
@@ -92,6 +93,8 @@ async def ungban(c: Gojo, m: Message):
 
     user_id, user_first_name, _ = await extract_user(c, m)
 
+    SUPPORT_STAFF = get_support_staff()
+
     if user_id in SUPPORT_STAFF:
         await m.reply_text(text="This user is part of my Support!, Can't ban our own!")
         return
@@ -169,3 +172,18 @@ async def gban_list(_, m: Message):
     LOGGER.info(f"{m.from_user.id} exported gbanlist in {m.chat.id}")
 
     return
+
+__PLUGIN__ = "global"
+
+__alt_name__ = ["antispam", "global"]
+
+
+__HELP__ = """
+**Global**
+
+**Sudo commands:**
+• /gban [reply to user | user id | username]: Add the user in the global ban watchlist.
+• /ungban [reply to user | user id | username]: Remove the user from the global ban watchlist.
+• /numgbans : Give number of users who are banned globally.
+• /gbanlist : Give list of globally banned users.
+"""

Powers/plugins/auto_join.py

@@ -10,7 +10,6 @@ from Powers.database.autojoin_db import AUTOJOIN
 from Powers.supports import get_support_staff
 from Powers.utils.custom_filters import admin_filter, auto_join_filter, command
 
-SUPPORT_STAFF = get_support_staff()
 
 @Gojo.on_message(command(["joinreq"]) & admin_filter)
 async def accept_join_requests(c: Gojo, m: Message):
@@ -21,6 +20,9 @@ async def accept_join_requests(c: Gojo, m: Message):
     split = m.command
     a_j = AUTOJOIN()
 
+    try:
+        await 
+
     if len(split) == 1:
         txt = "**USAGE**\n/joinreq [on | off]"
         await m.reply_text(txt)
@@ -84,7 +86,8 @@ async def join_request_handler(c: Gojo, j: ChatJoinRequest):
     chat = j.chat.id
     aj = AUTOJOIN()
     join_type = aj.get_autojoin(chat)
-    
+    SUPPORT_STAFF = get_support_staff()
+
     if not join_type:
         return
     if join_type == "auto" or user in SUPPORT_STAFF:

Powers/plugins/bans.py

@@ -20,7 +20,6 @@ from Powers.utils.parser import mention_html
 from Powers.utils.string import extract_time
 from Powers.vars import Config
 
-SUPPORT_STAFF = get_support_staff()
 
 @Gojo.on_message(command("tban") & restrict_filter)
 async def tban_usr(c: Gojo, m: Message):
@@ -40,6 +39,8 @@ async def tban_usr(c: Gojo, m: Message):
         await m.reply_text("WTF??  Why would I ban myself?")
         await m.stop_propagation()
 
+    SUPPORT_STAFF = get_support_staff()
+
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
             text="This user is in my support staff, cannot restrict them."
@@ -160,6 +161,8 @@ async def stban_usr(c: Gojo, m: Message):
         await m.reply_text(text="I can't ban nothing!")
         await m.stop_propagation()
 
+    SUPPORT_STAFF = get_support_staff()
+
     try:
         user_id, _, _ = await extract_user(c, m)
     except Exception:
@@ -266,6 +269,8 @@ async def dtban_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I ban myself?")
         await m.stop_propagation()
 
+    SUPPORT_STAFF = get_support_staff()
+
     if user_id in SUPPORT_STAFF:
         await m.reply_text(text="I am not going to ban one of my support staff")
         LOGGER.info(
@@ -394,6 +399,8 @@ async def kick_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I kick myself?")
         await m.stop_propagation()
 
+    SUPPORT_STAFF = get_support_staff()
+
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
             text="This user is in my support staff, cannot restrict them."
@@ -483,6 +490,8 @@ async def skick_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I kick myself?")
         await m.stop_propagation()
 
+    SUPPORT_STAFF = get_support_staff()
+
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
             text="This user is in my support staff, cannot restrict them."
@@ -555,6 +564,8 @@ async def dkick_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I kick myself?")
         await m.stop_propagation()
 
+    SUPPORT_STAFF = get_support_staff()
+
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
             text="This user is in my support staff, cannot restrict them."
@@ -704,6 +715,8 @@ async def sban_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I ban myself?")
         await m.stop_propagation()
 
+    SUPPORT_STAFF = get_support_staff()
+
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
             text="This user is in my support staff, cannot restrict them."
@@ -783,6 +796,8 @@ async def dban_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I ban myself?")
         await m.stop_propagation()
 
+    SUPPORT_STAFF = get_support_staff()
+
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
             text="This user is in my support staff, cannot restrict them."
@@ -882,6 +897,8 @@ async def ban_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I ban myself?")
         await m.stop_propagation()
 
+    SUPPORT_STAFF = get_support_staff()
+
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
             text="This user is in my support staff, cannot restrict them."

Powers/plugins/chat_blacklist.py

@@ -1,5 +1,6 @@
 from traceback import format_exc
 
+from pyrogram.enums import ChatType as CT
 from pyrogram.errors import PeerIdInvalid, RPCError
 from pyrogram.types import Message
 
@@ -33,6 +34,13 @@ async def blacklist_chat(c: Gojo, m: Message):
         await replymsg.edit_text(
             f"Added the following chats to Blacklist.\n<code>{', '.join(chat_ids)}</code>.",
         )
+    else:
+        if m.chat.type == CT.PRIVATE:
+            await m.reply_text("Use in groups")
+        else:
+            chat_id = m.chat.id
+            db.add_chat(chat_id)
+            await m.reply_text("Added this chat to blacklist chats")
     return
 
 
@@ -63,6 +71,16 @@ async def unblacklist_chat(c: Gojo, m: Message):
         await replymsg.edit_text(
             f"Removed the following chats to Blacklist.\n<code>{', '.join(chat_ids)}</code>.",
         )
+    else:
+        if m.chat.type == CT.PRIVATE:
+            await m.reply_text("Use in groups")
+        else:
+            chat_id = m.chat.id
+            bl_chats = bl_chats = db.list_all_chats()
+            if chat_id not in bl_chats:
+                await m.reply_text("This chat is not in my list of blacklisted chats")
+            else:
+                await m.reply_text("Removed this chat from blacklist chats")
     return
 
 
@@ -84,3 +102,17 @@ async def list_blacklist_chats(_, m: Message):
         txt = "No chats are currently blacklisted!"
     await m.reply_text(txt)
     return
+
+
+__PLUGIN__ = "Chat blacklist"
+
+
+
+__HELP__ = """
+**Chat blacklist**
+
+**Dev commands:**
+• /blchat [space separated id or username of chats]: Add chats to black list if given or the current chat.
+• /rmblchat [space separated id or username of chats]: Remove chats from black list if given or the current chat.
+• /blchats: Give the list of blacklisted chats
+"""

Powers/plugins/dev.py

@@ -181,10 +181,13 @@ async def rm_support(c: Gojo, m: Message):
             return
     elif len(split) >= 2:
         try:
-            curr,_,_ = extract_user(m)
+            curr = int(split[1])
         except Exception:
-            await m.reply_text("Dunno who u r talking abt")
-            return
+            try:
+                curr,_,_ = extract_user(m)
+            except Exception:
+                await m.reply_text("Dunno who u r talking abt")
+                return
     else:
         await m.reply_text("**USAGE**\n/rmsupport [reply to user | user id | username]")
         return

Powers/plugins/disable.py

@@ -148,3 +148,23 @@ async def enablealll(_, q: CallbackQuery):
     LOGGER.info(f"{user_id} enabled all in {q.message.chat.id}")
     await q.message.edit_text("Enabled all!", show_alert=True)
     return
+
+
+__PLUGIN__ = "disable able"
+
+__alt_name__ = ["disable commands", "disable"]
+
+
+__HELP__ = """
+**Disable commands**
+
+**Admin commands:**
+• /disable [command]: To disable the given command.
+• /disabledel [on | off]: Will delete the command which is disabled.
+• /enable [command]: To enable the given command.
+• /disableable : Give all disableable commands.
+• /disabled : Give all disabled commands.
+
+**Owner command:**
+• /enableall : Enable all the disabled commands.
+"""

Powers/plugins/flood.py

@@ -20,7 +20,6 @@ from Powers.utils.extras import BAN_GIFS, KICK_GIFS, MUTE_GIFS
 from Powers.utils.kbhelpers import ikb
 from Powers.vars import Config
 
-SUPPORT_STAFF = get_support_staff()
 
 on_key = ["on", "start", "disable"]
 off_key = ["off", "end", "enable", "stop"]
@@ -192,6 +191,7 @@ async def flood_set(c: Gojo, m: Message):
 
 @Gojo.on_callback_query(filters.regex("^f_"))
 async def callbacks(c: Gojo, q: CallbackQuery):
+    SUPPORT_STAFF = get_support_staff()
     data = q.data
     if data == "f_close":
         await q.answer("Closed")
@@ -291,6 +291,7 @@ async def reverse_callbacks(c: Gojo, q: CallbackQuery):
     data = q.data.split("_")
     action = data[1]
     user_id = int(q.data.split("=")[1])
+    SUPPORT_STAFF = get_support_staff()
     if not q.from_user:
         return q.answer("Looks like you are not an user 👀")
     if action == "ban":

Powers/plugins/info.py

@@ -146,10 +146,15 @@ async def user_info(c: Gojo, user, already=False):
 <b>🔅 Second Name</b>: <code>{last_name}</code>
 <b>🔍 Username</b>: {("@" + username) if username else "NA"}
 <b>✍️ Bio</b>: `{about}`
-<b>🧑‍💻 Support</b>: {is_support}
-<b>🥷 Support user type</b>: <code>{omp}</code>
-<b>💣 Gbanned</b>: {gban}
-<b>☠️ Gban reason</b>: <code>{reason}</code>
+<b>🧑‍💻 Support</b>: {is_support}\n"""
+    if is_support:
+        caption += f"<b>🥷 Support user type</b>: <code>{omp}</code>\n<b>💣 Gbanned</b>: {gban}\n"
+    else:
+        caption += f"<b>💣 Gbanned</b>: {gban}\n"
+
+    if gban:
+        caption += f"<b>☠️ Gban reason</b>: <code>{reason}</code>\n"
+    caption += f"""
 <b>🌐 DC ID</b>: {dc_id}
 <b>✋ RESTRICTED</b>: {is_restricted}
 <b>✅ VERIFIED</b>: {is_verified}
@@ -157,7 +162,6 @@ async def user_info(c: Gojo, user, already=False):
 <b>⚠️ SCAM</b> : {is_scam} 
 <b>🤖 BOT</b>: {is_bot}
 <b>👀 Last seen</b>: <code>{last_date}</code>
-
 """
 
     return caption, photo_id

Powers/plugins/locks.py

@@ -15,8 +15,6 @@ from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
 from Powers.utils.custom_filters import command, restrict_filter
 from Powers.vars import Config
 
-SUDO_LEVEL = get_support_staff("sudo_level")
-
 l_t = """
 **Lock Types:**
 - `all` = Everything
@@ -67,10 +65,12 @@ async def lock_perm(c: Gojo, m: Message):
     invite = get_perm.can_invite_users
     pin = get_perm.can_pin_messages
     stickers = animations = games = inlinebots = None
+    lock = LOCKS()
 
     if lock_type == "all":
         try:
             await c.set_chat_permissions(chat_id, ChatPermissions())
+            lock.insert_lock_channel(m.chat.id, "all")
             LOGGER.info(f"{m.from_user.id} locked all permissions in {m.chat.id}")
         except ChatNotModified:
             pass
@@ -80,7 +80,6 @@ async def lock_perm(c: Gojo, m: Message):
         await prevent_approved(m)
         return
 
-    lock = LOCKS()
 
     if lock_type == "msg":
         msg = False
@@ -280,6 +279,7 @@ async def unlock_perm(c: Gojo, m: Message):
         return
 
     if unlock_type == "all":
+        lock = LOCKS()
         try:
             await c.set_chat_permissions(
                 chat_id,
@@ -294,6 +294,7 @@ async def unlock_perm(c: Gojo, m: Message):
                     can_pin_messages=True,
                 ),
             )
+            lock.remove_lock_channel(m.chat.id,"all")
             LOGGER.info(f"{m.from_user.id} unlocked all permissions in {m.chat.id}")
         except ChatNotModified:
             pass
@@ -314,7 +315,6 @@ async def unlock_perm(c: Gojo, m: Message):
     upin = get_uperm.can_pin_messages
     ustickers = uanimations = ugames = uinlinebots = None
 
-    lock = LOCKS()
 
     if unlock_type == "msg":
         umsg = True
@@ -455,6 +455,8 @@ async def is_approved_user(c:Gojo, m: Message):
     except KeyError:
         admins_group = await admin_cache_reload(m, "lock")
     
+    SUDO_LEVEL = get_support_staff("sudo_level")
+
     if m.forward_from:
         if m.from_user.id in ul or m.from_user.id in SUDO_LEVEL or m.from_user.id in admins_group or m.from_user.id == Config.BOT_ID:
             return True

Powers/plugins/muting.py

@@ -20,7 +20,6 @@ from Powers.utils.parser import mention_html
 from Powers.utils.string import extract_time
 from Powers.vars import Config
 
-SUPPORT_STAFF = get_support_staff()
 
 @Gojo.on_message(command("tmute") & restrict_filter)
 async def tmute_usr(c: Gojo, m: Message):
@@ -40,6 +39,8 @@ async def tmute_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I mute myself?")
         return
 
+    SUPPORT_STAFF = get_support_staff()
+
     if user_id in SUPPORT_STAFF:
         LOGGER.info(
             f"{m.from_user.id} trying to mute {user_id} (SUPPORT_STAFF) in {m.chat.id}",
@@ -152,6 +153,7 @@ async def dtmute_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I mute myself?")
         return
 
+    SUPPORT_STAFF = get_support_staff()
     if user_id in SUPPORT_STAFF:
         LOGGER.info(
             f"{m.from_user.id} trying to mute {user_id} (SUPPORT_STAFF) in {m.chat.id}",
@@ -260,6 +262,7 @@ async def stmute_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I mute myself?")
         return
 
+    SUPPORT_STAFF = get_support_staff()
     if user_id in SUPPORT_STAFF:
         LOGGER.info(
             f"{m.from_user.id} trying to mute {user_id} (SUPPORT_STAFF) in {m.chat.id}",
@@ -353,6 +356,7 @@ async def mute_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I mute myself?")
         return
 
+    SUPPORT_STAFF = get_support_staff()
     if user_id in SUPPORT_STAFF:
         LOGGER.info(
             f"{m.from_user.id} trying to mute {user_id} (SUPPORT_STAFF) in {m.chat.id}",
@@ -438,6 +442,8 @@ async def smute_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I mute myself?")
         return
 
+    SUPPORT_STAFF = get_support_staff()
+
     if user_id in SUPPORT_STAFF:
         LOGGER.info(
             f"{m.from_user.id} trying to mute {user_id} (SUPPORT_STAFF) in {m.chat.id}",
@@ -509,6 +515,8 @@ async def dmute_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I mute myself?")
         return
 
+
+    SUPPORT_STAFF = get_support_staff()
     if user_id in SUPPORT_STAFF:
         LOGGER.info(
             f"{m.from_user.id} trying to mute {user_id} (SUPPORT_STAFF) in {m.chat.id}",

Powers/plugins/report.py

@@ -14,7 +14,6 @@ from Powers.utils.custom_filters import admin_filter, command
 from Powers.utils.kbhelpers import ikb
 from Powers.utils.parser import mention_html
 
-SUPPORT_STAFF = get_support_staff()
 
 @Gojo.on_message(
     command("reports") & (filters.private | admin_filter),
@@ -85,7 +84,8 @@ async def report_watcher(c: Gojo, m: Message):
         if reported_user.id == me.id:
             await m.reply_text("Nice try.")
             return
-
+            
+        SUPPORT_STAFF = get_support_staff()
         if reported_user.id in SUPPORT_STAFF:
             await m.reply_text("Uh? You reporting my support team?")
             return

Powers/plugins/warns.py

@@ -18,7 +18,6 @@ from Powers.utils.extract_user import extract_user
 from Powers.utils.parser import mention_html
 from Powers.vars import Config
 
-SUPPORT_STAFF = get_support_staff()
 
 @Gojo.on_message(
     command(["warn", "swarn", "dwarn"]) & restrict_filter,
@@ -49,6 +48,7 @@ async def warn(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I warn myself?")
         return
 
+    SUPPORT_STAFF = get_support_staff()
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
             text="This user is in my support staff, cannot restrict them."
@@ -151,6 +151,7 @@ async def reset_warn(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I warn myself?")
         return
 
+    SUPPORT_STAFF = get_support_staff()
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
             "They are support users, cannot be restriced, how am I then supposed to unrestrict them?",
@@ -186,6 +187,7 @@ async def list_warns(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I warn myself?")
         return
 
+    SUPPORT_STAFF = get_support_staff()
     if user_id in SUPPORT_STAFF:
         await m.reply_text("This user has no warns!")
         LOGGER.info(
@@ -234,6 +236,7 @@ async def remove_warn(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I warn myself?")
         return
 
+    SUPPORT_STAFF = get_support_staff()
     if user_id in SUPPORT_STAFF:
         await m.reply_text("This user has no warns!")
         LOGGER.info(
@@ -300,15 +303,17 @@ async def remove_last_warn_btn(c: Gojo, q: CallbackQuery):
         )
     if action == "kick":
         try:
-            timee = timeee = datetime.now(TIME_ZONE) + timedelta(minutes=45)
+            timee = datetime.now(TIME_ZONE) + timedelta(minutes=45)
             await c.ban_chat_member(chat_id, user_id, until_date=timee)
             await q.message.edit_text(
                 (
                     f"Admin {(await mention_html(q.from_user.first_name, q.from_user.id))} "
-                    "kicked user "
+                    "kicked user they can't join the chat for 45 minutes"
                     f"{(await mention_html(user_first_name, user_id))} for last warning!"
                 ),
             )
+            warn_db = Warns(q.message.chat.id)
+            warn_db.reset_warns(user_id)
         except RPCError as err:
             await q.message.edit_text(
                 f"🛑 Failed to Kick\n<b>Error:</b>\n</code>{err}</code>",
@@ -388,5 +393,7 @@ __HELP__ = """
 • /warnmode `<ban/kick/mute>`: Set the chat's warn mode.
 • /warnlimit `<number>`: Set the number of warnings before users are punished.
 
+**IF THE USER IS KICKED THEN THEY WILL BE TEMPORARILY BANNED FOR 45 MINUTES**
+
 **Examples:**
 `/warn @user`: this warns a user in the chat."""

Powers/plugins/watchers.py

@@ -22,7 +22,6 @@ from Powers.utils.regex_utils import regex_searcher
 
 # Initialise
 gban_db = GBan()
-SUPPORT_STAFF = get_support_staff()
 
 @Gojo.on_message(filters.linked_channel)
 async def antichanpin_cleanlinked(c: Gojo, m: Message):
@@ -124,7 +123,8 @@ async def bl_watcher(_, m: Message):
                     ),
                 )
             return
-
+        
+        SUPPORT_STAFF = get_support_staff()
         if m.from_user.id in SUPPORT_STAFF:
             # Don't work on Support Staff!
             return

Powers/utils/admin_check.py

@@ -5,9 +5,6 @@ from pyrogram.types import CallbackQuery, Message
 
 from Powers import DEV_USERS, LOGGER, OWNER_ID, SUDO_USERS
 
-SUDO_LEVEL = SUDO_USERS + DEV_USERS + [int(OWNER_ID)]
-DEV_LEVEL = DEV_USERS + [int(OWNER_ID)]
-
 
 async def admin_check(m: Message or CallbackQuery) -> bool:
     """Checks if user is admin or not."""
@@ -16,6 +13,8 @@ async def admin_check(m: Message or CallbackQuery) -> bool:
     if isinstance(m, CallbackQuery):
         user_id = m.message.from_user.id
 
+    SUDO_LEVEL = SUDO_USERS + DEV_USERS + [int(OWNER_ID)]
+
     try:
         if user_id in SUDO_LEVEL:
             return True
@@ -66,6 +65,8 @@ async def owner_check(m: Message or CallbackQuery) -> bool:
         user_id = m.message.from_user.id
         m = m.message
 
+    SUDO_LEVEL = SUDO_USERS + DEV_USERS + [int(OWNER_ID)]
+
     try:
         if user_id in SUDO_LEVEL:
             return True

Powers/utils/custom_filters.py

@@ -18,9 +18,6 @@ from Powers.database.flood_db import Floods
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
 from Powers.vars import Config
 
-SUDO_LEVEL = set(SUDO_USERS + DEV_USERS + [int(OWNER_ID)])
-DEV_LEVEL = set(DEV_USERS + [int(OWNER_ID)])
-
 
 def command(
     commands: Union[str, List[str]],
@@ -52,11 +49,11 @@ def command(
         if owner_cmd and (m.from_user.id != OWNER_ID):
             # Only owner allowed to use this...!
             return False
-
+        DEV_LEVEL = set(DEV_USERS + [int(OWNER_ID)])
         if dev_cmd and (m.from_user.id not in DEV_LEVEL):
             # Only devs allowed to use this...!
             return False
-
+        SUDO_LEVEL = set(SUDO_USERS + DEV_USERS + [int(OWNER_ID)])
         if sudo_cmd and (m.from_user.id not in SUDO_LEVEL):
             # Only sudos and above allowed to use it
             return False
@@ -73,7 +70,7 @@ def command(
             m.command = [matches.group(1)]
             if matches.group(1) not in flt.commands:
                 return False
-            if bool(m.chat and m.chat.type in {ChatType.SUPERGROUP}):
+            if bool(m.chat and m.chat.type in {ChatType.SUPERGROUP, ChatType.GROUP}):
                 try:
                     user_status = (await m.chat.get_member(m.from_user.id)).status
                 except UserNotParticipant:
@@ -293,6 +290,7 @@ async def can_pin_message_func(_, __, m):
         return True
 
     # Bypass the bot devs, sudos and owner
+    SUDO_LEVEL = set(SUDO_USERS + DEV_USERS + [int(OWNER_ID)])
     if m.from_user.id in SUDO_LEVEL:
         return True
 
@@ -362,7 +360,8 @@ async def flood_check_filter(_, __, m: Message):
     is_flood = Flood.is_chat(c_id)
     
     app_users = Approve(m.chat.id).list_approved()
-
+    SUDO_LEVEL = set(SUDO_USERS + DEV_USERS + [int(OWNER_ID)])
+    
     if not is_flood or u_id in SUDO_LEVEL:
         return False
     

Powers/utils/start_utils.py

@@ -53,7 +53,7 @@ async def gen_start_kb(q: Message or CallbackQuery):
                     "📚 Commands & Help", "commands"
                 ),
                 (
-                    "👾 Bot info",
+                    "Bot info 👾",
                     "bot_curr_info"
                 )
             ],
@@ -71,12 +71,12 @@ async def gen_start_kb(q: Message or CallbackQuery):
             ],
             [
                 (
-                    "Essential",
+                    "❗️ Essential",
                     "https://t.me/+PcVYvdzNt4E1YjM1",
                     "url",
                 ),
                 (
-                    "Powered by",
+                    "Powered by ⚡️",
                     f"https://{Config.SUPPORT_CHANNEL}.t.me",
                     "url",
                 ),