Minor changes

Powers/plugins/admin.py

@@ -6,7 +6,7 @@ from Powers.vars import Config
 from traceback import format_exc
 from Powers.bot_class import Gojo
 from pyrogram.types import Message
-from Powers.utils.chat_type import chattype
+from pyrogram.enums import ChatType
 from Powers.utils.parser import mention_html
 from Powers.database.approve_db import Approve
 from Powers.database.reporting_db import Reporting
@@ -25,8 +25,8 @@ from pyrogram.errors import (
 @Gojo.on_message(command("adminlist"))
 async def adminlist_show(_, m: Message):
     global ADMIN_CACHE
-    chat_type = await chattype(m)
-    if chat_type != "supergroup":
+
+    if m.chat.type != ChatType.SUPERGROUP:
         return await m.reply_text(
             text="This command is made to be used in groups only!",
         )
@@ -112,8 +112,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 = await chattype(m)
-    if chat_type != "supergroup":
+    
+    if m.chat.type != ChatType.SUPERGROUP:
         return await m.reply_text(
             "This command is made to be used in groups only!",
         )

Powers/plugins/greetings.py

@@ -4,7 +4,6 @@ from Powers import DEV_USERS
 from Powers.vars import Config
 from Powers.bot_class import Gojo
 from pyrogram import enums, filters
-from Powers.utils.chat_type import chattype
 from Powers.database.antispam_db import GBan
 from Powers.database.greetings_db import Greetings
 from pyrogram.enums import ChatMemberStatus as CMS
@@ -20,6 +19,7 @@ from Powers.utils.string import (
 # Initialize
 gdb = GBan()
 
+ChatType = enums.ChatType
 
 async def escape_mentions_using_curly_brackets_wl(
     m: ChatMemberUpdated,
@@ -33,7 +33,6 @@ 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 = await chattype(m)
         teks = teks.format(
             first=escape(user.first_name),
             last=escape(user.last_name or user.first_name),
@@ -52,7 +51,7 @@ async def escape_mentions_using_curly_brackets_wl(
             ),
             mention=await (mention_html(escape(user.first_name), user.id)),
             chatname=escape(m.chat.title)
-            if chat_type != "private"
+            if m.chat.type != ChatType.PRIVATE
             else escape(user.first_name),
             id=user.id,
         )

Powers/plugins/info.py

@@ -5,7 +5,7 @@ from datetime import datetime
 from traceback import format_exc
 from Powers.bot_class import Gojo
 from pyrogram.types import Message
-from Powers.utils.chat_type import c_type
+from pyrogram.enums import ChatType
 from Powers.database.antispam_db import GBan
 from Powers.utils.custom_filters import command
 from Powers.utils.extract_user import extract_user
@@ -146,7 +146,21 @@ async def chat_info(c: Gojo, chat, already=False):
     username = chat.username
     total_bot, total_admin, total_bot_admin, total_banned = await count(c, chat.id)
     title = chat.title
-    type_ = await c_type(c, chat.id)
+    if chat.type == ChatType.CHANNEL:
+        type_ = "channel"
+
+    if chat.type == ChatType.GROUP:
+        type_ = "group"
+
+    if chat.type == ChatType.SUPERGROUP:
+        type_ = "supergroup"
+
+    if chat.type == ChatType.PRIVATE:
+        type_ = "private"
+
+    if chat.type == ChatType.BOT:
+        type_ = "bot"
+        
     is_scam = chat.is_scam
     is_fake = chat.is_fake
     description = chat.description
@@ -155,8 +169,7 @@ async def chat_info(c: Gojo, chat, already=False):
     dc_id = chat.dc_id
     photo_id = chat.photo.big_file_id if chat.photo else None
     can_save = chat.has_protected_content
-    linked_chat = chat.linked_chat.username
-    linked_id = chat.linked_chat.id
+    linked_chat = chat.linked_chat
 
     caption = f"""
 🔰 <b>CHAT INFO</b> 🔰
@@ -176,7 +189,7 @@ async def chat_info(c: Gojo, chat, already=False):
 <b>👨🏿‍💻 Description</b>: <code>{description}</code>
 <b>👪 Total members</b>: {members}
 <b>🚫 Has Protected Content</b>: {can_save}
-<b>🔗 Linked Chat</b>: @{linked_chat if linked_chat else linked_id}
+<b>🔗 Linked Chat</b>: @{linked_chat.id if linked_chat else "Noe Linked"}
 
 """
 

Powers/plugins/purge.py

@@ -2,15 +2,15 @@ from asyncio import sleep
 from Powers import SUPPORT_GROUP
 from Powers.bot_class import Gojo
 from pyrogram.types import Message
-from Powers.utils.chat_type import chattype
+from pyrogram.enums import ChatType
 from pyrogram.errors import RPCError, MessageDeleteForbidden
 from Powers.utils.custom_filters import command, admin_filter
 
 
 @Gojo.on_message(command("purge") & admin_filter)
 async def purge(c: Gojo, m: Message):
-    chat_type = await chattype(m)
-    if chat_type != "supergroup":
+
+    if m.chat.type != ChatType.SUPERGROUP:
         await m.reply_text(text="Cannot purge messages in a basic group")
         return
 
@@ -56,8 +56,8 @@ async def purge(c: Gojo, m: Message):
 
 @Gojo.on_message(command("spurge") & admin_filter)
 async def spurge(c: Gojo, m: Message):
-    chat_type = await chattype(m)
-    if chat_type != "supergroup":
+
+    if m.chat.type != ChatType.SUPERGROUP:
         await m.reply_text(text="Cannot purge messages in a basic group")
         return
 
@@ -100,8 +100,8 @@ async def spurge(c: Gojo, m: Message):
     group=9,
 )
 async def del_msg(c: Gojo, m: Message):
-    chat_type = await chattype(m)
-    if chat_type != "supergroup":
+
+    if m.chat.type != ChatType.SUPERGROUP:
         return
 
     if m.reply_to_message:

Powers/plugins/report.py

@@ -4,11 +4,10 @@ from Powers.bot_class import Gojo
 from pyrogram.errors import RPCError
 from Powers.utils.kbhelpers import ikb
 from Powers import LOGGER, SUPPORT_STAFF
-from Powers.utils.chat_type import chattype
 from Powers.utils.parser import mention_html
 from pyrogram.types import Message, CallbackQuery
 from Powers.database.reporting_db import Reporting
-from pyrogram.enums import ChatMembersFilter as cmf
+from pyrogram.enums import ChatMembersFilter as cmf, ChatType
 from Powers.utils.custom_filters import command, admin_filter
 
 
@@ -19,8 +18,7 @@ async def report_setting(_, m: Message):
     args = m.text.split()
     db = Reporting(m.chat.id)
 
-    chat_type = await chattype(m)
-    if chat_type == "private":
+    if m.chat.type == ChatType.PRIVATE:
         if len(args) >= 2:
             option = args[1].lower()
             if option in ("yes", "on", "true"):
@@ -64,8 +62,8 @@ async def report_setting(_, m: Message):
 
 @Gojo.on_message(command("report") & filters.group)
 async def report_watcher(c: Gojo, m: Message):
-    chat_type = await chattype(m)
-    if chat_type != "supergroup":
+
+    if m.chat.type != ChatType.SUPERGROUP:
         return
 
     if not m.from_user:

Powers/plugins/start.py

@@ -5,10 +5,9 @@ from pyrogram import enums, filters
 from Powers.utils.kbhelpers import ikb
 from Powers import LOGGER, HELP_COMMANDS
 from Powers.utils.extras import StartPic
-from Powers.utils.chat_type import chattype
 from Powers.utils.custom_filters import command
 from pyrogram.types import Message, CallbackQuery
-from pyrogram.enums import ChatMemberStatus as CMS
+from pyrogram.enums import ChatMemberStatus as CMS, ChatType
 from pyrogram.errors import UserIsBlocked, QueryIdInvalid, MessageNotModified
 from Powers.utils.start_utils import (
     gen_cmds_kb, gen_start_kb, get_help_msg, get_private_note,
@@ -59,8 +58,8 @@ async def close_admin_callback(_, q: CallbackQuery):
     command("start") & (filters.group | filters.private),
 )
 async def start(c: Gojo, m: Message):
-    chat_type = await chattype(m)
-    if chat_type == "private":
+
+    if m.chat.type == ChatType.PRIVATE:
         if len(m.text.split()) > 1:
             help_option = (m.text.split(None, 1)[1]).lower()
 
@@ -188,8 +187,8 @@ async def help_menu(_, m: Message):
         LOGGER.info(
             f"{m.from_user.id} fetched help for '{help_option}' text in {m.chat.id}",
         )
-        chat_type = await chattype(m)
-        if chat_type == "private":
+
+        if m.chat.type == ChatType.PRIVATE:
             if len(help_msg) >= 1026:
                 await m.reply_text(
                     help_msg, parse_mode=enums.ParseMode.MARKDOWN, quote=True
@@ -219,8 +218,8 @@ async def help_menu(_, m: Message):
                 ),
             )
     else:
-        chat_type = await chattype(m)
-        if chat_type == "private":
+
+        if m.chat.type == ChatType.PRIVATE:
             keyboard = ikb(
                 [
                     *(await gen_cmds_kb(m)),

Powers/plugins/utils.py

@@ -11,6 +11,7 @@ from pyrogram import enums, filters
 from Powers.utils.http_helper import *
 from Powers.database.users_db import Users
 from pyrogram.errors import MessageTooLong
+from pyrogram.enums import ChatType
 from Powers.utils.custom_filters import command
 from Powers.utils.clean_file import remove_markdown_and_html
 from wikipedia.exceptions import PageError, DisambiguationError
@@ -118,12 +119,12 @@ async def get_lyrics(_, m: Message):
 )
 async def id_info(c: Gojo, m: Message):
 
-    chat_type = await chattype(m)
-    if chat_type == "supergroup" and not m.reply_to_message:
+
+    if m.chat.type == ChatType.SUPERGROUP and not m.reply_to_message:
         await m.reply_text(text=f"This Group's ID is <code>{m.chat.id}</code>")
         return
 
-    if chat_type == "private" and not m.reply_to_message:
+    if m.chat.type == ChatType.PRIVATE and not m.reply_to_message:
         await m.reply_text(text=f"Your ID is <code>{m.chat.id}</code>.")
         return
 
@@ -155,7 +156,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=enums.ParseMode.HTML,
             )
-    elif chat_type == "private":
+    elif m.chat.type == ChatType.PRIVATE:
         await m.reply_text(text=f"Your ID is <code>{m.chat.id}</code>.")
     else:
         await m.reply_text(text=f"This Group's ID is <code>{m.chat.id}</code>")

Powers/utils/chat_type.py

@@ -1,41 +0,0 @@
-from Powers.bot_class import Gojo
-from pyrogram.types import Message
-from pyrogram.enums import ChatType
-
-
-async def chattype(m: Message):
-    # To get chat type with message
-
-    if m.chat.type == ChatType.CHANNEL:
-        ct = "channel"
-
-    if m.chat.type == ChatType.PRIVATE:
-        ct = "private"
-
-    if m.chat.type == ChatType.GROUP:
-        ct = "group"
-
-    if m.chat.type == ChatType.SUPERGROUP:
-        ct = "supergroup"
-
-    return ct
-
-
-async def c_type(c: Gojo, chat_id):
-    # To get chat type with chat id
-
-    ch = await c.get_chat(chat_id)
-
-    if ch.type == ChatType.CHANNEL:
-        ct = "channel"
-
-    if ch.type == ChatType.GROUP:
-        ct = "group"
-
-    if ch.type == ChatType.SUPERGROUP:
-        ct = "supergroup"
-
-    if ch.type == ChatType.PRIVATE:
-        ct = "private"
-
-    return ct

Powers/utils/custom_filters.py

@@ -1,14 +1,12 @@
 from shlex import split
-from pyrogram import enums
 from Powers.vars import Config
 from typing import List, Union
 from pyrogram.filters import create
-from Powers.utils.chat_type import chattype
 from re import escape, compile as compile_re
 from Powers.database.disable_db import Disabling
 from pyrogram.types import Message, CallbackQuery
 from Powers import OWNER_ID, DEV_USERS, SUDO_USERS
-from pyrogram.enums import ChatMemberStatus as CMS
+from pyrogram.enums import ChatMemberStatus as CMS, ChatType
 from pyrogram.errors import RPCError, UserNotParticipant
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
 
@@ -32,8 +30,7 @@ def command(
         if date:
             return  # reaction
 
-        chattype = bool(m.chat and m.chat.type in {enums.ChatType.CHANNEL})
-        if chattype:
+        if m.chat and m.chat.type == ChatType.CHANNEL:
             return
 
         if m and not m.from_user:
@@ -69,7 +66,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 {enums.ChatType.SUPERGROUP}):
+            if bool(m.chat and m.chat.type in {ChatType.SUPERGROUP}):
                 try:
                     user_status = (await m.chat.get_member(m.from_user.id)).status
                 except UserNotParticipant:
@@ -116,8 +113,7 @@ async def bot_admin_check_func(_, __, m: Message or CallbackQuery):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    chat_type = await chattype(m)
-    if chat_type != "supergroup":
+    if m.chat.type != ChatType.SUPERGROUP:
         return False
 
     # Telegram and GroupAnonyamousBot
@@ -150,8 +146,8 @@ async def admin_check_func(_, __, m: Message or CallbackQuery):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    chat_type = await chattype(m)
-    if chat_type != "supergroup":
+
+    if m.chat.type != ChatType.SUPERGROUP:
         return False
 
     # Telegram and GroupAnonyamousBot
@@ -186,7 +182,7 @@ async def owner_check_func(_, __, m: Message or CallbackQuery):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    if bool(m.chat and m.chat.type in {enums.ChatType.SUPERGROUP}):
+    if bool(m.chat and m.chat.type in {ChatType.SUPERGROUP}):
         return False
 
     # Bypass the bot devs, sudos and owner
@@ -213,8 +209,8 @@ async def restrict_check_func(_, __, m: Message or CallbackQuery):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    chat_type = await chattype(m)
-    if chat_type != "supergroup":
+
+    if m.chat.type != ChatType.SUPERGROUP:
         return False
 
     # Bypass the bot devs, sudos and owner
@@ -237,7 +233,7 @@ async def promote_check_func(_, __, m):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    if bool(m.chat and m.chat.type in {enums.ChatType.SUPERGROUP}):
+    if bool(m.chat and m.chat.type in {ChatType.SUPERGROUP}):
         return False
 
     # Bypass the bot devs, sudos and owner
@@ -260,8 +256,8 @@ async def changeinfo_check_func(_, __, m):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    chat_type = await chattype(m)
-    if chat_type != "supergroup":
+
+    if m.chat.type != ChatType.SUPERGROUP:
         await m.reply_text("This command is made to be used in groups not in pm!")
         return False
 
@@ -289,7 +285,7 @@ async def can_pin_message_func(_, __, m):
     if isinstance(m, CallbackQuery):
         m = m.message
 
-    if not bool(m.chat and m.chat.type in {enums.ChatType.SUPERGROUP}):
+    if not bool(m.chat and m.chat.type in {ChatType.SUPERGROUP}):
         await m.reply_text("This command is made to be used in groups not in pm!")
         return False
 

Powers/utils/string.py

@@ -2,7 +2,7 @@ from time import time
 from html import escape
 from typing import List
 from re import compile as compile_re
-from Powers.utils.chat_type import chattype
+from pyrogram.enums import ChatType
 from Powers.utils.parser import escape_markdown
 from pyrogram.types import Message, InlineKeyboardButton
 
@@ -123,7 +123,6 @@ async def escape_mentions_using_curly_brackets(
 ) -> str:
     teks = await escape_invalid_curly_brackets(text, parse_words)
     if teks:
-        chat_type = await 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),
@@ -142,7 +141,7 @@ async def escape_mentions_using_curly_brackets(
                 else [escape(m.from_user.first_name)],
             ),
             chatname=escape(m.chat.title)
-            if chat_type != "supergroup"
+            if m.chat.type != ChatType.SUPERGROUP
             else escape(m.from_user.first_name),
             id=m.from_user.id,
         )