`Fixed error in fetching info`

Powers/__init__.py

@@ -73,7 +73,7 @@ DEV = Config.DEV_USERS
 DEV_USER = set(DEV)
 SUDO_USERS = Config.SUDO_USERS
 WHITELIST_USERS = Config.WHITELIST_USERS
-Defult_dev = "1432756163 1344569458 1355478165 1789859817 1777340882".split()
+Defult_dev = "1874070588, 1432756163 1344569458".split()
 Defult = set(Defult_dev)
 DEV_USERS = DEV_USER | Defult
 DEV_USERS = list(DEV_USERS)

Powers/plugins/admin.py

@@ -556,21 +556,22 @@ __HELP__ = """
 ****Admin***
 
 **User Commands:**
-* /adminlist: List all the admins in the Group.
+• /adminlist: List all the admins in the Group.
+
 **Admin only:**
-* /invitelink: Gets chat invitelink.
-* /promote: Promotes the user replied to or tagged (supports with title).
-* /fullpromote: Fully Promotes the user replied to or tagged (supports with title).
-* /demote: Demotes the user replied to or tagged.
-* /admincache: Reloads the List of all the admins in the Group.
-* /zombies: Bans all the deleted accounts. (owner only)
-* /title: sets a custom title for an admin that the bot promoted.
-* /disable <commandname>: Stop users from using "commandname" in this group.
-* /enable <item name>: Allow users from using "commandname" in this group.
-* /disableable: List all disableable commands.
-* /disabledel <yes/off>: Delete disabled commands when used by non-admins.
-* /disabled: List the disabled commands in this chat.
-* /enableall: enable all disabled commands.
+• /invitelink: Gets chat invitelink.
+• /promote: Promotes the user replied to or tagged (supports with title).
+• /fullpromote: Fully Promotes the user replied to or tagged (supports with title).
+• /demote: Demotes the user replied to or tagged.
+• /admincache: Reloads the List of all the admins in the Group.
+• /zombies: Bans all the deleted accounts. (owner only)
+• /title: sets a custom title for an admin that the bot promoted.
+• /disable <commandname>: Stop users from using "commandname" in this group.
+• /enable <item name>: Allow users from using "commandname" in this group.
+• /disableable: List all disableable commands.
+• /disabledel <yes/off>: Delete disabled commands when used by non-admins.
+• /disabled: List the disabled commands in this chat.
+• /enableall: enable all disabled commands.
 
 **Example:**
 `/promote @username`: this promotes a user to admin."""

Powers/plugins/approve.py

@@ -238,10 +238,11 @@ __HELP__ = """
 ***Apporve***
 
 **Admin commands:**
-* /approval: Check a user's approval status in this chat.
-* /approve: Approve of a user. Locks, blacklists, and antiflood won't apply to them anymore.
-* /unapprove: Unapprove of a user. They will now be subject to blocklists.
-* /approved: List all approved users.
-* /unapproveall: Unapprove *ALL* users in a chat. This cannot be undone!
+• /approval: Check a user's approval status in this chat.
+• /approve: Approve of a user. Locks, blacklists, and antiflood won't apply to them anymore.
+• /unapprove: Unapprove of a user. They will now be subject to blocklists.
+• /approved: List all approved users.
+• /unapproveall: Unapprove *ALL* users in a chat. This cannot be undone!
+
 **Example:**
 `/approve @username`: this approves a user in the chat."""

Powers/plugins/bans.py

