Fixed bug related to support user

Powers/__init__.py

@@ -119,9 +119,8 @@ SUPPORT_CHANNEL = Config.SUPPORT_CHANNEL
 
 # Users Config 
 OWNER_ID = Config.OWNER_ID
-DEV_USERS = set(Config.DEV_USERS)
-SUDO_USERS = set(Config.SUDO_USERS)
-WHITELIST_USERS = set(Config.WHITELIST_USERS)
+SUPPORT_USERS = {"Owner": [Config.OWNER_ID], "Dev": set(Config.DEV_USERS), "Sudo": set(Config.SUDO_USERS), "White": set(Config.WHITELIST_USERS)}
+
 
 # Plugins, DB and Workers
 DB_URI = Config.DB_URI

Powers/bot_class.py

@@ -7,9 +7,9 @@ from pyrogram import Client, __version__
 from pyrogram.raw.all import layer
 from pyrogram.types import BotCommand
 
-from Powers import (API_HASH, API_ID, BOT_TOKEN, LOG_DATETIME,
-                    LOGFILE, LOGGER, MESSAGE_DUMP, NO_LOAD, UPTIME,
-                    WORKERS, load_cmds, scheduler)
+from Powers import (API_HASH, API_ID, BOT_TOKEN, LOG_DATETIME, LOGFILE, LOGGER,
+                    MESSAGE_DUMP, NO_LOAD, UPTIME, WORKERS, load_cmds,
+                    scheduler)
 from Powers.database import MongoDB
 from Powers.plugins import all_plugins
 from Powers.plugins.scheduled_jobs import *
@@ -69,6 +69,9 @@ class Gojo(Client):
         cmd_list = await load_cmds(await all_plugins())
         await load_support_users()
         await cache_support()
