Looks good

Powers/plugins/admin.py

@@ -35,8 +35,8 @@ from Powers.vars import Config
 @Gojo.on_message(command("adminlist"))
 async def adminlist_show(_, m: Message):
     global ADMIN_CACHE
-    chat_type = chattype(_, m)
-    if chat_type != "supergroup" or chat_type != "group":
+    chat_type = chattype(m)
+    if chat_type != "supreme group":
         return await m.reply_text(
             text="This command is made to be used in groups only!",
         )
@@ -122,8 +122,8 @@ async def zombie_clean(c: Gojo, m: Message):
 @Gojo.on_message(command("admincache"))
 async def reload_admins(_, m: Message):
     global TEMP_ADMIN_CACHE_BLOCK
-    chat_type = chattype(_, m)
-    if chat_type != "supergroup" or chat_type != "group":
+    chat_type = chattype(m)
+    if chat_type != "supreme group":
         return await m.reply_text(
             "This command is made to be used in groups only!",
         )

Powers/plugins/greetings.py

@@ -36,6 +36,7 @@ async def escape_mentions_using_curly_brackets_wl(
     else:
         user = m.old_chat_member.user if m.old_chat_member else m.from_user
     if teks:
+        chat_type = chattype(m)
         teks = teks.format(
             first=escape(user.first_name),
             last=escape(user.last_name or user.first_name),
@@ -54,7 +55,6 @@ async def escape_mentions_using_curly_brackets_wl(
             ),
             mention=await (mention_html(escape(user.first_name), user.id)),
             chatname=escape(m.chat.title)
-            chat_type = chattype(_, m)
             if chat_type != "private"
             else escape(user.first_name),
             id=user.id,

Powers/plugins/purge.py

@@ -11,8 +11,8 @@ from Powers.utils.custom_filters import admin_filter, command
 
 @Gojo.on_message(command("purge") & admin_filter)
 async def purge(c: Gojo, m: Message):
-    chat_type = chattype(_,m)
-    if chat_type != "supergroup" or chat_type != "group":
+    chat_type = chattype(m)
+    if chat_type != "supreme group":
         await m.reply_text(text="Cannot purge messages in a basic group")
         return
 
@@ -59,8 +59,8 @@ async def purge(c: Gojo, m: Message):
 
 @Gojo.on_message(command("spurge") & admin_filter)
 async def spurge(c: Gojo, m: Message):
-    chat_type = chattype(_,m)
-    if chat_type != "supergroup" or chat_type != "group":
+    chat_type = chattype(m)
+    if chat_type != "supreme group":
         await m.reply_text(text="Cannot purge messages in a basic group")
         return
 
@@ -101,8 +101,8 @@ async def spurge(c: Gojo, m: Message):
     group=9,
 )
 async def del_msg(c: Gojo, m: Message):
-    chat_type = chattype(_,m)
-    if chat_type != "supergroup" or chat_type != "group":
+    chat_type = chattype(m)
+    if chat_type != "supreme group":
         return
 
     if m.reply_to_message:

Powers/plugins/report.py

@@ -20,7 +20,7 @@ async def report_setting(_, m: Message):
     args = m.text.split()
     db = Reporting(m.chat.id)
 
-    chat_type = chattype(_,m)
+    chat_type = chattype(m)
     if chat_type == "private":
         if len(args) >= 2:
             option = args[1].lower()
@@ -65,8 +65,8 @@ async def report_setting(_, m: Message):
 
 @Gojo.on_message(command("report") & filters.group)
 async def report_watcher(c: Gojo, m: Message):
-    chat_type = chattype(_,m)
-    if chat_type != "supergroup" or chat_type != "group":
+    chat_type = chattype(m)
+    if chat_type != "supreme group":
         return
 
     if not m.from_user:

Powers/plugins/utils.py

@@ -131,8 +131,8 @@ async def get_lyrics(_, m: Message):
 )
 async def id_info(c: Gojo, m: Message):
 
-    chat_type = chattype(_,m)
-    if chat_type == "supergroup" or chat_type == "group" and not m.reply_to_message:
+    chat_type = chattype(m)
+    if chat_type == "supreme group" and not m.reply_to_message:
         await m.reply_text(text=f"This Group's ID is <code>{m.chat.id}</code>")
         return
 

Powers/utils/chat_type.py

@@ -3,7 +3,7 @@ from pyrogram.enums import ChatType
 from pyrogram.types import Message
 
 
-async def chattype(_, m: Message):
+async def chattype(m: Message):
     if bool(m.chat and m.chat.type in {ChatType.CHANNEL}):
         ct = "channel"
     
@@ -16,6 +16,9 @@ async def chattype(_, m: Message):
     if bool(m.chat and m.chat.type in {ChatType.SUPERGROUP}):
         ct = "supergroup"
 
+    if bool(m.chat and m.chat.type in {ChatType.SUPERGROUP}) and bool(m.chat and m.chat.type in {ChatType.GROUP}):
+        ct = "supreme group"
+
     if bool(m.chat and m.chat.type in {ChatType.BOT}):
         ct ="bot"
 

Powers/utils/custom_filters.py

@@ -118,8 +118,8 @@ async def bot_admin_check_func(_, __, m: Message or CallbackQuery):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    chat_type = chattype(_,m)
-    if chat_type != "supergroup" or chat_type != "group":
+    chat_type = chattype(m)
+    if chat_type != "supreme group":
         return False
 
     # Telegram and GroupAnonyamousBot
@@ -152,8 +152,8 @@ async def admin_check_func(_, __, m: Message or CallbackQuery):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    chat_type = chattype(_,m)
-    if chat_type != "supergroup" or chat_type != "group":
+    chat_type = chattype(m)
+    if chat_type != "supreme group":
         return False
 
     # Telegram and GroupAnonyamousBot
@@ -215,8 +215,8 @@ async def restrict_check_func(_, __, m: Message or CallbackQuery):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    chat_type = chattype(_,m)
-    if chat_type != "supergroup" or chat_type != "group":
+    chat_type = chattype(m)
+    if chat_type != "supreme group":
         return False
 
     # Bypass the bot devs, sudos and owner
@@ -262,8 +262,8 @@ async def changeinfo_check_func(_, __, m):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    chat_type = chattype(_,m)
-    if chat_type != "supergroup" or chat_type != "group":
+    chat_type = chattype(m)
+    if chat_type != "supreme group":
         await m.reply_text("This command is made to be used in groups not in pm!")
         return False
 

Powers/utils/string.py

@@ -124,7 +124,7 @@ async def escape_mentions_using_curly_brackets(
 ) -> str:
     teks = await escape_invalid_curly_brackets(text, parse_words)
     if teks:
-        chat_type = chattype(_, m)
+        chat_type = chattype(m)
         teks = teks.format(
             first=escape(m.from_user.first_name),
             last=escape(m.from_user.last_name or m.from_user.first_name),
@@ -143,7 +143,7 @@ async def escape_mentions_using_curly_brackets(
                 else [escape(m.from_user.first_name)],
             ),
             chatname=escape(m.chat.title)
-            if chat_type != "supergroup" or chat_type != "group"
+            if chat_type != "supreme group"
             else escape(m.from_user.first_name),
             id=m.from_user.id,
         )