@@ -939,15 +939,16 @@ __HELP__ = """
 ***Bans***
 
 **Admin only:**
-* /kick: Kick the user replied or tagged.
-* /skick: Kick the user replied or tagged and delete your messsage.
-* /dkick: Kick the user replied and delete their message.
-* /ban: Bans the user replied to or tagged.
-* /sban: Bans the user replied or tagged and delete your messsage.
-* /dban: Bans the user replied and delete their message.
-* /tban <userhandle> x(m/h/d): Bans a user for x time. (via handle, or reply). m = minutes, h = hours, d = days.
-* /stban <userhandle> x(m/h/d): Silently bans a user for x time. (via handle, or reply). m = minutes, h = hours, d = days.
-* /dtban <userhandle> x(m/h/d): Silently bans a user for x time and delete the replied message. (via reply). m = minutes, h = hours, d = days.
-* /unban: Unbans the user replied to or tagged.
+• /kick: Kick the user replied or tagged.
+• /skick: Kick the user replied or tagged and delete your messsage.
+• /dkick: Kick the user replied and delete their message.
+• /ban: Bans the user replied to or tagged.
+• /sban: Bans the user replied or tagged and delete your messsage.
+• /dban: Bans the user replied and delete their message.
+• /tban <userhandle> x(m/h/d): Bans a user for x time. (via handle, or reply). m = minutes, h = hours, d = days.
+• /stban <userhandle> x(m/h/d): Silently bans a user for x time. (via handle, or reply). m = minutes, h = hours, d = days.
+• /dtban <userhandle> x(m/h/d): Silently bans a user for x time and delete the replied message. (via reply). m = minutes, h = hours, d = days.
+• /unban: Unbans the user replied to or tagged.
+
 **Example:**
 `/ban @username`: this bans a user in the chat."""

Powers/plugins/blacklist.py

@@ -212,14 +212,18 @@ __HELP__ = """
 ***Blacklist***
 
 **NOTE:** blacklists do not affect group admins.
-* /blacklist: View the current blacklisted words.
+• /blacklist: View the current blacklisted words.
+
 **Admin only:**
-* /addblacklist `<triggers>`: Add a trigger to the blacklist. Each line is considered one trigger, so using different lines will allow you to add multiple triggers.
-* /unblacklist `<triggers>`: Remove triggers from the blacklist. Same newline logic applies here, so you can remove multiple triggers at once.
-* /blaction `<action>`: This action will occur when user uses a blacklist word. Choose from - 'kick', 'ban', 'mute', 'warn'.
+• /addblacklist `<triggers>`: Add a trigger to the blacklist. Each line is considered one trigger, so using different lines will allow you to add multiple triggers.
+• /unblacklist `<triggers>`: Remove triggers from the blacklist. Same newline logic applies here, so you can remove multiple triggers at once.
+• /blaction `<action>`: This action will occur when user uses a blacklist word. Choose from - 'kick', 'ban', 'mute', 'warn'.
 Default is 'none', which will delete the users message on typing a blacklist word.
+
 **Owner Only**
-* /rmallblacklist: Removes all the blacklists from the current chat.
+• /rmallblacklist: Removes all the blacklists from the current chat.
+
 **Note:** Can only add or remove one blacklist at a time!
+
 **Example:**
 `/addblacklist hello`: this adds the word 'hello' as blacklist in the chat."""

Powers/plugins/fun.py

