modules/commands/applications.py

@@ -10,7 +10,7 @@ from modules.database import col_applications
 @app.on_message(~ filters.scheduled & filters.command(["applications"], prefixes=["/"]))
 async def cmd_applications(app, msg):
 
-    if (await isAnAdmin(msg.from_user.id)) or (msg.chat.id == configGet("admin_group")):
+    if await isAnAdmin(msg.from_user.id) is True:
         await app.send_chat_action(msg.chat.id, ChatAction.UPLOAD_DOCUMENT)
         filename = uuid1()
         output = []

modules/commands/label.py

@@ -6,7 +6,7 @@ from classes.holo_user import HoloUser
 @app.on_message(~ filters.scheduled & filters.private & filters.command(["label"], prefixes=["/"]))
 async def cmd_label(app, msg):
 
-    if msg.chat.id == configGet("admin_group") or await isAnAdmin(msg.from_user.id):
+    if await isAnAdmin(msg.from_user.id) is True:
 
         if len(msg.command) < 3:
             await msg.reply_text("Invalid syntax:\n`/label USER LABEL`")

modules/commands/message.py

@@ -7,7 +7,7 @@ from modules.utils import logWrite, locale, configGet, should_quote
 @app.on_message(~ filters.scheduled & filters.command(["message"], prefixes=["/"]))
 async def cmd_message(app, msg):
 
-    if msg.chat.id == configGet("admin_group") or await isAnAdmin(msg.from_user.id):
+    if await isAnAdmin(msg.from_user.id) is True:
 
         try:
 

modules/commands/reboot.py

@@ -11,7 +11,7 @@ pid = getpid()
 @app.on_message(~ filters.scheduled & filters.private & filters.command(["kill", "die", "reboot"], prefixes=["/"]))
 async def cmd_kill(app, msg):
 
-    if msg.chat.id == configGet("admin_group") or await isAnAdmin(msg.from_user.id):
+    if await isAnAdmin(msg.from_user.id) is True:
         logWrite(f"Shutting down bot with pid {pid}")
         await msg.reply_text(f"Вимкнення бота з підом `{pid}`", quote=should_quote(msg))
         scheduler.shutdown()

modules/commands/warn.py

@@ -10,7 +10,7 @@ async def cmd_warn(app, msg):
 
     if msg.chat.id == configGet("destination_group"):
         if msg.reply_to_message_id != None:
-            if await isAnAdmin(msg.from_user.id):
+            if await isAnAdmin(msg.from_user.id) is True:
                 message = " ".join(msg.command[1:]) if len(msg.command) > 1 else ""
                 col_warnings.insert_one({"user": msg.reply_to_message.from_user.id, "admin": msg.from_user.id, "date": datetime.now(), "reason": message})
                 if message == "":

modules/commands/warnings.py

@@ -8,7 +8,7 @@ from modules.database import col_users, col_warnings
 @app.on_message(~ filters.scheduled & filters.command(["warnings"], prefixes=["/"]))
 async def cmd_warnings(app, msg):
 
-    if await isAnAdmin(msg.from_user.id):
+    if await isAnAdmin(msg.from_user.id) is True:
 
         if len(msg.command) <= 1:
             await msg.reply_text(locale("syntax_warnings", "message"), quote=should_quote(msg))

modules/handlers/contact.py

@@ -8,7 +8,7 @@ from modules.utils import configGet, jsonLoad, locale, logWrite
 # Contact getting ==============================================================================================================
 @app.on_message(~ filters.scheduled & filters.contact & filters.private)
 async def get_contact(app, msg):
-    if (path.exists(f"{configGet('data', 'locations')}{sep}users{sep}{msg.from_user.id}.json") and jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{msg.from_user.id}.json")["approved"]) or (await isAnAdmin(msg.from_user.id)):
+    if (path.exists(f"{configGet('data', 'locations')}{sep}users{sep}{msg.from_user.id}.json") and jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{msg.from_user.id}.json")["approved"]) or (await isAnAdmin(msg.from_user.id) is True):
         if msg.contact.user_id != None:
             try:
                 user_data = jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{msg.contact.user_id}.json")

modules/handlers/group_join.py

@@ -8,7 +8,7 @@ from modules.utils import configGet, jsonLoad, locale
 #@app.on_message(filters.new_chat_members, group=configGet("destination_group"))
 async def filter_join(app, member):
     if member.invite_link != None:
-        if (path.exists(f"{configGet('data', 'locations')}{sep}users{sep}{member.from_user.id}.json") and jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{member.from_user.id}.json")["approved"]) or (await isAnAdmin(member.from_user.id)):
+        if (path.exists(f"{configGet('data', 'locations')}{sep}users{sep}{member.from_user.id}.json") and jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{member.from_user.id}.json")["approved"]) or (await isAnAdmin(member.from_user.id) is True):
             if configGet("link", file=str(member.from_user.id)) == member.invite_link.invite_link:
                 return
         if await isAnAdmin(member.invite_link.creator.id):

modules/inline.py

@@ -25,7 +25,7 @@ async def inline_answer(client, inline_query):
         )
         return
 
-    if (path.exists(f"{configGet('data', 'locations')}{sep}users{sep}{inline_query.from_user.id}.json") and jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{inline_query.from_user.id}.json")["approved"]) or (await isAnAdmin(inline_query.from_user.id)):
+    if (path.exists(f"{configGet('data', 'locations')}{sep}users{sep}{inline_query.from_user.id}.json") and jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{inline_query.from_user.id}.json")["approved"]) or (await isAnAdmin(inline_query.from_user.id) is True):
 
         list_of_users = []
         async for m in app.get_chat_members(configGet("destination_group"), limit=configGet("inline_preview_count"), filter=ChatMembersFilter.SEARCH, query=inline_query.query):