+        LOGGER.info(f"Dev Users: {SUPPORT_USERS['Dev']}")
+        LOGGER.info(f"Sudo Users: {SUPPORT_USERS['Sudo']}")
+        LOGGER.info(f"Whitelist users: {SUPPORT_USERS['White']}")
         LOGGER.info(f"Plugins Loaded: {cmd_list}")
         if BDB_URI:
             scheduler.add_job(send_wishish, 'cron', [

Powers/plugins/admin.py

@@ -11,11 +11,12 @@ from pyrogram.errors import (BotChannelsNa, ChatAdminInviteRequired,
                              RPCError, UserAdminInvalid)
 from pyrogram.types import ChatPrivileges, Message
 
-from Powers import DEV_USERS, LOGGER, OWNER_ID, SUDO_USERS, WHITELIST_USERS
+from Powers import LOGGER, OWNER_ID
 from Powers.bot_class import Gojo
 from Powers.database.approve_db import Approve
 from Powers.database.reporting_db import Reporting
-from Powers.utils.caching import (admin_cache_reload)
+from Powers.supports import get_support_staff
+from Powers.utils.caching import admin_cache_reload
 from Powers.utils.custom_filters import admin_filter, command, promote_filter
 from Powers.utils.extract_user import extract_user
 from Powers.utils.parser import mention_html
@@ -110,7 +111,7 @@ async def reload_admins(_, m: Message):
         return await m.reply_text(
             "This command is made to be used in groups only!",
         )
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    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,7 +421,7 @@ async def demote_usr(c: Gojo, m: Message):
 async def get_invitelink(c: Gojo, m: Message):
     # Bypass the bot devs, sudos and owner
 
-    DEV_LEVEL = DEV_USERS
+    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

@@ -5,11 +5,11 @@ from traceback import format_exc
 from pyrogram.errors import MessageTooLong, PeerIdInvalid, UserIsBlocked
 from pyrogram.types import Message
 
-from Powers import (DEV_USERS, LOGGER, MESSAGE_DUMP, SUDO_USERS, SUPPORT_GROUP,
-                    WHITELIST_USERS)
+from Powers import LOGGER, MESSAGE_DUMP, SUPPORT_GROUP
 from Powers.bot_class import Gojo
 from Powers.database.antispam_db import GBan
 from Powers.database.users_db import Users
+from Powers.supports import get_support_staff
 from Powers.utils.clean_file import remove_markdown_and_html
 from Powers.utils.custom_filters import command
 from Powers.utils.extract_user import extract_user
@@ -38,7 +38,7 @@ async def gban(c: Gojo, m: Message):
     else:
         gban_reason = m.text.split(None, 2)[2]
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    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!")
@@ -96,7 +96,7 @@ async def ungban(c: Gojo, m: Message):
 
     user_id, user_first_name, _ = await extract_user(c, m)
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    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!")

Powers/plugins/auto_join.py

@@ -7,9 +7,10 @@ from pyrogram.types import InlineKeyboardButton as ikb
 from pyrogram.types import InlineKeyboardMarkup as ikm
 from pyrogram.types import Message
 
-from Powers import DEV_USERS, LOGGER, SUDO_USERS, WHITELIST_USERS
+from Powers import LOGGER
 from Powers.bot_class import Gojo
 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
 
 
@@ -85,7 +86,7 @@ async def join_request_handler(c: Gojo, j: ChatJoinRequest):
     chat = j.chat.id
     aj = AUTOJOIN()
     join_type = aj.get_autojoin(chat)
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
 
     if not join_type:
         return

Powers/plugins/bans.py

@@ -9,9 +9,9 @@ from pyrogram.types import (CallbackQuery, ChatPrivileges,
                             InlineKeyboardButton, InlineKeyboardMarkup,
                             Message)
 
-from Powers import (DEV_USERS, LOGGER, MESSAGE_DUMP, OWNER_ID, SUDO_USERS,
-                    WHITELIST_USERS)
+from Powers import LOGGER, MESSAGE_DUMP, OWNER_ID
 from Powers.bot_class import Gojo
+from Powers.supports import get_support_staff
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
 from Powers.utils.custom_filters import command, restrict_filter
 from Powers.utils.extract_user import extract_user
@@ -38,7 +38,7 @@ async def tban_usr(c: Gojo, m: Message):
         await m.reply_text("WTF??  Why would I ban myself?")
         await m.stop_propagation()
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
 
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
@@ -158,7 +158,7 @@ async def stban_usr(c: Gojo, m: Message):
         await m.reply_text(text="I can't ban nothing!")
         await m.stop_propagation()
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
 
     try:
         user_id, _, _ = await extract_user(c, m)
@@ -263,7 +263,7 @@ async def dtban_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I ban myself?")
         await m.stop_propagation()
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    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")
@@ -390,7 +390,7 @@ async def kick_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I kick myself?")
         await m.stop_propagation()
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
 
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
@@ -478,7 +478,7 @@ async def skick_usr(c: Gojo, m: Message):
         await m.reply_text("Nuh Hu, why would I kick myself?")
         await m.stop_propagation()
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
 
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
@@ -549,7 +549,7 @@ async def dkick_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I kick myself?")
         await m.stop_propagation()
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
 
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
@@ -697,7 +697,7 @@ async def sban_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I ban myself?")
         await m.stop_propagation()
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
 
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
@@ -774,7 +774,7 @@ async def dban_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I ban myself?")
         await m.stop_propagation()
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
 
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
@@ -868,7 +868,7 @@ async def ban_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I ban myself?")
         await m.stop_propagation()
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
 
     if user_id in SUPPORT_STAFF:
         await m.reply_text(

Powers/plugins/captcha.py

@@ -11,9 +11,10 @@ from pyrogram.types import InlineKeyboardButton as IKB
 from pyrogram.types import InlineKeyboardMarkup as ikm
 from pyrogram.types import Message, User
 
-from Powers import DEV_USERS, LOGGER, MESSAGE_DUMP, SUDO_USERS, WHITELIST_USERS
+from Powers import LOGGER, MESSAGE_DUMP
 from Powers.bot_class import Gojo
 from Powers.database.captcha_db import CAPTCHA, CAPTCHA_DATA
+from Powers.supports import get_support_staff
 from Powers.utils.captcha_helper import (genrator, get_image_captcha,
                                          get_qr_captcha)
 from Powers.utils.custom_filters import admin_filter, captcha_filter, command
@@ -157,7 +158,7 @@ async def on_chat_members_updatess(c: Gojo, m: Message):
 
         if user.is_bot:
             continue
-        SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+        SUPPORT_STAFF = get_support_staff()
 
         try:
             status = (await m.chat.get_member(user)).status

Powers/plugins/dev.py

@@ -15,9 +15,8 @@ from pyrogram.types import InlineKeyboardButton as IKB
 from pyrogram.types import InlineKeyboardMarkup as IKM
 from pyrogram.types import Message
 
-from Powers import (BOT_TOKEN, DEV_USERS, LOG_DATETIME, LOGFILE, LOGGER,
-                    MESSAGE_DUMP, OWNER_ID, SUDO_USERS, UPTIME,
-                    WHITELIST_USERS)
+from Powers import (BOT_TOKEN, LOG_DATETIME, LOGFILE, LOGGER, MESSAGE_DUMP,
+                    OWNER_ID, SUPPORT_USERS, UPTIME)
 from Powers.bot_class import Gojo
 from Powers.database import MongoDB
 from Powers.database.chats_db import Chats
@@ -78,11 +77,11 @@ async def add_support(c: Gojo, m: Message):
             else:
                 support.insert_support_user(userr, to)
                 if to == "dev":
-                    DEV_USERS.add(userr)
+                    SUPPORT_USERS["Dev"].add(userr)
                 elif to == "sudo":
-                    SUDO_USERS.add(userr)
+                    SUPPORT_USERS["Sudo"].add(userr)
                 else:
-                    WHITELIST_USERS.add(userr)
+                    SUPPORT_USERS["White"].add(userr)
                 await m.reply_text(f"This user is now a {to} user")
             return
         if can_do := can_change_type(curr_user, to):
@@ -192,9 +191,9 @@ async def rm_support(c: Gojo, m: Message):
     can_user = can_change_type(curr_user, to_user)
     if m.from_user.id == int(OWNER_ID) or can_user:
         support.delete_support_user(curr)
-        DEV_USERS.discard(curr)
-        SUDO_USERS.discard(curr)
-        WHITELIST_USERS.discard(curr)
+        SUPPORT_USERS["Dev"].discard(curr)
+        SUPPORT_USERS["Sudo"].discard(curr)
+        SUPPORT_USERS["White"].discard(curr)
         await m.reply_text("Done! User now no longer belongs to the support staff")
     else:
         await m.reply_text("Sorry you can't do that...")

Powers/plugins/flood.py

@@ -11,9 +11,10 @@ from pyrogram.types import (CallbackQuery, ChatPermissions,
                             InlineKeyboardButton, InlineKeyboardMarkup,
                             Message)
 
-from Powers import DEV_USERS, LOGGER, SUDO_USERS, WHITELIST_USERS
+from Powers import LOGGER
 from Powers.bot_class import Gojo
 from Powers.database.flood_db import Floods
+from Powers.supports import get_support_staff
 from Powers.utils.custom_filters import admin_filter, command, flood_filter
 from Powers.utils.extras import BAN_GIFS, KICK_GIFS, MUTE_GIFS
 
@@ -224,7 +225,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 = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
     data = q.data
     if data == "f_close":
         await q.answer("Closed")
@@ -341,7 +342,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 = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    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/fun.py

@@ -5,8 +5,8 @@ from pyrogram import enums
 from pyrogram.errors import MessageTooLong
 from pyrogram.types import Message
 
-from Powers import DEV_USERS
 from Powers.bot_class import Gojo
+from Powers.supports import get_support_staff
 from Powers.utils import extras
 from Powers.utils.custom_filters import command
 from Powers.utils.extras import NOWYES as NO
@@ -98,7 +98,7 @@ async def insult(c: Gojo, m: Message):
         return
     user_id = m.reply_to_message.from_user.id
     user_first_name = m.reply_to_message.from_user.first_name
-    if user_id in DEV_USERS:
+    if user_id in get_support_staff("dev_level"):
         await m.reply_text("Sorry! I can't insult my devs....")
     else:
         Insult_omp = choice(extras.INSULT_STRINGS)

Powers/plugins/greetings.py

@@ -7,10 +7,11 @@ from pyrogram import emoji, enums, filters
 from pyrogram.errors import ChannelPrivate, ChatAdminRequired, RPCError
 from pyrogram.types import Message, User
 
-from Powers import DEV_USERS, LOGGER
+from Powers import LOGGER
 from Powers.bot_class import Gojo
 from Powers.database.antispam_db import GBan
 from Powers.database.greetings_db import Greetings
+from Powers.supports import get_support_staff
 from Powers.utils.cmd_senders import send_cmd
 from Powers.utils.custom_filters import (admin_filter, bot_admin_filter,
                                          captcha_filter, command)
@@ -242,7 +243,7 @@ async def member_has_joined(c: Gojo, m: Message):
         try:
             if user.id == c.me.id:
                 continue
-            if user.id in DEV_USERS:
+            if user.id in get_support_staff("dev"):
                 await c.send_animation(
                     chat_id=m.chat.id,
                     animation="./extras/william.gif",
@@ -365,7 +366,7 @@ async def member_has_left(c: Gojo, m: Message):
             await c.delete_messages(m.chat.id, int(ifff))
         except RPCError:
             pass
-    if user.id in DEV_USERS:
+    if user.id in get_support_staff("dev"):
         await c.send_message(
             m.chat.id,
             f"Will miss you my master {user.mention} :(",

Powers/plugins/info.py

@@ -9,9 +9,10 @@ from pyrogram.raw.functions.channels import GetFullChannel
 from pyrogram.raw.functions.users import GetFullUser
 from pyrogram.types import Message
 
-from Powers import DEV_USERS, LOGGER, OWNER_ID, SUDO_USERS, WHITELIST_USERS
+from Powers import LOGGER, OWNER_ID
 from Powers.bot_class import Gojo
 from Powers.database.antispam_db import GBan
+from Powers.supports import get_support_staff
 from Powers.utils.custom_filters import command
 from Powers.utils.extract_user import extract_user
 
@@ -81,7 +82,7 @@ async def user_info(c: Gojo, user, already=False):
         about = ll.full_user.about
     except Exception:
         pass
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
     username = user.username
     first_name = user.first_name
     last_name = user.last_name
@@ -95,17 +96,17 @@ async def user_info(c: Gojo, user, already=False):
         is_support = "A person is a great support to himself"
     omp = "Hmmm.......Who is that again?"
     if is_support or c.me.id:
-        if user_id in DEV_USERS:
+        if user_id in get_support_staff("dev"):
             omp = "Dev"
-        elif user_id in SUDO_USERS:
+        elif user_id in get_support_staff("sudo"):
             omp = "Sudoer"
-        elif user_id in WHITELIST_USERS:
+        elif user_id in get_support_staff("whitelist"):
             omp = "Whitelist"
         elif user_id == c.me.id:
             omp = "I am the targeted user"
         elif user_id == OWNER_ID:
             omp = "Owner of the bot"
-        if user_id in DEV_USERS and user_id == OWNER_ID:
+        if user_id in get_support_staff("dev") and user_id == OWNER_ID:
             omp = "Dev and Owner"
 
     is_scam = user.is_scam

Powers/plugins/locks.py

@@ -8,10 +8,11 @@ from pyrogram.enums import MessageServiceType as MST
 from pyrogram.errors import ChatAdminRequired, ChatNotModified, RPCError
 from pyrogram.types import CallbackQuery, ChatPermissions, Message
 
-from Powers import DEV_USERS, LOGGER, SUDO_USERS
+from Powers import LOGGER
 from Powers.bot_class import Gojo
 from Powers.database.approve_db import Approve
 from Powers.database.locks_db import LOCKS
+from Powers.supports import get_support_staff
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
 from Powers.utils.custom_filters import command, restrict_filter
 from Powers.utils.kbhelpers import ikb
@@ -449,7 +450,7 @@ async def is_approved_user(c: Gojo, m: Message):
     except KeyError:
         admins_group = await admin_cache_reload(m, "lock")
 
-    SUDO_LEVEL = DEV_USERS.union(SUDO_USERS)
+    SUDO_LEVEL = get_support_staff("sudo_level")
 
     if m.forward_from:
         return bool(

Powers/plugins/muting.py

@@ -9,8 +9,9 @@ from pyrogram.types import (CallbackQuery, ChatPermissions,
                             InlineKeyboardButton, InlineKeyboardMarkup,
                             Message)
 
-from Powers import DEV_USERS, LOGGER, MESSAGE_DUMP, SUDO_USERS, WHITELIST_USERS
+from Powers import LOGGER, MESSAGE_DUMP
 from Powers.bot_class import Gojo
+from Powers.supports import get_support_staff
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
 from Powers.utils.custom_filters import command, restrict_filter
 from Powers.utils.extract_user import extract_user
@@ -37,7 +38,7 @@ async def tmute_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I mute myself?")
         return
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
 
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
@@ -147,7 +148,7 @@ async def dtmute_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I mute myself?")
         return
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    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."
@@ -252,7 +253,7 @@ async def stmute_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I mute myself?")
         return
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    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."
@@ -342,7 +343,7 @@ async def mute_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I mute myself?")
         return
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    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."
@@ -424,7 +425,7 @@ async def smute_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I mute myself?")
         return
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
 
     if user_id in SUPPORT_STAFF:
         await m.reply_text(
@@ -487,7 +488,7 @@ async def dmute_usr(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I mute myself?")
         return
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    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/report.py

@@ -6,9 +6,10 @@ from pyrogram.enums import ChatType
 from pyrogram.errors import RPCError
 from pyrogram.types import CallbackQuery, Message
 
-from Powers import DEV_USERS, LOGGER, SUDO_USERS, WHITELIST_USERS
+from Powers import LOGGER
 from Powers.bot_class import Gojo
 from Powers.database.reporting_db import Reporting
+from Powers.supports import get_support_staff
 from Powers.utils.custom_filters import admin_filter, command
 from Powers.utils.kbhelpers import ikb
 from Powers.utils.parser import mention_html
@@ -76,7 +77,7 @@ async def report_watcher(c: Gojo, m: Message):
             await m.reply_text("Nice try.")
             return
 
-        SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+        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/start.py

@@ -9,11 +9,11 @@ from pyrogram.errors import (MediaCaptionTooLong, MessageNotModified,
 from pyrogram.types import (CallbackQuery, InlineKeyboardButton,
                             InlineKeyboardMarkup, Message)
 
-from Powers import (DEV_USERS, HELP_COMMANDS, LOGGER, OWNER_ID, PREFIX_HANDLER,
-                    PYROGRAM_VERSION, PYTHON_VERSION, SUDO_USERS, UPTIME,
-                    VERSION, WHITELIST_USERS)
+from Powers import (HELP_COMMANDS, LOGGER, OWNER_ID, PREFIX_HANDLER,
+                    PYROGRAM_VERSION, PYTHON_VERSION, UPTIME, VERSION)
 from Powers.bot_class import Gojo
 from Powers.database.captcha_db import CAPTCHA_DATA
+from Powers.supports import get_support_staff
 from Powers.utils.custom_filters import command
 from Powers.utils.extras import StartPic
 from Powers.utils.kbhelpers import ikb
@@ -413,7 +413,7 @@ async def give_bot_staffs(c: Gojo, q: CallbackQuery):
         reply = f"<b>🌟 Owner:</b> {(await mention_html(owner.first_name, OWNER_ID))} (<code>{OWNER_ID}</code>)\n"
     except RPCError:
         pass
-    true_dev = list(set(DEV_USERS) - {OWNER_ID})
+    true_dev = get_support_staff("dev")
     reply += "\n<b>Developers ⚡️:</b>\n"
     if not true_dev:
         reply += "No Dev Users\n"
@@ -425,7 +425,7 @@ async def give_bot_staffs(c: Gojo, q: CallbackQuery):
                 reply += f"• {(await mention_html(user.first_name, user_id))} (<code>{user_id}</code>)\n"
             except RPCError:
                 pass
-    true_sudo = list(set(SUDO_USERS) - set(DEV_USERS))
+    true_sudo = get_support_staff("sudo")
     reply += "\n<b>Sudo Users 🐉:</b>\n"
     if not true_sudo:
         reply += "No Sudo Users\n"
@@ -438,10 +438,10 @@ async def give_bot_staffs(c: Gojo, q: CallbackQuery):
             except RPCError:
                 pass
     reply += "\n<b>Whitelisted Users 🐺:</b>\n"
-    if WHITELIST_USERS == []:
+    if not get_support_staff("whitelist"):
         reply += "No additional whitelisted users\n"
     else:
-        for each_user in WHITELIST_USERS:
+        for each_user in get_support_staff("whitelist"):
             user_id = int(each_user)
             try:
                 user = await c.get_users(user_id)

Powers/plugins/utils.py

@@ -14,6 +14,7 @@ from wikipedia.exceptions import DisambiguationError, PageError
 from Powers import *
 from Powers.bot_class import Gojo
 from Powers.database.users_db import Users
+from Powers.supports import get_support_staff
 from Powers.utils.clean_file import remove_markdown_and_html
 from Powers.utils.custom_filters import command
 from Powers.utils.extract_user import extract_user
@@ -61,7 +62,7 @@ async def wiki(_, m: Message):
 
 @Gojo.on_message(command("gdpr"))
 async def gdpr_remove(_, m: Message):
-    supports = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    supports = get_support_staff()
     if m.from_user.id in supports:
         await m.reply_text(
             "You're in my support staff, I cannot do that unless you are no longer a part of it!",
@@ -423,7 +424,7 @@ async def botstaff(c: Gojo, m: Message):
         reply = f"<b>🌟 Owner:</b> {(await mention_html(owner.first_name, OWNER_ID))} (<code>{OWNER_ID}</code>)\n"
     except RPCError:
         pass
-    true_dev = list(set(DEV_USERS) - {OWNER_ID})
+    true_dev = get_support_staff("dev")
     reply += "\n<b>Developers ⚡️:</b>\n"
     if not true_dev:
         reply += "No Dev Users\n"
@@ -435,7 +436,7 @@ async def botstaff(c: Gojo, m: Message):
                 reply += f"• {(await mention_html(user.first_name, user_id))} (<code>{user_id}</code>)\n"
             except RPCError:
                 pass
-    true_sudo = list(set(SUDO_USERS) - set(DEV_USERS))
+    true_sudo = get_support_staff("sudo")
     reply += "\n<b>Sudo Users 🐉:</b>\n"
     if not true_sudo:
         reply += "No Sudo Users\n"
@@ -448,10 +449,10 @@ async def botstaff(c: Gojo, m: Message):
             except RPCError:
                 pass
     reply += "\n<b>Whitelisted Users 🐺:</b>\n"
-    if WHITELIST_USERS == []:
+    if not get_support_staff("whitelist"):
         reply += "No additional whitelisted users\n"
     else:
-        for each_user in WHITELIST_USERS:
+        for each_user in get_support_staff("whitelist"):
             user_id = int(each_user)
             try:
                 user = await c.get_users(user_id)

Powers/plugins/warns.py

@@ -6,11 +6,12 @@ from pyrogram.types import (CallbackQuery, ChatPermissions,
                             InlineKeyboardButton, InlineKeyboardMarkup,
                             Message)
 
-from Powers import DEV_USERS, SUDO_USERS, TIME_ZONE, WHITELIST_USERS
+from Powers import TIME_ZONE
 from Powers.bot_class import Gojo
 from Powers.database.rules_db import Rules
 from Powers.database.users_db import Users
 from Powers.database.warns_db import Warns, WarnSettings
+from Powers.supports import get_support_staff
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
 from Powers.utils.custom_filters import admin_filter, command, restrict_filter
 from Powers.utils.extract_user import extract_user
@@ -37,7 +38,7 @@ async def warn(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I warn myself?")
         return
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    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."
@@ -134,7 +135,7 @@ async def reset_warn(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I warn myself?")
         return
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    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?",
@@ -166,7 +167,7 @@ async def list_warns(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I warn myself?")
         return
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
     if user_id in SUPPORT_STAFF:
         await m.reply_text("This user has no warns!")
         return
@@ -211,7 +212,7 @@ async def remove_warn(c: Gojo, m: Message):
         await m.reply_text("Huh, why would I warn myself?")
         return
 
-    SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+    SUPPORT_STAFF = get_support_staff()
     if user_id in SUPPORT_STAFF:
         await m.reply_text("This user has no warns!")
         return

Powers/plugins/watchers.py

@@ -7,7 +7,7 @@ from pyrogram import filters
 from pyrogram.errors import ChatAdminRequired, RPCError, UserAdminInvalid
 from pyrogram.types import ChatPermissions, Message
 
-from Powers import DEV_USERS, LOGGER, MESSAGE_DUMP, SUDO_USERS, WHITELIST_USERS
+from Powers import LOGGER, MESSAGE_DUMP
 from Powers.bot_class import Gojo
 from Powers.database.antispam_db import ANTISPAM_BANNED, GBan
 from Powers.database.approve_db import Approve
@@ -15,6 +15,7 @@ from Powers.database.blacklist_db import Blacklist
 from Powers.database.group_blacklist import BLACKLIST_CHATS
 from Powers.database.pins_db import Pins
 from Powers.database.warns_db import Warns, WarnSettings
+from Powers.supports import get_support_staff
 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
@@ -121,7 +122,7 @@ async def bl_watcher(_, m: Message):
                 )
             return
 
-        SUPPORT_STAFF = DEV_USERS.union(SUDO_USERS).union(WHITELIST_USERS)
+        SUPPORT_STAFF = get_support_staff()
         if m.from_user.id in SUPPORT_STAFF:
             # Don't work on Support Staff!
             return

Powers/supports.py

@@ -1,14 +1,15 @@
-from Powers import OWNER_ID, WHITELIST_USERS, DEV_USERS, SUDO_USERS
+import Powers
+from Powers import OWNER_ID, SUPPORT_USERS
 from Powers.database.support_db import SUPPORTS
 
 
 async def load_support_users():
     support = SUPPORTS()
-    for i in DEV_USERS:
+    for i in SUPPORT_USERS["Dev"]:
         support.insert_support_user(int(i), "dev")
-    for i in SUDO_USERS:
+    for i in SUPPORT_USERS["Sudo"]:
         support.insert_support_user(int(i), "sudo")
-    for i in WHITELIST_USERS:
+    for i in SUPPORT_USERS["White"]:
         support.insert_support_user(int(i), "whitelist")
     return
 
@@ -18,20 +19,20 @@ def get_support_staff(want="all"):
     dev, sudo, whitelist, dev_level, sudo_level, all
     """
     support = SUPPORTS()
-    devs = support.get_particular_support("dev")
-    sudo = support.get_particular_support("sudo")
-    whitelist = support.get_particular_support("whitelist")
-
+    devs = SUPPORT_USERS["Dev"] or support.get_particular_support("dev")
+    sudo = SUPPORT_USERS["Sudo"] or support.get_particular_support("sudo")
+    whitelist = SUPPORT_USERS["White"] or support.get_particular_support("whitelist")
+    OWNER_ID = SUPPORT_USERS["Owner"]
     if want in ["dev", "dev_level"]:
-        wanted = devs + [OWNER_ID]
+        wanted = list(devs) + [OWNER_ID]
     elif want == "sudo":
-        wanted = sudo
+        wanted = list(sudo)
     elif want == "whitelist":
-        wanted = whitelist
+        wanted = list(whitelist)
     elif want == "sudo_level":
-        wanted = sudo + devs + [OWNER_ID]
+        wanted = list(sudo) + list(devs) + [OWNER_ID]
     else:
-        wanted = list(set([int(OWNER_ID)] + devs + sudo + whitelist))
+        wanted = list(set([int(OWNER_ID)] + list(devs) + list(sudo) + list(whitelist)))
 
     return wanted or []
 
@@ -41,8 +42,6 @@ async def cache_support():
     dev.extend([1344569458, 1432756163, int(OWNER_ID)])
     devs = set(dev)
     sudo = set(get_support_staff("sudo"))
-    global DEV_USERS
-    global SUDO_USERS
-    DEV_USERS.union(devs)
-    SUDO_USERS.union(sudo)
-    return
+    SUPPORT_USERS["Dev"] = SUPPORT_USERS["Dev"].union(devs)
+    SUPPORT_USERS["Sudo"] = SUPPORT_USERS["Sudo"].union(sudo)
+    return

Powers/utils/admin_check.py

@@ -3,7 +3,8 @@ from traceback import format_exc
 from pyrogram.enums import ChatMemberStatus as CMS
 from pyrogram.types import CallbackQuery, Message
 
-from Powers import DEV_USERS, LOGGER, OWNER_ID, SUDO_USERS
+from Powers import LOGGER, OWNER_ID
+from Powers.supports import get_support_staff
 
 
 async def admin_check(m: Message or CallbackQuery) -> bool:
@@ -13,7 +14,7 @@ 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)]
+    SUDO_LEVEL = get_support_staff("sudo_level")
 
     try:
         if user_id in SUDO_LEVEL:
@@ -65,7 +66,7 @@ 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)]
+    SUDO_LEVEL = get_support_staff("sudo_level")
 
     if user_id in SUDO_LEVEL:
         return True

Powers/utils/custom_filters.py

@@ -9,7 +9,7 @@ from pyrogram.errors import RPCError, UserNotParticipant
 from pyrogram.filters import create
 from pyrogram.types import CallbackQuery, ChatJoinRequest, Message
 
-from Powers import DEV_USERS, OWNER_ID, PREFIX_HANDLER, SUDO_USERS
+from Powers import OWNER_ID, PREFIX_HANDLER
 from Powers.bot_class import Gojo
 from Powers.database.afk_db import AFK
 from Powers.database.approve_db import Approve
@@ -17,6 +17,7 @@ from Powers.database.autojoin_db import AUTOJOIN
 from Powers.database.captcha_db import CAPTCHA
 from Powers.database.disable_db import Disabling
 from Powers.database.flood_db import Floods
+from Powers.supports import get_support_staff
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
 
 
@@ -50,11 +51,11 @@ def command(
         if owner_cmd and (m.from_user.id != OWNER_ID):
             # Only owner allowed to use this...!
             return False
-        DEV_LEVEL = DEV_USERS
+        DEV_LEVEL = get_support_staff("dev_level")
         if dev_cmd and (m.from_user.id not in DEV_LEVEL):
             # Only devs allowed to use this...!
             return False
-        SUDO_LEVEL = SUDO_USERS.union(DEV_USERS)
+        SUDO_LEVEL = get_support_staff("sudo_level")
         if sudo_cmd and (m.from_user.id not in SUDO_LEVEL):
             # Only sudos and above allowed to use it
             return False
@@ -291,7 +292,7 @@ async def can_pin_message_func(_, __, m):
         return True
 
     # Bypass the bot devs, sudos and owner
-    SUDO_LEVEL = DEV_USERS.union(SUDO_USERS)
+    SUDO_LEVEL = get_support_staff("sudo_level")
     if m.from_user.id in SUDO_LEVEL:
         return True
 
@@ -362,7 +363,7 @@ async def flood_check_filter(_, __, m: Message):
             i[0] for i in await admin_cache_reload(m, "custom_filter_update")
         }
     app_users = Approve(m.chat.id).list_approved()
-    SUDO_LEVEL = DEV_USERS.union(SUDO_USERS)
+    SUDO_LEVEL = get_support_staff("sudo_level")
 
     if u_id in SUDO_LEVEL:
         return False