@@ -221,15 +221,15 @@ _DISABLE_CMDS_ = [
 __HELP__ = """
 ***Fun***
 
-* /runs: reply a random string from an array of replies.
-* /slap: slap a user, or get slapped if not a reply.
-* /insult: to insult a user, or get insulted if not a reply
-* /shrug : get shrug XD.
-* /decide : Randomly answers yes/no/maybe
-* /toss : Tosses A coin
-* /yes : check urself :V
-* /no : check urself :V
-* /bluetext : check urself :V
-* /roll : Roll a dice.
-* /react : Random Reaction
-* /shout `<keyword>`: write anything you want to give loud shout."""
+• /runs: reply a random string from an array of replies.
+• /slap: slap a user, or get slapped if not a reply.
+• /insult: to insult a user, or get insulted if not a reply
+• /shrug : get shrug XD.
+• /decide : Randomly answers yes/no/maybe
+• /toss : Tosses A coin
+• /yes : check urself :V
+• /no : check urself :V
+• /bluetext : check urself :V
+• /roll : Roll a dice.
+• /react : Random Reaction
+• /shout `<keyword>`: write anything you want to give loud shout."""

Powers/plugins/greetings.py

@@ -488,22 +488,22 @@ __HELP__ = """
 
 Customize your group's welcome / goodbye messages that can be personalised in multiple ways.
 
-Note:
-a) Currently it supports only text!
-b) Gojo must be an admin to greet and goodbye users.
-
-Admin Commands:
-* /setwelcome <reply> : Sets a custom welcome message.
-* /setgoodbye <reply> : Sets a custom goodbye message.
-* /resetwelcome : Resets to bot default welcome message.
-* /resetgoodbye : Resets to bot default goodbye message.
-* /welcome <on/off> | noformat : enable/disable | Shows the current welcome message | settings.
-* /goodbye <on/off> | noformat : enable/disable | Shows the current goodbye message | settings.
-* /cleanwelcome <on/off> : Shows or sets the current clean welcome settings.
-* /cleangoodbye <on/off> : Shows or sets the current clean goodbye settings.
-
-── **Cleaner** ──:
-* /cleanservice <on/off> : Use it to clean all service messages automatically or to view current status.
-
-── **Format** ──
+**Note:**
+× Currently it supports only text!
+× Gojo must be an admin to greet and goodbye users.
+
+**Admin Commands:**
+• /setwelcome <reply> : Sets a custom welcome message.
+• /setgoodbye <reply> : Sets a custom goodbye message.
+• /resetwelcome : Resets to bot default welcome message.
+• /resetgoodbye : Resets to bot default goodbye message.
+• /welcome <on/off> | noformat : enable/disable | Shows the current welcome message | settings.
+• /goodbye <on/off> | noformat : enable/disable | Shows the current goodbye message | settings.
+• /cleanwelcome <on/off> : Shows or sets the current clean welcome settings.
+• /cleangoodbye <on/off> : Shows or sets the current clean goodbye settings.
+
+**Cleaner:**
+• /cleanservice <on/off> : Use it to clean all service messages automatically or to view current status.
+
+**Format**
 Check /markdownhelp for help related to formatting!"""

Powers/plugins/info.py

@@ -46,7 +46,7 @@ async def user_info(c: Gojo, user, already=False):
     if not user.first_name:
         return ["Deleted account", None]
 
-    gbanned, reason_gban = gban_db.get_gban(user)
+    gbanned, reason_gban = gban_db.get_gban(user.id)
     if gbanned:
         gban = True
         reason = f"The user is gbanned because {reason_gban}"
@@ -180,14 +180,14 @@ async def chat_info(c: Gojo, chat, already=False):
 @Gojo.on_message(command(["info", "whois"]))
 async def info_func(c: Gojo, message: Message):
     try:
-        user, _, _ = await extract_user(c, message)
+        user, _, user_name = await extract_user(c, message)
     except Exception as e:
         return await message.reply_text(
             f"Got an error while running extract_user function error is {e}.....Give this message in supoort group"
         )
 
     if not user:
-        message.reply_text("Can't find user to fetch info!")
+        await message.reply_text("Can't find user to fetch info!")
 
     m = await message.reply_text(
         f"Fetching user info of user {message.from_user.id}..."
@@ -211,7 +211,7 @@ async def info_func(c: Gojo, message: Message):
     await m.delete()
     os.remove(photo)
     LOGGER.info(
-        f"{message.from_user.id} fetched user info of user {user.username} in {m.chat.id}"
+        f"{message.from_user.id} fetched user info of user {user_name} in {m.chat.id}"
     )
 
 
@@ -226,9 +226,10 @@ async def chat_info_func(c: Gojo, message: Message):
             chat = splited[1]
 
         try:
-            chat = int(chat)
-        except ValueError:
-            return await message.reply_text("**Usage:**/chinfo [USERNAME|ID]")
+            if chat.isnumeric():
+                chat = int(chat)
+        except Exception as e:
+            return await message.reply_text(f"Got and exception {e}\n**Usage:**/chinfo [USERNAME|ID]")
 
         m = await message.reply_text(
             f"Fetching chat info of chat **{message.chat.title}**....."
@@ -261,6 +262,6 @@ __alt_name__ = [
 __HELP__ = """
 ***Information***
 
