update

Powers/plugins/admin.py

@@ -19,6 +19,7 @@ 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, TEMP_ADMIN_CACHE_BLOCK, admin_cache_reload
+from Powers.utils.chat_type import chattype
 from Powers.utils.custom_filters import (
     DEV_LEVEL,
     admin_filter,
@@ -34,7 +35,8 @@ from Powers.vars import Config
 @Gojo.on_message(command("adminlist"))
 async def adminlist_show(_, m: Message):
     global ADMIN_CACHE
-    if m.chat.type != "supergroup":
+    chat_type = chattype(_, m)
+    if chat_type != "supergroup" or chat_type != "group":
         return await m.reply_text(
             text="This command is made to be used in groups only!",
         )
@@ -120,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
-
-    if m.chat.type != "supergroup":
+    chat_type = chattype(_, m)
+    if chat_type != "supergroup" or chat_type != "group":
         return await m.reply_text(
             "This command is made to be used in groups only!",
         )

Powers/plugins/greetings.py

@@ -10,6 +10,7 @@ from Powers.bot_class import Gojo
 from Powers.database.antispam_db import GBan
 from Powers.database.greetings_db import Greetings
 from Powers.utils.custom_filters import admin_filter, bot_admin_filter, command
+from Powers.utils.chat_type import chattype
 from Powers.utils.msg_types import Types, get_wlcm_type
 from Powers.utils.parser import escape_markdown, mention_html
 from Powers.utils.string import (
@@ -53,7 +54,8 @@ async def escape_mentions_using_curly_brackets_wl(
             ),
             mention=await (mention_html(escape(user.first_name), user.id)),
             chatname=escape(m.chat.title)
-            if m.chat.type != "private"
+            chat_type = chattype(_, m)
+            if chat_type != "private"
             else escape(user.first_name),
             id=user.id,
         )

Powers/plugins/purge.py

@@ -5,12 +5,14 @@ from pyrogram.types import Message
 
 from Powers import SUPPORT_GROUP
 from Powers.bot_class import Gojo
+from Powers.utils.chat_type import chattype
 from Powers.utils.custom_filters import admin_filter, command
 
 
 @Gojo.on_message(command("purge") & admin_filter)
 async def purge(c: Gojo, m: Message):
-    if m.chat.type != "supergroup":
+    chat_type = chattype(_,m)
+    if chat_type != "supergroup" or chat_type != "group":
         await m.reply_text(text="Cannot purge messages in a basic group")
         return
 
@@ -57,7 +59,8 @@ async def purge(c: Gojo, m: Message):
 
 @Gojo.on_message(command("spurge") & admin_filter)
 async def spurge(c: Gojo, m: Message):
-    if m.chat.type != "supergroup":
+    chat_type = chattype(_,m)
+    if chat_type != "supergroup" or chat_type != "group":
         await m.reply_text(text="Cannot purge messages in a basic group")
         return
 
@@ -98,7 +101,8 @@ async def spurge(c: Gojo, m: Message):
     group=9,
 )
 async def del_msg(c: Gojo, m: Message):
-    if m.chat.type != "supergroup":
+    chat_type = chattype(_,m)
+    if chat_type != "supergroup" or chat_type != "group":
         return
 
     if m.reply_to_message:

Powers/plugins/report.py

@@ -9,6 +9,7 @@ from Powers.bot_class import Gojo
 from Powers.database.reporting_db import Reporting
 from Powers.utils.custom_filters import admin_filter, command
 from Powers.utils.kbhelpers import ikb
+from Powers.utils.chat_type import chattype
 from Powers.utils.parser import mention_html
 
 
@@ -19,7 +20,8 @@ async def report_setting(_, m: Message):
     args = m.text.split()
     db = Reporting(m.chat.id)
 
-    if m.chat.type == "private":
+    chat_type = chattype(_,m)
+    if chat_type == "private":
         if len(args) >= 2:
             option = args[1].lower()
             if option in ("yes", "on", "true"):
@@ -63,7 +65,8 @@ async def report_setting(_, m: Message):
 
 @Gojo.on_message(command("report") & filters.group)
 async def report_watcher(c: Gojo, m: Message):
-    if m.chat.type != "supergroup":
+    chat_type = chattype(_,m)
+    if chat_type != "supergroup" or chat_type != "group":
         return
 
     if not m.from_user:

Powers/plugins/start.py

@@ -6,6 +6,7 @@ from Powers import HELP_COMMANDS, LOGGER
 from Powers.bot_class import Gojo
 from Powers.utils.custom_filters import command
 from Powers.utils.kbhelpers import ikb
+from Powers.utils.chat_type import chattype
 from Powers.utils.start_utils import (
     gen_cmds_kb,
     gen_start_kb,

Powers/plugins/utils.py

@@ -22,6 +22,7 @@ from Powers.database.antispam_db import GBan
 from Powers.database.users_db import Users
 from Powers.utils.clean_file import remove_markdown_and_html
 from Powers.utils.custom_filters import command
+from Powers.utils.chat_type import chattype
 from Powers.utils.http_helper import *
 from Powers.utils.kbhelpers import ikb
 from Powers.utils.parser import mention_html
@@ -130,11 +131,12 @@ async def get_lyrics(_, m: Message):
 )
 async def id_info(c: Gojo, m: Message):
 