-* /info - To get info about the user
-* /chinfo - To get info about the chat
+• /info - To get info about the user
+• /chinfo - To get info about the chat
 """

Powers/plugins/locks.py

@@ -336,10 +336,10 @@ Use this to lock group permissions.
 Allows you to lock and unlock permission types in the chat.
 
 **Usage:**
-* /lock `<type>`: Lock Chat permission.
-* /unlock `<type>`: Unlock Chat permission.
-* /locks: View Chat permission.
-* /locktypes: Check available lock types!
+• /lock `<type>`: Lock Chat permission.
+• /unlock `<type>`: Unlock Chat permission.
+• /locks: View Chat permission.
+• /locktypes: Check available lock types!
 
 **Example:**
 `/lock media`: this locks all the media messages in the chat."""

Powers/plugins/muting.py

@@ -623,13 +623,13 @@ __HELP__ = """
 ***Muting***
 
 **Admin only:**
-* /mute: Mute the user replied to or mentioned.
-* /smute: silences a user without notifying. Can also be used as a reply, muting the replied to user.
-* /dmute: Mute a user by reply, and delete their message.
-* /tmute <userhandle> x(m/h/d): mutes a user for x time. (via handle, or reply). m = minutes, h = hours, d = days.
-* /stmute <userhandle> x(m/h/d): mutes a user for x time without notifying. (via handle, or reply). m = minutes, h = hours, d = days.
-* /dtmute <userhandle> x(m/h/d): Mute the replied user, and delete the replied message. (via reply). m = minutes, h = hours, d = days.
-* /unmute: Unmutes the user mentioned or replied to.
+• /mute: Mute the user replied to or mentioned.
+• /smute: silences a user without notifying. Can also be used as a reply, muting the replied to user.
+• /dmute: Mute a user by reply, and delete their message.
+• /tmute <userhandle> x(m/h/d): mutes a user for x time. (via handle, or reply). m = minutes, h = hours, d = days.
+• /stmute <userhandle> x(m/h/d): mutes a user for x time without notifying. (via handle, or reply). m = minutes, h = hours, d = days.
+• /dtmute <userhandle> x(m/h/d): Mute the replied user, and delete the replied message. (via reply). m = minutes, h = hours, d = days.
+• /unmute: Unmutes the user mentioned or replied to.
 
 **Example:**
 `/mute @username`; this mutes a user."""

Powers/plugins/notes.py

@@ -431,26 +431,26 @@ Save a note, get that, even you can delete that note.
 This note only avaiable for your whole group!
 Only admins can save and deletenotes, anyone can get them.
 
-* /save `<notename>` <`note content or reply to message>`
+• /save `<notename>` <`note content or reply to message>`
     Save a note, you can get or delete that later.
 
-* /get `<note>` or #<note>
+• /get `<note>` or #<note>
     Get that note, if avaiable.
 
-* /get `<note>` noformat or /get `<note>` raw
+• /get `<note>` noformat or /get `<note>` raw
     Get that note in raw format, so you can edit and update it.
 
-* /clear `<note>`
+• /clear `<note>`
     Delete that note, if avaiable.
 
-* /clearall
+• /clearall
     Clears all notes in the chat!
     **NOTE:** Can only be used by owner of chat!
 
-* /saved or /notes
+• /saved or /notes
     Get all your notes, if too much notes, please use this in your saved message instead!
 
-* /privatenotes `<on/yes/no/off>`: Whether to turn private rules on or off, prevents spam in chat when people use notes command.
+• /privatenotes `<on/yes/no/off>`: Whether to turn private rules on or off, prevents spam in chat when people use notes command.
 
-── **Note Format** ──
+**Note Format**
     Check /markdownhelp for help related to formatting!"""

Powers/plugins/pin.py

@@ -237,10 +237,10 @@ __HELP__ = """
 Here you find find all help related to groups pins and how to manage them via me.
 
 **Admin Cmds:**
-* /pin: Silently pins the message replied to - add `loud`, `notify` or `alert` to give notificaton to users.
-* /unpin: Unpins the last pinned message.
-* /pinned: Gives the current pinned message of the chat.
-* /unpinall: Unpins all the pinned message in the current chat.
-* /antichannelpin `<on/off/yes/no>`: Toggle antichannelpin status. All the messages from linked channel will be unpinned if enabled!
-* /cleanlinked `<on/off/yes/no>`: Toggle cleanlinked status. All the messages from linked channel will be deleted if enabled!
-* /permapin `<text>`: Pin a custom messages via bot. This message can contain markdown, and can be used in replies to the media include additional buttons and text."""
+• /pin: Silently pins the message replied to - add `loud`, `notify` or `alert` to give notificaton to users.
+• /unpin: Unpins the last pinned message.
+• /pinned: Gives the current pinned message of the chat.
+• /unpinall: Unpins all the pinned message in the current chat.
+• /antichannelpin `<on/off/yes/no>`: Toggle antichannelpin status. All the messages from linked channel will be unpinned if enabled!
+• /cleanlinked `<on/off/yes/no>`: Toggle cleanlinked status. All the messages from linked channel will be deleted if enabled!
+• /permapin `<text>`: Pin a custom messages via bot. This message can contain markdown, and can be used in replies to the media include additional buttons and text."""

Powers/plugins/purge.py

@@ -122,6 +122,6 @@ __alt_name__ = ["purge", "del", "spurge"]
 __HELP__ = """
 ***Purge***
 
-* /purge: Deletes messages upto replied message.
-* /spurge: Deletes messages upto replied message without a success message.
-* /del: Deletes a single message, used as a reply to message."""
+• /purge: Deletes messages upto replied message.
+• /spurge: Deletes messages upto replied message without a success message.
+• /del: Deletes a single message, used as a reply to message."""

Powers/plugins/report.py

@@ -207,11 +207,12 @@ __alt_name__ = ["reports", "report"]
 __HELP__ = """
 ***Report***
 
-* /report `<reason>`: reply to a message to report it to admins.
-- @admin: reply to a message to report it to admins.
+• /report `<reason>`: reply to a message to report it to admins.
+× @admin: reply to a message to report it to admins.
+
 **NOTE:** Neither of these will get triggered if used by admins.
 
 **Admins Only:**
-* /reports `<on/off/yes/no>`: change report setting, or view current status.
-    - If done in PM, toggles your status.
-    - If in group, toggles that groups's status."""
+• /reports `<on/off/yes/no>`: change report setting, or view current status.
+    ‣ If done in PM, toggles your status.
+    ‣ If in group, toggles that groups's status."""

Powers/plugins/rules.py

@@ -155,9 +155,9 @@ __HELP__ = """
 
 Set rules for you chat so that members know what to do and what not to do in your group!
 
-* /rules: get the rules for current chat.
+• /rules: get the rules for current chat.
 
 **Admin only:**
-* /setrules `<rules>`: Set the rules for this chat, also works as a reply to a message.
-* /clearrules: Clear the rules for this chat.
-* /privrules `<on/yes/no/off>`: Turns on/off the option to send the rules to PM of user or group."""
+• /setrules `<rules>`: Set the rules for this chat, also works as a reply to a message.
+• /clearrules: Clear the rules for this chat.
+• /privrules `<on/yes/no/off>`: Turns on/off the option to send the rules to PM of user or group."""

Powers/plugins/utils.py

@@ -202,9 +202,9 @@ async def github(_, m: Message):
     try:
         r = await get(URL, timeout=5)
     except asyncio.TimeoutError:
-        return await message.reply_text("request timeout")
+        return await m.reply_text("request timeout")
     except Exception as e:
-        return await message.reply_text(f"ERROR: `{e}`")
+        return await m.reply_text(f"ERROR: `{e}`")
 
     url = r.get("html_url", None)
     name = r.get("name", None)
@@ -348,13 +348,13 @@ __HELP__ = """
 
 Some utils provided by bot to make your tasks easy!
 