-    if m.chat.type == "supergroup" and not m.reply_to_message:
+    chat_type = chattype(_,m)
+    if chat_type == "supergroup" or chat_type == "group" and not m.reply_to_message:
         await m.reply_text(text=f"This Group's ID is <code>{m.chat.id}</code>")
         return
 
-    if m.chat.type == "private" and not m.reply_to_message:
+    if chat_type == "private" and not m.reply_to_message:
         await m.reply_text(text=f"Your ID is <code>{m.chat.id}</code>.")
         return
 
@@ -164,7 +166,7 @@ async def id_info(c: Gojo, m: Message):
                 f"{(await mention_html(user.first_name, user.id))}'s ID is <code>{user.id}</code>.",
                 parse_mode="HTML",
             )
-    elif m.chat.type == "private":
+    elif chat_type == "private":
         await m.reply_text(
             text=f"Your ID is <code>{m.chat.id}</code>."    
         )

Powers/utils/chat_type.py

@@ -1 +1,23 @@
-from pyrogram import enums
+import enum
+from pyrogram.enums import ChatType
+from pyrogram.types import Message
+
+
+async def chattype(_, m: Message):
+    if bool(m.chat and m.chat.type in {ChatType.CHANNEL}):
+        ct = "channel"
+    
+    if bool(m.chat and m.chat.type in {ChatType.PRIVATE}):
+        ct = "private"
+
+    if bool(m.chat and m.chat.type in {ChatType.GROUP}):
+        ct = "group"
+    
+    if bool(m.chat and m.chat.type in {ChatType.SUPERGROUP}):
+        ct = "supergroup"
+
+    if bool(m.chat and m.chat.type in {ChatType.BOT}):
+        ct ="bot"
+
+
+    return ct

Powers/utils/custom_filters.py

@@ -12,6 +12,7 @@ from pyrogram import enums
 from Powers import DEV_USERS, OWNER_ID, SUDO_USERS
 from Powers.database.disable_db import Disabling
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
+from Powers.utils.chat_type import chattype
 from Powers.vars import Config
 
 SUDO_LEVEL = set(SUDO_USERS + DEV_USERS + [int(OWNER_ID)])
@@ -70,7 +71,7 @@ def command(
             m.command = [matches.group(1)]
             if matches.group(1) not in flt.commands:
                 return False
-            if m.chat.type == "supergroup":
+            if bool(m.chat and m.chat.type in {enums.ChatType.SUPERGROUP}):
                 try:
                     user_status = (await m.chat.get_member(m.from_user.id)).status
                 except UserNotParticipant:
@@ -117,7 +118,8 @@ async def bot_admin_check_func(_, __, m: Message or CallbackQuery):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    if m.chat.type != "supergroup":
+    chat_type = chattype(_,m)
+    if chat_type != "supergroup" or chat_type != "group":
         return False
 
     # Telegram and GroupAnonyamousBot
@@ -150,7 +152,8 @@ async def admin_check_func(_, __, m: Message or CallbackQuery):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    if m.chat.type != "supergroup":
+    chat_type = chattype(_,m)
+    if chat_type != "supergroup" or chat_type != "group":
         return False
 
     # Telegram and GroupAnonyamousBot
@@ -185,7 +188,7 @@ async def owner_check_func(_, __, m: Message or CallbackQuery):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    if m.chat.type != "supergroup":
+    if bool(m.chat and m.chat.type in {enums.ChatType.SUPERGROUP}):
         return False
 
     # Bypass the bot devs, sudos and owner
@@ -212,7 +215,8 @@ async def restrict_check_func(_, __, m: Message or CallbackQuery):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    if m.chat.type != "supergroup":
+    chat_type = chattype(_,m)
+    if chat_type != "supergroup" or chat_type != "group":
         return False
 
     # Bypass the bot devs, sudos and owner
@@ -235,7 +239,7 @@ async def promote_check_func(_, __, m):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    if m.chat.type != "supergroup":
+    if bool(m.chat and m.chat.type in {enums.ChatType.SUPERGROUP}):
         return False
 
     # Bypass the bot devs, sudos and owner
@@ -258,7 +262,8 @@ async def changeinfo_check_func(_, __, m):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    if m.chat.type != "supergroup":
+    chat_type = chattype(_,m)
+    if chat_type != "supergroup" or chat_type != "group":
         await m.reply_text("This command is made to be used in groups not in pm!")
         return False
 
@@ -286,7 +291,7 @@ async def can_pin_message_func(_, __, m):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    if m.chat.type != "supergroup":
+    if not bool(m.chat and m.chat.type in {enums.ChatType.SUPERGROUP}):
         await m.reply_text("This command is made to be used in groups not in pm!")
         return False
 

Powers/utils/string.py

@@ -6,6 +6,7 @@ from typing import List
 from pyrogram.types import InlineKeyboardButton, Message
 
 from Powers.utils.parser import escape_markdown
+from Powers.utils.chat_type import chattype
 
 BTN_URL_REGEX = compile_re(r"(\[([^\[]+?)\]\(buttonurl:(?:/{0,2})(.+?)(:same)?\))")
 
@@ -141,7 +142,8 @@ async def escape_mentions_using_curly_brackets(
                 else [escape(m.from_user.first_name)],
             ),
             chatname=escape(m.chat.title)
-            if m.chat.type != "private"
+            chat_type = chattype(_,m)
+            if chat_type != "supergroup" or chat_type != "group"
             else escape(m.from_user.first_name),
             id=m.from_user.id,
         )