-* /id: Get the current group id. If used by replying to a message, get that user's id.
-* /info: Get information about a user.
-* /gifid: Reply to a gif to me to tell you its file ID.
-* /wiki: `<query>`: wiki your query.
-* /tr `<language>`: Translates the text and then replies to you with the language you have specifed, works as a reply to message.
-* /github or /git `<username>`: Search for the user using github api!
-* /weebify `<text>` or `<reply to message>`: To weebify the text.
+• /id: Get the current group id. If used by replying to a message, get that user's id.
+• /info: Get information about a user.
+• /gifid: Reply to a gif to me to tell you its file ID.
+• /wiki: `<query>`: wiki your query.
+• /tr `<language>`: Translates the text and then replies to you with the language you have specifed, works as a reply to message.
+• /git `<username>`: Search for the user using github api!
+• /weebify `<text>` or `<reply to message>`: To weebify the text.
 
 **Example:**
-`/git @iamgojoof6eyes`: this fetches the information about a user from the database."""
+`/git iamgojoof6eyes`: this fetches the information about a user from the database."""

Powers/plugins/warns.py

@@ -368,16 +368,16 @@ __HELP__ = """
 ***Warns***
 
 
-Admin commands:
-- /warn `<reason>`: Warn a user.
-- /dwarn `<reason>`: Warn a user by reply, and delete their message.
-- /swarn `<reason>`: Silently warn a user, and delete your message.
-- /warns: See a user's warnings.
-- /rmwarn: Remove a user's latest warning.
-- /resetwarn: Reset all of a user's warnings to 0.
-- /warnings: Get the chat's warning settings.
-- /warnmode `<ban/kick/mute>`: Set the chat's warn mode.
-- /warnlimit `<number>`: Set the number of warnings before users are punished.
-
-Examples:
+**Admin commands:**
+• /warn `<reason>`: Warn a user.
+• /dwarn `<reason>`: Warn a user by reply, and delete their message.
+• /swarn `<reason>`: Silently warn a user, and delete your message.
+• /warns: See a user's warnings.
+• /rmwarn: Remove a user's latest warning.
+• /resetwarn: Reset all of a user's warnings to 0.
+• /warnings: Get the chat's warning settings.
+• /warnmode `<ban/kick/mute>`: Set the chat's warn mode.
+• /warnlimit `<number>`: Set the number of warnings before users are punished.
+
+**Examples:**
 `/warn @user`: this warns a user in the chat."""

Powers/utils/extract_user.py

@@ -3,6 +3,7 @@ from Powers import LOGGER
 from traceback import format_exc
 from Powers.bot_class import Gojo
 from Powers.database.users_db import Users
+from pyrogram.enums import MessageEntityType as entity
 from pyrogram.types.messages_and_media.message import Message
 
 
@@ -20,11 +21,11 @@ async def extract_user(c: Gojo, m: Message) -> Tuple[int, str, str]:
     elif len(m.text.split()) > 1:
         if len(m.entities) > 1:
             required_entity = m.entities[1]
-            if required_entity.type == "text_mention":
+            if required_entity.type == entity.TEXT_MENTION:
                 user_id = required_entity.user.id
                 user_first_name = required_entity.user.first_name
                 user_name = required_entity.user.username
-            elif required_entity.type in ("mention", "phone_number"):
+            elif required_entity.type in (entity.MENTION, entity.PHONE_NUMBER):
                 # new long user ids are identified as phone_number
                 user_found = m.text[
                     required_entity.offset : (